fix: insecure tmp path (#33)

Fixes #13
This commit is contained in:
Morten Olsen
2024-01-14 13:00:17 +01:00
committed by GitHub
parent 7436b3439c
commit 028b65587e
5 changed files with 15 additions and 5 deletions

View File

@@ -4,6 +4,7 @@ import { run as runLoad } from '@morten-olsen/mini-loader-runner';
import { bundle } from '../../bundler/bundler.js'; import { bundle } from '../../bundler/bundler.js';
import { step } from '../../utils/step.js'; import { step } from '../../utils/step.js';
import { readSecrets } from './local.utils.js'; import { readSecrets } from './local.utils.js';
import { Config } from '../../config/config.js';
const run = new Command('run'); const run = new Command('run');
@@ -12,6 +13,7 @@ run
.argument('script') .argument('script')
.action(async (script) => { .action(async (script) => {
const location = resolve(script); const location = resolve(script);
const config = new Config();
const { autoInstall } = run.opts(); const { autoInstall } = run.opts();
const secrets = await readSecrets(); const secrets = await readSecrets();
@@ -21,6 +23,7 @@ run
const { promise, emitter } = await runLoad({ const { promise, emitter } = await runLoad({
script: code, script: code,
secrets, secrets,
cacheLocation: config.cacheLocation,
}); });
emitter.addListener('message', (message) => { emitter.addListener('message', (message) => {
switch (message.type) { switch (message.type) {

View File

@@ -7,12 +7,13 @@ type ConfigValues = {
context?: string; context?: string;
}; };
const paths = envPaths('mini-loader');
class Config { class Config {
#location: string; #location: string;
#config?: ConfigValues; #config?: ConfigValues;
constructor() { constructor() {
const paths = envPaths('mini-loader');
this.#location = join(paths.config, 'config.json'); this.#location = join(paths.config, 'config.json');
if (existsSync(this.#location)) { if (existsSync(this.#location)) {
this.#config = JSON.parse(readFileSync(this.#location, 'utf-8')); this.#config = JSON.parse(readFileSync(this.#location, 'utf-8'));
@@ -23,6 +24,10 @@ class Config {
return this.#config?.context || 'default'; return this.#config?.context || 'default';
} }
public get cacheLocation() {
return join(paths.cache, this.context);
}
public setContext = (context: string) => { public setContext = (context: string) => {
this.#config = { this.#config = {
...(this.#config || {}), ...(this.#config || {}),

View File

@@ -5,10 +5,11 @@ type RunOptions = {
script: string; script: string;
input?: Buffer | string; input?: Buffer | string;
secrets?: Record<string, string>; secrets?: Record<string, string>;
cacheLocation: string;
}; };
const run = async ({ script, input, secrets }: RunOptions) => { const run = async ({ script, input, secrets, cacheLocation }: RunOptions) => {
const info = await setup({ script, input, secrets }); const info = await setup({ script, input, secrets, cacheLocation });
const worker = new Worker(info.scriptLocation, { const worker = new Worker(info.scriptLocation, {
stdin: false, stdin: false,

View File

@@ -1,5 +1,4 @@
import { join } from 'path'; import { join } from 'path';
import os from 'os';
import { nanoid } from 'nanoid'; import { nanoid } from 'nanoid';
import { chmod, mkdir, rm, writeFile } from 'fs/promises'; import { chmod, mkdir, rm, writeFile } from 'fs/promises';
import { createServer } from 'net'; import { createServer } from 'net';
@@ -9,6 +8,7 @@ type SetupOptions = {
input?: Buffer | string; input?: Buffer | string;
script: string; script: string;
secrets?: Record<string, string>; secrets?: Record<string, string>;
cacheLocation: string;
}; };
type RunEvents = { type RunEvents = {
@@ -20,7 +20,7 @@ type RunEvents = {
const setup = async (options: SetupOptions) => { const setup = async (options: SetupOptions) => {
const { input, script, secrets } = options; const { input, script, secrets } = options;
const emitter = new EventEmitter<RunEvents>(); const emitter = new EventEmitter<RunEvents>();
const dataDir = join(os.tmpdir(), 'mini-loader', nanoid()); const dataDir = join(options.cacheLocation, nanoid());
await mkdir(dataDir, { recursive: true }); await mkdir(dataDir, { recursive: true });
await chmod(dataDir, 0o700); await chmod(dataDir, 0o700);

View File

@@ -67,6 +67,7 @@ class RunnerInstance extends EventEmitter<RunnerInstanceEvents> {
script, script,
secrets: allSecrets, secrets: allSecrets,
input, input,
cacheLocation: config.files.cache,
}); });
this.#run = current; this.#run = current;
const { promise, emitter } = current; const { promise, emitter } = current;