Commit Graph

2026 Commits (23a86e7ad2e6178cc7dbe6cef49a9f454d7d11bf)

Author SHA1 Message Date
William Vu 6d317baada Coerce DisablePayloadHandler into a Boolean string
Due to discrepancies in how command dispatchers receive datastore
options, especially after a "save" of the console, Boolean values are
stored as strings.

This is a quick fix for DisablePayloadHandler specifically, since it was
driving me insane.
2018-11-19 13:18:15 -06:00
Brendan Coles 277ed375d6
Ensure peer_msg falls back on an empty string
Co-Authored-By: wvu-r7 <wvu-r7@users.noreply.github.com>
2018-11-16 03:30:52 -06:00
William Vu eb90fc74a1 Fix extraneous whitespace in check output
Death to the peer gods.
2018-11-16 02:59:36 -06:00
Brendan Coles e231fd0623 next if onlyup 2018-11-10 16:21:06 +00:00
Brent Cook 12857a1d93
Land , Add 'evasion' to search help 2018-10-10 13:02:45 -05:00
Wei Chen b103ea256d Fix , incorrect implementation of "show evasion" command
Fix 
2018-10-10 10:20:12 -05:00
Auxilus a6797f101d
Add 'evasion' to search help 2018-10-10 20:15:47 +05:30
Wei Chen c6dddaa481 Support automatic payload choice 2018-10-06 20:28:41 -05:00
Wei Chen c7efd57144
Sync up with master 2018-10-06 08:27:01 -05:00
Brent Cook 4363bd830b
Land , 50, it's a magic number (sorry 2) 2018-10-05 15:04:20 -05:00
William Vu 938139d23c Add vi and more for hysterical raisins 2018-10-05 14:21:44 -05:00
William Vu 25147c49e8 Bump fallback pager in log command to tail -n 50
24 is never enough. Unless you're Jack Bauer.

