-
Notifications
You must be signed in to change notification settings - Fork 1.8k
feat(NODE-5393): Migrate AWS signature v4 logic into driver #4824
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from 12 commits
7cc1156
811d453
a0ba1ec
449d677
a44f3b4
221044d
72ab61d
037bcf8
fe3c90b
021f9de
d7966a3
3a2a0ee
9178f66
5a8380f
a3c06e4
26fecf5
a625dc5
2e69f64
31f49e7
59f3e26
41a18ab
178b90a
4e88199
a4d722a
6fffef6
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,7 +22,5 @@ cd $DRIVERS_TOOLS/.evergreen/auth_aws | |
|
|
||
| cd $BEFORE | ||
|
|
||
| npm install --no-save aws4 | ||
|
|
||
| # revert to show test output | ||
| set -x | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,202 @@ | ||
| import { BSON } from '../../bson'; | ||
| import { type AWSCredentials } from '../../deps'; | ||
|
|
||
| export type Options = { | ||
| path: '/'; | ||
| body: string; | ||
| host: string; | ||
| method: 'POST'; | ||
| headers: { | ||
| 'Content-Type': 'application/x-www-form-urlencoded'; | ||
| 'Content-Length': number; | ||
| 'X-MongoDB-Server-Nonce': string; | ||
| 'X-MongoDB-GS2-CB-Flag': 'n'; | ||
| }; | ||
| service: string; | ||
| region: string; | ||
| date: Date; | ||
| }; | ||
|
|
||
| export type SignedHeaders = { | ||
| headers: { | ||
| Authorization: string; | ||
| 'X-Amz-Date': string; | ||
| }; | ||
| }; | ||
|
|
||
| /** | ||
| * Calculates the SHA-256 hash of a string. | ||
| * | ||
| * @param str - String to hash. | ||
| * @returns Hexadecimal representation of the hash. | ||
| */ | ||
| const getHash = async (str: string): Promise<string> => { | ||
addaleax marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| const data = new Uint8Array(BSON.onDemand.ByteUtils.utf8ByteLength(str)); | ||
| BSON.onDemand.ByteUtils.encodeUTF8Into(data, str, 0); | ||
addaleax marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| const hashBuffer = await crypto.subtle.digest('SHA-256', data); | ||
| const hashHex = BSON.onDemand.ByteUtils.toHex(new Uint8Array(hashBuffer)); | ||
| return hashHex; | ||
| }; | ||
|
|
||
| /** | ||
| * Calculates the HMAC-SHA256 of a string using the provided key. | ||
| * @param key - Key to use for HMAC calculation. Can be a string or Uint8Array. | ||
| * @param str - String to calculate HMAC for. | ||
| * @returns Uint8Array containing the HMAC-SHA256 digest. | ||
| */ | ||
| const getHmacBuffer = async (key: string | Uint8Array, str: string): Promise<Uint8Array> => { | ||
baileympearson marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| let keyData: Uint8Array; | ||
| if (typeof key === 'string') { | ||
| keyData = new Uint8Array(BSON.onDemand.ByteUtils.utf8ByteLength(key)); | ||
| BSON.onDemand.ByteUtils.encodeUTF8Into(keyData, key, 0); | ||
| } else { | ||
| keyData = key; | ||
| } | ||
|
|
||
| const importedKey = await crypto.subtle.importKey( | ||
| 'raw', | ||
| keyData, | ||
| { name: 'HMAC', hash: { name: 'SHA-256' } }, | ||
| false, | ||
| ['sign'] | ||
| ); | ||
| const strData = new Uint8Array(BSON.onDemand.ByteUtils.utf8ByteLength(str)); | ||
| BSON.onDemand.ByteUtils.encodeUTF8Into(strData, str, 0); | ||
| const signature = await crypto.subtle.sign('HMAC', importedKey, strData); | ||
| const digest = new Uint8Array(signature); | ||
| return digest; | ||
| }; | ||
|
|
||
| /** | ||
| * Converts header values according to AWS requirements, | ||
| * From https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_sigv-create-signed-request.html#create-canonical-request | ||
| * For values, you must: | ||
| - trim any leading or trailing spaces. | ||
| - convert sequential spaces to a single space. | ||
| * @param value - Header value to convert. | ||
| * @returns - Converted header value. | ||
| */ | ||
| const convertHeaderValue = (value: string | number) => { | ||
baileympearson marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return value.toString().trim().replace(/\s+/g, ' '); | ||
| }; | ||
|
|
||
| /** | ||
| * This method implements AWS Signature 4 logic for a very specific request format. | ||
| * The signing logic is described here: https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_sigv-create-signed-request.html | ||
| */ | ||
| export async function aws4Sign( | ||
| options: Options, | ||
| credentials: AWSCredentials | ||
| ): Promise<SignedHeaders> { | ||
| /** | ||
| * From the spec: https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_sigv-create-signed-request.html | ||
| * | ||
| * Summary of signing steps | ||
| * 1. Create a canonical request | ||
| * Arrange the contents of your request (host, action, headers, etc.) into a standard canonical format. The canonical request is one of the inputs used to create the string to sign. | ||
| * 2. Create a hash of the canonical request | ||
| * Hash the canonical request using the same algorithm that you used to create the hash of the payload. The hash of the canonical request is a string of lowercase hexadecimal characters. | ||
| * 3. Create a string to sign | ||
| * Create a string to sign with the canonical request and extra information such as the algorithm, request date, credential scope, and the hash of the canonical request. | ||
| * 4. Derive a signing key | ||
| * Use the secret access key to derive the key used to sign the request. | ||
| * 5. Calculate the signature | ||
| * Perform a keyed hash operation on the string to sign using the derived signing key as the hash key. | ||
| * 6. Add the signature to the request | ||
| * Add the calculated signature to an HTTP header or to the query string of the request. | ||
| */ | ||
|
|
||
| // 1: Create a canonical request | ||
|
|
||
| // Date – The date and time used to sign the request. | ||
| const date = options.date; | ||
| // RequestDateTime – The date and time used in the credential scope. This value is the current UTC time in ISO 8601 format (for example, 20130524T000000Z). | ||
| const requestDateTime = date.toISOString().replace(/[:-]|\.\d{3}/g, ''); | ||
| // RequestDate – The date used in the credential scope. This value is the current UTC date in YYYYMMDD format (for example, 20130524). | ||
| const requestDate = requestDateTime.substring(0, 8); | ||
| // Method – The HTTP request method. For us, this is always 'POST'. | ||
| const method = options.method; | ||
| // CanonicalUri – The URI-encoded version of the absolute path component URI, starting with the / that follows the domain name and up to the end of the string | ||
| // For our requests, this is always '/' | ||
| const canonicalUri = options.path; | ||
| // CanonicalQueryString – The URI-encoded query string parameters. For our requests, there are no query string parameters, so this is always an empty string. | ||
| const canonicalQuerystring = ''; | ||
|
|
||
| // CanonicalHeaders – A list of request headers with their values. Individual header name and value pairs are separated by the newline character ("\n"). | ||
| // All of our known/expected headers are included here, there are no extra headers. | ||
| const headers = new Headers({ | ||
| 'content-length': convertHeaderValue(options.headers['Content-Length']), | ||
| 'content-type': convertHeaderValue(options.headers['Content-Type']), | ||
| host: convertHeaderValue(options.host), | ||
| 'x-amz-date': convertHeaderValue(requestDateTime), | ||
| 'x-mongodb-gs2-cb-flag': convertHeaderValue(options.headers['X-MongoDB-GS2-CB-Flag']), | ||
| 'x-mongodb-server-nonce': convertHeaderValue(options.headers['X-MongoDB-Server-Nonce']) | ||
| }); | ||
| // If session token is provided, include it in the headers | ||
| if ('sessionToken' in credentials && credentials.sessionToken) { | ||
| headers.append('x-amz-security-token', convertHeaderValue(credentials.sessionToken)); | ||
| } | ||
| // Canonical headers are lowercased and sorted. | ||
| const canonicalHeaders = Array.from(headers.entries()) | ||
| .map(([key, value]) => `${key.toLowerCase()}:${value}`) | ||
| .sort() | ||
| .join('\n'); | ||
| const canonicalHeaderNames = Array.from(headers.keys()).map(header => header.toLowerCase()); | ||
| // SignedHeaders – An alphabetically sorted, semicolon-separated list of lowercase request header names. | ||
| const signedHeaders = canonicalHeaderNames.sort().join(';'); | ||
|
|
||
| // HashedPayload – A string created using the payload in the body of the HTTP request as input to a hash function. This string uses lowercase hexadecimal characters. | ||
| const hashedPayload = await getHash(options.body); | ||
|
|
||
| // CanonicalRequest – A string that includes the above elements, separated by newline characters. | ||
| const canonicalRequest = [ | ||
| method, | ||
| canonicalUri, | ||
| canonicalQuerystring, | ||
| canonicalHeaders + '\n', | ||
| signedHeaders, | ||
| hashedPayload | ||
| ].join('\n'); | ||
|
|
||
| // 2. Create a hash of the canonical request | ||
| // HashedCanonicalRequest – A string created by using the canonical request as input to a hash function. | ||
| const hashedCanonicalRequest = await getHash(canonicalRequest); | ||
|
|
||
| // 3. Create a string to sign | ||
| // Algorithm – The algorithm used to create the hash of the canonical request. For SigV4, use AWS4-HMAC-SHA256. | ||
| const algorithm = 'AWS4-HMAC-SHA256'; | ||
| // CredentialScope – The credential scope, which restricts the resulting signature to the specified Region and service. | ||
| // Has the following format: YYYYMMDD/region/service/aws4_request. | ||
| const credentialScope = `${requestDate}/${options.region}/${options.service}/aws4_request`; | ||
| // StringToSign – A string that includes the above elements, separated by newline characters. | ||
| const stringToSign = [algorithm, requestDateTime, credentialScope, hashedCanonicalRequest].join( | ||
| '\n' | ||
| ); | ||
|
|
||
| // 4. Derive a signing key | ||
| // To derive a signing key for SigV4, perform a succession of keyed hash operations (HMAC) on the request date, Region, and service, with your AWS secret access key as the key for the initial hashing operation. | ||
| const dateKey = await getHmacBuffer('AWS4' + credentials.secretAccessKey, requestDate); | ||
| const dateRegionKey = await getHmacBuffer(dateKey, options.region); | ||
| const dateRegionServiceKey = await getHmacBuffer(dateRegionKey, options.service); | ||
| const signingKey = await getHmacBuffer(dateRegionServiceKey, 'aws4_request'); | ||
|
|
||
| // 5. Calculate the signature | ||
| const signatureBuffer = await getHmacBuffer(signingKey, stringToSign); | ||
| const signature = BSON.onDemand.ByteUtils.toHex(signatureBuffer); | ||
|
|
||
| // 6. Add the signature to the request | ||
| // Calculate the Authorization header | ||
| const authorizationHeader = [ | ||
| 'AWS4-HMAC-SHA256 Credential=' + credentials.accessKeyId + '/' + credentialScope, | ||
| 'SignedHeaders=' + signedHeaders, | ||
| 'Signature=' + signature | ||
| ].join(', '); | ||
|
|
||
| // Return the calculated headers | ||
| return { | ||
| headers: { | ||
| Authorization: authorizationHeader, | ||
| 'X-Amz-Date': requestDateTime | ||
| } | ||
| }; | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| import type { Binary, BSONSerializeOptions } from '../../bson'; | ||
| import * as BSON from '../../bson'; | ||
| import { aws4 } from '../../deps'; | ||
| import { | ||
| MongoCompatibilityError, | ||
| MongoMissingCredentialsError, | ||
|
|
@@ -13,6 +12,7 @@ import { | |
| AWSSDKCredentialProvider, | ||
| type AWSTempCredentials | ||
| } from './aws_temporary_credentials'; | ||
| import { aws4Sign } from './aws4'; | ||
| import { MongoCredentials } from './mongo_credentials'; | ||
| import { AuthMechanism } from './providers'; | ||
|
|
||
|
|
@@ -45,11 +45,6 @@ export class MongoDBAWS extends AuthProvider { | |
| throw new MongoMissingCredentialsError('AuthContext must provide credentials.'); | ||
| } | ||
|
|
||
| if ('kModuleError' in aws4) { | ||
| throw aws4['kModuleError']; | ||
| } | ||
| const { sign } = aws4; | ||
|
|
||
| if (maxWireVersion(connection) < 9) { | ||
| throw new MongoCompatibilityError( | ||
| 'MONGODB-AWS authentication requires MongoDB version 4.4 or later' | ||
|
|
@@ -68,13 +63,10 @@ export class MongoDBAWS extends AuthProvider { | |
| // Allow the user to specify an AWS session token for authentication with temporary credentials. | ||
| const sessionToken = credentials.mechanismProperties.AWS_SESSION_TOKEN; | ||
|
|
||
| // If all three defined, include sessionToken, else include username and pass, else no credentials | ||
| const awsCredentials = | ||
| accessKeyId && secretAccessKey && sessionToken | ||
| ? { accessKeyId, secretAccessKey, sessionToken } | ||
| : accessKeyId && secretAccessKey | ||
| ? { accessKeyId, secretAccessKey } | ||
| : undefined; | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this case (
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This change is based on Bailey's earlier comment:
But maybe we should throw another
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It was dead code before. these values come from above: authContext.credentials = await makeTempCredentials(
authContext.credentials,
this.credentialFetcher
);
const { credentials } = authContext;
const accessKeyId = credentials.username;
const secretAccessKey = credentials.password;
// Allow the user to specify an AWS session token for authentication with temporary credentials.
const sessionToken = credentials.mechanismProperties.AWS_SESSION_TOKEN;and: async function makeTempCredentials(
credentials: MongoCredentials,
awsCredentialFetcher: AWSSDKCredentialProvider
): Promise<MongoCredentials> {
function makeMongoCredentialsFromAWSTemp(creds: AWSTempCredentials) {
// The AWS session token (creds.Token) may or may not be set.
if (!creds.AccessKeyId || !creds.SecretAccessKey) {
throw new MongoMissingCredentialsError('Could not obtain temporary MONGODB-AWS credentials');
}
return new MongoCredentials({
username: creds.AccessKeyId,
password: creds.SecretAccessKey,
source: credentials.source,
mechanism: AuthMechanism.MONGODB_AWS,
mechanismProperties: {
AWS_SESSION_TOKEN: creds.Token
}
});
}
const temporaryCredentials = await awsCredentialFetcher.getCredentials();
return makeMongoCredentialsFromAWSTemp(temporaryCredentials);
}So, we always have an accessKeyId and secretAccessKey, token is optional. |
||
| // If all three defined, include sessionToken, else only include username and pass | ||
| const awsCredentials = sessionToken | ||
| ? { accessKeyId, secretAccessKey, sessionToken } | ||
| : { accessKeyId, secretAccessKey }; | ||
|
|
||
| const db = credentials.source; | ||
| const nonce = await randomBytes(32); | ||
|
|
@@ -114,7 +106,7 @@ export class MongoDBAWS extends AuthProvider { | |
| } | ||
|
|
||
| const body = 'Action=GetCallerIdentity&Version=2011-06-15'; | ||
| const options = sign( | ||
| const signed = await aws4Sign( | ||
baileympearson marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| { | ||
| method: 'POST', | ||
| host, | ||
|
|
@@ -127,14 +119,15 @@ export class MongoDBAWS extends AuthProvider { | |
| 'X-MongoDB-GS2-CB-Flag': 'n' | ||
| }, | ||
| path: '/', | ||
| body | ||
| body, | ||
| date: new Date() | ||
| }, | ||
| awsCredentials | ||
| ); | ||
|
|
||
| const payload: AWSSaslContinuePayload = { | ||
| a: options.headers.Authorization, | ||
| d: options.headers['X-Amz-Date'] | ||
| a: signed.headers.Authorization, | ||
| d: signed.headers['X-Amz-Date'] | ||
| }; | ||
|
|
||
| if (sessionToken) { | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.