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

Add support for custom endpoint URL scheme (both HTTP and HTTPS)

Browse source
This commit is contained in:
Denis Palashevskii 2020-08-05 15:22:57 +04:00
parent 4b22df31ad
commit a3c5a971e5
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,6 +25,8 @@ import {
IDataObject, IDataObject,
} from 'n8n-workflow'; } from 'n8n-workflow';
import { URL } from 'url';
export async function s3ApiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, bucket: string, method: string, path: string, body?: string | Buffer, query: IDataObject = {}, headers?: object, option: IDataObject = {}, region?: string): Promise<any> { // tslint:disable-line:no-any export async function s3ApiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, bucket: string, method: string, path: string, body?: string | Buffer, query: IDataObject = {}, headers?: object, option: IDataObject = {}, region?: string): Promise<any> { // tslint:disable-line:no-any
let credentials; let credentials;
@ -45,22 +47,27 @@ export async function s3ApiRequest(this: IHookFunctions | IExecuteFunctions | IL
throw new Error('No credentials got returned!'); throw new Error('No credentials got returned!');
} }
let endpoint = endpointType === 'aws' ? `${bucket}.s3.${region || credentials.region}.amazonaws.com` : credentials.endpoint; if (endpointType === "customS3Endpoint" && !(credentials.endpoint as string).startsWith('http')) {
throw new Error('HTTP(S) Scheme is required in endpoint definition');
}
const endpoint = new URL(endpointType === 'aws' ? `https://${bucket}.s3.${region || credentials.region}.amazonaws.com` : credentials.endpoint as string);
// Using path-style for non-AWS services
if (bucket && endpointType === 'customS3Endpoint') { if (bucket && endpointType === 'customS3Endpoint') {
if (credentials.forcePathStyle) { if (credentials.forcePathStyle) {
path = `/${bucket}${path}`; path = `/${bucket}${path}`;
} else { } else {
endpoint = `${bucket}.${endpoint}`; endpoint.host = `${bucket}.${endpoint.host}`;
} }
} }
endpoint.pathname = path;
// Sign AWS API request with the user credentials // Sign AWS API request with the user credentials
const signOpts = { const signOpts = {
headers: headers || {}, headers: headers || {},
region: region || credentials.region, region: region || credentials.region,
host: endpoint, host: endpoint.host,
method, method,
path: `${path}?${queryToString(query).replace(/\+/g, '%2B')}`, path: `${path}?${queryToString(query).replace(/\+/g, '%2B')}`,
service: 's3', service: 's3',
@ -73,7 +80,7 @@ export async function s3ApiRequest(this: IHookFunctions | IExecuteFunctions | IL
headers: signOpts.headers, headers: signOpts.headers,
method, method,
qs: query, qs: query,
uri: `https://${endpoint}${path}`, uri: endpoint,
body: signOpts.body, body: signOpts.body,
}; };