Commit Graph

3300 Commits (734dd76e22c35eaf55e018873b7e56b84ba1fd3e)

Author SHA1 Message Date
Carlos Perez d279123b77 Added functions for managing services in the railgun api and created new calls to use this functions for starting, stopping and creating services, Thanks to Scriptjunkie for the calls and example code that I used to base the mixin calls on
git-svn-id: file:///home/svn/framework3/trunk@9920 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-25 01:32:50 +00:00
James Lee 9a583b9e09 fix encoding. =/
git-svn-id: file:///home/svn/framework3/trunk@9918 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-24 01:04:58 +00:00
James Lee 3ae1a26aef include a bunch more firefox fingerprints. thanks Mark Fioravanti for the patch
git-svn-id: file:///home/svn/framework3/trunk@9917 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-23 22:20:05 +00:00
James Lee e957a7a90e add support for doing everything msfpayload does into msfconsole and xmlrpc, fixes #589. Thanks, Ryan Linn for the patch
git-svn-id: file:///home/svn/framework3/trunk@9914 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-23 20:22:36 +00:00
Joshua Drake fbc4be6af4 support outputing selected columns instead of just address
git-svn-id: file:///home/svn/framework3/trunk@9913 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-22 16:53:11 +00:00
Joshua Drake 6e34bc5420 further clean up exception handling / session waiting for exploits
git-svn-id: file:///home/svn/framework3/trunk@9910 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 23:25:20 +00:00
Joshua Drake 25bc9f2973 add error printing for HttpServer exploits
git-svn-id: file:///home/svn/framework3/trunk@9909 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 23:24:51 +00:00
James Lee fed1e88b7d missed a file
git-svn-id: file:///home/svn/framework3/trunk@9908 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 22:37:49 +00:00
James Lee 671d243aaa put the stop command in core instead of base and default the extra argument to nil. this should allow a cleaner exit without breaking existing code (i hope). see #2247 (again) and also fixes #1010
git-svn-id: file:///home/svn/framework3/trunk@9907 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 22:37:26 +00:00
Joshua Drake a5d179311f fix session creation, *facepalm*
git-svn-id: file:///home/svn/framework3/trunk@9904 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 15:14:54 +00:00
James Lee b8b5d0586d generate job info from available properties in rpc. fixes #2236
git-svn-id: file:///home/svn/framework3/trunk@9902 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 08:57:11 +00:00
Joshua Drake 8c5f10006f style compliance fixes
git-svn-id: file:///home/svn/framework3/trunk@9899 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 06:03:42 +00:00
Joshua Drake 0d8e98a519 handle validation errors more gracefully, check job_id, fixes #2279
git-svn-id: file:///home/svn/framework3/trunk@9898 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 00:50:25 +00:00
Joshua Drake 276a83d7b4 allow specifing which code to use for the exe
git-svn-id: file:///home/svn/framework3/trunk@9895 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 00:01:45 +00:00
James Lee 45c869d015 revert the rpc.stop patch as it breaks other rpc stuff. i'll have a better fix for this later today.
git-svn-id: file:///home/svn/framework3/trunk@9890 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 20:36:09 +00:00
James Lee 88c6bf13dd apply patch from scriptjunkie to stop the xmlrpc daemon. fixes #2247
git-svn-id: file:///home/svn/framework3/trunk@9887 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 19:12:09 +00:00
James Lee 08d705c1db add java meterpreter and update java_calendar_deserialize to be able to use it, see #406
git-svn-id: file:///home/svn/framework3/trunk@9874 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 00:53:24 +00:00
Joshua Drake 33b479e696 adjust https handler status message
git-svn-id: file:///home/svn/framework3/trunk@9872 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 00:17:58 +00:00
HD Moore 7963d65f28 Only allow a single instance of a generated DLL to execute (prevent duplicate sessions, like with LNK)
git-svn-id: file:///home/svn/framework3/trunk@9871 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-19 23:24:57 +00:00
HD Moore f87b7bc59e Fix up the DLL payloads
git-svn-id: file:///home/svn/framework3/trunk@9868 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-19 22:13:34 +00:00
Tod Beardsley 23fd327f30 Fixes the VulnerabilityListing class in the NeXpose API.
git-svn-id: file:///home/svn/framework3/trunk@9860 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-19 18:14:23 +00:00
Jonathan Cran d363efd883 slight changes to the vmware controller
git-svn-id: file:///home/svn/framework3/trunk@9850 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 22:19:38 +00:00
Jonathan Cran b6d506f078 centralize lab requires
git-svn-id: file:///home/svn/framework3/trunk@9849 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 22:19:17 +00:00
James Lee bcb62247dd explicitly clear a module's job_id in case it was set in a previous run. Fixes #2267
git-svn-id: file:///home/svn/framework3/trunk@9847 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 21:47:00 +00:00
Joshua Drake 63595d1ce2 update exception handling to bail on RuntimeError or Interrupt, but wait otherwise.
git-svn-id: file:///home/svn/framework3/trunk@9845 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 19:58:41 +00:00
HD Moore d9402edde3 Handle cases where the exploit succeeds but then throws an exception, printing the "exploit failed" message. Closes #2260
git-svn-id: file:///home/svn/framework3/trunk@9840 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-15 21:28:21 +00:00
James Lee 9f5042c8ac add the uripath back into the output of 'jobs -v'
git-svn-id: file:///home/svn/framework3/trunk@9835 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-15 03:27:02 +00:00
Tod Beardsley 3c199b0364 Fixes #824. PcapLog now works, and doesn't use racket nor packetfu -- just straight pcaprub, since I'm not doing anything exciting with them aside from saving to a file.
Also, it's a proper plugin now, not just a singleton, with a command dispather and everything.

