Add **many** things (refactor core, add cache, ETA, multiple password file options, ...) (return of PR #74)

.gitignore

@@ -1,6 +1,8 @@
 aws.config
 config.json
 credmaster-success.txt
+credmaster-validusers.txt
+credmaster-cache.db
 venv/
 env/
 __pycache__/

README.md

@@ -16,6 +16,13 @@ For detection tips, see the blogpost and detection section.
 3. `pip install -r requirements.txt`
 4. Fill out the config file ([wiki](https://github.com/knavesec/CredMaster/wiki/Config-File)) with desired options, or provide through CLI
 
+## Quick notes on delays
+
+- `delay_user` is the minimum amount of time (in seconds) between two tries for a same user.
+- `delay_domain` is the minimum amount of time (in seconds) between two tries for a same domain.
+- `batch_delay` is the minimum amount of time (in seconds) between two batches (batches' size is defined in `batch_size`).
+- `jitter` is the maximum amount of time between two tries (no matter the user or domain).
+- `jitter_min` is the minimum amount of time between two tries (no matter the user or domain).
 
 ## Benefits & Features ##
 
@@ -63,6 +70,8 @@ The following plugins are currently supported:
   * `--plugin httpbrute`
 * [GMailEnum](https://github.com/knavesec/CredMaster/wiki/GmailEnum) - GSuite/Gmail enumeration
   * `--plugin gmailenum`
+* AWS IAM - AWS IAM enumeration
+  * `--plugin aws`
 
 
 Example Use:

config.example.json

@@ -0,0 +1,49 @@
+{
+  "plugin" : "msol",
+  "userfile" : "users-example.com",
+  "passwordfile" : "passwords-example.com",
+  "passwordconfig" : null,
+  "userpassfile" : null,
+  "useragentfile" : "useragents.txt",
+
+  "outfile" : "example.credmaster.logs",
+  "threads" : 1,
+  "region" : "eu-west-3",
+  "jitter" : 20,
+  "jitter_min" : 10,
+  "delay_user" : 3610,
+  "comment": "delay_user is the delay in seconds between two authentications with the same user",
+  "delay_domain": null,
+  "batch_size": 15,
+  "batch_delay": 20,
+  "header" : null,
+  "xforwardedfor" : null,
+  "weekday_warrior" : 0,
+  "comment": "weekday_warrior allows you to spray only during the day",
+  "color" : false,
+  "trim" : false,
+  "cache_file": "cache.db",
+  "proxy": "http://127.0.0.1:8080",
+  "comment": "proxy to use",
+  "proxy_notify": null,
+  "debug": false,
+
+  "slack_webhook" : null,
+  "pushover_token" : null,
+  "pushover_user" : null,
+  "ntfy_topic" : null,
+  "ntfy_host" : null,
+  "ntfy_token" : null,
+  "discord_webhook" : null,
+  "teams_webhook" : null,
+  "keybase_webhook": null,
+  "operator_id" : null,
+  "exclude_password" : false,
+
+  "no_fireprox" : true,
+  "access_key" : "AKIA[...]",
+  "secret_access_key" : "odW1wn[...]6L8xd",
+  "session_token" : null,
+  "profile_name" : null,
+  "api_prefix": null
+}

config.json

@@ -2,6 +2,7 @@
   "plugin" : null,
   "userfile" : null,
   "passwordfile" : null,
+  "passwordconfig" : null,
   "userpassfile" : null,
   "useragentfile" : null,
 
@@ -10,16 +11,19 @@
   "region" : null,
   "jitter" : null,
   "jitter_min" : null,
-  "delay" : null,
+  "delay_user" : null,
+  "delay_domain": null,
   "batch_size": null,
   "batch_delay": null,
-  "passwordsperdelay" : null,
-  "randomize" : false,
   "header" : null,
   "xforwardedfor" : null,
   "weekday_warrior" : null,
   "color" : false,
   "trim" : false,
+  "cache_file": null,
+  "proxy": null,
+  "proxy_notify": null,
+  "debug": false,
 
   "slack_webhook" : null,
   "pushover_token" : null,
@@ -33,8 +37,10 @@
   "operator_id" : null,
   "exclude_password" : false,
 
+  "no_fireprox" : false,
   "access_key" : null,
   "secret_access_key" : null,
   "session_token" : null,
-  "profile_name" : null
+  "profile_name" : null,
+  "api_prefix": null
 }