dxfl 0.5.2 → 0.5.5

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v0.5.4, v0.5.5
+
+- Fix bug when deploying compressed files in subdirectories (introduced in 0.5.0)
+
+# v0.5.3
+
+- Update @aws-sdk/client-s3 to include patch for CVE-2026-26278 (cleaning 0.5.1 and 0.5.2)
+
 # v0.5.2
 
 - Force fast-xml-parser version on package-lock

package/README.md

@@ -146,26 +146,26 @@ allowed_origins = "https://www.example.com"
 # Required parameter.
 
 # HTTP methods allowed in a cross-origin request (in response to a preflight request).
-allowed_method = "GET"
+allowed_methods = "GET"
 # Possible values:
-# - allowed_method = "*" : wild card to allow all methods (only GET/HEAD are currently supported by the server)
-# - allowed_method = "GET" : string of http method ("GET" or "HEAD")
-# - allowed_method = ["GET", "HEAD"] : array of string http methods
+# - allowed_methods = "*" : wild card to allow all methods (only GET/HEAD are currently supported by the server)
+# - allowed_methods = "GET" : string of http method ("GET" or "HEAD")
+# - allowed_methods = ["GET", "HEAD"] : array of string http methods
 # Optional parameter. Default value: ["GET", "HEAD"]
 
 # Request headers allowed in a preflight request.
-allowed_header = "Authorization"
+allowed_headers = "Authorization"
 # Possible values:
-# - allowed_header = "*" : wildcard to allow all headers
-# - allowed_header = "Authorization" : string of http header
-# - allowed_header = ["Authorization", "Age"] : array of string http header
+# - allowed_headers = "*" : wildcard to allow all headers
+# - allowed_headers = "Authorization" : string of http header
+# - allowed_headers = ["Authorization", "Age"] : array of string http header
 # Optional parameter. Default value : []
 
 # Response headers you want to make available to JavaScript in response to a cross-origin request.
-expose_header = "Content-Encoding"
+expose_headers = "Content-Encoding"
 # Possible values:
