Skip to content

fix: safer os command execution #45

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

Merged
RishabhS7 merged 2 commits into from
Oct 21, 2025
Merged

fix: safer os command execution #45

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1f339f
fix: safer os command execution
rongquan1 Oct 21, 2025
64d018d
fix: add signal handling for command termination
rongquan1 Oct 21, 2025
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
121 changes: 106 additions & 15 deletions scripts/generate.v3.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/no-empty-function,camelcase */
import { sign, SUPPORTED_SIGNING_ALGORITHM } from "@tradetrust-tt/tradetrust";
import { v3, __unsafe__use__it__at__your__own__risks__wrapDocument as wrapDocument } from "@tradetrust-tt/tradetrust";
import { execSync } from "child_process";
import { spawnSync } from "child_process";
import { writeFileSync } from "fs";
import { getLogger } from "../src/common/logger";
import {
Expand Down Expand Up @@ -36,6 +36,23 @@ const ethereumDocumentConfig = {
timeout: 5 * 60 * 1000, // 5 min timeout for contract to execute
};

// Helper function to execute tradetrust commands securely
const runTradetrust = (args: string[], timeoutMs?: number) => {
const result = spawnSync("tradetrust", args, {
timeout: timeoutMs ?? ethereumDocumentConfig.timeout,
stdio: "inherit",
});
if (result.error) {
throw result.error;
}
if (result.signal) {
throw new Error(`Command terminated by signal ${result.signal}`);
}
if (result.status !== 0) {
throw new Error(`Command failed with exit code ${result.status}`);
}
};

interface OutLocations {
revoked: string;
notRevoked: string;
Expand Down Expand Up @@ -106,8 +123,18 @@ const generateRevocationStore = async ({ logMessage, document, outLocations }: G
writeFileSync(`${mainPath}/${outLocations.notRevoked}`, JSON.stringify(signedAnother, null, 2));

info("Revoking document...");
const cmdRevoke = `tradetrust document-store revoke -h 0x${signed.proof.merkleRoot} -a ${ethereumDocumentConfig.documentStore} -k ${ethereumDocumentConfig.wallet.key} -n ${ethereumDocumentConfig.network}`;
execSync(cmdRevoke, { timeout: ethereumDocumentConfig.timeout });
runTradetrust([
"document-store",
"revoke",
"-h",
`0x${signed.proof.merkleRoot}`,
"-a",
ethereumDocumentConfig.documentStore,
"-k",
ethereumDocumentConfig.wallet.key,
"-n",
ethereumDocumentConfig.network,
]);
};

const generateDnsDid = async () => {
Expand Down Expand Up @@ -221,17 +248,57 @@ const generateDocumentStore = async () => {
JSON.stringify(invalidDnsDocumentStoreDocument, null, 2)
);
info("Issuing document(1/3)...");
const cmdIssue1 = `tradetrust document-store issue -h 0x${issuedBaseDocumentStoreDocument.proof.merkleRoot} -a ${ethereumDocumentConfig.documentStore} -k ${ethereumDocumentConfig.wallet.key} -n ${ethereumDocumentConfig.network}`;
execSync(cmdIssue1, { timeout: ethereumDocumentConfig.timeout });
runTradetrust([
"document-store",
"issue",
"-h",
`0x${issuedBaseDocumentStoreDocument.proof.merkleRoot}`,
"-a",
ethereumDocumentConfig.documentStore,
"-k",
ethereumDocumentConfig.wallet.key,
"-n",
ethereumDocumentConfig.network,
]);
info("Issuing document(2/3)...");
const cmdIssue2 = `tradetrust document-store issue -h 0x${revokedBaseDocumentStoreDocument.proof.merkleRoot} -a ${ethereumDocumentConfig.documentStore} -k ${ethereumDocumentConfig.wallet.key} -n ${ethereumDocumentConfig.network}`;
execSync(cmdIssue2, { timeout: ethereumDocumentConfig.timeout });
runTradetrust([
"document-store",
"issue",
"-h",
`0x${revokedBaseDocumentStoreDocument.proof.merkleRoot}`,
"-a",
ethereumDocumentConfig.documentStore,
"-k",
ethereumDocumentConfig.wallet.key,
"-n",
ethereumDocumentConfig.network,
]);
info("Issuing document(3/3)...");
const cmdIssue3 = `tradetrust document-store issue -h 0x${invalidDnsDocumentStoreDocument.proof.merkleRoot} -a ${ethereumDocumentConfig.documentStore} -k ${ethereumDocumentConfig.wallet.key} -n ${ethereumDocumentConfig.network}`;
execSync(cmdIssue3, { timeout: ethereumDocumentConfig.timeout });
runTradetrust([
"document-store",
"issue",
"-h",
`0x${invalidDnsDocumentStoreDocument.proof.merkleRoot}`,
"-a",
ethereumDocumentConfig.documentStore,
"-k",
ethereumDocumentConfig.wallet.key,
"-n",
ethereumDocumentConfig.network,
]);
info("Revoking document...");
const cmdRevoke = `tradetrust document-store revoke -h 0x${revokedBaseDocumentStoreDocument.proof.merkleRoot} -a ${ethereumDocumentConfig.documentStore} -k ${ethereumDocumentConfig.wallet.key} -n ${ethereumDocumentConfig.network}`;
execSync(cmdRevoke, { timeout: ethereumDocumentConfig.timeout });
runTradetrust([
"document-store",
"revoke",
"-h",
`0x${revokedBaseDocumentStoreDocument.proof.merkleRoot}`,
"-a",
ethereumDocumentConfig.documentStore,
"-k",
ethereumDocumentConfig.wallet.key,
"-n",
ethereumDocumentConfig.network,
]);
};

const generateTokenRegistry = async () => {
Expand Down Expand Up @@ -261,12 +328,36 @@ const generateTokenRegistry = async () => {
"./test/fixtures/v3/tokenRegistry-invalid-issued.json",
JSON.stringify(invalidDnsTokenRegistryDocument, null, 2)
);
const cmdIssue1 = `tradetrust token-registry mint -a ${ethereumDocumentConfig.tokenRegistry} --tokenId 0x${issuedBaseTokenRegistryDocument.proof.merkleRoot} --to ${ethereumDocumentConfig.wallet.address} -k ${ethereumDocumentConfig.wallet.key} -n ${ethereumDocumentConfig.network}`;
info("Issuing document(1/2)...");
execSync(cmdIssue1, { timeout: ethereumDocumentConfig.timeout });
runTradetrust([
"token-registry",
"mint",
"-a",
ethereumDocumentConfig.tokenRegistry,
"--tokenId",
`0x${issuedBaseTokenRegistryDocument.proof.merkleRoot}`,
"--to",
ethereumDocumentConfig.wallet.address,
"-k",
ethereumDocumentConfig.wallet.key,
"-n",
ethereumDocumentConfig.network,
]);
info("Issuing document(2/2)...");
const cmdIssue2 = `tradetrust token-registry mint -a ${ethereumDocumentConfig.tokenRegistry} --tokenId 0x${invalidDnsTokenRegistryDocument.proof.merkleRoot} --to ${ethereumDocumentConfig.wallet.address} -k ${ethereumDocumentConfig.wallet.key} -n ${ethereumDocumentConfig.network}`;
execSync(cmdIssue2, { timeout: ethereumDocumentConfig.timeout });
runTradetrust([
"token-registry",
"mint",
"-a",
ethereumDocumentConfig.tokenRegistry,
"--tokenId",
`0x${invalidDnsTokenRegistryDocument.proof.merkleRoot}`,
"--to",
ethereumDocumentConfig.wallet.address,
"-k",
ethereumDocumentConfig.wallet.key,
"-n",
ethereumDocumentConfig.network,
]);
};

const run = async () => {
Expand Down