Commit Graph

1986 Commits (0044635e3bdb7e5d17907d2e8e6b140e6c484099)

Author SHA1 Message Date
HD Moore 0881649f14 The psexec and smb_relay module now automatically cleanup. The ms08-06 module now supports all languages of XP SP3.
git-svn-id: file:///home/svn/framework3/trunk@5841 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-04 22:27:59 +00:00
HD Moore 68b9a2a421 Adds a new submitted fingerprint for Czech
git-svn-id: file:///home/svn/framework3/trunk@5836 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-04 07:13:48 +00:00
James Lee 0193cd5219 fix session vs client variable problems with meterpreter AutoRunScript and make usage actually reflect what the code does
git-svn-id: file:///home/svn/framework3/trunk@5834 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-04 06:40:12 +00:00
HD Moore 8ee55fb53c Embed the revision of the smb mixin
git-svn-id: file:///home/svn/framework3/trunk@5832 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-04 04:24:11 +00:00
HD Moore b53695f7db The psexec module now uses a service-compatible exe, shellcode is spawned in a subprocess and the service cleans up properly
git-svn-id: file:///home/svn/framework3/trunk@5829 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-03 23:06:37 +00:00
HD Moore 133d7ce658 Adds an automatic default target to ms08-067, autodetects OS, SP, and language now.
git-svn-id: file:///home/svn/framework3/trunk@5827 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-03 20:37:51 +00:00
HD Moore f1789fc1b2 Adds the check() method and scanner module to ms08-067, massively upgrades the smb/version scanner, with better SP detection and remote language pack detection.
git-svn-id: file:///home/svn/framework3/trunk@5823 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-03 09:17:08 +00:00
kris c52f889082 Report hosts as alive through db_tracker and the db Nmap and Nessus commands
git-svn-id: file:///home/svn/framework3/trunk@5819 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-31 18:39:53 +00:00
HD Moore 56a413d803 Reflective DLL injection payloads from Stephen Fewer
git-svn-id: file:///home/svn/framework3/trunk@5806 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-30 22:17:32 +00:00
HD Moore a4d53893ac Improvements to opty2 from vlad902:
1) Fixed a minor bug, sometimes Opty2 would generate C1 /6 instructions which most processors will execute but which are not technically valid (they would exist for SAL but SAL is an alias for SHL so it is defined as C1 /4).
 2) I changed the 0x90 nop instruction so that it is no longer considered that 0x90 changes the eax register.
3) Removed o16/0x66 prepend byte from 0x0f, this is currently unused anyways but might prevent some poor person from debugging it in the future.
 4) Previously short jumps would only make positive jumps, I added the capability for them to make a "-1" jump which would basically just start executing at the offset byte. For example it could generate something like EB FF XX YY ... where EB FF jumps to FF XX YY ...
 5) I added support for the instructions mov reg, segreg (8C), mov reg, imm8/imm32 (C6/C7), and lea reg, mem (8D). I implemented LEA so that it only allows memory references to be in ModR/M form and not be in SIB form (I don't think it's possible to allow SIB in the way Opty2 works at the moment).
 



