infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,374 Commits
7 Branches
556 Tags
419 MiB
Commit Graph

10140 Commits (9bce08b8134f02be65a19e2178bd2324edb859de)

Author SHA1 Message Date
James Lee a3ae0daf5a
Whitespace 2015-03-26 10:02:08 -05:00
sinn3r 8f03cadb92 Forgot to remove print_debug 2015-03-25 16:08:47 -05:00
jvazquez-r7 72a0909e9b
Land #4992, @wchen-r7's support for multiple ActiveX controls on BrowserExploitServerMerge 2015-03-25 13:30:36 -05:00
James Lee 8f0c434faa Add specs for the new method 2015-03-25 12:34:10 -05:00
sinn3r 6e3e696262 Use symantec_web_gateway as an example of using send_request 2015-03-25 10:55:46 -05:00
sinn3r 60f1d9c961 More yard doc 2015-03-25 10:50:11 -05:00
sinn3r 9b9e157e84 More yard doc 2015-03-25 02:26:06 -05:00
sinn3r ded500a9ae Use send_request 2015-03-25 02:13:40 -05:00
sinn3r 6984e5234e Fix a typo 2015-03-25 02:01:25 -05:00
sinn3r 8a8d6fb5ab Some more changes 2015-03-25 02:00:23 -05:00
sinn3r 855cadc6b1 Rescue more exceptions 
The attempt_login method is rescuing these exceptions, so maybe
I should do the same.
 2015-03-25 01:48:37 -05:00
sinn3r 8f95624bf7 Add #send_request to Metasploit::Framework::LoginScanner::HTTP 2015-03-25 01:40:02 -05:00
Christian Mehlmauer 7bf00f8f47
Land #4789, @rastating WPLMS wordpress module 2015-03-24 20:46:38 +01:00
James Lee b0fac4824c
Stop caring about order of keys in user_data 2015-03-24 14:21:52 -05:00
William Vu 6d85b5fd1e
Land #4998, non-loopback LHOST tab completion 2015-03-24 14:00:01 -05:00
William Vu 660f3dac2b
Land #4997, smb_version SMBDirect option fix 2015-03-24 13:46:09 -05:00
James Lee 414983ac8c
Merge branch 'feature/MSP-11925/create-user-data' into staging/single-vuln-push 
Conflicts:
	Gemfile.lock
 2015-03-24 12:42:08 -05:00
James Lee 65c00dffac
Tab complete non-loopback interfaces' addresses 2015-03-24 12:10:58 -05:00
sinn3r 58c5be0d72 Allow SMBDirect to be optional 
The smb_version module needs to deregister the SMBDirect option,
but cannot do this because SMBDirect is a required option. By
having it as optional, the user no longer needs to set it. Also,
since SMBDirect already has a default value, having it as optional
should not change the mixin's default behavior.
 2015-03-24 12:04:44 -05:00
RageLtMan 548a710745 Replace db_nmap string concat with an Array 
16eab48012 introduced changes to
cmd_db_nmap which pass a new arguments variable to Open3 with a
list of args excluding save.

This approach created a problem wherein the address of the target
had to be passed in first and arguments could get mangled.

Reintroduce an array format, exploding when passing to Open3.
Ensure output file options are appended to the arguments being
passed to Open3, instead of the args variable.

Error example:
db_nmap -F 192.168.0.1
[*] Nmap: 'nmap: unrecognized option '- 192.168.0.1 ''
 2015-03-24 04:36:58 -04:00
sinn3r bef67d773c Don't break untested_payloads.rb 2015-03-24 00:54:11 -05:00
sinn3r 3c4da5c3ff Update BES rspec 2015-03-24 00:10:18 -05:00
OJ 25dcfc796a Better support old binaries in rev http(s) 
* Patch 256char URL if the 512char one doesn't work.
* Return an empty list in the case where the ext enum fails.
 2015-03-24 10:14:44 +10:00
Brent Cook 1869977921
Land #4962: OJ adjusts MSF to new metsrv needs 
bump meterpreter bins to 0.0.17
 2015-03-23 17:18:06 -05:00
sinn3r 2900f57afd It looks like this works 2015-03-23 16:46:53 -05:00
David Maloney 60966f3d2a
handle a blank response body 
sometimes the response body itself can be blank
so we need to handle that properly.

