Skip to content
Merged
Changes from all commits
Commits
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
15 changes: 13 additions & 2 deletions codex-rs/core/src/tools/js_repl/kernel.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

const { Buffer } = require("node:buffer");
const crypto = require("node:crypto");
const fs = require("node:fs");
const { builtinModules, createRequire } = require("node:module");
const { createInterface } = require("node:readline");
const { performance } = require("node:perf_hooks");
Expand Down Expand Up @@ -149,6 +150,14 @@ const moduleSearchBases = (() => {
const importResolveConditions = new Set(["node", "import"]);
const requireByBase = new Map();

function canonicalizePath(value) {
try {
return fs.realpathSync.native(value);
} catch {
return value;
}
}

function getRequireForBase(base) {
let req = requireByBase.get(base);
if (!req) {
Expand All @@ -165,8 +174,10 @@ function isModuleNotFoundError(err) {
}

function isWithinBaseNodeModules(base, resolvedPath) {
const nodeModulesRoot = path.resolve(base, "node_modules");
const relative = path.relative(nodeModulesRoot, resolvedPath);
const canonicalBase = canonicalizePath(base);
const canonicalResolved = canonicalizePath(resolvedPath);
const nodeModulesRoot = path.resolve(canonicalBase, "node_modules");
const relative = path.relative(nodeModulesRoot, canonicalResolved);
return (
relative !== "" && !relative.startsWith("..") && !path.isAbsolute(relative)
);
Expand Down
Loading