f86c3d8c0b
fixup the extra space pointed out by kernelsmith. should really fixup #4613 .
...
git-svn-id: file:///home/svn/framework3/trunk@12817 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 19:28:39 +00:00
7458abc8b3
add rkelly, a javascript parsing library. this version fixes several bugs in the abandoned gem, see https://github.com/tenderlove/rkelly/pull/6
...
git-svn-id: file:///home/svn/framework3/trunk@12815 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 06:31:34 +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
afa11f51a4
Fix up check for IPv6 constant, some minor grammar typos
...
git-svn-id: file:///home/svn/framework3/trunk@12811 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 00:29:28 +00:00
ddcc9407dd
Linux initial post libraries
...
git-svn-id: file:///home/svn/framework3/trunk@12805 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 22:48:55 +00:00
c0d88caf95
Fix the references for MS Bulletins when importing from qualys sources.
...
git-svn-id: file:///home/svn/framework3/trunk@12804 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 20:14:25 +00:00
d9355e4c32
Fix find_module vs _find_module
...
git-svn-id: file:///home/svn/framework3/trunk@12803 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 20:06:17 +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
40f06cd3e1
pcaprub : -add several native function to get all the informations about the network intefaces, original code is a python c extension called netifaces
...
-add also some initial wrappers into capture mixin
-Fixes #4376
git-svn-id: file:///home/svn/framework3/trunk@12799 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 17:22:48 +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
f75a907f4b
Provide a more reasonable to_s value for wrapped exceptions
...
git-svn-id: file:///home/svn/framework3/trunk@12785 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-31 17:23:13 +00:00
a5e6b78d12
Cleanup on the yield warning for Retina imports.
...
git-svn-id: file:///home/svn/framework3/trunk@12783 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-31 16:30:07 +00:00
8132409497
For older Nessus formatted reports, prefer the plugin name over the plugin id when importing vulnerabilities.
...
git-svn-id: file:///home/svn/framework3/trunk@12782 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-31 16:22:42 +00:00
e78d43691d
fixup the output, better autonaming of vms when build_from_running or build_from_dir is used
...
git-svn-id: file:///home/svn/framework3/trunk@12781 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-31 15:51:22 +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
e5a4dad237
Forgot to add handling for paths with spaced for when reading paths with spaces on post read_file command on nix sessions
...
git-svn-id: file:///home/svn/framework3/trunk@12777 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-30 22:16:19 +00:00
520760a899
File Post commands will execute the appropriate command and handle the different formats of issuing the commands depending on the OS for when executing against shell sessions.
...
git-svn-id: file:///home/svn/framework3/trunk@12776 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-30 22:14:11 +00:00
ec3e1efbc8
Expanded cmd_exec to work also on shell sessions and handle command time out.
...
git-svn-id: file:///home/svn/framework3/trunk@12775 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-30 22:11:43 +00:00
283e83bc5e
fixes #4612 and a few other issues w/ lab commands
...
git-svn-id: file:///home/svn/framework3/trunk@12771 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-30 19:11:13 +00:00
f33cc502f0
More RPC cleanup work, just about done
...
git-svn-id: file:///home/svn/framework3/trunk@12769 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-30 05:29:22 +00:00
3e0f3639ef
This adds a quick windows/loadlibrary payload for folks who have a need for such things. The library path can be a UNC location and works fine over WebDAV...
...
git-svn-id: file:///home/svn/framework3/trunk@12765 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-30 03:44:59 +00:00
0dbe55c2ad
Fix use of wrong nix command writing data to a file
...
git-svn-id: file:///home/svn/framework3/trunk@12764 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-30 00:15:04 +00:00
68c4b34ab6
More RPC cleanup
...
git-svn-id: file:///home/svn/framework3/trunk@12763 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-29 20:30:56 +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
cf002b6b68
Updating PacketFu to track latest.
...
git-svn-id: file:///home/svn/framework3/trunk@12761 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-28 17:54:49 +00:00
556cd5affe
Expand the core API to add threads, module paths, set/unsetd, and save
...
git-svn-id: file:///home/svn/framework3/trunk@12760 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-28 17:00:21 +00:00
c1996206f2
Remove the temporary msgpack client/server, this is replaced by v10/client.rb and v10/service.rb respectively
...
git-svn-id: file:///home/svn/framework3/trunk@12759 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-28 16:22:20 +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
a78a58b9d0
More RPC cleanup work
...
git-svn-id: file:///home/svn/framework3/trunk@12757 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-28 05:17:34 +00:00
f126805ea1
Cleanup SSL key passing to match egypt's changes (cert + key in the same PEM). Add token management functions
...
git-svn-id: file:///home/svn/framework3/trunk@12756 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-28 04:01:15 +00:00
cab5d26181
Add the database table for api keys
...
git-svn-id: file:///home/svn/framework3/trunk@12755 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-28 03:41:37 +00:00
f7243d9245
Remove base64 encoding
...
git-svn-id: file:///home/svn/framework3/trunk@12754 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-28 03:29:15 +00:00
618c438ffd
Move keyward parsing into the module base class
...
git-svn-id: file:///home/svn/framework3/trunk@12753 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-28 02:29:22 +00:00
52f7863890
Add keyword searching to msfconsole
...
git-svn-id: file:///home/svn/framework3/trunk@12752 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-28 02:26:04 +00:00
911a219e56
db_import nmap: add ms06-035, ms07-029 in the parser too
...
git-svn-id: file:///home/svn/framework3/trunk@12750 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 23:34:12 +00:00
00a8533a52
add a display field for the message body's From: field
...
git-svn-id: file:///home/svn/framework3/trunk@12749 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 20:59:36 +00:00
1ecdb15017
It helps to actually require the parser if I'm going to go to all the trouble of writing it.
...
git-svn-id: file:///home/svn/framework3/trunk@12748 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 19:53:40 +00:00
c6c7d84c3e
db_import : parse nmap script output and report ms08-67 vuln if found
...
git-svn-id: file:///home/svn/framework3/trunk@12745 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 18:51:09 +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
e1180f5aac
Fix a stack trace when handling Qualys imports with unknown fingerprints
...
git-svn-id: file:///home/svn/framework3/trunk@12743 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 18:11:46 +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
609ae839a1
remove debug line
...
git-svn-id: file:///home/svn/framework3/trunk@12729 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-26 02:31:28 +00:00
970b0a424a
Remove autoloads, hits a conflict with rails
...
git-svn-id: file:///home/svn/framework3/trunk@12727 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-26 00:53:59 +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
971a77277e
wrap the rest of the commands in quotes
...
git-svn-id: file:///home/svn/framework3/trunk@12713 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 07:30:22 +00:00
c979f3a43d
fixup a few bugs w/ copying files
...
git-svn-id: file:///home/svn/framework3/trunk@12712 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 06:26:26 +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
c5c679cdb7
Remove all calls to framework.db.sync and make this method a no-op now that the task manager is no longer used.
...
git-svn-id: file:///home/svn/framework3/trunk@12708 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 00:30:03 +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
b27b7b53ae
Fix bug introduced in last merge
...
git-svn-id: file:///home/svn/framework3/trunk@12701 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-24 17:29:14 +00:00
563acc280b
lots of fun changes to the lab plugin. added a basic TODO / README, added run_command support to remote_workstation, added support for dynagen (though it needs more testing), added a vixr controller and driver but the lack of snapshots is a little sad. see the README for more info on how to use it
...
git-svn-id: file:///home/svn/framework3/trunk@12700 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-24 15:56:32 +00:00
046e65fbce
Remove old test cases
...
git-svn-id: file:///home/svn/framework3/trunk@12699 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-24 15:46:17 +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
f4b8b56883
This patch from Chris Lee adds the following methods:
...
* asset_groups_listing
* asset_group_config
* site_scan_history
* site_device_scan_start
This patch also adds AdHoc report downloads and parsing
git-svn-id: file:///home/svn/framework3/trunk@12696 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-23 20:43:17 +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
1f72859874
set the session info when there is no database. fixes regression introduced by r12523
...
git-svn-id: file:///home/svn/framework3/trunk@12690 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-23 16:01:24 +00:00
1efb6a1ff2
Updating PacketFu to 1.0.2
...
git-svn-id: file:///home/svn/framework3/trunk@12689 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-23 14:04:38 +00:00
4b2a37015c
Make the HTTP Server header configurable
...
git-svn-id: file:///home/svn/framework3/trunk@12687 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-22 23:01:30 +00:00
7d320fc961
Bump the max read size and fix the agent option
...
git-svn-id: file:///home/svn/framework3/trunk@12686 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-22 22:55:16 +00:00
a8c474d7d6
Add the versioned (1.0) RPC backend
...
git-svn-id: file:///home/svn/framework3/trunk@12679 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-22 03:50:14 +00:00
0d984cdd81
Added calls to write and append to files in binary format for post modules and scripts.
...
git-svn-id: file:///home/svn/framework3/trunk@12677 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-21 16:24:34 +00:00
56b4a092d6
Added Linux x64 payloads. Modified exe.rb to support elf x64 payloads.
...
git-svn-id: file:///home/svn/framework3/trunk@12676 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-20 23:51:19 +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
9003622af3
fix a typo in the dtd url, thanks tebo for noticing
...
git-svn-id: file:///home/svn/framework3/trunk@12674 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-20 16:52:51 +00:00
edd3041c9e
Fixes #4561 - ensures that the declared interface is preferred over LHOST, and makes it possible to specify a device to capture_sendto().
...
Also makes should_arp?() logic a little easier to follow using an if instead of an unless.
git-svn-id: file:///home/svn/framework3/trunk@12673 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-20 15:27:13 +00:00
520aa7d01c
Fixes #4558 . Since the arp spoofer is the only module that actually uses lookupaddrs, don't require every other pcaprub module to check for it.
...
git-svn-id: file:///home/svn/framework3/trunk@12672 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-20 14:26:24 +00:00
25d7c5a6df
make the constant match what os normalization is doing
...
git-svn-id: file:///home/svn/framework3/trunk@12664 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-19 16:54:33 +00:00
c95080d83d
See #4430 , committing upstream fixes to packetfu to enable app parsing. This will change very soon, but at least get the two repo's synced up.
...
git-svn-id: file:///home/svn/framework3/trunk@12662 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-19 13:00:35 +00:00
76ebc59f29
Somehow missed this performance checkin for the 2000 ips check.
...
git-svn-id: file:///home/svn/framework3/trunk@12661 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-19 12:57:14 +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
23ee4b3aa8
Display additional version info in about box.
...
git-svn-id: file:///home/svn/framework3/trunk@12658 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-18 21:43:52 +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
3d5cf03af6
move help into its own method for a couple more commands
...
git-svn-id: file:///home/svn/framework3/trunk@12651 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 20:43:04 +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
5091a0fbfa
un-revert another piece of r12600's overzealousness. see r12574
...
git-svn-id: file:///home/svn/framework3/trunk@12647 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 17:16:47 +00:00
d43d542316
re-add elf template support which was inadvertantly reverted in r12600, see #4384
...
git-svn-id: file:///home/svn/framework3/trunk@12646 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 17:10:55 +00:00
0441b0c68c
Typo that broke scripts in users home folder
...
git-svn-id: file:///home/svn/framework3/trunk@12645 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 17:03:06 +00:00
9bbee65ebb
Back to regularly scheduled development
...
git-svn-id: file:///home/svn/framework3/trunk@12644 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 14:03:05 +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
68ca98b225
Add the missing debug accessor
...
git-svn-id: file:///home/svn/framework3/trunk@12627 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-16 02:12:59 +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
e0ffab0e6c
Move all db.import* calls to the same db.import backend call (as they should have been). Fix method casing to be ruby standard
...
git-svn-id: file:///home/svn/framework3/trunk@12625 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-16 00:51:26 +00:00
9d765d4d25
Change protected for private, add debug flag to MessagePack (with debug.methods call)
...
git-svn-id: file:///home/svn/framework3/trunk@12624 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-15 23:51:53 +00:00
056cde292f
Deprecate the exploited_host table. Vulns that indicate a successful exploit without opening a session should set the :exploited_at timestamp.
...
git-svn-id: file:///home/svn/framework3/trunk@12623 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-15 22:19:00 +00:00
26fe5f2c9f
Detailed logging when something goes wonky
...
git-svn-id: file:///home/svn/framework3/trunk@12622 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-15 19:25:09 +00:00
a6da350581
Treat timestamps as integers in all RPC calls. This fixes a inconsistency between methods (string vs DateTime object) and standardizing on Unix time stamps results in wider RPC transport support
...
git-svn-id: file:///home/svn/framework3/trunk@12621 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-15 18:24:52 +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
80f71b441e
This adds a basic RPC server that operates over HTTP and uses MessagePack. The client/server wrappers are still being finalized. MessagePack libraries are avavailable for all major languages ( http://msgpack.org/ ) and this implementation is ridiculous fast and binary safe, relative to XMLRPC.
...
git-svn-id: file:///home/svn/framework3/trunk@12616 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-14 18:38:44 +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
03549f0b15
Nessus imported vulns should reference themselves as a NSS- identifier.
...
git-svn-id: file:///home/svn/framework3/trunk@12610 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-13 17:00:03 +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
369a2e898e
mark version for minor release
...
git-svn-id: file:///home/svn/framework3/trunk@12608 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-13 16:14:05 +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
c7439f5ba1
Remove the leftover autoloads
...
git-svn-id: file:///home/svn/framework3/trunk@12603 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 20:20:08 +00:00
1904e446b2
Change this back to cooincide with autoload revert
...
git-svn-id: file:///home/svn/framework3/trunk@12602 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 20:11:43 +00:00
ecb726fb2c
Rolling two changes through again (stomped on by the autoload revert)
...
git-svn-id: file:///home/svn/framework3/trunk@12601 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 20:08:33 +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
95d802754b
Rework to avoid a warning
...
git-svn-id: file:///home/svn/framework3/trunk@12598 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 19:26:11 +00:00
3122c500a6
See #4371 , add a missing autoload for :Script
...
git-svn-id: file:///home/svn/framework3/trunk@12597 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 19:12:00 +00:00
fd4e6db85d
Fixes 4373, Migrates lib/msf to use autoload instead of require (first try)
...
git-svn-id: file:///home/svn/framework3/trunk@12596 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 19:07:35 +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
664bbf7c3c
Remove the requires now that autoload has been fixed
...
git-svn-id: file:///home/svn/framework3/trunk@12593 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 15:09:27 +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
78a2558142
Apply patch from chao-mu, fixes #4414
...
git-svn-id: file:///home/svn/framework3/trunk@12591 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 14:59:44 +00:00
c9566da399
Add missing requires and autoload to make browser exploits work again.
...
git-svn-id: file:///home/svn/framework3/trunk@12590 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 05:23:32 +00:00
8bd4f463a6
See #4371 , add autoload for PeParsey
...
git-svn-id: file:///home/svn/framework3/trunk@12589 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 01:26:58 +00:00
06779bc8c0
remove unnecessary requires for stuff in rex. autoload and a high-level require 'rex' in lib/msf/core.rb should take care of everything. see #4371 , #4373 , r12587, and r12554.
...
git-svn-id: file:///home/svn/framework3/trunk@12588 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 00:53:33 +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
a95186df6a
Revert previous patch and handle via override instead
...
git-svn-id: file:///home/svn/framework3/trunk@12585 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-11 22:18:16 +00:00
ea2da5f9ce
Applies a patch to fix autoload + active_support conflicts: https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/2283-unnecessary-exception-raised-in-asdependenciesload_missing_constant
...
git-svn-id: file:///home/svn/framework3/trunk@12583 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-11 17:39:40 +00:00
3e6d526eca
Fixes #4391 . Sorry! Ruby incompatability on method defs where if you set one option, you need to set them all (doesn't affect current 1.9 Rubies).
...
git-svn-id: file:///home/svn/framework3/trunk@12580 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-10 21:27:17 +00:00
69d09113b5
use Metasm to parse elf templates and set appropriate header flags for marking .text as rwx, fixes #4384
...
git-svn-id: file:///home/svn/framework3/trunk@12579 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-10 21:06:19 +00:00
cd5dbe7d58
See #4371 , fix rex/file autoloads
...
git-svn-id: file:///home/svn/framework3/trunk@12577 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-10 20:15:16 +00:00
50b26cb2d6
Adds another Qualys formatted XML importer for ASSET_DATA_REPORT files.
...
git-svn-id: file:///home/svn/framework3/trunk@12575 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-10 19:10:02 +00:00
cdeb44747f
huh? missing something important heh
...
git-svn-id: file:///home/svn/framework3/trunk@12574 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-10 18:33:38 +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
cb72073cd8
pcaprub: add a respond_to? in the capture mixin to ensure latest version
...
git-svn-id: file:///home/svn/framework3/trunk@12565 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-08 04:43:24 +00:00
5d8db916d7
pcap_replay: small fix on th delay
...
git-svn-id: file:///home/svn/framework3/trunk@12563 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-08 01:44:09 +00:00
490471e129
Include necessary require.
...
git-svn-id: file:///home/svn/framework3/trunk@12558 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-07 02:16:09 +00:00
cd4c38333d
See #4371 , Fixes logging error with LogLevel set in config
...
git-svn-id: file:///home/svn/framework3/trunk@12556 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 19:10:02 +00:00
a2cf5c01b9
See #4371 , oops, forgot to commit rex.rb!
...
git-svn-id: file:///home/svn/framework3/trunk@12555 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:55:41 +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
47ef020c61
back to development. 3.8 here we come
...
git-svn-id: file:///home/svn/framework3/trunk@12541 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-04 23:12:43 +00:00
27c1e757e1
add post count to the banner
...
git-svn-id: file:///home/svn/framework3/trunk@12537 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-04 08:50:38 +00:00
decf71c4af
Exceptions trying to determine DB status should simply return false
...
git-svn-id: file:///home/svn/framework3/trunk@12536 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-04 02:44:14 +00:00
9c712f1481
cosmetic
...
git-svn-id: file:///home/svn/framework3/trunk@12534 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-03 18:25:55 +00:00
09f861736a
Lets try this without breaking msfpayload
...
git-svn-id: file:///home/svn/framework3/trunk@12533 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-03 15:07:27 +00:00
98831c3285
Clean up an SNMP rescue clause that makes Windows Ruby builds sad.
...
git-svn-id: file:///home/svn/framework3/trunk@12530 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-03 07:51:09 +00:00
4c84181c44
This adds a migrated flag to the framework.db object, to prevent a race condition between session_manager startup and db availability while the schema loads. This also makes the session_manager code try again (up to a max count) when it encounters an exception
...
git-svn-id: file:///home/svn/framework3/trunk@12529 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-03 07:09:34 +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
93b0c5beb3
Check for the database first
...
git-svn-id: file:///home/svn/framework3/trunk@12523 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-03 04:49:18 +00:00
73ba020547
release!
...
git-svn-id: file:///home/svn/framework3/trunk@12521 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-03 04:40:41 +00:00
2192532a0c
don't read from the rsock as that's already taken care of by monitor_rsock in StreamAbstraction. fixes EVERYTHING. also fixes #4321
...
git-svn-id: file:///home/svn/framework3/trunk@12520 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-03 04:12: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
fdc19b5e4a
Add the second required argument to write()
...
git-svn-id: file:///home/svn/framework3/trunk@12518 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-03 03:09:20 +00:00
23c355ba2c
Just use :mac not :host_mac
...
git-svn-id: file:///home/svn/framework3/trunk@12517 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-03 03:03:38 +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
8fd84e3c3d
fix cmd/unix/reverse by adding proper read() and write() methods to TcpReverseDoubleSessionChannel
...
git-svn-id: file:///home/svn/framework3/trunk@12514 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 20:42:53 +00:00
259bf9695a
don't kill a session when the user ctrl-C's during a command run by sessions -c or a script/postmod
...
git-svn-id: file:///home/svn/framework3/trunk@12513 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 20:40:19 +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
e81d3440b8
don't try to store session events for sessions without a db_record. fixes #4301
...
git-svn-id: file:///home/svn/framework3/trunk@12505 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 06:45:21 +00:00
732a1f3993
Skip empty vulnerability names
...
git-svn-id: file:///home/svn/framework3/trunk@12503 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 05:20:07 +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
e9372d0e51
add another require
...
git-svn-id: file:///home/svn/framework3/trunk@12501 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 03:40:34 +00:00
ed86305675
add a require
...
git-svn-id: file:///home/svn/framework3/trunk@12500 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 03:40:03 +00:00
91658ac45e
remove crufty require
...
git-svn-id: file:///home/svn/framework3/trunk@12497 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 01:35:21 +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
61ac192d0d
read() instead of sysread(), fixes ssh sessions
...
git-svn-id: file:///home/svn/framework3/trunk@12495 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 00:23:42 +00:00
178ae10e22
make sure telnet sessions use crlf for write() as well as put()
...
git-svn-id: file:///home/svn/framework3/trunk@12494 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-01 23:56:57 +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
2c3e85af05
Major cleanups to the session manager, serialized processing of incoming connections, concurrent processing (up to a max scheduler thread count) of meterpreter initialization/scripts. This is to avoid a potential deadlock in openssl and ensure consistent, reliable session staging. This commit also fixes a bug that would mark database sessions as closed too early.
...
git-svn-id: file:///home/svn/framework3/trunk@12485 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 18:51:50 +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
23d0c7d7d0
This overrides the framework.sessions.each method to use a temporary list instead of the native hash method. This avoids a rare race condition where a thread is enumerating sessions while another thread tries to register one.
...
git-svn-id: file:///home/svn/framework3/trunk@12478 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 04:50:06 +00:00
dfb8a9e24b
Catching more nils in db_import.
...
git-svn-id: file:///home/svn/framework3/trunk@12477 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 04:33:52 +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
321e5bd292
Qualify the exception namespace
...
git-svn-id: file:///home/svn/framework3/trunk@12475 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 03:33:45 +00:00
94be33e8ee
A little cleaner method for determining the nature of imported zip files.
...
git-svn-id: file:///home/svn/framework3/trunk@12472 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 01:49:55 +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
d942442bcd
Officially remove sqlite3 support (its been deprecated for approximately a year). SQLite3 has not been usable for a long time due to thread concurrency and stability issues. This is the final nail in the coffin now that the DB backend has gone through an overhaul.
...
git-svn-id: file:///home/svn/framework3/trunk@12469 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-29 17:22:53 +00:00
743a401a47
Add the ability to reset the last read pointer from the ringer buffer
...
git-svn-id: file:///home/svn/framework3/trunk@12467 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-29 16:02:24 +00:00
882c4b52f8
Monkey patch xmlrpc to handle 64-bit integers (meterpreter file sizes) and deal with nil more gracefully.
...
git-svn-id: file:///home/svn/framework3/trunk@12466 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-29 06:10:41 +00:00
4053764f21
In the event an import file isn't an msf_zip, pcapfile, and doesn't have a newline, bail.
...
git-svn-id: file:///home/svn/framework3/trunk@12465 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-29 04:16:42 +00:00
07e02ce44a
When reporting a session from an import, :routes should always end up an an array.
...
git-svn-id: file:///home/svn/framework3/trunk@12464 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-29 04:10:46 +00:00
1693a21b06
Fixes nessus_v2 imports to indicate a service name correctly.
...
git-svn-id: file:///home/svn/framework3/trunk@12463 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-28 18:52:35 +00:00
0a638aebfc
make modules' class.inspect useful. this has bugged me for *years*
...
git-svn-id: file:///home/svn/framework3/trunk@12462 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-28 16:50:57 +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
859fd9216f
report module_run and script_run session events
...
git-svn-id: file:///home/svn/framework3/trunk@12448 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 21:57:01 +00:00
f04782904e
move @@reload_opts to the correct class, fixes 'help reload' from a non-exploit module context
...
git-svn-id: file:///home/svn/framework3/trunk@12447 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 21:53:45 +00:00
f72c94b514
default last_seen to sane values so we don't orphan all sessions right away. =/
...
git-svn-id: file:///home/svn/framework3/trunk@12446 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 21:29:47 +00:00
956dcfa6d2
deal with the odd 'No Service Pack' by normalizing to 'Service Pack 0', fixes odd 2003 detection
...
git-svn-id: file:///home/svn/framework3/trunk@12444 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 19:31:56 +00:00
81391d6ebf
fix a stupid bug where retina, nessus, and qualys os fingerpritns would not be saved; improve fingerprints for 2003, 2008
...
git-svn-id: file:///home/svn/framework3/trunk@12443 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 19:13:35 +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
8cf4733535
change the close_reason to be more accurate now that the close isn't happening at startup
...
git-svn-id: file:///home/svn/framework3/trunk@12441 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 16:19:59 +00:00
1d8dca6268
Merge the stale session reaper code into the session manager
...
git-svn-id: file:///home/svn/framework3/trunk@12437 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 05:10:14 +00:00
cc0904b27e
Unbreak trunk for now, this code needs to be fixed, its throwing errors. Fixes #4218
...
git-svn-id: file:///home/svn/framework3/trunk@12436 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 02:22:05 +00:00
905044b03b
Sources credentials gained from exploits by a session ID directly, rather than going through the ExploitedHost table.
...
git-svn-id: file:///home/svn/framework3/trunk@12435 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-25 21:01:24 +00:00
80fe4c22e3
don't bomb out when there are no stale sessions
...
git-svn-id: file:///home/svn/framework3/trunk@12433 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-25 17:18:29 +00:00
b61d83a0ae
add a last-seen column to the sessions table so we can cull dead sessions on startup
...
git-svn-id: file:///home/svn/framework3/trunk@12432 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-25 16:11:02 +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
bfe3c58d8b
Correct the logic around Host object parameters
...
git-svn-id: file:///home/svn/framework3/trunk@12421 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 02:41:29 +00:00
eacf1d3c8c
Lets not break the trunk after all
...
git-svn-id: file:///home/svn/framework3/trunk@12420 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 02:32:43 +00:00
25971ff2ac
Pass a host object into the nse parser from a host object cache.
...
git-svn-id: file:///home/svn/framework3/trunk@12416 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 00:54:43 +00:00
5918e6c0ac
Allow report_auth_info() to accept a Host object instead of an address like all the other methods.
...
git-svn-id: file:///home/svn/framework3/trunk@12415 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 00:48:05 +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
b0d81f4385
This mega-patch solves a few outstanding issues:
...
1) The database queue is no longer used, all threads have their own connection. This officially breaks sqlite3 support, even though sqlite3 was pretty broken to being with.
2) The report_* calls prefer a Host object in the :host parameter instead of :address. This lets it skip a lookup on the host table
3) The importers now pass in the Host object, significantly speeding up large imports
4) The host record is no longer updated by every change to a child object, this was too much of a bottleneck.
TL;DR: Database stuff is faster
git-svn-id: file:///home/svn/framework3/trunk@12409 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 20:16:55 +00:00
53809926c1
the database *is* available at startup if there is a ~/.msf3/database.yml or if msfconsole was started with -y. There's a check for the db anyway, so this shouldn't ever bomb out
...
git-svn-id: file:///home/svn/framework3/trunk@12407 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 19:49:44 +00:00
4c0c282cf8
Fix a stack trace when one of these is nil
...
git-svn-id: file:///home/svn/framework3/trunk@12406 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 19:27:50 +00:00
5fc0f4eaf1
Fix typo
...
git-svn-id: file:///home/svn/framework3/trunk@12405 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 19:07:41 +00:00
537e312c13
set RHOSTS directly when we have a short list
...
git-svn-id: file:///home/svn/framework3/trunk@12404 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 18:31:55 +00:00
91bb4b0130
auxiliary: add a basic pcap replay module
...
git-svn-id: file:///home/svn/framework3/trunk@12403 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 18:25:19 +00:00
96ee780967
merge the_listener's patch for adding ability to set RHOSTS from db_services. extends it by adding the same support in db_hosts and db_notes, see #308
...
git-svn-id: file:///home/svn/framework3/trunk@12401 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 05:08:08 +00:00
1be4b0831b
add support for dumping services as a csv file like hosts. merges partial patch from the_listener, thanks! fixes #3120
...
git-svn-id: file:///home/svn/framework3/trunk@12400 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 02:22:21 +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
1a4d4340bf
Make Ruby 1.8.7 happy
...
git-svn-id: file:///home/svn/framework3/trunk@12382 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 20:06:45 +00:00
545025dbea
Add a warning when the imported vulnerability data is missing the service protocol/port (looks like just one vendor today has this problem).
...
git-svn-id: file:///home/svn/framework3/trunk@12381 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 18:33:27 +00:00
41cc038eca
Undoing r12379 in anticipation of a different version.
...
git-svn-id: file:///home/svn/framework3/trunk@12380 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 18:29:04 +00:00
93a07df541
Add a :warning handler for db_import.
...
git-svn-id: file:///home/svn/framework3/trunk@12379 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 18:22:18 +00:00
07fb337ad9
Fix the actual thread cap
...
git-svn-id: file:///home/svn/framework3/trunk@12378 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 17:56:38 +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
b164ac6539
Actually store the title for Nexpose imports.
...
git-svn-id: file:///home/svn/framework3/trunk@12374 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-19 23:00:19 +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
b94d09cdf1
Try a little harder to make this module more reliable through TCP proxies
...
git-svn-id: file:///home/svn/framework3/trunk@12359 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-18 20:53:21 +00:00
d2d66f3285
This patch changes how VNC sessions are handled, making them a now-unique type that is not registered in the normal sense. This works around a corner case due to recent session work.
...
git-svn-id: file:///home/svn/framework3/trunk@12358 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-18 20:07:53 +00:00
8b5d004997
Adding an nmap version checker so NSE modules can tell if it's okay to run or not.
...
git-svn-id: file:///home/svn/framework3/trunk@12357 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-18 19:52:13 +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
debc16bea5
vnc sessions don't have an arch
...
git-svn-id: file:///home/svn/framework3/trunk@12352 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-18 16:53:58 +00:00
99d5affbc7
put session_* events back in until we can sort out some issues with the change
...
git-svn-id: file:///home/svn/framework3/trunk@12351 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-18 16:29:15 +00:00
069eb808f1
store closed_at in utc to avoid discrepancies with opened_at
...
git-svn-id: file:///home/svn/framework3/trunk@12348 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-18 15:59:25 +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
5effb0ca04
use Table#to_csv to generate csv a file that isn't broken when data contains commas
...
git-svn-id: file:///home/svn/framework3/trunk@12343 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-17 01:07:53 +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
ff07d00b51
Simpler interrupt handling in RPC consoles.
...
git-svn-id: file:///home/svn/framework3/trunk@12339 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-16 23:03:30 +00:00
05f0f3739f
add help for several db commands
...
git-svn-id: file:///home/svn/framework3/trunk@12338 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-16 22:49:31 +00:00
b53545e875
Seach post modules by default too.
...
git-svn-id: file:///home/svn/framework3/trunk@12336 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-16 18:03:13 +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
a0cbbdfab0
Support 'jar' format when generating payloads.
...
git-svn-id: file:///home/svn/framework3/trunk@12331 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-16 02:11:12 +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
f386a2c587
Adding an additional sessions mapping to workspaces.
...
git-svn-id: file:///home/svn/framework3/trunk@12327 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-15 20:36:10 +00:00
175cae5047
Add associations between Host, Session & SessionEvent model objects.
...
git-svn-id: file:///home/svn/framework3/trunk@12325 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-15 18:54:27 +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
d63fe9a7ba
Adding a column for local_id to the sessions table in order to better handle database-mediated session operations.
...
git-svn-id: file:///home/svn/framework3/trunk@12321 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-14 23:14:36 +00:00
93ee866669
Prevent new sessions from being opened several hours in the past so that we don't accidentally create spatiotemporal paradoxes and erase ourselves from history.
...
git-svn-id: file:///home/svn/framework3/trunk@12319 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-14 21:53:03 +00:00
96af5e2af6
store session info in the db
...
git-svn-id: file:///home/svn/framework3/trunk@12317 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-14 18:28:44 +00:00
d6edeebcef
actually log errors from reporting the session fingerprint. would have helped greatly in tracking down #4128
...
git-svn-id: file:///home/svn/framework3/trunk@12313 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-13 23:03:00 +00:00
c5c7ca3657
loglevel max is actually 5
...
git-svn-id: file:///home/svn/framework3/trunk@12312 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-13 21:22:38 +00:00
f8be06bd88
See #4129 . This patches up shell_read and shell_write to use the new ring buffer mechanisms with no significant API changes. Still need to run through a test on Armitage to ensure it's all still flowing smoothly, should be done within the hour.
...
git-svn-id: file:///home/svn/framework3/trunk@12310 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-13 17:02:45 +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
361922c634
don't use in-place gsub, it breaks on 1.9.2 since the string was a hash key at one point and apparently gets frozen, fixes #4128
...
git-svn-id: file:///home/svn/framework3/trunk@12308 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-13 01:48:37 +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
9831dd5ca6
take linux sysinfo into account for os fingerprints
...
git-svn-id: file:///home/svn/framework3/trunk@12303 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-11 23:15:05 +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
b2eb5a4908
store the service pack from nexpose (previously not returned from the xml parser, see r12298); store hostname and more version info from nmap; see #4099
...
git-svn-id: file:///home/svn/framework3/trunk@12300 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-11 22:29:53 +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
e9e8026832
Fixed author name in modules for myself.
...
git-svn-id: file:///home/svn/framework3/trunk@12292 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-11 02:25:36 +00:00
a82c47789d
silly debug print, see #4099
...
git-svn-id: file:///home/svn/framework3/trunk@12290 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-11 01:41:35 +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
875858e78e
See #4089 , fix method definitions
...
git-svn-id: file:///home/svn/framework3/trunk@12267 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-07 13:19:43 +00:00
1a7cc50530
Fixes #4089 , Pass DECODERSTUB advopt when calling generate_stager too
...
git-svn-id: file:///home/svn/framework3/trunk@12266 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-07 13:17:03 +00:00
8057c7e969
sync up with metasm tip, yay for Yoann and autoload
...
git-svn-id: file:///home/svn/framework3/trunk@12252 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-06 17:40:01 +00:00
f3717302cd
Fixes #4073 by applying a patch from Francois Ropert for parsing DMVPN keys from Cisco configuration files
...
git-svn-id: file:///home/svn/framework3/trunk@12248 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-05 15:45:01 +00:00
b91c81a182
Fixes #4074 -- corrects the affected regexes.
...
git-svn-id: file:///home/svn/framework3/trunk@12238 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-04 22:19:59 +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
16eac54a39
and now back to your regular scheduled msfconsole
...
git-svn-id: file:///home/svn/framework3/trunk@12220 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-02 15:51:48 +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
0c9dbbf9f3
a few more cosmetic changes
...
git-svn-id: file:///home/svn/framework3/trunk@12201 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-01 06:48:36 +00:00
a305d3bd27
deprecate windows. What day is it today?
...
git-svn-id: file:///home/svn/framework3/trunk@12200 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-01 06:35:25 +00:00
fea84dccda
Text alignment
...
git-svn-id: file:///home/svn/framework3/trunk@12199 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-01 06:03:42 +00:00
f97790ec8b
Cosmetic change
...
git-svn-id: file:///home/svn/framework3/trunk@12198 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-01 06:01:25 +00:00
ae1d3b78bc
add host.imported notes for import types other than nmap, see r9277; don't double-report hosts for nessus and ip360 imports
...
git-svn-id: file:///home/svn/framework3/trunk@12197 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-01 01:01:11 +00:00
e1499657c9
Overhaul the nexpose vuln importer to be a little more friendly to all the XML data we can gather about vulns, beyond just their ID and references.
...
git-svn-id: file:///home/svn/framework3/trunk@12182 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-29 22:22:58 +00:00
e0e8d986e7
Fix up psexec by adding a reqwuire for the wbemexec mixin
...
git-svn-id: file:///home/svn/framework3/trunk@12180 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-29 16:35:26 +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
4892a67fa1
small tweaks, remove model - no longer necessary
...
git-svn-id: file:///home/svn/framework3/trunk@12143 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-26 00:46:55 +00:00
cf3fbdad71
unneeded require in comments
...
git-svn-id: file:///home/svn/framework3/trunk@12142 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-26 00:45:52 +00:00
50d573f282
doh! commit the rest of chao's railgun work
...
git-svn-id: file:///home/svn/framework3/trunk@12141 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-26 00:33:05 +00:00
29061c5799
merge in chao-mu's changes. all tests passing :)
...
git-svn-id: file:///home/svn/framework3/trunk@12138 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-25 21:16:41 +00:00
695bd76a30
typo fix
...
git-svn-id: file:///home/svn/framework3/trunk@12134 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-25 18:28:27 +00:00
9895d01d51
Moving lib_mysqludf_sys*.dll to a more obvious subdirectory of the exploit binaries.
...
git-svn-id: file:///home/svn/framework3/trunk@12128 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-24 17:48:19 +00:00
c09be5561d
this should have been a raise all along, see r9752
...
git-svn-id: file:///home/svn/framework3/trunk@12119 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-23 23:15:11 +00:00
ad5073d6b1
only close the session when we get socket-related exceptions, fixes #4005
...
git-svn-id: file:///home/svn/framework3/trunk@12118 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-23 22:21:59 +00:00
ec5e61966d
oops revert the unwanted early commit on mssql
...
git-svn-id: file:///home/svn/framework3/trunk@12114 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-23 20:53:57 +00:00
2b4acb3b6c
Misplaced (and redundant) functon in the postgres library, removed.
...
git-svn-id: file:///home/svn/framework3/trunk@12113 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-23 20:52:07 +00:00
46cf938475
fix typo
...
git-svn-id: file:///home/svn/framework3/trunk@12112 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-23 20:47:49 +00:00
b1178686cf
Fixes #3988 . Adds a command execution module for PostgreSQL by uploading a UDF library and adding sys_exec() as a temporary function. Requires the target to be Windows, uses Bernardo Damele A. G.'s binaries.
...
Also fixes a typo in the arguments to handler which clears up a heretofore mysterious exception (see exploit.rb).
git-svn-id: file:///home/svn/framework3/trunk@12111 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-23 19:36:07 +00:00
8bb95f02c5
load the config after adding any module paths so we can start msfconsole using a module from a non-default path
...
git-svn-id: file:///home/svn/framework3/trunk@12105 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-23 16:19:55 +00:00
ac75160741
Add sinn3r and bannedit to authors
...
git-svn-id: file:///home/svn/framework3/trunk@12084 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-23 03:28:19 +00:00
02165304c2
Adding an additional error code for postgresql, new as of version 9.
...
git-svn-id: file:///home/svn/framework3/trunk@12071 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-22 17:43:36 +00:00
3ed59574e1
Another postgresql fingerprint, now when auths are enabled.
...
git-svn-id: file:///home/svn/framework3/trunk@12070 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-22 17:39:19 +00:00
8bca6d4d54
Adding a quickie fingerprint for PostgreSQL on windows (9.0.3)
...
git-svn-id: file:///home/svn/framework3/trunk@12069 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-22 17:26:57 +00:00
3395ee226e
Associate the replicant exploit instance with the replicant payload, otherwise the wrong exploit instance will be used by the payload handler. Fixes #4004 .
...
git-svn-id: file:///home/svn/framework3/trunk@12065 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-22 03:19:56 +00:00
46dfafa81f
Fixes #3987 . Don't raise on the attr set, raise when the command actually wants to get run.
...
git-svn-id: file:///home/svn/framework3/trunk@12063 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-21 20:52:08 +00:00
cf04b2f387
fix a stack trace if nmap is not installed
...
git-svn-id: file:///home/svn/framework3/trunk@12062 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-21 20:11:12 +00:00
7043e25ae9
Clarify the license and the usability
...
git-svn-id: file:///home/svn/framework3/trunk@12061 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-21 19:00:35 +00:00
e72a4e36bd
add 'show actions' for post mods, oversight from r12008. see #3965
...
git-svn-id: file:///home/svn/framework3/trunk@12058 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-21 17:07:11 +00:00
3527aa2472
correct width calculation for sysinfo
...
git-svn-id: file:///home/svn/framework3/trunk@12057 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-21 16:58:24 +00:00
c6b3bfacfe
Merge in an openvas-bridge update from kost
...
git-svn-id: file:///home/svn/framework3/trunk@12056 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-21 05:02:14 +00:00
3d59be3586
This patch adds a 'reload_all' command to msfconsole. This will flush and reload all modules from all module paths
...
git-svn-id: file:///home/svn/framework3/trunk@12040 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-20 22:22:07 +00:00
2e267bdca3
This patch removes the unimplemented "persist" command. This has been sitting in half-done state for too many years and its time to go.
...
git-svn-id: file:///home/svn/framework3/trunk@12039 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-20 21:41:09 +00:00
12ea375d25
See #3183 : Pad the plain text before trying DES on it.
...
git-svn-id: file:///home/svn/framework3/trunk@12033 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-20 08:55:12 +00:00
d45b2aaa20
bugfix & cleanup of the vm loading and a speedup / bugfix for the regex lib
...
git-svn-id: file:///home/svn/framework3/trunk@12032 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-20 02:33:39 +00:00
a31eadc554
Change IPs before offer instead of between offer and ack. Fixes #3973 .
...
git-svn-id: file:///home/svn/framework3/trunk@12030 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-20 00:33:02 +00:00
b5bd7599fd
Updated usage message to reflect that more than one resource file can be used
...
git-svn-id: file:///home/svn/framework3/trunk@12017 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-18 02:47:58 +00:00
3416862f13
Resource command for Meterpreter Sessions
...
git-svn-id: file:///home/svn/framework3/trunk@12016 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-18 02:44:15 +00:00
e094c7e941
Fix typo in db_creds
...
git-svn-id: file:///home/svn/framework3/trunk@12011 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-17 22:13:10 +00:00
f2057f54a8
De-dup'ed get_link_filter() in the crawler module. Added some comment
...
docs on crawler_process_page(). Nothing exciting.
git-svn-id: file:///home/svn/framework3/trunk@12010 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-17 21:21:21 +00:00
ded3ff9c75
add support for actions in post modules. fixes #3965~
...
git-svn-id: file:///home/svn/framework3/trunk@12008 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-17 05:39:30 +00:00
c4bd210eae
Fixes #3959 .
...
git-svn-id: file:///home/svn/framework3/trunk@12006 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-17 04:12:51 +00:00
91a48cd04b
Fix error with undefined variable 'name' when clearing default workspace
...
git-svn-id: file:///home/svn/framework3/trunk@12005 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-17 04:10:22 +00:00
6cd1699c42
Enable command passthru in "web" console, since it's awfully convenient and no longer provides any security since msfweb was removed.
...
(console access already provides the ability to execute OS commands)
git-svn-id: file:///home/svn/framework3/trunk@12004 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-17 00:17:45 +00:00
e49ab08e21
Add support to scripts for Meterpreter Accounts Mixin and add new method is_system? for checking if sessions is running as SYSTEM, uses SID so as at to ensure compatibility with multiple language versions of windows.
...
git-svn-id: file:///home/svn/framework3/trunk@11997 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-16 22:44:36 +00:00
f4ceb83e40
send spn avp by default ; it wont hurt at all
...
git-svn-id: file:///home/svn/framework3/trunk@11992 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-16 20:01:28 +00:00
91c50f7683
use self.rhost instead of datastore['RHOST']
...
git-svn-id: file:///home/svn/framework3/trunk@11973 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-16 00:34:07 +00:00
a7d2a34fe2
move comment
...
git-svn-id: file:///home/svn/framework3/trunk@11972 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-16 00:27:44 +00:00
b7a0a305ee
allow psexec to success when SPN validation level is required on windows seven / 2008r2 servers
...
git-svn-id: file:///home/svn/framework3/trunk@11971 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-16 00:12:07 +00:00
ecb89c785b
Actually use the API for appending command line arguments for nmap.
...
git-svn-id: file:///home/svn/framework3/trunk@11970 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-15 21:59:35 +00:00
292f357f7a
Moving requires from oracle_login to nmap. Duh.
...
git-svn-id: file:///home/svn/framework3/trunk@11966 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-15 20:46:03 +00:00
9e15c487b5
Adding pid info for nmap.
...
git-svn-id: file:///home/svn/framework3/trunk@11964 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-15 18:31:17 +00:00
fa3c038f1d
Check for nulls/nils when retrieving client list
...
git-svn-id: file:///home/svn/framework3/trunk@11963 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-15 16:52:01 +00:00
f3ddb869be
Clean these too.
...
git-svn-id: file:///home/svn/framework3/trunk@11962 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-15 01:53:45 +00:00
7d12151ec6
add support for http digest authentication. fixes #2504 , thanks oliver kleinecke for the patch!
...
git-svn-id: file:///home/svn/framework3/trunk@11961 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-14 22:37:16 +00:00
6e0e23f5ba
Fixups on the Oracle/Nmap stuff. Adding back in the Scanner module, since it has some handy process mgmt functions.
...
git-svn-id: file:///home/svn/framework3/trunk@11960 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-14 22:13:57 +00:00
e073a3a01c
Fixes #3941 . This should deal with the path problems I ran into on Windows. otherwise, works like a champ, so resolving.
...
git-svn-id: file:///home/svn/framework3/trunk@11951 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-14 03:31:40 +00:00
b68396351a
See #3941 . This is a first attempt at supporting driving nmap via a metasploit module. It's a somewhat hefty checkin that includes the Nmap auxiliary mixin as well as an oracle login bruteforce module that uses it.
...
This definitely needs to be tested on Win32 before it can be called f i x e d, due to the differences between the nmap binaries and the way files are created and used.
Also, the oracle_login scanner could use another once-over for error handling -- don't rely on that yet.
Once this all works the way I expect, I'll document the procedure more thoroghly so people can take advantage.
git-svn-id: file:///home/svn/framework3/trunk@11948 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-13 22:52:50 +00:00
468f500e31
add a function to detect if ntlm response comes from an empty pwd
...
git-svn-id: file:///home/svn/framework3/trunk@11936 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-11 20:24:49 +00:00
dbcb02b8de
future-proof the sysinfo command by generically looping over the values returned by the server instead of hardcoding keys
...
git-svn-id: file:///home/svn/framework3/trunk@11925 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-10 17:23:47 +00:00
98a6b7db4c
Missing space between hosts and services in db_notes
...
git-svn-id: file:///home/svn/framework3/trunk@11919 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 22:11:29 +00:00
b5323c129c
when ntlmssp is not used, better to disable signing then raising an error
...
git-svn-id: file:///home/svn/framework3/trunk@11918 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 21:51:11 +00:00
fea87fb82b
enable pass-the-hash when signing is required
...
git-svn-id: file:///home/svn/framework3/trunk@11917 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 21:13:04 +00:00
2fa2ca174c
use the correct exception
...
git-svn-id: file:///home/svn/framework3/trunk@11916 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 17:31:53 +00:00
7755cdd983
correct a bug on ntlmv2_response and comment style compliance
...
git-svn-id: file:///home/svn/framework3/trunk@11915 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 16:57:33 +00:00
612c2e6796
This commit fixes much of the NTLM crypt code to work properly again, fixing #3918 as well.
...
git-svn-id: file:///home/svn/framework3/trunk@11914 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 05:04:42 +00:00
046d75533a
This patch adds a method for recognizing LM/NTLM hashes, disables signing when no user is specified and the server denies our NTLMSSP logon with an empty user, and cleans up the indents and formatting for some of the new code
...
git-svn-id: file:///home/svn/framework3/trunk@11912 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 03:35:25 +00:00
315a1cb4f2
Disable signing when we reach this corner case, required to setup null sessions to XP SP2/SP3 (no domain)
...
git-svn-id: file:///home/svn/framework3/trunk@11910 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 03:08:11 +00:00
b04ac2d446
enable pass-the-hash for ntlmv2 as well, signing is not yet suported
...
git-svn-id: file:///home/svn/framework3/trunk@11908 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 02:41:50 +00:00
1f948c1e17
re-enable pass-the-hash for smb client when ntlmv1 or ntlm2_session is used ( ntlmv2 or signing not yet supported but coming soon)
...
git-svn-id: file:///home/svn/framework3/trunk@11906 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 01:56:09 +00:00
fc8c0681de
remove an option present twice
...
git-svn-id: file:///home/svn/framework3/trunk@11905 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 00:42:12 +00:00
e71e609ab0
Rework this option as well
...
git-svn-id: file:///home/svn/framework3/trunk@11903 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-08 23:46:44 +00:00
c2aede0a59
Revert an overzealous search/replace
...
git-svn-id: file:///home/svn/framework3/trunk@11902 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-08 23:31:06 +00:00
5c2abe4dd7
This patch reworks some of the new SMB names to match the standard option format
...
git-svn-id: file:///home/svn/framework3/trunk@11901 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-08 23:29:34 +00:00
42531e097f
Fixes #3916 . Adds a module for mysql delivery of a payload via a UDF, using Bernardo's quite excellent UDF libraries.
...
git-svn-id: file:///home/svn/framework3/trunk@11899 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-08 22:42:26 +00:00
a5275fa6e5
Fixes #3915 . This comments out two more raiseable conditions -- neither seem particularly useful to raise on in the first place anyway, though.
...
Some day, I need to go over all this with some decent version switching and submit some upstream patches.
git-svn-id: file:///home/svn/framework3/trunk@11897 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-08 21:28:20 +00:00
79903eb724
Fixes #3910 . Backporting the upstream fix by dropping the f1 check. Ought to uprev the whole thing from the git repo, but need to figure out if we have any local changes first.
...
git-svn-id: file:///home/svn/framework3/trunk@11894 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-08 00:08:26 +00:00
5f6995e8d3
enable ntlmv2 and signing for smb client stack (pth implementation is coming), fixes #11678 and #152
...
git-svn-id: file:///home/svn/framework3/trunk@11893 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-07 19:57:53 +00:00
d535e74f47
Bump trunk to 3.7.0-dev to start on the next release
...
git-svn-id: file:///home/svn/framework3/trunk@11890 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-07 04:09:45 +00:00
31970fb09a
Release time, mark this as 3.6.0
...
git-svn-id: file:///home/svn/framework3/trunk@11889 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-07 02:46:51 +00:00
c92ab3f6b5
only dup if we've got something to dup. fixes #3896
...
git-svn-id: file:///home/svn/framework3/trunk@11880 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-05 20:15:36 +00:00
c775f07a82
this test works, re-enable. fix a 1.9 compat issue.
...
git-svn-id: file:///home/svn/framework3/trunk@11877 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-04 16:43:20 +00:00
3b5c467c47
Fix db_hosts when -c is passed
...
git-svn-id: file:///home/svn/framework3/trunk@11862 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-02 17:12:10 +00:00
3e99eea120
Adds a to_csv method to the table class
...
git-svn-id: file:///home/svn/framework3/trunk@11861 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-02 15:06:43 +00:00
6904ce8c7b
3.6.0-beta\!
...
git-svn-id: file:///home/svn/framework3/trunk@11852 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-01 06:15:15 +00:00
4a41e4e352
Fixes #3742 by sanitizing utf-8 characters for the username and system name in session.info.
...
Tested with German Win2k3EE and a session created with exploit/windows/mssql/mssql_payload.
git-svn-id: file:///home/svn/framework3/trunk@11848 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-28 21:39:25 +00:00
e7dbf28626
This patch adds a register_parent() method to the module class, making it easy to propogate things like ParentUUID, Workspace, and Owner down. The multi/handler post modules were updated to use this new api. This fixes an issue where the session generated by a post module would be registered to the wrong workspace.
...
git-svn-id: file:///home/svn/framework3/trunk@11846 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-28 04:24:35 +00:00
1cdc5d8c0a
add_row instead of just adding to self.rows. fixes #3825
...
git-svn-id: file:///home/svn/framework3/trunk@11844 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-28 02:30:47 +00:00
f912d2e0c2
Add db_loot (basic)
...
git-svn-id: file:///home/svn/framework3/trunk@11843 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-27 16:30:17 +00:00
30c14fe45c
Remove a duplicate host column from db_services
...
git-svn-id: file:///home/svn/framework3/trunk@11842 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-27 15:58:08 +00:00
d7eecc9d67
make sure registry is there before including it, fixes #3806 , fixes #3726
...
git-svn-id: file:///home/svn/framework3/trunk@11840 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-26 23:52:28 +00:00
424adcd74d
Remove the near-worthless loot report message
...
git-svn-id: file:///home/svn/framework3/trunk@11839 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-26 18:07:48 +00:00
c204f38e84
Remove the near-worthless loot report message
...
git-svn-id: file:///home/svn/framework3/trunk@11838 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-26 18:07:25 +00:00
1f3000dc41
Cleaner default output for db_hosts and db_services
...
git-svn-id: file:///home/svn/framework3/trunk@11837 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-26 17:42:03 +00:00
9bc2a2cd3a
Store keystrokes as loot
...
git-svn-id: file:///home/svn/framework3/trunk@11835 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-26 04:54:45 +00:00
fa16dcb098
Add the ability to enumerate compatible post modules for a given session id
...
git-svn-id: file:///home/svn/framework3/trunk@11832 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-26 03:50:12 +00:00
941c0f446f
Change the CustomPrintPrefix to apply to lines (before the status/timestamp)
...
git-svn-id: file:///home/svn/framework3/trunk@11829 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-26 02:35:38 +00:00
880ffeb1f7
This updates the (C) for 2011, adds a CustomPrintPrefix option to set a unique prefix for a module and cleans up some post modules
...
git-svn-id: file:///home/svn/framework3/trunk@11828 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-26 02:02:34 +00:00
52d8e59b43
work around what i can only assume is a bizarre ruby bug where session_has_registry_ext?() never gets called and is assumed false, but session_has_registry_ext() works fine.
...
git-svn-id: file:///home/svn/framework3/trunk@11822 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-24 21:33:32 +00:00
57966c66d8
This allows for blank usernames in the normal case, as well as a domain/<blank> sort of construct for smb logins.
...
git-svn-id: file:///home/svn/framework3/trunk@11820 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-24 20:42:14 +00:00
21ed434f24
better test for registry extension
...
git-svn-id: file:///home/svn/framework3/trunk@11819 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-24 19:36:22 +00:00
4721fd4539
unbreak scripts that use is_uac_enabled?()
...
git-svn-id: file:///home/svn/framework3/trunk@11818 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-24 18:14:40 +00:00
db619828f2
add a session_compatible? method to post modules, include platform in compatibility checks.
...
git-svn-id: file:///home/svn/framework3/trunk@11802 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-23 04:40:21 +00:00
fb98f96984
fix a pasto and simplify the return value
...
git-svn-id: file:///home/svn/framework3/trunk@11801 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-23 04:28:11 +00:00
f647088fba
give the timeout a default value. fixes everything that uses shell_command_token_* with one arg
...
git-svn-id: file:///home/svn/framework3/trunk@11800 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-23 01:33:39 +00:00
7e2fb81cb5
Initial set of OSX Shell Post modules for general basic enumeration and for dumping hashes (SHA, LM and NTLM) for OSX 10.4 and above
...
git-svn-id: file:///home/svn/framework3/trunk@11792 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-22 14:00:47 +00:00
1cbadda8c0
add 2008 to the list of versions on which UAC is enabled
...
git-svn-id: file:///home/svn/framework3/trunk@11787 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-21 20:26:14 +00:00
b97ccd5d88
don't error out and die if a post module doesn't have a SessionTypes
...
git-svn-id: file:///home/svn/framework3/trunk@11786 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-21 20:00:21 +00:00
50614260f1
remove superfluous stuff from the test module, fix an ArgumentError in the mixin. see r11783 and r11784
...
git-svn-id: file:///home/svn/framework3/trunk@11785 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-21 19:22:19 +00:00
e71cd9b524
add shell support for registry methdos, thanks kernelsmith!
...
git-svn-id: file:///home/svn/framework3/trunk@11784 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-21 19:13:11 +00:00
5db118fa9b
add support for reading various WinAPI data structures, thanks, chao-mu! fixes #3721
...
git-svn-id: file:///home/svn/framework3/trunk@11778 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-18 19:23:36 +00:00
bbbb86d571
patch by Hauke of the Fidus Project to fixup my bugs in the virtualbox controller :) -- thanks!
...
git-svn-id: file:///home/svn/framework3/trunk@11775 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-18 17:03:19 +00:00
ad691ec05b
Additional commands for the nexpose engine
...
git-svn-id: file:///home/svn/framework3/trunk@11774 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-18 09:16:06 +00:00
64529011a0
add the meterpreter platform to the output of sysinfo command
...
git-svn-id: file:///home/svn/framework3/trunk@11772 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-18 00:29:43 +00:00
f8c2fa6b72
aesthetic
...
git-svn-id: file:///home/svn/framework3/trunk@11771 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-18 00:25:36 +00:00
d6b8ef4c16
don't show meta type for packets (since they don't have one)
...
git-svn-id: file:///home/svn/framework3/trunk@11768 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-17 20:04:46 +00:00
b7d1ccb304
add packet-type to meterpreter packets' inspect
...
git-svn-id: file:///home/svn/framework3/trunk@11767 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-17 19:59:12 +00:00
160c683f18
Add WbemExec mixin, modify MS10-061 to use MOF technique
...
git-svn-id: file:///home/svn/framework3/trunk@11766 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-17 19:22:11 +00:00
e8e0841afc
don't error out if we previously loaded the client extension
...
git-svn-id: file:///home/svn/framework3/trunk@11763 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-17 04:32:26 +00:00
a8de0591b2
vhost should be used when it's available
...
git-svn-id: file:///home/svn/framework3/trunk@11761 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-17 02:16:20 +00:00
b56f6293a3
stupid debugging
...
git-svn-id: file:///home/svn/framework3/trunk@11760 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-17 02:09:32 +00:00
974d9ad6c2
clean up comments
...
git-svn-id: file:///home/svn/framework3/trunk@11759 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-16 22:34:43 +00:00
24f37e25de
add a search path for client extensions
...
git-svn-id: file:///home/svn/framework3/trunk@11758 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-16 21:13:44 +00:00
38e7beda4f
minor typo
...
git-svn-id: file:///home/svn/framework3/trunk@11755 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-16 02:20:12 +00:00
5172768cb9
Merging in VirtualBox control functionality from Hauke / Fidius Project
...
git-svn-id: file:///home/svn/framework3/trunk@11753 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-16 02:15:24 +00:00
257fe9d47c
add more descriptive usage for meterpreter run command
...
git-svn-id: file:///home/svn/framework3/trunk@11751 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-15 22:34:46 +00:00
e94d39af2c
un-ghetto meterpreter output logging
...
git-svn-id: file:///home/svn/framework3/trunk@11750 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-15 05:45:01 +00:00
21b1945cd4
add a commandline switch for loading plugins at startup
...
git-svn-id: file:///home/svn/framework3/trunk@11748 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-13 22:19:43 +00:00
d26e955e69
Test unique forms wmap
...
git-svn-id: file:///home/svn/framework3/trunk@11747 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-13 04:36:00 +00:00
708ff0e2ce
fix 1.8 vs 1.9 compat in option parsing
...
git-svn-id: file:///home/svn/framework3/trunk@11745 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-12 22:25:02 +00:00
f6b5974feb
add help for use command
...
git-svn-id: file:///home/svn/framework3/trunk@11744 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-11 23:42:46 +00:00
f8d03ea257
make the _snapshot / running_list methods a little more sane
...
git-svn-id: file:///home/svn/framework3/trunk@11742 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-11 15:04:33 +00:00
224bd1c6a2
make vm type available
...
git-svn-id: file:///home/svn/framework3/trunk@11738 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-10 10:56:36 +00:00
2efa01e8bd
Deal with importing and exporting tags.
...
git-svn-id: file:///home/svn/framework3/trunk@11737 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-10 00:17:20 +00:00
f876b7fb4b
back to dev
...
git-svn-id: file:///home/svn/framework3/trunk@11735 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-09 16:04:53 +00:00
eba4b05237
Make sure registry functions are always present (errors when rerunning post modules)
...
git-svn-id: file:///home/svn/framework3/trunk@11732 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-09 02:41:22 +00:00
749e9215bc
Adding smcintyre's patch for allowing for AuthBrute to automatically generate a password the same as a username. Thanks!
...
git-svn-id: file:///home/svn/framework3/trunk@11731 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-09 01:46:27 +00:00
742e9bca94
Adding the model that goes with r11726.
...
git-svn-id: file:///home/svn/framework3/trunk@11728 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-08 20:46:02 +00:00
25554992d0
beta -> release!
...
git-svn-id: file:///home/svn/framework3/trunk@11727 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-08 18:55:01 +00:00
14e6809b2b
migrations for tags
...
git-svn-id: file:///home/svn/framework3/trunk@11726 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-08 18:53:55 +00:00
070f48e16a
Work around some weirdness between report_website and report_host not accepting hostnames as :host by forcing :host to be the address
...
git-svn-id: file:///home/svn/framework3/trunk@11723 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-08 17:32:37 +00:00
Jonathan Cran
James Lee
Tod Beardsley
HD Moore
Carlos Perez
David Rude
amaloteaux
Mario Ceballos
Wei Chen
Matt Weeks
Joshua Drake
Mike Smith
Patrick Webster