Commit Graph

7956 Commits

Author SHA1 Message Date
Carter Brainerd 3da48dbb10 Fix bug caused by last commit 2018-04-17 13:38:38 -04:00
Carter Brainerd 7bfaae0919 Update system.rb
Fix get_listening_ports bug
2018-04-17 13:35:25 -04:00
James Barnett 82798424b2 Support getting a workspace via id
Also implements a helper method to sanitize sinatra injected
params since it was causing issues downstream. Updated each
use of sinatra params to use this helper method.
2018-04-17 12:35:22 -05:00
Carter Brainerd 85b09a162a Add some efficiency improvements 2018-04-17 12:09:46 -04:00
James Barnett b569498250 Address more code review comments 2018-04-17 10:52:56 -05:00
James Barnett a8a95a03a3 Implement remote workspace delete 2018-04-17 10:19:40 -05:00
Carter Brainerd d91ef7c9dc Add strip to protected_* methods 2018-04-17 11:04:08 -04:00
James Barnett 68ad91763a Merge branch 'rapid7/master' into MS-3062_workspaces 2018-04-16 15:33:59 -05:00
James Barnett 2ef451c349 Land #9873, add notes functionality to remote datastore
This PR enables create, update, and delete functionality for the notes
command and data model when using a remote data service.
2018-04-16 15:03:27 -05:00
Matthew Kienow e283f109a7 Remove commented out code 2018-04-16 14:14:46 -04:00
Brendan Coles f3ee870d72 Remove selinux_enforcing? method 2018-04-16 12:16:00 +00:00
Brendan Coles 5bc24d048c Remove kaslr_enabled? method 2018-04-16 11:51:15 +00:00
Brendan Coles a1a4c636fb strip 2018-04-16 10:22:41 +00:00
Auxilus 4de9f84dd4 fix no method error for Failure::Unknown 2018-04-16 13:51:32 +05:30
Auxilus f0b9ea635a cleanup psexec code 2018-04-16 09:04:36 +05:30
Brendan Coles b5c8b2ed19 Add kaiser_enabled? and kaslr_enabled? methods 2018-04-15 06:53:00 +00:00
Brendan Coles 78daa283c7 Add new methods to Msf::Post::Linux::Kernel lib 2018-04-14 07:33:29 +00:00
Adam Cammack e65de2b56f Conform to JSONRPC 2.0 spec in external modules
Responses to queries had a `response` field instead of the required
`result` field.
2018-04-12 16:55:27 -05:00
Matthew Kienow 37479d8fd4 Modify notes search to handle serialized data
Initial Goliath notes search implementation attempted to use Arel and
decode base64 serialized data column, however, this was not without
issue. Updated implementation retrieves all records that match
conditions, thus data has been deserialized and then filters using
specified search term.
2018-04-12 17:37:16 -04:00
cbrnrd bf8c62f27c change if ! to unless 2018-04-12 09:54:57 -04:00
cbrnrd 5923845f68 Merge branch 'post_linux_system_dev' of https://github.com/cbrnrd/metasploit-framework into post_linux_system_dev 2018-04-12 09:16:31 -04:00
cbrnrd 5f725e09db Make nosuid? and noexec? take a filepath as param 2018-04-12 09:15:44 -04:00
thecarterb 0abeb4fee6 Add new functions and fix return bugs attempt 2 2018-04-11 21:52:53 -04:00
thecarterb 892fb70fc6 Revert "Add new functions and fix return bugs"
This reverts commit 1e34a6d3c6.
2018-04-11 21:46:34 -04:00
James Barnett 86b6009999 Land #9860, Fix DB init when database.yml is missing
This PR fixes a bug introduced with goliath that caused incorrect error messages
and other error messages when no database.yml was present. It also improves the
messaging around that use case and loads CommandDispatcher::Db correctly.
2018-04-11 16:13:40 -05:00
Adam Cammack f1d426d257 Land #9833, Remove broken feature detection 2018-04-11 15:02:53 -05:00
James Barnett 4e5e0f2c40 Merge branch 'master' of github.com:rapid7/metasploit-framework 2018-04-11 13:59:43 -05:00
William Vu 6c6aa8db82 Print generated CmdStager with inspect, not join
I dun goofed. I knew I should have just printed it verbatim.

tl;dr I thought I had accounted for command compression. I was wrong.
This should also give us more information about what exactly is being
run and how many times.
2018-04-11 13:49:00 -05:00
Matthew Kienow 3db19fe4f2 Fix DBManager::Service use of services method
services method was previously modified to use a hash as the parameter,
but each_service was passing a workspace. Make each_service method
consistent with other DBManager modules.
2018-04-11 11:43:12 -04:00
cbrnrd 1e34a6d3c6 Add new functions and fix return bugs 2018-04-11 10:47:21 -04:00
Matthew Kienow e639fda53c Fix DB initialization with no database YAML 2018-04-11 09:15:38 -04:00
thecarterb 57e243ac49 Read from /proc/mounts instead of the mount command 2018-04-10 23:20:00 -04:00
Wei Chen 13edf66fa3 Fix options 2018-04-10 18:57:02 -05:00
Brent Cook 41a21def80 Land #9857, Restore services search semantics 2018-04-10 17:25:48 -05:00
James Barnett cd48b47760 Fix failing tests.
-Was accidentally deleting opts[:workspace] instead of processing
-Update notes help text expectations
2018-04-10 17:10:32 -05:00
James Barnett e51f41fa34 Merge remote-tracking branch 'msf_jbarnett/fix_services_bugs' into MS-3062_workspaces 2018-04-10 13:35:33 -05:00
Wei Chen b630d5c327 Add encryption support for shellcode 2018-04-10 11:14:14 -05:00
Adam Cammack 4495eea1ca Land #9836, Force #! for external modules 2018-04-10 11:08:15 -05:00
Adam Cammack 81ec33b0e4 Refactor script path check into base module loader 2018-04-10 11:07:21 -05:00
James Barnett 48c0bbfa7a Only display the services for a given workspace 2018-04-10 10:28:02 -05:00
cbrnrd 07b3b576f5 Fix parsing in get_cpu_info 2018-04-10 06:03:16 -04:00
cbrnrd 1276960d88 Fix typo in raise call 2018-04-10 05:54:35 -04:00
cbrnrd 0a79c5a15b Add docs to nosuid? 2018-04-10 05:53:19 -04:00
cbrnrd 6e6bc9bc6b Add noexec and nosuid
Also fix some regex bugs
2018-04-10 05:51:57 -04:00
James Barnett 90542779ff Audit models to ensure :workspace is passed only when needed 2018-04-09 14:50:37 -05:00
Brent Cook 7b85edfde5 Land #9822, Fix backgrounded aggressive exploits 2018-04-09 09:36:12 -05:00
h00die a473dd04a8 Land #9813, Add etcd library and version scanner 2018-04-08 07:05:31 -04:00
Brent Cook 07c9be5130 Land #9812, Add Msf::Post::Linux::Kernel lib 2018-04-08 00:40:03 -05:00
Brent Cook 6c8ea2d883 also be sure to load executable modules if they don't have #! 2018-04-07 21:15:51 -05:00
Brent Cook 28ebe9d102 sanity check that external modules start with #! before executing 2018-04-07 16:31:34 -05:00