(The 24 comes from the VT100. :)
2018-10-05 14:05:54 -05:00
Green-m 3ec71ed549
Fix issue that not interact with session. 2018-10-05 17:30:38 +08:00
Brent Cook b3dca6081d
Land , better handle errors with multi-host exploits 2018-10-02 05:28:57 -05:00
Brent Cook 304acd42f0 minor comment tweaks 2018-10-02 05:23:13 -05:00
Green-m 90b98a193c
Refactor the rhosts for exploit modules. 2018-09-30 16:08:49 +08:00
jgor 5dcb6ab321 fix typo in route command examples 2018-09-28 16:53:12 -05:00
William Vu 0686c76cd5 Restore help on empty args for reload_lib 2018-09-27 23:21:43 -05:00
William Vu 11538bcd4f Remove pathspec due to vague errors
"error: Could not access '*.rb'" is printed when not a repo. We fall
back on reload_file's checks, once again. :(
2018-09-27 22:12:56 -05:00
William Vu ab56ac6655 Refactor and clean up reload_lib -a and others 2018-09-27 22:11:22 -05:00
Erin Bleiweiss 3ca95933a1
Update help text. 2018-09-27 13:13:25 -05:00
Erin Bleiweiss 64c86ef4de
Add support for working outside install directory 2018-09-27 13:05:23 -05:00
Erin Bleiweiss 7ba73ef658
Check for valid files in git command 2018-09-27 12:01:04 -05:00
Erin Bleiweiss c5c1706636
Acutally, get rid of git? check 2018-09-27 11:14:01 -05:00
Erin Bleiweiss 7f9b9be78b
Allow git? to return true 2018-09-27 11:12:10 -05:00
Erin Bleiweiss 0e2361d675
Use friendly error messages and also Open3.capture2e 2018-09-26 18:49:07 -05:00
Erin Bleiweiss 79c26bce08
Add a more comprehensive git check 2018-09-26 18:32:52 -05:00
Erin Bleiweiss 173f570812
Check for presence of git directory 2018-09-26 18:29:49 -05:00
Erin Bleiweiss 71cb3e8e94
Use OptionParser 2018-09-26 18:08:46 -05:00
Erin Bleiweiss f8984c4f9b
Rename function, change args from to 2018-09-26 17:55:43 -05:00
Erin Bleiweiss 0b48d2371d
Add error handling for non-git situations 2018-09-26 17:32:40 -05:00
Erin Bleiweiss b3053020d1
Update help docs 2018-09-26 17:23:46 -05:00
Erin Bleiweiss eeee289e2f
Add command to reload all files changed as per git diff 2018-09-26 17:16:46 -05:00
Wei Chen 02ef565730
Update evasion_module_type branch 2018-09-24 08:20:32 -05:00
William Vu fb032745a1 Print nicely about what object you're in 2018-09-21 16:03:48 -05:00
William Vu 7c000c6692 Add pry -h 2018-09-21 16:03:37 -05:00
William Vu 185931ca91
Land , repeat command to repeat commands 2018-09-20 15:24:03 -05:00
William Vu c7ee3bdf45
Land , compatible_sessions NoMethodError fix 2018-09-19 03:44:04 -05:00
Green-m 85c40a122a
Fix crash issue when auto complete the session option. 2018-09-18 18:49:56 +08:00
Green-m d24eb2dbac
Add a comment 2018-09-18 15:58:09 +08:00
Green-m 862a8c921c
Fix issue when kill a job with non-integer jobid 2018-09-18 15:50:00 +08:00
Green-m d4cdaf56ae
Fix issue when kill a non-existent job. 2018-09-18 15:48:30 +08:00
Brent Cook 86f5b25d8f
Land , Add 'Notes' metadata section 2018-09-17 11:18:08 -05:00
Matthew Kienow c2230f98d5
Warn user about inactive sessions without DB 2018-09-13 15:13:41 -04:00
Adam Cammack 175dec7ade
Print help when `repeat` is run with no commands 2018-09-13 11:27:05 -05:00
Adam Cammack 04cc7843a4
Typo fixes 2018-09-13 11:19:13 -05:00
William Vu 68a51da27b
Land , console prompt fixes and refactor 2018-09-12 18:00:48 -05:00
Adam Cammack 8fa71ade44
Add `repeat` command to loop msfconsole commands 2018-09-11 17:25:33 -05:00
Adam Cammack 74ae89ac96
Minor fixups for `grep`
Use Shellwords to join words that have been shellsplit and will be
shellsplit again, and correctly reference a missing command name.
2018-09-11 17:20:34 -05:00
Matthew Kienow 34f87efb2b
Land , enhance db_connect for data services 2018-09-03 09:43:34 -04:00
James Barnett 1c8a2f3ee1
Raise an error when http service fails to connect
Also fix a bug where failed Postgres connections werent being raised
2018-09-02 15:51:13 -05:00
James Barnett b4c731d4ca
Check name validity at a higher level 2018-08-31 18:16:32 -05:00
Erin Bleiweiss 420041f287
Don't refer to AKA as 'alias' in order to not overlap nomenclature with upcoming 'alias' feature 2018-08-31 16:54:07 -05:00
Erin Bleiweiss e10d9c5d67
Update module search to search aka names 2018-08-31 16:52:17 -05:00
James Barnett 084607b955
Set current_data_service when disconnecting from http 2018-08-31 16:48:33 -05:00
James Barnett 185fe56e82
Add message when connecting via yaml 2018-08-31 16:13:17 -05:00
James Barnett a413b27e57
Fix bug connecting to https servers 2018-08-31 15:49:29 -05:00
James Barnett 1e6f19e1de
Update db_save message when no valid service connected
Also add the current data service name to db_status
2018-08-31 12:54:08 -05:00
Wei Chen 5c6b33bcf4 Add support for evasion targets, also module doc 2018-08-31 11:45:29 -05:00
James Barnett bc4a0345dc
Fix bug preventing yaml connections 2018-08-31 11:26:08 -05:00
James Barnett 6ddf4f4c22
Refactor db_connect for updated usage
db_connect will now automatically save the data service it connects to
db_save will be used to set the current data service as default
add a db_remove command to delete a saved data service
2018-08-30 18:19:14 -05:00
James Barnett d6d9f9c675
Handle case for no connection for save and disconnect 2018-08-29 13:54:20 -05:00
James Barnett 133892629e
Dont allow invalid config file characters
Also only save cert when it is present
2018-08-29 12:49:03 -05:00
James Barnett f7ecd4436d
Even more messaging changes 2018-08-29 11:32:01 -05:00
James Barnett 65f38d6051
More messaging changes 2018-08-29 11:19:37 -05:00
Adam Cammack 7414b18f20
Move prompt_char space to correct place 2018-08-29 10:38:28 -05:00
James Barnett 28954dbc1d
More messaging improvements 2018-08-28 17:14:59 -05:00
James Barnett cc5d96a441
Update messaging 2018-08-28 17:00:58 -05:00
James Barnett 161fb52ae3
Dont build connect string manually during loadup 2018-08-28 16:37:14 -05:00
James Barnett 52cc140cd2
Handle case where no default db is set 2018-08-28 15:52:26 -05:00
William Vu 4803c889f9
Land , GPP creds for db_import 2018-08-28 11:45:51 -05:00
James Barnett 5e45e2f1e9
Add help text for -l and -n options 2018-08-28 11:42:10 -05:00
James Barnett 3c1086741b
Use correct variable name for api_token 2018-08-28 10:49:50 -05:00
James Barnett 5b7127c826
Use Rex::Text::Table for outputting data services 2018-08-27 13:18:41 -05:00
James Barnett 24cf99f59c
Enable deletion of saved data services 2018-08-27 11:32:19 -05:00
Brent Cook 969170096a
Land , Only allow setting persistence on payload jobs 2018-08-25 22:21:46 -05:00
William Vu e955e8dc15 Clean up code
And hope I didn't break anything.
2018-08-24 18:05:52 -05:00
James Barnett bb0ec0472b
Enable saving local data services 2018-08-24 12:51:50 -05:00
Green-m 1dd91434f4
Fix , bug fix when add persistent to non-payload job. 2018-08-24 03:39:18 -04:00
Green-m 6d84d3bfec
Add tabs auto completion for irb. 2018-08-23 23:29:12 -04:00
Green-m 418b574161
Merge branch 'master' and resolve conflict. 2018-08-23 23:24:23 -04:00
James Barnett 724e0dcaf3
Add ability to connect to saved data services 2018-08-22 17:16:27 -05:00
William Vu 2891255549 Clarify what is being imported currently
Since the parser is focused on creds.
2018-08-22 15:53:19 -05:00
William Vu b1c633faf6 Add Group Policy Preferences support to db_import
And take the Jaden Smith approach, as @busterb quipped to me. :)

