diff --git a/modules/iam.py b/modules/iam.py index f14f884..666c688 100644 --- a/modules/iam.py +++ b/modules/iam.py @@ -18,7 +18,7 @@ def step_iam_get_account_summary(): iam_get_account_summary(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY) -def step_iam_list_users(): +def step_iam_list_users(*args): iam_list_users(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY) def step_iam_check_root_account(): diff --git a/weirdAAL.py b/weirdAAL.py index 1d43717..5e534c0 100755 --- a/weirdAAL.py +++ b/weirdAAL.py @@ -24,6 +24,8 @@ parser.add_argument("-s", "--step", help="list the step you would like to run", action="store", type=str, required=True) parser.add_argument("-t", "--target", help="Give your target a name so we can track results", action="store", type=str, required=True) +parser.add_argument("-a", "--arguments", help="Give your target a name so we can track results", +action="store", type=str, required=False) parser.add_argument("-l", "--list", help="list steps", action="store_true") parser.add_argument("-v", "--verbosity", help="increase output verbosity", action="store_true") @@ -58,12 +60,21 @@ else: if (args.list): pass + +# arg_list has to be defined otherwise will cause an exception +arg_list = None + +if (args.arguments): + arg_list = args.arguments.split(',') + # We need the user to tell us the step they want to proceed on if (args.step): arg = method_create() if callable(arg): - arg() - + if arg_list: + arg(arg_list) + else: + arg() # Allow the user to specify verbosity for debugging