Skip to content

Commit 78897c9

Browse files
pierotofypierotofy
committed
ASR Ignore SSL support
1 parent d2d25dd commit 78897c9

File tree

7 files changed

+36
-16
lines changed

7 files changed

+36
-16
lines changed

‎docs/digitalocean.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ Example configuration file:
1010
"accessKey": "CHANGEME",
1111
"secretKey": "CHANGEME",
1212
"endpoint" :"sfo2.digitaloceanspaces.com",
13-
"bucket": "CHANGEME"
13+
"bucket": "CHANGEME",
14+
"ignoreSSL": false
1415
},
1516

1617
"createRetries": 10,

‎docs/hetzner.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ Example configuration file:
2525
"accessKey": "CHANGEME!",
2626
"secretKey": "CHANGEME!",
2727
"endpoint": "CHANGEME!",
28-
"bucket": "CHANGEME!"
28+
"bucket": "CHANGEME!",
29+
"ignoreSSL": false
2930
},
3031

3132
"maxRuntime": -1,

‎docs/scaleway.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ Example configuration file:
2727
"accessKey": "CHANGEME!",
2828
"secretKey": "CHANGEME!",
2929
"endpoint": "CHANGEME!",
30-
"bucket": "CHANGEME!"
30+
"bucket": "CHANGEME!",
31+
"ignoreSSL": false
3132
},
3233

3334
"maxRuntime": -1,

‎libs/S3.js

+12-1
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,22 @@
1717
*/
1818
"use strict";
1919
const AWS = require('aws-sdk');
20+
const https = require('https');
2021
const logger = require('./logger');
2122

