Skip to content

harden: add path validation in jsmoeraapi.py... #123

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

Open
anupamme wants to merge 1 commit into
base: master
Choose a base branch
from
Open

harden: add path validation in jsmoeraapi.py... #123

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: 12 additions & 5 deletions js-moera-api/jsmoeraapi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from __future__ import annotations

import os
import re
import sys
from enum import Enum
Expand Down Expand Up @@ -583,9 +584,15 @@ def generate_sagas(api: Any, structs: dict[str, Structure], afile: TextIO) -> No

def generate_types(api: Any, outdir: str) -> None:
structs = scan_structures(api)

with open(outdir + '/node/api-types.ts', 'w+') as tfile:
with open(outdir + '/node/api-schemas.mjs', 'w+') as sfile:
outdir = os.path.realpath(outdir)
types_path = os.path.realpath(os.path.join(outdir, 'node', 'api-types.ts'))
schemas_path = os.path.realpath(os.path.join(outdir, 'node', 'api-schemas.mjs'))
sagas_path = os.path.realpath(os.path.join(outdir, 'node', 'api-sagas.ts'))
if not types_path.startswith(outdir) or not schemas_path.startswith(outdir) or not sagas_path.startswith(outdir):
raise ValueError("Path traversal detected in outdir")

with open(types_path, 'w+') as tfile:
with open(schemas_path, 'w+') as sfile:
tfile.write(PREAMBLE_TYPES)
sfile.write(PREAMBLE_SCHEMAS)
for enum in api['enums']:
Expand All @@ -596,7 +603,7 @@ def generate_types(api: Any, outdir: str) -> None:
sfile.write('\n }\n')
sfile.write('}\n')

with open(outdir + '/node/api-sagas.ts', 'w+') as afile:
with open(sagas_path, 'w+') as afile:
afile.write(PREAMBLE_SAGAS)
generate_sagas(api, structs, afile)

Expand Down Expand Up @@ -801,5 +808,5 @@ def generate_code(outdir: str) -> None:
print("Usage: js-moera-api <node_api.yml file path> <events.yml file path> <output directory>")
exit(1)

outdir = sys.argv[3] if len(sys.argv) >= 4 else '.'
outdir = os.path.realpath(os.path.abspath(sys.argv[3] if len(sys.argv) >= 4 else '.'))
generate_code(outdir)