James Lee
5aaa7bb3de
fix a latent bug where multiple hosts could be reported with the same info and make report_vuln() work
...
git-svn-id: file:///home/svn/framework3/trunk@8050 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-01 00:19:15 +00:00
HD Moore
98f83bbab1
Adds reg queryclass
...
git-svn-id: file:///home/svn/framework3/trunk@8046 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-31 15:52:30 +00:00
Mike Smith
de55508a03
fix 'db_workspace -a'
...
git-svn-id: file:///home/svn/framework3/trunk@8043 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-31 01:51:12 +00:00
James Lee
90b2b4c77c
fix the db_add* and db_del* commands, make note output readable on 1.8
...
git-svn-id: file:///home/svn/framework3/trunk@8042 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-31 01:27:04 +00:00
James Lee
3bc1f935fa
fix amap mlog import
...
git-svn-id: file:///home/svn/framework3/trunk@8041 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-31 01:11:53 +00:00
James Lee
7fc5ada4c6
fix nessus nbe parsing
...
git-svn-id: file:///home/svn/framework3/trunk@8040 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 23:49:29 +00:00
James Lee
56c2b54369
remove a debug print
...
git-svn-id: file:///home/svn/framework3/trunk@8039 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 23:31:18 +00:00
Joshua Drake
2283e029db
crossing fingers, big cr removal batch
...
git-svn-id: file:///home/svn/framework3/trunk@8038 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 22:24:22 +00:00
Joshua Drake
ff515f5808
fixed exception when unable to connect, fixed formatting
...
git-svn-id: file:///home/svn/framework3/trunk@8037 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 22:15:12 +00:00
James Lee
653daac8e6
remove a debug print and default proto to 'tcp' if it wasn't given
...
git-svn-id: file:///home/svn/framework3/trunk@8034 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 17:43:47 +00:00
James Lee
02eb7ab80d
massive changes to the database api. Auxiliary::Report is now just a bunch of stubs into the main DBManager, most aux modules should just work, but they haven't all been tested. introduces a get_auth_info method for pulling credentials out of the db. other db api methods should be more standardized now. cross your fingers
...
git-svn-id: file:///home/svn/framework3/trunk@8028 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 23:48:45 +00:00
HD Moore
c3038d4027
Add the payload_data method back in
...
git-svn-id: file:///home/svn/framework3/trunk@8027 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 23:37:36 +00:00
Joshua Drake
036ac8fb90
show warning if -L was specified but readline failed to load
...
git-svn-id: file:///home/svn/framework3/trunk@8024 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 21:54:03 +00:00
HD Moore
922cef26fa
Store the domain name in the SMB client object, along with other fields provided by NTLMSSP responses. Show the domain name and netbios name in the version scanner. Update MS06-070 to remove the default target, use the domain name from the server response, and use a more reliable return address for 2000 SP4.
...
git-svn-id: file:///home/svn/framework3/trunk@8022 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 14:00:49 +00:00
Mike Smith
488b0cba5d
Fix "dbfile" deprecation warning when using SQLite.
...
Replaced the deprecated "dbfile" option with "database" so that Rails
2.3.5 will not print a warning message.
git-svn-id: file:///home/svn/framework3/trunk@8018 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 01:27:11 +00:00
HD Moore
1d1f94593c
Add -t asp to msfencode :)
...
git-svn-id: file:///home/svn/framework3/trunk@8013 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 22:41:43 +00:00
Joshua Drake
a247de77ec
add the SingleStaticBit for the CVE-2008-4193 exploit - comments welcome
...
git-svn-id: file:///home/svn/framework3/trunk@8011 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 20:39:43 +00:00
James Lee
8aff26edb4
add a method for waiting on a task to finish
...
git-svn-id: file:///home/svn/framework3/trunk@8009 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 20:15:33 +00:00
HD Moore
3f59ea2f95
Handle a return() from a proc a bit more gracefully, add a test case
...
git-svn-id: file:///home/svn/framework3/trunk@8008 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 19:44:14 +00:00
HD Moore
a414d5fc8f
Fixes an issue identified by egypt when the task's proc returns. This also stores the return value in task.retval
...
git-svn-id: file:///home/svn/framework3/trunk@8007 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 19:37:14 +00:00
HD Moore
bb84e76e40
Upgrade the bundled Racket to version 1.0.7
...
git-svn-id: file:///home/svn/framework3/trunk@8003 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 13:26:56 +00:00
HD Moore
5757216f9a
This overhauls the database reporting code - all report_* functions now add their write operation to a queue that is processed sequentially in the background. This prevents concurrency issues around database writes, but prevents modules from immediately using the results of their report_* calls in the database. Still todo is a method for waiting on the write to have occurred
...
git-svn-id: file:///home/svn/framework3/trunk@7997 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 00:21:21 +00:00
HD Moore
4c6fd97b0e
Handles some broken TCP stack implementations better (but not perfectly)
...
git-svn-id: file:///home/svn/framework3/trunk@7991 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-27 07:02:55 +00:00
HD Moore
308bdcccb2
Fixes #733 (using open vs ::Up, may need a revert and a change to the importers instead). Update the sweep_udp module to store host, mac, name info
...
git-svn-id: file:///home/svn/framework3/trunk@7990 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 22:08:49 +00:00
HD Moore
0bf2f7dd9e
Clean up trailing whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@7987 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 18:29:24 +00:00
HD Moore
de7cabaed1
Handle dashes in the version strings and add generic catch-alls for windows
...
git-svn-id: file:///home/svn/framework3/trunk@7986 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 18:26:24 +00:00
HD Moore
b80ebd45f1
Better parsing of Windows 2008 versions (should handle Hyper-V variants now)
...
git-svn-id: file:///home/svn/framework3/trunk@7985 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 18:17:35 +00:00
HD Moore
c8e60da5ee
Fix warning on 1.8
...
git-svn-id: file:///home/svn/framework3/trunk@7982 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 09:01:08 +00:00
HD Moore
4331c111f1
Add a mysql mixin that wraps ruby-mysql (tmtm.org)
...
git-svn-id: file:///home/svn/framework3/trunk@7977 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 05:21:21 +00:00
HD Moore
ec9bc73e0f
Allow an existing socket to be passed in
...
git-svn-id: file:///home/svn/framework3/trunk@7976 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 04:08:59 +00:00
HD Moore
fd24634fcc
Rename to rbmysql, fix main script as well
...
git-svn-id: file:///home/svn/framework3/trunk@7975 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 04:06:40 +00:00
HD Moore
81b3470ef5
Rename the main class to prevent conflicts:
...
git-svn-id: file:///home/svn/framework3/trunk@7974 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 04:04:15 +00:00
HD Moore
8f47140ddf
Add the README file from upstream
...
git-svn-id: file:///home/svn/framework3/trunk@7973 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 03:58:34 +00:00
HD Moore
c9777b993a
Rename to prevent system level conflicts
...
git-svn-id: file:///home/svn/framework3/trunk@7972 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 03:57:49 +00:00
HD Moore
a7f672c2cd
Import the ruby-mysql library
...
git-svn-id: file:///home/svn/framework3/trunk@7971 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 03:57:05 +00:00
James Lee
8f2138a464
and remove the empty xdr.rb
...
git-svn-id: file:///home/svn/framework3/trunk@7965 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-24 00:21:36 +00:00
Mike Smith
744c4cd02f
Store the current workspace's name instead of the whole Workspace object.
...
This ensures that the most up-to-date data is reloaded from the database
when you ask for it, instead of returning cached results.
git-svn-id: file:///home/svn/framework3/trunk@7963 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 20:37:30 +00:00
HD Moore
a9ec7c8b21
Ignore proxy errors during scanning
...
git-svn-id: file:///home/svn/framework3/trunk@7962 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 15:29:22 +00:00
HD Moore
b13e185943
Giant update from tebo, fixing up SunRPC and the nsfmount module
...
git-svn-id: file:///home/svn/framework3/trunk@7961 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 13:44:53 +00:00
HD Moore
556b28e6ca
Switching focus to 3.3.4-dev
...
git-svn-id: file:///home/svn/framework3/trunk@7960 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 13:44:19 +00:00
HD Moore
eb58e8801a
Tagging this as 3.3.3-release
...
git-svn-id: file:///home/svn/framework3/trunk@7957 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 06:03:57 +00:00
HD Moore
dde54bf99c
Allow minrank to be specified via -R
...
git-svn-id: file:///home/svn/framework3/trunk@7952 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 03:53:16 +00:00
James Lee
86f1616d24
less verbose inspect method for modules
...
git-svn-id: file:///home/svn/framework3/trunk@7951 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 01:46:20 +00:00
James Lee
0708798598
more concise inspect output for Session objects
...
git-svn-id: file:///home/svn/framework3/trunk@7949 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 01:03:51 +00:00
James Lee
89695b40fe
add ability to specify columns for db_{hosts,services} output
...
git-svn-id: file:///home/svn/framework3/trunk@7948 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-22 22:20:58 +00:00
James Lee
4f92d9f431
Revamp the event system and add some ui hooks. Sessions are still ghetto -- we get interact events (in a lame way) but no input or output events yet. see 619
...
git-svn-id: file:///home/svn/framework3/trunk@7947 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-22 18:52:48 +00:00
Mike Smith
d3e8132532
Fix (ruby 1.8.7) issue where data appeared under the wrong column.
...
git-svn-id: file:///home/svn/framework3/trunk@7944 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-22 02:48:54 +00:00
HD Moore
7935656355
Fixes #708 . Enforces a timeout around SSL's connect()
...
git-svn-id: file:///home/svn/framework3/trunk@7938 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 22:48:40 +00:00
HD Moore
655e864ee3
See #708 . Sets a default timeout for http requests
...
git-svn-id: file:///home/svn/framework3/trunk@7937 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 22:42:21 +00:00
HD Moore
111d49135e
Fixes #609 . Revert back to ExitProcess(0) as default, this resolves a number of small bugs
...
git-svn-id: file:///home/svn/framework3/trunk@7935 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 20:44:44 +00:00
HD Moore
6147db8722
Fixes #696 . Default direct to FALSE if port is 139
...
git-svn-id: file:///home/svn/framework3/trunk@7933 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 19:04:28 +00:00
Mike Smith
1f7b184fe5
Use SQL to filter/sort the hosts & services records, instead of ruby.
...
git-svn-id: file:///home/svn/framework3/trunk@7930 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 16:46:11 +00:00
HD Moore
2d399f9b52
Handle the native win32 errno as well
...
git-svn-id: file:///home/svn/framework3/trunk@7923 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-19 15:08:37 +00:00
HD Moore
1eceebc950
Fixes #697 . This prevents a closed socket from being passed to select() and handles the case where a race condition allowed this to happen anyways (one thread closes, one thread selects). This should prevent most 'invalid handle' exceptions on Cygwin and prevent Win32 native from crashing due to the native exception.
...
git-svn-id: file:///home/svn/framework3/trunk@7922 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-19 15:02:26 +00:00
Joshua Drake
addcba5131
0x7f isn't printable!
...
git-svn-id: file:///home/svn/framework3/trunk@7915 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-18 20:40:08 +00:00
James Lee
fc1e0b88fb
change db_hosts and db_services output to be more thorough, see 619
...
git-svn-id: file:///home/svn/framework3/trunk@7912 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-18 01:14:05 +00:00
HD Moore
39d37065de
See #485 . This patch allows the very basics of metasploit to work under jRuby 1.4.0. Many, many things are still broken
...
git-svn-id: file:///home/svn/framework3/trunk@7906 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-17 08:02:11 +00:00
James Lee
c4c0fd2b55
deal with broken Date.parse in 1.8.6 and older by just not printing the last updated date. fixes 693
...
git-svn-id: file:///home/svn/framework3/trunk@7897 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-17 03:17:37 +00:00
James Lee
06427b53c9
document the detection for 2k SP0
...
git-svn-id: file:///home/svn/framework3/trunk@7887 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-15 23:08:28 +00:00
HD Moore
f76a9a43e6
Switch compat payloads to normal vs ranked
...
git-svn-id: file:///home/svn/framework3/trunk@7877 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-15 13:14:01 +00:00
James Lee
f1a5103b32
allow the browser_autopwn mixin access to exploit modules' Rank constants. see 628
...
git-svn-id: file:///home/svn/framework3/trunk@7876 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-15 07:21:17 +00:00
James Lee
b6c497467e
add a message about requiring libmysqlclient-dev, fixes 535
...
git-svn-id: file:///home/svn/framework3/trunk@7866 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-14 23:40:21 +00:00
Mike Smith
f9ffc8b8bc
Add db_workspace command & other db refactoring.
...
* Added "workspaces" table and associated ActiveRecord class.
* Moved ActiveRecord models from db_objects.rb into separate files.
* Do the DB migration check every time you connect (was previously done
during db_create).
* Use :dependent => :destroy associations so that we don't have to
manually delete the dependent objects.
git-svn-id: file:///home/svn/framework3/trunk@7861 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-14 22:52:34 +00:00
HD Moore
4311c20ee1
Warn the user when nessusv2 is specified (only v1 supported). See #690
...
git-svn-id: file:///home/svn/framework3/trunk@7857 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-14 22:00:54 +00:00
James Lee
a03e3bf823
adds support for regular shell sessions when running commands with 'sessions -c'. Commands are run sequentially, so will take forever on large numbers of sessions.
...
git-svn-id: file:///home/svn/framework3/trunk@7855 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-14 21:17:49 +00:00
HD Moore
bce6355df1
Make sure we use a real module class instance when ranking
...
git-svn-id: file:///home/svn/framework3/trunk@7844 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 23:41:25 +00:00
HD Moore
e2cc45e4d4
Use the not-so-explicit platform
...
git-svn-id: file:///home/svn/framework3/trunk@7843 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 19:46:44 +00:00
HD Moore
89da53d570
Updates to encode_shellcode_stub
...
git-svn-id: file:///home/svn/framework3/trunk@7842 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 19:43:17 +00:00
HD Moore
40fb409343
Adds encode_shellcode_stub() to the exploit class, this allows arbitrary shellecode bits to be easily encoded
...
git-svn-id: file:///home/svn/framework3/trunk@7841 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 19:31:17 +00:00
HD Moore
7e4d03be86
This adds support for the old exe format to msfencode using -t exe-small and allows encoder modules to change preferences based on the platform, which fully solves #430 .
...
git-svn-id: file:///home/svn/framework3/trunk@7840 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 19:03:35 +00:00
HD Moore
c287573213
A few more wmap cleanups
...
git-svn-id: file:///home/svn/framework3/trunk@7839 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 06:56:01 +00:00
HD Moore
a1f71fa994
Fixes #683 . This triggers when running on ruby 1.9 and is probably one of many like this and one of the reasons this interface is not maintained. However, since you wen to the effort of reporting it, the least we can do is fix it ;)
...
git-svn-id: file:///home/svn/framework3/trunk@7838 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 05:30:34 +00:00
HD Moore
1029ecd7f8
Cleanup wmap, add the missing database tables back, rename to have a wmap_prefix
...
git-svn-id: file:///home/svn/framework3/trunk@7837 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 05:24:48 +00:00
James Lee
23a63991b2
add -c option to sessions command to allow running a shell command on running meterpreter sesions; see #663
...
git-svn-id: file:///home/svn/framework3/trunk@7831 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-12 00:49:48 +00:00
Joshua Drake
004c2864f4
This adds an option to the sessions command (-s). Using it allows running a script for each open meterpreter session, see #663
...
git-svn-id: file:///home/svn/framework3/trunk@7830 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-11 23:19:19 +00:00
HD Moore
eac301484c
Forgot to update the timeout() wrapper class for refernces
...
git-svn-id: file:///home/svn/framework3/trunk@7829 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-11 21:46:44 +00:00
HD Moore
0bc4ba6211
Major overhaul to how db_autopwn works, should be substantially faster and less error prone
...
git-svn-id: file:///home/svn/framework3/trunk@7824 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-11 20:21:18 +00:00
HD Moore
e2a5cb0ebe
Pass the password argument in db_create
...
git-svn-id: file:///home/svn/framework3/trunk@7823 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-11 18:54:19 +00:00
HD Moore
c94c2ee892
Resolved Mac OS X compatibility with the tar, switching back to 3.3.3-dev
...
git-svn-id: file:///home/svn/framework3/trunk@7817 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 22:32:36 +00:00
HD Moore
f1bf7ec7cf
Bumping back to 3.3.2 for a second to build a tarball for OS X (._main bug)
...
git-svn-id: file:///home/svn/framework3/trunk@7816 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 22:26:59 +00:00
HD Moore
8179472a35
Hurray 3.3.2 is out - back to work on 3.3.3
...
git-svn-id: file:///home/svn/framework3/trunk@7809 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 20:26:40 +00:00
HD Moore
d976df897a
3.3.2 done
...
git-svn-id: file:///home/svn/framework3/trunk@7808 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 19:14:45 +00:00
HD Moore
a16feb01bc
Minor tweaks to http processing
...
git-svn-id: file:///home/svn/framework3/trunk@7805 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 18:12:38 +00:00
HD Moore
5ef9a1c040
Wipe the headers before reparsing
...
git-svn-id: file:///home/svn/framework3/trunk@7801 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 17:04:52 +00:00
HD Moore
1c98368351
Loop until a non-100 is found or the resp parser fails
...
git-svn-id: file:///home/svn/framework3/trunk@7800 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 16:57:21 +00:00
HD Moore
006d5d51fc
Fixes #674 by adding 100-continue support
...
git-svn-id: file:///home/svn/framework3/trunk@7799 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 16:54:27 +00:00
HD Moore
afa5b46674
Default the minrank for autopwn, otherwise this prevents usage from being shown when no args are present. Also breaks -t -p when no rank is specified
...
git-svn-id: file:///home/svn/framework3/trunk@7798 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 15:12:59 +00:00
HD Moore
75c90b8ef9
Handle Errno::EINTR gracefully
...
git-svn-id: file:///home/svn/framework3/trunk@7796 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 06:13:14 +00:00
HD Moore
d2694ce5b9
Ignore errors on shutdown for the relay
...
git-svn-id: file:///home/svn/framework3/trunk@7795 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 06:09:15 +00:00
HD Moore
2a5a5207f5
Switch trunk to 3.3.2-testing until we cut this
...
git-svn-id: file:///home/svn/framework3/trunk@7794 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 05:48:12 +00:00
HD Moore
e731426666
Fixes #662 . The socket pivoting is still not perfect, but this goes a long way
...
git-svn-id: file:///home/svn/framework3/trunk@7792 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 05:40:26 +00:00
Joshua Drake
4cb050010b
add exploitability detection (by trying %n)
...
git-svn-id: file:///home/svn/framework3/trunk@7791 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 23:53:26 +00:00
James Lee
8d25dc00bc
bail if MinimumRank is invalid
...
git-svn-id: file:///home/svn/framework3/trunk@7787 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 23:07:58 +00:00
James Lee
084a10ded5
remove a debug print and deal with minrank being absent
...
git-svn-id: file:///home/svn/framework3/trunk@7786 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 22:42:06 +00:00
Joshua Drake
318750c68c
oops, forgot to update fmtstr_count_printed
...
git-svn-id: file:///home/svn/framework3/trunk@7785 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 22:37:34 +00:00
Joshua Drake
4a363329cb
fixed generating fmts from buffers with small value delta (eg \x02\x01\x03\x01)
...
git-svn-id: file:///home/svn/framework3/trunk@7781 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 21:50:17 +00:00
James Lee
e0bd6dd6ed
don't bother checking for an address if our range is empty
...
git-svn-id: file:///home/svn/framework3/trunk@7779 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 21:28:44 +00:00
HD Moore
898c8655ff
Default rank to manual for the search command
...
git-svn-id: file:///home/svn/framework3/trunk@7773 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 13:57:46 +00:00
James Lee
961e70fc34
add -f flag to exploit command to force running despite a conflicting MinimumRank value. fixes 628
...
git-svn-id: file:///home/svn/framework3/trunk@7770 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 02:49:27 +00:00
Joshua Drake
061b4a36cf
add stack reading and detection for dpa/fpu fmt specifiers
...
git-svn-id: file:///home/svn/framework3/trunk@7768 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 02:18:12 +00:00
James Lee
6989949720
adds a global option, MinimumRank, which db_autopwn now checks to prevent running exploits below a certain rank. fixes #625 , see #628
...
git-svn-id: file:///home/svn/framework3/trunk@7767 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 01:54:20 +00:00
Joshua Drake
f383949540
fix 1.9.1 compatability
...
git-svn-id: file:///home/svn/framework3/trunk@7764 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 23:50:29 +00:00
Joshua Drake
9abe0c0b03
added support for direct parameter access
...
git-svn-id: file:///home/svn/framework3/trunk@7763 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 23:50:02 +00:00
Joshua Drake
87c85b5176
removed executable generation routines from Rex::Text (use Msf::Util::EXE), Fixes #660
...
git-svn-id: file:///home/svn/framework3/trunk@7760 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 21:24:45 +00:00
HD Moore
54c10c0c3d
Fixes #623 and fixes #622 , implements a number of changes to the core channel dispatch code, sets timeouts on unmatched responses, and handles tcp relay writes with a threaded/timeout wrapper to avoid delays.
...
git-svn-id: file:///home/svn/framework3/trunk@7753 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 18:32:26 +00:00
James Lee
7427640fb0
don't wait for a message body that will never come. fixes 659
...
git-svn-id: file:///home/svn/framework3/trunk@7748 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 02:26:37 +00:00
James Lee
47fdec6ab3
add ability to search by minimum rank, fixes 627
...
git-svn-id: file:///home/svn/framework3/trunk@7747 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 23:15:13 +00:00
Mike Smith
61b556a0d1
Initialize the database schema using ActiveRecord migrations
...
git-svn-id: file:///home/svn/framework3/trunk@7739 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 17:03:27 +00:00
Mike Smith
05a4212e1d
Minor db improvements
...
Use find_each for better scalability with large databases.
No need to call save immediately after create.
git-svn-id: file:///home/svn/framework3/trunk@7737 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 17:03:21 +00:00
James Lee
765a1d72eb
replace old clear color code with the new one ('%clr'). fixes 610
...
git-svn-id: file:///home/svn/framework3/trunk@7736 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 17:00:05 +00:00
Stephen Fewer
0b8917a39e
Add HD's optimization for faster DLL reading (ala the x86 counterpart).
...
git-svn-id: file:///home/svn/framework3/trunk@7731 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 12:58:28 +00:00
Stephen Fewer
7d3ff93ec9
Fix a few bugs in the parsing of exception directories on PE64 binaries.
...
git-svn-id: file:///home/svn/framework3/trunk@7730 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 12:56:54 +00:00
Stephen Fewer
4fb212b54e
Go back to using select instead of sleep for the waiters.
...
git-svn-id: file:///home/svn/framework3/trunk@7729 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 12:55:31 +00:00
James Lee
02a62967e4
register the 'rex' log source, see #577
...
git-svn-id: file:///home/svn/framework3/trunk@7727 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-06 18:09:27 +00:00
HD Moore
1f5a0be9ca
Fixes #630 by correct the constant typo
...
git-svn-id: file:///home/svn/framework3/trunk@7726 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-06 14:51:15 +00:00
HD Moore
8df719e7a8
See #624 . Adds the module ranking to all text-base displays, this may be enough to close the ticket
...
git-svn-id: file:///home/svn/framework3/trunk@7725 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-06 14:35:16 +00:00
HD Moore
42e6486fb4
Module loading broken again by revision r7709.
...
git-svn-id: file:///home/svn/framework3/trunk@7711 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-05 11:10:46 +00:00
Mario Ceballos
43f65b2851
fix for the NLS_LANG issue. (rory)
...
git-svn-id: file:///home/svn/framework3/trunk@7709 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 23:01:54 +00:00
HD Moore
2c92856612
Fixes #604 . This fixes a long-standing race condition with meterpreter channels that received data as soon as they were open (TCP).
...
git-svn-id: file:///home/svn/framework3/trunk@7708 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 21:08:34 +00:00
James Lee
a96a23f95c
add cidr parsing for ipv6
...
git-svn-id: file:///home/svn/framework3/trunk@7707 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 20:17:28 +00:00
James Lee
1e6b6b3d62
fix ipv6 handling for single addresses
...
git-svn-id: file:///home/svn/framework3/trunk@7706 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 19:55:58 +00:00
James Lee
5952e29040
modify address range specification (for e.g. RHOSTS) to use nmap notation, fixes #182
...
git-svn-id: file:///home/svn/framework3/trunk@7705 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 19:37:14 +00:00
Joshua Drake
0458622cb7
attempt to persist left over data across calls
...
git-svn-id: file:///home/svn/framework3/trunk@7704 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 19:20:14 +00:00
James Lee
ee0c1d460a
remove the lock that was causing segfaults on 1.9; fixes #513 , see #514
...
git-svn-id: file:///home/svn/framework3/trunk@7703 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 19:16:28 +00:00
HD Moore
9b2d5fcd24
Fixes #605 by re-raising the correct exception class
...
git-svn-id: file:///home/svn/framework3/trunk@7701 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 18:38:59 +00:00
Stephen Fewer
a544d71f4e
A few small changes to the ruby side of meterpreters packet dispatcher stuff. Allow for blocking a request indefinatly and add in a new command 'wait' to stdapi.sys.process.
...
git-svn-id: file:///home/svn/framework3/trunk@7697 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 17:32:56 +00:00
HD Moore
fda1083d13
Stop throwing an exception on module initialization, delay this until connect() to avoid breaking module enumeration tools. Clean up the tabs and indents. Delete the broken rescue clause with no begin
...
git-svn-id: file:///home/svn/framework3/trunk@7696 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 17:22:32 +00:00
Joshua Drake
821f515ff5
add PrependChrootBreak
...
git-svn-id: file:///home/svn/framework3/trunk@7692 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 07:49:05 +00:00
Joshua Drake
4ab9a59a39
now supporting sequential identical values!
...
git-svn-id: file:///home/svn/framework3/trunk@7691 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 07:45:08 +00:00
HD Moore
facebbc791
allow module search to continue even if one module fails to load
...
git-svn-id: file:///home/svn/framework3/trunk@7689 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 01:00:48 +00:00
Mario Ceballos
93d02320cf
updated oracle mixin and adjusted affected modules. now compatible with ruby 1.8 and 1.9
...
git-svn-id: file:///home/svn/framework3/trunk@7688 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 23:57:02 +00:00
Joshua Drake
d4f1314025
fixed problem reading long lines
...
git-svn-id: file:///home/svn/framework3/trunk@7687 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 21:52:59 +00:00
Joshua Drake
1d143a6ccf
fix silly bug, sorry
...
git-svn-id: file:///home/svn/framework3/trunk@7686 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 21:11:56 +00:00
Joshua Drake
d31d7f869f
split buffer to array conversion out
...
git-svn-id: file:///home/svn/framework3/trunk@7685 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 20:58:07 +00:00
Joshua Drake
7aeb7a08b3
first attempt at support for ftp continuations
...
git-svn-id: file:///home/svn/framework3/trunk@7684 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 20:56:08 +00:00
HD Moore
b1b7ef0350
Improves the NeXpose plugin, adds the ability to do discovery outside of NeXpose and then scan the results using the database as input (-d).
...
git-svn-id: file:///home/svn/framework3/trunk@7681 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 15:26:30 +00:00
Patrick Webster
a4fc468700
Handles exception where exec is a directory, or permission is denied.
...
git-svn-id: file:///home/svn/framework3/trunk@7678 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 08:17:14 +00:00
James Lee
5182d1c927
allow the Connection header to specify keep-alive in a less strict manner. this is more rfc2616 compliant and fixes #601
...
git-svn-id: file:///home/svn/framework3/trunk@7677 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 07:40:37 +00:00
HD Moore
fc983ef7e3
Many bug fixes to db_autopwn, cross-referencing of OS-level vulnerabilities, small bug fixes to HTTP client API
...
git-svn-id: file:///home/svn/framework3/trunk@7676 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 01:36:17 +00:00
James Lee
7b4a942ed6
revert logging change from r7653 which broke meterpreter sessions
...
git-svn-id: file:///home/svn/framework3/trunk@7671 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-02 19:11:11 +00:00
James Lee
626d085dd4
expand ryan linn's idea of more verbose job info to include start time, see #586
...
git-svn-id: file:///home/svn/framework3/trunk@7668 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-02 03:32:48 +00:00
James Lee
dfabd1e3fc
fixes #587 ; add http xmlrpc support from Ryan Linn, invoke it with 'load xmlrpc ServerType=Web' or ./msfrpcd -t Web
...
git-svn-id: file:///home/svn/framework3/trunk@7667 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-02 00:00:11 +00:00
James Lee
e427bd5f81
spaces to tabs
...
git-svn-id: file:///home/svn/framework3/trunk@7666 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 23:15:07 +00:00
James Lee
0da80965d6
more info about a job, thanks Ryan Linn for the patch; fixes #586
...
git-svn-id: file:///home/svn/framework3/trunk@7665 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 23:11:12 +00:00
James Lee
b486654975
nothing actually uses the zip library, ripping it out. fixes 591
...
git-svn-id: file:///home/svn/framework3/trunk@7663 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 22:34:45 +00:00
James Lee
c2fac74ae2
make irb more useful by eliding unnecessary stuff from framework.inspect
...
git-svn-id: file:///home/svn/framework3/trunk@7662 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 21:42:14 +00:00
James Lee
e73842251e
add a kill command and clean up tabbing for jobs
...
git-svn-id: file:///home/svn/framework3/trunk@7659 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 18:24:11 +00:00
HD Moore
b7addee664
Release cut, back to 3.4-dev
...
git-svn-id: file:///home/svn/framework3/trunk@7656 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 03:57:09 +00:00
HD Moore
cae9880c28
Tag this as 3.3.1-release
...
git-svn-id: file:///home/svn/framework3/trunk@7654 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 03:08:48 +00:00
James Lee
125f0aab0a
map any attempt to log to an unknown logsink to the core logsink, fixes 577
...
git-svn-id: file:///home/svn/framework3/trunk@7653 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 22:03:53 +00:00