jinql
/
bashtop
mirror of https://github.com/aristocratos/bashtop
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed psutil script security issue

pull/171/head
aristocratos 2020-07-06 13:44:15 +02:00
parent bb7643d43c
commit d90c456238
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bashtop
View File

@ -589,7 +589,7 @@ quit_() { #? Clean exit
if [[ $use_psutil == true && $2 != "psutil" ]]; then if [[ $use_psutil == true && $2 != "psutil" ]]; then
py_command quit py_command quit
sleep 0.1 sleep 0.1
rm "${pywrapper}" rm -rf "${pytmpdir}"
fi fi
echo -en "${clear_screen}${normal_screen}${show_cursor}" echo -en "${clear_screen}${normal_screen}${show_cursor}"
${stty} "${saved_stty}" ${stty} "${saved_stty}"
@ -877,7 +877,7 @@ get_cpu_info() {
if [[ $use_psutil == true ]]; then if [[ $use_psutil == true ]]; then
if [[ -z ${cpu[threads]} || -z ${cpu[cores]} ]]; then if [[ -z ${cpu[threads]} || -z ${cpu[cores]} ]]; then
py_command -v pyin "get_cpu_cores()" py_command -v pyin "get_cpu_cores()"
read cpu[threads] cpu[cores] <<<"${pyin}" read cpu[cores] cpu[threads] <<<"${pyin}"
fi fi
else else
@ -4816,7 +4816,8 @@ if [[ $use_psutil == true ]]; then
return 0 return 0
} }
pywrapper=$(mktemp "${TMPDIR:-/tmp}"/bashtop.psutil.XXXX) pytmpdir=$(mktemp -d "${TMPDIR:-/tmp}"/XXXXXXXXXXXX)
pywrapper=$(mktemp "${pytmpdir}"/bashtop.psutil.XXXX)
cat << 'EOF' > "${pywrapper}" cat << 'EOF' > "${pywrapper}"
import os, sys, subprocess, re, time, psutil import os, sys, subprocess, re, time, psutil
@ -4938,8 +4939,8 @@ def get_cpu_name():
def get_cpu_cores(): def get_cpu_cores():
'''Get number of CPU cores and threads''' '''Get number of CPU cores and threads'''
cores: int = psutil.cpu_count(logical=True) cores: int = psutil.cpu_count(logical=False)
threads: int = psutil.cpu_count(logical=False) threads: int = psutil.cpu_count(logical=True)
print(f'{cores} {threads if threads else cores}') print(f'{cores} {threads if threads else cores}')
def get_cpu_usage(): def get_cpu_usage():

4
src/bashtop.psutil.py
View File

@ -121,8 +121,8 @@ def get_cpu_name():
def get_cpu_cores(): def get_cpu_cores():
'''Get number of CPU cores and threads''' '''Get number of CPU cores and threads'''
cores: int = psutil.cpu_count(logical=True) cores: int = psutil.cpu_count(logical=False)
threads: int = psutil.cpu_count(logical=False) threads: int = psutil.cpu_count(logical=True)
print(f'{cores} {threads if threads else cores}') print(f'{cores} {threads if threads else cores}')
def get_cpu_usage(): def get_cpu_usage():