HD Moore
a8311fd71d
Verify a host is actually a real string before using it
...
git-svn-id: file:///home/svn/framework3/trunk@11372 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-18 03:37:27 +00:00
HD Moore
c28ad8ea0c
Minor improvements and corner case bug fixes to session handling. This fixes issues that can come up when a stream is shut down
...
git-svn-id: file:///home/svn/framework3/trunk@11371 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-18 03:00:26 +00:00
James Lee
c252d53c15
back to dev
...
git-svn-id: file:///home/svn/framework3/trunk@11370 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-17 18:35:23 +00:00
Tod Beardsley
f159678bf0
Rejigger the packet analysis to not suck up so much memory for no real reason. This ensures that the initial file read represents (pretty much) the entire overhead needed to process packets. I'd say this fixs bumps the ceiling up to about a million packets that can be read without too much trouble (assuming you have a serious amount of RAM available -- I'm testing with 8GB here).
...
git-svn-id: file:///home/svn/framework3/trunk@11364 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-17 03:20:47 +00:00
Tod Beardsley
3ed2d8b694
Add a pcap counter to the pcap importer.
...
git-svn-id: file:///home/svn/framework3/trunk@11356 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-16 21:36:00 +00:00
HD Moore
743cdba360
Detect empty imports
...
git-svn-id: file:///home/svn/framework3/trunk@11355 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-16 21:26:39 +00:00
Tod Beardsley
925e4a66f0
See #3371 . Uncommits the database logging of smb_hash credentials.
...
This kind of meterpreter update may not actually be desirable, given the introduction of a dependency on Metasploit Framework in to the stand-alone Rex library.
#3371 will remain open until this debate is resolved. In the meantime, need to back this out. :/
git-svn-id: file:///home/svn/framework3/trunk@11351 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-16 16:53:28 +00:00
Carlos Perez
9627194330
Hashdump will now save found credentials to the database.
...
git-svn-id: file:///home/svn/framework3/trunk@11347 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-16 02:42:45 +00:00
Joshua Drake
e92c073c22
Sync RbReadline with TIP, some diffs remain Metasploit specific
...
git-svn-id: file:///home/svn/framework3/trunk@11338 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 22:09:38 +00:00
HD Moore
93c26125aa
Recognize RO vs RW strings
...
git-svn-id: file:///home/svn/framework3/trunk@11337 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 20:52:48 +00:00
HD Moore
55b21d4aaf
Fixes to enable password parsing and rw/ro detection in snmp brute force
...
git-svn-id: file:///home/svn/framework3/trunk@11336 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 20:51:17 +00:00
Tod Beardsley
1c2c3ed1f6
Adds an example protocol analyzer to pick out http basic auth credentials and do some server analysis for libpcap imports.
...
git-svn-id: file:///home/svn/framework3/trunk@11334 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 19:04:12 +00:00
James Lee
c6dd53b5c0
look for database configuration in environment variable as well as command line arguments and configuration directory
...
git-svn-id: file:///home/svn/framework3/trunk@11327 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 09:59:49 +00:00
James Lee
d12be5bd4d
testing -> release!
...
git-svn-id: file:///home/svn/framework3/trunk@11325 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 05:28:32 +00:00
Joshua Drake
f45e03cd14
remove wait when DisablePayloadHandler was set
...
git-svn-id: file:///home/svn/framework3/trunk@11324 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-13 23:34:43 +00:00
Tod Beardsley
256d3409d4
Fixes #3351 . Suppress the warning message about pcaprub. It's not a big deal at all in Metasploit
...
Note that while missing pcaprub is fine, loading the wrong versions of pcaprub is still not fine, and raises actual exceptions.
git-svn-id: file:///home/svn/framework3/trunk@11319 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-13 18:30:42 +00:00
Tod Beardsley
244dc18867
Fixes #3348 . Adds the PacketFu packet processing library from http://code.google.com/p/packetfu/ , and adds a db_import path for pcaps (it's straightforward -- db_import /path/to/file.pcap will import hosts and service ports from a pcap file.)
...
git-svn-id: file:///home/svn/framework3/trunk@11308 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-12 17:44:48 +00:00
HD Moore
431a0e13aa
Store these in a format more friendly to JtR
...
git-svn-id: file:///home/svn/framework3/trunk@11305 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-12 08:53:37 +00:00
HD Moore
68dc327222
Fix missing decode for enable password 7
...
git-svn-id: file:///home/svn/framework3/trunk@11304 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-12 08:51:08 +00:00
HD Moore
4e4eb14887
This adds a TFTP version of #3345 (Pello's snmp config downloader). Still more work to do for the generic module
...
git-svn-id: file:///home/svn/framework3/trunk@11300 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 23:36:37 +00:00
HD Moore
644633454d
Cleanups to credential type
...
git-svn-id: file:///home/svn/framework3/trunk@11297 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 20:36:08 +00:00
HD Moore
e3f909cef9
Fixes for chunked http reply processing, additional cisco configuration support, and a scanner module for unprotected cisco device managers.
...
git-svn-id: file:///home/svn/framework3/trunk@11287 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 07:37:09 +00:00
HD Moore
5b43ea2c15
Buffer data before sending it to the response parser, handle buffered data on disconnect
...
git-svn-id: file:///home/svn/framework3/trunk@11286 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 06:19:36 +00:00
HD Moore
26aca9d6ba
Swap some module locations, add loot and cred reporting
...
git-svn-id: file:///home/svn/framework3/trunk@11271 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-10 05:47:33 +00:00
HD Moore
fa29afaece
Handle character echoing sessions more gracefully
...
git-svn-id: file:///home/svn/framework3/trunk@11268 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-09 22:44:17 +00:00
Tod Beardsley
493db14006
Adds a "duplicate_ok" option to report_auth_info to allow for multiple passwords on the same username. Never came up before I took a look at SNMP.
...
Also normalizes the print_status messages to be explicit about which module is reporting (important when you're running several at once).
git-svn-id: file:///home/svn/framework3/trunk@11267 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-09 21:23:39 +00:00
Joshua Drake
2742475ae0
fix refactoring scrap
...
git-svn-id: file:///home/svn/framework3/trunk@11258 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-08 22:30:01 +00:00
HD Moore
e5dc368b57
Add WoW64 detection
...
git-svn-id: file:///home/svn/framework3/trunk@11256 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-08 21:05:07 +00:00
Joshua Drake
19ba0164f6
fix bad socket reference
...
git-svn-id: file:///home/svn/framework3/trunk@11255 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-08 20:37:31 +00:00
HD Moore
5dd1f52349
Bump to testing
...
git-svn-id: file:///home/svn/framework3/trunk@11248 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-07 20:16:39 +00:00
Joshua Drake
fbd340aae8
add an adodb based cmdstager, fixes #1431
...
git-svn-id: file:///home/svn/framework3/trunk@11247 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-07 18:51:12 +00:00
James Lee
284e568f7c
fix 'search -o', thanks Larry Wert for the patch! fixes #3306
...
git-svn-id: file:///home/svn/framework3/trunk@11243 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-07 16:02:44 +00:00
HD Moore
2192d06189
Handle cases where the class has already been loaded
...
git-svn-id: file:///home/svn/framework3/trunk@11242 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-07 13:45:49 +00:00
Mike Smith
ebaf100a9f
Add RangeWalker#include_range?
...
git-svn-id: file:///home/svn/framework3/trunk@11237 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-06 22:18:49 +00:00
Mike Smith
1b6c0664e6
Add EmailTemplate fields: exploit_module, exploit_attach_name & attach_exploit
...
git-svn-id: file:///home/svn/framework3/trunk@11236 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-06 22:18:33 +00:00
James Lee
185f50212f
use TCPServer instead of Socket + bind and work around JRuby's broken Socket#getsockname (see http://jira.codehaus.org/browse/JRUBY-5232 )
...
git-svn-id: file:///home/svn/framework3/trunk@11211 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 23:49:02 +00:00
James Lee
b89fe64e74
whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@11209 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 22:13:39 +00:00
Tod Beardsley
2d4af15581
Peerhost, not peerhot. :/
...
git-svn-id: file:///home/svn/framework3/trunk@11205 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 17:33:20 +00:00
Tod Beardsley
0204cedca6
Makes the print_status displays more consistent between smb_login and psexec by moving some of the domain display functions up into exploit/smb proper.
...
git-svn-id: file:///home/svn/framework3/trunk@11204 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 17:29:26 +00:00
Tod Beardsley
fed550d7e7
Fixes #3285 . Checks for nil for session.peerhost and session.tunnel_peer -- hard to test, though, since I can't tell what originally causes the issue -- with and without this fix I get idential results on a normal ssh session. But, with the nil check in place, it should clear up the stack trace listed.
...
git-svn-id: file:///home/svn/framework3/trunk@11203 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 17:26:43 +00:00
Joshua Drake
9e03e8a142
fix service name handling
...
git-svn-id: file:///home/svn/framework3/trunk@11198 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 02:23:27 +00:00
James Lee
b0a0a2413c
print the proper proto (https vs http) when ssl is in use
...
git-svn-id: file:///home/svn/framework3/trunk@11194 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-01 16:57:20 +00:00
Joshua Drake
5a01ede38a
only assign the original request if a response was returned
...
git-svn-id: file:///home/svn/framework3/trunk@11193 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-01 16:32:40 +00:00
James Lee
bf24e44114
avoid creating a second manifest.mf entry if one already exists
...
git-svn-id: file:///home/svn/framework3/trunk@11175 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 07:10:57 +00:00
Joshua Drake
c5c2b37c8b
dont mangle offset 0x88 if using sub_method
...
git-svn-id: file:///home/svn/framework3/trunk@11174 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 04:53:43 +00:00
James Lee
85113deb04
allow modifying the data in a Zip::Entry to support the previous commit (r11172)
...
git-svn-id: file:///home/svn/framework3/trunk@11173 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 03:52:46 +00:00
Joshua Drake
225bf0738e
improve handling of return from connect_from_privileged_port, rework rlogin fromuser merging
...
git-svn-id: file:///home/svn/framework3/trunk@11171 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 02:00:58 +00:00
Joshua Drake
7e15c97328
remove duplicate credentials before running
...
git-svn-id: file:///home/svn/framework3/trunk@11168 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 01:15:42 +00:00
Joshua Drake
1061baba8d
fix some potential bugs from Edward Kolodka, fixes #3256
...
git-svn-id: file:///home/svn/framework3/trunk@11165 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 00:16:07 +00:00
Joshua Drake
ee7d5827d5
prevent mangling the input string
...
git-svn-id: file:///home/svn/framework3/trunk@11148 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-25 07:42:34 +00:00