Skip to content
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

sanitize python env and subprocess i/o #16736

Merged
merged 12 commits into from
Jun 13, 2022
Merged

sanitize python env and subprocess i/o #16736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
295421e
sanitize python env when used in cross compiling cases
pmp-p Apr 15, 2022
cbc9ee9
set default to utf8
pmp-p Apr 15, 2022
fe3c43c
missing space
pmp-p Apr 15, 2022
f572fe8
Update emconfigure
pmp-p Apr 17, 2022
c24ad2b
Update emmake
pmp-p Apr 17, 2022
27aec3b
Merge branch 'emscripten-core:main' into patch-4
pmp-p Jun 9, 2022
a96c2f4
affine #16736
pmp-p Jun 9, 2022
ef5fc4d
Merge branch 'emscripten-core:main' into patch-4
pmp-p Jun 9, 2022
1f95e92
-E where shared.PYTHON, only unset internal _PYTHON_SYSCONFIGDATA_NAME
pmp-p Jun 10, 2022
7ce685f
-E for windows .bat
pmp-p Jun 10, 2022
c76bd6c
-E for windows .bat
pmp-p Jun 10, 2022
e8eace7
comment and unset _PYTHON_SYSCONFIGDATA_NAME on .bat
pmp-p Jun 10, 2022
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
6 changes: 5 additions & 1 deletion em++
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
# To make modifications to this file, edit `tools/run_python_compiler.sh` and
# then run `tools/create_entry_points.py`

# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
# of cpython used in cross compilation via setup.py.
unset _PYTHON_SYSCONFIGDATA_NAME

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi
Expand All @@ -29,7 +33,7 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$_EMCC_CCACHE" ]; then
exec "$PYTHON" "$0.py" "$@"
exec "$PYTHON" -E "$0.py" "$@"
else
unset _EMCC_CCACHE
exec ccache "$0" "$@"
Expand Down
6 changes: 4 additions & 2 deletions em++.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@

:: All env. vars specified in this file are to be local only to this script.
@setlocal

:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
:: of cpython used in cross compilation via setup.py.
@set _PYTHON_SYSCONFIGDATA_NAME=
@set EM_PY=%EMSDK_PYTHON%
@if "%EM_PY%"=="" (
set EM_PY=python
Expand All @@ -16,7 +18,7 @@
:: If _EMCC_CCACHE is not set, do a regular invocation of the python compiler driver.
:: Otherwise remove the ccache env. var, and then reinvoke this script with ccache enabled.
@if "%_EMCC_CCACHE%"=="" (
set CMD="%EM_PY%" "%~dp0\%~n0.py"
set CMD="%EM_PY%" -E "%~dp0\%~n0.py"
) else (
set _EMCC_CCACHE=
set CMD=ccache "%~dp0\%~n0.bat"
Expand Down
6 changes: 5 additions & 1 deletion em-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
# To make modifications to this file, edit `tools/run_python.sh` and then run
# `tools/create_entry_points.py`

# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
# of cpython used in cross compilation via setup.py.
unset _PYTHON_SYSCONFIGDATA_NAME

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi
Expand All @@ -28,4 +32,4 @@ if [ -z "$PYTHON" ]; then
exit 1
fi

exec "$PYTHON" "$0.py" "$@"
exec "$PYTHON" -E "$0.py" "$@"
12 changes: 7 additions & 5 deletions em-config.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@

:: All env. vars specified in this file are to be local only to this script.
@setlocal

:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
:: of cpython used in cross compilation via setup.py.
@set _PYTHON_SYSCONFIGDATA_NAME=
@set EM_PY=%EMSDK_PYTHON%
@if "%EM_PY%"=="" (
set EM_PY=python
Expand Down Expand Up @@ -45,16 +47,16 @@
)

:NORMAL_EXIT
@"%EM_PY%" "%~dp0\%~n0.py" %*
@"%EM_PY%" -E "%~dp0\%~n0.py" %*
@exit %ERRORLEVEL%

:MUTE_STDIN
@"%EM_PY%" "%~dp0\%~n0.py" %* < NUL
@"%EM_PY%" -E "%~dp0\%~n0.py" %* < NUL
@exit /b %ERRORLEVEL%

:MUTE_STDIN_EXIT
@"%EM_PY%" "%~dp0\%~n0.py" %* < NUL
@"%EM_PY%" -E "%~dp0\%~n0.py" %* < NUL
@exit %ERRORLEVEL%

:NORMAL
@"%EM_PY%" "%~dp0\%~n0.py" %*
@"%EM_PY%" -E "%~dp0\%~n0.py" %*
6 changes: 5 additions & 1 deletion emar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
# To make modifications to this file, edit `tools/run_python.sh` and then run
# `tools/create_entry_points.py`

# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
# of cpython used in cross compilation via setup.py.
unset _PYTHON_SYSCONFIGDATA_NAME

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi
Expand All @@ -28,4 +32,4 @@ if [ -z "$PYTHON" ]; then
exit 1
fi

exec "$PYTHON" "$0.py" "$@"
exec "$PYTHON" -E "$0.py" "$@"
12 changes: 7 additions & 5 deletions emar.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@

:: All env. vars specified in this file are to be local only to this script.
@setlocal

:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
:: of cpython used in cross compilation via setup.py.
@set _PYTHON_SYSCONFIGDATA_NAME=
@set EM_PY=%EMSDK_PYTHON%
@if "%EM_PY%"=="" (
set EM_PY=python
Expand Down Expand Up @@ -45,16 +47,16 @@
)

:NORMAL_EXIT
@"%EM_PY%" "%~dp0\%~n0.py" %*
@"%EM_PY%" -E "%~dp0\%~n0.py" %*
@exit %ERRORLEVEL%

:MUTE_STDIN
@"%EM_PY%" "%~dp0\%~n0.py" %* < NUL
@"%EM_PY%" -E "%~dp0\%~n0.py" %* < NUL
@exit /b %ERRORLEVEL%

:MUTE_STDIN_EXIT
@"%EM_PY%" "%~dp0\%~n0.py" %* < NUL
@"%EM_PY%" -E "%~dp0\%~n0.py" %* < NUL
@exit %ERRORLEVEL%

:NORMAL
@"%EM_PY%" "%~dp0\%~n0.py" %*
@"%EM_PY%" -E "%~dp0\%~n0.py" %*
6 changes: 5 additions & 1 deletion embuilder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
# To make modifications to this file, edit `tools/run_python.sh` and then run
# `tools/create_entry_points.py`

# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
# of cpython used in cross compilation via setup.py.
unset _PYTHON_SYSCONFIGDATA_NAME

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi
Expand All @@ -28,4 +32,4 @@ if [ -z "$PYTHON" ]; then
exit 1
fi

exec "$PYTHON" "$0.py" "$@"
exec "$PYTHON" -E "$0.py" "$@"
12 changes: 7 additions & 5 deletions embuilder.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@

:: All env. vars specified in this file are to be local only to this script.
@setlocal

:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
:: of cpython used in cross compilation via setup.py.
@set _PYTHON_SYSCONFIGDATA_NAME=
@set EM_PY=%EMSDK_PYTHON%
@if "%EM_PY%"=="" (
set EM_PY=python
Expand Down Expand Up @@ -45,16 +47,16 @@
)

:NORMAL_EXIT
@"%EM_PY%" "%~dp0\%~n0.py" %*
@"%EM_PY%" -E "%~dp0\%~n0.py" %*
@exit %ERRORLEVEL%

:MUTE_STDIN
@"%EM_PY%" "%~dp0\%~n0.py" %* < NUL
@"%EM_PY%" -E "%~dp0\%~n0.py" %* < NUL
@exit /b %ERRORLEVEL%

:MUTE_STDIN_EXIT
@"%EM_PY%" "%~dp0\%~n0.py" %* < NUL
@"%EM_PY%" -E "%~dp0\%~n0.py" %* < NUL
@exit %ERRORLEVEL%

:NORMAL
@"%EM_PY%" "%~dp0\%~n0.py" %*
@"%EM_PY%" -E "%~dp0\%~n0.py" %*
6 changes: 5 additions & 1 deletion emcc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
# To make modifications to this file, edit `tools/run_python_compiler.sh` and
# then run `tools/create_entry_points.py`

# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
# of cpython used in cross compilation via setup.py.
unset _PYTHON_SYSCONFIGDATA_NAME

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi
Expand All @@ -29,7 +33,7 @@ if [ -z "$PYTHON" ]; then
fi

if [ -z "$_EMCC_CCACHE" ]; then
exec "$PYTHON" "$0.py" "$@"
exec "$PYTHON" -E "$0.py" "$@"
else
unset _EMCC_CCACHE
exec ccache "$0" "$@"
Expand Down
6 changes: 4 additions & 2 deletions emcc.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@

:: All env. vars specified in this file are to be local only to this script.
@setlocal

:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
:: of cpython used in cross compilation via setup.py.
@set _PYTHON_SYSCONFIGDATA_NAME=
@set EM_PY=%EMSDK_PYTHON%
@if "%EM_PY%"=="" (
set EM_PY=python
Expand All @@ -16,7 +18,7 @@
:: If _EMCC_CCACHE is not set, do a regular invocation of the python compiler driver.
:: Otherwise remove the ccache env. var, and then reinvoke this script with ccache enabled.
@if "%_EMCC_CCACHE%"=="" (
set CMD="%EM_PY%" "%~dp0\%~n0.py"
set CMD="%EM_PY%" -E "%~dp0\%~n0.py"
) else (
set _EMCC_CCACHE=
set CMD=ccache "%~dp0\%~n0.bat"
Expand Down
2 changes: 1 addition & 1 deletion emcc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,7 @@ def run(args):
args = [x for x in args if x != '--cflags']
with misc_temp_files.get_file(suffix='.o') as temp_target:
input_file = 'hello_world.c'
cmd = [shared.PYTHON, sys.argv[0], utils.path_from_root('tests', input_file), '-v', '-c', '-o', temp_target] + args
cmd = [shared.PYTHON, "-E", sys.argv[0], utils.path_from_root('tests', input_file), '-v', '-c', '-o', temp_target] + args
proc = run_process(cmd, stderr=PIPE, check=False)
if proc.returncode != 0:
print(proc.stderr)
Expand Down
6 changes: 5 additions & 1 deletion emcmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
# To make modifications to this file, edit `tools/run_python.sh` and then run
# `tools/create_entry_points.py`

# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
# of cpython used in cross compilation via setup.py.
unset _PYTHON_SYSCONFIGDATA_NAME

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi
Expand All @@ -28,4 +32,4 @@ if [ -z "$PYTHON" ]; then
exit 1
fi

exec "$PYTHON" "$0.py" "$@"
exec "$PYTHON" -E "$0.py" "$@"
12 changes: 7 additions & 5 deletions emcmake.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@

:: All env. vars specified in this file are to be local only to this script.
@setlocal

:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
:: of cpython used in cross compilation via setup.py.
@set _PYTHON_SYSCONFIGDATA_NAME=
@set EM_PY=%EMSDK_PYTHON%
@if "%EM_PY%"=="" (
set EM_PY=python
Expand Down Expand Up @@ -45,16 +47,16 @@
)

:NORMAL_EXIT
@"%EM_PY%" "%~dp0\%~n0.py" %*
@"%EM_PY%" -E "%~dp0\%~n0.py" %*
@exit %ERRORLEVEL%

:MUTE_STDIN
@"%EM_PY%" "%~dp0\%~n0.py" %* < NUL
@"%EM_PY%" -E "%~dp0\%~n0.py" %* < NUL
@exit /b %ERRORLEVEL%

:MUTE_STDIN_EXIT
@"%EM_PY%" "%~dp0\%~n0.py" %* < NUL
@"%EM_PY%" -E "%~dp0\%~n0.py" %* < NUL
@exit %ERRORLEVEL%

:NORMAL
@"%EM_PY%" "%~dp0\%~n0.py" %*
@"%EM_PY%" -E "%~dp0\%~n0.py" %*
6 changes: 5 additions & 1 deletion emconfigure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
# To make modifications to this file, edit `tools/run_python.sh` and then run
# `tools/create_entry_points.py`

# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
# of cpython used in cross compilation via setup.py.
unset _PYTHON_SYSCONFIGDATA_NAME

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi
Expand All @@ -28,4 +32,4 @@ if [ -z "$PYTHON" ]; then
exit 1
fi

exec "$PYTHON" "$0.py" "$@"
exec "$PYTHON" -E "$0.py" "$@"
pmp-p marked this conversation as resolved.
Show resolved Hide resolved
12 changes: 7 additions & 5 deletions emconfigure.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@

:: All env. vars specified in this file are to be local only to this script.
@setlocal

:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
:: of cpython used in cross compilation via setup.py.
@set _PYTHON_SYSCONFIGDATA_NAME=
@set EM_PY=%EMSDK_PYTHON%
@if "%EM_PY%"=="" (
set EM_PY=python
Expand Down Expand Up @@ -45,16 +47,16 @@
)

:NORMAL_EXIT
@"%EM_PY%" "%~dp0\%~n0.py" %*
@"%EM_PY%" -E "%~dp0\%~n0.py" %*
@exit %ERRORLEVEL%

:MUTE_STDIN
@"%EM_PY%" "%~dp0\%~n0.py" %* < NUL
@"%EM_PY%" -E "%~dp0\%~n0.py" %* < NUL
@exit /b %ERRORLEVEL%

:MUTE_STDIN_EXIT
@"%EM_PY%" "%~dp0\%~n0.py" %* < NUL
@"%EM_PY%" -E "%~dp0\%~n0.py" %* < NUL
@exit %ERRORLEVEL%

:NORMAL
@"%EM_PY%" "%~dp0\%~n0.py" %*
@"%EM_PY%" -E "%~dp0\%~n0.py" %*
6 changes: 5 additions & 1 deletion emdump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
# To make modifications to this file, edit `tools/run_python.sh` and then run
# `tools/create_entry_points.py`

# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
# of cpython used in cross compilation via setup.py.
unset _PYTHON_SYSCONFIGDATA_NAME

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi
Expand All @@ -28,4 +32,4 @@ if [ -z "$PYTHON" ]; then
exit 1
fi

exec "$PYTHON" "$(dirname $0)/tools/emdump.py" "$@"
exec "$PYTHON" -E "$(dirname $0)/tools/emdump.py" "$@"
12 changes: 7 additions & 5 deletions emdump.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@

:: All env. vars specified in this file are to be local only to this script.
@setlocal

:: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
:: of cpython used in cross compilation via setup.py.
@set _PYTHON_SYSCONFIGDATA_NAME=
@set EM_PY=%EMSDK_PYTHON%
@if "%EM_PY%"=="" (
set EM_PY=python
Expand Down Expand Up @@ -45,16 +47,16 @@
)

:NORMAL_EXIT
@"%EM_PY%" "%~dp0\tools\emdump.py" %*
@"%EM_PY%" -E "%~dp0\tools\emdump.py" %*
@exit %ERRORLEVEL%

:MUTE_STDIN
@"%EM_PY%" "%~dp0\tools\emdump.py" %* < NUL
@"%EM_PY%" -E "%~dp0\tools\emdump.py" %* < NUL
@exit /b %ERRORLEVEL%

:MUTE_STDIN_EXIT
@"%EM_PY%" "%~dp0\tools\emdump.py" %* < NUL
@"%EM_PY%" -E "%~dp0\tools\emdump.py" %* < NUL
@exit %ERRORLEVEL%

:NORMAL
@"%EM_PY%" "%~dp0\tools\emdump.py" %*
@"%EM_PY%" -E "%~dp0\tools\emdump.py" %*
6 changes: 5 additions & 1 deletion emdwp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
# To make modifications to this file, edit `tools/run_python.sh` and then run
# `tools/create_entry_points.py`

# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
# of cpython used in cross compilation via setup.py.
unset _PYTHON_SYSCONFIGDATA_NAME

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi
Expand All @@ -28,4 +32,4 @@ if [ -z "$PYTHON" ]; then
exit 1
fi

exec "$PYTHON" "$(dirname $0)/tools/emdwp.py" "$@"
exec "$PYTHON" -E "$(dirname $0)/tools/emdwp.py" "$@"
Loading