git-svn-id: file:///home/svn/framework3/trunk@5804 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-30 07:30:52 +00:00
kris 025b7410a0 Remove spurious ] from db_services output for consistency with other db output
git-svn-id: file:///home/svn/framework3/trunk@5799 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-29 13:10:22 +00:00
kris 3e8c5ecebc Fix db_add_host (undefined variable)
git-svn-id: file:///home/svn/framework3/trunk@5795 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-27 22:47:09 +00:00
druid a07a3af2d6 Adds a method hook for any primer code needed to execute immediately after server startup.
git-svn-id: file:///home/svn/framework3/trunk@5792 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-27 20:31:40 +00:00
et 75be2e33ad Added module reporting and wmap_reports command
git-svn-id: file:///home/svn/framework3/trunk@5789 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-27 02:22:30 +00:00
et 29e983567e removed reports_exist check
git-svn-id: file:///home/svn/framework3/trunk@5785 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-23 04:23:54 +00:00
HD Moore 1df0612f61 Adds a case-sensitivity permutation routine
git-svn-id: file:///home/svn/framework3/trunk@5780 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-22 22:43:13 +00:00
HD Moore 65419ad206 Adds routines/tools for cracking the NTLM hash from the plaintext case-insensive LANMAN password
git-svn-id: file:///home/svn/framework3/trunk@5779 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-22 22:42:52 +00:00
Ramon de C Valle f124597a56 Code cleanups
git-svn-id: file:///home/svn/framework3/trunk@5773 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-19 21:03:39 +00:00
Ramon de C Valle 4c847e0d44 Fixed typo
git-svn-id: file:///home/svn/framework3/trunk@5772 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-19 20:38:07 +00:00
et 7e73ed8c15 first attempt of reporting implementation.
git-svn-id: file:///home/svn/framework3/trunk@5771 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-19 20:32:14 +00:00
Ramon de C Valle c34bbae344 Added payload advanced packing types for 16/16 and 22/10 bits substitution
git-svn-id: file:///home/svn/framework3/trunk@5770 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-19 20:32:14 +00:00
HD Moore deea354fbb Wrap the modulation setting as well
git-svn-id: file:///home/svn/framework3/trunk@5768 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-17 18:31:09 +00:00
HD Moore 4a3b540685 Handle the txrate error better
git-svn-id: file:///home/svn/framework3/trunk@5767 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-17 17:46:05 +00:00
HD Moore 7d98de2fed Handle cases where lorcon cant change the txrate (zdw driver)
git-svn-id: file:///home/svn/framework3/trunk@5766 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-17 17:35:35 +00:00
HD Moore 4eac2506b8 Add TXRATE and TXMOD options
git-svn-id: file:///home/svn/framework3/trunk@5765 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-17 15:58:33 +00:00
HD Moore 2e297596b0 Make the 1.8.6 requirement a warning for now
git-svn-id: file:///home/svn/framework3/trunk@5762 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-16 19:56:10 +00:00
Ramon de C Valle 8d760ebc1e Added patch and module from Kris Katterjohn
git-svn-id: file:///home/svn/framework3/trunk@5751 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-14 14:22:34 +00:00
HD Moore e016ff2d76 cleanup patch from antoine
git-svn-id: file:///home/svn/framework3/trunk@5748 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-13 14:22:38 +00:00
et c153d1fea0 Wmap database merged, new wmap_generic module, fix website tree display and docs.
git-svn-id: file:///home/svn/framework3/trunk@5740 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-12 03:46:49 +00:00
HD Moore 0320809c18 Fix session interaction again
git-svn-id: file:///home/svn/framework3/trunk@5734 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-10 05:01:49 +00:00
HD Moore 6df3d7f54a Switch capture mixin from scruby to packetfu
git-svn-id: file:///home/svn/framework3/trunk@5729 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-10 02:27:25 +00:00
HD Moore 10619f3af0 Import the bindata and packetfu libraries (thanks Tod)
git-svn-id: file:///home/svn/framework3/trunk@5727 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-10 02:23:05 +00:00
HD Moore 050216a1e9 Bug fix from Kris Katterjohn
git-svn-id: file:///home/svn/framework3/trunk@5723 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-09 23:12:16 +00:00
Ramon de C Valle 35240108de Added patch and module from Kris Katterjohn
git-svn-id: file:///home/svn/framework3/trunk@5720 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-06 13:16:08 +00:00
HD Moore a9d8ab159a Two patches from antoine
git-svn-id: file:///home/svn/framework3/trunk@5719 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-06 10:50:57 +00:00
HD Moore 6ca97f33f4 Syncing with trunk
git-svn-id: file:///home/svn/framework3/trunk@5718 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-05 15:09:47 +00:00
HD Moore a87cbe1c5e Add disassembly mode to msfpescan for -a
git-svn-id: file:///home/svn/framework3/trunk@5717 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-05 02:40:55 +00:00
HD Moore 02780a1d88 Improvements to the FTP mixin and scanner, still needs multiline read support
git-svn-id: file:///home/svn/framework3/trunk@5715 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-04 21:42:37 +00:00
HD Moore 94802ede22 Change the support url to the correct location
git-svn-id: file:///home/svn/framework3/trunk@5713 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-04 18:56:16 +00:00
HD Moore fd256ec4a1 This massive commit changes the metasploit 3 module format. The new syntax allows for greater scalability and future improvements to the metasploit module loader. This change also makes it easier for users to add new modules, since the class name no longer needs to match the directory structure.
git-svn-id: file:///home/svn/framework3/trunk@5709 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-02 05:23:59 +00:00
HD Moore 0f03e872f1 Fixes ^C and ^Z session handling
git-svn-id: file:///home/svn/framework3/trunk@5706 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-01 17:32:55 +00:00
et fa3ce57fed Implemented Auxiliary::WMAPScanUniqueQuery.
git-svn-id: file:///home/svn/framework3/trunk@5704 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-01 03:57:57 +00:00
James Lee 43886f3697 typo fix, thanks Kris Katterjohn
git-svn-id: file:///home/svn/framework3/trunk@5702 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-30 23:24:52 +00:00
Ramon de C Valle 623fd50de5 Applied patch from patch from Kris Katterjohn to fix the time printed in the MsfGui log output.
git-svn-id: file:///home/svn/framework3/trunk@5698 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-30 04:18:28 +00:00
HD Moore af9a8eba9a Swap back to 8192 until the exploits which use it are updated.
git-svn-id: file:///home/svn/framework3/trunk@5694 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-27 17:13:11 +00:00
HD Moore 14e8e75cb6 Another, smaller, win32 wrapper
git-svn-id: file:///home/svn/framework3/trunk@5693 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-27 05:02:36 +00:00
HD Moore 16d2825b83 Wrap the shellcode in SEH
git-svn-id: file:///home/svn/framework3/trunk@5692 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 23:35:47 +00:00
HD Moore b94d10f53c Switch the exe back to windows mode (vs console)
git-svn-id: file:///home/svn/framework3/trunk@5691 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 23:01:58 +00:00
HD Moore 4d47f49c1c Randomize the timedatestamp
git-svn-id: file:///home/svn/framework3/trunk@5690 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 22:37:41 +00:00
HD Moore 6d5ac7eead Switches the executable template to something a little nicer and adds exe output to msfencode
git-svn-id: file:///home/svn/framework3/trunk@5689 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 22:34:51 +00:00
HD Moore e341e46f6b Remove debugging comment
git-svn-id: file:///home/svn/framework3/trunk@5688 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 13:33:09 +00:00
HD Moore 37d9c3db1d Corrects an issue where a scope ID is passed to IPv4 addresses, cleans up the parsing.
git-svn-id: file:///home/svn/framework3/trunk@5687 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 05:39:06 +00:00
HD Moore c9bb1bbcd0 Move th fd.unlink for the db_nmap command
git-svn-id: file:///home/svn/framework3/trunk@5686 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 05:01:18 +00:00
HD Moore e6254d42ce Cleaning up all the wordy stuff
git-svn-id: file:///home/svn/framework3/trunk@5685 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 04:25:44 +00:00
HD Moore f4a4b0bfbb Add a nasty error about ruby 1.8.7 for now
git-svn-id: file:///home/svn/framework3/trunk@5684 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-25 04:42:08 +00:00
HD Moore a75978a218 Patch from Stephen Fewer from Harmony Security, makes the midstager uses VirtualAlloc with RWX, solves a number of issues, specifically stack space starvation for large payloads.
git-svn-id: file:///home/svn/framework3/trunk@5683 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 22:54:30 +00:00
HD Moore 1310e0e94c Imported msfmachscan from Darren Kemp
git-svn-id: file:///home/svn/framework3/trunk@5682 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 22:14:33 +00:00
HD Moore b3c3b29ed1 Wrong fix, right bug.
git-svn-id: file:///home/svn/framework3/trunk@5681 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 20:47:01 +00:00
HD Moore 8491ef3ff9 Correct File namespace (thanks MJM)
git-svn-id: file:///home/svn/framework3/trunk@5680 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 20:39:28 +00:00
HD Moore df55d0107a Update from Julien fixes API calls on older OSs
git-svn-id: file:///home/svn/framework3/trunk@5679 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 20:01:22 +00:00
James Lee 36a06e7576 initial commit of php findsock. This patch makes all http connections global and removes the "close if (!pipelining)" checks, so beware of bugs.
git-svn-id: file:///home/svn/framework3/trunk@5678 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 04:41:51 +00:00
HD Moore ddc47955f2 Simplified module loader, update to the platform module to be more compat with ruby 1.9
git-svn-id: file:///home/svn/framework3/trunk@5677 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 04:15:10 +00:00
HD Moore fba4fb2889 Fix deprecated while/case syntax
git-svn-id: file:///home/svn/framework3/trunk@5676 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-23 15:41:13 +00:00
HD Moore b001e4684d Import first version of WMAP from ET LoWNOISE
git-svn-id: file:///home/svn/framework3/trunk@5675 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-22 22:32:20 +00:00
HD Moore b0225127cf Patch for Ruby 1.9 compat (not there yet)
git-svn-id: file:///home/svn/framework3/trunk@5674 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-22 15:52:18 +00:00
HD Moore c123a0e3ee Merged in from the latest HG pull
git-svn-id: file:///home/svn/framework3/trunk@5669 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-18 21:02:32 +00:00
HD Moore 97dc2065b6 Nuking this - replacing with the latest testing version.
git-svn-id: file:///home/svn/framework3/trunk@5668 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-18 21:01:48 +00:00
HD Moore 53e9dc5b92 Massive patch to enable Ruby 1.9 compatibility
git-svn-id: file:///home/svn/framework3/trunk@5666 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-17 18:17:58 +00:00
Ramon de C Valle bd753e8ece Fixed identation
git-svn-id: file:///home/svn/framework3/trunk@5664 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-17 02:01:15 +00:00
Ramon de C Valle 58cef5775e Added ARCH_POWER constant and fixed AIX payload modules
git-svn-id: file:///home/svn/framework3/trunk@5663 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-17 01:42:51 +00:00
HD Moore 6772685f3e Merge patch from Julien TINNES for MIPS support (LE/BE)
git-svn-id: file:///home/svn/framework3/trunk@5658 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-15 18:50:34 +00:00
Ramon de C Valle 117bae1e3e Added AIX POWER/PowerPC payload modules
git-svn-id: file:///home/svn/framework3/trunk@5654 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-10 20:13:36 +00:00
HD Moore 9b34f931d2 Fixes #240. Resets tab completion after irb
git-svn-id: file:///home/svn/framework3/trunk@5653 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-05 22:10:18 +00:00
HD Moore 0f25d98fb2 Fixes a typo with IPv4->IPv6 address translation
git-svn-id: file:///home/svn/framework3/trunk@5652 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-05 16:23:34 +00:00
James Lee 0c2f8537a1 re-enable randomization of basic blocks in php shells
git-svn-id: file:///home/svn/framework3/trunk@5647 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-01 04:43:07 +00:00
HD Moore ecf211a0d8 Pass the correct payload space value when specified via target or override
git-svn-id: file:///home/svn/framework3/trunk@5645 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-26 22:57:06 +00:00
HD Moore b6993ad46a Increase the address option fields, supports IPv6 and hostnames now.
git-svn-id: file:///home/svn/framework3/trunk@5641 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-24 15:34:24 +00:00
HD Moore 1fa95d6050 This patch adds support for IPv6 scope_ids to AddressRange parameters. Ranges consisting of a single address are not expanded
git-svn-id: file:///home/svn/framework3/trunk@5640 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-23 07:05:38 +00:00
HD Moore 947dad1f45 Expose the sslctx to the caller
git-svn-id: file:///home/svn/framework3/trunk@5639 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-23 05:12:43 +00:00
HD Moore fcaa218548 Fix IPv4 payloads, dont commit past midnight anymore.
git-svn-id: file:///home/svn/framework3/trunk@5638 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-22 22:06:14 +00:00
HD Moore d53dd66701 Adds initial support for IPv6, including two stager. Tested Meterpreter over IPv6 stages on XP and Vista. Using this is still tricky, I will add a wiki page tomorrow to explain the ScopeID stuff for link-local testing. This commit also includes the raw (oversized) assembler for the stagers as well as the entire old metasploit assembly set (useful for development).
git-svn-id: file:///home/svn/framework3/trunk@5635 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-22 06:34:57 +00:00
James Lee 1e3d89b467 fix a bug where firefox detection breaks with obfuscation of the js_osdetect code
git-svn-id: file:///home/svn/framework3/trunk@5632 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-15 20:11:42 +00:00
James Lee 36ce7136aa add a couple of javascript os detections
git-svn-id: file:///home/svn/framework3/trunk@5629 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-13 16:31:38 +00:00
HD Moore 9903e0bb1d Add the ror/rol ror13hash code to msf3
git-svn-id: file:///home/svn/framework3/trunk@5627 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-13 01:44:37 +00:00
HD Moore a9c74714bb Upgrading to a newer snapshot of metasm
git-svn-id: file:///home/svn/framework3/trunk@5623 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-11 19:46:33 +00:00
HD Moore 3cf81f257e Ensure that the Content-Type is set to text/html by default.
git-svn-id: file:///home/svn/framework3/trunk@5615 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-08 02:37:54 +00:00
James Lee f5fe1e0305 fix escaping bug in js_base64
git-svn-id: file:///home/svn/framework3/trunk@5611 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-30 02:56:21 +00:00
HD Moore bd7e616fe3 Need another red bull...
git-svn-id: file:///home/svn/framework3/trunk@5604 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-26 18:23:54 +00:00
HD Moore 09c1b1d0fc This fixes raw socket support for FreeBSD, NetBSD, BSDi, and Mac OS X. Thanks LibNET!
git-svn-id: file:///home/svn/framework3/trunk@5603 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-26 18:15:35 +00:00
HD Moore 30e29858a2 Fix the resolver on darwin
git-svn-id: file:///home/svn/framework3/trunk@5598 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-25 22:42:04 +00:00
HD Moore c6930f79f1 consistency fixes
git-svn-id: file:///home/svn/framework3/trunk@5596 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-25 06:04:51 +00:00
HD Moore bb1db8253a Raw socket mode that should work for 'everyone'
git-svn-id: file:///home/svn/framework3/trunk@5595 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-25 05:05:32 +00:00
HD Moore cef76df19c Raw socket support for BSD systems
git-svn-id: file:///home/svn/framework3/trunk@5594 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-25 04:59:11 +00:00
HD Moore 905366758a Add the US-CERT-VU reference type
git-svn-id: file:///home/svn/framework3/trunk@5578 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-23 20:56:36 +00:00
HD Moore f52f4d7b62 Add |)ruid's infos to author, fix an issue with auxiliary options checking.
git-svn-id: file:///home/svn/framework3/trunk@5577 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-23 20:14:47 +00:00
HD Moore a4af2d9d93 Fix socket, change requires in dns
git-svn-id: file:///home/svn/framework3/trunk@5575 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-23 17:39:02 +00:00
HD Moore b70ce0ae10 Import the Net-DNS library
git-svn-id: file:///home/svn/framework3/trunk@5574 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-23 17:32:05 +00:00
James Lee 0144e9ea6a add detection for IE6 on XPSP0
git-svn-id: file:///home/svn/framework3/trunk@5572 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-23 06:40:27 +00:00
HD Moore cd41d97232 Remove double aux error logging
git-svn-id: file:///home/svn/framework3/trunk@5568 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-22 21:03:59 +00:00
HD Moore 43f9501c52 Adds a new module that demonstrates IP spoofing.
git-svn-id: file:///home/svn/framework3/trunk@5567 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-22 19:37:05 +00:00
HD Moore ca7c8b0f68 Adds the Exploit::Remote::Ip mixin
git-svn-id: file:///home/svn/framework3/trunk@5566 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-22 19:12:05 +00:00
HD Moore a52530f647 Raw IP socket support for Rex. Guess what this is for :-)
git-svn-id: file:///home/svn/framework3/trunk@5565 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-22 19:03:59 +00:00
James Lee 2d344e64df browser_autopwn now works with mozilla_compareto, mozilla_navigatorjava, and firefox_queryinterface; increased reliability of OS and browser detection
git-svn-id: file:///home/svn/framework3/trunk@5563 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-22 07:28:05 +00:00
HD Moore 4415d0370f Stop leaking file descriptors when source_address() is called
git-svn-id: file:///home/svn/framework3/trunk@5561 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-21 03:32:51 +00:00
James Lee a15e3c08e9 add string obfuscation
git-svn-id: file:///home/svn/framework3/trunk@5556 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-14 18:57:13 +00:00
Patrick Webster 301b1514f3 Added pop2 mixin, aux module, typos.
git-svn-id: file:///home/svn/framework3/trunk@5550 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-08 14:21:48 +00:00
James Lee 8800372e46 initial commit of browser_autopwn;
revamp php payloads;
socks5 for IPv6 (untested)