MSP-9972
 2015-03-23 16:03:30 -05:00
OJ 24d74b26e3 Beginning work for stageless x64 meterpreter 2015-03-24 06:50:06 +10:00
William Vu 809bc52dfc
Land #4982, tagging for msfconsole 2015-03-23 15:28:50 -05:00
sinn3r 0e1b9f90b4 Small details 2015-03-23 14:40:20 -05:00
HD Moore 6852475be0 Placeholder for UUID options 2015-03-23 14:35:33 -05:00
HD Moore dfbaa6b42e Typo 2015-03-23 14:35:08 -05:00
sinn3r e520ace1f1 Stash 2015-03-23 14:21:46 -05:00
sinn3r 156520338d Making some changes to how BES handles ActiveX 2015-03-23 12:21:27 -05:00
William Vu 2f83a53884
Add missing fix for #4921 2015-03-23 00:26:18 -05:00
William Vu 8165ae35d0 Remove extraneous semicolon 2015-03-23 00:26:03 -05:00
William Vu e176b21bcd
Land #4921, db_nmap help and tab completion 2015-03-23 00:22:46 -05:00
OJ 20131110cd Add verify_ssl file (missed in prev commit) 2015-03-23 13:22:10 +10:00
OJ 9c9d333a1b Create verify ssl mixin, adjust some formatting 2015-03-23 13:21:08 +10:00
sinn3r 23685694ad The tags column should be a virtual column 2015-03-22 21:04:37 -05:00
sinn3r 182018786b This is probably the proper way to delete tags 2015-03-22 20:55:20 -05:00
sinn3r ffe48e1ec8 Don't need order to delete 2015-03-22 20:43:11 -05:00
sinn3r ef62fc3df7 Allow the delete mode for tags 2015-03-22 20:08:23 -05:00
HD Moore bc3c73e408 Merge branch 'master' into feature/registered-payload-uuids 2015-03-22 18:51:13 -05:00
sinn3r b2cc3c4954 I found more bugs and fixed them 2015-03-22 18:21:57 -05:00
sinn3r 708eb42984 I fix bugs for tagging 2015-03-22 18:13:40 -05:00
nstarke dac5b078f0 Minor fixes for format and style 
This commit contains a few minor tweaks
for style and format.  Some whitespace removed,
an erroneous 'return' removed, and using single
quotes for consistency.  Updated as per request.
 2015-03-22 22:51:21 +00:00
nstarke 16eab48012 Adding help and tab functions for db_nmap 
These functions address certain problems
listed in GitHub issue #4353, but do not
address all issues in that ticket.  Most
notably, this commit adds basic tab
completion for db_nmap.
 2015-03-22 22:45:56 +00:00
HD Moore 378e867486 Refactor Msf::Payload::UUID, use this in reverse_http 2015-03-22 16:17:12 -05:00
HD Moore 0d1fe37710 Ignore non-base64url characters during decode 2015-03-22 16:16:47 -05:00
sinn3r 863cbcbddb Add real tagging for the hosts command 2015-03-22 15:34:37 -05:00
HD Moore 94241b2998 First attempt at rewiring HTTP handlers to use UUIDs 2015-03-21 03:15:08 -05:00
sinn3r 97b919923e Fix undefined esize in Rex::Exploitation::Egghunter 
esize is not a valid variable, and we don't need it either.
 2015-03-20 21:32:46 -05:00
HD Moore 858d9b1e7a Introduce Rex::Text.(en|de)code_base64url and use it for uri_checksum 2015-03-20 21:32:08 -05:00
HD Moore 1eafb21741
Lands #4970, fixes exception about msfconsole.rc 2015-03-20 16:49:04 -05:00
William Vu 259e95ed21 Add load_resource exception for msfconsole.rc 
This prevents msfconsole from erroring on a nonexistent msfconsole.rc.
 2015-03-20 16:50:27 -05:00
jvazquez-r7 1226b3656f
Land #4945, @wchen-r7's login scanner for Symantec web gateway 2015-03-20 14:44:05 -05:00
jvazquez-r7 62871255b0
Match class and file names 2015-03-20 14:25:20 -05:00
William Vu 4d00114428 Add parens around print_error 2015-03-20 13:53:14 -05:00
sinn3r 2c5c94288d Fix #4966, tell the user the resource script path is invalid 
Fix #4966
 2015-03-20 13:38:12 -05:00