Pretty much totoally rewritten. Since it hasn't worked for at least 5 months, I doubt anyone will be shocked by the API change.



git-svn-id: file:///home/svn/framework3/trunk@9834 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 20:38:19 +00:00
HD Moore ac69cf72bb Clone the module_store while we are at it
git-svn-id: file:///home/svn/framework3/trunk@9832 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 20:18:39 +00:00
HD Moore 97d3c9da8b This may solve both of the scanner/bap cases for module cloning
git-svn-id: file:///home/svn/framework3/trunk@9831 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 20:16:22 +00:00
HD Moore 6b25b1024e Always try to read the NB header first to get the length
git-svn-id: file:///home/svn/framework3/trunk@9826 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 17:07:10 +00:00
HD Moore 7710528432 Duplicate the report info string
git-svn-id: file:///home/svn/framework3/trunk@9825 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 17:06:44 +00:00
HD Moore 5c2f104ade Fix module.replicant(), closes #2252
git-svn-id: file:///home/svn/framework3/trunk@9824 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 17:06:12 +00:00
HD Moore ff204324e0 Do not fall through to YAML
git-svn-id: file:///home/svn/framework3/trunk@9823 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 17:05:47 +00:00
Joshua Drake 4b44fdb8c2 adds ftp data functionality from Thomas Ring, after some modifications
git-svn-id: file:///home/svn/framework3/trunk@9821 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 14:04:27 +00:00
Stephen Fewer c78b87a356 Add support for the ring0 stager_sysenter_hook payload to run its ring3 payload in a new thread in order to preserve/resume the original hijacked ring3 thread.
git-svn-id: file:///home/svn/framework3/trunk@9819 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 13:43:17 +00:00
Tod Beardsley c19e533ec9 Don't call it a success if AIX complains about all upcase logins.
git-svn-id: file:///home/svn/framework3/trunk@9813 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 22:30:45 +00:00
HD Moore e765553d26 Fix BufferItem references
git-svn-id: file:///home/svn/framework3/trunk@9811 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 19:34:32 +00:00
HD Moore 9d859e4dce Implements the client side of multi-call railgun
git-svn-id: file:///home/svn/framework3/trunk@9807 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 19:19:36 +00:00
Tod Beardsley e67e231659 Adds Rex::Text.to_hex_ascii(), replaces the gsub on the banner checks to use it.
git-svn-id: file:///home/svn/framework3/trunk@9804 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 18:52:27 +00:00
James Lee 301d220c80 get rid of debugging alerts. wtf
git-svn-id: file:///home/svn/framework3/trunk@9800 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 07:58:50 +00:00
HD Moore 16851f56c9 Swizzle.
git-svn-id: file:///home/svn/framework3/trunk@9796 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 21:51:11 +00:00
HD Moore a430970ddd Wrap the write() calls to catch exceptions from the socket api
git-svn-id: file:///home/svn/framework3/trunk@9794 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 17:55:20 +00:00
Jonathan Cran e5d6214bf5 refactored lab libraries - now with more object orientation.
git-svn-id: file:///home/svn/framework3/trunk@9793 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 15:00:45 +00:00
James Lee 5b3fa182ba Switch back to dev mode
git-svn-id: file:///home/svn/framework3/trunk@9791 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 07:25:30 +00:00
HD Moore 37f4783d55 Adds -u to the connect command
git-svn-id: file:///home/svn/framework3/trunk@9788 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 03:15:45 +00:00
James Lee 1dd2dd2315 add java as a regular platform
git-svn-id: file:///home/svn/framework3/trunk@9782 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-11 19:46:55 +00:00
HD Moore cc963785fc Bump to -release, final should be cut soon
git-svn-id: file:///home/svn/framework3/trunk@9763 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-10 15:18:34 +00:00
HD Moore 16134447d9 Cleanup / cosmetic for dcerpc, make EBADF pretend to be EOFError in terms of what exception is raised
git-svn-id: file:///home/svn/framework3/trunk@9752 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 19:05:16 +00:00
HD Moore 42f8dc10c0 Change the timeout from 0
git-svn-id: file:///home/svn/framework3/trunk@9750 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 18:03:48 +00:00
HD Moore adf33feb0e Catch an odd corner case with zero timeouts - this broke dcerpc over tcp
git-svn-id: file:///home/svn/framework3/trunk@9749 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 17:58:59 +00:00
HD Moore 2d65cb602b Fix boolean handling
git-svn-id: file:///home/svn/framework3/trunk@9747 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 16:34:18 +00:00
Joshua Drake 573fc216dd add write support, tftproot, output dir for tftp server
git-svn-id: file:///home/svn/framework3/trunk@9742 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-08 23:34:29 +00:00
Carlos Perez e0d9c41b5f did not write info when file did not exists, problem fixed
git-svn-id: file:///home/svn/framework3/trunk@9739 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-08 20:28:56 +00:00
Jonathan Cran 978c0f30e3 updated get_vmx to handle the structure passed by the control shells. For instance: @lab['metasploitable'] = {"vmx" => "msf_lab/user/Metasploitable/Metasploitable.vmx", "user" => "user", "pass" => "user", "os" => "linux" }
git-svn-id: file:///home/svn/framework3/trunk@9737 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-08 19:13:20 +00:00
HD Moore a4c6280ae0 Minor cleanups for railgun, fix 1.8/1.9 differences, remove use of string encoding routines for 1.8 back-compat
git-svn-id: file:///home/svn/framework3/trunk@9736 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-08 18:53:49 +00:00
James Lee 4b1286522d version bump for beta release
git-svn-id: file:///home/svn/framework3/trunk@9731 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 23:15:03 +00:00
Jonathan Cran 2d0e49ca6f adding in tod's patch (http://www.0x0e.org/x/msf/vmware_lab_diff.tod.20100707) - adds neat functionality like being able to create a lab on the fly or from a set of files on disk.
git-svn-id: file:///home/svn/framework3/trunk@9730 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 22:56:26 +00:00
Joshua Drake 3049d527ef there is no comm variable here, fixes #2200
git-svn-id: file:///home/svn/framework3/trunk@9728 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 20:49:49 +00:00
Joshua Drake 2de94b910b more specificity
git-svn-id: file:///home/svn/framework3/trunk@9725 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 18:25:04 +00:00
Joshua Drake 08a75a0c8e make shell_read_until_token more agressive
git-svn-id: file:///home/svn/framework3/trunk@9724 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 18:18:55 +00:00
HD Moore c0aca105de closes #2205. This is actually part of the bigger datastore bug
git-svn-id: file:///home/svn/framework3/trunk@9722 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 18:14:51 +00:00
James Lee 49955d2ca0 check for fileness instead of just existence, fixes #2204
git-svn-id: file:///home/svn/framework3/trunk@9720 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 17:42:18 +00:00
Joshua Drake 3aa3a642ac move fingerprint verification to mixin
git-svn-id: file:///home/svn/framework3/trunk@9717 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 17:36:33 +00:00
James Lee 2c5336dabb attach job_id to the exploit, not just the driver; regenerate the uuid when replicating a module; generate the payload after copying the exploit module for a new job; fixes #2203, see #2098 and #2096
git-svn-id: file:///home/svn/framework3/trunk@9714 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 16:37:23 +00:00
HD Moore 9915be8935 Add the railgun client extensions
git-svn-id: file:///home/svn/framework3/trunk@9712 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 16:31:24 +00:00
Tod Beardsley 01c1d1d6df Makes sure that Qualys reports only try to report sensible data -- fixes DB complaints about null in non-null contrained columns.
git-svn-id: file:///home/svn/framework3/trunk@9707 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 14:53:16 +00:00
Tod Beardsley dffd8c0c97 Deal with marshaled data for msfx imports.
git-svn-id: file:///home/svn/framework3/trunk@9699 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 00:28:34 +00:00
HD Moore 843b6ffa00 Make the http client try harder
git-svn-id: file:///home/svn/framework3/trunk@9698 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 23:08:28 +00:00
Joshua Drake ce44b02a35 avoid returning nil info, try to look it up
git-svn-id: file:///home/svn/framework3/trunk@9693 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 21:53:24 +00:00
James Lee 8898e2de8f go back to copying the module for jobs. 'exploit -j' appears to work with the current changes. fixes #2096 and #2098 (for real this time)
git-svn-id: file:///home/svn/framework3/trunk@9692 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 21:09:53 +00:00
HD Moore d5e9453a9c Allow yaml for v1/v2, not for v3, tested
git-svn-id: file:///home/svn/framework3/trunk@9691 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 19:33:27 +00:00
HD Moore 812d715c35 Validate base64 before demarshal
git-svn-id: file:///home/svn/framework3/trunk@9690 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:40:19 +00:00
HD Moore ef3dbf3841 Workaround for Ruby 1.8's fragile Marshal code
git-svn-id: file:///home/svn/framework3/trunk@9689 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:35:49 +00:00
Joshua Drake 7384dec65e add virtual columns back per egyp7 request, see #2055
git-svn-id: file:///home/svn/framework3/trunk@9688 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:18:26 +00:00
Jonathan Cran 2786427113 adding initial version of the lab controller - note that this will be updated to use vixr soon
git-svn-id: file:///home/svn/framework3/trunk@9687 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:18:06 +00:00
HD Moore 8f967af2f3 Dont fallback to yaml for service.info, its either base64 or a string
git-svn-id: file:///home/svn/framework3/trunk@9686 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:17:14 +00:00
Joshua Drake 7c9e39ab1d make db_hosts -c conform to the -h text, fixes #2055
git-svn-id: file:///home/svn/framework3/trunk@9685 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:05:41 +00:00
James Lee 618b377d58 let's try this again. don't convert datastore values to strings when copying, only dup things that are already Strings, see #2189, #2098, #2096
git-svn-id: file:///home/svn/framework3/trunk@9684 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 17:59:36 +00:00
James Lee 5df5991d95 revert r9651, fixes #2189. Clearly there is more going on when copying a datastore object
git-svn-id: file:///home/svn/framework3/trunk@9683 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 17:26:06 +00:00
Joshua Drake 24fbbfb906 use fat_offset, from Dino, fixes #2183
git-svn-id: file:///home/svn/framework3/trunk@9682 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 17:16:35 +00:00
HD Moore 7847a645cd Remove the 'delete'
git-svn-id: file:///home/svn/framework3/trunk@9681 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 16:44:04 +00:00
HD Moore fbdf5dca3c Try the three-way fallback for serialized fields (service.info and note.data)
git-svn-id: file:///home/svn/framework3/trunk@9680 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 16:33:27 +00:00
HD Moore a482f66cb9 Serialize service.info, handle all 3 forms of possible serialized data (marshal, yaml, and string)
git-svn-id: file:///home/svn/framework3/trunk@9679 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 16:20:04 +00:00
HD Moore 0d40a69f16 Dont mangle the service.info field this way
git-svn-id: file:///home/svn/framework3/trunk@9678 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 16:10:05 +00:00
HD Moore 5cff86cc1e Use the module-defined workspace if specified
git-svn-id: file:///home/svn/framework3/trunk@9676 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 15:43:22 +00:00
HD Moore f3afedf490 Fix an issue caused by pad_data being a string not an integer, this caused the evasion code to return a nil. Fixed a couple of ambiguities in how options are passed
git-svn-id: file:///home/svn/framework3/trunk@9674 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-05 13:38:39 +00:00
James Lee 21b3be4f53 fix the payload display in jobs -v
git-svn-id: file:///home/svn/framework3/trunk@9673 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-04 23:40:11 +00:00
Tod Beardsley 2250a83913 Updates meterpreter autoroute to accept CIDR notation.
git-svn-id: file:///home/svn/framework3/trunk@9667 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-03 01:27:24 +00:00
Tod Beardsley 6a20b8f5f5 Fixing a typing error for banner timeouts on telnet.
git-svn-id: file:///home/svn/framework3/trunk@9665 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 21:33:38 +00:00
Tod Beardsley fb273e83a9 Updates autoroute to enforce sensible netmasks. This is serious business.
git-svn-id: file:///home/svn/framework3/trunk@9664 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 18:42:56 +00:00
Tod Beardsley 01139ed655 Adding an autoroute meterpreter script, and enabling route housekeeping to be stored and retrived via Sessions directly, rather than through Rex::Socket::SwitchBoard.
git-svn-id: file:///home/svn/framework3/trunk@9663 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 17:38:56 +00:00
James Lee 07ef50e4e1 don't copy modules for jobs. fixes 'exploit -j' which was unable to create sessions, but reopens #2096 and #2098
git-svn-id: file:///home/svn/framework3/trunk@9662 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 02:46:07 +00:00
James Lee 1c9059eeb1 standardize job context as an Array and always copy datastore for jobs. fixes #2096 and fixes #2098
git-svn-id: file:///home/svn/framework3/trunk@9652 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 22:02:46 +00:00
James Lee 37da4be3e4 do a deep copy of the datastore when replicating a module
git-svn-id: file:///home/svn/framework3/trunk@9651 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 21:57:24 +00:00
James Lee c0eaed263c abstract some copy-paste; add DataStore#copy for doing a deep copy instead of the shallow copy performed by #dup and #clone
git-svn-id: file:///home/svn/framework3/trunk@9650 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 21:56:38 +00:00
James Lee f1c7fc79de remove to_s methods that reference a non-existent attribute. fixes .inspect on instances of Opt*. I have no idea how this bug never showed up before
git-svn-id: file:///home/svn/framework3/trunk@9649 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 21:52:30 +00:00
HD Moore 864fcafb4a See #2167. This should make all platforms equal now in terms of how read selects are handled. It looks like OS X needs the same workaround as Windows
git-svn-id: file:///home/svn/framework3/trunk@9641 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 14:49:49 +00:00
Tod Beardsley 03918eeeda Adds an explicit function for import file validation acceptability.
git-svn-id: file:///home/svn/framework3/trunk@9636 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-30 15:28:49 +00:00
Tod Beardsley 7e247e2f29 db migration to convert services info from varchar(65535) to text, and save info as a yaml'ed form in order to preserve funny characters.
git-svn-id: file:///home/svn/framework3/trunk@9633 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-28 22:42:50 +00:00
HD Moore aecb6cd43f Prevent a loop condition noted by commonism
git-svn-id: file:///home/svn/framework3/trunk@9631 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-28 14:40:11 +00:00
James Lee d488f133cf log the number of modules db_autopwn will try
git-svn-id: file:///home/svn/framework3/trunk@9628 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 22:32:39 +00:00
James Lee d4c558b0d0 use the calculated address for :target_host since session.target_host is nil for client exploits
git-svn-id: file:///home/svn/framework3/trunk@9625 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 18:33:41 +00:00
James Lee 96cd7bddae compatibility for 1.9. fixes #2143
git-svn-id: file:///home/svn/framework3/trunk@9622 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 05:52:05 +00:00
Mike Smith 63a563c20b Add disclosure_date method
git-svn-id: file:///home/svn/framework3/trunk@9619 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 04:21:23 +00:00
James Lee 83d3e3cbac 1.9 fixes, see 2143
git-svn-id: file:///home/svn/framework3/trunk@9618 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 04:03:58 +00:00
James Lee 01702e8506 don't rescue IOError.
git-svn-id: file:///home/svn/framework3/trunk@9616 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 00:31:00 +00:00
James Lee 6e01b03767 IO.select has different behavior when a socket is closed, go back to Rex::ThreadSafe.select; fixes portfwd
git-svn-id: file:///home/svn/framework3/trunk@9615 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 00:28:49 +00:00
Joshua Drake f0a4812644 add special encoder for piranha_passwd_exec vuln (rh62)
git-svn-id: file:///home/svn/framework3/trunk@9613 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 22:36:51 +00:00
Tod Beardsley b3e5fec174 Fixing misplaced puts from r9606
git-svn-id: file:///home/svn/framework3/trunk@9612 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 20:34:36 +00:00
Tod Beardsley 32fa35d53f Undoing r9607.
git-svn-id: file:///home/svn/framework3/trunk@9610 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 16:44:09 +00:00
Tod Beardsley 6280c51382 Adding Java to the platform list (mainly so module_ports.rb will work again)
git-svn-id: file:///home/svn/framework3/trunk@9607 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 14:17:09 +00:00
Joshua Drake 19d6ee5edf add compat for KEXDH_GEX_REQUEST_OLD
git-svn-id: file:///home/svn/framework3/trunk@9606 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 06:24:43 +00:00
HD Moore 9c0bcb4bad Add timeouts to the retry category, helps with the nexpose instance is heavily loaded
git-svn-id: file:///home/svn/framework3/trunk@9604 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 03:43:32 +00:00
Tod Beardsley 5f9680d902 Fixes #2133. This seems to handle many keyfiles pretty well, even if they're concatenated together. Calling it closed.
git-svn-id: file:///home/svn/framework3/trunk@9602 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 01:00:08 +00:00
Carlos Perez ec0e8aba30 Cosmetic changes, renamed mixin function and now all scripts that generate logs they are saved to .msf3/logs/scripts
git-svn-id: file:///home/svn/framework3/trunk@9588 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-23 00:50:14 +00:00
Tod Beardsley 4953b3b69f If the :fix_services option is used for nmap, actually fix the services, and in addition, skip hosts which only present filtered ports.
git-svn-id: file:///home/svn/framework3/trunk@9585 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 22:37:14 +00:00
Tod Beardsley 3591143f3a When importing MSFX data, just report unique collateral once.
git-svn-id: file:///home/svn/framework3/trunk@9584 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 20:30:43 +00:00
Joshua Drake 171543624a fix typos
git-svn-id: file:///home/svn/framework3/trunk@9581 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 16:11:02 +00:00
James Lee 3f7dbaaaac check the database for a previous fingerprint before going out to the network
git-svn-id: file:///home/svn/framework3/trunk@9580 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 06:30:48 +00:00
James Lee f14b3221ca move http version reporting into the HttpClient mixin
git-svn-id: file:///home/svn/framework3/trunk@9579 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 01:39:43 +00:00
James Lee ef5c0f77eb move copy-paste into a mixin
git-svn-id: file:///home/svn/framework3/trunk@9576 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 00:46:52 +00:00
James Lee 83962cb24a be explicit about returning false when we couldn't find a vncviewer
git-svn-id: file:///home/svn/framework3/trunk@9573 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 00:09:50 +00:00
Joshua Drake 2c91164494 allow x64 payloads to be used with psexec
git-svn-id: file:///home/svn/framework3/trunk@9565 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-21 03:49:39 +00:00
Tod Beardsley 613f288226 Fix up ssh_login_pubkey's session management for more effective session reuse.
git-svn-id: file:///home/svn/framework3/trunk@9563 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-19 15:03:27 +00:00
James Lee 161ae211c4 add a capabilities hash to the meterpreter client for determining whether libs are available on the server. eventually there should be a way to request this from the server directly instead of inferring it from platform
git-svn-id: file:///home/svn/framework3/trunk@9561 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-18 23:15:48 +00:00
Joshua Drake 025cfa9286 break to_war out from to_jsp_war
git-svn-id: file:///home/svn/framework3/trunk@9559 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-18 21:54:33 +00:00
Joshua Drake 20dd7ca26b make 100% line up correctly
git-svn-id: file:///home/svn/framework3/trunk@9554 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-18 03:37:23 +00:00
Tod Beardsley 50c59a9ab1 Skip nmap port imports where the result is unknown and the target is really localhost.
git-svn-id: file:///home/svn/framework3/trunk@9553 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-18 03:03:11 +00:00
James Lee ebe48096f3 put the original suspend handler back, even if it was nil. fixes 2102
git-svn-id: file:///home/svn/framework3/trunk@9547 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-16 22:41:53 +00:00
James Lee 3e38aa9cd4 put the old sigint handler back, fixes #2103
git-svn-id: file:///home/svn/framework3/trunk@9546 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-16 21:57:46 +00:00
James Lee b35baa39f7 allow PHPInclude modules to run automatically
git-svn-id: file:///home/svn/framework3/trunk@9545 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-16 21:16:15 +00:00
Tod Beardsley 3d98f22ef4 Un-private-ing :range
git-svn-id: file:///home/svn/framework3/trunk@9537 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-16 19:12:31 +00:00
Tod Beardsley 9924a8d40e Incorporates a service name map that makes nmap scanning a little more useful for MSFX out of the gate.
git-svn-id: file:///home/svn/framework3/trunk@9536 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-16 18:22:42 +00:00
Tod Beardsley cb69b0c134 Fixes #2101. Introduces a proper :skip_user, and adds better comment docs to auth_brute to describe the intended use of each return code.
git-svn-id: file:///home/svn/framework3/trunk@9529 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-15 19:10:15 +00:00
Carlos Perez f4670b26d0 sessions -s was passing unnecesary arguments to scripts, fixeed conflict for scripts that use the -s option
git-svn-id: file:///home/svn/framework3/trunk@9508 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-13 01:25:18 +00:00
Tod Beardsley 1b5e35b059 Fixes #2089. Getting rid of zip_requires() in favor of always loading Zip, Dirtmp, and FileUtils.
git-svn-id: file:///home/svn/framework3/trunk@9496 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 21:21:59 +00:00
Tod Beardsley d4e6e75f7d Handle loot, tasks, and report times that come from a MSFX ZIP report.
git-svn-id: file:///home/svn/framework3/trunk@9493 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 18:56:16 +00:00
James Lee f6901861fa allow host specifications like 'range, range' e.g. '10.1.1.0/24, 10.2.2.1'. Note that the space is required
git-svn-id: file:///home/svn/framework3/trunk@9489 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 17:20:14 +00:00
Joshua Drake e32abab8dc a HTTP -> an HTTP (http://www.english-zone.com/grammar/a-anlessn.html)
git-svn-id: file:///home/svn/framework3/trunk@9488 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 16:12:05 +00:00
James Lee 6fc84364b5 make PlatformList a little more like an Array
git-svn-id: file:///home/svn/framework3/trunk@9479 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 05:20:40 +00:00
Tod Beardsley 6f37ea2aeb Adding a 3rd party zip library (rubyzip by Thomas Sondergaard and Technorama Ltd, released under the Ruby license), and a method to import ZIP reports generated by Metasploit Express (still needs work, but is mildly functional right now).
git-svn-id: file:///home/svn/framework3/trunk@9478 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-10 21:06:06 +00:00
Tod Beardsley ec439354b0 Dropping the summary info. It's often incorrect.
git-svn-id: file:///home/svn/framework3/trunk@9469 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-10 13:24:43 +00:00
HD Moore ef372a9d78 Adds the db_sync command
git-svn-id: file:///home/svn/framework3/trunk@9466 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-09 21:47:57 +00:00
James Lee 4f2c63dae7 add templates for creating linux armle ELFs, thanks Civ
git-svn-id: file:///home/svn/framework3/trunk@9455 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-09 07:20:21 +00:00
Tod Beardsley d4e1da2fc9 Fixes amap log importing, hopefully once and for all.
git-svn-id: file:///home/svn/framework3/trunk@9454 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-08 22:14:25 +00:00
Tod Beardsley 38674cf62f Implements callbacks for importing data from vulnerability scanners.
git-svn-id: file:///home/svn/framework3/trunk@9452 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-08 19:16:20 +00:00
Tod Beardsley dd71e4ac58 Fixes #2034. Adds the SINGLE_SESSION option, adds an ftp_quit method to handle sending QUIT and disconnecting.
git-svn-id: file:///home/svn/framework3/trunk@9451 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-08 16:30:03 +00:00
James Lee 32c24b944a actually increment the loop variable; document the deficiencies of the employed technique
git-svn-id: file:///home/svn/framework3/trunk@9449 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-07 23:56:35 +00:00
James Lee 7044c65f22 make sure we have a newline in a chunk length before parsing it, tighten up the regex. fixes 2063 (I hope)
git-svn-id: file:///home/svn/framework3/trunk@9448 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-07 23:43:32 +00:00