git-svn-id: file:///home/svn/framework3/trunk@5546 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-01 01:44:56 +00:00
HD Moore 380aba15b0 Implements the readline workaround, tested with regular and meterpreter sessions
git-svn-id: file:///home/svn/framework3/trunk@5544 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-27 20:51:36 +00:00
HD Moore f056b9437f Revert this again, breaks meterpreter console
git-svn-id: file:///home/svn/framework3/trunk@5543 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-27 20:07:53 +00:00
HD Moore 596a13ae30 Correctly handle the readline threading issue, tested with sessions.
git-svn-id: file:///home/svn/framework3/trunk@5541 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-27 19:57:28 +00:00
HD Moore eb0134d8b6 Fix an annoying error
git-svn-id: file:///home/svn/framework3/trunk@5539 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-24 20:55:42 +00:00
James Lee 8a009c5b48 initial support for SOCKS5
git-svn-id: file:///home/svn/framework3/trunk@5537 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-22 22:55:38 +00:00
James Lee 487d7d0bec spaces -> tabs. =(
git-svn-id: file:///home/svn/framework3/trunk@5536 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-22 20:01:41 +00:00
James Lee 4733e56c5a add 'resource' command, no tab completion yet because i'm lazy
git-svn-id: file:///home/svn/framework3/trunk@5535 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-22 19:59:12 +00:00
James Lee 73dd9aa89f show the name of the module in the output of 'show options' and friends
git-svn-id: file:///home/svn/framework3/trunk@5532 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-18 08:30:26 +00:00
James Lee 44e16600d1 typo fix
git-svn-id: file:///home/svn/framework3/trunk@5530 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-16 05:39:36 +00:00
Matt Miller b2b7a05abb comment out stage encoding until I can troubleshoot it some more
git-svn-id: file:///home/svn/framework3/trunk@5522 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-05 07:03:10 +00:00
HD Moore 67b418475d Temporarily revert to the old readline behavior
git-svn-id: file:///home/svn/framework3/trunk@5521 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-05 00:15:40 +00:00
HD Moore e55a9d29a4 Temporarily disable the new readline mode
git-svn-id: file:///home/svn/framework3/trunk@5520 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-05 00:13:33 +00:00
HD Moore b844a31fcc Re-enable readline history
git-svn-id: file:///home/svn/framework3/trunk@5519 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-05 00:01:38 +00:00
HD Moore 14d8bc67fc This patch solves a slowness problem introduced by the ruby thread scheduler and the readline extension. For every time slice that the readline thread receives, it does a 100ms select(stdin), which severely impacts the performance of all other running threads. This patch pushes readline into a forked subprocess. Not the most elegant, but it will do until we have a real client-server model.
git-svn-id: file:///home/svn/framework3/trunk@5518 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-04 22:56:25 +00:00
Matt Miller 2be17ce819 patch from Kris Katterjohn
git-svn-id: file:///home/svn/framework3/trunk@5512 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-26 08:42:17 +00:00
Matt Miller 30ae3af6fb experimental: stages encoded by default, set DisableStageEncoding 1 to disable
git-svn-id: file:///home/svn/framework3/trunk@5511 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-26 07:59:03 +00:00
Matt Miller d94bfaf373 better support for nx with dllinject payloads/meterp
git-svn-id: file:///home/svn/framework3/trunk@5510 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-26 06:34:12 +00:00
James Lee e1a25c1383 payload generate now honors ENCODER instead of requiring -e
git-svn-id: file:///home/svn/framework3/trunk@5508 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-19 23:56:17 +00:00
James Lee c0b39cc234 "set foo" prints the value of foo if it exists; really, that's it this time
git-svn-id: file:///home/svn/framework3/trunk@5507 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-17 06:27:03 +00:00
James Lee 2db9dd6ab2 Reversing over greedy commit. =(
git-svn-id: file:///home/svn/framework3/trunk@5506 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-17 06:17:41 +00:00
James Lee 93199c5610 "set foo" prints the value of foo if it exists
git-svn-id: file:///home/svn/framework3/trunk@5505 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-17 05:29:32 +00:00
HD Moore 5ec3509103 egypt found a bug, regenerate payload was overwriting datastore entries and not setting them back
git-svn-id: file:///home/svn/framework3/trunk@5504 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-16 21:20:43 +00:00
Patrick Webster 0adab629ba Added ntp module, linux egghunter
git-svn-id: file:///home/svn/framework3/trunk@5502 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-12 14:49:45 +00:00
Matt Miller e63a121341 merge incognito updates from Luke Jennings
git-svn-id: file:///home/svn/framework3/trunk@5499 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-28 16:57:49 +00:00
James Lee 8116b32e14 allow comments in resource files.
git-svn-id: file:///home/svn/framework3/trunk@5498 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-26 18:28:41 +00:00
James Lee af4ac919fe add whitespace randomization to Rex::Text. Will update modules to use this instead of copy-paste
git-svn-id: file:///home/svn/framework3/trunk@5494 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-23 06:54:00 +00:00
HD Moore 16170bd716 Let the GUI handle -r, change default window size to fit smaller screens, updated HTTP capture code, added keywords to payload
git-svn-id: file:///home/svn/framework3/trunk@5491 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-22 23:20:35 +00:00
HD Moore 84d921633b Fun with saved passwords
git-svn-id: file:///home/svn/framework3/trunk@5490 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-22 18:48:21 +00:00
HD Moore c5a910525c Adding the BPS reference type, URLs are not public yet, will be soon.
git-svn-id: file:///home/svn/framework3/trunk@5481 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-21 05:21:28 +00:00
HD Moore 57131f98c3 Adding I)ruids's yp exploit. Fixing a streamserver bug thats been causing problems for a while. Updating the HTTP capture module to do better fingerprinting
git-svn-id: file:///home/svn/framework3/trunk@5477 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-18 01:33:09 +00:00
HD Moore 0ad43aad70 Fix an exception that is encountered when not enough of the DCERPC packet has been read
git-svn-id: file:///home/svn/framework3/trunk@5468 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-04 22:12:59 +00:00
HD Moore 06e47726ba Handle DCERPC reads over SMB pipes in a more efficient fashion. Rename the sadmind exploit, since Solaris is redundant
git-svn-id: file:///home/svn/framework3/trunk@5467 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-04 21:15:55 +00:00
HD Moore 125d114526 Properly handle SMB::pipe_(read|write)_(min|max)
git-svn-id: file:///home/svn/framework3/trunk@5466 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-04 20:54:39 +00:00
HD Moore 74f7fb0cb9 Patch from I)ruid
git-svn-id: file:///home/svn/framework3/trunk@5464 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-02 19:03:42 +00:00
James Lee 6ede0b8827 Remove the dispatch ninja tease.
git-svn-id: file:///home/svn/framework3/trunk@5462 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-01 04:55:59 +00:00
HD Moore 9c7f5d7130 Simple fix for bad calls to negotiate, remove useless disconnect call in the relay daemon
git-svn-id: file:///home/svn/framework3/trunk@5460 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-26 22:36:42 +00:00
HD Moore 03276c9cc0 Add a find_layers method
git-svn-id: file:///home/svn/framework3/trunk@5456 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-22 19:55:23 +00:00
HD Moore 1ea29ba8f0 Fixes #218. Updates the http password capture module. Removes a bogus makefile from the tree
git-svn-id: file:///home/svn/framework3/trunk@5452 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-22 06:34:52 +00:00
HD Moore 06aa636126 Payload patch from toto
git-svn-id: file:///home/svn/framework3/trunk@5450 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-18 16:01:15 +00:00
HD Moore c3a4cda127 Merged all of the scruby patches, fixed Dot11 support with regards to RadioTap headers.
git-svn-id: file:///home/svn/framework3/trunk@5446 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-17 04:46:42 +00:00
HD Moore 4ee248bf3e Pass the IP address in the IPC$ tree connect (required by novell)
git-svn-id: file:///home/svn/framework3/trunk@5441 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-13 15:46:33 +00:00
HD Moore ba075599a9 Patches from Sandor Szucs
git-svn-id: file:///home/svn/framework3/trunk@5440 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-10 21:27:07 +00:00
James Lee 4acc181aa7 Reload extensions after migrate
git-svn-id: file:///home/svn/framework3/trunk@5436 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-10 16:14:11 +00:00
James Lee dfa0f6c0c4 More reliable reverse shell
git-svn-id: file:///home/svn/framework3/trunk@5429 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-04 07:34:26 +00:00
James Lee 77f431fea3 autoload meterpreter's priv extension if the exploit gave us admin
git-svn-id: file:///home/svn/framework3/trunk@5427 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-02 23:07:33 +00:00
HD Moore 509fc09382 Lots of updates related to <secret project X>.
git-svn-id: file:///home/svn/framework3/trunk@5424 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-02 04:46:13 +00:00
HD Moore 7349c32ec9 Ignore exceptions during shutdown()
git-svn-id: file:///home/svn/framework3/trunk@5419 4d416f70-5f16-0410-b530-b9f4589650da
2008-02-14 21:11:57 +00:00
Ramon de C Valle e39c053f76 Updated ELF stuff
git-svn-id: file:///home/svn/framework3/trunk@5413 4d416f70-5f16-0410-b530-b9f4589650da
2008-02-13 02:43:56 +00:00
HD Moore cd5d111296 Handle situations were ruby-gtk2 is available, but cairo is not. Fixes #191
git-svn-id: file:///home/svn/framework3/trunk@5407 4d416f70-5f16-0410-b530-b9f4589650da
2008-02-09 08:17:20 +00:00
HD Moore 3685b7a133 Fixes #190. Check for missing path and handle all exceptions.
git-svn-id: file:///home/svn/framework3/trunk@5403 4d416f70-5f16-0410-b530-b9f4589650da
2008-02-09 07:50:20 +00:00
Ramon de C Valle a3ccb61b91 Pulled out image_source
git-svn-id: file:///home/svn/framework3/trunk@5401 4d416f70-5f16-0410-b530-b9f4589650da
2008-02-09 04:35:21 +00:00
Ramon de C Valle 42be6e56a2 Added more options
git-svn-id: file:///home/svn/framework3/trunk@5398 4d416f70-5f16-0410-b530-b9f4589650da
2008-02-06 17:31:57 +00:00
Ramon de C Valle 8601a4133d Forgot
git-svn-id: file:///home/svn/framework3/trunk@5389 4d416f70-5f16-0410-b530-b9f4589650da
2008-02-01 01:49:34 +00:00
Ramon de C Valle 177117cfb5 First version of msfelfscan
git-svn-id: file:///home/svn/framework3/trunk@5388 4d416f70-5f16-0410-b530-b9f4589650da
2008-02-01 01:44:25 +00:00
HD Moore 7bd86cdc4a Merged revisions 5384-5385 via svnmerge from
svn+ssh://metasploit.com/home/svn/framework3/branches/framework-3.1