jvazquez-r7 179177d5c0
Fix typo 2015-03-20 13:27:41 -05:00
sinn3r b19f766728
Land #4942, Gitlab Login Scanner 2015-03-20 13:02:12 -05:00
OJ 9d20d057dd Update Meterpreter URL length to 512 2015-03-20 13:16:43 +10:00
oj@buffered.io fd4ad9bd2e Rework changes on top of HD's PR 
This commit removes duplication, tidies up a couple of things and puts
some common code into the x509 module.
 2015-03-20 13:06:57 +10:00
OJ 7b4161bdb4 Update code to handle cert validation properly 
This code contains duplication from HD's PR. Once his has been landed
this code can be fixed up a bit so that duplication is removed.
 2015-03-20 12:52:47 +10:00
OJ 7ca91b2eb5 Add support for ssl to the patcher 2015-03-20 12:52:38 +10:00
OJ d38e2c968e Add required include for stageless meterpreter 2015-03-20 12:52:28 +10:00
OJ a9f74383d0 Update patch to support both ascii and wchar 2015-03-20 12:52:18 +10:00
OJ acd802c5fd Initial work for WinHTTP comms support in Meterpreter 2015-03-20 12:51:47 +10:00
William Vu cf645772b6
Land #4960, hosts -i, -n, and -m support 2015-03-19 21:34:14 -05:00
William Vu 38dbd1889e Fix report_note to use :data 
:note doesn't do what we want.
 2015-03-19 21:33:17 -05:00
William Vu 83ce967d75 Clean up hash syntax as per style guide 2015-03-19 21:23:28 -05:00
Brent Cook 564962042e
Land #4925, OJ adds self-contained windows meterpreter options 2015-03-19 21:07:32 -05:00
HD Moore c0bf51e0f5 Add a timestamp to the UUID structure 2015-03-19 19:11:58 -05:00
sinn3r f38ad13094 Resolve #4891, new arguments for the hosts command 
Resolve #4891
 2015-03-19 17:00:41 -05:00
Brent Cook 24ce0118b8 reenable UTF filtering support where needed 
revert d22231bdc8
 2015-03-19 16:02:21 -05:00
HD Moore d53ccb32a0 Turn off unicode filtering by default for non-Windows platforms (UTF-8 consoles) 
This is a followup to support for unicode added in #4950
 2015-03-19 15:45:45 -05:00
OJ a582e05b6d Merge gemfile changes in master 2015-03-20 06:29:38 +10:00
OJ 040ef1e3e9
Land #4950: ls unicode and sorting in meterpreter 2015-03-20 06:28:29 +10:00
OJ 7899881416 Update POSIX bins from master 2015-03-19 14:50:14 +10:00
Meatballs 2dd9dcb26c
Dont use native unpack operators! 2015-03-18 23:48:39 +00:00
Meatballs 975ddc9092
Add some spec mockery 2015-03-18 23:43:46 +00:00
HD Moore ce0796a427 Base module for Payload UUID support 2015-03-18 17:03:47 -05:00
HD Moore ae621c83c5 Add a URL-safe base64 encoder/decoder 2015-03-18 17:03:29 -05:00
Brent Cook c774038fe6 improve ls output by providing various new options 2015-03-18 16:02:03 -05:00
David Maloney 4293af01b1
make sure we strip leading whitespace 
in the aforementiond record_request_and_response method
we need to still make sure to strip leading whitespace
from the front of our data before saving it

MSP-9972
 2015-03-18 11:23:45 -05:00
David Maloney dacaa9e82b
simplify request-response parsing in apsscan 
the record_request_and_response method for the
nokogiri appscan parser was way overcomplicated
it was trying to do way too much trickiness
when the data could be very simply split and consumed

MSP-9972
 2015-03-18 11:19:00 -05:00
David Maloney 3269817b29
remove bad truthiness checks 
truthy checks were used here, but you'll get
an empty hash which will be treated as true causing
the test to be invalid and allowing for errors further in the method

MSP-9972
 2015-03-18 10:52:24 -05:00
