Commit Graph

16492 Commits

Author SHA1 Message Date
Adam Cammack 133f982f7c Add external module bridge for Ruby
This runs Ruby external modules with the same Ruby that is running MSF,
so it might even work on Windows!
2018-03-23 14:46:40 -05:00
James Barnett def0e4d93b Merge branch 'goliath' into MS-3062_workspaces 2018-03-23 11:37:01 -05:00
James Barnett 6b3a4a56dc Merge branch 'rapid7/master' into goliath 2018-03-23 11:26:31 -05:00
James Barnett ed5b22a541 Address more code review comments 2018-03-22 21:47:59 -05:00
James Barnett 6c5a7a663a Merge branch 'goliath' into MS-2879_db_export 2018-03-22 21:22:23 -05:00
James Barnett 466c97f114 WIP: move tracking active workspace to client side
* Move the @current_workspace tracking to workspace proxy
* Create helper for handling workspace value in opts
* Call framework.db.proxy across dbmanager files now that active ws is tracked in proxy

NOTE: This commit throws an exception when adding a remote data service.
2018-03-22 21:00:06 -05:00
Jon Hart a1287a0776 Remove blank before services output 2018-03-22 18:26:50 -07:00
Jon Hart 2ce8423883 Make vulns and notes with -o similar to services and hosts
Now all of them will simply save the requested information to an output
file if specified and will let you know where the file is when done.
Previously, notes and vulns would also print out all of the notes and
vulns, which just felt weird and inconsistent.  So, I fixed it.
2018-03-22 18:18:12 -07:00
Jeffrey Martin b9fc786d24 Land #9744, Add synchronization around public module metadata cache methods 2018-03-22 17:24:39 -05:00
William Vu 23a7444646 Add PipeAuditor mixin to Psexec_MS17_010 mixin 2018-03-22 15:37:44 -05:00
William Vu 558ecbcb49 Add PipeAuditor mixin 2018-03-22 15:37:36 -05:00
James Barnett 93d4f5cd0b Last few review comments 2018-03-21 17:50:11 -05:00
James Barnett eee24366c9 Address code review comments and bug 2018-03-21 17:42:54 -05:00
James Barnett f6fddb3113 Fix indent 2018-03-21 17:16:44 -05:00
Matthew Kienow 8d660084fc Omit parentheses for no argument get_db calls 2018-03-21 18:03:27 -04:00
Matthew Kienow 975948439d Make vulns cmd option string literals consistent 2018-03-21 16:35:06 -04:00
Matthew Kienow 09bea3ec39 Remove vulns cmd help short-circuit 2018-03-21 16:34:11 -04:00
Adam Cammack bb8fd45cb2 Land #9739, Add Python logging module support 2018-03-21 14:48:49 -05:00
christopher lee 70c9a434e6 Add synchronization around public module metadata cache methods 2018-03-21 14:23:34 -05:00
Spencer McIntyre 3aa37eb266 Add a log handler for external python modules 2018-03-21 10:14:49 -04:00
Jacob Robles fc9005df8a Add External License Support 2018-03-21 06:26:25 -05:00
Matthew Kienow 553789557b Merge branch 'goliath' into MS-2910-remote-vuln-read-update-delete 2018-03-21 01:45:58 -04:00
Jacob Robles 86266dc636 Add batch_size option for external multi_scanner 2018-03-20 14:47:46 -05:00
Matthew Kienow ced6707ba6 Fix cmd vulns and DBManager Session spec 2018-03-20 15:25:09 -04:00
Aaron Soto 7e5214fef5 Improved CTRL-C edge case, Invalid Options edge case, help output, version output 2018-03-20 13:34:15 -05:00
Jacob Robles ca7caae622 Change External Module Type Names
Change the a couple of external module type names
to be consistent with the template files.
2018-03-20 10:19:57 -05:00
g0tmi1k 973d00aca0 Add a message about DisablePayloadHandler
Based on https://github.com/rapid7/metasploit-framework/blob/26bf96b3ce1e97bfb997432ba532e9823f885750/lib/msf/core/exploit/exe.rb#L43
2018-03-20 13:04:41 +00:00
g0tmi1k 8463ed99b0 Add standardised header comments 2018-03-20 11:33:34 +00:00
Summus6 587215affc Remove unwanted 'pop RAX' from windows/x64/reverse_(win)http 2018-03-20 11:01:10 +01:00
James Barnett 90bebc2096 Convert workspace update to new api 2018-03-19 14:24:16 -05:00
Matthew Kienow cd7ecc4b74 Display vulns information column based on option 2018-03-19 14:29:38 -04:00
James Barnett 929fb041ab Fix bug when adding workspace remotely 2018-03-19 11:01:22 -05:00
Jeffrey Martin 4801021aba Land #9613, add bind_named_pipe x86 2018-03-17 15:53:06 -05:00
Matthew Kienow fc83220aa7 Fix report_vuln duplicate VulnRef record creation
Multiple calls to report_vuln for the same vuln results in the creation
of duplicate VulnRef records, except for the CVE refs
2018-03-16 17:53:07 -04:00
Matthew Kienow f365e6fc28 Remove stderr debug output 2018-03-16 17:50:49 -04:00
James Barnett 35bc8e905e Refactor workspace delete to be consistent with other commands 2018-03-16 16:11:09 -05:00
Brent Cook 65ae1e33e1 Land #9694, move ssh platforms to lib 2018-03-16 12:49:57 -05:00
James Barnett 8ddaae5fe4 Remove unused code 2018-03-15 12:12:12 -05:00
christopher lee 4d04319d2a Merged master 2018-03-15 11:31:44 -05:00
Matthew Kienow 334da2477c Get first Vuln record 2018-03-14 18:49:49 -04:00
James Barnett 730eea800c Merge branch 'MS-2879_db_export' of github.com:clee-r7/metasploit-framework into MS-2879_db_export 2018-03-14 16:47:07 -05:00
James Barnett 100a64ae6c Fix bug when saving to path that doesnt exist 2018-03-14 16:43:04 -05:00
James Barnett 0d170571da Fix bug with file name 2018-03-14 15:59:07 -05:00
James Barnett b179603b4a Externalize db_export command 2018-03-14 15:06:28 -05:00
Brent Cook 588993f20e remove no-op 2018-03-14 14:16:47 -05:00
James Barnett ac5669388a Merge branch 'goliath' into MS-2879_db_export 2018-03-14 11:37:08 -05:00
Mehmet İnce 6811097bed Create reload_file method for edit and reload_lib cms 2018-03-14 11:47:23 +03:00
UserExistsError 948b07166a pipe error checks 2018-03-14 00:09:20 -06:00
Matthew Kienow e4cc2a565a Correct services cmd help message for protocol 2018-03-13 16:09:35 -04:00
Mehmet İnce 9b84477ddc Changing cmd name to reload_lib 2018-03-13 22:17:59 +03:00