........
  r5385 | hdm | 2008-01-28 10:54:04 -0600 (Mon, 28 Jan 2008) | 2 lines
  
  Fixed a bug reported by Nicolas RUFF (clicking any selected module text that isnt a link results in a crash)
........


git-svn-id: file:///home/svn/framework3/trunk@5386 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-28 16:54:57 +00:00
HD Moore 62303eefbf Merged revisions 5378-5379 via svnmerge from
svn+ssh://metasploit.com/home/svn/framework3/branches/framework-3.1

........
  r5379 | hdm | 2008-01-27 21:13:27 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  Remove $stderr prints
........


git-svn-id: file:///home/svn/framework3/trunk@5380 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-28 03:13:55 +00:00
HD Moore 6677beb174 Merged revisions 5366-5377 via svnmerge from
svn+ssh://metasploit.com/home/svn/framework3/branches/framework-3.1

........
  r5366 | hdm | 2008-01-26 20:30:53 -0600 (Sat, 26 Jan 2008) | 2 lines
  
  Update version information
........
  r5367 | hdm | 2008-01-26 21:10:57 -0600 (Sat, 26 Jan 2008) | 3 lines
  
  Updated for version 3.1
........
  r5369 | hdm | 2008-01-26 21:13:31 -0600 (Sat, 26 Jan 2008) | 3 lines
  
  Wipe the private directories from the branch. 
........
  r5371 | hdm | 2008-01-27 17:24:24 -0600 (Sun, 27 Jan 2008) | 5 lines
  
  Timeout options added for dcerpc connect and read times. Addition of novell netware as a supported target platform. Inclusion of the serverprotect exploit (still works on the latest version). Addition of the first remote netware kernel exploit that leads to a shell, addition of netware stager and shell, and first draft of the release notes for 3.1
........
  r5372 | hdm | 2008-01-27 17:30:08 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  Formatting, indentation, fixed the static IP embedded in the request
........
  r5373 | hdm | 2008-01-27 20:02:48 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  Correctly trap exploit errors in a way that works with all of the UIs
........
  r5374 | hdm | 2008-01-27 20:23:25 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  More last-minute bug fixes
........
  r5375 | hdm | 2008-01-27 20:37:43 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  Force multi-bind off in netware, correct label display in gtk gui labels
........
  r5376 | hdm | 2008-01-27 20:50:03 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  More exception handling fun
........


