Matt Weeks
2b340439e0
Fixes #5312 - auto boot from disk on second PXE boot (after payload delivery).
...
git-svn-id: file:///home/svn/framework3/trunk@13629 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-24 21:28:31 +00:00
amaloteaux
a1bace0cb9
make exploit::capture compatible with pcaprub under Windows
...
git-svn-id: file:///home/svn/framework3/trunk@13625 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-24 20:40:48 +00:00
Matt Weeks
562a624127
Fix issues with undefined or incorrect variables, and update encoding opts.
...
git-svn-id: file:///home/svn/framework3/trunk@13621 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-24 20:25:28 +00:00
Matt Weeks
32eb5d05ba
Fix RPC typos.
...
def_ prefixes and remove calls to nonexistant clean_nils function. Msgpack libs should not require clean_nils.
git-svn-id: file:///home/svn/framework3/trunk@13615 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-24 01:01:48 +00:00
Matt Weeks
c8a0039b98
Fix this error:
...
error
error_class
NoMethodError
error_string
undefined method `state=' for #<Msf::RPC::Service:0x000000094ddd58>
error_backtrace
lib/msf/core/rpc/v10/service.rb:76:in `stop'1
lib/msf/core/rpc/v10/rpc_core.rb:14:in `rpc_stop'9
lib/msf/core/rpc/v10/service.rb:149:in `block in process')
lib/ruby/1.9.1/timeout.rb:57:in `timeout'0
lib/msf/core/rpc/v10/service.rb:149:in `process'6
lib/msf/core/rpc/v10/service.rb:89:in `on_request_uri'6
lib/msf/core/rpc/v10/service.rb:70:in `block in start'/
lib/rex/proto/http/handler/proc.rb:37:in `call'5
lib/rex/proto/http/handler/proc.rb:37:in `on_request'6
lib/rex/proto/http/server.rb:354:in `dispatch_request'4
lib/rex/proto/http/server.rb:288:in `on_client_data'4
lib/rex/proto/http/server.rb:148:in `block in start'(
lib/rex/io/stream_server.rb:47:in `call'2
lib/rex/io/stream_server.rb:47:in `on_client_data'=
lib/rex/io/stream_server.rb:191:in `block in monitor_clients')
lib/rex/io/stream_server.rb:189:in `each'4
lib/rex/io/stream_server.rb:189:in `monitor_clients'2
lib/rex/io/stream_server.rb:72:in `block in start'&
lib/rex/thread_factory.rb:21:in `call'0
lib/rex/thread_factory.rb:21:in `block in spawn'+
lib/msf/core/thread_manager.rb:64:in `call'5
lib/msf/core/thread_manager.rb:64:in `block in spawn'
error_message
undefined method `state=' for #<Msf::RPC::Service:0x000000094ddd58>
git-svn-id: file:///home/svn/framework3/trunk@13614 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-23 23:20:20 +00:00
HD Moore
425a032a31
Remove the routes check here as its not actually used
...
git-svn-id: file:///home/svn/framework3/trunk@13613 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-23 19:37:58 +00:00
HD Moore
50638068a2
Woops - this should check for a Msf::DBManager::Session, not Msf::Session, thanks! Closes #5302
...
git-svn-id: file:///home/svn/framework3/trunk@13612 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-23 03:35:59 +00:00
HD Moore
deb0441c90
Stop throwing a stack trace
...
git-svn-id: file:///home/svn/framework3/trunk@13611 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-22 14:12:44 +00:00
HD Moore
7e474fe29a
Fix this up so that it works for this function as well
...
git-svn-id: file:///home/svn/framework3/trunk@13610 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-22 14:00:01 +00:00
HD Moore
c1baf51bad
Handle session object detection better, kind_of? doesnt work when the session has been extended via mixins
...
git-svn-id: file:///home/svn/framework3/trunk@13609 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-22 05:17:57 +00:00
amaloteaux
981e47de06
db_export can now export netntlmv1 and netntlmv2 hashes
...
git-svn-id: file:///home/svn/framework3/trunk@13607 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-22 00:29:32 +00:00
HD Moore
d6b349e3c3
Don't use globals.
...
git-svn-id: file:///home/svn/framework3/trunk@13601 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-20 20:43:07 +00:00
HD Moore
df93ddfb11
Remove global reference
...
git-svn-id: file:///home/svn/framework3/trunk@13600 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-20 20:39:57 +00:00
Matt Weeks
31d1628dde
Some payload fixes
...
git-svn-id: file:///home/svn/framework3/trunk@13596 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-20 02:18:20 +00:00
James Lee
660d7ccfc6
superfluous whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@13581 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-18 23:37:38 +00:00
James Lee
778d6b4bb6
add help for the last few commands that lacked it in core and move the methods around into a more logical order, see #564
...
git-svn-id: file:///home/svn/framework3/trunk@13580 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-18 23:36:51 +00:00
James Lee
3c7f25ff78
help help
...
git-svn-id: file:///home/svn/framework3/trunk@13579 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-18 20:29:49 +00:00
Matt Weeks
9e80c740b6
Also recognize PXE clients who do not set the PXE option in the DHCP request but do identify in client string.
...
git-svn-id: file:///home/svn/framework3/trunk@13577 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-18 00:18:43 +00:00
James Lee
f99429138e
clean up some rdoc comments. odd that rdoc doesn't appear to pick up ApiConstants at all...
...
git-svn-id: file:///home/svn/framework3/trunk@13576 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-17 23:00:28 +00:00
James Lee
0fc14a2164
whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@13572 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-16 21:16:25 +00:00
James Lee
79b7fb7c43
actually store the new Util object. how did this ever work before? fixes #5265
...
git-svn-id: file:///home/svn/framework3/trunk@13571 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-16 18:01:21 +00:00
James Lee
f16e593628
report udp protocol correctly, see #5260 , r13569
...
git-svn-id: file:///home/svn/framework3/trunk@13570 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-15 22:39:41 +00:00
James Lee
4779c039f0
protocol != proto. fixes #5260
...
git-svn-id: file:///home/svn/framework3/trunk@13569 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-15 22:29:57 +00:00
Chao Mu
c77dfcc48e
fixes #5232 Add DLL definition for crypt32. I removed a custom add too
...
git-svn-id: file:///home/svn/framework3/trunk@13560 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-14 21:08:55 +00:00
Matt Weeks
4a7714e1b1
Fix #5244
...
git-svn-id: file:///home/svn/framework3/trunk@13551 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-12 20:26:03 +00:00
Joshua Drake
5966cf460e
Fixes #5240 : avoid crash when read fails
...
git-svn-id: file:///home/svn/framework3/trunk@13550 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-12 19:30:56 +00:00
HD Moore
dc9c395a7f
Handle a range with a nil length
...
git-svn-id: file:///home/svn/framework3/trunk@13548 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-12 19:09:05 +00:00
Wei Chen
4f2a0f8c6a
Allow more custom settings for creating a .Net control
...
git-svn-id: file:///home/svn/framework3/trunk@13546 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-12 19:03:09 +00:00
James Lee
0e8e17a565
add shell/non-native support for is_admin? and is_system?, fixes #5235
...
git-svn-id: file:///home/svn/framework3/trunk@13539 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-12 00:01:55 +00:00
David Rude
f971a84f3e
Add VSploit PII mixin
...
git-svn-id: file:///home/svn/framework3/trunk@13537 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-11 23:44:18 +00:00
Jonathan Cran
22ba089b0e
check for framework before removing the socket. make the spacing consistent
...
git-svn-id: file:///home/svn/framework3/trunk@13536 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-11 23:31:19 +00:00
James Lee
925016535f
fix typo
...
git-svn-id: file:///home/svn/framework3/trunk@13531 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-11 21:24:55 +00:00
James Lee
f34b96b454
cleanup some rdoc
...
git-svn-id: file:///home/svn/framework3/trunk@13525 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-11 16:02:06 +00:00
James Lee
065dd433a9
clean up the rdoc a bit.
...
git-svn-id: file:///home/svn/framework3/trunk@13517 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-10 22:30:38 +00:00
Jonathan Cran
15a9036dd9
add in the Buffer input class
...
git-svn-id: file:///home/svn/framework3/trunk@13516 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-10 21:05:12 +00:00
Chao Mu
0bc44c4736
Expanding the range of mock dll/functions to allow for more thorough testing. Number of assertions when you run railgun tests are about to jump.
...
git-svn-id: file:///home/svn/framework3/trunk@13506 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-10 03:36:39 +00:00
James Lee
a5b30b1964
sometimes windows raises EADDRNOTAVAIL which gets mapped to AddressInUse when using addresses it doesn't like, e.g. .0 and .255; make AddressInUse a ConnectionError so scanners handle it properly. makes scanners work on windows when an address range includes one of these. they won't be scanned (since windows is dumb) but at least it won't error out.
...
git-svn-id: file:///home/svn/framework3/trunk@13503 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-10 00:51:23 +00:00
James Lee
46f81fe04a
back to development. Hello, 4.0.1-dev
...
git-svn-id: file:///home/svn/framework3/trunk@13502 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-09 23:05:15 +00:00
Carlos Perez
071db161d3
Add support for AAA none privileged accounts.
...
git-svn-id: file:///home/svn/framework3/trunk@13495 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-06 12:36:39 +00:00
Matt Weeks
b2733c04db
More PXE dust for extra magic!
...
git-svn-id: file:///home/svn/framework3/trunk@13493 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-05 17:10:27 +00:00
HD Moore
842bfdebe8
Lets just leave this here (insurance against my laptop melting down between now and tomorrow morning). Nothing to see here, move along ;)
...
git-svn-id: file:///home/svn/framework3/trunk@13483 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-03 22:58:55 +00:00
HD Moore
d7e775b74c
This speeds up shutdown for normal reverse_tcp meterpreters (avoids the penalization for http/https)
...
git-svn-id: file:///home/svn/framework3/trunk@13470 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-02 01:33:17 +00:00
HD Moore
d631e109e1
Truncate field names if necessary for specific fields hit by importers
...
git-svn-id: file:///home/svn/framework3/trunk@13469 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-02 01:07:52 +00:00
HD Moore
3c33128186
Ensure that a :ua_string is always present in report_client()
...
git-svn-id: file:///home/svn/framework3/trunk@13461 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-31 21:02:39 +00:00
James Lee
65a3c08406
hello, 4.0.0-release
...
git-svn-id: file:///home/svn/framework3/trunk@13460 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-31 20:26:41 +00:00
HD Moore
7fa5795115
Cleanup session files. Wait a little longer for the session to receive the shutdown command
...
git-svn-id: file:///home/svn/framework3/trunk@13458 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-31 19:46:36 +00:00
Jonathan Cran
b76b1db279
check for modifiers before slurping them in
...
git-svn-id: file:///home/svn/framework3/trunk@13455 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-31 19:05:09 +00:00
HD Moore
61228c046d
Gracefully handle Windows 2000
...
git-svn-id: file:///home/svn/framework3/trunk@13449 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-31 18:27:13 +00:00
HD Moore
36ca1c60c9
Fixes #5138
...
git-svn-id: file:///home/svn/framework3/trunk@13447 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-31 17:25:25 +00:00
James Lee
f5862e87d0
guard against nil and false ranges
...
git-svn-id: file:///home/svn/framework3/trunk@13446 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-31 15:48:29 +00:00
HD Moore
89a41e86da
Sanitize host fields for low bytes
...
git-svn-id: file:///home/svn/framework3/trunk@13441 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-31 03:34:51 +00:00
Tod Beardsley
7667e5aa74
More of the same.
...
git-svn-id: file:///home/svn/framework3/trunk@13439 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-30 23:50:04 +00:00
Tod Beardsley
58f7618b78
Fixes #5144 . Repro's with nexpose-raw.xml in sample data -- before the fix, DNS on port 53 would be marked as "Postfix" which is the same as the service prior, 25/tcp. After the fix, it is appropriately blank. (Same with 80/tcp and 443/tcp both being Apache -- technically probably correct but the service fingerprint isn't there for 443 in the import).
...
Checking other service importers for the same kind of problem, but it looks unique to nexpose-raw.
git-svn-id: file:///home/svn/framework3/trunk@13438 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-30 23:35:13 +00:00
HD Moore
e916e06b6e
Closes #5142 by merging (with some small changes)
...
git-svn-id: file:///home/svn/framework3/trunk@13433 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-30 21:07:22 +00:00
HD Moore
b885b8ea74
Fixes import of binary data. This may not be a problem for valid imports, but at the least this avoids a stack trace
...
git-svn-id: file:///home/svn/framework3/trunk@13428 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-30 18:31:12 +00:00
James Lee
e02addd36a
preparing for release. this is release candidate 1
...
git-svn-id: file:///home/svn/framework3/trunk@13426 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-30 17:14:28 +00:00
Jonathan Cran
a627f647f0
doh, filter this
...
git-svn-id: file:///home/svn/framework3/trunk@13419 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-30 06:27:52 +00:00
Carlos Perez
6865c10662
Patch railgun entries for services
...
git-svn-id: file:///home/svn/framework3/trunk@13417 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-30 03:26:22 +00:00
HD Moore
7f758e42e8
Fix up SSL behavior (correctly, this time). Update the msfrpc tools to support the new MessagePack code, fix various defaults in the plugin. Fixes #5116
...
git-svn-id: file:///home/svn/framework3/trunk@13416 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-29 23:58:05 +00:00
Wei Chen
fae9f52090
The Metasploit ninja vanishes and comes right back.... l337.
...
git-svn-id: file:///home/svn/framework3/trunk@13415 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-29 22:54:19 +00:00
Wei Chen
5ff2cf184f
Add ASCII Art: Metasploit logo
...
git-svn-id: file:///home/svn/framework3/trunk@13414 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-29 22:45:10 +00:00
Wei Chen
a2bd9d09ba
Add ninja ascii art
...
git-svn-id: file:///home/svn/framework3/trunk@13413 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-29 22:15:03 +00:00
HD Moore
07df5f051f
Woops. Get the right variable name
...
git-svn-id: file:///home/svn/framework3/trunk@13412 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-29 19:26:43 +00:00
HD Moore
f57799943c
Rework this patch to only enable non-blocking openssl on Windows, as this has also reproduced on BT5 with 1.9.2
...
git-svn-id: file:///home/svn/framework3/trunk@13411 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-29 19:10:20 +00:00
Jonathan Cran
5f3cd45d07
example vm modifier
...
git-svn-id: file:///home/svn/framework3/trunk@13410 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-29 18:23:20 +00:00
Jonathan Cran
ded8008470
add in the modifier stuff from AHA! demo.
...
git-svn-id: file:///home/svn/framework3/trunk@13408 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-29 18:20:02 +00:00
HD Moore
5ab9e95dda
Merge some smarter/faster finder methods over from Pro
...
git-svn-id: file:///home/svn/framework3/trunk@13405 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-29 04:55:15 +00:00
HD Moore
ace9ca86a8
This commit abstracts the non-blocking SSL check so that it verifies existence of the non-blocking API and skips Mac OS X. This should fix some of the issues with meterpreter on MacOS X with Ruby 1.9.2
...
git-svn-id: file:///home/svn/framework3/trunk@13404 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-29 03:34:15 +00:00
James Lee
d50577066f
remove some silliness of registering UserAgent as an option since it's already an advanced option for HttpClient, make the default obvious
...
git-svn-id: file:///home/svn/framework3/trunk@13394 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-28 22:57:47 +00:00
HD Moore
9f8cbc4145
First pass at an import, still missing a few items to call this done
...
git-svn-id: file:///home/svn/framework3/trunk@13390 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-28 21:17:30 +00:00
James Lee
e87fb830ec
add an rpc call to grab the host's directory separator, see #4892
...
git-svn-id: file:///home/svn/framework3/trunk@13385 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-27 23:49:29 +00:00
HD Moore
c7077f2551
Fix up the stop call
...
git-svn-id: file:///home/svn/framework3/trunk@13382 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-27 20:50:11 +00:00
James Lee
75c4553bb8
add prompt options to list of globals for tab completion
...
git-svn-id: file:///home/svn/framework3/trunk@13380 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-27 19:46:16 +00:00
James Lee
a5573b986d
update urls
...
git-svn-id: file:///home/svn/framework3/trunk@13379 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-27 19:45:22 +00:00
James Lee
91790d186a
add path to the loot table printout, use the proper help for vulns
...
git-svn-id: file:///home/svn/framework3/trunk@13378 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-27 19:38:34 +00:00
Tod Beardsley
9dd3c5fbf5
Fixes #5081 , removes racket and bitstruct
...
git-svn-id: file:///home/svn/framework3/trunk@13374 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-27 18:04:32 +00:00
Tod Beardsley
b22ca615c7
Fixes #5038 , missed a couple mentions of Racket. Excised now for sure.
...
git-svn-id: file:///home/svn/framework3/trunk@13371 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-27 17:44:36 +00:00
HD Moore
46183783aa
Fix a typo in the previous commit
...
git-svn-id: file:///home/svn/framework3/trunk@13363 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-27 13:38:22 +00:00
HD Moore
9b076df69f
Encode non-ASCII bits in usernames/hashes for now
...
git-svn-id: file:///home/svn/framework3/trunk@13362 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-27 13:25:55 +00:00
James Lee
aa2c025ce1
add a flush option to portfwd. thanks ipax for the patch!
...
git-svn-id: file:///home/svn/framework3/trunk@13359 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-27 04:59:06 +00:00
Joshua Drake
f1473c4cb3
Fixes #5062 - Use .length instead of .count (1.8 compat)
...
git-svn-id: file:///home/svn/framework3/trunk@13352 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-26 23:36:30 +00:00
HD Moore
29585e0a95
Change import names to work properly on windows 2000
...
git-svn-id: file:///home/svn/framework3/trunk@13351 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-26 22:48:46 +00:00
James Lee
fa4dbf6783
move the client accessor back to the top so it's available when needed, use the session-specific separator, fixes #4892 again
...
git-svn-id: file:///home/svn/framework3/trunk@13350 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-26 22:37:41 +00:00
James Lee
2212afcf31
un-remove an important include...
...
git-svn-id: file:///home/svn/framework3/trunk@13348 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-26 20:58:23 +00:00
James Lee
0f95070f3f
add a request type for grabbing the host's directory separator, fixes #4892
...
git-svn-id: file:///home/svn/framework3/trunk@13346 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-26 20:51:33 +00:00
Tod Beardsley
c54e18d757
Fixes #5038 . Removes all instances of Racket objects, as far as I can tell. If I missed any through my mighty grep -ril racket . statement, please reopen!
...
git-svn-id: file:///home/svn/framework3/trunk@13342 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-26 01:29:21 +00:00
HD Moore
3a76075f4d
Update high score based on feedback
...
git-svn-id: file:///home/svn/framework3/trunk@13336 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-25 17:04:56 +00:00
Tod Beardsley
b965d4b6c8
Avoid a problem with phantom services on port 0
...
git-svn-id: file:///home/svn/framework3/trunk@13334 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-25 13:24:41 +00:00
David Rude
25bdbe6568
More prompt bug fixes, back and use commands should work properly now
...
git-svn-id: file:///home/svn/framework3/trunk@13326 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-24 18:41:23 +00:00
Wei Chen
30dac2a01c
Must have the cow
...
git-svn-id: file:///home/svn/framework3/trunk@13322 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-23 17:56:15 +00:00
James Lee
d3836badc6
add a fingerprint for ie6 on xp sp2 korean
...
git-svn-id: file:///home/svn/framework3/trunk@13321 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-23 17:42:56 +00:00
Matt Weeks
9c3d738b60
Addresses #4781 for signed executables.
...
git-svn-id: file:///home/svn/framework3/trunk@13320 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-23 16:38:13 +00:00
Matt Weeks
425358d286
If replacing payload, don't try to handle payload.
...
git-svn-id: file:///home/svn/framework3/trunk@13319 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-23 14:04:40 +00:00
Matt Weeks
46f225b83b
Because true is a boolean and 'True' is a string.
...
git-svn-id: file:///home/svn/framework3/trunk@13318 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-23 13:47:41 +00:00
HD Moore
a8b56479f4
Fix a typo
...
git-svn-id: file:///home/svn/framework3/trunk@13317 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-23 07:30:53 +00:00
HD Moore
5b8111a27a
Switch to the production defaults
...
git-svn-id: file:///home/svn/framework3/trunk@13316 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-23 07:05:22 +00:00
HD Moore
bad5ed63c0
Sub not GSub
...
git-svn-id: file:///home/svn/framework3/trunk@13315 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-23 07:04:06 +00:00
HD Moore
f2426b6f33
Scrub out the install path in the backtrace
...
git-svn-id: file:///home/svn/framework3/trunk@13314 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-23 07:03:27 +00:00
HD Moore
05867ef6d0
Fix up this to use the right parameters and arguments to HTTP::Client
...
git-svn-id: file:///home/svn/framework3/trunk@13313 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-23 06:55:39 +00:00
HD Moore
2920389aa2
This adds the ability to authenticate against the db user backend as well
...
git-svn-id: file:///home/svn/framework3/trunk@13309 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-23 04:38:42 +00:00
HD Moore
2a4ba84363
Cow repair
...
git-svn-id: file:///home/svn/framework3/trunk@13308 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-23 02:22:01 +00:00
HD Moore
972f07f8d1
Minor tweak
...
git-svn-id: file:///home/svn/framework3/trunk@13307 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-23 02:21:30 +00:00
HD Moore
a7af0c8f08
Merge in some new banners
...
git-svn-id: file:///home/svn/framework3/trunk@13306 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-23 02:20:41 +00:00
Matt Weeks
bb3f572efd
Proper read.
...
git-svn-id: file:///home/svn/framework3/trunk@13305 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-23 01:40:25 +00:00
Matt Weeks
aad07f85b4
Remove debugging statement. oops.
...
git-svn-id: file:///home/svn/framework3/trunk@13304 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-23 01:19:57 +00:00
David Rude
acb857e62b
GOCOW!
...
git-svn-id: file:///home/svn/framework3/trunk@13303 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-23 01:01:38 +00:00
Matt Weeks
1d9c2a0f4f
Reverting 13286 to unbreak GUI and keep db calls consistent; options passed in hash.
...
git-svn-id: file:///home/svn/framework3/trunk@13302 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-23 00:28:36 +00:00
Matt Weeks
8079bfa9b2
Add support for custom executables in EXE mixin instead of generated executables. Fixes #4982 .
...
git-svn-id: file:///home/svn/framework3/trunk@13300 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-23 00:00:04 +00:00
HD Moore
d60524a3d4
Fixes #5009 by using the right client object
...
git-svn-id: file:///home/svn/framework3/trunk@13299 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-22 23:33:06 +00:00
David Rude
a54b8c26c3
Fix prompt updates to show the last set prompt variable
...
git-svn-id: file:///home/svn/framework3/trunk@13291 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-22 01:49:29 +00:00
James Lee
e77ad05910
consistent color
...
git-svn-id: file:///home/svn/framework3/trunk@13290 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 21:49:41 +00:00
HD Moore
93d5935d2c
Add more cow(bell)
...
git-svn-id: file:///home/svn/framework3/trunk@13287 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 20:35:43 +00:00
Raphael Mudge
8f9bfd26c2
fixed db.creds call in RPC
...
git-svn-id: file:///home/svn/framework3/trunk@13286 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 20:00:11 +00:00
David Rude
973170279c
I love shells too
...
git-svn-id: file:///home/svn/framework3/trunk@13285 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 19:28:23 +00:00
Raphael Mudge
6c4ee16d58
fixed db.loots call, this closes #4863
...
git-svn-id: file:///home/svn/framework3/trunk@13284 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 19:15:34 +00:00
David Rude
21922cdcd7
old school 80 column...
...
git-svn-id: file:///home/svn/framework3/trunk@13283 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 19:15:18 +00:00
David Rude
78176fe2b2
New ascii art for the masses!
...
git-svn-id: file:///home/svn/framework3/trunk@13282 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 18:58:54 +00:00
David Rude
59b9dfd9eb
no need for the framework reference now
...
git-svn-id: file:///home/svn/framework3/trunk@13281 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 18:35:57 +00:00
HD Moore
12562ef6cf
Its that time again
...
git-svn-id: file:///home/svn/framework3/trunk@13280 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 18:35:09 +00:00
David Rude
2776669a51
reworked how the custom prompts work with different input streams
...
git-svn-id: file:///home/svn/framework3/trunk@13279 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 18:19:43 +00:00
HD Moore
3046896204
This commit makes the new unicode string encoding optional, it can be disabled by setting EnableUnicodeEncoding to false or through the 'disable_unicode_encoding' console command in the Meterpreter shell. Fixes #4986
...
git-svn-id: file:///home/svn/framework3/trunk@13278 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 15:44:54 +00:00
HD Moore
ce862cf999
Disable this until some bugs are sorted out
...
git-svn-id: file:///home/svn/framework3/trunk@13277 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 15:38:28 +00:00
HD Moore
8337c9e90a
Add the framework accessor, unbreak trunk
...
git-svn-id: file:///home/svn/framework3/trunk@13276 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 15:35:28 +00:00
HD Moore
7dfb74be10
See #4986 , make unicode encoding optional
...
git-svn-id: file:///home/svn/framework3/trunk@13275 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 15:26:15 +00:00
David Rude
f6e3065a51
camel case the advanced options
...
git-svn-id: file:///home/svn/framework3/trunk@13274 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 14:35:02 +00:00
David Rude
98e99ea2e6
add prompt_char support
...
git-svn-id: file:///home/svn/framework3/trunk@13273 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 06:17:44 +00:00
David Rude
1902b92878
Merge custom prompt code
...
git-svn-id: file:///home/svn/framework3/trunk@13272 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 06:14:25 +00:00
amaloteaux
b7ca38f212
correct a bug on capture module when pcapfile are used
...
git-svn-id: file:///home/svn/framework3/trunk@13269 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-20 23:17:55 +00:00
James Lee
19c4ded9c7
remove the unnecessary db_ prefix on commands that do not manipulate the database infrastructure. fixes #4963
...
git-svn-id: file:///home/svn/framework3/trunk@13267 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-20 08:39:35 +00:00
James Lee
ce604977b9
remove deprecated db_create and db_destroy
...
git-svn-id: file:///home/svn/framework3/trunk@13266 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-20 08:25:01 +00:00
James Lee
dd4bebf1dd
add a list of supported file types for import, fixes #4509
...
git-svn-id: file:///home/svn/framework3/trunk@13265 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-20 07:51:52 +00:00
James Lee
18ce54c11f
require a note type when adding notes
...
git-svn-id: file:///home/svn/framework3/trunk@13264 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-20 07:34:52 +00:00
James Lee
00b9af40a1
add RangeWalker support for db_notes, see #4963
...
git-svn-id: file:///home/svn/framework3/trunk@13263 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-20 07:29:42 +00:00
James Lee
26e74e2c4e
add RangeWalker and portspec support for db_vulns, see #4963
...
git-svn-id: file:///home/svn/framework3/trunk@13262 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-20 06:32:40 +00:00
James Lee
14f5e2bd9c
remove deprecated db_exploited, see #4217
...
git-svn-id: file:///home/svn/framework3/trunk@13261 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-20 05:53:40 +00:00
James Lee
f3f94f24a8
db_loot: print a table instead of a big line, accept RangeWalker addrs
...
git-svn-id: file:///home/svn/framework3/trunk@13260 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-20 05:13:59 +00:00
James Lee
03b6eee19e
print a table instead of a big line for db_creds
...
git-svn-id: file:///home/svn/framework3/trunk@13259 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-20 04:48:55 +00:00
James Lee
60d6357070
db_hosts and db_services should have full support for RangeWalker and portspec now. see #4963
...
git-svn-id: file:///home/svn/framework3/trunk@13258 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-20 04:39:52 +00:00
James Lee
1023a4a393
allow RangeWalker syntax for args to db_hosts, see #4963
...
git-svn-id: file:///home/svn/framework3/trunk@13257 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-20 03:58:25 +00:00
James Lee
047f509c75
allow portspecs for db_services -p
...
git-svn-id: file:///home/svn/framework3/trunk@13255 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-20 02:07:14 +00:00
James Lee
4bfb342ad6
abstract parsing of hosts and ports in preperation of adding the same facilities to other commands
...
git-svn-id: file:///home/svn/framework3/trunk@13253 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-20 00:33:52 +00:00
James Lee
bffc8088c3
don't just ignore the prefix. see r13244
...
git-svn-id: file:///home/svn/framework3/trunk@13250 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 23:27:37 +00:00
James Lee
5e245afe48
make db_creds search a little nicer, allow adding and deleting. see r13233
...
git-svn-id: file:///home/svn/framework3/trunk@13247 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 22:53:02 +00:00
Carlos Perez
d4055e8697
to_s on table was appending to it self every time it was called
...
git-svn-id: file:///home/svn/framework3/trunk@13244 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 22:04:13 +00:00
HD Moore
18b96c6f3b
Add the utils require, sometimes it was actually needed
...
git-svn-id: file:///home/svn/framework3/trunk@13242 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 21:51:13 +00:00
Tod Beardsley
9eb71240a4
Avoid trying to save multiple MAC addresses with the nessus import.
...
git-svn-id: file:///home/svn/framework3/trunk@13241 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 21:27:02 +00:00
James Lee
93839922dd
fix method name in doc comment
...
git-svn-id: file:///home/svn/framework3/trunk@13235 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 19:52:52 +00:00
James Lee
25d8365aca
unbreak db_loot when given no addresses, see r13233
...
git-svn-id: file:///home/svn/framework3/trunk@13234 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 19:42:45 +00:00
James Lee
8f7d935cf7
unbreak db_notes when given no addresses
...
git-svn-id: file:///home/svn/framework3/trunk@13233 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 19:18:12 +00:00
James Lee
578d3bc101
refactor hosts -> hostlist in db_loot to match other methdos. see #4963
...
git-svn-id: file:///home/svn/framework3/trunk@13232 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 19:05:16 +00:00
James Lee
8a9eb35c54
remove deprecated db_add_* and db_del_* commands see #4963
...
git-svn-id: file:///home/svn/framework3/trunk@13231 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 18:50:10 +00:00
James Lee
c5ef30f0eb
remove deprecated import commands. see #4963
...
git-svn-id: file:///home/svn/framework3/trunk@13229 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 17:41:20 +00:00
David Rude
b877d3c639
Added memory_grep post module and updated the GetProcessHeaps definition in railgun
...
git-svn-id: file:///home/svn/framework3/trunk@13225 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 17:06:26 +00:00
HD Moore
628f29c551
Correctly throw a not-supported error on older ruby
...
git-svn-id: file:///home/svn/framework3/trunk@13223 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 14:49:34 +00:00
James Lee
becf8d756c
standardize db_creds and db_exploited, hopefully keeping the same level of flexibility. see #4963
...
git-svn-id: file:///home/svn/framework3/trunk@13222 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 11:16:36 +00:00
James Lee
c39d75ceee
fix a typo that causes stack traces whan searching for 'app:client'
...
git-svn-id: file:///home/svn/framework3/trunk@13220 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 08:35:25 +00:00
James Lee
115a331e6b
remove db_add_{note,host}; replace them with options to db_{notes,hosts}, see #4963
...
git-svn-id: file:///home/svn/framework3/trunk@13219 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 08:13:55 +00:00
James Lee
7b7b9670d2
add -a to db_hosts to replace db_add_hots, see #4963
...
git-svn-id: file:///home/svn/framework3/trunk@13218 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 06:09:10 +00:00
HD Moore
ad53b4f115
A couple really minor tweaks to metasm samples and code
...
git-svn-id: file:///home/svn/framework3/trunk@13217 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 05:50:17 +00:00
Chao Mu
13b3fe841e
adds new mixin for enumerating windows profiles. fixes #4864 . Thank you David Maloney!
...
git-svn-id: file:///home/svn/framework3/trunk@13216 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 04:35:31 +00:00
James Lee
4188db3a6d
honor the Spawn option when creating a jar
...
git-svn-id: file:///home/svn/framework3/trunk@13215 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 02:54:38 +00:00
James Lee
3c261c346f
add support for java/meterpreter/reverse_http. assuming i didn't miss any files, fixes #4946 , thanks mihi!
...
git-svn-id: file:///home/svn/framework3/trunk@13213 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-18 23:15:06 +00:00
Jonathan Cran
9b72b12050
filtering on command line strings should be a bit heavier
...
git-svn-id: file:///home/svn/framework3/trunk@13210 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-18 20:26:26 +00:00
Jonathan Cran
8f82a29638
allow a '!' in the filter
...
git-svn-id: file:///home/svn/framework3/trunk@13209 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-18 20:17:28 +00:00
HD Moore
f683a2d26f
Note that IE doesnt support inline base64 (thanks resetter)
...
git-svn-id: file:///home/svn/framework3/trunk@13207 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-18 15:38:47 +00:00
HD Moore
2ea46552ad
Apply a fix that was already in reverse_https
...
git-svn-id: file:///home/svn/framework3/trunk@13205 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-18 14:17:19 +00:00
HD Moore
16840ebfa5
Add profiles table
...
git-svn-id: file:///home/svn/framework3/trunk@13202 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-17 21:39:21 +00:00
Chao Mu
d23a5f6092
"The GetFileSecurityA and GetFileSecurityW functions have a "RequestedInformation" that is defined as a PBLOB and should be a DWORD." - Keith Faber. Thank you Keith! see #4364
...
git-svn-id: file:///home/svn/framework3/trunk@13201 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-17 17:48:09 +00:00
HD Moore
cccbdf9fab
This patch allows meterpreter to work with file paths and user names that are not of the US-ASCII character set.
...
git-svn-id: file:///home/svn/framework3/trunk@13200 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-17 17:32:52 +00:00
Chao Mu
1e1d7c534d
"This is the first update to the Railgun Advapi32.dll Definitions. It adds some of the Windows CryptoAPI function calls." - David Maloney. see #4746
...
git-svn-id: file:///home/svn/framework3/trunk@13199 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-17 17:17:48 +00:00
Chao Mu
572a5a5b8b
Added method "functions" to DLLWrapper that grabs the DLL's "functions" so that people can continue to test for function existence via .functions['blah'], evne though I hate this, I want to be backwards compatible. This will be deprecated eventually
...
git-svn-id: file:///home/svn/framework3/trunk@13198 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-17 15:15:26 +00:00
HD Moore
1bb9470e59
Adds the ability to set the cookies, authentication, and arbitrary headers
...
git-svn-id: file:///home/svn/framework3/trunk@13195 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-16 13:29:28 +00:00
James Lee
642cddf620
fix startup-time plugin loading when there is a space in the path.
...
git-svn-id: file:///home/svn/framework3/trunk@13189 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-15 23:46:37 +00:00
James Lee
c412a836ed
add VERBOSE option to all modules and vprint_* methods to use it
...
git-svn-id: file:///home/svn/framework3/trunk@13183 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-15 15:33:35 +00:00
HD Moore
483abeab72
Change this to query the class name of the input
...
git-svn-id: file:///home/svn/framework3/trunk@13182 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-15 04:22:32 +00:00
Chao Mu
59015b2cbf
Closes Redmine issue 3073 (Railgun DLL cache/definition loader needs a rewrite). Major overhaul of how railgun handles DLLs and requests to them. def_*.rb files are now formed differently, this may break your code if you made changes to railgun/def/def_* or railgun.rb, see http://blog.minorcrash.com/2011/07/new-way-to-add-dlls-to-railgun.html
...
git-svn-id: file:///home/svn/framework3/trunk@13181 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-15 00:18:01 +00:00
Matt Weeks
b1afbfeb96
Fix rpc error with console detect code.
...
Un-breaks rpc/msfgui/armitage.
Reference r13160 r13161 r13179
git-svn-id: file:///home/svn/framework3/trunk@13180 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-14 22:45:20 +00:00
James Lee
bc77523a01
revert r13161, hopefully unbreaking msfgui and armitage
...
git-svn-id: file:///home/svn/framework3/trunk@13179 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-14 22:01:28 +00:00
James Lee
c64efb676b
don't raise RequestErrors that kill a whole module when we can't open a file
...
git-svn-id: file:///home/svn/framework3/trunk@13178 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-14 21:59:35 +00:00
James Lee
c32ac59580
explicitly return the resultant session
...
git-svn-id: file:///home/svn/framework3/trunk@13172 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-14 19:42:03 +00:00
HD Moore
9b2e03e18b
Handle newlines (or lack of them) cleaner
...
git-svn-id: file:///home/svn/framework3/trunk@13170 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-14 15:11:17 +00:00
Matt Weeks
d1cfa7560f
Update DHCP server for correctness, reliability, simplicity.
...
Actually keep track of which clients get which IP, only give PXE options to PXE clients, and provide more control over serving to PXE and/or normal clients.
git-svn-id: file:///home/svn/framework3/trunk@13165 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-14 02:34:25 +00:00
Matt Weeks
bcfbcfec30
Because Program Files (x86) has spaces in it.
...
git-svn-id: file:///home/svn/framework3/trunk@13163 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-13 21:54:22 +00:00
Tod Beardsley
b9c5835b5e
Touching up the ssh key login module to be smarter about duplicate user names, not be so chatty in its messaging to the console, deal with whitespace, and avoid storing duplicate keys when we don't need to.
...
git-svn-id: file:///home/svn/framework3/trunk@13162 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-13 20:51:18 +00:00
HD Moore
9fc5470023
Exit makes more sense here
...
git-svn-id: file:///home/svn/framework3/trunk@13161 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-13 05:06:01 +00:00
HD Moore
65702f64b6
Check to make sure we are running under Console2; all sorts of gremlins and threading bugs appear when running under a bare cmd.exe console, this should save us a few bug reports.
...
git-svn-id: file:///home/svn/framework3/trunk@13160 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-13 05:01:37 +00:00
Joshua Drake
ee6cbb7c87
See #4868 , reverts r13103
...
git-svn-id: file:///home/svn/framework3/trunk@13158 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-12 23:07:51 +00:00
Tod Beardsley
dc84ee6aab
More fixups for ssh_login_pubkey and special handlers for long strings of keys.
...
git-svn-id: file:///home/svn/framework3/trunk@13156 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-12 20:58:25 +00:00
Tod Beardsley
4c80d9a427
updates r13154 don't be case insensitive since it's a custom format and would like to preserve case on KEY=
...
git-svn-id: file:///home/svn/framework3/trunk@13155 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-12 16:36:28 +00:00
Tod Beardsley
7abb2980a6
Adds a mechanism to compare stored SSH keys by key id.
...
git-svn-id: file:///home/svn/framework3/trunk@13154 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-12 16:33:54 +00:00
Wei Chen
687aaf5c71
Apply egghunter patch (by corelanc0d3r) for DEP bypass size calculation improvement.
...
Please see #4909
git-svn-id: file:///home/svn/framework3/trunk@13153 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-12 01:06:15 +00:00
Jonathan Cran
24d2b48f64
Initial commit of an esx/esxi driver for the lab plugin (thanks to kernelsmith). Also updated documentation in lib/lab/README.
...
git-svn-id: file:///home/svn/framework3/trunk@13151 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-11 05:52:51 +00:00
HD Moore
90ced404b3
Updates to the jtr code, supports ruby 1.8.7 now, fixes #4908
...
git-svn-id: file:///home/svn/framework3/trunk@13149 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-11 01:07:46 +00:00
Wei Chen
e55d2289cd
I totally missed this: x64 linux payloads in msfencode should still remain in 64-bit format, not 32.
...
git-svn-id: file:///home/svn/framework3/trunk@13140 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-10 06:40:03 +00:00
HD Moore
cd6678188e
Allow :service to be passed in
...
git-svn-id: file:///home/svn/framework3/trunk@13139 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-09 06:58:55 +00:00
HD Moore
71488d37c1
Add the interact payload to the defaults
...
git-svn-id: file:///home/svn/framework3/trunk@13138 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-09 06:57:30 +00:00
HD Moore
7754f0d8f2
This commit adds a basic "analyzer" module for creds
...
git-svn-id: file:///home/svn/framework3/trunk@13136 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-09 02:14:24 +00:00
Wei Chen
dfc7f39e1c
Modified how function to_linux_x64_elf() loads a template file
...
git-svn-id: file:///home/svn/framework3/trunk@13129 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-08 19:24:22 +00:00
Joshua Drake
d6de23de27
Fixes #4868 : allow 125 response during send_cmd_data
...
git-svn-id: file:///home/svn/framework3/trunk@13127 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-08 04:22:47 +00:00
Jonathan Cran
4ac2e9111e
add a missing require, and ensure the proper namespace is referenced - thanks ricky
...
git-svn-id: file:///home/svn/framework3/trunk@13126 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-08 03:51:48 +00:00
James Lee
7f743a5c1b
make meterpreter's File.basename() honor both kinds of directory seperators, use the remote basename as the dest when dest is implicit
...
git-svn-id: file:///home/svn/framework3/trunk@13124 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-08 00:08:42 +00:00
Wei Chen
946074feb9
Add a waitFor() function to make sure chmod is finished running. Thx Juan.
...
git-svn-id: file:///home/svn/framework3/trunk@13119 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-07 19:40:34 +00:00
Tod Beardsley
fb9e0a72e0
Deal with a workspace namespace race in starting the UI.
...
git-svn-id: file:///home/svn/framework3/trunk@13116 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-07 13:33:07 +00:00
James Lee
1f349ff542
Don't close the session for irrelevant exceptions. The shell might still be dead for some other reason, but this will prevent closing it unnecessarily
...
git-svn-id: file:///home/svn/framework3/trunk@13107 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-06 20:34:52 +00:00
James Lee
b49c451cd7
derp, this is a string
...
git-svn-id: file:///home/svn/framework3/trunk@13104 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-06 00:19:29 +00:00
Joshua Drake
b42df7cd20
close instead of shutdown
...
git-svn-id: file:///home/svn/framework3/trunk@13103 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-05 17:22:19 +00:00
James Lee
d876b8d297
if the command we're running has spaces and we got no options for it, split it up correctly using Shellwords, fixes issues with running commands on java meterp
...
git-svn-id: file:///home/svn/framework3/trunk@13102 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-05 17:17:27 +00:00
HD Moore
e6968c202a
A couple bug fixes to enable cmd_interact and a new module for the VSFTPD backdoor
...
git-svn-id: file:///home/svn/framework3/trunk@13093 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-04 20:09:32 +00:00
James Lee
47a551468b
add a Post.create method that makes testing post module stuff in IRB a lot easier. try this from a meterpreter irb prompt: pry Msf::Module::Post.create(client)
...
git-svn-id: file:///home/svn/framework3/trunk@13087 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-02 00:39:16 +00:00
James Lee
d68e855bb6
don't try to chomp nil when the command failed (happens when a session dies)
...
git-svn-id: file:///home/svn/framework3/trunk@13085 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-01 23:46:54 +00:00
James Lee
a301170cc2
special-case java and php to check for compatibility against the underlying platform.
...
git-svn-id: file:///home/svn/framework3/trunk@13084 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-01 23:41:49 +00:00
James Lee
9c8605813e
don't wait for the session to send back a response after telling it to die
...
git-svn-id: file:///home/svn/framework3/trunk@13083 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-01 23:29:00 +00:00
James Lee
56de119a0f
add a few opera fingerprints gathered from http://www.giac.org/paper/gwapt/1353/client-fingerprinting-analysis-browser-scripting-environment/115300
...
git-svn-id: file:///home/svn/framework3/trunk@13082 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-01 23:20:31 +00:00
Tod Beardsley
238d256ecb
Works around a race condition that sometimes triggers when running multiple AuthBrute modules concurrently.
...
git-svn-id: file:///home/svn/framework3/trunk@13078 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-30 19:24:14 +00:00
Tod Beardsley
0818a856b6
Some fixups for some new AuthBrute hotness.
...
git-svn-id: file:///home/svn/framework3/trunk@13075 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-30 06:52:52 +00:00
HD Moore
17145d07b6
Add some new tables
...
git-svn-id: file:///home/svn/framework3/trunk@13074 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-30 06:49:04 +00:00
HD Moore
7d9f36d4b9
Adds support for the new regloadkey/regunloadkey operations.
...
git-svn-id: file:///home/svn/framework3/trunk@13072 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-30 05:35:18 +00:00
James Lee
5f5c024193
supress a useless exception (trying to close a closed stream)
...
git-svn-id: file:///home/svn/framework3/trunk@13071 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-30 05:12:07 +00:00
James Lee
e321d01cd4
actually do what the comment says it does instead of trying to read a bunch of times with a tiny timeout. fixes some issues with shell commands on meterpreter sessions
...
git-svn-id: file:///home/svn/framework3/trunk@13070 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-30 05:05:02 +00:00
James Lee
59ef021bd6
cosmetic documentation fix
...
git-svn-id: file:///home/svn/framework3/trunk@13065 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-29 14:50:15 +00:00
HD Moore
92bb531af5
New bins, new functions, more info soon
...
git-svn-id: file:///home/svn/framework3/trunk@13059 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-29 06:12:03 +00:00
Matt Weeks
078d5d7790
Enable rwx exec thread method to generate jump offset off end. (for multipayload)
...
git-svn-id: file:///home/svn/framework3/trunk@13056 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-29 01:13:12 +00:00
HD Moore
a98602ed8d
Shut down properly through session.kill
...
git-svn-id: file:///home/svn/framework3/trunk@13055 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-28 21:38:24 +00:00
HD Moore
a03b030465
Typo
...
git-svn-id: file:///home/svn/framework3/trunk@13054 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-28 21:35:27 +00:00
HD Moore
9220506ba2
Merge in recent meterpreter work. These are not the commits you are looking for (more info on what all this is later this week).
...
git-svn-id: file:///home/svn/framework3/trunk@13053 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-28 21:26:43 +00:00
HD Moore
175df6e52d
Add framework.db.listeners
...
git-svn-id: file:///home/svn/framework3/trunk@13047 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-28 16:01:21 +00:00
HD Moore
5bbf27bf5b
Woops, this may not have a prompt accessor, find another way
...
git-svn-id: file:///home/svn/framework3/trunk@13029 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-25 20:33:15 +00:00
HD Moore
da7cc53c38
Add the spool command for redirecting output to both the console and a file
...
git-svn-id: file:///home/svn/framework3/trunk@13028 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-25 18:51:07 +00:00
HD Moore
e4eb2a4af0
Add a new table for managing background listeners
...
git-svn-id: file:///home/svn/framework3/trunk@13024 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-25 06:57:47 +00:00
Joshua Drake
415777c25b
fix missing initialization
...
git-svn-id: file:///home/svn/framework3/trunk@13023 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-25 04:57:01 +00:00
HD Moore
73137c8dc1
Implement some future proofing
...
git-svn-id: file:///home/svn/framework3/trunk@13020 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-25 01:40:16 +00:00
James Lee
515eda1fff
add help about new search keyword options
...
git-svn-id: file:///home/svn/framework3/trunk@13017 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-23 22:32:44 +00:00
James Lee
df5974c25d
And now back to your regularly scheduled development version
...
git-svn-id: file:///home/svn/framework3/trunk@13016 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-23 19:39:16 +00:00
HD Moore
25a2d846e2
Add the settings column
...
git-svn-id: file:///home/svn/framework3/trunk@13011 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-23 07:04:20 +00:00
Jonathan Cran
ef19406645
don't try to launch the gui w/ the workstation driver
...
git-svn-id: file:///home/svn/framework3/trunk@13010 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-23 04:27:09 +00:00
James Lee
7ef6be45c4
fix some wacky inheritance problems with Msf::Module#inspect
...
git-svn-id: file:///home/svn/framework3/trunk@13006 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-22 22:18:55 +00:00
Tod Beardsley
824022fde3
Adds a more universal print_error message for :abort in auth_brute.rb
...
git-svn-id: file:///home/svn/framework3/trunk@13005 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-22 20:53:51 +00:00
Tod Beardsley
7a0e2ba59e
Adds more verbose debugging output when the RPC service hits a raisable condition. Namely, tells the consumer what actually triggered the raise in the case of a missing or invalid request method, missing API group, or missing API group method.
...
git-svn-id: file:///home/svn/framework3/trunk@13004 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-22 17:53:17 +00:00
HD Moore
40b9b2467b
Remove the downgrade until we figure out the cause, getting different results for the same OS/SP/configuration
...
git-svn-id: file:///home/svn/framework3/trunk@12991 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-21 01:12:17 +00:00
Carlos Perez
68e3691411
Change Post Mixin for Windows platform in its own separate class and minor fixes on modules and scripts
...
git-svn-id: file:///home/svn/framework3/trunk@12990 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-21 00:38:04 +00:00
HD Moore
c42ea1f896
Re-enable the workaround for now, see #4785
...
git-svn-id: file:///home/svn/framework3/trunk@12989 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 23:38:30 +00:00
Carlos Perez
ff7f68b470
Change Post Mixin for Solaris platform in its own separate class
...
git-svn-id: file:///home/svn/framework3/trunk@12988 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 23:33:59 +00:00
HD Moore
ab615c1225
Reference the ticket in this comment: See #4785
...
git-svn-id: file:///home/svn/framework3/trunk@12987 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 23:32:29 +00:00
Carlos Perez
7a1c8d7bb2
Change Post Mixin for OSX platform in its own separate class
...
git-svn-id: file:///home/svn/framework3/trunk@12986 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 23:29:57 +00:00
Carlos Perez
5d3bb04ac0
Change Post Mixin for Linux platform in its own separate class
...
git-svn-id: file:///home/svn/framework3/trunk@12985 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 23:27:57 +00:00
HD Moore
346018c321
Disable NTLMv2 Session for Windows 2000 servers
...
git-svn-id: file:///home/svn/framework3/trunk@12984 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 22:54:13 +00:00
HD Moore
846172fa1a
Split options based on shellwords, pass as a hash, this prevents commas in option values from breaking things and allows quotes to be used
...
git-svn-id: file:///home/svn/framework3/trunk@12983 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 20:54:46 +00:00
James Lee
28d182b2fa
3.7.2 release
...
git-svn-id: file:///home/svn/framework3/trunk@12982 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 19:48:54 +00:00
HD Moore
3831e49455
See #4506 for Macro handling
...
git-svn-id: file:///home/svn/framework3/trunk@12977 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 07:23:16 +00:00
HD Moore
47523c5925
Add RHEL detection from the .el[2-6] match
...
git-svn-id: file:///home/svn/framework3/trunk@12973 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-18 18:12:59 +00:00