这是indexloc提供的服务，不要输入任何密码
Skip to content

Better version check #19

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
merged 3 commits into from
Oct 3, 2018
Merged

Better version check #19

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6ce797
added better version checking
linted Sep 29, 2018
3adb891
made two different version of execCMD
linted Sep 29, 2018
02cd1af
changed to a slightly easier to maintain versioning of the two. now i…
linted Sep 29, 2018
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
24 changes: 13 additions & 11 deletions linuxprivchecker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,20 @@
###############################################################################################################

# conditional import for older versions of python not compatible with subprocess
try:
from sys import version_info
if version_info >= (3,5):
#import subprocess as sub
from subprocess import run, PIPE
compatmode = 0 # newer version of python, no need for compatibility mode
except ImportError:
def do_cmd(cmd):
return run(cmd, stdout=PIPE, stderr=PIPE, shell=True).stdout
elif version_info >= (3,):
#import os # older version of python, need to use ### instead
from subprocess import check_output, PIPE
compatmode = 1
from subprocess import check_output, STDOUT
def do_cmd(cmd):
return check_output(cmd, shell=True, stderr=STDOUT)
else:
print("Error: please run in python3 only.")
exit(1)

# title / formatting
bigline = "=" * 80
Expand All @@ -45,12 +51,8 @@ def execCmd(cmdDict):
for item in cmdDict:
cmd = cmdDict[item]["cmd"]
try:
if compatmode == 0: # newer version of python, use preferred subprocess
process = run(cmd, stdout=PIPE, stderr=PIPE, shell=True)
results = process.stdout.decode().split('\n')
else: # older version of python, use os.popen
echo_stdout = check_output(cmd, shell=True)
results = stdout.decode().split('\n')
stdout = do_cmd(cmd)
results = stdout.decode().split('\n')
except Exception as e:
results = ['[-] failed: {}'.format(e)]
cmdDict[item]["results"]=results
Expand Down