@webda/aws 2.4.2 → 3.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +50 -0
- package/lib/deployers/cloudformation.js +17 -7
- package/lib/deployers/cloudformation.js.map +1 -1
- package/lib/deployers/cloudformation.spec.js +42 -8
- package/lib/deployers/cloudformation.spec.js.map +1 -1
- package/lib/deployers/index.js +11 -6
- package/lib/deployers/index.js.map +1 -1
- package/lib/deployers/index.spec.js +42 -11
- package/lib/deployers/index.spec.js.map +1 -1
- package/lib/deployers/lambdapackager.spec.js +5 -1
- package/lib/deployers/lambdapackager.spec.js.map +1 -1
- package/lib/services/dynamodb.d.ts +5 -2
- package/lib/services/dynamodb.js +24 -13
- package/lib/services/dynamodb.js.map +1 -1
- package/lib/services/dynamodb.spec.js +9 -9
- package/lib/services/dynamodb.spec.js.map +1 -1
- package/lib/services/lambdacaller.spec.js +6 -2
- package/lib/services/lambdacaller.spec.js.map +1 -1
- package/lib/services/lambdaserver.js +13 -5
- package/lib/services/lambdaserver.js.map +1 -1
- package/lib/services/lambdaserver.spec.js +47 -11
- package/lib/services/lambdaserver.spec.js.map +1 -1
- package/lib/services/route53.spec.js +9 -2
- package/lib/services/route53.spec.js.map +1 -1
- package/lib/services/s3binary.d.ts +8 -5
- package/lib/services/s3binary.js +40 -18
- package/lib/services/s3binary.js.map +1 -1
- package/lib/services/s3binary.spec.js +5 -3
- package/lib/services/s3binary.spec.js.map +1 -1
- package/lib/services/sqsqueue.js +5 -2
- package/lib/services/sqsqueue.js.map +1 -1
- package/lib/services/sqsqueue.spec.js +5 -5
- package/package.json +13 -8
- package/webda.module.json +93 -65
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Core as Webda, HttpContext } from "@webda/core";
|
|
1
|
+
import { Core as Webda, HttpContext, WebdaError } from "@webda/core";
|
|
2
2
|
import { serialize as cookieSerialize } from "cookie";
|
|
3
3
|
/**
|
|
4
4
|
* The Lambda entrypoint for Webda
|
|
@@ -159,7 +159,7 @@ export default class LambdaServer extends Webda {
|
|
|
159
159
|
httpContext.setBody(event.body);
|
|
160
160
|
}
|
|
161
161
|
this.computePrefix(event, httpContext);
|
|
162
|
-
let ctx = await this.
|
|
162
|
+
let ctx = await this.newWebContext(httpContext);
|
|
163
163
|
// TODO Get all client info
|
|
164
164
|
// event['requestContext']['identity']['sourceIp']
|
|
165
165
|
// Debug mode
|
|
@@ -167,11 +167,10 @@ export default class LambdaServer extends Webda {
|
|
|
167
167
|
if (this.getConfiguration().parameters.lambdaRequestHeader) {
|
|
168
168
|
ctx.setHeader(this.getConfiguration().parameters.lambdaRequestHeader, context.awsRequestId);
|
|
169
169
|
}
|
|
170
|
-
|
|
171
|
-
let origin = headers.Origin || headers.origin || headers.Referer || headers.referer;
|
|
170
|
+
let origin = headers.Origin || headers.origin;
|
|
172
171
|
try {
|
|
173
172
|
// Set predefined headers for CORS
|
|
174
|
-
if (await this.checkCORSRequest(ctx)) {
|
|
173
|
+
if (!origin || (await this.checkCORSRequest(ctx))) {
|
|
175
174
|
if (origin) {
|
|
176
175
|
ctx.setHeader("Access-Control-Allow-Origin", origin);
|
|
177
176
|
}
|
|
@@ -193,6 +192,11 @@ export default class LambdaServer extends Webda {
|
|
|
193
192
|
ctx.statusCode = err;
|
|
194
193
|
return this.handleLambdaReturn(ctx);
|
|
195
194
|
}
|
|
195
|
+
else if (err instanceof WebdaError.HttpError) {
|
|
196
|
+
ctx.statusCode = err.getResponseCode();
|
|
197
|
+
this.log("TRACE", `${err.getResponseCode()}: ${err.message}`);
|
|
198
|
+
return this.handleLambdaReturn(ctx);
|
|
199
|
+
}
|
|
196
200
|
throw err;
|
|
197
201
|
}
|
|
198
202
|
if (protocol === "https") {
|
|
@@ -228,6 +232,10 @@ export default class LambdaServer extends Webda {
|
|
|
228
232
|
if (typeof err === "number") {
|
|
229
233
|
ctx.statusCode = err;
|
|
230
234
|
}
|
|
235
|
+
else if (err instanceof WebdaError.HttpError) {
|
|
236
|
+
this.log("DEBUG", "Sending error", err.message);
|
|
237
|
+
ctx.statusCode = err.getResponseCode();
|
|
238
|
+
}
|
|
231
239
|
else {
|
|
232
240
|
this.log("ERROR", err);
|
|
233
241
|
ctx.statusCode = 500;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lambdaserver.js","sourceRoot":"","sources":["../../src/services/lambdaserver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,KAAK,EAAE,WAAW,EAA8B,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"lambdaserver.js","sourceRoot":"","sources":["../../src/services/lambdaserver.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
5
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
6
|
};
|
|
7
7
|
import { suite, test } from "@testdeck/mocha";
|
|
8
|
-
import { Bean, getCommonJS, HttpContext, Route, Service } from "@webda/core";
|
|
8
|
+
import { Bean, getCommonJS, HttpContext, Route, Service, WebdaError } from "@webda/core";
|
|
9
9
|
import { TestApplication } from "@webda/core/lib/test.js";
|
|
10
10
|
import * as assert from "assert";
|
|
11
11
|
import * as fs from "fs";
|
|
@@ -19,7 +19,10 @@ let ExceptionExecutor = class ExceptionExecutor extends Service {
|
|
|
19
19
|
this.addRoute("/route/string", ["GET"], this.onString);
|
|
20
20
|
}
|
|
21
21
|
async _brokenRoute(ctx) {
|
|
22
|
-
if (ctx.parameters.type === "
|
|
22
|
+
if (ctx.parameters.type === "unauthorized") {
|
|
23
|
+
throw new WebdaError.Unauthorized("OnPurpose");
|
|
24
|
+
}
|
|
25
|
+
else if (ctx.parameters.type === "401") {
|
|
23
26
|
throw 401;
|
|
24
27
|
}
|
|
25
28
|
else if (ctx.parameters.type === "Error") {
|
|
@@ -40,7 +43,7 @@ __decorate([
|
|
|
40
43
|
Route("/route/string{?test}")
|
|
41
44
|
], ExceptionExecutor.prototype, "onString", null);
|
|
42
45
|
__decorate([
|
|
43
|
-
Route("/route/param/{uuid}{?test}")
|
|
46
|
+
Route("/route/param/{uuid}{?test?}")
|
|
44
47
|
], ExceptionExecutor.prototype, "onParamString", null);
|
|
45
48
|
ExceptionExecutor = __decorate([
|
|
46
49
|
Bean
|
|
@@ -54,7 +57,7 @@ let LambdaHandlerTest = class LambdaHandlerTest extends WebdaAwsTest {
|
|
|
54
57
|
async before() {
|
|
55
58
|
await checkLocalStack();
|
|
56
59
|
let app = new TestApplication(this.getTestConfiguration());
|
|
57
|
-
app.addService("
|
|
60
|
+
app.addService("Test/AWSEvents", (await import("../../test/moddas/awsevents.js")).AWSEventsHandler);
|
|
58
61
|
await app.load();
|
|
59
62
|
this.webda = this.handler = new LambdaServer(app);
|
|
60
63
|
await this.webda.init();
|
|
@@ -77,12 +80,25 @@ let LambdaHandlerTest = class LambdaHandlerTest extends WebdaAwsTest {
|
|
|
77
80
|
};
|
|
78
81
|
this.debugMailer = this.handler.getService("DebugMailer");
|
|
79
82
|
}
|
|
80
|
-
async
|
|
83
|
+
async checkRequestNoRequestFilter() {
|
|
84
|
+
await this.handler.init();
|
|
85
|
+
// @ts-ignore
|
|
86
|
+
this.handler._requestFilters = [];
|
|
87
|
+
this.ensureGoodCSRF();
|
|
88
|
+
this.evt.queryStringParameters = { test: "Plop" };
|
|
89
|
+
let res = await this.handler.handleRequest(this.evt, this.context);
|
|
90
|
+
// No filter return ok now
|
|
91
|
+
assert.strictEqual(res.statusCode, 200);
|
|
92
|
+
}
|
|
93
|
+
async checkRequestRefusedRequest() {
|
|
81
94
|
await this.handler.init();
|
|
82
95
|
// @ts-ignore
|
|
83
96
|
this.handler._requestFilters = [];
|
|
84
97
|
this.ensureGoodCSRF();
|
|
85
98
|
this.evt.queryStringParameters = { test: "Plop" };
|
|
99
|
+
this.handler.registerRequestFilter({
|
|
100
|
+
checkRequest: async () => false
|
|
101
|
+
});
|
|
86
102
|
let res = await this.handler.handleRequest(this.evt, this.context);
|
|
87
103
|
assert.strictEqual(res.statusCode, 403);
|
|
88
104
|
}
|
|
@@ -120,7 +136,10 @@ let LambdaHandlerTest = class LambdaHandlerTest extends WebdaAwsTest {
|
|
|
120
136
|
async handleRequestIdHeader() {
|
|
121
137
|
this.ensureGoodCSRF();
|
|
122
138
|
this.handler.getConfiguration().parameters.lambdaRequestHeader = "x-webda-request-id";
|
|
123
|
-
let res = await this.handler.handleRequest(this.evt, {
|
|
139
|
+
let res = await this.handler.handleRequest(this.evt, {
|
|
140
|
+
...this.context,
|
|
141
|
+
awsRequestId: "toto"
|
|
142
|
+
});
|
|
124
143
|
assert.strictEqual(res.body, "CodeCoverage");
|
|
125
144
|
assert.strictEqual(res.headers["x-webda-request-id"], "toto");
|
|
126
145
|
}
|
|
@@ -161,6 +180,10 @@ let LambdaHandlerTest = class LambdaHandlerTest extends WebdaAwsTest {
|
|
|
161
180
|
this.evt.resource = "/route/broken/401";
|
|
162
181
|
let res = await this.handler.handleRequest(this.evt, this.context);
|
|
163
182
|
assert.strictEqual(res.statusCode, 401);
|
|
183
|
+
this.evt.path = "/route/broken/unauthorized";
|
|
184
|
+
this.evt.resource = "/route/broken/unauthorized";
|
|
185
|
+
res = await this.handler.handleRequest(this.evt, this.context);
|
|
186
|
+
assert.strictEqual(res.statusCode, 401);
|
|
164
187
|
}
|
|
165
188
|
async handleRequestThrowError() {
|
|
166
189
|
this.ensureGoodCSRF();
|
|
@@ -225,14 +248,18 @@ let LambdaHandlerTest = class LambdaHandlerTest extends WebdaAwsTest {
|
|
|
225
248
|
async handleRequestRefererCSRF() {
|
|
226
249
|
this.evt.headers.Referer = "https://test3.webda.io";
|
|
227
250
|
this.evt.headers.Host = "test3.webda.io";
|
|
251
|
+
this.evt.headers.origin = "test3.webda.io";
|
|
228
252
|
let res = await this.handler.handleRequest(this.evt, this.context);
|
|
229
253
|
assert.strictEqual(res.statusCode, 401);
|
|
230
254
|
}
|
|
231
|
-
async
|
|
255
|
+
async handleRequestRefererNoCORS() {
|
|
256
|
+
// No more fallback on referer for CORS
|
|
257
|
+
// BUt request should be served as no CORS is requested (lack of Origin)
|
|
232
258
|
this.evt.headers.Referer = "https://test.webda.io";
|
|
233
259
|
this.evt.headers.Host = "test.webda.io";
|
|
234
260
|
let res = await this.handler.handleRequest(this.evt, this.context);
|
|
235
|
-
assert.strictEqual(res.headers["Access-Control-Allow-Origin"],
|
|
261
|
+
assert.strictEqual(res.headers["Access-Control-Allow-Origin"], undefined);
|
|
262
|
+
assert.strictEqual(res.statusCode, 200);
|
|
236
263
|
}
|
|
237
264
|
async handleRequestHardStopCheckRequest() {
|
|
238
265
|
this.evt.headers.Referer = "https://test.webda.io";
|
|
@@ -242,15 +269,21 @@ let LambdaHandlerTest = class LambdaHandlerTest extends WebdaAwsTest {
|
|
|
242
269
|
assert.strictEqual(res.statusCode, 410);
|
|
243
270
|
this.badCheck = true;
|
|
244
271
|
await assert.rejects(() => this.handler.handleRequest(this.evt, this.context), /Unknown/);
|
|
272
|
+
this.newExcept = true;
|
|
273
|
+
res = await this.handler.handleRequest(this.evt, this.context);
|
|
274
|
+
assert.strictEqual(res.statusCode, 429);
|
|
245
275
|
}
|
|
246
276
|
async checkRequest() {
|
|
277
|
+
if (this.newExcept) {
|
|
278
|
+
throw new WebdaError.TooManyRequests("Too many requests");
|
|
279
|
+
}
|
|
247
280
|
if (this.badCheck) {
|
|
248
281
|
throw new Error("Unknown");
|
|
249
282
|
}
|
|
250
283
|
throw 410;
|
|
251
284
|
}
|
|
252
285
|
ensureGoodCSRF() {
|
|
253
|
-
this.evt.headers.
|
|
286
|
+
this.evt.headers.Origin = "https://test.webda.io";
|
|
254
287
|
this.evt.headers.Host = "test.webda.io";
|
|
255
288
|
}
|
|
256
289
|
async awsEvents() {
|
|
@@ -288,7 +321,10 @@ let LambdaHandlerTest = class LambdaHandlerTest extends WebdaAwsTest {
|
|
|
288
321
|
};
|
|
289
322
|
__decorate([
|
|
290
323
|
test
|
|
291
|
-
], LambdaHandlerTest.prototype, "
|
|
324
|
+
], LambdaHandlerTest.prototype, "checkRequestNoRequestFilter", null);
|
|
325
|
+
__decorate([
|
|
326
|
+
test
|
|
327
|
+
], LambdaHandlerTest.prototype, "checkRequestRefusedRequest", null);
|
|
292
328
|
__decorate([
|
|
293
329
|
test
|
|
294
330
|
], LambdaHandlerTest.prototype, "handleRequestCustomLaunch", null);
|
|
@@ -345,7 +381,7 @@ __decorate([
|
|
|
345
381
|
], LambdaHandlerTest.prototype, "handleRequestRefererCSRF", null);
|
|
346
382
|
__decorate([
|
|
347
383
|
test
|
|
348
|
-
], LambdaHandlerTest.prototype, "
|
|
384
|
+
], LambdaHandlerTest.prototype, "handleRequestRefererNoCORS", null);
|
|
349
385
|
__decorate([
|
|
350
386
|
test
|
|
351
387
|
], LambdaHandlerTest.prototype, "handleRequestHardStopCheckRequest", null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lambdaserver.spec.js","sourceRoot":"","sources":["../../src/services/lambdaserver.spec.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"lambdaserver.spec.js","sourceRoot":"","sources":["../../src/services/lambdaserver.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,8 +46,15 @@ let Route53Test = class Route53Test {
|
|
|
46
46
|
return { Id: "myZone", Name: "webda.io.", CallerReference: "" };
|
|
47
47
|
});
|
|
48
48
|
await Route53Service.createDNSEntry("test.com", "A", "1.1.1.1");
|
|
49
|
-
await Route53Service.shell(undefined, {
|
|
50
|
-
|
|
49
|
+
await Route53Service.shell(undefined, {
|
|
50
|
+
_: ["export"],
|
|
51
|
+
domain: "webda.io",
|
|
52
|
+
file: "./myzone.json"
|
|
53
|
+
});
|
|
54
|
+
await Route53Service.shell(undefined, {
|
|
55
|
+
_: ["import"],
|
|
56
|
+
file: "./test/zone-export.json"
|
|
57
|
+
});
|
|
51
58
|
spyChanges.callsFake(() => {
|
|
52
59
|
throw new Error("Cannot do this");
|
|
53
60
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route53.spec.js","sourceRoot":"","sources":["../../src/services/route53.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,+BAA+B,EAAE,6BAA6B,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnH,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAG3C,IAAM,WAAW,GAAjB,MAAM,WAAW;IAET,AAAN,KAAK,CAAC,YAAY;QAChB,OAAO;QACP,IAAI,QAAQ,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE;YAC/C,IAAI,QAAQ,CAAC,SAAS,IAAI,CAAC,EAAE;gBAC3B,OAAO;oBACL,kBAAkB,EAAE,SAAS,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC,OAAO;oBACzE,WAAW,EAAE,IAAI;oBACjB,oBAAoB,EAAE,MAAM;iBAC7B,CAAC;aACH;iBAAM;gBACL,OAAO;oBACL,kBAAkB,EAAE,EAAE;oBACtB,WAAW,EAAE,KAAK;iBACnB,CAAC;aACH;QACH,CAAC,CAAC,CAAC;QACH,IAAI,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC3C,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC;aAC7B,EAAE,CAAC,6BAA6B,CAAC;aACjC,SAAS,CAAC,QAAQ,CAAC;aACnB,EAAE,CAAC,+BAA+B,CAAC;aACnC,SAAS,CAAC,UAAU,CAAC,CAAC;QACzB,IAAI;YACF,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,sBAAsB,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE;gBAC3E,OAAO,SAAS,CAAC;YACnB,CAAC,CAAC,CAAC;YACH,MAAM,MAAM,CAAC,OAAO,CAClB,GAAG,EAAE,CAAC,cAAc,CAAC,cAAc,CAAC,UAAU,EAAE,GAAG,EAAE,SAAS,CAAC,EAC/D,2CAA2C,CAC5C,CAAC;YACF,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,2CAA2C,CAAC,CAAC;YAC/G,MAAM,MAAM,CAAC,OAAO,CAClB,GAAG,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,yBAAyB,EAAE,SAAS,CAAC,EACjE,2CAA2C,CAC5C,CAAC;YAEF,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE;gBACxB,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC;YAClE,CAAC,CAAC,CAAC;YAEH,MAAM,cAAc,CAAC,cAAc,CAAC,UAAU,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;YAEhE,MAAM,cAAc,CAAC,KAAK,CAAC,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"route53.spec.js","sourceRoot":"","sources":["../../src/services/route53.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
/// <reference types="node" />
|
|
4
4
|
import { HeadObjectCommandOutput, S3 } from "@aws-sdk/client-s3";
|
|
5
|
-
import { BinaryFile, BinaryMap, BinaryParameters, CloudBinary,
|
|
5
|
+
import { BinaryFile, BinaryMap, BinaryParameters, CloudBinary, CoreModel, OperationContext, WebContext } from "@webda/core";
|
|
6
6
|
import { Readable } from "stream";
|
|
7
7
|
import CloudFormationDeployer from "../deployers/cloudformation.js";
|
|
8
8
|
import { CloudFormationContributor } from "./index.js";
|
|
@@ -63,14 +63,17 @@ export default class S3Binary<T extends S3BinaryParameters = S3BinaryParameters>
|
|
|
63
63
|
/**
|
|
64
64
|
* @inheritdoc
|
|
65
65
|
*/
|
|
66
|
-
putRedirectUrl(ctx:
|
|
66
|
+
putRedirectUrl(ctx: WebContext): Promise<{
|
|
67
67
|
url: string;
|
|
68
68
|
method: string;
|
|
69
|
+
headers: {
|
|
70
|
+
[key: string]: string;
|
|
71
|
+
};
|
|
69
72
|
}>;
|
|
70
73
|
/**
|
|
71
74
|
* @inheritdoc
|
|
72
75
|
*/
|
|
73
|
-
putMarker(hash:
|
|
76
|
+
putMarker(hash: string, suffix: string, storeName: string): Promise<import("@aws-sdk/client-s3").PutObjectCommandOutput>;
|
|
74
77
|
/**
|
|
75
78
|
* Return a signed url to an object
|
|
76
79
|
*
|
|
@@ -83,7 +86,7 @@ export default class S3Binary<T extends S3BinaryParameters = S3BinaryParameters>
|
|
|
83
86
|
/**
|
|
84
87
|
* @override
|
|
85
88
|
*/
|
|
86
|
-
getSignedUrlFromMap(binaryMap: BinaryMap, expire: number, _context:
|
|
89
|
+
getSignedUrlFromMap(binaryMap: BinaryMap, expire: number, _context: OperationContext): Promise<string>;
|
|
87
90
|
/**
|
|
88
91
|
* @override
|
|
89
92
|
*/
|
|
@@ -105,7 +108,7 @@ export default class S3Binary<T extends S3BinaryParameters = S3BinaryParameters>
|
|
|
105
108
|
/**
|
|
106
109
|
* @inheritdoc
|
|
107
110
|
*/
|
|
108
|
-
_cleanUsage(hash: string, uuid: string): Promise<void>;
|
|
111
|
+
_cleanUsage(hash: string, uuid: string, attribute?: string): Promise<void>;
|
|
109
112
|
/**
|
|
110
113
|
* @inheritdoc
|
|
111
114
|
*/
|
package/lib/services/s3binary.js
CHANGED
|
@@ -8,7 +8,7 @@ export class S3BinaryParameters extends AWSServiceParameters(BinaryParameters) {
|
|
|
8
8
|
constructor(params, service) {
|
|
9
9
|
super(params, service);
|
|
10
10
|
if (!this.bucket) {
|
|
11
|
-
throw new WebdaError("S3BUCKET_PARAMETER_REQUIRED", "Need to define a bucket at least");
|
|
11
|
+
throw new WebdaError.CodeError("S3BUCKET_PARAMETER_REQUIRED", "Need to define a bucket at least");
|
|
12
12
|
}
|
|
13
13
|
this.forcePathStyle ?? (this.forcePathStyle = false);
|
|
14
14
|
this.prefix = "";
|
|
@@ -54,11 +54,9 @@ export default class S3Binary extends CloudBinary {
|
|
|
54
54
|
*/
|
|
55
55
|
async putRedirectUrl(ctx) {
|
|
56
56
|
let body = await ctx.getRequestBody();
|
|
57
|
-
|
|
58
|
-
let store = ctx.parameter("store");
|
|
59
|
-
let property = ctx.parameter("property");
|
|
57
|
+
const { uuid, store, property } = ctx.getParameters();
|
|
60
58
|
let targetStore = this._verifyMapAndStore(ctx);
|
|
61
|
-
let object = await targetStore.get(
|
|
59
|
+
let object = await targetStore.get(uuid);
|
|
62
60
|
let base64String = Buffer.from(body.hash, "hex").toString("base64");
|
|
63
61
|
let params = {
|
|
64
62
|
Bucket: this.parameters.bucket,
|
|
@@ -77,16 +75,24 @@ export default class S3Binary extends CloudBinary {
|
|
|
77
75
|
for (let i in data.Contents) {
|
|
78
76
|
if (data.Contents[i].Key.endsWith("data"))
|
|
79
77
|
foundData = true;
|
|
80
|
-
if (data.Contents[i].Key.endsWith(
|
|
78
|
+
if (data.Contents[i].Key.endsWith(`${property}_${uuid}`))
|
|
81
79
|
foundMap = true;
|
|
82
80
|
if (data.Contents[i].Key.split("/").pop().startsWith("challenge_")) {
|
|
83
81
|
challenge = data.Contents[i].Key.split("/").pop().substring("challenge_".length);
|
|
84
82
|
}
|
|
85
83
|
}
|
|
84
|
+
const headers = {
|
|
85
|
+
"Content-MD5": base64String,
|
|
86
|
+
"Content-Type": "application/octet-stream"
|
|
87
|
+
};
|
|
86
88
|
if (foundMap) {
|
|
87
89
|
if (foundData)
|
|
88
90
|
return;
|
|
89
|
-
return {
|
|
91
|
+
return {
|
|
92
|
+
url: await this.getSignedUrl(params.Key, "putObject", params),
|
|
93
|
+
method: "PUT",
|
|
94
|
+
headers
|
|
95
|
+
};
|
|
90
96
|
}
|
|
91
97
|
if (foundData) {
|
|
92
98
|
if (challenge) {
|
|
@@ -102,17 +108,21 @@ export default class S3Binary extends CloudBinary {
|
|
|
102
108
|
await this.putMarker(body.hash, `challenge_${body.challenge}`, "challenge");
|
|
103
109
|
}
|
|
104
110
|
await this.uploadSuccess(object, property, body);
|
|
105
|
-
await this.putMarker(body.hash,
|
|
106
|
-
return {
|
|
111
|
+
await this.putMarker(body.hash, `${property}_${uuid}`, store);
|
|
112
|
+
return {
|
|
113
|
+
url: await this.getSignedUrl(params.Key, "putObject", params),
|
|
114
|
+
method: "PUT",
|
|
115
|
+
headers
|
|
116
|
+
};
|
|
107
117
|
}
|
|
108
118
|
/**
|
|
109
119
|
* @inheritdoc
|
|
110
120
|
*/
|
|
111
|
-
putMarker(hash,
|
|
121
|
+
putMarker(hash, suffix, storeName) {
|
|
112
122
|
let s3obj = new S3(this.parameters);
|
|
113
123
|
return s3obj.putObject({
|
|
114
124
|
Bucket: this.parameters.bucket,
|
|
115
|
-
Key: this._getKey(hash,
|
|
125
|
+
Key: this._getKey(hash, suffix),
|
|
116
126
|
Metadata: {
|
|
117
127
|
"x-amz-meta-store": storeName
|
|
118
128
|
}
|
|
@@ -187,26 +197,35 @@ export default class S3Binary extends CloudBinary {
|
|
|
187
197
|
Bucket: this.parameters.bucket,
|
|
188
198
|
Prefix: this._getKey(hash, "")
|
|
189
199
|
});
|
|
200
|
+
data.Contents ?? (data.Contents = []);
|
|
190
201
|
return data.Contents.filter(k => !(k.Key.includes("data") || k.Key.includes("challenge"))).length;
|
|
191
202
|
}
|
|
192
203
|
/**
|
|
193
204
|
* @inheritdoc
|
|
194
205
|
*/
|
|
195
206
|
async _cleanHash(hash) {
|
|
196
|
-
let files = (await this._s3.listObjectsV2({
|
|
197
|
-
.
|
|
198
|
-
|
|
207
|
+
let files = (await this._s3.listObjectsV2({
|
|
208
|
+
Bucket: this.parameters.bucket,
|
|
209
|
+
Prefix: this._getKey(hash, "")
|
|
210
|
+
})).Contents;
|
|
211
|
+
await bluebird.map(files, file => this._s3.deleteObject({
|
|
212
|
+
Bucket: this.parameters.bucket,
|
|
213
|
+
Key: file.Key
|
|
214
|
+
}), {
|
|
199
215
|
concurrency: 5
|
|
200
216
|
});
|
|
201
217
|
}
|
|
202
218
|
/**
|
|
203
219
|
* @inheritdoc
|
|
204
220
|
*/
|
|
205
|
-
async _cleanUsage(hash, uuid) {
|
|
221
|
+
async _cleanUsage(hash, uuid, attribute) {
|
|
222
|
+
if (!attribute) {
|
|
223
|
+
return this._cleanHash(hash);
|
|
224
|
+
}
|
|
206
225
|
// Dont clean data for now
|
|
207
226
|
let params = {
|
|
208
227
|
Bucket: this.parameters.bucket,
|
|
209
|
-
Key: this._getKey(hash, uuid)
|
|
228
|
+
Key: this._getKey(hash, `${attribute}_${uuid}`)
|
|
210
229
|
};
|
|
211
230
|
await this._s3.deleteObject(params);
|
|
212
231
|
}
|
|
@@ -215,7 +234,10 @@ export default class S3Binary extends CloudBinary {
|
|
|
215
234
|
*/
|
|
216
235
|
async _exists(hash) {
|
|
217
236
|
try {
|
|
218
|
-
await this._s3.headObject({
|
|
237
|
+
await this._s3.headObject({
|
|
238
|
+
Bucket: this.parameters.bucket,
|
|
239
|
+
Key: this._getKey(hash)
|
|
240
|
+
});
|
|
219
241
|
return true;
|
|
220
242
|
}
|
|
221
243
|
catch (err) {
|
|
@@ -320,7 +342,7 @@ export default class S3Binary extends CloudBinary {
|
|
|
320
342
|
}
|
|
321
343
|
// Set challenge aside for now
|
|
322
344
|
await this.putMarker(file.hash, `challenge_${file.challenge}`, "challenge");
|
|
323
|
-
await this.putMarker(file.hash, object.getUuid()
|
|
345
|
+
await this.putMarker(file.hash, `${property}_${object.getUuid()}`, object.getStore().getName());
|
|
324
346
|
await this.uploadSuccess(object, property, file);
|
|
325
347
|
}
|
|
326
348
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"s3binary.js","sourceRoot":"","sources":["../../src/services/s3binary.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"s3binary.js","sourceRoot":"","sources":["../../src/services/s3binary.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
6
6
|
};
|
|
7
7
|
import { HeadObjectCommand, ListObjectsV2Command, S3 } from "@aws-sdk/client-s3";
|
|
8
8
|
import { suite, test } from "@testdeck/mocha";
|
|
9
|
-
import {
|
|
9
|
+
import { BinaryService, getCommonJS } from "@webda/core";
|
|
10
10
|
import { BinaryTest } from "@webda/core/lib/services/binary.spec.js";
|
|
11
11
|
import * as assert from "assert";
|
|
12
12
|
import { mockClient } from "aws-sdk-client-mock";
|
|
@@ -139,7 +139,9 @@ let S3BinaryTest = class S3BinaryTest extends BinaryTest {
|
|
|
139
139
|
}
|
|
140
140
|
async signedUrl() {
|
|
141
141
|
let urls = [
|
|
142
|
-
this.getBinary().getSignedUrl("plop/test", "putObject", {
|
|
142
|
+
this.getBinary().getSignedUrl("plop/test", "putObject", {
|
|
143
|
+
Bucket: "myBuck"
|
|
144
|
+
}),
|
|
143
145
|
this.getBinary().getSignedUrl("plop/test")
|
|
144
146
|
];
|
|
145
147
|
(await Promise.all(urls)).forEach(url => {
|
|
@@ -150,7 +152,7 @@ let S3BinaryTest = class S3BinaryTest extends BinaryTest {
|
|
|
150
152
|
assert.ok(!(await this.getBinary()._exists("bouzouf")));
|
|
151
153
|
await this.getBinary().putObject(this.getBinary()._getKey("bouzouf"), "plop");
|
|
152
154
|
assert.ok(await this.getBinary()._exists("bouzouf"));
|
|
153
|
-
assert.strictEqual((await
|
|
155
|
+
assert.strictEqual((await BinaryService.streamToBuffer(await this.getBinary().getObject(this.getBinary()._getKey("bouzouf")))).toString("utf8"), "plop");
|
|
154
156
|
assert.notStrictEqual(await this.getBinary().exists(this.getBinary()._getKey("bouzouf")), null);
|
|
155
157
|
assert.strictEqual(await this.getBinary().exists(this.getBinary()._getKey("bouzouf2")), null);
|
|
156
158
|
}
|