Commit Graph

14299 Commits

Author SHA1 Message Date
James Barnett 9559c06c10 Land #9762, Fix OpenSSL deprecation in Ruby 2.5
This PR replaces a deprecated method in the Ruby 2.5
OpenSSL library. It also bumps the ruby-version to use 2.5.

Fixes #9576
2018-03-27 11:02:44 -05:00
christopher lee abf16a4469 fix workspace tests 2018-03-27 10:41:08 -05:00
William Vu a4ad7de4e0 Use a better error in scriptable sessions 2018-03-26 17:56:44 -05:00
William Vu e761d211b9 Land #9708, reload_lib command for msfconsole 2018-03-26 17:10:11 -05:00
William Vu 862a3ff74d Land #9618, pipe auditing improvements 2018-03-26 17:01:48 -05:00
James Barnett 83f2052ee7 Accidentally q 2018-03-26 16:09:56 -05:00
James Barnett cfa03a999c Finish moving current_workspace tracking to client 2018-03-26 15:58:47 -05:00
Matthew Kienow 991f4e35ea Remove added regex options from search_term 2018-03-26 14:07:21 -04:00
Brent Cook 3fb5137c2d use Rex::Socket::SslTcp.supported_ssl_methods for SSLVersion option 2018-03-26 03:40:49 -05:00
andrea 38af667094 Support for Ruby 2.5.0 fixing OpenSSL warnings 2018-03-26 02:52:02 -05:00
Brent Cook 4194b6d991 Land #9586, fix #9112, improve android screenshot error message on failure 2018-03-25 07:36:15 -05:00
Brent Cook 1610db482a minor style nits 2018-03-25 07:34:45 -05:00
Brent Cook 7c5c5513eb Merge remote-tracking branch 'upstream/master' into land-9586- 2018-03-25 07:29:55 -05:00
Brent Cook f662049b27 clarify screenshot on android scenario 2018-03-25 07:29:39 -05:00
Jon Hart d0ef5617fa Merge master and resolve conflict 2018-03-23 14:25:21 -07:00
b0yd 7e0c255591 Formatted reg binary type to hex when displaying query results. 2018-03-23 15:56:12 -04:00
Adam Cammack 71149e9c68 Remove executable Ruby files from classic loading 2018-03-23 14:49:06 -05:00
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