HD Moore b62da42927 Merge branch 'master' into feature/add-proxies-to-wininet 2015-03-18 01:51:15 -05:00
HD Moore c607cf7b11 Merging master 2015-03-18 01:45:44 -05:00
HD Moore 97def50cc2 Whitespace cleanup 2015-03-18 01:26:59 -05:00
HD Moore 8d3cb8bde5 Fix up meterpreter patching arguments and names 2015-03-18 01:25:42 -05:00
HD Moore 390a704cc7 Cleanup proxyhost/proxyport arguments to match new names 2015-03-18 01:19:05 -05:00
HD Moore f7a06d8e44 Rework PROXY_{HOST|PORT|TYPE|USERNAME|PASSWORD) to the new syntax 2015-03-18 01:15:32 -05:00
HD Moore 3aa8cb69a4 Fix two use cases of PROXYHOST/PROXYPORT 2015-03-18 01:08:09 -05:00
HD Moore 2ab14e7e79 Adds IPv6 and option-related issues with the previous patch 2015-03-18 01:01:10 -05:00
HD Moore a4df6d539f Cleanup proxy handling code (consistency & bugs) 
One subtle bug was that each time a request was received, a null byte was being appended to the datastore options for PROXY_USERNAME and PROXY_PASSWORD. Eventually this would break new sessions. This change centralizes the proxy configuration and cleans up the logic.
 2015-03-18 00:59:59 -05:00
HD Moore 2f13988d7b Use OptPort vs OptInt and cleanup the description 2015-03-18 00:59:25 -05:00
HD Moore a01be365b0 Rework PROXYHOST/PROXYPORT to PROXY_HOST/PROXY_PORT 
This also cleans up the windows reverse_https_proxy stager.
 2015-03-18 00:59:13 -05:00
James Lee bd4738b93e
Land #4827, capture and nbns fixups 2015-03-17 17:37:55 -05:00
James Lee d7fa0ec669
Let IPAddr#hton do the calculating 2015-03-17 17:36:45 -05:00
sinn3r 608bf55b79 Update 2015-03-17 11:54:38 -05:00
sinn3r 27b6fbb648 I don't need :ssl and :ssl_version 2015-03-17 11:31:38 -05:00
Brent Cook d22231bdc8 remove unicode_filter_encode calls 
Let the underlying utf8 messages through to the console.
 2015-03-17 11:07:07 -05:00
Meatballs 69453c1955
Missing ? 2015-03-17 12:00:58 +00:00
Meatballs d18224e3cb
Correct capitilzation of GitLab 2015-03-17 11:32:14 +00:00
Meatballs 25840c41cf
Rubocop 2015-03-17 11:21:05 +00:00
Meatballs f4a1e981ab
Add gitlab login scanner 2015-03-17 11:19:23 +00:00
sinn3r ff58f7d270 Add Symantec Web Gateway Login Module 2015-03-17 02:51:57 -05:00
HD Moore 2ea984423b while(true)->loop, use thread.join 2015-03-16 14:08:01 -05:00
HD Moore 5fd3637d34 Remove the i32 size specifier (not needed) 2015-03-16 14:00:51 -05:00
HD Moore 69d9280748 Fix yard docs, retries, push.i8 instructions. See commit 05138524e3 
Note that StagerRetryCount is not defined here, but will be in the parent class once #4934 lands
 2015-03-16 13:52:13 -05:00
HD Moore 05138524e3 Fix yard docs, fix retries, trim bytes, retested and working 2015-03-16 13:35:36 -05:00
HD Moore 69a808b744 StagerProxy -> PayloadProxy 2015-03-16 12:14:42 -05:00
OJ 03232befc7 Add extra check to avoid crashing on startup 2015-03-16 17:14:36 +10:00
HD Moore f361e4ee52 Prefer the new-style proxy datastore options when available 2015-03-16 00:22:10 -05:00
HD Moore 7e89281485 Adds proxy (with authentication) support to reverse_http(s) 2015-03-16 00:03:31 -05:00
HD Moore 8e37342c50 Comment typo 2015-03-14 16:52:04 -05:00
HD Moore 0d12ca49a7 Work around lack of option normalization during size calculation 2015-03-14 16:19:13 -05:00
HD Moore 03019cf451 Adds StagerVerifySSLCert support (SHA1 of HandlerSSLCert) 2015-03-14 15:53:21 -05:00
HD Moore 11593800b6 Move X509 PEM parsing into Rex::Parser::X509Certificate 2015-03-14 15:52:23 -05:00
Brent Cook 74ee2d8408
Land #4916, @hmoore-r7 annotate Interlock Target param as 'in' only 2015-03-13 08:59:59 -05:00
Brent Cook 7a212a01eb
Land #4917, @hmoore-r7 avoid another payload size recalc 2015-03-13 08:43:33 -05:00
Brent Cook b68e05e536
Land #4914, @hmoore-r7 and @BorjaMerino winhttp stagers 2015-03-13 08:24:11 -05:00
OJ 1338a55b0d Adjust error handling for extension enumeration 
Make the catch case more generic for when the target doesn't support the
command for extension enumeration. This supports more than just windows
now.
 2015-03-13 21:49:45 +10:00