git-svn-id: file:///home/svn/framework3/trunk@5378 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-28 03:06:31 +00:00
HD Moore 96e543de06 Bumped to 3.2-dev
git-svn-id: file:///home/svn/framework3/trunk@5368 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-27 03:11:33 +00:00
HD Moore 19c36b0f24 Nice confirmation dialog for the save button
git-svn-id: file:///home/svn/framework3/trunk@5362 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-27 02:06:44 +00:00
HD Moore c66f8706ef Fixes #180. Places all exploit and auxiliary options into a nice scrolling window. Solves a crash when validation fails in the wizard
git-svn-id: file:///home/svn/framework3/trunk@5360 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-27 02:03:10 +00:00
HD Moore e17f43b9d5 Prevent duplicate error messages from appearing
git-svn-id: file:///home/svn/framework3/trunk@5359 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-26 22:46:49 +00:00
HD Moore 31d121da82 Speedup to local relay
git-svn-id: file:///home/svn/framework3/trunk@5358 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-26 22:17:59 +00:00
HD Moore 7a04d3fbad Merge metasm back in (fresh copy, no HG stuff)
git-svn-id: file:///home/svn/framework3/trunk@5356 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-26 09:57:05 +00:00
HD Moore 63f396827e Removed (replacing with a fresh copy)
git-svn-id: file:///home/svn/framework3/trunk@5355 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-26 09:56:02 +00:00
HD Moore d931374844 Add -f to generate. Add SMBUser/SMBPass options to psexec (regular vs advanced)
git-svn-id: file:///home/svn/framework3/trunk@5354 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-25 23:24:06 +00:00
HD Moore 16b457067a Woops. Had to add the error printing code to the UI wrapper
git-svn-id: file:///home/svn/framework3/trunk@5353 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-25 22:36:05 +00:00
HD Moore 9d2abb9287 The capture mixin is now working again (with scruby)
git-svn-id: file:///home/svn/framework3/trunk@5352 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-25 05:59:06 +00:00
HD Moore 09532a9bd1 Add a quick readme
git-svn-id: file:///home/svn/framework3/trunk@5351 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-25 05:29:44 +00:00
HD Moore 5018637864 Add the GPLv2 license so its clear
git-svn-id: file:///home/svn/framework3/trunk@5350 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-25 05:28:26 +00:00
HD Moore 7a857939f2 Import the modified scruby code
git-svn-id: file:///home/svn/framework3/trunk@5349 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-25 05:25:06 +00:00
HD Moore ee4fbac2bf Log error message by IP address
git-svn-id: file:///home/svn/framework3/trunk@5348 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-25 04:53:15 +00:00
HD Moore 25373d3ef5 Swap heaplib.js for a base64 encoded version. The antivirus tools were making svn update break when they deleted this file and the -svn-base.
git-svn-id: file:///home/svn/framework3/trunk@5346 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-25 03:15:26 +00:00
HD Moore 151d928280 Nuke ruby-pcapx (pcaprub replaces it)
git-svn-id: file:///home/svn/framework3/trunk@5345 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-25 03:09:04 +00:00
HD Moore 5b2af0fe18 Fixes #179. Handle modules with no descriptions
git-svn-id: file:///home/svn/framework3/trunk@5344 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-25 02:33:52 +00:00
HD Moore 1e2ec68913 Handle lorcon on windows better
git-svn-id: file:///home/svn/framework3/trunk@5341 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-24 05:49:48 +00:00
HD Moore da11ec312f Bugrit
git-svn-id: file:///home/svn/framework3/trunk@5339 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-24 05:43:04 +00:00
HD Moore cb96859883 Another try at it
git-svn-id: file:///home/svn/framework3/trunk@5338 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-24 05:42:11 +00:00
HD Moore 13e09b1026 Another try at making the splash screen not freeze ;-)
git-svn-id: file:///home/svn/framework3/trunk@5337 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-24 05:39:31 +00:00
HD Moore b5a1db4fb2 Cosmetic
git-svn-id: file:///home/svn/framework3/trunk@5336 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-24 05:31:54 +00:00
HD Moore a9ca5d1ace More GUI work. Changed the location where module exceptions are reported
git-svn-id: file:///home/svn/framework3/trunk@5335 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-24 05:29:35 +00:00
HD Moore f43d43376a Fix typo
git-svn-id: file:///home/svn/framework3/trunk@5334 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-24 04:04:01 +00:00
HD Moore 8b321341b9 use shellexecute() for urls on windows
git-svn-id: file:///home/svn/framework3/trunk@5333 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-24 04:03:10 +00:00
HD Moore af9999bb73 The references can now be clicked
git-svn-id: file:///home/svn/framework3/trunk@5332 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-24 03:53:28 +00:00
HD Moore e0a2c215cf Remove the freeze-splash-screen fix... causes segv when modules are not cached
git-svn-id: file:///home/svn/framework3/trunk@5331 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-23 03:21:47 +00:00
HD Moore 248eab9b41 Remove stderr print
git-svn-id: file:///home/svn/framework3/trunk@5323 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-22 06:19:35 +00:00
HD Moore 54444bf39c Add missing style
git-svn-id: file:///home/svn/framework3/trunk@5322 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-22 06:15:00 +00:00
HD Moore 4cd79e98e5 More responsive splash screen, shorten name of std jobs name
git-svn-id: file:///home/svn/framework3/trunk@5321 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-22 06:09:52 +00:00
HD Moore 221b408c37 Closer
git-svn-id: file:///home/svn/framework3/trunk@5319 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-22 05:48:16 +00:00
HD Moore 8ad5e6ce1e Closer
git-svn-id: file:///home/svn/framework3/trunk@5318 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-22 05:30:45 +00:00
HD Moore be156ef668 Closer
git-svn-id: file:///home/svn/framework3/trunk@5317 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-22 05:27:23 +00:00
HD Moore cad23e7977 Closer
git-svn-id: file:///home/svn/framework3/trunk@5316 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-22 05:24:08 +00:00
HD Moore a18f2cb295 Closer
git-svn-id: file:///home/svn/framework3/trunk@5315 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-22 05:22:14 +00:00
HD Moore 24136de1d0 Another go
git-svn-id: file:///home/svn/framework3/trunk@5314 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-22 05:20:53 +00:00
HD Moore 65bfaa269d fixes to the search command in msfconsole. an attempt at solving the rubyw/gtk/stderr issue on windows
git-svn-id: file:///home/svn/framework3/trunk@5308 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-22 04:57:06 +00:00
HD Moore 187adc8c14 Change foreground color to bloack
git-svn-id: file:///home/svn/framework3/trunk@5307 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-22 03:39:09 +00:00
HD Moore 282cfe304c Sanitize the log view as well
git-svn-id: file:///home/svn/framework3/trunk@5306 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-21 02:20:57 +00:00
HD Moore b202317a29 Use gray instead of white for inactive items
git-svn-id: file:///home/svn/framework3/trunk@5305 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-21 02:19:08 +00:00
HD Moore c376951b30 Sanitize text before inserting it into a text view
git-svn-id: file:///home/svn/framework3/trunk@5304 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-21 02:10:27 +00:00
HD Moore e27db6c17d Work around Gtk-related crashes
git-svn-id: file:///home/svn/framework3/trunk@5303 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-21 01:53:36 +00:00
HD Moore 003cc32be6 Clean up for the 3.1 release, hide features which are not completed or working well.
git-svn-id: file:///home/svn/framework3/trunk@5301 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-21 01:48:05 +00:00
HD Moore 47160b712a Block the exit/quit/etc commands
git-svn-id: file:///home/svn/framework3/trunk@5300 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-21 01:08:31 +00:00
HD Moore 9753f50410 Remove debugging hook
git-svn-id: file:///home/svn/framework3/trunk@5299 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-21 01:06:11 +00:00
HD Moore 9a24ffcb5a More UI work
git-svn-id: file:///home/svn/framework3/trunk@5298 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-21 01:04:41 +00:00
HD Moore 2ea3ea0c7c Syntax highlighting to code view
git-svn-id: file:///home/svn/framework3/trunk@5296 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-20 23:36:20 +00:00
HD Moore cc82a7e854 Revert a broken options change
git-svn-id: file:///home/svn/framework3/trunk@5295 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-20 22:59:38 +00:00
HD Moore 289d280291 More UI updates
git-svn-id: file:///home/svn/framework3/trunk@5293 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-20 22:40:11 +00:00
HD Moore 175ac427ab Correct the type display
git-svn-id: file:///home/svn/framework3/trunk@5288 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-07 07:28:59 +00:00
HD Moore e6edcb9098 Remove the frame around the entries
git-svn-id: file:///home/svn/framework3/trunk@5287 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-07 07:17:37 +00:00
HD Moore 22ef3be8ef Get the stupid out
git-svn-id: file:///home/svn/framework3/trunk@5286 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-07 07:11:34 +00:00
HD Moore 09d751e283 No shadow_type for Gtk::Entry in win32 version?
git-svn-id: file:///home/svn/framework3/trunk@5285 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-07 07:10:45 +00:00
HD Moore eeed1c8a87 Added consoles to the GUI
git-svn-id: file:///home/svn/framework3/trunk@5283 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-07 07:00:42 +00:00
HD Moore df67cb42f9 Dont use ipv6 sockets for unconnected udp on freebsd
git-svn-id: file:///home/svn/framework3/trunk@5278 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-06 21:51:07 +00:00
HD Moore 2b41f4fe05 Dont throw an exception when a module is marked as ambiguous
git-svn-id: file:///home/svn/framework3/trunk@5274 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-06 20:25:09 +00:00
HD Moore 757b610a59 Fixes #163. Multiple headers with the same value are now squashed into a single long line in the response object.
git-svn-id: file:///home/svn/framework3/trunk@5273 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-06 20:11:02 +00:00
HD Moore dbb22495a6 Unit test for #173 fix
git-svn-id: file:///home/svn/framework3/trunk@5272 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-06 20:07:28 +00:00
HD Moore af9407e7b0 Fixes #173. Handle mixed-case header lookups better
git-svn-id: file:///home/svn/framework3/trunk@5271 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-06 20:06:39 +00:00
HD Moore 481bc3fbd5 Fixes #164. VNC sessions are automatically dropped to the background and close up properly.
git-svn-id: file:///home/svn/framework3/trunk@5270 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-06 20:02:49 +00:00
HD Moore a14b47fa06 Dont write to stdout, it kills rubyw
git-svn-id: file:///home/svn/framework3/trunk@5267 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-02 06:31:14 +00:00
HD Moore 039d9f6c6a Correct aux mod count
git-svn-id: file:///home/svn/framework3/trunk@5266 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-02 06:26:04 +00:00
HD Moore dd2e302834 Fix the aux modules
git-svn-id: file:///home/svn/framework3/trunk@5265 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-02 06:23:08 +00:00
HD Moore c888b12285 New module tree view
git-svn-id: file:///home/svn/framework3/trunk@5264 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-02 06:18:24 +00:00
HD Moore 6c1e3b74b4 Disable logging to stderr, it crashes rubyw
git-svn-id: file:///home/svn/framework3/trunk@5263 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 19:02:36 +00:00
HD Moore 2dba57748a Disable console output for now
git-svn-id: file:///home/svn/framework3/trunk@5262 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 18:59:49 +00:00
HD Moore 79a7fa3819 Gtk blows up if the path is relative
git-svn-id: file:///home/svn/framework3/trunk@5261 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 18:48:49 +00:00
fab 76fd0864fb began the database configuration ;-)
git-svn-id: file:///home/svn/framework3/trunk@5260 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 17:03:06 +00:00
fab e030a3f7b5 typo
git-svn-id: file:///home/svn/framework3/trunk@5258 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 16:59:32 +00:00
fab 643ad017a1 add comments
git-svn-id: file:///home/svn/framework3/trunk@5255 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 16:56:25 +00:00
fab 043985ce90 uber test
git-svn-id: file:///home/svn/framework3/trunk@5254 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 09:54:49 +00:00
HD Moore 5e2f1ea7cc More tempfile nonsense
git-svn-id: file:///home/svn/framework3/trunk@5247 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 08:27:24 +00:00
HD Moore d6e5b0a25d Fix use of Tempfile
git-svn-id: file:///home/svn/framework3/trunk@5246 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 08:20:48 +00:00
HD Moore 5131e4b747 Change the default payload back to a working one
git-svn-id: file:///home/svn/framework3/trunk@5245 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 05:01:10 +00:00
HD Moore dfdc7d6dad Fix db_nmap on windows
git-svn-id: file:///home/svn/framework3/trunk@5244 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 04:58:44 +00:00
HD Moore b7dc7dfe65 print command line output
git-svn-id: file:///home/svn/framework3/trunk@5243 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 04:53:35 +00:00
HD Moore a396f655d5 Fixes to the sqlite3 database driver, the db_nmap command, and msfgui
git-svn-id: file:///home/svn/framework3/trunk@5242 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 04:05:51 +00:00
HD Moore 2125254d1d Remove unused tag
git-svn-id: file:///home/svn/framework3/trunk@5240 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 02:13:31 +00:00
HD Moore 9c54fecada Changes to about dialog, look for cmd+.exe as well
git-svn-id: file:///home/svn/framework3/trunk@5239 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 02:03:13 +00:00
HD Moore 084fa6a7df browser/email hooks
git-svn-id: file:///home/svn/framework3/trunk@5238 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 01:19:49 +00:00
HD Moore 3ebe718644 Minor tweaks to the GUI
git-svn-id: file:///home/svn/framework3/trunk@5237 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 01:09:34 +00:00
HD Moore 016f4ece6a Change the sessions directory
Refresh after kill and migrate



