mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(AWS Nodes): Handle query string and body properly for AWS related requests (#4039)

Browse source
This commit is contained in:
Omar Ajoue 2022-09-06 14:33:52 +02:00 committed by GitHub
parent 637863ea02
commit 103f04e4eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/core/src/NodeExecuteFunctions.ts
View file

@ -1461,8 +1461,6 @@ export async function requestWithAuthentication(
// make the updated property in the credentials
// available to the authenticate method
Object.assign(credentialsDecrypted, data);
}
requestOptions = await additionalData.credentialsHelper.authenticate(
credentialsDecrypted,
credentialsType,
@ -1471,9 +1469,11 @@ export async function requestWithAuthentication(
node,
additionalData.timezone,
);
}
// retry the request
return await proxyRequestToAxios(requestOptions as IDataObject);
}
}
throw error;
} catch (error) {
throw new NodeApiError(this.getNode(), error);
}

40
packages/nodes-base/credentials/Aws.credentials.ts
View file

@ -272,7 +272,7 @@ export class Aws implements ICredentialType {
credentials: ICredentialDataDecryptedObject,
requestOptions: IHttpRequestOptions,
): Promise<IHttpRequestOptions> {
let endpoint;
let endpoint: URL;
let service = requestOptions.qs?.service as string;
let path = requestOptions.qs?.path;
const method = requestOptions.method;
@ -280,27 +280,28 @@ export class Aws implements ICredentialType {
let region = credentials.region;
const query = requestOptions.qs?.query as IDataObject;
if (!requestOptions.baseURL && !requestOptions.url) {
let endpointString: string;
if (service === 'lambda' && credentials.lambdaEndpoint) {
endpoint = credentials.lambdaEndpoint;
endpointString = credentials.lambdaEndpoint as string;
} else if (service === 'sns' && credentials.snsEndpoint) {
endpoint = credentials.snsEndpoint;
endpointString = credentials.snsEndpoint as string;
} else if (service === 'sqs' && credentials.sqsEndpoint) {
endpoint = credentials.sqsEndpoint;
endpointString = credentials.sqsEndpoint as string;
} else if (service === 's3' && credentials.s3Endpoint) {
endpoint = credentials.s3Endpoint;
endpointString = credentials.s3Endpoint as string;
} else if (service === 'ses' && credentials.sesEndpoint) {
endpoint = credentials.sesEndpoint;
endpointString = credentials.sesEndpoint as string;
} else if (service === 'rekognition' && credentials.rekognitionEndpoint) {
endpoint = credentials.rekognitionEndpoint;
endpointString = credentials.rekognitionEndpoint as string;
} else if (service === 'sqs' && credentials.sqsEndpoint) {
endpoint = credentials.sqsEndpoint;
endpointString = credentials.sqsEndpoint as string;
} else if (service) {
endpoint = `https://${service}.${credentials.region}.amazonaws.com`;
endpointString = `https://${service}.${credentials.region}.amazonaws.com`;
}
endpoint = new URL((endpoint as string).replace('{region}', credentials.region as string));
endpoint = new URL(endpointString!.replace('{region}', credentials.region as string) + path);
} else {
// If no endpoint is set, we try to decompose the path and use the default endpoint
const customUrl = new URL(requestOptions.baseURL! + requestOptions.url!);
const customUrl = new URL(requestOptions.baseURL! + requestOptions.url! + path);
service = customUrl.hostname.split('.')[0] as string;
region = customUrl.hostname.split('.')[1] as string;
if (service === 'sts') {
@ -311,19 +312,24 @@ export class Aws implements ICredentialType {
console.log(err);
}
}
path = customUrl.pathname as string;
endpoint = customUrl;
}
if (service.includes('.s3')) {
path = `${endpoint.pathname}?${queryToString(query).replace(/\+/g, '%2B')}`;
if (query && Object.keys(query).length !== 0) {
Object.keys(query).forEach((key) => {
endpoint.searchParams.append(key, query[key] as string);
});
}
path = endpoint.pathname + endpoint.search;
const signOpts = {
headers: requestOptions.headers,
...requestOptions,
headers: requestOptions.headers ?? {},
host: endpoint.host,
method,
path,
body,
body: body !== '' ? body : undefined,
region,
} as Request;
@ -340,10 +346,12 @@ export class Aws implements ICredentialType {
console.log(err);
}
const options: IHttpRequestOptions = {
...requestOptions,
headers: signOpts.headers,
method,
url: endpoint.origin + path,
body: signOpts.body,
qs: undefined, // override since it's already in the url
};
return options;

9
packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts
View file

@ -1,11 +1,5 @@
import { URL } from 'url';
import { Request, sign } from 'aws4';
import { get } from 'lodash';
import { OptionsWithUri } from 'request';
import { parseString } from 'xml2js';
import {
@ -20,7 +14,6 @@ import {
IHttpRequestOptions,
JsonObject,
NodeApiError,
NodeOperationError,
} from 'n8n-workflow';
export async function awsApiRequest(
@ -44,7 +37,7 @@ export async function awsApiRequest(
query,
},
method,
body: JSON.stringify(body),
body,
url: '',
headers,
//region: credentials?.region as string,