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 |