Skip to content

Fix Linux bundled plugin cache permissions #1026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
psypeal wants to merge 1 commit into from
Closed

Fix Linux bundled plugin cache permissions #1026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions scripts/patch-linux-window-ui.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6888,7 +6888,7 @@ test("auto-installs the current Chrome plugin gate shape", () => {
assert.equal((patched.match(/installWhenMissing:!0,name:o\.s/g) || []).length, 0);
});

test("makes Linux bundled plugin staging writable after copying read-only resources", async () => {
test("makes Linux bundled plugin staging owner-writable without cooperative write bits", async () => {
const patched = applyPatchTwice(
applyLinuxBundledPluginCopyPermissionsPatch,
currentBundledPluginCopyBundleFixture(),
Expand All @@ -6897,21 +6897,29 @@ test("makes Linux bundled plugin staging writable after copying read-only resour
const sourcePlugin = path.join(root, "source-plugin");
const sourceManifestDir = path.join(sourcePlugin, ".codex-plugin");
const sourceManifest = path.join(sourceManifestDir, "plugin.json");
const sourceCooperativeFile = path.join(sourceManifestDir, "cooperative.txt");
const externalFile = path.join(root, "external-read-only-file");
const sourceLink = path.join(sourcePlugin, "external-link");
const targetPlugin = path.join(root, "target-plugin");
const targetManifest = path.join(targetPlugin, ".codex-plugin", "plugin.json");
const targetCooperativeFile = path.join(
targetPlugin,
".codex-plugin",
"cooperative.txt",
);
const targetLink = path.join(targetPlugin, "external-link");

try {
fs.mkdirSync(sourceManifestDir, { recursive: true });
fs.writeFileSync(sourceManifest, '{"name":"computer-use"}\n');
fs.writeFileSync(sourceCooperativeFile, "cooperative\n");
fs.writeFileSync(externalFile, "external\n");
fs.chmodSync(externalFile, 0o444);
fs.symlinkSync(externalFile, sourceLink);
fs.chmodSync(sourceManifest, 0o444);
fs.chmodSync(sourceManifestDir, 0o555);
fs.chmodSync(sourcePlugin, 0o555);
fs.chmodSync(sourceCooperativeFile, 0o664);
fs.chmodSync(sourceManifestDir, 0o775);
fs.chmodSync(sourcePlugin, 0o775);

const copyPlugin = new Function("process", "require", `${patched};return fl;`)(
{ platform: "linux" },
Expand All @@ -6923,6 +6931,9 @@ test("makes Linux bundled plugin staging writable after copying read-only resour
assert.match(patched, /async function codexLinuxMakeBundledPluginTreeWritable/);
assert.equal(fs.statSync(targetPlugin).mode & 0o200, 0o200);
assert.equal(fs.statSync(targetManifest).mode & 0o200, 0o200);
assert.equal(fs.statSync(targetPlugin).mode & 0o022, 0);
assert.equal(fs.statSync(targetManifest).mode & 0o022, 0);
assert.equal(fs.statSync(targetCooperativeFile).mode & 0o022, 0);
assert.equal(fs.lstatSync(targetLink).isSymbolicLink(), true);
assert.equal(fs.statSync(externalFile).mode & 0o200, 0);
} finally {
Expand Down
2 changes: 1 addition & 1 deletion scripts/patches/impl/main-process/browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function applyLinuxBundledPluginCopyPermissionsPatch(currentSource) {
}

const helper =
`async function ${helperName}(e,t){let n=await t.lstat(e);if(n.isSymbolicLink())return;await t.chmod(e,n.mode|128);if(n.isDirectory())for(let n of await t.readdir(e))await ${helperName}((0,${pathVar}.join)(e,n),t)}`;
`async function ${helperName}(e,t){let n=await t.lstat(e);if(n.isSymbolicLink())return;await t.chmod(e,(n.mode|128)&~18);if(n.isDirectory())for(let n of await t.readdir(e))await ${helperName}((0,${pathVar}.join)(e,n),t)}`;
const strictDirective = '"use strict";';
const helperInsertionIndex = currentSource.startsWith(strictDirective)
? strictDirective.length
Expand Down
Loading