4037543072
whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@11680 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-30 21:41:54 +00:00
8b6cb60a20
whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@11679 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-30 21:38:05 +00:00
ac651fba6b
Merge code from Alexandre Maloteaux, fixes #3615
...
git-svn-id: file:///home/svn/framework3/trunk@11678 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-30 19:26:35 +00:00
de7ad3f111
unbreak store_loot
...
git-svn-id: file:///home/svn/framework3/trunk@11677 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-30 19:11:27 +00:00
aeddee0f03
typo. good thing nothing actually uses this module?
...
git-svn-id: file:///home/svn/framework3/trunk@11676 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-30 05:54:50 +00:00
8da92a7bb9
don't bomb out when given no args or an invalid module for the info command, fixes #3558 , thanks chao-mu for the patch!
...
git-svn-id: file:///home/svn/framework3/trunk@11672 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 18:07:30 +00:00
3b3bb4d874
clarify SRVHOST description
...
git-svn-id: file:///home/svn/framework3/trunk@11671 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 17:59:46 +00:00
05022b6fe4
client.framework, there's no top-level framework obj in rex. see #3557
...
git-svn-id: file:///home/svn/framework3/trunk@11670 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 16:46:41 +00:00
4f3cdf0b26
See #3470 , forgot a debug line, oops
...
git-svn-id: file:///home/svn/framework3/trunk@11669 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 03:35:42 +00:00
647b41cc96
Fixes #3470 by canonicalizing module paths as they are added
...
git-svn-id: file:///home/svn/framework3/trunk@11668 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 03:34:48 +00:00
1ee9b205b8
session -> address is now taken care of by the underlying db.rb, don't bother in Auxiliary::Report
...
git-svn-id: file:///home/svn/framework3/trunk@11667 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 02:44:32 +00:00
01d116f60f
allow a Session as the :host argument to some report_* methods that make sense
...
git-svn-id: file:///home/svn/framework3/trunk@11666 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 02:42:45 +00:00
3af1cf8279
failure to reload is an error
...
git-svn-id: file:///home/svn/framework3/trunk@11665 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 02:39:27 +00:00
2618e4fffe
Add traceroute parsing to nmap
...
git-svn-id: file:///home/svn/framework3/trunk@11661 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-28 23:32:14 +00:00
88a5b1982e
always reload post modules when run from meterpreter prompt, fail and error out instead of running the old one when a reload fails. Fixes #3557
...
git-svn-id: file:///home/svn/framework3/trunk@11659 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-28 17:02:26 +00:00
a7b5e831f7
clean up how help works, pull cmd_reload up so all module types can use it
...
git-svn-id: file:///home/svn/framework3/trunk@11658 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-28 03:29:20 +00:00
9682091cca
Add SQLI version of MSSQL Payload from Rodrigo Marcos!
...
git-svn-id: file:///home/svn/framework3/trunk@11655 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-27 16:48:07 +00:00
a1b74eee0d
Fixes #3607 , Removes the module count cache since it seems to have no performance impact (and was broken)
...
git-svn-id: file:///home/svn/framework3/trunk@11653 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-27 00:13:13 +00:00
47a706962a
do the win32api thing if it's mingw. thanks Ludovic Courgnaud
...
git-svn-id: file:///home/svn/framework3/trunk@11651 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 19:20:45 +00:00
1c58943edd
Backing out r11616 since OptFloat will surely cause problems with RPC. Nothing to see here. Verified that all OptInt options are now actually Ints and not Floats with a grep -r "OptInt" trunk | grep "[0-9]\.[0-9]"
...
git-svn-id: file:///home/svn/framework3/trunk@11648 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 15:29:26 +00:00
19d9185ca3
updated for remote workstation control
...
git-svn-id: file:///home/svn/framework3/trunk@11647 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 07:33:59 +00:00
d2670d52ec
add BufferRegister and BufferOffset support for shikata_ga_nai. see #3563 . tested this pretty extensively. /me crosses fingers
...
git-svn-id: file:///home/svn/framework3/trunk@11646 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 04:24:41 +00:00
4b777686d8
whitespace fixes
...
git-svn-id: file:///home/svn/framework3/trunk@11645 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 03:13:40 +00:00
53bba0bd54
Move cache logic from statistics->module_manager, More modularization in ModuleManager
...
git-svn-id: file:///home/svn/framework3/trunk@11643 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 00:07:34 +00:00
a2e6f0e96c
add -q option to suppress banner, improve -n warning
...
git-svn-id: file:///home/svn/framework3/trunk@11642 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 22:58:21 +00:00
56b112e03b
See #3596 , Only force encoding for rubies that support encoding
...
git-svn-id: file:///home/svn/framework3/trunk@11640 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 20:03:33 +00:00
1e6365ed58
Fixes #3596 , Force Rex::Text.gzip to use ASCII-8BIT strings, Reverts r10653
...
git-svn-id: file:///home/svn/framework3/trunk@11639 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 19:59:56 +00:00
05fd7b4e57
Patch for railgun and post mixin; and module from cha-mou to add capability to delete users on windows hosts.
...
git-svn-id: file:///home/svn/framework3/trunk@11638 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 13:02:35 +00:00
3794ed35cc
Apply patches from Matthew Weeks (scriptjunkie) to fix traversal flaws outlined in his Black Hat DC talk:
...
https://media.blackhat.com/bh-dc-11/Weeks/BlackHat_DC_2011_Weeks_Counterattack-wp.pdf
https://media.blackhat.com/bh-dc-11/Weeks/BlackHat_DC_2011_Weeks_Counterattack-Slides.pdf
git-svn-id: file:///home/svn/framework3/trunk@11636 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 02:24:37 +00:00
8a4c23ffd4
small adjustment
...
git-svn-id: file:///home/svn/framework3/trunk@11635 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 02:15:25 +00:00
81ff9483bf
add ms09-004 exploit via sql injection from Rodrigo Marcos
...
git-svn-id: file:///home/svn/framework3/trunk@11631 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-24 19:37:58 +00:00
0af8915fd5
Fixes #1936 , Add accounts mixin and accompanying post module
...
git-svn-id: file:///home/svn/framework3/trunk@11629 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-24 17:23:48 +00:00
3346a30023
See #1936 , Add FreeSid definition and convert several PSID* out params to PDWORD
...
git-svn-id: file:///home/svn/framework3/trunk@11628 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-24 05:36:38 +00:00
8bf60c6d11
carlos forgot to delete this, see r11550, r11551
...
git-svn-id: file:///home/svn/framework3/trunk@11624 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-22 00:56:37 +00:00
d7cda0f85a
accept a client argument for get_uri()
...
git-svn-id: file:///home/svn/framework3/trunk@11623 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-22 00:16:57 +00:00
8b5f0f6559
Allow getsystem to report its success as a host note.
...
git-svn-id: file:///home/svn/framework3/trunk@11622 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-22 00:08:35 +00:00
f8120a8e3f
servers don't have a sock().
...
git-svn-id: file:///home/svn/framework3/trunk@11621 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-21 23:42:56 +00:00
e7ced5f887
disable ssl for the php include server, and try the address with the default gateway for get_uri when SRVHOST is inaddr_any
...
git-svn-id: file:///home/svn/framework3/trunk@11620 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-21 23:19:11 +00:00
b8b3d9e00f
See #1936 , Apply patch from Chao Mu - PSID is kind of opaque, so we treat it as a pointer only (not a blob)
...
git-svn-id: file:///home/svn/framework3/trunk@11618 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-21 22:05:28 +00:00
63f893dd90
Adds an OptFloat option class, for when people actually want floats and not integers.
...
git-svn-id: file:///home/svn/framework3/trunk@11616 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-21 17:21:42 +00:00
e1e35ea15b
Adds a attribute_locked? method to Host objects. If an attribute is locked, report_host() won't update it. (These aren't very serious locks since you can still set them directly on objects, but if you use the API, and you should, locks will be respected.)
...
git-svn-id: file:///home/svn/framework3/trunk@11613 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-20 23:10:27 +00:00
a12f5556cb
Fixes #3564 by better randomizing the temp directory for extraction (minimizing the chance of a filesystem name collision), correctly extracting the original workspace name, and identifying the correct XML file to work off of for importing hosts and services.
...
git-svn-id: file:///home/svn/framework3/trunk@11609 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-20 17:32:48 +00:00
dfbef1e38c
make sure we have the right kind of args. fixes argument processing for scripts
...
git-svn-id: file:///home/svn/framework3/trunk@11605 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 23:36:11 +00:00
987ce12ba8
Fixes #3552 , add ConvertStringSidtoSid
...
git-svn-id: file:///home/svn/framework3/trunk@11604 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 23:15:42 +00:00
d8fddbfcd4
missing file
...
git-svn-id: file:///home/svn/framework3/trunk@11603 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 21:23:29 +00:00
067c612d9e
Make creds visible to RPC and GUI.
...
git-svn-id: file:///home/svn/framework3/trunk@11602 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 20:09:18 +00:00
bd2dcdb5c3
add the scriptable mixin. fixes #3550 , see #3541 . /me grumbles
...
git-svn-id: file:///home/svn/framework3/trunk@11600 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 16:01:12 +00:00
d120892e7c
post modules working for shell sessions, fixes #3541
...
git-svn-id: file:///home/svn/framework3/trunk@11599 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 02:24:21 +00:00
6210fea1f3
add post/ module support for meterpreter autorunscript, see #3541
...
git-svn-id: file:///home/svn/framework3/trunk@11595 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 23:48:19 +00:00
5429c73b3b
don't try to store to the database if there isn't one. fixes #3540
...
git-svn-id: file:///home/svn/framework3/trunk@11594 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 23:41:01 +00:00
aca1a0d8e4
allow passive post modules, fixes #3542 . add 'Passive' => true to the module info for a passive module
...
git-svn-id: file:///home/svn/framework3/trunk@11591 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 22:00:12 +00:00
437b060ab9
fix a namespace problem, maybe related to #3592
...
git-svn-id: file:///home/svn/framework3/trunk@11590 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 20:53:57 +00:00
9df78e8f47
correct passive?() for post modules, see #3542
...
git-svn-id: file:///home/svn/framework3/trunk@11589 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 20:50:30 +00:00
63934c34ec
check for a ancestors instead of a straight comparison of classes when matching payloads for generics, fixes #3477
...
git-svn-id: file:///home/svn/framework3/trunk@11585 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 17:15:43 +00:00
4384618950
add workstation-over-ssh control into the lab vm-control plugin
...
git-svn-id: file:///home/svn/framework3/trunk@11584 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 05:58:16 +00:00
a237122869
for Java version of Meterpreter options can not be included with the command, they have to be given apart updating mixin for this behavior
...
git-svn-id: file:///home/svn/framework3/trunk@11581 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-15 05:08:42 +00:00
64d160e393
add a method for determining if an address is internal, i.e. within the ranges specified in rfc1918 or rfc5735, and cleanup the unit tests to work on 1.9 and account for various changes to the library that previously didn't get any love in the tests, e.g. r4545.
...
git-svn-id: file:///home/svn/framework3/trunk@11580 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-15 04:40:21 +00:00
0158cd28f1
tab complete local filenames for upload command
...
git-svn-id: file:///home/svn/framework3/trunk@11575 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-13 20:22:13 +00:00
1e3df538f9
use more specific config directory for future-proofing.
...
git-svn-id: file:///home/svn/framework3/trunk@11574 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-13 18:55:26 +00:00
ef883859f1
jduck is right, this isn't necessary since non-matches get removed for us later. if this does indeed make it easier to make modules tab like files later, we can add it back in.
...
git-svn-id: file:///home/svn/framework3/trunk@11572 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-13 16:34:09 +00:00
0355271662
fix a <1.9.2 compat bug. =(
...
git-svn-id: file:///home/svn/framework3/trunk@11569 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-13 00:17:07 +00:00
7226a43bea
move tab completion helpers up to ShellDispatcher to avoid copy-paste and allow non-msf shells to complete filenames
...
git-svn-id: file:///home/svn/framework3/trunk@11562 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-12 22:09:32 +00:00
e27e824755
rectify a lying comment
...
git-svn-id: file:///home/svn/framework3/trunk@11561 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-12 19:24:54 +00:00
a7d92937df
Fixes #3500 , Copy pasta find/replace bug
...
git-svn-id: file:///home/svn/framework3/trunk@11553 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-12 01:21:52 +00:00
9399e69425
Updated original mixin files to use the new post mixing
...
git-svn-id: file:///home/svn/framework3/trunk@11552 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-12 00:18:40 +00:00
e48aa7856a
Migration of Meterpreter mixin to post module mixin
...
git-svn-id: file:///home/svn/framework3/trunk@11550 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-12 00:10:32 +00:00
af8850feb4
Avoid actually prompting the user for SSH messages in keyboard-interactive, since it depends on stdin/stdout, and is kind of useless for us anyway.
...
git-svn-id: file:///home/svn/framework3/trunk@11547 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-11 22:14:12 +00:00
855f8b0752
fix more silly tab completion behavior
...
git-svn-id: file:///home/svn/framework3/trunk@11546 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-11 18:55:37 +00:00
ffbea6199f
Do not wait for the DCERPC call to timeout
...
git-svn-id: file:///home/svn/framework3/trunk@11545 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-11 17:56:27 +00:00
18ee35149a
move script mixin code into Post mixins and include them back in for backwards compatibility
...
git-svn-id: file:///home/svn/framework3/trunk@11544 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-11 17:53:24 +00:00
d87b5ad3d2
Drops the DBImportError when you import a pcap file that doesn't actually contain any normal Eth::IP hosts. It doesn't add a whole lot or give the user any more information than merely failing to import anything.
...
git-svn-id: file:///home/svn/framework3/trunk@11543 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-11 17:35:45 +00:00
f001463ed1
catch ENOTSOCK errors in has_read_data?
...
git-svn-id: file:///home/svn/framework3/trunk@11541 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-11 08:47:42 +00:00
972fdc8cc3
display module's fullname when dumping options or info, thanks chao-mu for the patch, fixes #3486
...
git-svn-id: file:///home/svn/framework3/trunk@11539 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-10 23:34:05 +00:00
40fa5eebaf
Don't convert the timeout to an integer, it makes 0.1 -> 0 svn status eek. See #3483
...
git-svn-id: file:///home/svn/framework3/trunk@11536 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-10 19:42:58 +00:00
87cdaa4ea5
add an info command + tab completion for post modules. fixes #3478
...
git-svn-id: file:///home/svn/framework3/trunk@11534 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-10 18:37:23 +00:00
5efb5e318b
fix various tab completions so they dont recurse/add silly spaces
...
git-svn-id: file:///home/svn/framework3/trunk@11519 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-08 05:36:00 +00:00
e776697f38
Fixes #3466 by detecting a second null handle and breaking the loop (happens with likewise servers)
...
git-svn-id: file:///home/svn/framework3/trunk@11508 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-07 19:51:59 +00:00
eb4ae0e5b7
add tab-completion for post modules in the meterpreter run command
...
git-svn-id: file:///home/svn/framework3/trunk@11498 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 22:16:24 +00:00
dbeae8df24
add support for running post modules from the meterpreter prompt. options are set in the same way as the -o arg to run, e.g. run post/escalate/bypassuac LHOST=192.168.0.1
...
git-svn-id: file:///home/svn/framework3/trunk@11496 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 21:28:00 +00:00
aafb30ba8c
update user agent string detection for some android, fedora, ipod/ipad/iphone
...
git-svn-id: file:///home/svn/framework3/trunk@11495 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 21:24:38 +00:00
58277dd00e
updated browser detection for android, ipod/ipad/iphone, a couple of new fingerprints for FF and IE.
...
git-svn-id: file:///home/svn/framework3/trunk@11492 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 21:11:54 +00:00
713db12a39
add post modules to the search command
...
git-svn-id: file:///home/svn/framework3/trunk@11486 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 17:49:46 +00:00
ecfcb7b89a
updated chrome detection
...
git-svn-id: file:///home/svn/framework3/trunk@11480 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 00:53:53 +00:00
3b67ea5124
print usage when the route command is given an argument we don't understand
...
git-svn-id: file:///home/svn/framework3/trunk@11471 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-04 17:13:30 +00:00
0ba8cbd8a1
don't complain about no session being created when DisablePayloadHandler is true
...
git-svn-id: file:///home/svn/framework3/trunk@11470 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-04 17:06:22 +00:00
be1ee243bf
Switch ord for the more compatibly .unpack("C"), Fixes #3431
...
git-svn-id: file:///home/svn/framework3/trunk@11468 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-04 16:15:56 +00:00
bafd318ba7
replace exe_lhost with the more generic payload_lhost
...
git-svn-id: file:///home/svn/framework3/trunk@11463 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-04 01:13:03 +00:00
0b2f68aa3b
Fix error with TcpServer modules not properly cleaning up after job is killed.
...
Stops StreamServerListener and ClientMonitor threads from remaining after the job is killed and preventing rerunning such modules.
git-svn-id: file:///home/svn/framework3/trunk@11460 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-02 22:30:14 +00:00
bec8a95b02
Merges pello's Cisco uploader module, merges changes back into the TFTP server class. Fixes #3429
...
git-svn-id: file:///home/svn/framework3/trunk@11454 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-30 16:37:58 +00:00
efafb793c4
only add a / if one wasn't there before; update comments/documentation to reflect the current reality now that #968 and #664 are fixed
...
git-svn-id: file:///home/svn/framework3/trunk@11452 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-29 21:10:14 +00:00
9f05e02b85
a better fix for rbreadline, also fixes completion for ~/, see #3352
...
git-svn-id: file:///home/svn/framework3/trunk@11451 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-29 20:31:22 +00:00
269f123143
add PropertySetStream implementation in preperation for upcoming exploit ;)
...
git-svn-id: file:///home/svn/framework3/trunk@11444 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-29 17:07:46 +00:00
85efd12467
make sure the dirname is actually a directory before trying to read it's entries, fixes #3352 . also fixes a typo and a bug where directories other than ./ wouldn't be considered for tabbing.
...
git-svn-id: file:///home/svn/framework3/trunk@11441 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-29 02:56:01 +00:00
c25b08452b
remove LocalInput as a string (no Rex::Ui::Text::Input::File class exists), see #3426
...
git-svn-id: file:///home/svn/framework3/trunk@11440 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-29 02:15:18 +00:00
93e1f56cd8
`butane's patch for my msfrpcd breakage
...
git-svn-id: file:///home/svn/framework3/trunk@11439 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-29 00:35:27 +00:00
a4571f927a
handle nessus xml files w/o a leading <xml> tag -- resolves #3369
...
git-svn-id: file:///home/svn/framework3/trunk@11438 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-28 22:07:41 +00:00
a1af22d330
applying a patch to enable easy output to file: ./msfconsole -o output.txt -r input.msfrc
...
git-svn-id: file:///home/svn/framework3/trunk@11436 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-28 20:24:17 +00:00
f164059d60
backend changes for lab functionality. architecture now allows storage of more info about VMs, and Labs made up of different-technology vms (ie, 1 vmware, 1 vbox, 1 amazon). drivers still need to be written
...
git-svn-id: file:///home/svn/framework3/trunk@11433 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-28 19:47:33 +00:00
02c555c4c6
use the module's platfrom if no session is set
...
git-svn-id: file:///home/svn/framework3/trunk@11430 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-28 19:28:43 +00:00
cd2088ee96
Import the OpenVAS bridge from Kost. Go see his talk: http://www.berlinsides.org/node/14
...
git-svn-id: file:///home/svn/framework3/trunk@11428 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-28 17:45:05 +00:00
1ac8b5abe9
fix a nil.dup by returning a proper platformlist when we don't have a session, dump actual info with 'info' command instead of nothing
...
git-svn-id: file:///home/svn/framework3/trunk@11425 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 18:21:33 +00:00
de9c1286e6
missed file, makes post/hashdump work again
...
git-svn-id: file:///home/svn/framework3/trunk@11424 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 18:11:43 +00:00
1351af8300
missed file. =(
...
git-svn-id: file:///home/svn/framework3/trunk@11422 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 17:56:29 +00:00
f0cc6ff596
big commit for converting meterpreter scripts to modules, see #3377 . also fixes payload tab-completion and 'show payloads' after TARGET has changed
...
git-svn-id: file:///home/svn/framework3/trunk@11421 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 17:46:42 +00:00
30affd4b2c
This commit adds a new set of discovery modules from wuntee and some useful utility methods for working with link-local addresses
...
git-svn-id: file:///home/svn/framework3/trunk@11417 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 16:43:53 +00:00
0468dbeabe
Fixes a db_import bug introduced in r11355 .
...
git-svn-id: file:///home/svn/framework3/trunk@11416 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 16:30:08 +00:00
1df394638e
Remove an annoying warning
...
git-svn-id: file:///home/svn/framework3/trunk@11413 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-25 06:33:04 +00:00
2bb7528e26
Switch to 8.8.8.8 from 50.50.50.50 now that the 50 block has been allocated. Note that this isn't actually sending data to the target
...
git-svn-id: file:///home/svn/framework3/trunk@11384 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-20 22:13:49 +00:00
a8311fd71d
Verify a host is actually a real string before using it
...
git-svn-id: file:///home/svn/framework3/trunk@11372 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-18 03:37:27 +00:00
c28ad8ea0c
Minor improvements and corner case bug fixes to session handling. This fixes issues that can come up when a stream is shut down
...
git-svn-id: file:///home/svn/framework3/trunk@11371 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-18 03:00:26 +00:00
c252d53c15
back to dev
...
git-svn-id: file:///home/svn/framework3/trunk@11370 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-17 18:35:23 +00:00
f159678bf0
Rejigger the packet analysis to not suck up so much memory for no real reason. This ensures that the initial file read represents (pretty much) the entire overhead needed to process packets. I'd say this fixs bumps the ceiling up to about a million packets that can be read without too much trouble (assuming you have a serious amount of RAM available -- I'm testing with 8GB here).
...
git-svn-id: file:///home/svn/framework3/trunk@11364 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-17 03:20:47 +00:00
3ed2d8b694
Add a pcap counter to the pcap importer.
...
git-svn-id: file:///home/svn/framework3/trunk@11356 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-16 21:36:00 +00:00
743cdba360
Detect empty imports
...
git-svn-id: file:///home/svn/framework3/trunk@11355 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-16 21:26:39 +00:00
925e4a66f0
See #3371 . Uncommits the database logging of smb_hash credentials.
...
This kind of meterpreter update may not actually be desirable, given the introduction of a dependency on Metasploit Framework in to the stand-alone Rex library.
#3371 will remain open until this debate is resolved. In the meantime, need to back this out. :/
git-svn-id: file:///home/svn/framework3/trunk@11351 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-16 16:53:28 +00:00
9627194330
Hashdump will now save found credentials to the database.
...
git-svn-id: file:///home/svn/framework3/trunk@11347 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-16 02:42:45 +00:00
e92c073c22
Sync RbReadline with TIP, some diffs remain Metasploit specific
...
git-svn-id: file:///home/svn/framework3/trunk@11338 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 22:09:38 +00:00
93c26125aa
Recognize RO vs RW strings
...
git-svn-id: file:///home/svn/framework3/trunk@11337 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 20:52:48 +00:00
55b21d4aaf
Fixes to enable password parsing and rw/ro detection in snmp brute force
...
git-svn-id: file:///home/svn/framework3/trunk@11336 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 20:51:17 +00:00
1c2c3ed1f6
Adds an example protocol analyzer to pick out http basic auth credentials and do some server analysis for libpcap imports.
...
git-svn-id: file:///home/svn/framework3/trunk@11334 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 19:04:12 +00:00
c6dd53b5c0
look for database configuration in environment variable as well as command line arguments and configuration directory
...
git-svn-id: file:///home/svn/framework3/trunk@11327 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 09:59:49 +00:00
d12be5bd4d
testing -> release!
...
git-svn-id: file:///home/svn/framework3/trunk@11325 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-14 05:28:32 +00:00
f45e03cd14
remove wait when DisablePayloadHandler was set
...
git-svn-id: file:///home/svn/framework3/trunk@11324 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-13 23:34:43 +00:00
256d3409d4
Fixes #3351 . Suppress the warning message about pcaprub. It's not a big deal at all in Metasploit
...
Note that while missing pcaprub is fine, loading the wrong versions of pcaprub is still not fine, and raises actual exceptions.
git-svn-id: file:///home/svn/framework3/trunk@11319 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-13 18:30:42 +00:00
244dc18867
Fixes #3348 . Adds the PacketFu packet processing library from http://code.google.com/p/packetfu/ , and adds a db_import path for pcaps (it's straightforward -- db_import /path/to/file.pcap will import hosts and service ports from a pcap file.)
...
git-svn-id: file:///home/svn/framework3/trunk@11308 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-12 17:44:48 +00:00
431a0e13aa
Store these in a format more friendly to JtR
...
git-svn-id: file:///home/svn/framework3/trunk@11305 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-12 08:53:37 +00:00
68dc327222
Fix missing decode for enable password 7
...
git-svn-id: file:///home/svn/framework3/trunk@11304 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-12 08:51:08 +00:00
4e4eb14887
This adds a TFTP version of #3345 (Pello's snmp config downloader). Still more work to do for the generic module
...
git-svn-id: file:///home/svn/framework3/trunk@11300 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 23:36:37 +00:00
644633454d
Cleanups to credential type
...
git-svn-id: file:///home/svn/framework3/trunk@11297 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 20:36:08 +00:00
e3f909cef9
Fixes for chunked http reply processing, additional cisco configuration support, and a scanner module for unprotected cisco device managers.
...
git-svn-id: file:///home/svn/framework3/trunk@11287 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 07:37:09 +00:00
5b43ea2c15
Buffer data before sending it to the response parser, handle buffered data on disconnect
...
git-svn-id: file:///home/svn/framework3/trunk@11286 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 06:19:36 +00:00
26aca9d6ba
Swap some module locations, add loot and cred reporting
...
git-svn-id: file:///home/svn/framework3/trunk@11271 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-10 05:47:33 +00:00
fa29afaece
Handle character echoing sessions more gracefully
...
git-svn-id: file:///home/svn/framework3/trunk@11268 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-09 22:44:17 +00:00
493db14006
Adds a "duplicate_ok" option to report_auth_info to allow for multiple passwords on the same username. Never came up before I took a look at SNMP.
...
Also normalizes the print_status messages to be explicit about which module is reporting (important when you're running several at once).
git-svn-id: file:///home/svn/framework3/trunk@11267 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-09 21:23:39 +00:00
2742475ae0
fix refactoring scrap
...
git-svn-id: file:///home/svn/framework3/trunk@11258 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-08 22:30:01 +00:00
e5dc368b57
Add WoW64 detection
...
git-svn-id: file:///home/svn/framework3/trunk@11256 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-08 21:05:07 +00:00
19ba0164f6
fix bad socket reference
...
git-svn-id: file:///home/svn/framework3/trunk@11255 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-08 20:37:31 +00:00
5dd1f52349
Bump to testing
...
git-svn-id: file:///home/svn/framework3/trunk@11248 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-07 20:16:39 +00:00
fbd340aae8
add an adodb based cmdstager, fixes #1431
...
git-svn-id: file:///home/svn/framework3/trunk@11247 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-07 18:51:12 +00:00
284e568f7c
fix 'search -o', thanks Larry Wert for the patch! fixes #3306
...
git-svn-id: file:///home/svn/framework3/trunk@11243 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-07 16:02:44 +00:00
2192d06189
Handle cases where the class has already been loaded
...
git-svn-id: file:///home/svn/framework3/trunk@11242 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-07 13:45:49 +00:00
ebaf100a9f
Add RangeWalker#include_range?
...
git-svn-id: file:///home/svn/framework3/trunk@11237 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-06 22:18:49 +00:00
1b6c0664e6
Add EmailTemplate fields: exploit_module, exploit_attach_name & attach_exploit
...
git-svn-id: file:///home/svn/framework3/trunk@11236 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-06 22:18:33 +00:00
185f50212f
use TCPServer instead of Socket + bind and work around JRuby's broken Socket#getsockname (see http://jira.codehaus.org/browse/JRUBY-5232 )
...
git-svn-id: file:///home/svn/framework3/trunk@11211 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 23:49:02 +00:00
b89fe64e74
whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@11209 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 22:13:39 +00:00
2d4af15581
Peerhost, not peerhot. :/
...
git-svn-id: file:///home/svn/framework3/trunk@11205 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 17:33:20 +00:00
0204cedca6
Makes the print_status displays more consistent between smb_login and psexec by moving some of the domain display functions up into exploit/smb proper.
...
git-svn-id: file:///home/svn/framework3/trunk@11204 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 17:29:26 +00:00
fed550d7e7
Fixes #3285 . Checks for nil for session.peerhost and session.tunnel_peer -- hard to test, though, since I can't tell what originally causes the issue -- with and without this fix I get idential results on a normal ssh session. But, with the nil check in place, it should clear up the stack trace listed.
...
git-svn-id: file:///home/svn/framework3/trunk@11203 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 17:26:43 +00:00
9e03e8a142
fix service name handling
...
git-svn-id: file:///home/svn/framework3/trunk@11198 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 02:23:27 +00:00
b0a0a2413c
print the proper proto (https vs http) when ssl is in use
...
git-svn-id: file:///home/svn/framework3/trunk@11194 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-01 16:57:20 +00:00
5a01ede38a
only assign the original request if a response was returned
...
git-svn-id: file:///home/svn/framework3/trunk@11193 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-01 16:32:40 +00:00
bf24e44114
avoid creating a second manifest.mf entry if one already exists
...
git-svn-id: file:///home/svn/framework3/trunk@11175 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 07:10:57 +00:00
c5c2b37c8b
dont mangle offset 0x88 if using sub_method
...
git-svn-id: file:///home/svn/framework3/trunk@11174 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 04:53:43 +00:00
85113deb04
allow modifying the data in a Zip::Entry to support the previous commit (r11172)
...
git-svn-id: file:///home/svn/framework3/trunk@11173 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 03:52:46 +00:00
225bf0738e
improve handling of return from connect_from_privileged_port, rework rlogin fromuser merging
...
git-svn-id: file:///home/svn/framework3/trunk@11171 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 02:00:58 +00:00
7e15c97328
remove duplicate credentials before running
...
git-svn-id: file:///home/svn/framework3/trunk@11168 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 01:15:42 +00:00
1061baba8d
fix some potential bugs from Edward Kolodka, fixes #3256
...
git-svn-id: file:///home/svn/framework3/trunk@11165 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 00:16:07 +00:00
ee7d5827d5
prevent mangling the input string
...
git-svn-id: file:///home/svn/framework3/trunk@11148 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-25 07:42:34 +00:00
778040ec5b
move rservices mixin to aux instead of exploit
...
git-svn-id: file:///home/svn/framework3/trunk@11142 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-25 06:02:35 +00:00
e74d023971
formatting, modularization, and optimization
...
git-svn-id: file:///home/svn/framework3/trunk@11137 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-25 05:59:15 +00:00
20dc5d57cf
force key length to 8, pad if less and truncate if more
...
git-svn-id: file:///home/svn/framework3/trunk@11131 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-24 20:57:26 +00:00
1fda94f438
improve error reporting
...
git-svn-id: file:///home/svn/framework3/trunk@11121 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-24 06:09:36 +00:00
db28497900
add an extra check for JAVA_HOME
...
git-svn-id: file:///home/svn/framework3/trunk@11118 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-24 01:11:17 +00:00
fb79d97bca
Allow for things external to a scanner module to come in an kill all the threads with the mod.seppuko!() method.
...
git-svn-id: file:///home/svn/framework3/trunk@11117 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-24 00:08:39 +00:00
7581ce0153
try the payload's arch/platform if we don't have an associated exploit
...
git-svn-id: file:///home/svn/framework3/trunk@11116 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-23 20:37:32 +00:00
b3b43bbb8b
fix a bug in arch detection when an EncodedPayload's pinst is an EncodedPayload instead of a Payload
...
git-svn-id: file:///home/svn/framework3/trunk@11115 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-23 20:34:27 +00:00
fc5fcaea57
Handle unlicensed nexpose instances better
...
git-svn-id: file:///home/svn/framework3/trunk@11109 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-23 05:03:58 +00:00
23a6874954
add support for browsers other than firefox, starting with sensible-browser to try to use the system default. fixes #3059 , thanks Larry Wert for the patch
...
git-svn-id: file:///home/svn/framework3/trunk@11108 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-23 04:42:59 +00:00
9c668b8daf
Super-duper rservices commit -
...
1. Added rsh, rlogin, and rexec auth brute scanners
2. Login negotation moved into new Msf::Auxiliary::Login mixin
3. Centralized session registration for auth brute scanners
4. Telnet and SSH auth brute scanners updated to use new mixins
5. Previously committed rservices mixin (r11093)
git-svn-id: file:///home/svn/framework3/trunk@11106 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-23 01:23:24 +00:00
04f9aec2d8
Pass framework into the TcpReverseDoubleSessionChannel class
...
git-svn-id: file:///home/svn/framework3/trunk@11100 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 19:18:24 +00:00
9df192497b
make sure we're not turning nil into [nil], since it breaks the arch detection
...
git-svn-id: file:///home/svn/framework3/trunk@11098 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 17:48:35 +00:00
14e147c931
add the rservices mixin
...
git-svn-id: file:///home/svn/framework3/trunk@11093 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 13:18:02 +00:00
b495ca8aab
add a mixin for pdf gen, see #2841
...
git-svn-id: file:///home/svn/framework3/trunk@11092 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 12:21:49 +00:00
2e72926638
Add audio (microphone) recording support to stdapi.
...
git-svn-id: file:///home/svn/framework3/trunk@11087 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 00:32:39 +00:00
4c93eb974f
this fixes #3602 , incompatabilities TBD
...
git-svn-id: file:///home/svn/framework3/trunk@11077 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 22:36:38 +00:00
51fd4fb550
this fixes #3602 , incompatabilities TBD
...
git-svn-id: file:///home/svn/framework3/trunk@11076 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 22:32:29 +00:00
b5c5e21b24
this fixes #3602 , incompatabilities TBD
...
git-svn-id: file:///home/svn/framework3/trunk@11075 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 22:28:35 +00:00
fe9710b836
add a rand: special case for OptAddress options
...
git-svn-id: file:///home/svn/framework3/trunk@11071 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 18:31:14 +00:00
1c5481dcfb
add a method for getting the full uri from an HttpServer to complement get_resource
...
git-svn-id: file:///home/svn/framework3/trunk@11069 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 18:15:20 +00:00
9d0cf722fa
Spelling!
...
git-svn-id: file:///home/svn/framework3/trunk@11042 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-14 20:00:52 +00:00
77bc5cf6cd
Big VNC update:
...
* Created Rex::Proto::RFB
* Updated vnc_none_auth scanner to use Rex::Proto::RFB::Client
* Added vnc_login (refactored from carstein)
* Created an initial vnc_passwords.txt file
* Removed cipher/des.rb - incompatible license
* Updated getvncpw script to use new Rex::Proto::RFB::Cipher.decrypt
git-svn-id: file:///home/svn/framework3/trunk@11033 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-14 03:37:45 +00:00
4c69fc7b84
Fix typo
...
git-svn-id: file:///home/svn/framework3/trunk@11028 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:58:24 +00:00
432a2e0ee8
Nuke the old mixin
...
git-svn-id: file:///home/svn/framework3/trunk@11027 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:55:53 +00:00
dc5116f9df
Move the crawler mixin to an auxiliary
...
git-svn-id: file:///home/svn/framework3/trunk@11026 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:55:19 +00:00
f457ccb8f7
Add the crawler mixin and a sample form extractor crawler
...
git-svn-id: file:///home/svn/framework3/trunk@11025 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:40:56 +00:00
bc2d43d86d
Raise thread errors instead of eating them
...
git-svn-id: file:///home/svn/framework3/trunk@11024 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:22:40 +00:00
54f3563c7e
Store the http request in the http response object when Rex::HTTP::Client.send_recv() is used. Let Anemone store the request as well, passing it into the Page object for further analysis.
...
git-svn-id: file:///home/svn/framework3/trunk@11023 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 05:25:39 +00:00
510f61ac37
A working Rex backend for Anemone
...
git-svn-id: file:///home/svn/framework3/trunk@11022 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 05:20:51 +00:00
a0b76b1979
This merges in support for Rex sockets to anemone
...
git-svn-id: file:///home/svn/framework3/trunk@11016 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 03:33:36 +00:00
375a655317
Fix windows platform detection
...
git-svn-id: file:///home/svn/framework3/trunk@11012 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 19:46:33 +00:00
29073a519a
Small tweaks to the thread code, add an update method
...
git-svn-id: file:///home/svn/framework3/trunk@11011 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 17:28:40 +00:00
9df4c2bccf
don't fail if we were given a peerhost of 'Remote Pipe'. Fixes #3049 , thanks Raphael M for the patch
...
git-svn-id: file:///home/svn/framework3/trunk@11010 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 16:43:00 +00:00
a12d9f8dbf
This patch adds detailed thread tracking across the metasploit framework, along with a new console command (threads) to manage these. This level of tracking is required to accurately monitor background tasks, assist with debugging, and kill orphaned threads.
...
git-svn-id: file:///home/svn/framework3/trunk@11003 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 06:19:49 +00:00
b171d5192e
Changes to handle errors and to output print
...
git-svn-id: file:///home/svn/framework3/trunk@11001 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 01:27:15 +00:00
326dc42bca
add EncodedPayload#encoded_exe, encoded_jar, and encoded_war. simplifies exploits that need java and native payloads. see #406 and #3009
...
git-svn-id: file:///home/svn/framework3/trunk@10999 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 23:01:35 +00:00
3992eb7ef8
Mass RE-update: fix all framework URL references
...
git-svn-id: file:///home/svn/framework3/trunk@10998 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 22:43:22 +00:00
594a46bfc7
Merge webcam extension into stdapi.
...
git-svn-id: file:///home/svn/framework3/trunk@10997 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 22:36:54 +00:00
9fc6f2f3a3
Mass update: fix all framework URL references
...
git-svn-id: file:///home/svn/framework3/trunk@10996 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 22:25:13 +00:00
8afc9ebb41
Revert, this is causing threading issues with Windows.
...
git-svn-id: file:///home/svn/framework3/trunk@10989 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 19:54:27 +00:00
3edccbc118
fix help message
...
git-svn-id: file:///home/svn/framework3/trunk@10986 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 16:55:36 +00:00
b143c8eac1
Only load priv on win32/win64 sessions
...
git-svn-id: file:///home/svn/framework3/trunk@10984 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 16:15:26 +00:00
0b8f0c51bc
use a random name for the app if one is not supplied
...
git-svn-id: file:///home/svn/framework3/trunk@10976 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-10 23:35:02 +00:00
4aae717312
only need metasploit.dat in WEB-INF/classes/
...
git-svn-id: file:///home/svn/framework3/trunk@10975 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-10 23:22:00 +00:00
75cd356803
a less obnoxious .inspect
...
git-svn-id: file:///home/svn/framework3/trunk@10974 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-10 23:04:01 +00:00
73d9135c91
merge patch from Larry Wert, fixes #2510
...
git-svn-id: file:///home/svn/framework3/trunk@10955 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-09 02:31:21 +00:00
db602dd478
Add functional in-memory webcam support.
...
git-svn-id: file:///home/svn/framework3/trunk@10954 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-09 02:24:28 +00:00
dc9274229a
Reapply Yoann's patch from r7247 to the new tree
...
git-svn-id: file:///home/svn/framework3/trunk@10953 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 22:51:29 +00:00
bed66d4f64
Change the default domain to "." (local host) from WORKGROUP. Suggestion from Rob Fuller (mubix)
...
git-svn-id: file:///home/svn/framework3/trunk@10952 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 20:07:17 +00:00
d75e7885d4
remove has_badchars? in favor of Rex::Text.badchar_index
...
git-svn-id: file:///home/svn/framework3/trunk@10949 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 17:00:07 +00:00
2037262950
turn verbosity off by default
...
git-svn-id: file:///home/svn/framework3/trunk@10948 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 16:59:20 +00:00
5c692aa034
genericize the message since we now support LOGIN as well as PLAIN
...
git-svn-id: file:///home/svn/framework3/trunk@10945 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 05:03:15 +00:00
289c068f2a
add support for LOGIN authentication, thanks Ricardo Gandara for the patch. fixes #3072
...
git-svn-id: file:///home/svn/framework3/trunk@10944 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 05:01:18 +00:00
8f4cb4fbf6
Merge Zate Berg's latest patch
...
git-svn-id: file:///home/svn/framework3/trunk@10938 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-07 01:57:17 +00:00
bc983ea52c
Run meterpreter GUI commands in background to not interfere with active shell or other channel interaction.
...
Also simplify calling commands in file browser and process viewer.
git-svn-id: file:///home/svn/framework3/trunk@10929 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 16:51:48 +00:00
dc43689578
Make a note about the second callback
...
git-svn-id: file:///home/svn/framework3/trunk@10926 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 04:48:41 +00:00
1460e7134b
Merge in some minor tweaks to Anemone, overhaul to the HTTP class still in the works
...
git-svn-id: file:///home/svn/framework3/trunk@10925 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 04:45:27 +00:00
b3cc6e19b6
Initial import of an Anemone snapshot
...
git-svn-id: file:///home/svn/framework3/trunk@10924 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 04:34:43 +00:00
f6415186a8
Adds the imported_creds table.
...
git-svn-id: file:///home/svn/framework3/trunk@10923 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 01:01:20 +00:00
cf70f322d0
This minor syntax change allows rubinius to at least start the console
...
git-svn-id: file:///home/svn/framework3/trunk@10921 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-05 21:16:33 +00:00
8353bf7bf3
move 100-continue processing into Rex, fixes #3109
...
git-svn-id: file:///home/svn/framework3/trunk@10919 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-05 16:20:13 +00:00
66fd9f71b7
Typo.
...
git-svn-id: file:///home/svn/framework3/trunk@10906 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 23:05:01 +00:00
fe03497d57
Make tab completion work for meterpreter sessions over rpc.
...
git-svn-id: file:///home/svn/framework3/trunk@10905 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 23:01:03 +00:00
bbfcaefffb
Fix the double-up data directory
...
git-svn-id: file:///home/svn/framework3/trunk@10903 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 22:12:50 +00:00
652764ebd3
Merge in nCircle support from Dave Lassalle, handle file reads more consistently
...
git-svn-id: file:///home/svn/framework3/trunk@10902 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 21:44:16 +00:00
e6da9729c0
Handle invalid dates
...
git-svn-id: file:///home/svn/framework3/trunk@10888 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-03 15:31:28 +00:00
97d7290440
Fix an inadvertant change to close_key()
...
git-svn-id: file:///home/svn/framework3/trunk@10878 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-03 04:20:42 +00:00
1e4eed0559
Let recursive downloads skip over locked files
...
git-svn-id: file:///home/svn/framework3/trunk@10877 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-03 03:16:23 +00:00
fba2cb6d2d
Remove the response wait for close calls triggered by the finalizer, should help in a few corner cases that currently result in a timeout or hang.
...
git-svn-id: file:///home/svn/framework3/trunk@10876 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-03 03:03:29 +00:00
b15ba92567
Add rank; fix issue with searching.
...
git-svn-id: file:///home/svn/framework3/trunk@10873 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 23:35:12 +00:00
90500eebd1
Enable running scripts independent of console state. Fixes issue with running scripts from GUI while shell/channel is active.
...
git-svn-id: file:///home/svn/framework3/trunk@10872 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 23:33:22 +00:00
8e44f66d31
add a simple method for adding multiple files to a Jar from the file system. may eventually bubble this up to Rex::Zip::Archive
...
git-svn-id: file:///home/svn/framework3/trunk@10871 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 23:10:35 +00:00
db4c6ae246
Properly show compatible payloads. Important for cross-platform exploits.
...
git-svn-id: file:///home/svn/framework3/trunk@10870 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 22:41:49 +00:00
33e11421b4
fix sytax error bugs in dhcp server
...
git-svn-id: file:///home/svn/framework3/trunk@10868 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 22:37:11 +00:00
492268b066
See #3104 . Make exporting/importing funny characters more convenient. Export inactive credentials by default.
...
git-svn-id: file:///home/svn/framework3/trunk@10867 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 22:11:45 +00:00
6048580919
See #3104 . This adds a parser for the file format created in r10862, so that these exported credentials can be read back in to Metasploit.
...
git-svn-id: file:///home/svn/framework3/trunk@10866 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 21:27:26 +00:00
313317224f
fix keys, not hashes, in db_export
...
git-svn-id: file:///home/svn/framework3/trunk@10863 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 19:18:37 +00:00
754d1a3b90
Fixes #3104 . Adds the "pwdump" format to db_export.
...
git-svn-id: file:///home/svn/framework3/trunk@10862 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 19:13:15 +00:00
761acdc419
Fixes the db_export command to deal with nil values as self-closed tags (rather than NULL) and to correctly handle some binary values.
...
git-svn-id: file:///home/svn/framework3/trunk@10854 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-01 16:11:37 +00:00
245cfd3b61
Fixed problem when running cmd_exec in PHP Meterpreter on Linux
...
git-svn-id: file:///home/svn/framework3/trunk@10850 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-31 00:32:03 +00:00
9432991951
Rescue if priv is not available
...
git-svn-id: file:///home/svn/framework3/trunk@10848 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-30 19:37:01 +00:00
0f8a6b138b
Remove the IsAdmin check for now, always load priv instead. This works around a performance issue with railgun demand loading, once thats fixed we can re-enable
...
git-svn-id: file:///home/svn/framework3/trunk@10844 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-29 04:14:22 +00:00
dc4b7b6641
Fixes #3067 . Raise DBImportErrors when the contents of a zip archive isn't a Metasploit ZIP report.
...
git-svn-id: file:///home/svn/framework3/trunk@10842 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-28 15:59:40 +00:00
5fc69f1597
Fix charset handling, fixes #3053 , thanks Rami
...
git-svn-id: file:///home/svn/framework3/trunk@10818 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-25 14:57:30 +00:00
2021b1628e
Nod to http://videos.revision3.com/revision3/web/hak5/0810/hak5--0810--ipv6-mubix-metasploit--hd720p30.h264.mp4 @ 20:00
...
git-svn-id: file:///home/svn/framework3/trunk@10809 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-24 18:26:02 +00:00
c03da4fedf
add -y to db_connect, fixes #3046
...
git-svn-id: file:///home/svn/framework3/trunk@10802 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-23 23:20:43 +00:00
ed52da9ee9
automatically load ~/.msf3/database.yml if it exists, see #3046
...
git-svn-id: file:///home/svn/framework3/trunk@10800 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-23 22:51:28 +00:00
a2801e5dc1
Add detach/kill support to interacting meterpreter channels over RPC. Also clean some duplicated code in session interaction.
...
git-svn-id: file:///home/svn/framework3/trunk@10794 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-23 17:05:48 +00:00
745f31b20f
make the sessions command a little more useful, see #2097
...
git-svn-id: file:///home/svn/framework3/trunk@10791 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-23 00:02:09 +00:00
e3dac1d148
Add search option to find modules with specific options, or specific default values.
...
git-svn-id: file:///home/svn/framework3/trunk@10790 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-22 22:59:31 +00:00
27cc50f29a
missed this in the java payload updates, r10781
...
git-svn-id: file:///home/svn/framework3/trunk@10786 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-22 20:40:25 +00:00
56839ccf36
stupid debug prints
...
git-svn-id: file:///home/svn/framework3/trunk@10782 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-22 10:24:28 +00:00
f33d7cc670
revamp java payloads and make shells work with tomcat_mgr_deploy. tested java_trusted_chain and java_tester to verify that this doesn't break other java payload usage. see #3009 and #2973 , meterpreter doesn't work yet, so not marking resolved.
...
git-svn-id: file:///home/svn/framework3/trunk@10781 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-22 10:19:51 +00:00
2dbf731946
fix ArgumentError in everything that closes a process handle
...
git-svn-id: file:///home/svn/framework3/trunk@10776 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-21 17:10:46 +00:00
0e04505232
Fixes #3027 , a set of bugs introduced during the meterpreter posix work.
...
git-svn-id: file:///home/svn/framework3/trunk@10773 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-21 04:43:54 +00:00
3ece16e0d9
3.5.0 is out! back to work :)
...
git-svn-id: file:///home/svn/framework3/trunk@10771 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-21 00:48:17 +00:00
869d930588
Bugfix for db_events. Fixes #2982 .
...
git-svn-id: file:///home/svn/framework3/trunk@10770 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 23:32:42 +00:00
fe410df0fd
mark this rev as release. Releasesvn diff lib/msf/core/framework.rb
...
git-svn-id: file:///home/svn/framework3/trunk@10765 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 12:05:10 +00:00
44fa5c67a6
fix a latent issue with windows paths surrounded by quotes
...
git-svn-id: file:///home/svn/framework3/trunk@10763 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 09:50:12 +00:00
182943fe6c
This change allows IPv6 addresses to be ignored by passing false as a second parameter to getaddress()
...
git-svn-id: file:///home/svn/framework3/trunk@10761 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 01:27:00 +00:00
cafb8d1ac2
Yield back on pages, vulns, forms, and sites
...
git-svn-id: file:///home/svn/framework3/trunk@10760 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 01:13:26 +00:00
9d99bf1039
Store the original error code in the RequestError object as well, use this code to determine whether to raise a connect error or not
...
git-svn-id: file:///home/svn/framework3/trunk@10759 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 01:05:50 +00:00
c27749db8e
add default lookup_error function, fixes #2993
...
git-svn-id: file:///home/svn/framework3/trunk@10757 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-19 22:53:15 +00:00
bf28203159
Try to recover from binary in the XML import, report in the dlog if you run into trouble.
...
git-svn-id: file:///home/svn/framework3/trunk@10756 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-19 22:51:37 +00:00
432f235cfd
dont use the module table anymore
...
git-svn-id: file:///home/svn/framework3/trunk@10749 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-19 15:03:30 +00:00
f5f7f555b0
Allow a database config file to be specified
...
git-svn-id: file:///home/svn/framework3/trunk@10743 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-19 07:51:58 +00:00
1a03e528fa
Fix for properly backgrounding shell sessions over RPC.
...
git-svn-id: file:///home/svn/framework3/trunk@10740 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-19 00:15:37 +00:00
a7a769c443
Fixes #2984 by taking a 1/8th of a second nap.
...
git-svn-id: file:///home/svn/framework3/trunk@10733 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 21:08:48 +00:00
10a36d9398
Fixes #2979 . The bug is triggered when the en locale is used in activerecord -- this fix appears to have no ill effects when both the /vendor version or a local (current) version of i18n is installed, since the percent notation appears to be okay for both versions. In any event, db_nmap 127.0.0.1 fails correctly for both.
...
git-svn-id: file:///home/svn/framework3/trunk@10731 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 19:58:56 +00:00
2d6b995623
rename/clarify PrintfUtil encoder, fixes #2308
...
git-svn-id: file:///home/svn/framework3/trunk@10729 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 15:41:13 +00:00
e114f373b0
move content-disposition header before content-type, per rfc1867 examples
...
git-svn-id: file:///home/svn/framework3/trunk@10724 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 07:01:54 +00:00
f88033f0cc
Merge in R3L1K's Powershell enhancements and powerdump code (hashdump through powershell)
...
git-svn-id: file:///home/svn/framework3/trunk@10721 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-17 17:39:43 +00:00
6e118045eb
Patch from scriptjunkie to enable EXITFUNC=none; this is only useful in some limited situations, but was requested. Fixes #2969
...
git-svn-id: file:///home/svn/framework3/trunk@10720 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-17 05:40:56 +00:00
59b2620d2c
This commit adds the db_export command, which will export a workspace as an XML file. This can be re-imported with db_import
...
git-svn-id: file:///home/svn/framework3/trunk@10718 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-17 04:50:15 +00:00
9a4caf65a1
add ua fingerprinting for chrome and opera
...
git-svn-id: file:///home/svn/framework3/trunk@10717 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-17 04:35:44 +00:00
467fceb2a7
Fixes #2692 by retrying writes when the sendQ is full.
...
git-svn-id: file:///home/svn/framework3/trunk@10712 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-16 21:50:03 +00:00
3e09fc30ae
Fixes #2070 by adding finalizers to process, event, thread, registry, and channels.
...
git-svn-id: file:///home/svn/framework3/trunk@10711 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-16 19:39:11 +00:00
54df2c1e6c
Fixes #2977 ; error when checking non-interactive channels.
...
git-svn-id: file:///home/svn/framework3/trunk@10704 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-16 15:21:06 +00:00
4f40459498
Support backgrounding/killing active channels in meterpreter sessions; and not just the sessions themselves.
...
git-svn-id: file:///home/svn/framework3/trunk@10699 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-15 22:38:06 +00:00
f7bb3b82de
Fixes #2952 . Instead of raising an error when we hit the end of all possibles in converge_sets, just return what's left in the buffer, since it happens to be right anyway.
...
The associated test cases demonstrate that this doesn't cause any trouble (even with silly values) and nothing uses converged_sets except for pattern_create.
git-svn-id: file:///home/svn/framework3/trunk@10696 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-15 19:40:33 +00:00
303fa4784f
Allow multiple workspaces to be added/deleted with one command. ( fixes #2554 )
...
* db_workspace -a one two three
* db_workspace -d one two three
git-svn-id: file:///home/svn/framework3/trunk@10695 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-15 18:06:21 +00:00
865b711b5c
Fixes #2974 . Adds an "Unknown" level to Exploit::CheckCode, fixes the URI check for exploit/unix/webapp/php_include (which was relying on Unknown).
...
git-svn-id: file:///home/svn/framework3/trunk@10694 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-15 12:24:17 +00:00
87d2b6dfe5
Squash bug with service mixins & lazy loading of advapi32 exports.
...
git-svn-id: file:///home/svn/framework3/trunk@10692 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-15 05:25:53 +00:00
4e14aa1842
try to load win32api regardless of ruby version, so we correctly fall back to unixy stty stuff
...
git-svn-id: file:///home/svn/framework3/trunk@10687 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 19:35:41 +00:00
b10c04b865
Purge the old GTK code since we have a much nicer gui via Java now.
...
git-svn-id: file:///home/svn/framework3/trunk@10686 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 18:56:32 +00:00
238242ecb9
add latest nessus plugin patches from Zate, fixes #2704
...
git-svn-id: file:///home/svn/framework3/trunk@10685 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 18:54:35 +00:00
e9df13c761
Reapply ActiveRecord patch from r9281 & r9282
...
git-svn-id: file:///home/svn/framework3/trunk@10684 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 18:45:51 +00:00
bd3bdfba00
Reapply ActiveRecord patch from r8017
...
git-svn-id: file:///home/svn/framework3/trunk@10683 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 18:45:44 +00:00
756e6d2ad8
Remove unsupported msfweb interface. ( fixes #503 )
...
* This will significantly decrease the size of the msf install (~5 MB)
* ActiveRecord & ActiveSupport are still used, and have been moved to lib/
git-svn-id: file:///home/svn/framework3/trunk@10682 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 18:45:16 +00:00
a10b3cf9fc
getch() blocks all background threads until the user hits a key, make sure there is something there to read before calling it. also, use the windowsy stuff on mingw since official ruby installer uses mingw now. this fixes a long-standing bug on windows that originally forced us to use cygwin.
...
git-svn-id: file:///home/svn/framework3/trunk@10681 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 18:38:59 +00:00
ebfe771872
Fixes #2261 . Provide input stream for interacting with channels.
...
git-svn-id: file:///home/svn/framework3/trunk@10674 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 00:22:45 +00:00
0477789bee
Update to reflect the next target stable release
...
git-svn-id: file:///home/svn/framework3/trunk@10669 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-13 07:59:10 +00:00
c7fc361140
apply patch from Peter, see #684
...
git-svn-id: file:///home/svn/framework3/trunk@10657 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 17:29:35 +00:00
567e42fafa
Three more minor changs to ensure that HTTP response data is always treated as binary.
...
git-svn-id: file:///home/svn/framework3/trunk@10654 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 16:29:35 +00:00
dbbd0dc07e
This ensures that even if some wonky string encoding is passed as the body of a HTTP reply, it will be treated as binary. Fixes some of the HTTP Server exploits on Windows
...
git-svn-id: file:///home/svn/framework3/trunk@10653 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 16:16:39 +00:00
0b82de4846
Force binmode for Tempfile use to prevent issues with Windows
...
git-svn-id: file:///home/svn/framework3/trunk@10650 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 01:48:42 +00:00
2d425d2e67
Make our Quickfile's always binary mode
...
git-svn-id: file:///home/svn/framework3/trunk@10649 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 01:42:08 +00:00
026d411660
fix silly test bug
...
git-svn-id: file:///home/svn/framework3/trunk@10648 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 00:27:35 +00:00
7b576be821
only create the database if it doesn't exist
...
git-svn-id: file:///home/svn/framework3/trunk@10646 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-11 23:48:53 +00:00
b6c4d1fc00
add web_urihost
...
git-svn-id: file:///home/svn/framework3/trunk@10640 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-11 05:56:18 +00:00
6f981e7b08
Add missing confidence field from import
...
git-svn-id: file:///home/svn/framework3/trunk@10636 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-11 03:35:15 +00:00
5a2444eb24
Clean up web_vuln import, use additional fields
...
git-svn-id: file:///home/svn/framework3/trunk@10635 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-11 02:57:07 +00:00
e7fe407106
Update to the report_web_vuln method to take into account the schema update
...
git-svn-id: file:///home/svn/framework3/trunk@10632 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-10 19:36:31 +00:00
8ffe70c2a8
include the local path so you can just require lab_controller in irb
...
git-svn-id: file:///home/svn/framework3/trunk@10630 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-10 02:22:50 +00:00
c76f88245d
Cleaned up the gidance on the labs, and fixed the lab.rb require
...
git-svn-id: file:///home/svn/framework3/trunk@10629 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-10 02:18:41 +00:00
39be54970b
Fix a typo in the exception handler
...
git-svn-id: file:///home/svn/framework3/trunk@10625 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 22:09:35 +00:00
b99be2dae6
Unbreak this
...
git-svn-id: file:///home/svn/framework3/trunk@10621 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 18:27:09 +00:00
f19be2ca3f
Try harder to figure out who ran the module
...
git-svn-id: file:///home/svn/framework3/trunk@10620 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 18:11:11 +00:00
abf19e002d
tweak the models
...
git-svn-id: file:///home/svn/framework3/trunk@10618 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 08:35:41 +00:00
8aa73c2951
add a filename
...
git-svn-id: file:///home/svn/framework3/trunk@10616 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 03:50:04 +00:00
014ed847b2
actually save the campaign
...
git-svn-id: file:///home/svn/framework3/trunk@10609 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 20:32:32 +00:00
dbcd8619e1
break report_user_agent into a fingerprint method and a report method, pass extra arguments on to report_client
...
git-svn-id: file:///home/svn/framework3/trunk@10608 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 20:28:14 +00:00
d6f8b689ee
fix bug in default case
...
git-svn-id: file:///home/svn/framework3/trunk@10606 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 19:49:57 +00:00
e408d5a155
add windows error messages for windows meterpreter sessions, minor cleanups
...
git-svn-id: file:///home/svn/framework3/trunk@10605 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 19:36:34 +00:00
504be7e7e2
Dont put the load_priv into the timeout block
...
git-svn-id: file:///home/svn/framework3/trunk@10603 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 17:31:08 +00:00
988bbd13f1
associate clients with a campaign
...
git-svn-id: file:///home/svn/framework3/trunk@10601 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 17:20:57 +00:00
7f9fe3b527
bring metasm to tip
...
git-svn-id: file:///home/svn/framework3/trunk@10600 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 16:01:37 +00:00
d8b9cf5cac
Slight speed improvement to request processing
...
git-svn-id: file:///home/svn/framework3/trunk@10599 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 06:14:44 +00:00
41183d3395
Bump the packet queue timeout as well (10 minutes), which should handle even the worst lag
...
git-svn-id: file:///home/svn/framework3/trunk@10598 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 05:00:03 +00:00
9489c2fa58
Note on thread safety
...
git-svn-id: file:///home/svn/framework3/trunk@10597 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 04:55:06 +00:00
9e01b0f4e5
Fix a race condition in concurrent session handling
...
git-svn-id: file:///home/svn/framework3/trunk@10596 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 04:46:53 +00:00
2e9138ebbc
This commit overhauls much of the meterpreter timeouts and staging processes. This fixes a bug with concurrent session handling, reduces CPU load by caching a single SSL certificate for all sessions, increases all of the critical timeouts, and generally makes mass ownage work better. We still need to limit the maximum number of concurrent on_session() threads to something sane to prevent sesssion spikes from dragging out the process even longer. The C-side meterpreter change is minimal and will only help with future compatibility if we move to non-blocking fd's for the SSL socket.
...
git-svn-id: file:///home/svn/framework3/trunk@10595 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 04:11:47 +00:00
e4a00b2fd1
Handle a larger backlog
...
git-svn-id: file:///home/svn/framework3/trunk@10594 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 03:20:09 +00:00
754225a80d
Implement per dispatch run channel_write of packets, remove __FUNCTION__ due to dprintf changes, and fix shutting down networkpug interfaces. Re-add networkpug binary.
...
git-svn-id: file:///home/svn/framework3/trunk@10586 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 11:52:38 +00:00
6a47af814a
Basic, still buggy support for NetSparker XML
...
git-svn-id: file:///home/svn/framework3/trunk@10585 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 06:24:26 +00:00
1afba58f94
Fix typos
...
git-svn-id: file:///home/svn/framework3/trunk@10584 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 04:16:48 +00:00
2e25245e9b
Remove threading, caused slowdowns
...
git-svn-id: file:///home/svn/framework3/trunk@10583 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 03:57:51 +00:00
3250ab13e0
Add a parser for Retina XML
...
git-svn-id: file:///home/svn/framework3/trunk@10582 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 02:33:57 +00:00
eb6da40f69
fix thread rssh param, indentation, rescue close errors
...
git-svn-id: file:///home/svn/framework3/trunk@10581 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 00:12:12 +00:00
352b4cf1c8
Dispatch incoming requests as threads
...
git-svn-id: file:///home/svn/framework3/trunk@10579 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 23:20:13 +00:00
eee1e52f14
remove extra padding that messes everything up
...
git-svn-id: file:///home/svn/framework3/trunk@10577 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 21:44:23 +00:00
b98732ae0a
This change allows the auth modules to automatically remove their input files when requested. This makes scripting with temporary files much easier
...
git-svn-id: file:///home/svn/framework3/trunk@10576 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 21:04:16 +00:00
cbcebc0cc8
Bug fixes to the importer
...
git-svn-id: file:///home/svn/framework3/trunk@10575 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 20:24:26 +00:00
da459f7712
fix typo
...
git-svn-id: file:///home/svn/framework3/trunk@10574 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 19:42:14 +00:00
87cc978ed9
fix/redo OLD_DHGEX compat
...
git-svn-id: file:///home/svn/framework3/trunk@10573 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 19:40:13 +00:00
64ad40dc17
oops, the transport socket was getting removed prematurely, causing interact fail
...
git-svn-id: file:///home/svn/framework3/trunk@10572 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 19:39:16 +00:00
af28507c36
Cleaner regex
...
git-svn-id: file:///home/svn/framework3/trunk@10571 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 18:10:39 +00:00
222c418fee
Accept MetasploitV4 as well as a base tag, preparing for 3.5.0
...
git-svn-id: file:///home/svn/framework3/trunk@10570 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 18:09:06 +00:00
0127137151
Reorganize methods and add recognition of v4
...
git-svn-id: file:///home/svn/framework3/trunk@10569 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 18:00:21 +00:00
1e75603894
Add a Quickfile class that is identical to Tempfile except for the finalizer
...
git-svn-id: file:///home/svn/framework3/trunk@10568 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 17:57:56 +00:00
4e7e69f768
Avoid GC issue with Tempfiles in meterpreter's command dispatcher.
...
git-svn-id: file:///home/svn/framework3/trunk@10567 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 17:26:33 +00:00
fd0195133d
add socket so cleanup happens
...
git-svn-id: file:///home/svn/framework3/trunk@10566 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 16:59:57 +00:00
683a82bfee
Switch out msfx/msfe terminology for just msf
...
git-svn-id: file:///home/svn/framework3/trunk@10565 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 15:55:28 +00:00
e492136567
Handle slightly malformed MSFX zip imports. This introduces the nils_for_nulls function that basically takes any instance of NULL in the XML of an MSFX import and turns it into a proper Ruby nil. This helps avoid a lot of problems for reports that were created with NULLs accidentally included.
...
git-svn-id: file:///home/svn/framework3/trunk@10563 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 05:10:16 +00:00
7041102df7
Fixes #2848 , uses the half-guessing method of figuring out the "right" protocol.
...
git-svn-id: file:///home/svn/framework3/trunk@10562 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 04:18:01 +00:00
bf4cda0374
add a disclosure date column to module list (search and 'show exploits' output), fixes #2090
...
git-svn-id: file:///home/svn/framework3/trunk@10555 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-05 22:32:21 +00:00
e2ed2f0d75
Fix a long-standing issue with Resolv.getaddress() being broken on Ruby 1.9.1 Windows
...
git-svn-id: file:///home/svn/framework3/trunk@10544 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 14:49:19 +00:00
8fe655fce7
add unknown command override, see #2793
...
git-svn-id: file:///home/svn/framework3/trunk@10542 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 08:05:09 +00:00
3b99c58cb1
Drop this to 75 to take into account other processes accessing the same db. Theoretically the AR pool manager will kick in when this is hit anyways
...
git-svn-id: file:///home/svn/framework3/trunk@10541 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 07:11:07 +00:00
31b8fcf7f2
Reduce the default pool size to match reasonable database limits
...
git-svn-id: file:///home/svn/framework3/trunk@10540 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 06:55:34 +00:00
4a12f9529e
Choose a reasonable default if none is set
...
git-svn-id: file:///home/svn/framework3/trunk@10539 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 04:50:10 +00:00
f69a1190a4
Commit the EICAR Canary check for meddling AVs
...
git-svn-id: file:///home/svn/framework3/trunk@10536 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 03:07:58 +00:00
adeae9fdec
Expose ReverseListenerComm to the reverse_https and passivex handlers as well
...
git-svn-id: file:///home/svn/framework3/trunk@10535 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 02:17:09 +00:00
1b4190df38
This commit brings configurability to TCP Servers as to which Comm they use. The ReverseListenerComm and ListenerComm advanced options can be used to prevent a given listener from trying to bind a listener over the pivoted routed. This is useful for a number of situations and not possible to configure explicitly before.
...
git-svn-id: file:///home/svn/framework3/trunk@10534 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 02:11:22 +00:00
6a06a95f2f
Faster unique form sort
...
git-svn-id: file:///home/svn/framework3/trunk@10532 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-03 03:34:58 +00:00
555f6840fa
Remove the port when its the default for the protocol
...
git-svn-id: file:///home/svn/framework3/trunk@10531 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-03 01:57:07 +00:00
02b1979c27
Tweaks for vuln reporting
...
git-svn-id: file:///home/svn/framework3/trunk@10530 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-03 01:04:33 +00:00
6319d95456
Actually store the additional fields
...
git-svn-id: file:///home/svn/framework3/trunk@10529 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-03 00:45:44 +00:00
ddcb07bf97
Typos
...
git-svn-id: file:///home/svn/framework3/trunk@10528 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-03 00:23:18 +00:00
8a567dd3a8
Add query to web_form/web_path
...
git-svn-id: file:///home/svn/framework3/trunk@10526 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-02 22:55:54 +00:00
8a0fdf7e14
Add some helper methods to the workspace
...
git-svn-id: file:///home/svn/framework3/trunk@10524 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-02 19:52:50 +00:00
5b7296931d
This patch merges in support for four new database tables focused on tracking web application information along with a tweak to the task manager code to allow tasks to be run from within tasks without fear of deadlock.
...
git-svn-id: file:///home/svn/framework3/trunk@10523 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-02 18:48:29 +00:00
86f6ecdadd
add bools
...
git-svn-id: file:///home/svn/framework3/trunk@10517 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-01 13:36:32 +00:00
6743dbfc62
Actually respect the allow_yaml status for imports on everything that might be serialized, and also streamlines unserialized_object a little.
...
git-svn-id: file:///home/svn/framework3/trunk@10505 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-28 17:52:48 +00:00
7409e34738
See #2717 . Fixes session reaping (VNC, specifically)
...
git-svn-id: file:///home/svn/framework3/trunk@10502 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-28 15:06:09 +00:00
ddb2f71674
Ensuring binary file reads, always.
...
git-svn-id: file:///home/svn/framework3/trunk@10501 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-28 03:13:10 +00:00
dc79d360ac
Quick fix to avoid dying on badly formatted imported data (looks like a Nessus import problem, actually)
...
git-svn-id: file:///home/svn/framework3/trunk@10499 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-27 23:06:13 +00:00
331f7a7b26
Handles REXML::ParseErrors without making a terrible mess.
...
git-svn-id: file:///home/svn/framework3/trunk@10497 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-27 15:40:33 +00:00
337a0be8fc
adjust templates, move SerializedPrefs into its own file
...
git-svn-id: file:///home/svn/framework3/trunk@10494 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-27 04:12:04 +00:00
7b2a29365f
fix report_note taking a Service obj in opts[:service]
...
git-svn-id: file:///home/svn/framework3/trunk@10493 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-27 03:52:39 +00:00
971d1efcfb
Updated Nessus Plugin lib and formating fixes
...
git-svn-id: file:///home/svn/framework3/trunk@10492 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-27 00:43:40 +00:00
f07f354472
tidy pass on exploit mixins
...
git-svn-id: file:///home/svn/framework3/trunk@10487 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-26 21:02:00 +00:00
e4bef2ce51
turn off payload handler by default for fileformat modules
...
git-svn-id: file:///home/svn/framework3/trunk@10486 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-26 18:28:58 +00:00
14cabd2611
Allow debugging to be enabled.
...
This will make it easier to hopefully track down bugs.
exploitme-posix.c - make complete stack executable. On some kernel versions, execstack doesn't do the trick.
git-svn-id: file:///home/svn/framework3/trunk@10485 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-26 05:58:59 +00:00
784e355d93
Networkpug improvements
...
git-svn-id: file:///home/svn/framework3/trunk@10484 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-26 05:58:48 +00:00
e646176db7
check number of fields before trying to add row
...
git-svn-id: file:///home/svn/framework3/trunk@10482 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-26 04:16:18 +00:00
cdc97316b5
Automatically close dead sessions (finally), also, automatically mark meterpreter sessions as dead when writes start to trigger exceptions
...
git-svn-id: file:///home/svn/framework3/trunk@10475 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-25 03:57:30 +00:00
faf58c2b62
Allows 0.0.0.0/::0 to be used in place of the real "any" address regardless of socket type when the bind address is specified
...
git-svn-id: file:///home/svn/framework3/trunk@10473 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-25 03:28:19 +00:00
3b31f56894
This commit adds a new option to all reverse handlers: ReverseListenerBindAddress. This setting determines exactly what address is bound on the local system
...
git-svn-id: file:///home/svn/framework3/trunk@10472 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-25 03:25:09 +00:00
54c1ec843d
tab complete on scripts in ~/.msf3/scripts/meterpreter/ as well. fixes #2403
...
git-svn-id: file:///home/svn/framework3/trunk@10468 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 23:05:10 +00:00
478a15f827
doc the use of :name for services
...
git-svn-id: file:///home/svn/framework3/trunk@10465 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 21:25:18 +00:00
7878273131
try to preserve the service name in the case of incorrect report_note usage
...
git-svn-id: file:///home/svn/framework3/trunk@10464 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 21:11:36 +00:00
c00d56d560
Deal with services a little more intelligently if they're not already there when you report a note.
...
git-svn-id: file:///home/svn/framework3/trunk@10463 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 20:51:38 +00:00
09cab24dbf
Report_note no longer tries to re-report a service name; it just re-reports port numbers and protocols. This is to avoid unidentifying identified services.
...
git-svn-id: file:///home/svn/framework3/trunk@10458 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 17:52:25 +00:00
84c031d620
document smtp_deliver a little better
...
git-svn-id: file:///home/svn/framework3/trunk@10456 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 16:54:09 +00:00
b3d5e4ddf7
is_admin? Meterpreter Mixin call for win32 and win64 versions of Meterpreter
...
git-svn-id: file:///home/svn/framework3/trunk@10452 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 00:08:05 +00:00
ae48757fd5
new nessus plugin patches from Zate Berg
...
git-svn-id: file:///home/svn/framework3/trunk@10450 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 23:17:13 +00:00
a5527f7757
Typo
...
git-svn-id: file:///home/svn/framework3/trunk@10447 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 12:37:40 +00:00
0cd520b093
Changes for PHP, Java and Linux Meterpreter Channels and fix for registry key case changes depending on windows version.
...
git-svn-id: file:///home/svn/framework3/trunk@10446 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 12:15:59 +00:00
224891387a
add exploit number to prefix
...
git-svn-id: file:///home/svn/framework3/trunk@10443 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 02:16:29 +00:00
87b8b9ae8f
tighten up response code check
...
git-svn-id: file:///home/svn/framework3/trunk@10441 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 01:55:19 +00:00
cabbe1a84a
oops, hehehe -- fixes exe generation
...
git-svn-id: file:///home/svn/framework3/trunk@10440 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 01:43:42 +00:00
5800274b8f
avoid sending email data when the server says it doesn't like our DATA, don't send creds if the server doesn't ask, fix the slowness in TLS
...
git-svn-id: file:///home/svn/framework3/trunk@10438 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-22 22:34:37 +00:00
000c05ff86
allow external control of the arch/platform, fix for aux modules
...
git-svn-id: file:///home/svn/framework3/trunk@10435 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-22 20:55:26 +00:00
2a58f7433e
revamp report_note to compare data in ruby instead of SQL which was causing headaches with serialization
...
git-svn-id: file:///home/svn/framework3/trunk@10432 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-22 05:37:21 +00:00
d1de6fde36
remove _old from filename
...
git-svn-id: file:///home/svn/framework3/trunk@10428 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 17:07:00 +00:00
465fe7c60d
nice work troulouliou, shuffling comments only
...
git-svn-id: file:///home/svn/framework3/trunk@10427 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 16:24:18 +00:00
3204b3ad83
Patch for the SMB timestamp parser which allows it to function in GMT+ zones
...
git-svn-id: file:///home/svn/framework3/trunk@10425 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 14:21:38 +00:00
50241faa57
Implement a sniffer for posix meterpreter using libpcap.
...
This version of the sniffer supports packet filtering after the packet count variable, like so:
meterpreter > sniffer_interfaces
1 - 'eth0' ( type:0 mtu:1514 usable:false dhcp:false wifi:false )
2 - 'any' ( type:0 mtu:1514 usable:false dhcp:false wifi:false )
3 - 'lo' ( type:0 mtu:1514 usable:false dhcp:false wifi:false )
meterpreter > use sniffer
Loading extension sniffer...success.
meterpreter > sniffer_start 1 500000 icmp <-- picks up only icmp packets.
[*] Capture started on interface 1 (500000 packet buffer)
meterpreter > sniffer_stop 1
[*] Capture stopped on interface 1
git-svn-id: file:///home/svn/framework3/trunk@10424 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 11:43:30 +00:00
a179836fca
Initial import of networkpug, a pivoting interface using libpcap to monitor/inject packets on a interface on the remote machine.
...
git-svn-id: file:///home/svn/framework3/trunk@10423 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 09:35:46 +00:00
7a58e611e6
don't log plaintext passwords
...
git-svn-id: file:///home/svn/framework3/trunk@10422 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 07:00:50 +00:00
b8bcc2fedb
Continue processing even if the exploit's on_new_session override triggers an exception
...
git-svn-id: file:///home/svn/framework3/trunk@10413 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 03:05:55 +00:00
001a6ffbdb
really use simple substitution method, oops
...
git-svn-id: file:///home/svn/framework3/trunk@10412 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 02:59:42 +00:00
048b21e3b9
Ensure that errors in the PHPInclude mixin lead to the service being stopped. Handle unreachable services in the php_include module better. Fix database-enabled tab completion to be workspace friendly
...
git-svn-id: file:///home/svn/framework3/trunk@10410 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 02:52:49 +00:00
9f02523ab9
allow forcing use of substitution method
...
git-svn-id: file:///home/svn/framework3/trunk@10408 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 02:34:43 +00:00
eab9c22657
add support for more dll template types
...
git-svn-id: file:///home/svn/framework3/trunk@10407 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 02:32:12 +00:00
837e6e5075
fix inject support
...
git-svn-id: file:///home/svn/framework3/trunk@10406 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 02:19:33 +00:00
8e5cf31e9a
big exe/dll update, see #2017
...
NOTE: These changes specifically affect payload encoding via RPC, "use
payload", and msfencode
1. consolidate user-specified exe generation routine (now
Msf::Util::EXE.to_executable_fmt)
2. supported format types are now queried/checked using arrays
3. cleaned up and standardized exe option passing
4. rename data store options for EXE mixin
5. add generate_payload_exe_service for psexec/smb_relay
6. reworked default template handling in Msf::Util::EXE
a. added template search path option (not used if template includes
a path separator)
b. "fallback" flag to enable using default if specified file doesn't
exist
7. added Msf::Util::EXE.to_win64pe_dll
8. improved error messages from exe generation
git-svn-id: file:///home/svn/framework3/trunk@10404 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 00:13:30 +00:00
771fc82c8c
add a unique cid to attachments
...
git-svn-id: file:///home/svn/framework3/trunk@10399 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 21:41:50 +00:00
bd1eeb3722
rework to_jsp_war a bit, fix uses, default msfencode -t war to x86/win32
...
git-svn-id: file:///home/svn/framework3/trunk@10397 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 15:59:46 +00:00
4590844871
tons of indentation fixes, some other style tweaks
...
git-svn-id: file:///home/svn/framework3/trunk@10394 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 08:06:27 +00:00
69ce7eed1b
Wrap the admin check in case the OS doesn't support this API (WinNT, Win2000)
...
git-svn-id: file:///home/svn/framework3/trunk@10390 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 04:58:25 +00:00
21d88b36c1
rename generate_exe -> generate_payload_exe
...
git-svn-id: file:///home/svn/framework3/trunk@10388 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 04:37:25 +00:00
25315ec3ea
Store the module instance itself in an accessor on the session. You have to be careful when using this, as the contents can change if the owner of the module is still working with it.
...
git-svn-id: file:///home/svn/framework3/trunk@10386 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 03:51:38 +00:00
3c505f4c5d
remove loop instruction, it was causing problems when the destination was too far away, fixes #2459
...
git-svn-id: file:///home/svn/framework3/trunk@10385 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 03:26:41 +00:00
541c192f12
Updates from Zate, renamed commands to match the existing plugins
...
git-svn-id: file:///home/svn/framework3/trunk@10383 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 02:18:25 +00:00
0b008d6c3c
remove some duplicate code and make output more useful when there is a service with no name
...
git-svn-id: file:///home/svn/framework3/trunk@10382 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 01:54:23 +00:00
711fe18ac2
typo fix
...
git-svn-id: file:///home/svn/framework3/trunk@10379 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 23:22:32 +00:00
940a096769
typo fix
...
git-svn-id: file:///home/svn/framework3/trunk@10378 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 23:13:02 +00:00
5f0cc946b1
document report_note a little better, and modify several modules to use it correctly. fixes #2568
...
git-svn-id: file:///home/svn/framework3/trunk@10377 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 22:25:56 +00:00
7c540583b5
Latest code from Zate
...
git-svn-id: file:///home/svn/framework3/trunk@10376 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 22:18:56 +00:00
5d3089c135
raise EOFError from SSL connections
...
git-svn-id: file:///home/svn/framework3/trunk@10375 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 21:20:06 +00:00
136ab04a22
Add msfencode capability to rpc.
...
git-svn-id: file:///home/svn/framework3/trunk@10373 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 02:42:33 +00:00
ff22e5212e
revert to backward compatible method of using utc+zone
...
git-svn-id: file:///home/svn/framework3/trunk@10367 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 05:09:47 +00:00
af19a0d924
hrm, i dont think i meant to check these in
...
git-svn-id: file:///home/svn/framework3/trunk@10364 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 01:41:13 +00:00
b22c24289d
fix up the simple.client.system_time and underlying stuffs
...
git-svn-id: file:///home/svn/framework3/trunk@10362 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 01:12:44 +00:00
012654947a
Store the time zone as well
...
git-svn-id: file:///home/svn/framework3/trunk@10357 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 21:19:04 +00:00
73bec8b819
many-to-many switch
...
git-svn-id: file:///home/svn/framework3/trunk@10355 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 21:05:11 +00:00
31f5ee512c
Store the server time in Ruby object format
...
git-svn-id: file:///home/svn/framework3/trunk@10354 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 21:03:08 +00:00
d0ea92d35f
Dont match on directories with the name of the intended file. Problem identified by JJ Gray
...
git-svn-id: file:///home/svn/framework3/trunk@10347 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 16:02:10 +00:00
8f7743c999
Check for railgun first
...
git-svn-id: file:///home/svn/framework3/trunk@10342 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 21:49:51 +00:00
21d734201a
Closes #2520 . Merges Rob's patch to check admin privs on start
...
git-svn-id: file:///home/svn/framework3/trunk@10341 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 21:44:25 +00:00
99e2218d13
Be a little more careful with credential sources and update new services in the current workspace.
...
git-svn-id: file:///home/svn/framework3/trunk@10339 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 19:45:51 +00:00
5e2295a9a8
Add in an aux module to create a socks4 proxy server. If you add in a route via a meterpreter session to the framework routing table the proxy server will use that route where appropriate. (Also modified the servers opts hash to optionally take a 'Comm' param if you want to programmatically create a socks4 server which will always use a specific meterpreter session for all socket creation - by default this does not happen and it uses the rex socket switchboard as per normal rex socket creation).
...
git-svn-id: file:///home/svn/framework3/trunk@10337 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 18:23:03 +00:00
5c2717a189
Add in a Socks4a proxy server.
...
git-svn-id: file:///home/svn/framework3/trunk@10330 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 12:11:30 +00:00
ab1ac7ab22
make sure attachments are included
...
git-svn-id: file:///home/svn/framework3/trunk@10329 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 08:43:08 +00:00
0479107e7a
Railgun is now part of Standard API no need to load it
...
git-svn-id: file:///home/svn/framework3/trunk@10328 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 01:41:11 +00:00
cf440fc6c9
Rename for consistency
...
git-svn-id: file:///home/svn/framework3/trunk@10324 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-15 08:40:57 +00:00
4970c502f7
Import of the dual-licensed (GPL/BSD) nessus-xmlrpc client from Vlatko Kosturjak
...
git-svn-id: file:///home/svn/framework3/trunk@10323 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-15 08:22:28 +00:00
6f4eaeb8e3
Delete the ruby side railgun meterpreter extension and add in the new stdapi railgun stuff. Railgun with stdapi works the same (e.g. just use client.railgun.user32.MesageBoxA(...) ). The module definitions are lazy loaded on demand to avoid the performance hit if we load them all at once when stdapi is initially loaded.
...
git-svn-id: file:///home/svn/framework3/trunk@10319 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-14 23:28:52 +00:00
e85b8adcf8
Add Ruby side meterpreter packet support for QWORD Tlv's.
...
git-svn-id: file:///home/svn/framework3/trunk@10318 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-14 23:23:15 +00:00
44a67d0440
Typo fix
...
git-svn-id: file:///home/svn/framework3/trunk@10315 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-14 18:20:17 +00:00
792285cb87
Clean up monitor threads
...
git-svn-id: file:///home/svn/framework3/trunk@10309 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 21:07:02 +00:00
778132ad02
Remove the select spin loop in favor of a thread.join
...
git-svn-id: file:///home/svn/framework3/trunk@10308 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 20:57:38 +00:00
7ccf4e2f11
Change stream writes to be non-blocking, this has been pretty heavily tested over the last couple days, and should preserve the original behavior as well. This fixes a deadlock in Ruby in certain conditions
...
git-svn-id: file:///home/svn/framework3/trunk@10306 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 14:39:17 +00:00
fa38a19ada
Adding the missing report_template.rb.
...
git-svn-id: file:///home/svn/framework3/trunk@10304 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 13:20:49 +00:00
088e862e16
Adds a migration for report template tracking.
...
git-svn-id: file:///home/svn/framework3/trunk@10303 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 12:17:57 +00:00
cd7dd926e2
use the models from the last commit. i suck at getting all the files in a single commit. =/
...
git-svn-id: file:///home/svn/framework3/trunk@10302 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 08:26:48 +00:00
c8bd48dbb0
add models for campaigns and stuff.
...
git-svn-id: file:///home/svn/framework3/trunk@10301 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 08:25:27 +00:00
cefe0ecb45
Add ability to run modules in console, some other fixes.
...
git-svn-id: file:///home/svn/framework3/trunk@10297 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-11 21:54:19 +00:00
eddd6d481d
add some documentation for request_cgi
...
git-svn-id: file:///home/svn/framework3/trunk@10293 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-11 17:31:26 +00:00
cb41474f49
fix typo and import errors.
...
git-svn-id: file:///home/svn/framework3/trunk@10291 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-11 16:17:12 +00:00
995b289635
Add session upgrade capability to command shells.
...
git-svn-id: file:///home/svn/framework3/trunk@10289 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-11 15:59:19 +00:00
7f3cc47da9
Only add platform for meterpreter sessions. Unbreaks shell sessions.
...
git-svn-id: file:///home/svn/framework3/trunk@10286 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-10 23:33:33 +00:00
8716609aaf
add the platform to the session attributes returned by rpc
...
git-svn-id: file:///home/svn/framework3/trunk@10285 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-10 20:56:21 +00:00
f7020af01a
update metasm to tip
...
git-svn-id: file:///home/svn/framework3/trunk@10278 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 18:19:35 +00:00
eec9b59609
add docs dir
...
git-svn-id: file:///home/svn/framework3/trunk@10274 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 15:49:06 +00:00
6422d8c2de
unbreak payloads over rpc
...
git-svn-id: file:///home/svn/framework3/trunk@10271 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 05:19:04 +00:00
0a8c8b3c90
add the platform to sessions list
...
git-svn-id: file:///home/svn/framework3/trunk@10269 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 01:41:32 +00:00
1405bda8a4
properly set defaults for ip start and end, fixes #2500
...
git-svn-id: file:///home/svn/framework3/trunk@10261 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-08 17:06:31 +00:00
6336c01771
Deprecates db_import_* file type commands, and suggests the user use db_import instead.
...
git-svn-id: file:///home/svn/framework3/trunk@10246 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-06 18:33:17 +00:00
85cdc7ad78
ugh, i'm bouncing between too many languages, this syntax doesn't even work in php. fixes #2495
...
git-svn-id: file:///home/svn/framework3/trunk@10240 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-05 16:13:17 +00:00
e8e796868e
default to nil
...
git-svn-id: file:///home/svn/framework3/trunk@10237 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-04 00:08:12 +00:00
0b8eebcace
make sure sets has something in it. lib/msf/core/exploit.rb sends this a nil if the user didn't specify anything
...
git-svn-id: file:///home/svn/framework3/trunk@10235 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 23:48:46 +00:00
e42d2c1ef4
make sure we read the whole file
...
git-svn-id: file:///home/svn/framework3/trunk@10234 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 23:00:28 +00:00
b24a7db785
Add workspace support throughout GUI; add/select/remove db workspace and set default workspace when running modules.
...
git-svn-id: file:///home/svn/framework3/trunk@10233 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 17:13:53 +00:00
f5bc508370
Fix db.vulns typos
...
git-svn-id: file:///home/svn/framework3/trunk@10232 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 16:09:10 +00:00
57dac0dbf8
remove newlines when importing from an ip list
...
git-svn-id: file:///home/svn/framework3/trunk@10230 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 15:04:09 +00:00
04ee50d10c
fixed bug w/ revert
...
git-svn-id: file:///home/svn/framework3/trunk@10224 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-02 20:34:31 +00:00
4388b886c8
jduck tricked me on purpose.
...
git-svn-id: file:///home/svn/framework3/trunk@10222 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-02 16:22:48 +00:00
e7aa1a86ec
Avoid xml encoding spaces.
...
git-svn-id: file:///home/svn/framework3/trunk@10221 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-02 16:20:30 +00:00
832960b6df
Whoops forgot the x.
...
git-svn-id: file:///home/svn/framework3/trunk@10216 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-01 23:26:35 +00:00
1d1805306e
Adds xml_char_encode. Like html_encode, but allows xml-safe character through.
...
git-svn-id: file:///home/svn/framework3/trunk@10214 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-01 22:40:07 +00:00
b65be82387
Handle updating the updated_at time for just-checked credentials better.
...
git-svn-id: file:///home/svn/framework3/trunk@10213 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-01 22:06:52 +00:00
21540e22ed
Checking in missing reporting stuff for bruteforce. Namely, report_exploit, also changes ftp's pw type to just "password" and re-opens newly verified sessions.
...
git-svn-id: file:///home/svn/framework3/trunk@10205 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-31 20:33:16 +00:00
a0f86c62e3
Meterpreter search support to leverage the index on older systems (2000/XP/2003) via Windows Desktop Search v2.
...
git-svn-id: file:///home/svn/framework3/trunk@10187 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-30 09:50:41 +00:00
9253085d13
Add plugin support to rpc. Fixes #2292
...
git-svn-id: file:///home/svn/framework3/trunk@10177 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-28 18:21:17 +00:00
1d508a7acd
Fixes #2464
...
git-svn-id: file:///home/svn/framework3/trunk@10175 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-28 17:37:27 +00:00
6d333eb185
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@10173 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 21:26:59 +00:00
d02687b755
add dest adjust option to omelete hunter
...
git-svn-id: file:///home/svn/framework3/trunk@10172 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 21:19:42 +00:00
8dd489ad3b
expose the payload exe filename, remove the concat operator
...
git-svn-id: file:///home/svn/framework3/trunk@10169 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 17:23:47 +00:00
a3a20ebb05
default to no concatenation
...
git-svn-id: file:///home/svn/framework3/trunk@10168 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 17:16:44 +00:00
fbf64adf2a
Commit the ruby side for meterpreter file search. If available, will leverage Windows Search to speed up searching an indexed directory. Examples of usage as follows:
...
Find all .PDF files on the host system:
meterpreter>search *.pdf
Find all files on bob's desktop:
meterpreter>search -d 'c:\users\bob\desktop' -f *
Find all files in the root drive c: but don't search subdirectories:
meterpreter>search -d c: -r false -f *
If Windows Search is available (Vista and above by default, XP/2003 by addon) we can also search any indexed IE history and indexed email
meterpreter>search -d iehistory -f *
meterpreter>search -d mapi -f *
git-svn-id: file:///home/svn/framework3/trunk@10167 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 14:59:38 +00:00
77917c80e6
This should fix #2459 - the "short" qualifiers were not being removed from all asm stubs
...
git-svn-id: file:///home/svn/framework3/trunk@10164 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 05:11:19 +00:00
a119cb7b71
dont let close exceptions slow us down
...
git-svn-id: file:///home/svn/framework3/trunk@10163 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 04:44:02 +00:00
6e48076249
fixes #2435 , add BROADCAST option to DHCP server, use in cases where sending to 255.255.255.255 fails
...
git-svn-id: file:///home/svn/framework3/trunk@10159 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-26 19:34:53 +00:00
330281eadd
see #684 , adds checksum support, updates modules to use it, fixes some wfs_delay/WfsDelay issues
...
git-svn-id: file:///home/svn/framework3/trunk@10150 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 20:55:37 +00:00
c473d20927
default badchars to payload_badchars
...
git-svn-id: file:///home/svn/framework3/trunk@10149 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 20:54:20 +00:00
34eb75af73
overhaul smtp to add support for authentication and STARTTLS. can now send email through a gmail account
...
git-svn-id: file:///home/svn/framework3/trunk@10148 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 20:31:46 +00:00
a0e7901c19
add syscall name comment
...
git-svn-id: file:///home/svn/framework3/trunk@10147 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 20:23:38 +00:00
9557980607
oops, semicolon is a comment except when used in metasm_shell
...
git-svn-id: file:///home/svn/framework3/trunk@10144 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 17:46:06 +00:00
1477ae6b92
merge in checksum support, add quick-n-dirty unit test
...
git-svn-id: file:///home/svn/framework3/trunk@10143 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 16:52:13 +00:00
623e4ef3ac
add forward search, reset between eggs, move options into a hash
...
git-svn-id: file:///home/svn/framework3/trunk@10132 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 01:21:12 +00:00
1db9d8eb01
Fixes #2444 . Adds an ExploitedHost table, adds the db_exploited command, adds the report_exploit() function.
...
Tested with meterpreter, shell, and clientside exploit sessions.
git-svn-id: file:///home/svn/framework3/trunk@10130 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-24 21:57:04 +00:00
8741179e8a
bugfix for the revert command
...
git-svn-id: file:///home/svn/framework3/trunk@10129 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-24 19:29:43 +00:00
49beb83081
add the "makerc" command for quick resource script generation, fixes #738
...
git-svn-id: file:///home/svn/framework3/trunk@10119 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 21:19:01 +00:00
b6577681c6
another omelet update from Peter, this time with in-line assembly
...
git-svn-id: file:///home/svn/framework3/trunk@10118 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 21:03:00 +00:00
bd96c10cc0
only read the history file if we have no history
...
git-svn-id: file:///home/svn/framework3/trunk@10117 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 20:56:50 +00:00
6e66831517
couple minor fixes to omelet mixin/class
...
git-svn-id: file:///home/svn/framework3/trunk@10116 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 19:53:15 +00:00
2b11577ae1
fix broken free, type in require
...
git-svn-id: file:///home/svn/framework3/trunk@10112 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 18:05:37 +00:00
acef967d5a
Updating importing to deal with importing credentials from Metasploit Express XML.
...
git-svn-id: file:///home/svn/framework3/trunk@10111 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 17:45:36 +00:00
d2bada79a9
typo in error string
...
git-svn-id: file:///home/svn/framework3/trunk@10109 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 17:37:06 +00:00
08fc366d0b
add omlet mixin from Peter Van Eeckhoutte
...
git-svn-id: file:///home/svn/framework3/trunk@10108 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 17:35:41 +00:00
62f6c9b961
fix some 1.8/1.9 incompatabilities, should be last commit on #2329
...
git-svn-id: file:///home/svn/framework3/trunk@10106 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 16:45:38 +00:00
8c9d08b1e8
add egg override param for egghunter
...
git-svn-id: file:///home/svn/framework3/trunk@10098 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-22 20:19:19 +00:00
7ad4f80014
Add a badchars argument
...
git-svn-id: file:///home/svn/framework3/trunk@10094 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-21 07:20:58 +00:00
09af63c1fb
generate returning nil in payload.size
...
git-svn-id: file:///home/svn/framework3/trunk@10087 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 20:35:48 +00:00
0e896261cb
1.8.6 compatibility fix
...
git-svn-id: file:///home/svn/framework3/trunk@10086 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 20:31:39 +00:00
b1411084ff
add -h and invalid param error to cmd_show
...
git-svn-id: file:///home/svn/framework3/trunk@10083 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 18:45:33 +00:00
198cc37f8a
load java payload mixin, fixes #2432
...
git-svn-id: file:///home/svn/framework3/trunk@10081 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 18:04:48 +00:00
5b38990e70
missed this
...
git-svn-id: file:///home/svn/framework3/trunk@10076 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 07:13:35 +00:00
5d95f48848
add preliminary support for the new java payloads. Working meterpreter and shell stages with tcp bind and reverse stagers, see #406
...
git-svn-id: file:///home/svn/framework3/trunk@10073 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 07:01:23 +00:00
d0ea2737c5
Don't overwrite source_id just because we don't have one.
...
git-svn-id: file:///home/svn/framework3/trunk@10067 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 23:19:34 +00:00
2545410bc7
make exe template names more consistent
...
git-svn-id: file:///home/svn/framework3/trunk@10065 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 21:08:51 +00:00
d9337f3cca
add a Jar class to Rex::Zip
...
git-svn-id: file:///home/svn/framework3/trunk@10057 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 17:08:29 +00:00
d5149b8e23
less verbose Entry#inspect
...
git-svn-id: file:///home/svn/framework3/trunk@10056 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 17:04:42 +00:00
a9a4e3f2da
Add meterpreter client side support for cleaning up loaded extensions upon server termination by calling the loaded extensions cleanup() method if available.
...
git-svn-id: file:///home/svn/framework3/trunk@10055 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 11:37:22 +00:00
7d560e9c18
rescue NoCompatiblePayloadError inside size method, fixes #1604
...
git-svn-id: file:///home/svn/framework3/trunk@10051 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 00:10:06 +00:00
48e91af25d
remove client ip send, remove puts lines, fixes #2329
...
git-svn-id: file:///home/svn/framework3/trunk@10049 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 23:35:28 +00:00
8463e026bd
read responses until EOF per RFC
...
git-svn-id: file:///home/svn/framework3/trunk@10045 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 22:41:07 +00:00
06dca2addb
fix this unit test
...
git-svn-id: file:///home/svn/framework3/trunk@10044 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 22:36:13 +00:00
ad2b69dced
add database access to rpc. thanks Ryan Linn for the patch\!
...
git-svn-id: file:///home/svn/framework3/trunk@10043 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 21:26:26 +00:00
b8991c541e
add a NO RECV flag to the client call function
...
git-svn-id: file:///home/svn/framework3/trunk@10038 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 17:21:10 +00:00
626f7e0c66
add a flag indication not to recv to various smb/client methods
...
git-svn-id: file:///home/svn/framework3/trunk@10037 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 17:20:55 +00:00
24d10866b6
add update_checksum, size, and length methods
...
git-svn-id: file:///home/svn/framework3/trunk@10036 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 04:39:38 +00:00
6d6a547b34
Fixes #2412 . Adds a creds table, modifies the db_report_auth API, adds the db_creds and db_add_cred commands.
...
git-svn-id: file:///home/svn/framework3/trunk@10034 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 00:58:20 +00:00
d46d4313e7
reduce verbosity for printed exceptions when processing on_request
...
git-svn-id: file:///home/svn/framework3/trunk@10029 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-17 22:57:52 +00:00
aca547ac48
Remove the 10,000 banner
...
git-svn-id: file:///home/svn/framework3/trunk@10023 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-16 17:13:35 +00:00
d803cf0ea9
un-break the tree! *facepalm* -- see #2398
...
git-svn-id: file:///home/svn/framework3/trunk@10018 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-14 20:52:54 +00:00
6c05d425dc
change remaining methods to take an opts hash and allow template override for them
...
git-svn-id: file:///home/svn/framework3/trunk@10016 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-14 20:40:45 +00:00
9ba0916937
fix port bug, add diff from sj, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@10015 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-14 20:21:14 +00:00
d848732254
stop leaking sockets/jobs when using rerun on aux modules
...
git-svn-id: file:///home/svn/framework3/trunk@10014 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-14 06:47:11 +00:00
3a0402de2a
a few minor cleanups
...
git-svn-id: file:///home/svn/framework3/trunk@10013 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-14 06:42:17 +00:00
cb445588e0
fix problem with unclosed sockets
...
git-svn-id: file:///home/svn/framework3/trunk@10012 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-14 04:58:27 +00:00
c94663c1fd
check the os before adding output redirection to commands
...
git-svn-id: file:///home/svn/framework3/trunk@10007 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 19:46:04 +00:00
7b521b8ef2
change the timeout to something sane
...
git-svn-id: file:///home/svn/framework3/trunk@10006 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 17:24:59 +00:00
c1a2f51487
tagging id / rev
...
git-svn-id: file:///home/svn/framework3/trunk@10004 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 16:54:40 +00:00
cc99ceac52
10,000
...
git-svn-id: file:///home/svn/framework3/trunk@10000 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 16:10:30 +00:00
bcbd691ea7
add a list chunk function
...
git-svn-id: file:///home/svn/framework3/trunk@9997 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 16:09:31 +00:00
10c2bfb64e
added validation for the meterpreter route command - thanks robin for pointing it out
...
git-svn-id: file:///home/svn/framework3/trunk@9993 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 06:12:05 +00:00
fb6b993492
added validation for the route command - thanks robin wood
...
git-svn-id: file:///home/svn/framework3/trunk@9992 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 06:11:10 +00:00
f48afb37a7
merge tftp.diff from scriptjunkie, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@9991 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 03:25:43 +00:00
939bf2a881
merge dhcp.diif from scriptjunkie, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@9990 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 03:11:30 +00:00
1b31a44b57
move riff support from ani_loadimage browser sploit to mixin
...
git-svn-id: file:///home/svn/framework3/trunk@9984 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-12 16:56:41 +00:00
040a292181
Create a new mixin that changes SMBUser/SMBPass to normal options, include this mixin within SMB modules that more often than not require authentication
...
git-svn-id: file:///home/svn/framework3/trunk@9981 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-12 15:00:58 +00:00
d540818f01
split http exploit mixin into http/server and http/client
...
git-svn-id: file:///home/svn/framework3/trunk@9971 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-07 06:59:16 +00:00
23a0064f9d
merge cleanup.diff from scriptjunkie, rewrote set_option, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@9970 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-07 06:45:02 +00:00
9dacf8116e
remove rails dependency from module.replicant
...
git-svn-id: file:///home/svn/framework3/trunk@9969 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-07 05:57:58 +00:00
7f8bbbc535
add dhcp/pxe stuff from scriptjunkie, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@9963 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-06 17:37:28 +00:00
52b2d0a495
add support for various options
...
git-svn-id: file:///home/svn/framework3/trunk@9962 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-06 17:21:22 +00:00
53e2a010cd
add -n (disable database) option for msfconsole, gives 33% startup time reduction
...
git-svn-id: file:///home/svn/framework3/trunk@9959 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-05 02:24:40 +00:00
James Lee
HD Moore
Joshua Drake
Tod Beardsley
Jonathan Cran
Carlos Perez
Matt Weeks
Mike Smith
pks
Stephen Fewer