-# - expose_header = "Content-Encoding" : string of http header
-# - expose_header = ["Content-Encoding", "Kuma-Revision"] : array of string http header
+# - expose_headers = "Content-Encoding" : string of http header
+# - expose_headers = ["Content-Encoding", "Kuma-Revision"] : array of string http header
 # Optional Parameter. Default value : []
 ```
 

package/deuxfleurs.toml

@@ -0,0 +1,18 @@
+error_page = "error.html"
+
+# [[redirects]]
+# from = "TinyCorePure64-15.0.iso"
+# to = "/bbc"
+
+[[redirects]]
+from = "/a"
+to = "/def"
+
+[[cors]]
+allowed_origins = "foo"
+
+[[headers]]
+for = ["**/*.txt"]
+compress = "gzip"
+[headers.values]
+Cache-Control = "hello44"

package/dist/deploy.js

@@ -83,7 +83,10 @@ export function compressSelectedLocalFiles(localFiles, localCfg) {
             if (headers.compress) {
                 compressed = true;
                 if (headers.compress == "gzip") {
-                    const compressedPath = path.join(tmpDir, f.s3Path);
+                    // use the original file md5 as filename, this prevents conflicts
+                    // and is easier than reusing f.s3Path or f.localPath
+                    // (no need to create subdirectories or handle path delimiters portably)
+                    const compressedPath = path.join(tmpDir, f.md5);
                     yield gzipFile(localPath, compressedPath);
                     const [stat, compressedMd5] = yield Promise.all([
                         fs.promises.stat(compressedPath),

package/dist/deploy_websiteconfig.js

@@ -0,0 +1,108 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { PromisePool } from "@supercharge/promise-pool";
+import { GetBucketWebsiteCommand, HeadObjectCommand, } from "@aws-sdk/client-s3";
+export function getBucketWebsite(client, Bucket) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        const cmd = new GetBucketWebsiteCommand({ Bucket });
+        const response = yield client.send(cmd);
+        if (response.RedirectAllRequestsTo) {
+            // NB: garage does not currently support RedirectAllRequestsTo so this should never happen
+            throw `remote website configuration: RedirectAllRequestsTo is specified; \
+               this is currently unsupported by dxfl`;
+        }
+        const index_page = (_a = response.ErrorDocument) === null || _a === void 0 ? void 0 : _a.Key;
+        const error_page = (_b = response.IndexDocument) === null || _b === void 0 ? void 0 : _b.Suffix;
+        let redirects = [];
+        if (response.RoutingRules) {
+            for (const rule of response.RoutingRules) {
+                // If no Condition is specified, then the redirect always applies, which is equivalent
+                // to matching on an empty prefix
+                let prefix = "";
+                let if_error = undefined;
+                if (rule.Condition) {
+                    if (rule.Condition.HttpErrorCodeReturnedEquals) {
+                        if (rule.Condition.HttpErrorCodeReturnedEquals == "404") {
+                            if_error = 404;
+                        }
+                        else {
+                            // currently not supported by garage
+                            throw `remote website configuration: 'if_error' specified with a different \
+                               code than 404; this is currently unsupported by dxfl`;
+                        }
+                    }
+                    if (rule.Condition.KeyPrefixEquals) {
+                        prefix = rule.Condition.KeyPrefixEquals;
+                    }
+                }
+                const hostname = rule.Redirect.HostName;
+                const code = rule.Redirect.HttpRedirectCode
+                    ? parseInt(rule.Redirect.HttpRedirectCode)
+                    : undefined;
+                let protocol = undefined;
+                if (rule.Redirect.Protocol) {
+                    if (rule.Redirect.Protocol == "http" ||
+                        rule.Redirect.Protocol == "https") {
+                        protocol = rule.Redirect.Protocol;
+                    }
+                    else {
+                        // currently not supported by garage
+                        throw `remote website configuration: 'protocol' is neither http or https; \
+                           this is currently unsupported by dxfl`;
+                    }
+                }
+                let to;
+                if (rule.Redirect.ReplaceKeyPrefixWith) {
+                    to = {
+                        kind: "replace_prefix",
+                        prefix: rule.Redirect.ReplaceKeyPrefixWith,
+                    };
+                }
+                else if (rule.Redirect.ReplaceKeyWith) {
+                    to = { kind: "replace", target: rule.Redirect.ReplaceKeyWith };
+                }
+                else {
+                    // not completely sure whether this is the correct behavior, but it should
+                    // match garage's implementation
+                    to = { kind: "replace", target: "" };
+                }
+                redirects.push({
+                    kind: "bucket",
+                    r: { prefix, if_error, hostname, code, protocol, to },
+                });
+            }
+        }
+        return { index_page, error_page, redirects };
+    });
+}
+// XXX
+const MD5METAFIELD = "dfl-md5sum";
+export function getBucketFilesDetails(client, Bucket, files) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let res = new Map();
+        function doFile(file) {
+            return __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                const resp = yield client.send(new HeadObjectCommand({ Bucket, Key: file }));
+                if (resp.$metadata.httpStatusCode != 200) {
+                    // TODO: better error handling?
+                    throw resp;
+                }
+                res.set(file, {
+                    md5: (_a = resp.Metadata) === null || _a === void 0 ? void 0 : _a[MD5METAFIELD],
+                    redirect: resp.WebsiteRedirectLocation,
+                });
+            });
+        }
+        yield PromisePool.for(files).withConcurrency(50).process(doFile);
+        return res;
+    });
+}

package/dist/errors.js

@@ -0,0 +1,7 @@
+import { err } from "neverthrow";
+export function errMsg(msg) {
+    return err({ kind: "msg", msg });
+}
+export function errS3(resp) {
+    return err({ kind: "s3", resp: resp.$metadata });
+}

package/dist/index.js

@@ -6,7 +6,7 @@ import { deploy } from "./deploy.js";
 import { empty } from "./empty.js";
 import { vhostsList } from "./vhosts.js";
 import { inspect } from "./inspect.js";
-program.name("dxfl").description("Deuxfleurs CLI tool").version("0.5.2");
+program.name("dxfl").description("Deuxfleurs CLI tool").version("0.5.5");
 program
     .command("login")
     .description("Link your Deuxfleurs account with this tool.")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dxfl",
-  "version": "0.5.2",
+  "version": "0.5.5",
   "description": "",
   "license": "EUPL-1.2",
   "author": "Deuxfleurs Team <coucou@deuxfleurs.fr>",
@@ -23,7 +23,7 @@
     "prettier-check": "npx prettier . --check"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.1011.0",
+    "@aws-sdk/client-s3": "^3.1012.0",
     "@commander-js/extra-typings": "^14.0.0",
     "@supercharge/promise-pool": "^3.2.0",
     "@types/node": "^25.2.1",

package/public/TinyCorePure64-15.0.iso

@@ -0,0 +1 @@
+toto

package/public/d/b

@@ -0,0 +1,2 @@
+b
+foo

package/public/d/c

@@ -0,0 +1,2 @@
+c
+foo

package/public/d/dd/bla

@@ -0,0 +1 @@
+bla

package/public/d/dd/foo.txt

@@ -0,0 +1 @@
+test

package/public/def

@@ -0,0 +1,2 @@
+abc
+abc

package/public/error.html

@@ -0,0 +1 @@
+oops, 404 error!

package/public/index.html

@@ -0,0 +1 @@
+hello there! 花見 toto312

package/public/index.html~

@@ -0,0 +1 @@
+hello there! 花見 toto2

package/public/slt

@@ -0,0 +1 @@
+abc

package/public/toto.txt

@@ -0,0 +1 @@
+abc defuieu

package/public/toto2.txt

@@ -0,0 +1 @@
+abc

package/dist/_empty.js

@@ -1,64 +0,0 @@
-// // TODO: Refacto the codebase global before integrate this feature
-export {};
-// export async function empty(
-// 	vhost: string,
-// 	options: { dryRun: boolean | undefined },
-// ) {
-// 	const conf = await openApiConf();
-// 	// Get website info from guichet (bucket name and keys)
-// 	const api = new WebsiteApi(conf);
-// 	let vhostInfo = await api.getWebsite({ vhost }).catch(err => {
-// 		if (err.response.status == 404) {
-// 			console.error(`Error: website '${vhost}' does not exist`);
-// 		} else {
-// 			console.error(err);
-// 		}
-// 		process.exit(1);
-// 	});
-// 	// List the files currently stored in the bucket
-// 	// @FIXME this info could be returned by the guichet API
-// 	const s3client = new S3Client({
-// 		endpoint: "https://garage.deuxfleurs.fr",
-// 		region: "garage",
-// 		forcePathStyle: true,
-// 		credentials: {
-// 			accessKeyId: vhostInfo.accessKeyId!,
-// 			secretAccessKey: vhostInfo.secretAccessKey!,
-// 		},
-// 	});
-// 	const Bucket = vhostInfo.vhost!.name!;
-// 	const filesToDelete = [...(await getBucketFiles(s3client, Bucket))].map(
-// 		([name, { size }]) => ({
-// 			name,
-// 			size,
-// 		}),
-// 	);
-// 	for (const file of filesToDelete) {
-// 		process.stdout.write(`Deleting ${file.name}\n`);
-// 	}
-// 	// If not in dry-run mode, send the delete command
-// 	if (!options.dryRun) {
-// 		const resp = await deleteFiles(s3client, Bucket, filesToDelete);
-// 		if (resp && resp!.$metadata.httpStatusCode != 200) {
-// 			// TODO: better error handling?
-// 			console.error(resp);
-// 			process.exit(1);
-// 		}
-// 	}
-// 	// Display a summary
-// 	function sum(a: number[]) {
-// 		return a.reduce((x, y) => x + y, 0);
-// 	}
-// 	function formatFiles(n: number) {
-// 		if (n == 1) {
-// 			return `${n} file `;
-// 		} else {
-// 			return `${n} files`;
-// 		}
-// 	}
-// 	const sizeDeleted = sum(filesToDelete.map(f => f.size ?? 0));
-// 	process.stdout.write("\nSummary:\n");
-// 	process.stdout.write(
-// 		`${formatFiles(filesToDelete.length)} deleted (${formatBytes(sizeDeleted)})\n`,
-// 	);
-// }