1
mirror of https://github.com/rapid7/metasploit-framework synced 2024-11-12 11:52:01 +01:00
Commit Graph

6881 Commits

Author SHA1 Message Date
Joshua Drake
a018149278 check fingerprint first
git-svn-id: file:///home/svn/framework3/trunk@9701 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 01:33:03 +00:00
Joshua Drake
81cce81969 convert modules to HttpClient, use http_fingerprint
git-svn-id: file:///home/svn/framework3/trunk@9700 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 01:22:26 +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
ac267c5856 minor tweaks
git-svn-id: file:///home/svn/framework3/trunk@9697 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 22:15:16 +00:00
Joshua Drake
8c0e5fdf73 fix references, whitespace
git-svn-id: file:///home/svn/framework3/trunk@9696 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 21:59:16 +00:00
Joshua Drake
e5bf3301fb note ORD recommendation
git-svn-id: file:///home/svn/framework3/trunk@9695 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 21:58:57 +00:00
Joshua Drake
11bb8dee28 convert to httpclient module, use fingerprint
git-svn-id: file:///home/svn/framework3/trunk@9694 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 21:54:58 +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
Tod Beardsley
6c0c3c25ee Fixes #2191. Reports closed ports, and also alters the print_status messages to be consistent with other scan modules.
git-svn-id: file:///home/svn/framework3/trunk@9677 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 15:53: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
1ab0237591 Adds a pivot friendly version of the sweeper
git-svn-id: file:///home/svn/framework3/trunk@9675 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 14:56:36 +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
Mario Ceballos
348a03b4f9 add meterpreter script for panda av 2007
git-svn-id: file:///home/svn/framework3/trunk@9672 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-03 16:52:20 +00:00
Joshua Drake
a3d901a6b9 various minor fixes, some added fingerprinting
git-svn-id: file:///home/svn/framework3/trunk@9671 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-03 06:21:31 +00:00
Joshua Drake
c7f5ba801c add lots of disclosure dates from OSVDB (missed a few)
git-svn-id: file:///home/svn/framework3/trunk@9670 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-03 03:19:07 +00:00
Joshua Drake
7d945ed9dc add lots of disclosure dates from OSVDB
git-svn-id: file:///home/svn/framework3/trunk@9669 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-03 03:13:45 +00:00
Joshua Drake
56ea22716e oops, broke the tree
git-svn-id: file:///home/svn/framework3/trunk@9668 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-03 01:38:15 +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
Joshua Drake
9984b662e0 switch some URL references to US-CERT-VU type
git-svn-id: file:///home/svn/framework3/trunk@9666 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-03 01:09:32 +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
8ba9d6254a prioritize the base64 encoder over chr()
git-svn-id: file:///home/svn/framework3/trunk@9661 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 01:53:35 +00:00
Carlos Perez
5a73fb5cee set id
git-svn-id: file:///home/svn/framework3/trunk@9660 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 00:18:00 +00:00
Joshua Drake
f6f954a18c add missing CVE/OSVDB references, plenty still missing *wink wink*
git-svn-id: file:///home/svn/framework3/trunk@9659 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 00:10:51 +00:00
Carlos Perez
9abea21a96 Meterpreter script to enumerare Powershell snap-ins and settings
git-svn-id: file:///home/svn/framework3/trunk@9658 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 00:10:45 +00:00
Carlos Perez
684f604448 small fix
git-svn-id: file:///home/svn/framework3/trunk@9657 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 23:50:47 +00:00
Joshua Drake
310b548b67 indent-fu
git-svn-id: file:///home/svn/framework3/trunk@9656 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 23:48:55 +00:00
Joshua Drake
2f5970e30b set keywords property
git-svn-id: file:///home/svn/framework3/trunk@9655 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 23:46:05 +00:00
Joshua Drake
97b016cb70 missed one binary mode change
git-svn-id: file:///home/svn/framework3/trunk@9654 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 23:45:49 +00:00
Joshua Drake
0882838491 ensure binary mode when opening files, whitespace fixes
git-svn-id: file:///home/svn/framework3/trunk@9653 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 23:33: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