Fix escaping of embedded JSON

devcontainers · Dec 12, 2022 · 7b377a5 · 7b377a5
1 parent 93cb111
commit 7b377a5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/src/spec-node/dockerCompose.ts b/src/spec-node/dockerCompose.ts
@@ -541,7 +541,7 @@ while sleep 1 & wait $$!; do :; done", "-"${userEntrypoint.map(a => `, ${JSON.st
     security_opt:${securityOpts.map(securityOpt => `
       - ${securityOpt}`).join('')}` : ''}${additionalLabels.length ? `
     labels:${additionalLabels.map(label => `
-      - ${label.replace(/\$/g, '$$$$')}`).join('')}` : ''}${mounts.length ? `
+      - '${label.replace(/\$/g, '$$$$').replace(/'/g, '\'\'')}'`).join('')}` : ''}${mounts.length ? `
     volumes:${mounts.map(m => `
       - ${m.source}:${m.target}`).join('')}` : ''}${gpuResources}${volumeMounts.length ? `
 volumes:${volumeMounts.map(m => `

diff --git a/src/test/configs/compose-image-without-features-minimal/.devcontainer/devcontainer.json b/src/test/configs/compose-image-without-features-minimal/.devcontainer/devcontainer.json
@@ -4,6 +4,7 @@
 	"workspaceFolder": "/workspace",
 	"postCreateCommand": "touch /postCreateCommand.txt",
 	"remoteEnv": {
-		"TEST": "ENV"
+		"TEST": "ENV",
+		"TEST_ESCAPING": "{\n  \"fo$o\": \"ba'r\"\n}"
 	}
 }
diff --git a/src/test/configs/image/.devcontainer.json b/src/test/configs/image/.devcontainer.json
@@ -2,6 +2,8 @@
 	"image": "ubuntu:latest",
 	"postCreateCommand": "touch /postCreateCommand.txt",
 	"remoteEnv": {
+		"TEST": "ENV",
+		"TEST_ESCAPING": "{\n  \"fo$o\": \"ba'r\"\n}",
 		"LOCAL_PATH": "${localEnv:PATH}",
 		"CONTAINER_PATH": "${containerEnv:PATH}"
 	}

diff --git a/src/test/imageMetadata.test.ts b/src/test/imageMetadata.test.ts
@@ -156,6 +156,8 @@ describe('Image Metadata', function () {
 					const metadata = internalGetImageMetadata0(details, true, nullLog);
 					assert.strictEqual(metadata.length, 1);
 					assert.ok(metadata[0].remoteEnv);
+					assert.strictEqual(metadata[0].remoteEnv.TEST, 'ENV');
+					assert.strictEqual(metadata[0].remoteEnv.TEST_ESCAPING, '{\n  "fo$o": "ba\'r"\n}');
 					await shellExec(`docker exec ${response.containerId} test -f /postCreateCommand.txt`);
 					await shellExec(`docker rm -f ${response.containerId}`);
 				});