William Vu fa2fbc387c
Land #4922, REG_MULTI_SZ for type2str 2015-03-13 01:07:27 -05:00
James Lee 14a5efce58
Add yardoc 2015-03-13 01:04:23 -05:00
HD Moore a57f02b863 Remove invalid SECURITY_FLAG_IGNORE_REVOCATION flag 2015-03-12 23:01:04 -05:00
HD Moore 744b1a680e Reworks how payload prepends work internally, see #1674 2015-03-12 02:30:06 -05:00
HD Moore 376d05f797 Avoid instantiating the module during recalculate 2015-03-12 01:02:37 -05:00
HD Moore f676dc03c8
Lands #4849, prevents the target from running out of memory during NTFS reads 2015-03-12 00:01:47 -05:00
HD Moore 7252ba284a Tweak memory usage from 64Mb to 4Mb 2015-03-11 23:58:13 -05:00
HD Moore aa79b71e35 Fixes #4897 by corrected kernel32!Interlocked function definitions 2015-03-11 23:26:32 -05:00
scriptjunkie dfbc50ff47 Make Host header override optional 2015-03-11 23:15:45 -05:00
OJ 345b5cc8e1 Add stageless meterpreter support 
This commit adds plumbing which allows for the creation of stageless
meterpreter payloads that include extensions. The included transprots at
this point are bind_tcp, reverse_tcp and reverse_https, all x86.

More coming for x64. Will also validate http soon.
 2015-03-12 13:22:04 +10:00
HD Moore 8bae58d631 Updated cache sizes 2015-03-11 21:25:12 -05:00
HD Moore 631e1606bf Fix WinHttpSetOption & stack parameters 2015-03-11 21:05:18 -05:00
scriptjunkie 401d553f84 Use host header in reverse_http(s) 2015-03-11 19:40:52 -05:00
HD Moore 1135e5e073 First take on WinHTTP stagers, untested 2015-03-11 16:27:14 -05:00
Brent Cook ceeee4446f
Land #4904, @hmoore-r7 reworks reverse_http/s stagers 
They are now assembled dynamically and support more flexible options,
such as long URLs.
 2015-03-11 10:41:59 -05:00
HD Moore 1d17e9ab5b Remove the 256 byte limit for URLs 2015-03-10 15:27:04 -05:00
James Lee cb41154712
Make a MatchResult when sessions are reported 2015-03-10 15:17:57 -05:00
HD Moore 5f382e539a Updated required_space to count all 256 bytes of the URL 2015-03-10 15:17:09 -05:00
HD Moore dedf3726ea Simplify the uri_req_len logic, thanks @bcook-r7 2015-03-10 15:12:02 -05:00
William Vu 736f0b34be
Land #4902, @nstarke's db_connect warning message 2015-03-10 14:12:47 -05:00
William Vu 3c7b061e05 Use single quotes 
But I like double quotes. :(
 2015-03-10 14:03:13 -05:00
William Vu 72e7691300 Change print_status to print_error 
And drop db_disconnect note to another line.
 2015-03-10 13:31:35 -05:00
HD Moore 966848127a Refactor x86 Windows reverse_http and reverse_https stagers 2015-03-10 12:48:30 -05:00
William Vu e81f2e366c Refactor db_{status,connect} a bit 
Also allow for db_connect help.
 2015-03-10 12:35:58 -05:00
nstarke ee8318d5c4 Adding db_disconnect qualifying statement 2015-03-10 11:58:04 +00:00
Brent Cook 97f09b6ab0
Land #4894: hmoore-r7 cache payload sizes on start 
Avoid the hit of regenerating all of the static-size payloads when
loading the framework. This will facilitate conversion of payloads to
use metasm later.
 2015-03-09 23:06:55 -05:00