aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar rusty-snake <41237666+rusty-snake@users.noreply.github.com>2021-06-04 07:59:09 +0200
committerLibravatar rusty-snake <41237666+rusty-snake@users.noreply.github.com>2021-06-04 08:25:46 +0200
commit0dc82f0bc334c529977a873bcc243f46379cfbc8 (patch)
tree2f018c83569355467f6ad5f7196989f44a2a0177
parentMerge pull request #4325 from florianbegusch/fbegusch-improve-jail_prober.py (diff)
downloadfirejail-0dc82f0bc334c529977a873bcc243f46379cfbc8.tar.gz
firejail-0dc82f0bc334c529977a873bcc243f46379cfbc8.tar.zst
firejail-0dc82f0bc334c529977a873bcc243f46379cfbc8.zip
Better error message for jail_prober.py cli usage
Curerently sys.argv is accessed without checks, resulting in an IndexError: ``` Traceback (most recent call last): File "/home/rusty-snake/Projects/firejail/contrib/jail_prober.py", line 205, in <module> main() File "/home/rusty-snake/Projects/firejail/contrib/jail_prober.py", line 170, in main profile_path = sys.argv[1] IndexError: list index out of range ``` This commit catches this IndexError and prints a more helpfull message instaed: ``` USAGE: jail_prober.py <PROFILE-PATH> <PROGRAM> ```
-rwxr-xr-xcontrib/jail_prober.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/jail_prober.py b/contrib/jail_prober.py
index 95e299624..f89f97ac4 100755
--- a/contrib/jail_prober.py
+++ b/contrib/jail_prober.py
@@ -164,8 +164,12 @@ def run_firejail(program, all_args):
164 164
165 165
166def main(): 166def main():
167 profile_path = sys.argv[1] 167 try:
168 program = sys.argv[2] 168 profile_path = sys.argv[1]
169 program = sys.argv[2]
170 except IndexError:
171 print('USAGE: jail_prober.py <PROFILE-PATH> <PROGRAM>')
172 sys.exit()
169 # Quick error check and extract arguments 173 # Quick error check and extract arguments
170 check_params(profile_path) 174 check_params(profile_path)
171 profile = get_args(profile_path) 175 profile = get_args(profile_path)