git-svn-id: file:///home/svn/framework3/trunk@5236 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 00:52:20 +00:00
HD Moore 275c91dfed Adds a border to the splash screen, puts framework initialization into post-flash part
git-svn-id: file:///home/svn/framework3/trunk@5234 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 00:27:44 +00:00
HD Moore dde128f52c Add the splash screen, some reformatting
git-svn-id: file:///home/svn/framework3/trunk@5233 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 00:23:33 +00:00
HD Moore 673388da92 Overlapping with the main tree === bad idea
git-svn-id: file:///home/svn/framework3/trunk@5231 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-29 23:34:09 +00:00
HD Moore 7590cd9a85 Woops, add the msf3 directory to the path
git-svn-id: file:///home/svn/framework3/trunk@5230 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-29 23:24:34 +00:00
HD Moore ab2654f3a0 Defaults for airpcap
git-svn-id: file:///home/svn/framework3/trunk@5229 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-29 23:15:30 +00:00
HD Moore 91fbf5cccb Sync with the new windows directory path
git-svn-id: file:///home/svn/framework3/trunk@5228 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-29 23:05:15 +00:00
HD Moore 94c81d866c Fix is a cpu loop bug in batch-mode scanner modules. This was apparent when using a RHOSTS set of 256 hosts but a THREADS count of > 1 with the UDP sweep module
git-svn-id: file:///home/svn/framework3/trunk@5227 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-29 17:16:22 +00:00
HD Moore ad43a641f8 Patch from grutz (see #169). Added constants for SMB2
git-svn-id: file:///home/svn/framework3/trunk@5226 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-27 17:42:32 +00:00
HD Moore fe91968665 Patch from Kris Katterjohn <katterjohn@gmail.com> inplements 'search' in msfconsole
git-svn-id: file:///home/svn/framework3/trunk@5216 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-11 05:02:02 +00:00
HD Moore 6645a7256c Add the lcd command
git-svn-id: file:///home/svn/framework3/trunk@5212 4d416f70-5f16-0410-b530-b9f4589650da
2007-11-30 21:21:12 +00:00
Matt Miller 3b74c476a1 patch from Kris K
git-svn-id: file:///home/svn/framework3/trunk@5210 4d416f70-5f16-0410-b530-b9f4589650da
2007-11-29 06:57:14 +00:00
HD Moore 907282b061 Import version 0.9.1 of the rubyzip library
git-svn-id: file:///home/svn/framework3/trunk@5208 4d416f70-5f16-0410-b530-b9f4589650da
2007-11-28 22:21:58 +00:00
HD Moore 967a4c0fc6 Add x86 macho output support
git-svn-id: file:///home/svn/framework3/trunk@5205 4d416f70-5f16-0410-b530-b9f4589650da
2007-11-26 22:23:51 +00:00
HD Moore 293036bee8 fix the end of embedded mime messages (always end in \r\n)
git-svn-id: file:///home/svn/framework3/trunk@5201 4d416f70-5f16-0410-b530-b9f4589650da
2007-11-26 19:07:47 +00:00
HD Moore 3b9f9240b5 Bug noted by gh0st
git-svn-id: file:///home/svn/framework3/trunk@5190 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-31 16:03:39 +00:00
Matt Miller 55ddf3865a encoder changes for context key support from druid
git-svn-id: file:///home/svn/framework3/trunk@5177 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-23 20:07:55 +00:00
HD Moore 077bccbbe2 Patch from dustin
git-svn-id: file:///home/svn/framework3/trunk@5161 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-19 14:26:56 +00:00
Matt Miller ddc3b15269 fix from bad commit
git-svn-id: file:///home/svn/framework3/trunk@5159 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-19 06:48:26 +00:00
HD Moore 598568e079 New update from dustin
git-svn-id: file:///home/svn/framework3/trunk@5157 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-18 20:42:00 +00:00
HD Moore 53f7b946ac Update to the context dumper from dustin
git-svn-id: file:///home/svn/framework3/trunk@5156 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-18 20:26:24 +00:00
HD Moore 16a81d8c63 Switch to big endian byte order for context-map files
git-svn-id: file:///home/svn/framework3/trunk@5155 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-18 16:55:55 +00:00
HD Moore ec94968d82 Add support for context-map files to msfpescan (http://sourceforge.net/projects/smem-map/)
git-svn-id: file:///home/svn/framework3/trunk@5154 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-18 16:55:23 +00:00
HD Moore 21d971139b New HTTP NTLM code from Kurt Grutzmacher <grutz@jingojango.net>
git-svn-id: file:///home/svn/framework3/trunk@5143 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-12 01:24:57 +00:00
HD Moore 6f79e14c91 Fixes #157. Patches from egypt@nmt.edu
git-svn-id: file:///home/svn/framework3/trunk@5137 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-05 19:23:45 +00:00
Matt Miller aad6a6868b added EncoderDontFallThrough option, fixes #155
git-svn-id: file:///home/svn/framework3/trunk@5132 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-02 03:36:45 +00:00
Matt Miller dc23f5b8dc default to first architecture in architecture array for egghunter, fixes #148
git-svn-id: file:///home/svn/framework3/trunk@5131 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-02 03:24:21 +00:00
HD Moore 3b4adaff9c See #17
git-svn-id: file:///home/svn/framework3/trunk@5128 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-30 17:54:15 +00:00
HD Moore ffc5c0a57d Use a class variable instead of a global to cache unicode code pages.
git-svn-id: file:///home/svn/framework3/trunk@5126 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-29 06:47:16 +00:00
HD Moore ceb69bb541 Overhaul of the ruby-lorcon module to match pylorcon.
git-svn-id: file:///home/svn/framework3/trunk@5124 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-28 06:51:32 +00:00
Patrick Webster 09485b52e7 First commit. Added Netcat NT module.
git-svn-id: file:///home/svn/framework3/trunk@5123 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-26 13:44:25 +00:00
HD Moore 1527d92154 Correct offset typos in the new iphone modules. Add EXE output support for OS X PPC, Linux x86, and make the OS X ARM smaller.
git-svn-id: file:///home/svn/framework3/trunk@5119 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-25 01:50:05 +00:00
HD Moore cbec13de60 Add "X" mode for iPhone payloads
git-svn-id: file:///home/svn/framework3/trunk@5117 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-24 17:54:51 +00:00
HD Moore 621849beaf One more bad exception to fix
git-svn-id: file:///home/svn/framework3/trunk@5114 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-24 04:58:26 +00:00
HD Moore 7498562eb5 Add proxy support to HTTP mixin using modules. Fix socks proxy support.
git-svn-id: file:///home/svn/framework3/trunk@5113 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-24 04:44:44 +00:00
HD Moore acc4fd966a Add ARMLE/ARMBE
git-svn-id: file:///home/svn/framework3/trunk@5112 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-24 03:16:50 +00:00
HD Moore 8c844f96b0 Fixes #60. Adds a new block_command() method to the console, which allows a UI to disable certain commands at runtime.
git-svn-id: file:///home/svn/framework3/trunk@5109 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-22 20:20:10 +00:00
HD Moore f832df480a Fixes #8. Resets the tab completion routine after session interaction.
git-svn-id: file:///home/svn/framework3/trunk@5108 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-22 19:53:39 +00:00
HD Moore 7cc30f0fa8 Support pattern_create() lengths larger than the maximum set size
git-svn-id: file:///home/svn/framework3/trunk@5104 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-13 16:11:33 +00:00
fab 875b7ebfb4 fix #137 (thx to Glenn to report it)
git-svn-id: file:///home/svn/framework3/trunk@5102 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-11 19:49:05 +00:00
HD Moore 6f23487daa Fixes #117. No longer treat connection: close as a stop-processing case
git-svn-id: file:///home/svn/framework3/trunk@5090 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-09 22:27:27 +00:00
HD Moore 00beaa7049 Fixes #136. Detects a nil str parameter
git-svn-id: file:///home/svn/framework3/trunk@5088 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-09 22:10:38 +00:00
HD Moore 59120eafb2 Adds rand_text_numeric wrapper to the exploit class
git-svn-id: file:///home/svn/framework3/trunk@5086 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-05 13:40:41 +00:00
HD Moore 448714ab7b Adds rand_text_numeric
git-svn-id: file:///home/svn/framework3/trunk@5085 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-05 13:39:45 +00:00
Matt Miller 23da91742e the tag used for find tag must be sent BEFORE the intermediate stage
git-svn-id: file:///home/svn/framework3/trunk@5084 4d416f70-5f16-0410-b530-b9f4589650da
2007-08-31 17:39:54 +00:00
Matt Miller 1ae7bef139 removed debug puts
git-svn-id: file:///home/svn/framework3/trunk@5082 4d416f70-5f16-0410-b530-b9f4589650da
2007-08-31 04:03:26 +00:00
Matt Miller f61cde59c4 initial support for context encoding
git-svn-id: file:///home/svn/framework3/trunk@5081 4d416f70-5f16-0410-b530-b9f4589650da
2007-08-31 04:01:30 +00:00
Matt Miller bf935736b6 fix flushing to account for suffix
git-svn-id: file:///home/svn/framework3/trunk@5078 4d416f70-5f16-0410-b530-b9f4589650da
2007-08-13 01:32:32 +00:00
Matt Miller 3f903a4e24 fix from spoonm
git-svn-id: file:///home/svn/framework3/trunk@5077 4d416f70-5f16-0410-b530-b9f4589650da
2007-08-11 07:09:13 +00:00
Matt Miller 7b65a56d65 initial support for metasm integration, ported sample payload to use it
git-svn-id: file:///home/svn/framework3/trunk@5076 4d416f70-5f16-0410-b530-b9f4589650da
2007-08-11 00:37:50 +00:00
Matt Miller 89d0e200f6 fix portfwd command not functioning properly
git-svn-id: file:///home/svn/framework3/trunk@5075 4d416f70-5f16-0410-b530-b9f4589650da
2007-08-10 23:54:26 +00:00
Matt Miller b698d99209 catch IOError that may be raised when closing a socket that is already closed, fixes #61
git-svn-id: file:///home/svn/framework3/trunk@5074 4d416f70-5f16-0410-b530-b9f4589650da
2007-08-10 23:09:00 +00:00
HD Moore dbf2df3ec4 Remove calls to reset_ui which break background exploit output
git-svn-id: file:///home/svn/framework3/trunk@5070 4d416f70-5f16-0410-b530-b9f4589650da
2007-08-08 04:30:11 +00:00
HD Moore bff51b5578 Typo fix
git-svn-id: file:///home/svn/framework3/trunk@5067 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-30 05:21:02 +00:00
Ramon de C Valle f60810d00c Added more advanced payload options and advanced payload options support for Solaris.
git-svn-id: file:///home/svn/framework3/trunk@5060 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-25 03:24:51 +00:00
HD Moore 4c650f865b It helps when the new hash is actually used...
git-svn-id: file:///home/svn/framework3/trunk@5055 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-17 19:01:04 +00:00
HD Moore 84370e82aa Force the port parameter to be an integer, since some db drivers expect this.
git-svn-id: file:///home/svn/framework3/trunk@5054 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-17 18:42:26 +00:00
HD Moore b21fb10f75 Fixes #120. Applies a one-line patch from egypt[at]nmt.edu
git-svn-id: file:///home/svn/framework3/trunk@5053 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-16 13:52:11 +00:00
HD Moore b4fab66d40 Fixes #128. Applying a one-line typo fix from antoine. Thanks!
git-svn-id: file:///home/svn/framework3/trunk@5052 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-16 13:43:52 +00:00
HD Moore 1f2791494b General cleanups, bug fixes, removal of debugging statements.
git-svn-id: file:///home/svn/framework3/trunk@5051 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-16 02:17:32 +00:00
HD Moore 2fd4bf1579 Adds support for array arguments to Rex::Arch.endian(). This solves a problem where some exploits choose the wrong unescape method.
git-svn-id: file:///home/svn/framework3/trunk@5050 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-16 01:23:17 +00:00
HD Moore 24aac8b5ae Fixes #127. Applying patch from Alex that solves ASN.1 encoding issues.
git-svn-id: file:///home/svn/framework3/trunk@5049 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-16 01:13:25 +00:00
Ramon de C Valle f3dd74cfc9 Added advanced payload options for *BSD, improved solaris targets of lsa_transnames_heap.rb, some code cleanups.
git-svn-id: file:///home/svn/framework3/trunk@5044 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-11 03:19:28 +00:00
fab 181135dd06 minor update
git-svn-id: file:///home/svn/framework3/trunk@5043 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-10 20:52:20 +00:00
HD Moore 240ad73d6a Added --rip mode to msfpescan :)
git-svn-id: file:///home/svn/framework3/trunk@5041 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-09 18:17:04 +00:00
HD Moore 37c0376d73 Add file names to the resource output
git-svn-id: file:///home/svn/framework3/trunk@5040 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-09 05:06:01 +00:00
HD Moore 9aa34702dd Fix a typo which prevented the set() method from working correctly.
git-svn-id: file:///home/svn/framework3/trunk@5036 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-07 03:12:42 +00:00
HD Moore 1f0cd480e5 This commit adds --info support to msfpescan
git-svn-id: file:///home/svn/framework3/trunk@5034 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-06 05:14:05 +00:00
Ramon de C Valle 99f806b0e9 Added OSX payloads advanced options and improved Samba exploit module.
git-svn-id: file:///home/svn/framework3/trunk@5033 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-06 01:22:54 +00:00
fab 6096c4347a shell and meterpreter console signals
git-svn-id: file:///home/svn/framework3/trunk@5029 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-04 21:23:30 +00:00
fab 883f33759b meterpreter console (shell)
git-svn-id: file:///home/svn/framework3/trunk@5027 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-03 23:01:50 +00:00
fab 49e63b95b5 commit for debug with skape
git-svn-id: file:///home/svn/framework3/trunk@5026 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-03 20:55:24 +00:00
HD Moore e4e674003d Correct the super() call in http's regenerate_payload()
git-svn-id: file:///home/svn/framework3/trunk@5025 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-03 13:40:45 +00:00
HD Moore 0c6d0e5941 This code IS in a mixin now, remove the old comment :)
git-svn-id: file:///home/svn/framework3/trunk@5024 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-03 04:39:58 +00:00
HD Moore 30bf0667d8 cosmetic
git-svn-id: file:///home/svn/framework3/trunk@5023 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-03 04:39:18 +00:00
HD Moore ddadf74a85 Fix a typo that could break regenerate_payload
git-svn-id: file:///home/svn/framework3/trunk@5022 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-03 04:38:56 +00:00
HD Moore a21ec0a73c Updating the php_include_url function to figure out the server address a little bit better.
git-svn-id: file:///home/svn/framework3/trunk@5019 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-03 04:26:28 +00:00
HD Moore e01ed7a606 Updated METASM hg directory
git-svn-id: file:///home/svn/framework3/trunk@5018 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-03 04:22:55 +00:00
HD Moore d0b15d3d72 Lots of SMB fun, all preparation for Black Hat talk :-) More to come...
git-svn-id: file:///home/svn/framework3/trunk@5015 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-03 04:20:50 +00:00
fab 9a8a3096b4 binding the meterpreter console
git-svn-id: file:///home/svn/framework3/trunk@5013 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-02 19:25:42 +00:00
fab 664b15237b Add a basic command history to MsfConsole (shell and meterpreter)
git-svn-id: file:///home/svn/framework3/trunk@5012 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-02 18:37:04 +00:00
fab 7ebcf6413a Add comments and cleanup
git-svn-id: file:///home/svn/framework3/trunk@5011 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-02 15:57:36 +00:00
HD Moore 4a204efaa1 Import the new METASM code
git-svn-id: file:///home/svn/framework3/trunk@5008 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-30 21:53:26 +00:00
Matt Miller 525319fbd1 default to no badchars
git-svn-id: file:///home/svn/framework3/trunk@5006 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-29 00:29:29 +00:00
fab 9fcc1d33f5 The method used by Gtk2::Console::Meterpreter is not the best way.
Use the meterpreter API instead.

