70f185f76e
Whitespace adjustments on auth_brute.
...
git-svn-id: file:///home/svn/framework3/trunk@12960 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-16 22:33:08 +00:00
ab37580056
Refactored the AuthBrute mixin some to make the each_user_pass function a little cleaner and easier to maintain.
...
And maintain it I shall! Added in a standardized print_brute method to normalize the AuthBrute output to always include host, port, proto, and number of guesses over number remaining.
Also adds support for a MaxGuessesPerService datastore option for AuthBrute modules.
Currently, only ssh_login supports the new stuff, but now it's just a conversion matter. Will get to that in a bit.
git-svn-id: file:///home/svn/framework3/trunk@12958 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-16 22:08:45 +00:00
11779785d4
Fix typo
...
git-svn-id: file:///home/svn/framework3/trunk@12955 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-16 17:33:13 +00:00
ee20ed3dc6
This adds support for direct import of ASPL files from IP360 (stored in the user's config directory) and fixes an issue with the report_host() processing Host objects. Fixes #4619
...
git-svn-id: file:///home/svn/framework3/trunk@12945 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-15 00:51:51 +00:00
cc04b538af
use the proper id command
...
git-svn-id: file:///home/svn/framework3/trunk@12942 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-14 20:39:37 +00:00
d99df297d8
Added Amazon Linux the version used with EC2 AMI
...
git-svn-id: file:///home/svn/framework3/trunk@12933 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-13 01:37:04 +00:00
7f3e2d182d
Fix Axis2 to inherit from the correct class, prevent a stack trace when a non-Remote exploit has the cleanup method called.
...
git-svn-id: file:///home/svn/framework3/trunk@12928 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-12 18:32:27 +00:00
3fde9c6f1f
Reworking how imported crendentials work.
...
git-svn-id: file:///home/svn/framework3/trunk@12908 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-11 02:40:02 +00:00
30caa5b60c
remove hard coding of path for id command
...
git-svn-id: file:///home/svn/framework3/trunk@12902 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-10 11:14:57 +00:00
9a2f23bd61
bad indents
...
git-svn-id: file:///home/svn/framework3/trunk@12897 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-10 03:27:09 +00:00
2263e51cd2
Initial Solaris mixin
...
git-svn-id: file:///home/svn/framework3/trunk@12895 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-10 03:07:54 +00:00
05fe96cf37
Reworked how the Fileformat mixin works for exploits, a single filename will use a default path, users can set a full path as well if they want to place the files somewhere else instead of using OUTPUTPATH
...
git-svn-id: file:///home/svn/framework3/trunk@12889 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-09 14:21:52 +00:00
dc7ba642b0
Added Oracle Linux and Arch Linux support and change the call to standardize it with other mixins
...
git-svn-id: file:///home/svn/framework3/trunk@12887 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-09 12:50:36 +00:00
4a0cecbc29
Add the still unused macros table to the database
...
git-svn-id: file:///home/svn/framework3/trunk@12879 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-07 00:20:19 +00:00
bd79b31c80
Future-proofing the credential ptype. Don't assume anything not smb_hash|ssh_key is plaintext.
...
git-svn-id: file:///home/svn/framework3/trunk@12875 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-06 21:36:58 +00:00
7b4c7d44db
Adds a Burp Session XML parser and importer. Also includes fix to Rex's HTTP header parser to ensure that it uses only unencoded regexes.
...
git-svn-id: file:///home/svn/framework3/trunk@12846 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-03 21:17:57 +00:00
a0292f7722
added name to authors list
...
git-svn-id: file:///home/svn/framework3/trunk@12841 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-03 12:26:26 +00:00
fdd00e024d
Show the real message
...
git-svn-id: file:///home/svn/framework3/trunk@12834 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-03 00:08:58 +00:00
4499aa543d
fix formating, replace spaces for tabs
...
git-svn-id: file:///home/svn/framework3/trunk@12833 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 23:17:52 +00:00
a25ce9055e
typo :)
...
git-svn-id: file:///home/svn/framework3/trunk@12832 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 23:00:46 +00:00
d62c65b11a
typo
...
git-svn-id: file:///home/svn/framework3/trunk@12829 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 22:26:13 +00:00
e1c8e9032b
Added calls to enumerate users and groups to linux post mixin
...
git-svn-id: file:///home/svn/framework3/trunk@12828 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 22:21:28 +00:00
46cb4954b5
OSX Post mixin lib
...
git-svn-id: file:///home/svn/framework3/trunk@12827 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 22:20:36 +00:00
110f4df649
Adding a webapp vulnscanner parser for Appscan
...
git-svn-id: file:///home/svn/framework3/trunk@12826 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 22:16:08 +00:00
f1b8bbd436
arp poisoning : auto detect SMAC through new pcaprub code and avoid spoofing local host
...
git-svn-id: file:///home/svn/framework3/trunk@12822 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 21:12:21 +00:00
d326423b74
Skip another way that qualys indicates an invalid hostname
...
git-svn-id: file:///home/svn/framework3/trunk@12820 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 20:56:42 +00:00
8249ce243f
Show invalid requests (useful for debugging)
...
git-svn-id: file:///home/svn/framework3/trunk@12819 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 20:56:02 +00:00
d1ef28df1d
Add payload_type
...
git-svn-id: file:///home/svn/framework3/trunk@12818 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 20:55:46 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Tod Beardsley
HD Moore
Carlos Perez
David Rude
amaloteaux
James Lee
Matt Weeks
Joshua Drake