admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-16 17:46:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

✨ Add support for custom AWS endpoints (#1312)

Browse Source 
* Setup custom endpoints properties in AWS credentials type

* Update AWS nodes to use new endpoints (if specified)

* Fix a few error scenarios cases where message was being obscured

* Extend usage of URL API to validate user inputted endpoints

https://nodejs.org/docs/latest-v12.x/api/url.html

* Add support to custom endpoints for SES

Forgot to add this in my earlier commits…

* Fix incorrect Amazon SES endpoint placeholder value

* Fixed signing problems with path being ignored. Standardized to avoid future problems

* Linting fix

* ⚡ Make parameters optinal (wip)

* Make sure that we fallback to correct URL without errors if custom endpoints are not used

Co-authored-by: Luis Ramos <luis@ramos.dev>
Co-authored-by: Omar Ajoue <krynble@gmail.com>
This commit is contained in:
Jan
2021-01-07 14:16:52 +01:00
committed by GitHub
parent a13a7487cf
commit 1501175b81
5 changed files with 129 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts
View File

@@ -1,3 +1,7 @@
import {
URL,
} from 'url';
import {
sign,
} from 'aws4';
@@ -31,10 +35,11 @@ export async function awsApiRequest(this: IHookFunctions | IExecuteFunctions | I
throw new Error('No credentials got returned!');
}
const endpoint = `${service}.${region || credentials.region}.amazonaws.com`;
const endpoint = new URL(((credentials.s3Endpoint as string || '').replace('{region}', credentials.region as string) || `https://${service}.${credentials.region}.amazonaws.com`) + path);
// Sign AWS API request with the user credentials
const signOpts = {headers: headers || {}, host: endpoint, method, path: `${path}?${queryToString(query).replace(/\+/g, '%2B')}`, body};
const signOpts = {headers: headers || {}, host: endpoint.host, method, path: `${endpoint.pathname}?${queryToString(query).replace(/\+/g, '%2B')}`, body};
sign(signOpts, { accessKeyId: `${credentials.accessKeyId}`.trim(), secretAccessKey: `${credentials.secretAccessKey}`.trim()});
@@ -42,7 +47,7 @@ export async function awsApiRequest(this: IHookFunctions | IExecuteFunctions | I
headers: signOpts.headers,
method,
qs: query,
uri: `https://${endpoint}${signOpts.path}`,
uri: endpoint.href,
body: signOpts.body,
};
@@ -52,7 +57,7 @@ export async function awsApiRequest(this: IHookFunctions | IExecuteFunctions | I
try {
return await this.helpers.request!(options);
} catch (error) {
const errorMessage = error.response.body.message || error.response.body.Message || error.message;
const errorMessage = (error.response && error.response.body.message) || (error.response && error.response.body.Message) || error.message;
if (error.statusCode === 403) {
if (errorMessage === 'The security token included in the request is invalid.') {