Brent Cook
428233b82d
Land #7949 , Format binary registry data nicely on display
2018-04-02 23:11:25 -05:00
Brent Cook
b445583a14
Land #9774 , use correct whitespace when patching python meterpreter
2018-04-02 23:07:36 -05:00
Brent Cook
b0123b2095
Land #9787 , Fix adding IPv6 routes with subnets or CIDR masks
2018-04-02 22:57:15 -05:00
James Barnett
e892911fbe
Use a constant for default workspace name
2018-04-02 17:02:14 -05:00
Meatballs
cac0587d42
Fix no-uac msi creation
2018-04-02 19:29:16 +01:00
Brent Cook
fa34f3e0a4
Land #9718 , Add get_user_spns 'kerberoasting' module
2018-04-02 10:04:44 -05:00
christopher lee
3aed6d6666
Initial
2018-04-02 08:08:23 -05:00
Brent Cook
f386ae0ba3
Land #9731 , tool updates
2018-04-01 23:26:42 -05:00
William Vu
840923d591
Land #9738 , msfconsole user-friendliness changes
2018-04-01 02:12:53 -05:00
scriptjunkie
774ef22d08
Fix upts -> opts
2018-03-30 22:26:53 -05:00
Matthew Kienow
cb2366d2eb
Fix regex search for serialized data column
2018-03-30 19:25:38 -04:00
Matthew Kienow
4c536a1819
Add optional parameter to skip columns
2018-03-30 19:23:41 -04:00
James Barnett
7d58b0a5f4
Merge branch 'goliath' into MS-3062_workspaces
2018-03-30 16:35:26 -05:00
James Barnett
ecbbf1d940
Pass workspace when using db_nmap
2018-03-30 15:27:32 -05:00
Spencer McIntyre
c8033d69c5
Use the new keyword style for v6
2018-03-30 13:56:15 -04:00
Spencer McIntyre
bb17bdb6dd
Fix adding IPv6 routes with subnets or cidr masks
2018-03-30 13:18:03 -04:00
Matthew Kienow
f10924a5c0
Update cmd note operations, validation and output
2018-03-29 23:15:10 -04:00
Matthew Kienow
2b7c3872d4
Add proxy method for find_or_create_note
2018-03-29 18:43:34 -04:00
zerosum0x0
3a266d93b6
support for ARM
2018-03-29 15:11:27 -06:00
James Barnett
3b1e3a4256
Missed one more bug in append_workspace
2018-03-29 15:18:31 -05:00
James Barnett
19e01b4b66
Fix bug in append workspace when using :wspace
2018-03-29 15:04:00 -05:00
James Barnett
f41490728b
Process workspace when importing nmap data
2018-03-29 11:46:34 -05:00
James Barnett
7f42235ad7
Create default workspace if it doesnt exist
2018-03-28 15:39:24 -05:00
James Barnett
d23e33a7bc
Make workspace -v work with updates
2018-03-28 13:31:49 -05:00
James Barnett
1b6aa86d92
Merge remote-tracking branch 'mkienow/MS-3061-remote-notes-read-update-delete' into MS-3062_workspaces
2018-03-27 15:57:41 -05:00
Matthew Kienow
0b5d3d31f9
WIP remote note read, update, delete
2018-03-27 16:36:56 -04:00
William Vu
f5025cb84e
Add Rex::Tar
...
This just inherits from Gem::Package::Tar{Reader,Writer} at the moment.
We may want to build out higher-level methods than what the inherited
code already provides. Or don't inherit at all.
2018-03-27 14:57:57 -05:00
Jeffrey Martin
b509c14851
detect the whitespace needed when patching meterpreter
2018-03-27 13:24:44 -05:00
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 26bf96b3ce/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
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
James Barnett
9099ef0bf1
Enable exec_report_job to handle includes
2018-03-13 11:34:44 -05:00
Mehmet İnce
b7f95b9cbe
Add a loadlib command
2018-03-13 14:03:44 +03:00
James Barnett
e480b7dd2c
Only do regex search if search_term is passed
2018-03-12 17:14:44 -05:00
James Barnett
2e287135c4
Fix bug in services search
2018-03-12 16:37:16 -05:00
Brent Cook
1587b5b682
Land #9686 , add ipv6 to slowloris, rhost to non-scanner modules
2018-03-12 16:13:21 -05:00
Auxilus
b22c606b9a
msftidy fixes
2018-03-13 01:39:47 +05:30
Auxilus
9a9e9ead51
msftidy fixes
2018-03-13 01:34:26 +05:30
Auxilus
131ad69083
return array from connect_to_pipe
2018-03-13 01:32:17 +05:30
Auxilus
ef515d256d
msftidy fixes
2018-03-13 00:34:25 +05:30
Auxilus
6e9a4916f5
scanner update
2018-03-13 00:23:18 +05:30
Matthew Kienow
fcd2bbd1de
workaround attempt to parse nil JSON string value
2018-03-12 14:29:42 -04:00
Matthew Kienow
636284d530
Update session inferred vuln handling
...
Add remote vuln attempt
2018-03-12 14:26:03 -04:00
James Barnett
65f5eeb534
Strip :workspace from service update
2018-03-12 12:28:39 -05:00
Brent Cook
d86dcbc237
Land #9632 , owa_login and auth_brute enhancements
2018-03-12 10:31:20 -05:00
Auxilus
80c7e9442b
output formatting
2018-03-09 22:16:26 +05:30
Auxilus
8b3e5c745b
fix pipeaudit.rb
2018-03-09 22:14:16 +05:30
Auxilus
2b7364a637
Add wordlist
2018-03-09 21:46:07 +05:30
Auxilus
1342284dc9
Add wordlist
2018-03-09 21:38:59 +05:30
Auxilus
7855c416c9
push latest changes
2018-03-09 14:52:53 +05:30
Auxilus
28f5920c9d
update module
2018-03-09 14:45:56 +05:30
Auxilus
5bdc0b4ecd
update mixins.rb
2018-03-09 14:18:10 +05:30
Auxilus
0e84026334
fix module path
2018-03-09 14:08:09 +05:30
Auxilus
899e03ba9b
Move pipeaudit to exploit/smb/client
2018-03-09 14:05:53 +05:30
h00die
ec7a62bc4c
move ssh platforms to lib
2018-03-08 21:23:11 -05:00
Auxilus
cc9fbc93ed
fix format
2018-03-09 02:19:18 +05:30
Auxilus
a00ab2040f
include mixin to psexec_ms17_010
2018-03-08 23:04:21 +05:30
Auxilus
e6a9f2609f
include mixin to psexec_ms17_010
2018-03-08 23:01:58 +05:30
Adam Cammack
780c8f0506
Fix non-scanner external modules
2018-03-07 17:11:56 -06:00
James Barnett
b18ed03407
Merge branch 'goliath' into MS-2909
2018-03-07 14:55:50 -06:00
James Barnett
c670748fe3
Update services signature
2018-03-07 13:59:09 -06:00
James Barnett
c52daf43bf
Forcefully delete service as fallback
2018-03-07 12:07:47 -06:00
James Barnett
c058d0fba0
WIP: port db_export command
2018-03-06 15:15:27 -06:00
christopher lee
8740eeb9d7
Replace space
2018-03-06 13:33:29 -06:00
Brent Cook
d6871f5733
Land #9614 , Juniper post enum module
2018-03-06 10:29:56 -06:00
christopher lee
68d72cbfa7
Goliath Cleanup in preparation for merge to master
2018-03-06 10:21:22 -06:00
dcylabs
708f1da0ed
fix SSL certificate provider
2018-03-05 17:01:37 +01:00
James Barnett
b42c3ff654
Merge branch 'goliath' into MS-2909
2018-03-02 16:32:55 -06:00
James Barnett
b0012d6f36
Include hosts when returning services
2018-03-02 16:32:02 -06:00
bwatters-r7
0d07d44b14
ReLand #9565 , Reverse TCP x64 RC4 via max3raza's rc4_x64 asm
...
This reverts commit 7964868fcd
.
2018-03-02 16:09:52 -06:00
James Barnett
fd4032928e
Add services search
2018-03-02 10:57:35 -06:00
bwatters-r7
7964868fcd
Revert "Land #9565 , Reverse TCP x64 RC4 via max3raza's rc4_x64 asm"
...
This reverts commit fcc579377f
, reversing
changes made to 95cd149378
.
2018-03-02 08:29:48 -06:00
bwatters-r7
fcc579377f
Land #9565 , Reverse TCP x64 RC4 via max3raza's rc4_x64 asm
2018-03-02 07:34:45 -06:00
Jon Hart
f446f726ad
Land #9596 , fixes #9592 , broken NTP DRDoS modules
2018-03-01 17:12:00 -08:00
christopher lee
4f6b1de9a3
Merge branch 'master' into goliath
2018-03-01 14:14:39 -06:00
Sonny Gonzalez
883654f0ea
Land #9653 , fix Y2k38 issue (until Jan 1, 2038)
2018-03-01 09:13:41 -06:00
Brent Cook
4fec2e758d
make fix more precise, based on https://github.com/rapid7/metasploit-framework/pull/2343
2018-03-01 08:59:55 -06:00
Brent Cook
27bd2a4a9f
workaround Y2k38 issues in java certificate generation
2018-03-01 08:41:28 -06:00
James Barnett
06d2482e86
Implement services update
...
NOTE: This changes functionality for the services command flags.
Previously -s and -p were used for searching for services.
Now the commands will only be used for adds/updates.
If you would like to search, please use -s and pass a search string
2018-02-28 15:12:23 -06:00
Matthew Kienow
2d5f089ee6
Land #9646 , fix stale module cache issue
2018-02-28 15:17:00 -05:00
Jeffrey Martin
425f949bf8
Land #9638 , treat 'password must change' as a successful login
2018-02-28 11:28:38 -06:00
christopher lee
0949e0a501
Don't munch exception
2018-02-28 11:28:07 -06:00
christopher lee
cea61e7aa4
Fix bug with remove_from_cache
2018-02-28 11:21:34 -06:00
christopher lee
1686b82a40
Adhere to style guide by using unless
2018-02-28 11:11:26 -06:00
christopher lee
8b4c7b886f
Updated to use delete_if
2018-02-28 11:00:40 -06:00
christopher lee
964be3b5f0
Fix problem with stale module cache
2018-02-28 08:41:14 -06:00
James Barnett
dffbc67e71
Implement service delete
...
Also fix bug searching for services by host address
2018-02-27 17:17:07 -06:00
Brent Cook
9597e5294d
treat MUST_CHANGE + PASSWORD_EXPIRED as valid
2018-02-27 15:21:21 -06:00
James Barnett
c90fabee60
Implement remote service create
2018-02-27 14:20:43 -06:00
James Barnett
96709600e1
Condense services to use opts instead of individual params
2018-02-27 13:38:50 -06:00
James Barnett
9dc6089fcf
Merge branch 'goliath' into MS-2909
2018-02-27 11:14:15 -06:00
Jon Hart
f09c5eafc7
Appease hound
2018-02-27 04:12:58 -06:00
Jon Hart
46299dff00
The DRDOS mixin operates on strings, so make the bindata'd NTP classes cooperate
2018-02-27 04:12:57 -06:00
Jon Hart
d7853aaf60
Revert "update NTP drdos lib to use correct method on bindata objects"
...
This reverts commit 166070e9c37a4130f976f806116881c70a8401c6.
2018-02-27 04:12:57 -06:00
Brent Cook
bcf5918fb6
update NTP drdos lib to use correct method on bindata objects
2018-02-27 04:12:57 -06:00
Brent Cook
66e3ac4c76
treat 'password must change' as a successful login
2018-02-26 17:57:31 -06:00
William Vu
0e4fc48df4
Fix #9602 , a little defensive programming
...
Check for a nil message and unnecessary auth failures while looping.
2018-02-26 16:52:25 -06:00
James Barnett
847b9ba0d0
Add option to delay between runthroughs
2018-02-26 16:27:03 -06:00
Auxilus
4b0cb7631c
Update pipe_auditor.rb
2018-02-25 02:18:15 +05:30
Auxilus
3f93055a72
Add pipe_auditor
2018-02-24 11:14:03 +05:30
Auxilus
be77cb2a2b
Add pipe_auditor
2018-02-24 11:04:41 +05:30
James Barnett
1c9c1dc1fc
Add password spray option to brute force
2018-02-23 12:30:11 -06:00
h00die
c7bbc6eca4
juniper post enum module
2018-02-22 21:08:21 -05:00
UserExistsError
e19a071910
add bind_named_pipe x86
2018-02-22 19:03:37 -07:00
Matthew Kienow
ecad74cf99
Add cmd_vulns search and delete operations
2018-02-22 19:05:18 -05:00
James Barnett
1cee532526
Merge branch 'rapid7/master' into goliath
2018-02-22 14:49:45 -06:00
Matthew Kienow
22752518ea
WIP remote vuln read, update, delete
2018-02-22 13:53:22 -05:00
Matthew Kienow
7ad7188824
Fix comment typo
2018-02-22 11:29:44 -05:00
Jacob Robles
738d6ab33a
Land #9604 , Fix logged errors when running without Python 3.6 / gmpy2
2018-02-22 08:11:30 -06:00
Brent Cook
3f88e59516
handle Python 3.5/3.6 differences so we always have a UTF-8 string
2018-02-21 21:54:27 -06:00
William Vu
3880f6a65e
Finally fix "Unknown admin user ''" after 2yrs
...
The failed password auth was necessary after all. I misread the PoC. :'(
Apparently the password auth sets the username, while the backdoored
keyboard-interactive auth sets the password.
2018-02-21 20:44:35 -06:00
James Barnett
d4440d049d
Merge branch 'goliath' of github.com:clee-r7/metasploit-framework into goliath
2018-02-21 11:16:31 -06:00
James Barnett
3005a8b7ce
Merge branch 'rapid7/master' into goliath
2018-02-21 11:16:05 -06:00
Brent Cook
78822fd799
Land #9524 , prefer 'shell' channels over 'exec' channels for ssh CommandStream
2018-02-21 06:59:09 -06:00
Matthew Kienow
31cc516395
Merge branch 'goliath' into standardize_proxy_errors
2018-02-20 16:47:34 -05:00
James Barnett
b3642b1079
Address PR comments
2018-02-20 15:30:37 -06:00
James Barnett
3c9092f9a6
Complete services GET
2018-02-20 14:41:49 -06:00
James Barnett
09ae4ac8ac
Add more info to console output
2018-02-20 13:34:33 -06:00
Brent Cook
99965c142b
remove duplicate check
2018-02-20 04:42:49 -06:00
Brent Cook
bb3a11dd20
use ctrl-d to cancel input instead
2018-02-20 04:40:00 -06:00
Tim W
5083150002
fix #9112 , improve error message on failure
2018-02-20 18:06:03 +08:00
Brent Cook
f5f7b4d25a
handle sessions still open
2018-02-20 03:31:20 -06:00
Brent Cook
e995ccfc33
make this a little easier to read
2018-02-20 03:27:55 -06:00
Brent Cook
e26fb49c99
if we have no more input from the console, quit
2018-02-20 03:27:38 -06:00
Brent Cook
3d8451e616
Land #8997 , add local 'ls' support to Meterpreter sessions
2018-02-19 23:21:59 -06:00
Brent Cook
b9c1a64d20
Land #9505 , Support local knowledge base documents
2018-02-19 21:39:55 -06:00
Brent Cook
93689f0f0e
Land #9270 , Implement plugin API for hooking database events
2018-02-19 21:36:26 -06:00
Brent Cook
4e9d900a17
Land #9507 , Expand paths for meterpreter's cp, mv, and rm commands
2018-02-19 21:26:03 -06:00
Brent Cook
3d67d2ed12
Land #9443 , Add warning to FileDropper for deleting CWD
2018-02-19 21:22:39 -06:00
UserExistsError
b3f26ea55f
bind_named_pipe fixes
2018-02-18 10:31:57 -07:00
RageLtMan
80779f73ef
Implement Michael Schierl's suggestions
2018-02-16 23:03:05 -05:00
Brent Cook
bd2af0143a
properly handle when there is no stat callback specified on upload
2018-02-16 16:14:09 -06:00
Brent Cook
289277c613
Land #9516 , Support Bash-Style Continuation Lines
2018-02-16 10:53:58 -06:00
RageLtMan
354eb4092a
Reverse TCP x64 RC4 via max3raza's rc4_x64 asm
...
To round out the work done by mihi for x86 stages back in the day,
this PR provides x64 Windows stage encryption in RC4 via assembly
written/modified by max3raza during adjacent work on DNS tunneled
transport.
Stage encryption differs from encoding in that there is no decoder
stub or key materiel carried with the stage which can be used by
defensive systems to decode and identify the contents. Persistence
payloads, oob-delivered stage0, and other contexts benefit heavily
from this as their subsequent stage is difficult to detect/identify,
and the chance of accidental execution of the wrong payload/stage
is drastically reduced if separate keys are in play for individual
targets - acquiring the wrong stage will result in decryption
failure and prevent further execution.
For historical context, all of the RC4 stagers implement in-place
decryption via stage0 for the contents of stage1 using the provided
passphrase converted to a key and embedded in stage0 as part of the
payload.
Testing:
In-house testing with Max - we got sessions, loaded extensions.
Notes:
All credit for the work goes to Max3raza - big ups for getting
this knocked out.
2018-02-16 05:15:05 -05:00
Brent Cook
6734e532f5
Land #9562 , avoid an error with aux module command dispatcher
2018-02-15 17:46:58 -06:00
Brent Cook
a197997aca
avoid chinese finger trap logic, put it all on one side
2018-02-15 17:45:09 -06:00
Brent Cook
38b03fdfff
Merge branch 'upstream-master' into land-9539-
2018-02-15 16:22:13 -06:00
Brent Cook
2d3aef9031
Land #9533 , Add output file support to the vulns command
2018-02-15 15:52:25 -06:00
Brent Cook
93450b87dd
use common retry options for UDP
2018-02-15 14:36:21 -06:00
Wei Chen
6fe8691528
Fix #9090 , honoring retry counts for x86/64 payloads
...
Fix #9090
2018-02-15 13:52:34 -06:00
Brent Cook
0f656d6b5b
Land #9563 : improve memory usage on meterpreter file upload
2018-02-15 12:07:19 -06:00
a1exdandy
7e03bf838b
Fix src_size view
2018-02-15 17:44:41 +05:00
a1exdandy
a0c473f29e
Upload memory usage optimization
...
Optimize xor_bytes memory usage, use small buffer for upload,
add verbosity
2018-02-15 17:05:22 +05:00
RageLtMan
177e1321ae
Aux command dispatcher in exploit ctx with action
...
The Auxiliary command dispatcher checks modules for passive actions
expecting them to have included Msf::Module::HasActions mixin. The
mixin is included in post and aux modules already, but not in
exploits. When the aux dispatcher handles an exploit module, it
may get upset along the lines of:
```
[-] Error while running command exploit: undefined method 'passive'
for #<Msf::Modules::M...3::MetasploitModule:0x0000000d83de0428>
Did you mean? passive?
Call stack:
/opt/metasploit4/msf4/lib/msf/ui/console/command_dispatcher/
auxiliary.rb:106:in `cmd_run'
```
Avoid this mess by having the conditional which checks the methods
included by that mixin depend on the module having included the
mixin in the first place.
Testing:
In local fork (hence the lineno) it seems to fix the problem.
The problem condition and fix should be independently tested
upstream.
2018-02-15 04:20:09 -05:00
Wei Chen
9a293cd30e
Fix #8120 , Fix undef method 'gsub' in bavision_cam_login
...
Fix #8120
2018-02-14 11:03:03 -06:00
Jeffrey Martin
3811665b69
Land #7699 , Add UDP handlers and payloads (redux)
2018-02-13 14:50:09 -06:00
Jeffrey Martin
f5768e7ced
gate session reported when using bind udp
...
While this method here is somewhat noisy on the network it eliminates
a poor user experience when the handler is started but the payload is
not yet running on the target.
When a target is sent a udp packet and it is not rejected push down
an initial "echo syn" command that will respond with output. This
allows framework to be aware that the payload is what is running on
the server port instead of assuming a non-existent target is a valid
session.
2018-02-13 14:44:57 -06:00
UserExistsError
8ae8a0d94b
added bind_named_pipe payload
2018-02-11 18:56:50 -07:00
Wei Chen
b9faa9e92b
Fix a typo
2018-02-09 20:28:55 -06:00
Wei Chen
81e0d56261
Always write the file as long as the option is set
2018-02-09 20:28:12 -06:00
Wei Chen
958513bd86
Fix #9522 , Add output file support to the vulns command
...
This adds a new feature for the vulns command for msfconsole. It
allows the user to be able to save the vulnerability as a CSV
file.
Fix #9522
2018-02-09 19:45:46 -06:00
James Barnett
efd23d37c3
Use common error handling
2018-02-09 16:24:45 -06:00
Spencer McIntyre
c612dbfdbf
Also fix GitHub related pull request links
2018-02-09 15:16:10 -05:00
Spencer McIntyre
b2d617bde7
Fix a bug in the markdown docs references
2018-02-09 13:41:39 -05:00
James Barnett
c50b8b5c4f
Store loot data as-is, not base64
2018-02-08 18:15:31 -06:00
James Barnett
bbd25fc97b
WIP: getting services add working
2018-02-08 17:20:50 -06:00
James Barnett
effd0c3db2
Fix bug when not updating type
2018-02-08 16:07:20 -06:00
James Barnett
f12405191e
Fix a few bugs and PR comments
2018-02-08 15:10:44 -06:00
James Barnett
f114092445
Merge branch 'goliath' into MS-2833
2018-02-08 14:32:03 -06:00
James Barnett
be1ce573e7
Fix style issue
2018-02-08 13:35:28 -06:00
James Barnett
1d2af0658c
Fix bug with updating loot type
2018-02-08 13:26:40 -06:00
Jacob Robles
c642d420c2
Land #9489 , Add scanner for the Bleichenbacker oracle (AKA: ROBOT)
2018-02-08 12:55:02 -06:00
Matthew Kienow
de0c4c0572
Allow update of host workspace
2018-02-08 13:19:27 -05:00
Brent Cook
b1d0529161
prefer 'shell' channels over 'exec' channels for ssh
...
If a command is not specified to CommandStream, request a "shell"
session rather than running exec. This allows targets that do not have a
true "shell" which supports exec to instead return a raw shell session.
2018-02-08 02:21:16 -06:00
James Barnett
542e8a3538
Remove unneeded workspace
2018-02-07 19:51:23 -06:00
Spencer McIntyre
b88eff7e97
Switch the docs search order
2018-02-07 16:43:15 -05:00
Spencer McIntyre
214c137b4a
Don't use parenthesis around pgets
2018-02-07 15:53:11 -05:00
jbarnett-r7
352cf295b5
Merge branch 'goliath' into MS-2833
2018-02-07 14:38:26 -06:00
James Barnett
5b35662dbf
Address PR comments
2018-02-07 14:21:31 -06:00
James Barnett
cb093d8063
Use proper logging
2018-02-07 10:25:56 -06:00
Matthew Kienow
52b8f405bd
Refactor change host methods, remove debug output
2018-02-06 18:54:05 -05:00
James Barnett
74f811d865
Add TODOs
2018-02-06 17:31:42 -06:00
James Barnett
5bc38206c0
Few more loot bugs
2018-02-06 17:22:09 -06:00
James Barnett
0dfc10b1ec
Fix a couple of bugs in loot servlet
2018-02-06 17:02:17 -06:00
James Barnett
6e2503bbd8
Add loot update
2018-02-06 16:16:22 -06:00
Matthew Kienow
629f79ebf7
WIP remote host update
2018-02-06 16:11:46 -05:00
Spencer McIntyre
0ad7d10e05
Use a continuation flag to disable tab completion
2018-02-06 14:44:55 -05:00
Spencer McIntyre
6d7579d907
Support breaking commands into multiple lines
2018-02-06 14:29:11 -05:00
James Barnett
49b88dbef7
Pass loot search using query string
2018-02-05 18:15:05 -06:00
James Barnett
c72c41e7f3
Move loot search to db_manager
2018-02-05 16:43:02 -06:00
jbarnett-r7
f176e339bc
Merge pull request #12 from clee-r7/ms-2911
...
Ms 2911
2018-02-05 15:46:28 -06:00
Spencer McIntyre
8b56bbc541
Update mkdir as well for path expansion
2018-02-05 16:16:53 -05:00
Spencer McIntyre
c70bcb5869
Use a constant for the regex and update rmdir too
2018-02-05 16:06:16 -05:00
christopher lee
1759621b03
Make 8080 default service port
2018-02-05 15:01:03 -06:00
Spencer McIntyre
f441306036
Expand paths for meterpreter's cp, mv, and rm cmds
2018-02-05 15:22:05 -05:00
christopher lee
020a28f5c7
Unify data service command
2018-02-05 13:28:17 -06:00
Spencer McIntyre
2a79319dad
Support local knowledge base documents
2018-02-05 11:13:05 -05:00