Commit Graph

1900 Commits (cb39e2b5a92631a4625860ea811b5b4e4e06ea8f)

Author SHA1 Message Date
Tod Beardsley 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
David Rude 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
HD Moore 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
Matt Weeks 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
Tod Beardsley 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
James Lee 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
Matt Weeks 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
Carlos Perez 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
amaloteaux 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
amaloteaux 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
amaloteaux 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
Tod Beardsley 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
Tod Beardsley 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
Tod Beardsley 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
Matt Weeks 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
Matt Weeks 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
James Lee 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
Tod Beardsley 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
Tod Beardsley 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
Tod Beardsley 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
amaloteaux 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
HD Moore 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
HD Moore 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
HD Moore 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
Tod Beardsley 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
amaloteaux 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
HD Moore 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
HD Moore 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
James Lee 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
James Lee 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
HD Moore 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
James Lee 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
HD Moore 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
James Lee 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
Tod Beardsley 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
James Lee 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
James Lee 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
James Lee 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
James Lee 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
James Lee 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
Carlos Perez 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
James Lee 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
James Lee 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
James Lee 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
James Lee 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
Joshua Drake 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
Jonathan Cran 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
James Lee 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
James Lee 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
et 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
Tod Beardsley 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
James Lee 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
Matt Weeks 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
Tod Beardsley 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
Tod Beardsley 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
James Lee 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
Tod Beardsley 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
HD Moore 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
James Lee b05fd2c9a3 fix a stack trace when trying to loadpath a non-existant directory
git-svn-id: file:///home/svn/framework3/trunk@11714 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-04 20:53:08 +00:00
Tod Beardsley 19c8673346 See #3655. Don't crash if there isn't an sname. :/
git-svn-id: file:///home/svn/framework3/trunk@11713 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-04 15:32:12 +00:00
Tod Beardsley dda837a06c See #3655. Explicitly pass the sname if it's present from report_note to report_service.
git-svn-id: file:///home/svn/framework3/trunk@11712 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-04 15:29:57 +00:00
et baab86fc52 WMAP 1.0 and first pass on some modules
git-svn-id: file:///home/svn/framework3/trunk@11709 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-04 05:57:26 +00:00
Joshua Drake f09c1c8155 auto-close socket (and set to nil) when errors occur
git-svn-id: file:///home/svn/framework3/trunk@11708 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-04 03:33:37 +00:00
James Lee 2c2f9cd4dc bump version to 3.5.2-beta
git-svn-id: file:///home/svn/framework3/trunk@11704 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-03 18:04:55 +00:00
Carlos Perez 64c5393a10 Corrected mispelled word
git-svn-id: file:///home/svn/framework3/trunk@11702 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-02 23:40:15 +00:00
Tod Beardsley d7f291e41b Downcase all nexpose vuln id's.
git-svn-id: file:///home/svn/framework3/trunk@11694 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-01 23:42:07 +00:00
Tod Beardsley 4df940e81e Updating db.rb to account for nexpose raw vuln refs.
git-svn-id: file:///home/svn/framework3/trunk@11693 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-01 22:22:08 +00:00
James Lee 5e9fdc28e7 move shell token stuff up to a mixin so meterpreter can use it, too
git-svn-id: file:///home/svn/framework3/trunk@11682 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-31 05:20:16 +00:00
James Lee 4037543072 whitespace
git-svn-id: file:///home/svn/framework3/trunk@11680 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-30 21:41:54 +00:00
James Lee 8b6cb60a20 whitespace
git-svn-id: file:///home/svn/framework3/trunk@11679 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-30 21:38:05 +00:00
HD Moore ac651fba6b Merge code from Alexandre Maloteaux, fixes #3615
git-svn-id: file:///home/svn/framework3/trunk@11678 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-30 19:26:35 +00:00
James Lee de7ad3f111 unbreak store_loot
git-svn-id: file:///home/svn/framework3/trunk@11677 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-30 19:11:27 +00:00
James Lee aeddee0f03 typo. good thing nothing actually uses this module?
git-svn-id: file:///home/svn/framework3/trunk@11676 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-30 05:54:50 +00:00
James Lee 3b3bb4d874 clarify SRVHOST description
git-svn-id: file:///home/svn/framework3/trunk@11671 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 17:59:46 +00:00
Joshua Drake 4f3cdf0b26 See #3470, forgot a debug line, oops
git-svn-id: file:///home/svn/framework3/trunk@11669 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 03:35:42 +00:00
Joshua Drake 647b41cc96 Fixes #3470 by canonicalizing module paths as they are added
git-svn-id: file:///home/svn/framework3/trunk@11668 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 03:34:48 +00:00
James Lee 1ee9b205b8 session -> address is now taken care of by the underlying db.rb, don't bother in Auxiliary::Report
git-svn-id: file:///home/svn/framework3/trunk@11667 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 02:44:32 +00:00
James Lee 01d116f60f allow a Session as the :host argument to some report_* methods that make sense
git-svn-id: file:///home/svn/framework3/trunk@11666 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 02:42:45 +00:00
HD Moore 2618e4fffe Add traceroute parsing to nmap
git-svn-id: file:///home/svn/framework3/trunk@11661 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-28 23:32:14 +00:00
Joshua Drake 9682091cca Add SQLI version of MSSQL Payload from Rodrigo Marcos!
git-svn-id: file:///home/svn/framework3/trunk@11655 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-27 16:48:07 +00:00
Joshua Drake a1b74eee0d Fixes #3607, Removes the module count cache since it seems to have no performance impact (and was broken)
git-svn-id: file:///home/svn/framework3/trunk@11653 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-27 00:13:13 +00:00
Tod Beardsley 1c58943edd Backing out r11616 since OptFloat will surely cause problems with RPC. Nothing to see here. Verified that all OptInt options are now actually Ints and not Floats with a grep -r "OptInt" trunk | grep "[0-9]\.[0-9]"
git-svn-id: file:///home/svn/framework3/trunk@11648 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 15:29:26 +00:00
Joshua Drake 4b777686d8 whitespace fixes
git-svn-id: file:///home/svn/framework3/trunk@11645 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 03:13:40 +00:00
Joshua Drake 53bba0bd54 Move cache logic from statistics->module_manager, More modularization in ModuleManager
git-svn-id: file:///home/svn/framework3/trunk@11643 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 00:07:34 +00:00
Joshua Drake a2e6f0e96c add -q option to suppress banner, improve -n warning
git-svn-id: file:///home/svn/framework3/trunk@11642 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 22:58:21 +00:00
Carlos Perez 05fd7b4e57 Patch for railgun and post mixin; and module from cha-mou to add capability to delete users on windows hosts.
git-svn-id: file:///home/svn/framework3/trunk@11638 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 13:02:35 +00:00
Joshua Drake 81ff9483bf add ms09-004 exploit via sql injection from Rodrigo Marcos
git-svn-id: file:///home/svn/framework3/trunk@11631 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-24 19:37:58 +00:00
Joshua Drake 0af8915fd5 Fixes #1936, Add accounts mixin and accompanying post module
git-svn-id: file:///home/svn/framework3/trunk@11629 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-24 17:23:48 +00:00
James Lee 8bf60c6d11 carlos forgot to delete this, see r11550, r11551
git-svn-id: file:///home/svn/framework3/trunk@11624 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-22 00:56:37 +00:00
James Lee d7cda0f85a accept a client argument for get_uri()
git-svn-id: file:///home/svn/framework3/trunk@11623 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-22 00:16:57 +00:00
James Lee f8120a8e3f servers don't have a sock().
git-svn-id: file:///home/svn/framework3/trunk@11621 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-21 23:42:56 +00:00
James Lee e7ced5f887 disable ssl for the php include server, and try the address with the default gateway for get_uri when SRVHOST is inaddr_any
git-svn-id: file:///home/svn/framework3/trunk@11620 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-21 23:19:11 +00:00
Tod Beardsley 63f893dd90 Adds an OptFloat option class, for when people actually want floats and not integers.
git-svn-id: file:///home/svn/framework3/trunk@11616 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-21 17:21:42 +00:00
Tod Beardsley e1e35ea15b Adds a attribute_locked? method to Host objects. If an attribute is locked, report_host() won't update it. (These aren't very serious locks since you can still set them directly on objects, but if you use the API, and you should, locks will be respected.)
git-svn-id: file:///home/svn/framework3/trunk@11613 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-20 23:10:27 +00:00
Tod Beardsley a12f5556cb Fixes #3564 by better randomizing the temp directory for extraction (minimizing the chance of a filesystem name collision), correctly extracting the original workspace name, and identifying the correct XML file to work off of for importing hosts and services.
git-svn-id: file:///home/svn/framework3/trunk@11609 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-20 17:32:48 +00:00
Matt Weeks 067c612d9e Make creds visible to RPC and GUI.
git-svn-id: file:///home/svn/framework3/trunk@11602 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 20:09:18 +00:00
James Lee 5429c73b3b don't try to store to the database if there isn't one. fixes #3540
git-svn-id: file:///home/svn/framework3/trunk@11594 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 23:41:01 +00:00
James Lee 9df78e8f47 correct passive?() for post modules, see #3542
git-svn-id: file:///home/svn/framework3/trunk@11589 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 20:50:30 +00:00
James Lee 63934c34ec check for a ancestors instead of a straight comparison of classes when matching payloads for generics, fixes #3477
git-svn-id: file:///home/svn/framework3/trunk@11585 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 17:15:43 +00:00
Carlos Perez a237122869 for Java version of Meterpreter options can not be included with the command, they have to be given apart updating mixin for this behavior
git-svn-id: file:///home/svn/framework3/trunk@11581 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-15 05:08:42 +00:00
James Lee e27e824755 rectify a lying comment
git-svn-id: file:///home/svn/framework3/trunk@11561 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-12 19:24:54 +00:00
Carlos Perez e48aa7856a Migration of Meterpreter mixin to post module mixin
git-svn-id: file:///home/svn/framework3/trunk@11550 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-12 00:10:32 +00:00
Joshua Drake ffbea6199f Do not wait for the DCERPC call to timeout
git-svn-id: file:///home/svn/framework3/trunk@11545 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-11 17:56:27 +00:00
James Lee 18ee35149a move script mixin code into Post mixins and include them back in for backwards compatibility
git-svn-id: file:///home/svn/framework3/trunk@11544 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-11 17:53:24 +00:00
Tod Beardsley d87b5ad3d2 Drops the DBImportError when you import a pcap file that doesn't actually contain any normal Eth::IP hosts. It doesn't add a whole lot or give the user any more information than merely failing to import anything.
git-svn-id: file:///home/svn/framework3/trunk@11543 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-11 17:35:45 +00:00
Joshua Drake 40fa5eebaf Don't convert the timeout to an integer, it makes 0.1 -> 0 svn status eek. See #3483
git-svn-id: file:///home/svn/framework3/trunk@11536 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-10 19:42:58 +00:00
HD Moore e776697f38 Fixes #3466 by detecting a second null handle and breaking the loop (happens with likewise servers)
git-svn-id: file:///home/svn/framework3/trunk@11508 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-07 19:51:59 +00:00
James Lee dbeae8df24 add support for running post modules from the meterpreter prompt. options are set in the same way as the -o arg to run, e.g. run post/escalate/bypassuac LHOST=192.168.0.1
git-svn-id: file:///home/svn/framework3/trunk@11496 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 21:28:00 +00:00
James Lee aafb30ba8c update user agent string detection for some android, fedora, ipod/ipad/iphone
git-svn-id: file:///home/svn/framework3/trunk@11495 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 21:24:38 +00:00
James Lee bafd318ba7 replace exe_lhost with the more generic payload_lhost
git-svn-id: file:///home/svn/framework3/trunk@11463 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-04 01:13:03 +00:00
Matt Weeks 0b2f68aa3b Fix error with TcpServer modules not properly cleaning up after job is killed.
Stops StreamServerListener and ClientMonitor threads from remaining after the job is killed and preventing rerunning such modules.