2223
module.exports = {
23-
testBucket: async function(accessKey, secretKey, endpoint, bucket){
24+
testBucket: async function(accessKey, secretKey, endpoint, bucket, ignoreSSL = false){
2425
return new Promise((resolve, reject) => {
26+
if (ignoreSSL){
27+
AWS.config.update({
28+
httpOptions: {
29+
agent: new https.Agent({
30+
rejectUnauthorized: false
31+
})
32+
}
33+
});
34+
}
35+
2536
const spacesEndpoint = new AWS.Endpoint(endpoint);
2637
const s3 = new AWS.S3({
2738
endpoint: spacesEndpoint,

‎libs/asr-providers/digitalocean.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ module.exports = class DigitalOceanAsrProvider extends AbstractASRProvider{
3030
"accessKey": "CHANGEME!",
3131
"secretKey": "CHANGEME!",
3232
"endpoint": "CHANGEME!",
33-
"bucket": "CHANGEME!"
33+
"bucket": "CHANGEME!",
34+
"ignoreSSL": false
3435
},
3536

3637
"maxRuntime": -1,
@@ -61,11 +62,11 @@ module.exports = class DigitalOceanAsrProvider extends AbstractASRProvider{
6162
}
6263

6364
async initialize(){
64-
this.validateConfigKeys(["accessToken", "s3.accessKey", "s3.secretKey", "s3.endpoint", "s3.bucket"]);
65+
this.validateConfigKeys(["accessToken", "s3.accessKey", "s3.secretKey", "s3.endpoint", "s3.bucket", "s3.ignoreSSL"]);
6566

6667
// Test S3
67-
const { accessKey, secretKey, endpoint, bucket } = this.getConfig("s3");
68-
await S3.testBucket(accessKey, secretKey, endpoint, bucket);
68+
const { accessKey, secretKey, endpoint, bucket, ignoreSSL } = this.getConfig("s3");
69+
await S3.testBucket(accessKey, secretKey, endpoint, bucket, ignoreSSL);
6970

7071
const im = this.getConfig("imageSizeMapping", []);
7172
if (!Array.isArray(im)) throw new Error("Invalid config key imageSizeMapping (array expected)");
@@ -131,6 +132,7 @@ module.exports = class DigitalOceanAsrProvider extends AbstractASRProvider{
131132
`--s3_secret_key ${s3.secretKey}`,
132133
`--s3_endpoint ${s3.endpoint}`,
133134
`--s3_bucket ${s3.bucket}`,
135+
s3.ignoreSSL ? '--s3_ignore_ssl' : '',
134136
`--webhook ${webhook}`,
135137
`--token ${nodeToken}`].join(" "));
136138
}

‎libs/asr-providers/hetzner.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ module.exports = class HetznerAsrProvider extends AbstractASRProvider{
3030
"accessKey": "CHANGEME!",
3131
"secretKey": "CHANGEME!",
3232
"endpoint": "CHANGEME!",
33-
"bucket": "CHANGEME!"
33+
"bucket": "CHANGEME!",
34+
"ignoreSSL": false
3435
},
3536

3637
"maxRuntime": -1,
@@ -59,11 +60,11 @@ module.exports = class HetznerAsrProvider extends AbstractASRProvider{
5960
}
6061

6162
async initialize(){
62-
this.validateConfigKeys(["apiToken", "image", "s3.accessKey", "s3.secretKey", "s3.endpoint", "s3.bucket"]);
63+
this.validateConfigKeys(["apiToken", "image", "s3.accessKey", "s3.secretKey", "s3.endpoint", "s3.bucket", "s3.ignoreSSL"]);
6364

6465
// Test S3
65-
const { accessKey, secretKey, endpoint, bucket } = this.getConfig("s3");
66-
await S3.testBucket(accessKey, secretKey, endpoint, bucket);
66+
const { accessKey, secretKey, endpoint, bucket, ignoreSSL } = this.getConfig("s3");
67+
await S3.testBucket(accessKey, secretKey, endpoint, bucket, ignoreSSL);
6768

6869
const im = this.getConfig("imageSizeMapping", []);
6970
if (!Array.isArray(im)) throw new Error("Invalid config key imageSizeMapping (array expected)");
@@ -182,6 +183,7 @@ module.exports = class HetznerAsrProvider extends AbstractASRProvider{
182183
`--s3_secret_key ${s3.secretKey}`,
183184
`--s3_endpoint ${s3.endpoint}`,
184185
`--s3_bucket ${s3.bucket}`,
186+
s3.ignoreSSL ? '--s3_ignore_ssl' : '',
185187
`--webhook ${webhook}`,
186188
`--token ${nodeToken}`].join(" "));
187189
}

‎libs/asr-providers/scaleway.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ module.exports = class ScalewayAsrProvider extends AbstractASRProvider{
2929
"accessKey": "CHANGEME!",
3030
"secretKey": "CHANGEME!",
3131
"endpoint": "CHANGEME!",
32-
"bucket": "CHANGEME!"
32+
"bucket": "CHANGEME!",
33+
"ignoreSSL": false
3334
},
3435

3536
"maxRuntime": -1,
@@ -52,11 +53,11 @@ module.exports = class ScalewayAsrProvider extends AbstractASRProvider{
5253
}
5354

5455
async initialize(){
55-
this.validateConfigKeys(["organization", "secretToken", "s3.accessKey", "s3.secretKey", "s3.endpoint", "s3.bucket"]);
56+
this.validateConfigKeys(["organization", "secretToken", "s3.accessKey", "s3.secretKey", "s3.endpoint", "s3.bucket", "s3.ignoreSSL"]);
5657

5758
// Test S3
58-
const { accessKey, secretKey, endpoint, bucket } = this.getConfig("s3");
59-
await S3.testBucket(accessKey, secretKey, endpoint, bucket);
59+
const { accessKey, secretKey, endpoint, bucket, ignoreSSL } = this.getConfig("s3");
60+
await S3.testBucket(accessKey, secretKey, endpoint, bucket, ignoreSSL);
6061

6162
const im = this.getConfig("imageSizeMapping", []);
6263
if (!Array.isArray(im)) throw new Error("Invalid config key imageSizeMapping (array expected)");
@@ -114,6 +115,7 @@ module.exports = class ScalewayAsrProvider extends AbstractASRProvider{
114115
`--s3_secret_key ${s3.secretKey}`,
115116
`--s3_endpoint ${s3.endpoint}`,
116117
`--s3_bucket ${s3.bucket}`,
118+
s3.ignoreSSL ? '--s3_ignore_ssl' : '',
117119
`--webhook ${webhook}`,
118120
`--token ${nodeToken}`].join(" "));
119121
}

0 commit comments

Comments
 (0)