This one's a little weird, since you normally import scans into
Metasploit, but now that creds are first-class in the database, it makes
more sense to be able to import them.

Currently, your alternatives are post/windows/gather/credentials/gpp,
which requires a session, and auxiliary/scanner/smb/smb_enum_gpp, which
requires a network scan.
2018-08-21 23:44:39 -05:00
James Barnett 57243106f7
Connect to the default database on startup 2018-08-21 14:29:20 -05:00
James Barnett b6401dbe56
Add db_save command 2018-08-21 11:10:43 -05:00
William Vu 321f2b8746 Improve file operations
Hmm, why did I not use File.write before? Oh well, fixed.
2018-08-20 22:25:19 -05:00
Green-m 808e2f2e25 Fix issue 2018-08-21 03:08:14 +00:00
Green-m edb85614ff Make code cleaner 2018-08-21 03:05:44 +00:00
asoto-r7 4aee3a4ae2
Land , Implementation of CTRL+C to send SIGINT signal 2018-08-20 18:14:29 -05:00
Brent Cook 11fee8fa2c
Land , Import target DefaultOptions into the datastore 2018-08-20 17:30:27 -05:00
Brent Cook fb2d3bfd4a
Land , show help when no argument is provided to `show` 2018-08-20 15:46:29 -05:00
James Barnett 3fadc64fb2 Don't set the workspace to default if it is already set 2018-08-20 14:35:06 -05:00
Auxilus 8869604143
update help for show and search 2018-08-21 00:17:57 +05:30
Auxilus e8c0638092
Update modules.rb 2018-08-20 23:36:57 +05:30
Auxilus 0e594266e9
show help when no argument is provided to `show` 2018-08-20 23:32:34 +05:30
Adam Cammack 410eee8537
Remove 'append' mode from update_prompt
Nothing used it meaningfully. Also, due to the way `init_prompt` was set
prior to b1401e2e4e, it would have been
very broken: the prompt_char would have been included in the line twice
and prompt substitutions like %T would have been cached. Even more,
trying to append the empty string to the prompt (removed in that commit)
caused us to add a number of workarounds removed in
1df442e0cf.
2018-08-17 14:32:48 -05:00
Adam Cammack 1df442e0cf
Centralize where msfconsole touches the prompt 2018-08-17 14:21:16 -05:00
Jeffrey Martin d6bce4410c
Land , Add command for persistent job handler when msf restart 2018-08-16 15:37:10 -05:00
William Vu 7e496ae067 Import target DefaultOptions into the datastore 2018-08-16 12:18:02 -05:00