a98602ed8d
Shut down properly through session.kill
...
git-svn-id: file:///home/svn/framework3/trunk@13055 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-28 21:38:24 +00:00
9220506ba2
Merge in recent meterpreter work. These are not the commits you are looking for (more info on what all this is later this week).
...
git-svn-id: file:///home/svn/framework3/trunk@13053 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-28 21:26:43 +00:00
5bbf27bf5b
Woops, this may not have a prompt accessor, find another way
...
git-svn-id: file:///home/svn/framework3/trunk@13029 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-25 20:33:15 +00:00
da7cc53c38
Add the spool command for redirecting output to both the console and a file
...
git-svn-id: file:///home/svn/framework3/trunk@13028 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-25 18:51:07 +00:00
40b9b2467b
Remove the downgrade until we figure out the cause, getting different results for the same OS/SP/configuration
...
git-svn-id: file:///home/svn/framework3/trunk@12991 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-21 01:12:17 +00:00
c42ea1f896
Re-enable the workaround for now, see #4785
...
git-svn-id: file:///home/svn/framework3/trunk@12989 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 23:38:30 +00:00
ab615c1225
Reference the ticket in this comment: See #4785
...
git-svn-id: file:///home/svn/framework3/trunk@12987 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 23:32:29 +00:00
346018c321
Disable NTLMv2 Session for Windows 2000 servers
...
git-svn-id: file:///home/svn/framework3/trunk@12984 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 22:54:13 +00:00
092817d449
Finally merging Cachedump into the SVN tree. Thanks to everyone who helped and again for their patience
...
git-svn-id: file:///home/svn/framework3/trunk@12946 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-15 01:06:22 +00:00
cb98e40725
Add support for ignoring non-executable Mach-O binary segments
...
git-svn-id: file:///home/svn/framework3/trunk@12940 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-14 15:23:32 +00:00
db413592e9
This commit adds support for the -r (remote machine name) parameter to the reg command and extends the api to support a remote machine name. Closes #1894
...
git-svn-id: file:///home/svn/framework3/trunk@12924 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-12 00:01:29 +00:00
6dd65e56f2
All changes look good, merging
...
git-svn-id: file:///home/svn/framework3/trunk@12921 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-11 23:17:42 +00:00
c3307c80be
Fixes #1733 by merging in Danilo Nascimento's patch. Thanks!
...
git-svn-id: file:///home/svn/framework3/trunk@12919 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-11 23:01:11 +00:00
a8d177ec35
Revert r12910, conflict-o oops-o
...
git-svn-id: file:///home/svn/framework3/trunk@12911 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-11 18:53:39 +00:00
3ac9854e88
Fixes #4703 : Change an assignment in the loop to append instead
...
git-svn-id: file:///home/svn/framework3/trunk@12910 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-11 18:50:33 +00:00
54f9ea7c0d
code clean ups, fixes a bug in gadget collection, adds gadget grouping
...
git-svn-id: file:///home/svn/framework3/trunk@12909 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-11 18:38:02 +00:00
8eaf46eca0
Add support to disable color
...
git-svn-id: file:///home/svn/framework3/trunk@12906 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-10 18:13:34 +00:00
a0c2321efc
Add msfrop, a tool for collecting and ROP gadgets, features include export and import in CSV format, powerful regex searching
...
git-svn-id: file:///home/svn/framework3/trunk@12904 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-10 12:54:01 +00:00
9d99b9de22
fix a logic error that results in sockets closing instead of resending data, really fixes #4642 ; also fixes a nil error when read() failed, makes logs actually useful
...
git-svn-id: file:///home/svn/framework3/trunk@12885 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-08 21:36:34 +00:00
96b568d65b
add a tool for list all modules by rank, fixes #4333 , fixes #4334 , thanks David Maloney!
...
git-svn-id: file:///home/svn/framework3/trunk@12876 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-06 22:47:55 +00:00
62826d3ff8
fix a bug in msfpescan and msfbinscan when handling disassembly
...
git-svn-id: file:///home/svn/framework3/trunk@12863 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-05 21:50:29 +00:00
7b4c7d44db
Adds a Burp Session XML parser and importer. Also includes fix to Rex's HTTP header parser to ensure that it uses only unencoded regexes.
...
git-svn-id: file:///home/svn/framework3/trunk@12846 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-03 21:17:57 +00:00
89a12add6f
always break strings into at least two pieces when splitting. Add better docs.
...
git-svn-id: file:///home/svn/framework3/trunk@12843 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-03 17:52:34 +00:00
bee19278d7
add a new javascript obfuscation engine using rkelly for parsing. use it in browser_autopwn and ms10_018_ie_behaviors. see #1003
...
git-svn-id: file:///home/svn/framework3/trunk@12839 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-03 00:36:26 +00:00
110f4df649
Adding a webapp vulnscanner parser for Appscan
...
git-svn-id: file:///home/svn/framework3/trunk@12826 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 22:16:08 +00:00
f03ffaf13d
Fixing a stack trace when the imported site cannot be resolved.
...
git-svn-id: file:///home/svn/framework3/trunk@12825 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 22:12:50 +00:00
0a7f6b8528
Adds support for importing Acunetix webvuln XML reports.
...
git-svn-id: file:///home/svn/framework3/trunk@12813 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 06:17:38 +00:00
1a466da015
Handle PE dissassemly the proper way, fixes a bug when handling regex searches
...
git-svn-id: file:///home/svn/framework3/trunk@12802 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 19:53:08 +00:00
d3f19d8777
Moving the character and cdata readers to the nokogiri mixin. They've all been the same so far.
...
git-svn-id: file:///home/svn/framework3/trunk@12800 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 17:37:54 +00:00
8600bc5bef
Foundstone registers a fingerprint instead of directly setting os_name. Also updates the Windows version regex for mbsa. Also adds a fall-through fingerprint parser (which foundstone uses).
...
git-svn-id: file:///home/svn/framework3/trunk@12798 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 16:31:27 +00:00
43b78a6b8f
Adds an import note for MBSA and Foundstone.
...
git-svn-id: file:///home/svn/framework3/trunk@12792 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 02:21:10 +00:00
2e0d399262
fixes some warnings.
...
git-svn-id: file:///home/svn/framework3/trunk@12791 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 01:14:47 +00:00
23e3d4274d
Adds a parser for MBSA XML files.
...
git-svn-id: file:///home/svn/framework3/trunk@12790 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 00:01:46 +00:00
c94577448e
Cleans up service name normalization.
...
git-svn-id: file:///home/svn/framework3/trunk@12787 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-31 19:27:22 +00:00
90bbacd75e
Fixes #4620 , attribute hashes are passed through a sanitizer now.
...
git-svn-id: file:///home/svn/framework3/trunk@12786 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-31 19:01:54 +00:00
f420b9c9e9
Adding an importer for Foundstone/Mcafee Network Inventory reports.
...
git-svn-id: file:///home/svn/framework3/trunk@12780 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-31 15:24:42 +00:00
e85a350257
Fixes #4605 -- only try to yield if we have a block to yield to.
...
git-svn-id: file:///home/svn/framework3/trunk@12762 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-29 03:00:13 +00:00
3a4b5a02fb
Force strings to be binary in Meterpreter requests, wrap server-side errors with a client-side wrapper
...
git-svn-id: file:///home/svn/framework3/trunk@12758 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-28 05:55:51 +00:00
b6f79ec070
Updating nmap's nokogiri state tracker as well.
...
git-svn-id: file:///home/svn/framework3/trunk@12744 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 18:15:49 +00:00
19f50d9b1d
Updates the nokogiri streaming document state machine to something a little more grown up.
...
git-svn-id: file:///home/svn/framework3/trunk@12742 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 17:53:56 +00:00
f92819e754
removed nasm calls inplace of metasm, cleaned up some formatting as well
...
git-svn-id: file:///home/svn/framework3/trunk@12741 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 17:34:31 +00:00
a891d53be4
Adding a Nokogiri stream parser for Nexpose raw XML files.
...
git-svn-id: file:///home/svn/framework3/trunk@12740 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 17:30:11 +00:00
3eabf41a67
Adds a Nokogiri parser for Nexpose vuln imports.
...
git-svn-id: file:///home/svn/framework3/trunk@12737 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-26 20:29:47 +00:00
8acfef8770
add support for providing a list of CA certs for the signature
...
git-svn-id: file:///home/svn/framework3/trunk@12734 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-26 17:50:56 +00:00
528e9e2b3a
update from chlee
...
git-svn-id: file:///home/svn/framework3/trunk@12723 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 19:26:41 +00:00
252830f3dd
See #4471 - Moving off some common methods to a mixin.
...
git-svn-id: file:///home/svn/framework3/trunk@12720 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 18:48:23 +00:00
11a1b5dcad
fix the requires for java signing.
...
git-svn-id: file:///home/svn/framework3/trunk@12719 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 18:02:02 +00:00
812bae9df9
add support for signing applets (or any other jar) with openssl. this removes the need for a dependency on RJB
...
git-svn-id: file:///home/svn/framework3/trunk@12718 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 16:45:20 +00:00
ecaeac1f6e
Only override the server header if the caller didn't already provide one.
...
git-svn-id: file:///home/svn/framework3/trunk@12709 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 01:51:09 +00:00
e09d4fb771
Patch from chlee for the nexpose XML parser. Adds "potential" as a vulnerable marker (so imports them), adds import cases for description and solution as well.
...
git-svn-id: file:///home/svn/framework3/trunk@12707 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 00:24:20 +00:00
38504b39a8
Warn the user if there's a truncated nmap file.
...
git-svn-id: file:///home/svn/framework3/trunk@12704 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-24 21:48:22 +00:00
81e1b41840
Fixes #4578 . If the user has Nokogiri of a reasonable version installed, use that to parse Nmap-created XML documents. Otherwise, fall back to the existing REXML parser.
...
git-svn-id: file:///home/svn/framework3/trunk@12702 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-24 19:40:50 +00:00
ad2880ce67
merge chao-mu's patches for railgun testing, fixes #4015 , thanks!
...
git-svn-id: file:///home/svn/framework3/trunk@12697 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-23 22:20:45 +00:00
9311f5b198
add a unit test for ring buffer. all these tests pass on 1.8.7-p299, 1.9.1-p378, and 1.9.2-p180
...
git-svn-id: file:///home/svn/framework3/trunk@12694 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-23 19:15:00 +00:00
d1e2f274f9
add ability to use arbitrary certs with SSL server sockets.
...
git-svn-id: file:///home/svn/framework3/trunk@12675 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-20 23:12:35 +00:00
81eb15148f
add a new fingerprint for unpatched ie7 on vista
...
git-svn-id: file:///home/svn/framework3/trunk@12660 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-19 00:57:30 +00:00
0f9e7f640e
add a new fingerprint for latest ie8 on win7
...
git-svn-id: file:///home/svn/framework3/trunk@12659 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-18 22:42:46 +00:00
60dcac616e
Renames some nessus-imported vulnerabilities to drop the NSS identifier and just stick with the plugin name (if available). Also drops junk NSS-0 vulnerabilities.
...
git-svn-id: file:///home/svn/framework3/trunk@12653 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 22:18:43 +00:00
e823a885bc
avoid nil.downcase for old egghunter usage
...
git-svn-id: file:///home/svn/framework3/trunk@12652 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 21:55:48 +00:00
c5f79f1176
make parsing a little easier for obfuscation
...
git-svn-id: file:///home/svn/framework3/trunk@12650 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 20:35:18 +00:00
7c2455b704
un-revert the last of r12600's overzealousness. see #4378 and r12569
...
git-svn-id: file:///home/svn/framework3/trunk@12649 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 17:40:48 +00:00
f542bdbb84
Fixes r12634, should be a regex not a not-equal. Using unless instead of if to avoid negative matching.
...
git-svn-id: file:///home/svn/framework3/trunk@12648 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 17:37:04 +00:00
ad12dffe29
move help_to_s down into CommandDispatcher so each dispatcher will know how to print its own help. see #564
...
git-svn-id: file:///home/svn/framework3/trunk@12640 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-16 23:03:31 +00:00
db1684395f
Added VirtualProtect feature for egghunter
...
git-svn-id: file:///home/svn/framework3/trunk@12637 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-16 19:00:56 +00:00
5f3e451e4d
Fixes #4441 . I believe this will solve the empty element problem for the nmap parser, but I'm having trouble reproducing it. Basically it wraps tag_start in a begin/rescue, and will ignore bad calls to nil objects (and nil objects only).
...
git-svn-id: file:///home/svn/framework3/trunk@12634 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-16 13:49:35 +00:00
9f2ac9ae9f
Gracefully handle a failed socket write due to disconnect
...
git-svn-id: file:///home/svn/framework3/trunk@12626 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-16 02:00:47 +00:00
aadee8460d
Minor tweak helps syntax highlighters
...
git-svn-id: file:///home/svn/framework3/trunk@12620 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-15 18:23:40 +00:00
c5c4c929b8
Clarify that partial is handled in HTTP
...
git-svn-id: file:///home/svn/framework3/trunk@12619 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-15 18:23:14 +00:00
aa98667a77
Two performance fixes for HTTP Servers. The first reduces latency from 0.25s to near-zero for back-to-back connections by using the Queue class as a notify system. The second switches the slow socket.get for the much faster socket.read
...
git-svn-id: file:///home/svn/framework3/trunk@12615 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-14 18:34:06 +00:00
7f21eb8406
Allows for nessus imports to grab the plugin name as well as the plugin ID.
...
git-svn-id: file:///home/svn/framework3/trunk@12609 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-13 16:29:07 +00:00
4500d09c2f
Bubble up errors from socket.get_once() and trigger an EOFError when read() returns nil
...
git-svn-id: file:///home/svn/framework3/trunk@12607 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-13 06:37:15 +00:00
9ce47c01bd
Reverting the autoload changes until we can upgrade to a new ActiveSupport library or find a workaround
...
git-svn-id: file:///home/svn/framework3/trunk@12600 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 20:03:55 +00:00
7600f9110e
remove some more unecessary requires
...
git-svn-id: file:///home/svn/framework3/trunk@12595 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 18:33:49 +00:00
025c68244b
See #4371 , fix uninitialized constant Rex::Exploitation::Egghunter
...
git-svn-id: file:///home/svn/framework3/trunk@12592 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 15:03:20 +00:00
d0614a4be7
fix a few requires in rex in preparation of removing unneeded requires from msf
...
git-svn-id: file:///home/svn/framework3/trunk@12587 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-11 23:28:12 +00:00
7837e64b85
remove cruft leftover from the dawn of time
...
git-svn-id: file:///home/svn/framework3/trunk@12586 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-11 22:55:25 +00:00
af45f0166f
re-unbreak omelet code
...
git-svn-id: file:///home/svn/framework3/trunk@12572 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-09 22:42:41 +00:00
2de7f9eb30
fixes a stack trace in converting a char to hex in ruby 1.9.x
...
git-svn-id: file:///home/svn/framework3/trunk@12571 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-09 20:48:40 +00:00
2e1d25dad7
store some state so we can associate scripts with the right port/host. fixes #4378
...
git-svn-id: file:///home/svn/framework3/trunk@12569 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-09 18:10:56 +00:00
ce90282884
See #4378 -- this should limit the nmap parser to script tags that are associated only with ports. egyp7 may have a better way with dealing with this though, so not calling it fixed yet.
...
git-svn-id: file:///home/svn/framework3/trunk@12568 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-09 17:24:43 +00:00
05f107f466
Fixes #4371 , Converts many uses of require to autoload
...
git-svn-id: file:///home/svn/framework3/trunk@12554 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:47:10 +00:00
57b530ccf6
fix up test require path
...
git-svn-id: file:///home/svn/framework3/trunk@12553 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:41:38 +00:00
d638586d1f
fix up test require path
...
git-svn-id: file:///home/svn/framework3/trunk@12552 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:39:19 +00:00
3e59f77871
add require, get test running
...
git-svn-id: file:///home/svn/framework3/trunk@12551 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:17:41 +00:00
719576b7b9
fix a small bug in omelet hunter, test is now runnable
...
git-svn-id: file:///home/svn/framework3/trunk@12550 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:14:10 +00:00
849c2d682c
remove crufty require
...
git-svn-id: file:///home/svn/framework3/trunk@12549 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:12:38 +00:00
c3d66f276f
return the proper thing in add_route() and remove_route(), make sure each comm responds to :routes before trying to delete them. fixes several unit test failures.
...
git-svn-id: file:///home/svn/framework3/trunk@12548 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 17:30:25 +00:00
6e4049cb2c
add some error messages to this test
...
git-svn-id: file:///home/svn/framework3/trunk@12547 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 17:22:09 +00:00
e621828cac
check for a nil return value from write(), fixes #4329
...
git-svn-id: file:///home/svn/framework3/trunk@12528 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-03 06:55:15 +00:00
8d7e8620b2
Map write to syswrite for BufferSock
...
git-svn-id: file:///home/svn/framework3/trunk@12525 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-03 05:25:41 +00:00
1c86441f12
This removes the abortive_close code for stream sockets, it was leading to inconsistencies in how dead sessions were cleaned up
...
git-svn-id: file:///home/svn/framework3/trunk@12519 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-03 03:59:02 +00:00
b93e134195
Use shell_write vs ring.put
...
git-svn-id: file:///home/svn/framework3/trunk@12516 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 23:07:02 +00:00
d98f8dfd89
Make it clear that all Rex::IO::Stream implementations must accept a second parameter called opts for the read, write, and put methods
...
git-svn-id: file:///home/svn/framework3/trunk@12515 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 21:39:09 +00:00
366bc8979d
Only try to report to the database if the database driver is active. Fixes #4306
...
git-svn-id: file:///home/svn/framework3/trunk@12512 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 20:29:01 +00:00
c668534105
This normalizes openssl non-blocking support across both 1.8.x/1.9.1 and 1.9.2+
...
git-svn-id: file:///home/svn/framework3/trunk@12509 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 17:25:26 +00:00
eb78aac8dd
Only try to catch the non-blocking exceptions if they are defined
...
git-svn-id: file:///home/svn/framework3/trunk@12508 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 16:30:45 +00:00
d402ebf6fb
Fix #3498 by showing post module options in the info output
...
git-svn-id: file:///home/svn/framework3/trunk@12506 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 16:06:37 +00:00
1eee55b3cf
remove a crufty require
...
git-svn-id: file:///home/svn/framework3/trunk@12502 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 03:42:26 +00:00
e30d2bbdd4
revert r12476, as it breaks interactive meterpreter channels. r12495 and r12494 should deal with what it was it was trying to solve in the first place. fixes #4293 .
...
git-svn-id: file:///home/svn/framework3/trunk@12496 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 00:29:48 +00:00
a170d37c62
make it a little clearer what getprivs actually does
...
git-svn-id: file:///home/svn/framework3/trunk@12492 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-01 22:28:09 +00:00
39cab9b076
Correct use of select and expand the listen queue for TCP Servers
...
git-svn-id: file:///home/svn/framework3/trunk@12484 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 18:08:52 +00:00
140a304032
Specify IO::select for sleep directly.
...
git-svn-id: file:///home/svn/framework3/trunk@12483 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 17:56:38 +00:00
22537ffbde
A few more tweaks to non-blocking ssl mode
...
git-svn-id: file:///home/svn/framework3/trunk@12482 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 10:24:52 +00:00
96ac0fd51a
Swap out exceptions
...
git-svn-id: file:///home/svn/framework3/trunk@12481 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 08:47:32 +00:00
5758f2ab46
Add support for non-blocking OpenSSL sockets when the Ruby version supports them (1.9.2+ or with openssl-nonblock gem).
...
git-svn-id: file:///home/svn/framework3/trunk@12480 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 07:59:33 +00:00
6bdf2a4e2b
Proactively wrap each() in other Hash based classes to avoid situations that trigger modification during enumeration
...
git-svn-id: file:///home/svn/framework3/trunk@12479 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 04:59:27 +00:00
20c949d1fb
Fix some bad copypasta from non-blocking write commit. This should make stream sessions happy again.
...
git-svn-id: file:///home/svn/framework3/trunk@12476 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 04:25:42 +00:00
e99b5a4f35
Un-break DHCP server when not using served_over.
...
Variable must be initialized before use regardless of whether HOSTNAME is defined.
git-svn-id: file:///home/svn/framework3/trunk@12471 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-29 22:58:55 +00:00
0978047673
clean up help a little for several meterpreter file commands
...
git-svn-id: file:///home/svn/framework3/trunk@12451 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-27 00:38:15 +00:00
8ba356271f
Fixes #4223 on Windows by catching the specific exception class
...
git-svn-id: file:///home/svn/framework3/trunk@12450 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-27 00:20:32 +00:00
2031c0d288
Importing Nexpose reports should retain test keys (which are usually some kind of proof or expanded details about a vulnerability).
...
git-svn-id: file:///home/svn/framework3/trunk@12442 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 17:31:26 +00:00
b24b787e0a
Add the right class wrappers
...
git-svn-id: file:///home/svn/framework3/trunk@12426 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 19:35:25 +00:00
4426a1b7f2
Port of the python Manifest.mbdb parser
...
git-svn-id: file:///home/svn/framework3/trunk@12424 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 18:21:13 +00:00
9d715a1492
Switch from readpartial to read_nonblock, which works around an OpenSSL deadlock. This also adds support for the openssl-nonblock gem's specific exceptions
...
git-svn-id: file:///home/svn/framework3/trunk@12414 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-23 20:45:49 +00:00
56049012cb
remove my code out of the tree, tests all passing. thanks chao-mu!
...
git-svn-id: file:///home/svn/framework3/trunk@12413 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-23 02:49:14 +00:00
c9ab8f248d
commit the rest of chao's patch :/
...
git-svn-id: file:///home/svn/framework3/trunk@12412 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-23 01:10:49 +00:00
a61e7290b0
Do not modify the string passed to write() operations
...
git-svn-id: file:///home/svn/framework3/trunk@12394 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-21 17:29:11 +00:00
8b920a8f95
Dont modify the data buffer passed to write
...
git-svn-id: file:///home/svn/framework3/trunk@12393 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-21 17:17:26 +00:00
86bca6438f
add a routes table; delete each comm's routes when flushing
...
git-svn-id: file:///home/svn/framework3/trunk@12377 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 17:49:27 +00:00
78d3998854
Fixes #4125 , add hostname support to the Rex DHCP server & aux module
...
git-svn-id: file:///home/svn/framework3/trunk@12375 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 14:21:36 +00:00
0437d20f9d
Commit railgun tests from chao-mu: http://blog.minorcrash.com/2011/04/railgun-update-1st-milestone-almost.html
...
~/framework$ ruby lib/rex/post/meterpreter/extensions/stdapi/railgun.rb.ts.rb
Loaded suite lib/rex/post/meterpreter/extensions/stdapi/railgun.rb.ts
Started
.............
Finished in 8.804126009 seconds.
13 tests, 30 assertions, 0 failures, 0 errors
git-svn-id: file:///home/svn/framework3/trunk@12366 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-19 14:15:45 +00:00
f1f15ba448
Allow socks4a to relay through meterpreter
...
git-svn-id: file:///home/svn/framework3/trunk@12353 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-18 18:17:49 +00:00
1b63d36c85
Fix typo reported by mubix
...
git-svn-id: file:///home/svn/framework3/trunk@12346 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-18 04:40:06 +00:00
1d0d6195bd
fixes a load error
...
git-svn-id: file:///home/svn/framework3/trunk@12344 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-17 02:08:42 +00:00
03fdd9a0d0
add support method used in previous commit (r12341)
...
git-svn-id: file:///home/svn/framework3/trunk@12342 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-17 00:35:32 +00:00
c14580adf3
add help for several meterp commands and allow the channel command to do everything the associated with channels (list, interact, read, write, close)
...
git-svn-id: file:///home/svn/framework3/trunk@12341 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-17 00:34:45 +00:00
827bec98d6
ljust the option names so we don't have funky alignment for multi-char option names
...
git-svn-id: file:///home/svn/framework3/trunk@12335 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-16 15:57:52 +00:00
9c1b4ddca5
add a load command. this will later deprecate the use command under meterpreter for 3.7 release
...
git-svn-id: file:///home/svn/framework3/trunk@12334 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-16 13:59:57 +00:00
d294f511b6
add logging for interactive meterpreter channels
...
git-svn-id: file:///home/svn/framework3/trunk@12328 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-15 21:10:15 +00:00
50155919ea
Add File.exists? as a wrapper to File.stat
...
git-svn-id: file:///home/svn/framework3/trunk@12324 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-15 15:29:57 +00:00
904e7af88b
added API call for extracting keystrokes from client.ui.keyscan_dump
...
git-svn-id: file:///home/svn/framework3/trunk@12323 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-15 02:21:40 +00:00
f43fe6e31b
clarify the help for getprivs
...
git-svn-id: file:///home/svn/framework3/trunk@12309 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-13 16:01:40 +00:00
05e47166a3
push the check for msf up to the main meterpreter command dispatcher and fire events for file upload/download.
...
git-svn-id: file:///home/svn/framework3/trunk@12307 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-12 20:39:46 +00:00
857b5c786b
don't store less accurate nmap fingerprints, see #4099
...
git-svn-id: file:///home/svn/framework3/trunk@12302 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-11 23:05:07 +00:00
36367f8a67
save os version info (usually windows service packs) and close the names tag, so we don't store every xml tag's text as a hostname
...
git-svn-id: file:///home/svn/framework3/trunk@12298 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-11 22:16:25 +00:00
d5d9d56081
Create a dedicated db table to track sessions & session events.
...
* Add new db tables for session & session_events
* Migrate existing session data from events db table
* Modify session report methods to log to the new tables
git-svn-id: file:///home/svn/framework3/trunk@12273 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-07 21:59:32 +00:00
485211288f
doc formatting
...
git-svn-id: file:///home/svn/framework3/trunk@12237 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-04 18:06:41 +00:00
cd8866d22f
add doc for initialize
...
git-svn-id: file:///home/svn/framework3/trunk@12235 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-04 17:32:17 +00:00
dcefdc5f28
whitespace and rdoc fixes
...
git-svn-id: file:///home/svn/framework3/trunk@12234 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-04 17:27:12 +00:00
7444436750
fix directives for rdoc
...
git-svn-id: file:///home/svn/framework3/trunk@12233 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-04 17:06:59 +00:00
3e0982a792
enable ntlmv2 by default for smb, mssql and http
...
git-svn-id: file:///home/svn/framework3/trunk@12227 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-03 21:06:50 +00:00
f9680c854b
reworj http ntlm authentificaion and correct some bug
...
git-svn-id: file:///home/svn/framework3/trunk@12225 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-03 20:38:27 +00:00
b38a187631
mssql login : enable ntlmv2 authentification
...
git-svn-id: file:///home/svn/framework3/trunk@12223 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-03 17:02:23 +00:00
c5e137d7d3
correct a bug on ntlm signing
...
git-svn-id: file:///home/svn/framework3/trunk@12211 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-01 20:58:11 +00:00
b823ea9876
fix undefined method error by using the correct class
...
git-svn-id: file:///home/svn/framework3/trunk@12169 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-28 18:42:22 +00:00
19a4a2d88a
move some code from lib/rex/proto/smb/client to lib/rex/proto/ntlm/util and add a mini mixin for ntlm
...
git-svn-id: file:///home/svn/framework3/trunk@12162 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-27 20:14:56 +00:00
3c6b33bd80
continuation of tests / fixes from chao.
...
git-svn-id: file:///home/svn/framework3/trunk@12155 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-27 00:37:54 +00:00
08df8179cc
mssql login : enable windows authentification and add an encrypion check through tds prelogin mechanism
...
see issue #402 for some comment on the implementation and the todo's
git-svn-id: file:///home/svn/framework3/trunk@12154 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-27 00:24:19 +00:00
d18f14de4e
add a test suite for railgun
...
git-svn-id: file:///home/svn/framework3/trunk@12152 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-26 19:49:08 +00:00
35c33020ca
merge in test updates from chao-mu
...
git-svn-id: file:///home/svn/framework3/trunk@12150 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-26 19:29:59 +00:00
HD Moore
Joshua Drake
David Rude
James Lee
Tod Beardsley
Mario Ceballos
Wei Chen
Matt Weeks
Jonathan Cran
Carlos Perez
Mike Smith
amaloteaux