git-svn-id: file:///home/svn/framework3/trunk@11460 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-02 22:30:14 +00:00
Jonathan Cran a4571f927a handle nessus xml files w/o a leading <xml> tag -- resolves #3369
git-svn-id: file:///home/svn/framework3/trunk@11438 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-28 22:07:41 +00:00
James Lee 02c555c4c6 use the module's platfrom if no session is set
git-svn-id: file:///home/svn/framework3/trunk@11430 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-28 19:28:43 +00:00
James Lee de9c1286e6 missed file, makes post/hashdump work again
git-svn-id: file:///home/svn/framework3/trunk@11424 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 18:11:43 +00:00
James Lee 1351af8300 missed file. =(
git-svn-id: file:///home/svn/framework3/trunk@11422 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 17:56:29 +00:00
James Lee f0cc6ff596 big commit for converting meterpreter scripts to modules, see #3377. also fixes payload tab-completion and 'show payloads' after TARGET has changed
git-svn-id: file:///home/svn/framework3/trunk@11421 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 17:46:42 +00:00
HD Moore 30affd4b2c This commit adds a new set of discovery modules from wuntee and some useful utility methods for working with link-local addresses
git-svn-id: file:///home/svn/framework3/trunk@11417 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 16:43:53 +00:00
Tod Beardsley 0468dbeabe Fixes a db_import bug introduced in r11355 .
git-svn-id: file:///home/svn/framework3/trunk@11416 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 16:30:08 +00:00
HD Moore a8311fd71d Verify a host is actually a real string before using it
git-svn-id: file:///home/svn/framework3/trunk@11372 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-18 03:37:27 +00:00
HD Moore c28ad8ea0c Minor improvements and corner case bug fixes to session handling. This fixes issues that can come up when a stream is shut down
git-svn-id: file:///home/svn/framework3/trunk@11371 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-18 03:00:26 +00:00
James Lee c252d53c15 back to dev
git-svn-id: file:///home/svn/framework3/trunk@11370 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-17 18:35:23 +00:00
Tod Beardsley f159678bf0 Rejigger the packet analysis to not suck up so much memory for no real reason. This ensures that the initial file read represents (pretty much) the entire overhead needed to process packets. I'd say this fixs bumps the ceiling up to about a million packets that can be read without too much trouble (assuming you have a serious amount of RAM available -- I'm testing with 8GB here).
git-svn-id: file:///home/svn/framework3/trunk@11364 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-17 03:20:47 +00:00
Tod Beardsley 3ed2d8b694 Add a pcap counter to the pcap importer.
git-svn-id: file:///home/svn/framework3/trunk@11356 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-16 21:36:00 +00:00
HD Moore 743cdba360 Detect empty imports
git-svn-id: file:///home/svn/framework3/trunk@11355 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-16 21:26:39 +00:00
HD Moore 93c26125aa Recognize RO vs RW strings
git-svn-id: file:///home/svn/framework3/trunk@11337 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 20:52:48 +00:00
HD Moore 55b21d4aaf Fixes to enable password parsing and rw/ro detection in snmp brute force
git-svn-id: file:///home/svn/framework3/trunk@11336 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 20:51:17 +00:00
Tod Beardsley 1c2c3ed1f6 Adds an example protocol analyzer to pick out http basic auth credentials and do some server analysis for libpcap imports.
git-svn-id: file:///home/svn/framework3/trunk@11334 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 19:04:12 +00:00
James Lee d12be5bd4d testing -> release!
git-svn-id: file:///home/svn/framework3/trunk@11325 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 05:28:32 +00:00
Joshua Drake f45e03cd14 remove wait when DisablePayloadHandler was set
git-svn-id: file:///home/svn/framework3/trunk@11324 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-13 23:34:43 +00:00
Tod Beardsley 244dc18867 Fixes #3348. Adds the PacketFu packet processing library from http://code.google.com/p/packetfu/ , and adds a db_import path for pcaps (it's straightforward -- db_import /path/to/file.pcap will import hosts and service ports from a pcap file.)
git-svn-id: file:///home/svn/framework3/trunk@11308 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-12 17:44:48 +00:00
HD Moore 431a0e13aa Store these in a format more friendly to JtR
git-svn-id: file:///home/svn/framework3/trunk@11305 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-12 08:53:37 +00:00
HD Moore 68dc327222 Fix missing decode for enable password 7
git-svn-id: file:///home/svn/framework3/trunk@11304 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-12 08:51:08 +00:00
HD Moore 4e4eb14887 This adds a TFTP version of #3345 (Pello's snmp config downloader). Still more work to do for the generic module
git-svn-id: file:///home/svn/framework3/trunk@11300 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 23:36:37 +00:00
HD Moore 644633454d Cleanups to credential type
git-svn-id: file:///home/svn/framework3/trunk@11297 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 20:36:08 +00:00
HD Moore e3f909cef9 Fixes for chunked http reply processing, additional cisco configuration support, and a scanner module for unprotected cisco device managers.
git-svn-id: file:///home/svn/framework3/trunk@11287 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 07:37:09 +00:00
HD Moore 26aca9d6ba Swap some module locations, add loot and cred reporting
git-svn-id: file:///home/svn/framework3/trunk@11271 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-10 05:47:33 +00:00
Tod Beardsley 493db14006 Adds a "duplicate_ok" option to report_auth_info to allow for multiple passwords on the same username. Never came up before I took a look at SNMP.
Also normalizes the print_status messages to be explicit about which module is reporting (important when you're running several at once).



git-svn-id: file:///home/svn/framework3/trunk@11267 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-09 21:23:39 +00:00
HD Moore 5dd1f52349 Bump to testing
git-svn-id: file:///home/svn/framework3/trunk@11248 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-07 20:16:39 +00:00
Joshua Drake fbd340aae8 add an adodb based cmdstager, fixes #1431
git-svn-id: file:///home/svn/framework3/trunk@11247 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-07 18:51:12 +00:00
Mike Smith 1b6c0664e6 Add EmailTemplate fields: exploit_module, exploit_attach_name & attach_exploit
git-svn-id: file:///home/svn/framework3/trunk@11236 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-06 22:18:33 +00:00
Tod Beardsley 2d4af15581 Peerhost, not peerhot. :/
git-svn-id: file:///home/svn/framework3/trunk@11205 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 17:33:20 +00:00
Tod Beardsley 0204cedca6 Makes the print_status displays more consistent between smb_login and psexec by moving some of the domain display functions up into exploit/smb proper.
git-svn-id: file:///home/svn/framework3/trunk@11204 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 17:29:26 +00:00
Tod Beardsley fed550d7e7 Fixes #3285. Checks for nil for session.peerhost and session.tunnel_peer -- hard to test, though, since I can't tell what originally causes the issue -- with and without this fix I get idential results on a normal ssh session. But, with the nil check in place, it should clear up the stack trace listed.
git-svn-id: file:///home/svn/framework3/trunk@11203 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 17:26:43 +00:00
James Lee b0a0a2413c print the proper proto (https vs http) when ssl is in use
git-svn-id: file:///home/svn/framework3/trunk@11194 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-01 16:57:20 +00:00
Joshua Drake 225bf0738e improve handling of return from connect_from_privileged_port, rework rlogin fromuser merging
git-svn-id: file:///home/svn/framework3/trunk@11171 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 02:00:58 +00:00
Joshua Drake 7e15c97328 remove duplicate credentials before running
git-svn-id: file:///home/svn/framework3/trunk@11168 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 01:15:42 +00:00
Joshua Drake 778040ec5b move rservices mixin to aux instead of exploit
git-svn-id: file:///home/svn/framework3/trunk@11142 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-25 06:02:35 +00:00
Joshua Drake e74d023971 formatting, modularization, and optimization
git-svn-id: file:///home/svn/framework3/trunk@11137 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-25 05:59:15 +00:00
Joshua Drake 1fda94f438 improve error reporting
git-svn-id: file:///home/svn/framework3/trunk@11121 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-24 06:09:36 +00:00
Joshua Drake db28497900 add an extra check for JAVA_HOME
git-svn-id: file:///home/svn/framework3/trunk@11118 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-24 01:11:17 +00:00
Tod Beardsley fb79d97bca Allow for things external to a scanner module to come in an kill all the threads with the mod.seppuko!() method.
git-svn-id: file:///home/svn/framework3/trunk@11117 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-24 00:08:39 +00:00
James Lee 7581ce0153 try the payload's arch/platform if we don't have an associated exploit
git-svn-id: file:///home/svn/framework3/trunk@11116 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-23 20:37:32 +00:00
James Lee b3b43bbb8b fix a bug in arch detection when an EncodedPayload's pinst is an EncodedPayload instead of a Payload
git-svn-id: file:///home/svn/framework3/trunk@11115 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-23 20:34:27 +00:00
Joshua Drake 9c668b8daf Super-duper rservices commit -
1. Added rsh, rlogin, and rexec auth brute scanners
2. Login negotation moved into new Msf::Auxiliary::Login mixin
3. Centralized session registration for auth brute scanners
4. Telnet and SSH auth brute scanners updated to use new mixins
5. Previously committed rservices mixin (r11093)



git-svn-id: file:///home/svn/framework3/trunk@11106 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-23 01:23:24 +00:00
HD Moore 04f9aec2d8 Pass framework into the TcpReverseDoubleSessionChannel class
git-svn-id: file:///home/svn/framework3/trunk@11100 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 19:18:24 +00:00
James Lee 9df192497b make sure we're not turning nil into [nil], since it breaks the arch detection
git-svn-id: file:///home/svn/framework3/trunk@11098 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 17:48:35 +00:00
Joshua Drake 14e147c931 add the rservices mixin
git-svn-id: file:///home/svn/framework3/trunk@11093 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 13:18:02 +00:00
Joshua Drake b495ca8aab add a mixin for pdf gen, see #2841
git-svn-id: file:///home/svn/framework3/trunk@11092 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 12:21:49 +00:00
Joshua Drake fe9710b836 add a rand: special case for OptAddress options
git-svn-id: file:///home/svn/framework3/trunk@11071 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 18:31:14 +00:00
James Lee 1c5481dcfb add a method for getting the full uri from an HttpServer to complement get_resource
git-svn-id: file:///home/svn/framework3/trunk@11069 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 18:15:20 +00:00
HD Moore 4c69fc7b84 Fix typo
git-svn-id: file:///home/svn/framework3/trunk@11028 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:58:24 +00:00
HD Moore 432a2e0ee8 Nuke the old mixin
git-svn-id: file:///home/svn/framework3/trunk@11027 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:55:53 +00:00
HD Moore dc5116f9df Move the crawler mixin to an auxiliary
git-svn-id: file:///home/svn/framework3/trunk@11026 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:55:19 +00:00
HD Moore f457ccb8f7 Add the crawler mixin and a sample form extractor crawler
git-svn-id: file:///home/svn/framework3/trunk@11025 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:40:56 +00:00
HD Moore bc2d43d86d Raise thread errors instead of eating them
git-svn-id: file:///home/svn/framework3/trunk@11024 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:22:40 +00:00
HD Moore 29073a519a Small tweaks to the thread code, add an update method
git-svn-id: file:///home/svn/framework3/trunk@11011 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 17:28:40 +00:00
James Lee 9df4c2bccf don't fail if we were given a peerhost of 'Remote Pipe'. Fixes #3049, thanks Raphael M for the patch
git-svn-id: file:///home/svn/framework3/trunk@11010 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 16:43:00 +00:00
HD Moore a12d9f8dbf This patch adds detailed thread tracking across the metasploit framework, along with a new console command (threads) to manage these. This level of tracking is required to accurately monitor background tasks, assist with debugging, and kill orphaned threads.
git-svn-id: file:///home/svn/framework3/trunk@11003 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 06:19:49 +00:00
James Lee 326dc42bca add EncodedPayload#encoded_exe, encoded_jar, and encoded_war. simplifies exploits that need java and native payloads. see #406 and #3009
git-svn-id: file:///home/svn/framework3/trunk@10999 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 23:01:35 +00:00
Joshua Drake 3992eb7ef8 Mass RE-update: fix all framework URL references
git-svn-id: file:///home/svn/framework3/trunk@10998 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 22:43:22 +00:00
Joshua Drake 9fc6f2f3a3 Mass update: fix all framework URL references
git-svn-id: file:///home/svn/framework3/trunk@10996 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 22:25:13 +00:00
James Lee 0b8f0c51bc use a random name for the app if one is not supplied
git-svn-id: file:///home/svn/framework3/trunk@10976 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-10 23:35:02 +00:00
James Lee 4aae717312 only need metasploit.dat in WEB-INF/classes/
git-svn-id: file:///home/svn/framework3/trunk@10975 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-10 23:22:00 +00:00
HD Moore bed66d4f64 Change the default domain to "." (local host) from WORKGROUP. Suggestion from Rob Fuller (mubix)
git-svn-id: file:///home/svn/framework3/trunk@10952 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 20:07:17 +00:00
Joshua Drake d75e7885d4 remove has_badchars? in favor of Rex::Text.badchar_index
git-svn-id: file:///home/svn/framework3/trunk@10949 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 17:00:07 +00:00
Joshua Drake 2037262950 turn verbosity off by default
git-svn-id: file:///home/svn/framework3/trunk@10948 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 16:59:20 +00:00
James Lee 5c692aa034 genericize the message since we now support LOGIN as well as PLAIN
git-svn-id: file:///home/svn/framework3/trunk@10945 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 05:03:15 +00:00
James Lee 289c068f2a add support for LOGIN authentication, thanks Ricardo Gandara for the patch. fixes #3072
git-svn-id: file:///home/svn/framework3/trunk@10944 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 05:01:18 +00:00
Matt Weeks bc983ea52c Run meterpreter GUI commands in background to not interfere with active shell or other channel interaction.
Also simplify calling commands in file browser and process viewer.



git-svn-id: file:///home/svn/framework3/trunk@10929 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 16:51:48 +00:00
Tod Beardsley f6415186a8 Adds the imported_creds table.
git-svn-id: file:///home/svn/framework3/trunk@10923 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 01:01:20 +00:00
HD Moore cf70f322d0 This minor syntax change allows rubinius to at least start the console
git-svn-id: file:///home/svn/framework3/trunk@10921 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-05 21:16:33 +00:00
Joshua Drake 8353bf7bf3 move 100-continue processing into Rex, fixes #3109
git-svn-id: file:///home/svn/framework3/trunk@10919 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-05 16:20:13 +00:00
Matt Weeks 66fd9f71b7 Typo.
git-svn-id: file:///home/svn/framework3/trunk@10906 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 23:05:01 +00:00
Matt Weeks fe03497d57 Make tab completion work for meterpreter sessions over rpc.
git-svn-id: file:///home/svn/framework3/trunk@10905 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 23:01:03 +00:00
HD Moore bbfcaefffb Fix the double-up data directory
git-svn-id: file:///home/svn/framework3/trunk@10903 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 22:12:50 +00:00
HD Moore 652764ebd3 Merge in nCircle support from Dave Lassalle, handle file reads more consistently
git-svn-id: file:///home/svn/framework3/trunk@10902 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 21:44:16 +00:00
HD Moore e6da9729c0 Handle invalid dates
git-svn-id: file:///home/svn/framework3/trunk@10888 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-03 15:31:28 +00:00
Matt Weeks b15ba92567 Add rank; fix issue with searching.
git-svn-id: file:///home/svn/framework3/trunk@10873 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 23:35:12 +00:00
Matt Weeks 90500eebd1 Enable running scripts independent of console state. Fixes issue with running scripts from GUI while shell/channel is active.
git-svn-id: file:///home/svn/framework3/trunk@10872 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 23:33:22 +00:00
James Lee 8e44f66d31 add a simple method for adding multiple files to a Jar from the file system. may eventually bubble this up to Rex::Zip::Archive
git-svn-id: file:///home/svn/framework3/trunk@10871 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 23:10:35 +00:00
Matt Weeks db4c6ae246 Properly show compatible payloads. Important for cross-platform exploits.
git-svn-id: file:///home/svn/framework3/trunk@10870 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 22:41:49 +00:00
Tod Beardsley 492268b066 See #3104. Make exporting/importing funny characters more convenient. Export inactive credentials by default.
git-svn-id: file:///home/svn/framework3/trunk@10867 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 22:11:45 +00:00
Tod Beardsley 6048580919 See #3104. This adds a parser for the file format created in r10862, so that these exported credentials can be read back in to Metasploit.
git-svn-id: file:///home/svn/framework3/trunk@10866 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 21:27:26 +00:00
Tod Beardsley 313317224f fix keys, not hashes, in db_export
git-svn-id: file:///home/svn/framework3/trunk@10863 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 19:18:37 +00:00
Tod Beardsley 754d1a3b90 Fixes #3104. Adds the "pwdump" format to db_export.
git-svn-id: file:///home/svn/framework3/trunk@10862 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 19:13:15 +00:00
Tod Beardsley 761acdc419 Fixes the db_export command to deal with nil values as self-closed tags (rather than NULL) and to correctly handle some binary values.
git-svn-id: file:///home/svn/framework3/trunk@10854 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-01 16:11:37 +00:00
Tod Beardsley dc4b7b6641 Fixes #3067. Raise DBImportErrors when the contents of a zip archive isn't a Metasploit ZIP report.
git-svn-id: file:///home/svn/framework3/trunk@10842 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-28 15:59:40 +00:00
HD Moore 5fc69f1597 Fix charset handling, fixes #3053, thanks Rami
git-svn-id: file:///home/svn/framework3/trunk@10818 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-25 14:57:30 +00:00
Matt Weeks a2801e5dc1 Add detach/kill support to interacting meterpreter channels over RPC. Also clean some duplicated code in session interaction.
git-svn-id: file:///home/svn/framework3/trunk@10794 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-23 17:05:48 +00:00
James Lee 27cc50f29a missed this in the java payload updates, r10781
git-svn-id: file:///home/svn/framework3/trunk@10786 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-22 20:40:25 +00:00
James Lee 56839ccf36 stupid debug prints
git-svn-id: file:///home/svn/framework3/trunk@10782 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-22 10:24:28 +00:00
James Lee f33d7cc670 revamp java payloads and make shells work with tomcat_mgr_deploy. tested java_trusted_chain and java_tester to verify that this doesn't break other java payload usage. see #3009 and #2973, meterpreter doesn't work yet, so not marking resolved.
git-svn-id: file:///home/svn/framework3/trunk@10781 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-22 10:19:51 +00:00
HD Moore 0e04505232 Fixes #3027, a set of bugs introduced during the meterpreter posix work.
git-svn-id: file:///home/svn/framework3/trunk@10773 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-21 04:43:54 +00:00
HD Moore 3ece16e0d9 3.5.0 is out! back to work :)
git-svn-id: file:///home/svn/framework3/trunk@10771 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-21 00:48:17 +00:00
Matt Weeks 869d930588 Bugfix for db_events. Fixes #2982.
git-svn-id: file:///home/svn/framework3/trunk@10770 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 23:32:42 +00:00
James Lee fe410df0fd mark this rev as release. Releasesvn diff lib/msf/core/framework.rb
git-svn-id: file:///home/svn/framework3/trunk@10765 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 12:05:10 +00:00
HD Moore cafb8d1ac2 Yield back on pages, vulns, forms, and sites
git-svn-id: file:///home/svn/framework3/trunk@10760 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 01:13:26 +00:00
Tod Beardsley bf28203159 Try to recover from binary in the XML import, report in the dlog if you run into trouble.
git-svn-id: file:///home/svn/framework3/trunk@10756 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-19 22:51:37 +00:00
Joshua Drake 2d6b995623 rename/clarify PrintfUtil encoder, fixes #2308
git-svn-id: file:///home/svn/framework3/trunk@10729 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 15:41:13 +00:00
HD Moore f88033f0cc Merge in R3L1K's Powershell enhancements and powerdump code (hashdump through powershell)
git-svn-id: file:///home/svn/framework3/trunk@10721 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-17 17:39:43 +00:00
HD Moore 6e118045eb Patch from scriptjunkie to enable EXITFUNC=none; this is only useful in some limited situations, but was requested. Fixes #2969
git-svn-id: file:///home/svn/framework3/trunk@10720 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-17 05:40:56 +00:00
HD Moore 59b2620d2c This commit adds the db_export command, which will export a workspace as an XML file. This can be re-imported with db_import
git-svn-id: file:///home/svn/framework3/trunk@10718 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-17 04:50:15 +00:00
James Lee 9a4caf65a1 add ua fingerprinting for chrome and opera
git-svn-id: file:///home/svn/framework3/trunk@10717 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-17 04:35:44 +00:00
Matt Weeks 54df2c1e6c Fixes #2977; error when checking non-interactive channels.
git-svn-id: file:///home/svn/framework3/trunk@10704 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-16 15:21:06 +00:00
Tod Beardsley 865b711b5c Fixes #2974. Adds an "Unknown" level to Exploit::CheckCode, fixes the URI check for exploit/unix/webapp/php_include (which was relying on Unknown).
git-svn-id: file:///home/svn/framework3/trunk@10694 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-15 12:24:17 +00:00
James Lee 238242ecb9 add latest nessus plugin patches from Zate, fixes #2704
git-svn-id: file:///home/svn/framework3/trunk@10685 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 18:54:35 +00:00
Mike Smith 756e6d2ad8 Remove unsupported msfweb interface. (fixes #503)
* This will significantly decrease the size of the msf install (~5 MB)
* ActiveRecord & ActiveSupport are still used, and have been moved to lib/

git-svn-id: file:///home/svn/framework3/trunk@10682 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 18:45:16 +00:00
Matt Weeks ebfe771872 Fixes #2261. Provide input stream for interacting with channels.
git-svn-id: file:///home/svn/framework3/trunk@10674 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 00:22:45 +00:00
HD Moore 0477789bee Update to reflect the next target stable release
git-svn-id: file:///home/svn/framework3/trunk@10669 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-13 07:59:10 +00:00
HD Moore 567e42fafa Three more minor changs to ensure that HTTP response data is always treated as binary.
git-svn-id: file:///home/svn/framework3/trunk@10654 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 16:29:35 +00:00
Joshua Drake 7b576be821 only create the database if it doesn't exist
git-svn-id: file:///home/svn/framework3/trunk@10646 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-11 23:48:53 +00:00
Joshua Drake b6c4d1fc00 add web_urihost
git-svn-id: file:///home/svn/framework3/trunk@10640 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-11 05:56:18 +00:00
HD Moore 6f981e7b08 Add missing confidence field from import
git-svn-id: file:///home/svn/framework3/trunk@10636 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-11 03:35:15 +00:00
HD Moore 5a2444eb24 Clean up web_vuln import, use additional fields
git-svn-id: file:///home/svn/framework3/trunk@10635 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-11 02:57:07 +00:00
HD Moore e7fe407106 Update to the report_web_vuln method to take into account the schema update
git-svn-id: file:///home/svn/framework3/trunk@10632 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-10 19:36:31 +00:00
HD Moore 39be54970b Fix a typo in the exception handler
git-svn-id: file:///home/svn/framework3/trunk@10625 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 22:09:35 +00:00
HD Moore b99be2dae6 Unbreak this
git-svn-id: file:///home/svn/framework3/trunk@10621 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 18:27:09 +00:00
HD Moore f19be2ca3f Try harder to figure out who ran the module
git-svn-id: file:///home/svn/framework3/trunk@10620 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 18:11:11 +00:00
James Lee abf19e002d tweak the models
git-svn-id: file:///home/svn/framework3/trunk@10618 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 08:35:41 +00:00
James Lee 8aa73c2951 add a filename
git-svn-id: file:///home/svn/framework3/trunk@10616 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 03:50:04 +00:00
James Lee 014ed847b2 actually save the campaign
git-svn-id: file:///home/svn/framework3/trunk@10609 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 20:32:32 +00:00
James Lee dbcd8619e1 break report_user_agent into a fingerprint method and a report method, pass extra arguments on to report_client
git-svn-id: file:///home/svn/framework3/trunk@10608 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 20:28:14 +00:00
James Lee 988bbd13f1 associate clients with a campaign
git-svn-id: file:///home/svn/framework3/trunk@10601 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 17:20:57 +00:00
HD Moore d8b9cf5cac Slight speed improvement to request processing
git-svn-id: file:///home/svn/framework3/trunk@10599 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 06:14:44 +00:00
HD Moore 9e01b0f4e5 Fix a race condition in concurrent session handling
git-svn-id: file:///home/svn/framework3/trunk@10596 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 04:46:53 +00:00
HD Moore 2e9138ebbc This commit overhauls much of the meterpreter timeouts and staging processes. This fixes a bug with concurrent session handling, reduces CPU load by caching a single SSL certificate for all sessions, increases all of the critical timeouts, and generally makes mass ownage work better. We still need to limit the maximum number of concurrent on_session() threads to something sane to prevent sesssion spikes from dragging out the process even longer. The C-side meterpreter change is minimal and will only help with future compatibility if we move to non-blocking fd's for the SSL socket.
git-svn-id: file:///home/svn/framework3/trunk@10595 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 04:11:47 +00:00
HD Moore 6a47af814a Basic, still buggy support for NetSparker XML
git-svn-id: file:///home/svn/framework3/trunk@10585 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 06:24:26 +00:00
HD Moore 2e25245e9b Remove threading, caused slowdowns
git-svn-id: file:///home/svn/framework3/trunk@10583 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 03:57:51 +00:00
HD Moore 3250ab13e0 Add a parser for Retina XML
git-svn-id: file:///home/svn/framework3/trunk@10582 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 02:33:57 +00:00
HD Moore 352b4cf1c8 Dispatch incoming requests as threads
git-svn-id: file:///home/svn/framework3/trunk@10579 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 23:20:13 +00:00
HD Moore b98732ae0a This change allows the auth modules to automatically remove their input files when requested. This makes scripting with temporary files much easier
git-svn-id: file:///home/svn/framework3/trunk@10576 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 21:04:16 +00:00
HD Moore cbcebc0cc8 Bug fixes to the importer
git-svn-id: file:///home/svn/framework3/trunk@10575 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 20:24:26 +00:00
HD Moore af28507c36 Cleaner regex
git-svn-id: file:///home/svn/framework3/trunk@10571 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 18:10:39 +00:00
HD Moore 222c418fee Accept MetasploitV4 as well as a base tag, preparing for 3.5.0
git-svn-id: file:///home/svn/framework3/trunk@10570 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 18:09:06 +00:00
HD Moore 0127137151 Reorganize methods and add recognition of v4
git-svn-id: file:///home/svn/framework3/trunk@10569 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 18:00:21 +00:00