git-svn-id: file:///home/svn/framework3/trunk@5005 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-27 21:41:44 +00:00
fab dda8877c62 Module category without any bindings are commented
git-svn-id: file:///home/svn/framework3/trunk@5002 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-26 21:24:16 +00:00
fab 577196c774 New console for shell and meterpreter session, with handler keys
git-svn-id: file:///home/svn/framework3/trunk@5001 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-26 21:09:30 +00:00
fab a57bbb0f69 improve the jobs stuff
git-svn-id: file:///home/svn/framework3/trunk@5000 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-24 19:48:09 +00:00
fab 23f9708c6d git-svn-id: file:///home/svn/framework3/trunk@4998 4d416f70-5f16-0410-b530-b9f4589650da 2007-06-20 21:02:31 +00:00
fab 8dd39cf0af cleanup code
git-svn-id: file:///home/svn/framework3/trunk@4997 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-20 19:41:10 +00:00
Matt Miller d33675d870 framework now properly handles using singles without handlers as both stages and singles, fixes #115
git-svn-id: file:///home/svn/framework3/trunk@4994 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-16 05:04:03 +00:00
Matt Miller 025c9cea99 don't set ENCODER if it isn't supplied, potentially fixes #119
git-svn-id: file:///home/svn/framework3/trunk@4992 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-16 02:33:38 +00:00
fab c6e0cc1890 update msfbrowser
git-svn-id: file:///home/svn/framework3/trunk@4990 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-10 11:36:34 +00:00
fab 047e571e96 update for msfbrowser
git-svn-id: file:///home/svn/framework3/trunk@4989 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-09 23:14:52 +00:00
fab 2f376aa266 update for msfbrowser
git-svn-id: file:///home/svn/framework3/trunk@4988 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-09 22:50:29 +00:00
fab c61e719049 correct bug in MsfAssistant
git-svn-id: file:///home/svn/framework3/trunk@4987 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-09 21:11:50 +00:00
fab f9b92a133e update msfbrowser
git-svn-id: file:///home/svn/framework3/trunk@4986 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-09 14:45:18 +00:00
HD Moore c45e9b957a This adds suppor for the LSA open policy call for dcerpc exploits
git-svn-id: file:///home/svn/framework3/trunk@4985 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-09 02:26:35 +00:00
HD Moore 40511cffb7 This adds a Linux-payload specific mixin which allows for new advanced options, such as setuid/chroot prepends.
git-svn-id: file:///home/svn/framework3/trunk@4984 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-09 02:25:31 +00:00
fab ec959415ff Add drag'n drop for MsfBrowser and big update
git-svn-id: file:///home/svn/framework3/trunk@4983 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-07 21:34:04 +00:00
fab 1630aa7900 Update for graphical meterpreter (cmd_ps)
git-svn-id: file:///home/svn/framework3/trunk@4981 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-02 20:33:40 +00:00
fab 6bb46ec862 minor update
git-svn-id: file:///home/svn/framework3/trunk@4980 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-02 20:10:24 +00:00
fab 74923be33e update for support auxiliary module with MsfAssistant
git-svn-id: file:///home/svn/framework3/trunk@4974 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-28 21:23:40 +00:00
fab a924532056 update for support auxiliary module with MsfAssistant
git-svn-id: file:///home/svn/framework3/trunk@4973 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-28 18:26:31 +00:00
fab cdffd7993f update for support auxiliary module with MsfAssistant
git-svn-id: file:///home/svn/framework3/trunk@4972 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-28 14:12:17 +00:00
fab df9e206633 update for support auxiliary module with MsfAssistant
git-svn-id: file:///home/svn/framework3/trunk@4971 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-28 13:20:19 +00:00
fab 59ba9f10bd MsfAssistant for auxiliary modules (not totaly supported)
git-svn-id: file:///home/svn/framework3/trunk@4969 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-28 01:16:34 +00:00
fab 659118a276 update MsfAssistant
git-svn-id: file:///home/svn/framework3/trunk@4968 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-28 00:05:39 +00:00
fab 4d76a4b391 add graphical OptPath and minor change
git-svn-id: file:///home/svn/framework3/trunk@4967 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-27 22:28:28 +00:00
fab 6b78c4575d update for MsfAssistant
git-svn-id: file:///home/svn/framework3/trunk@4966 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-26 22:21:40 +00:00
fab 01454f3ae6 new release for msfassistant
git-svn-id: file:///home/svn/framework3/trunk@4965 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-26 17:54:56 +00:00
fab 3c0289c3c0 split
git-svn-id: file:///home/svn/framework3/trunk@4958 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-21 22:39:24 +00:00
fab 972944376e new window for Display log
git-svn-id: file:///home/svn/framework3/trunk@4956 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-21 22:37:23 +00:00
HD Moore fadfd17b1e Removed the duplicate author entry
git-svn-id: file:///home/svn/framework3/trunk@4952 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-21 20:46:22 +00:00
fab 688ea5b2b9 grapical meterpreter (file browser)
git-svn-id: file:///home/svn/framework3/trunk@4945 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-19 23:35:51 +00:00
fab 9a85c26c98 add new class Warning
git-svn-id: file:///home/svn/framework3/trunk@4944 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-19 23:34:52 +00:00
fab 917c50e49d graphical meterpreter, only directories are browseable
add comments


git-svn-id: file:///home/svn/framework3/trunk@4943 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-19 22:42:27 +00:00
fab fc6b379cae bugs
git-svn-id: file:///home/svn/framework3/trunk@4942 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-19 22:31:21 +00:00
fab f943272d54 minor change
git-svn-id: file:///home/svn/framework3/trunk@4941 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-19 22:18:44 +00:00
fab ae01ba825b grapical meterpreter, ignore UTF8 errrors
git-svn-id: file:///home/svn/framework3/trunk@4940 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-19 21:09:40 +00:00
fab 83a49959d8 grapical meterpreter, browse inside selected folders ;-)
git-svn-id: file:///home/svn/framework3/trunk@4939 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-19 20:23:24 +00:00
fab 314f5c974c bugs, Thanks to Julien CAYSSOL
git-svn-id: file:///home/svn/framework3/trunk@4938 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-19 11:22:58 +00:00
fab da50eaad00 graphical meterpreter (stdapi/ps)
git-svn-id: file:///home/svn/framework3/trunk@4937 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-19 00:13:56 +00:00
fab 5f59d4370c graphical meterpreter ( beta version of file browser)
git-svn-id: file:///home/svn/framework3/trunk@4936 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-18 23:51:10 +00:00
fab 2d88b75871 graphical meterpreter (beta file browser)
git-svn-id: file:///home/svn/framework3/trunk@4935 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-18 22:37:27 +00:00
fab 92189cd4e4 graphical meterpreter ( beta version of file browser)
git-svn-id: file:///home/svn/framework3/trunk@4934 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-18 22:35:47 +00:00
fab dfc8bdd130 graphical meterpreter (migrate server to another process)
git-svn-id: file:///home/svn/framework3/trunk@4931 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-18 14:03:40 +00:00
fab 1097641cef graphical meterpreter (migrate server to another process)
git-svn-id: file:///home/svn/framework3/trunk@4930 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-18 12:20:42 +00:00
fab 46e47a1869 graphical meterpreter (kill process)
git-svn-id: file:///home/svn/framework3/trunk@4929 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-18 11:46:27 +00:00
fab 4a61db796b first implementation of graphical meterpreter client (stdapi/ps)
git-svn-id: file:///home/svn/framework3/trunk@4927 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-17 23:33:18 +00:00
fab 17407c7217 template for dialod based on treeview (listore or treestore)
git-svn-id: file:///home/svn/framework3/trunk@4926 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-17 23:32:04 +00:00
fab dea5fbf243 tips stuff
git-svn-id: file:///home/svn/framework3/trunk@4925 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-17 22:18:26 +00:00
fab a12f4a6031 tips for the session view, generate by the session.type
git-svn-id: file:///home/svn/framework3/trunk@4924 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-17 22:17:24 +00:00
fab 2cfb085f18 minor change (payload / session.type)
git-svn-id: file:///home/svn/framework3/trunk@4921 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-17 20:17:53 +00:00
fab f138e95e22 Detect session type and build the dynamic menu
git-svn-id: file:///home/svn/framework3/trunk@4918 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-17 20:08:21 +00:00
fab d6dd5a809f minor change
git-svn-id: file:///home/svn/framework3/trunk@4917 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-17 20:07:14 +00:00
HD Moore ddfe651bc8 This adds support for smb_pipeio=trans
git-svn-id: file:///home/svn/framework3/trunk@4915 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-15 16:48:15 +00:00
HD Moore 58a804e510 Small bug fix to allow pipeio on Novell
git-svn-id: file:///home/svn/framework3/trunk@4914 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-15 15:44:39 +00:00
pusscat 14332dcb0e Move my email from gmail to metasploit
git-svn-id: file:///home/svn/framework3/trunk@4911 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-14 21:00:46 +00:00
bmc 5e23a54296 * uhwtfms_half - half-width encoding ( http://www.kb.cert.org/vuls/id/739224 )
git-svn-id: file:///home/svn/framework3/trunk@4910 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-14 20:49:35 +00:00
fab 938e9bf5ad support save_config and many changes on MsfAssistant
git-svn-id: file:///home/svn/framework3/trunk@4909 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-13 19:46:26 +00:00
fab 36b6da19fd Support the load datastore feature
git-svn-id: file:///home/svn/framework3/trunk@4908 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-13 11:32:55 +00:00
fab 271f5e5fce organisation
git-svn-id: file:///home/svn/framework3/trunk@4907 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-13 09:10:26 +00:00
fab 9bcd9c0ef2 TreeviewTips style
git-svn-id: file:///home/svn/framework3/trunk@4906 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-13 09:09:57 +00:00
fab ac7bc331c6 bug, thanks to Julien CAYSSOL
git-svn-id: file:///home/svn/framework3/trunk@4905 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-12 16:52:38 +00:00
fab 9f9cae075d organisation
git-svn-id: file:///home/svn/framework3/trunk@4904 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-12 16:36:36 +00:00
fab 244abb6ae0 beautify code
git-svn-id: file:///home/svn/framework3/trunk@4903 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-12 16:10:22 +00:00
fab 018f069b0a beautify test
git-svn-id: file:///home/svn/framework3/trunk@4902 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-12 15:49:22 +00:00
fab 49d5cc272c validate datastore and source address completion
git-svn-id: file:///home/svn/framework3/trunk@4901 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-12 15:38:58 +00:00
fab dc40c7b68a launcher
git-svn-id: file:///home/svn/framework3/trunk@4900 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-12 15:37:12 +00:00
fab e9510ccea4 organisation
git-svn-id: file:///home/svn/framework3/trunk@4899 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-12 15:36:37 +00:00
fab 27d3320712 typo
git-svn-id: file:///home/svn/framework3/trunk@4898 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-12 15:35:29 +00:00
HD Moore e8c5c53e4b This adds pass-the-hash support from grutz.
git-svn-id: file:///home/svn/framework3/trunk@4890 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-09 12:39:29 +00:00
fab f92b7dd466 add review page to Msf::Assistant
git-svn-id: file:///home/svn/framework3/trunk@4889 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-07 23:19:45 +00:00
fab f19af7698e add Gtk.tooltips style and minor change
git-svn-id: file:///home/svn/framework3/trunk@4888 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-07 22:35:45 +00:00