Joshua Smith
29b6d0d1e3
Adds previous, pushm, popm to msfconsole
...
Adds the ability to set and use a stack of modules, and to easily switch
between the last two modules used.
[Fixes #6165 ][Closes #84 ]
Squashed commit of the following:
commit e41e7f704888b1ce5ad5f23caeee1de13052e3d5
Author: Joshua Smith <kernelsmith@kernelsmith.com>
Date: Mon Dec 26 15:52:08 2011 -0500
pushm/popm working great, let me know if you find bugs
commit 23da8d56ea08ca196e649431e8188b4f29ba97b9
Author: Joshua Smith <kernelsmith@kernelsmith.com>
Date: Mon Dec 26 14:37:18 2011 -0500
Adds the 'previous' command to msfconsole which will load the previously active module as the currently active module, adds @previous_module as a class variable
2011-12-30 15:30:55 -06:00
andurin
898df592be
Fix2 rpc exception handling
...
HD suggested a small tweak to use error_code OR res.code for the raise
2011-12-30 07:05:26 +01:00
andurin
7b4de2380f
Small fix: RPC client exception handling
...
IMHO rpc client should transform the error code from Msf::RPC::Exception
into it's own Msf::RPC::ServerException and should not take the msgpack
response code.
In deep:
I ran into a '401 invalid auth token' after a token timeout (300s).
RPC Daemon raised a 401 - invalid auth token as expected but rpc client
transformed it to a '200 - invalid auth token' using the successful http
transaction to transport the exception.
2011-12-30 05:44:26 +01:00
Tod Beardsley
bc22b7de99
MSFConsole should display hostless loot, also typo fix.
...
Fixes the console to display loot not associated with a host, as when
the CorpWatch modules save loot. Also fixes a typo on
corpwatch_lookup_id.rb
Fixes #6177
2011-12-29 15:11:15 -06:00
Tod Beardsley
78da15ed15
Always check for the current workspace when calling Report#myworkspace().
...
Fixes #6175
2011-12-29 13:48:05 -06:00
chao-mu
ebe461cce7
Merge branch 'master' of git://github.com/rapid7/metasploit-framework
2011-12-28 20:14:01 -05:00
David Maloney
3bb2b5b7fd
Fixed typo in validation routine
2011-12-28 09:40:36 -08:00
David Maloney
9e1e87508f
Fix to boundary validation for when no db is present
...
Fixes #6171
2011-12-28 08:47:22 -08:00
chao-mu
5560c6b17e
Moved and adapted code relating to looking up constant names by constant value
2011-12-28 00:40:08 -05:00
chao-mu
ffcf5af9b0
Merge remote branch 'upstream/master'
2011-12-27 22:06:51 -05:00
David Maloney
9b995bc0a5
Adds boundary validation to the framework
...
enforces boudnary checking on netbios probes
2011-12-27 11:33:52 -08:00
chao-mu
1604162ba3
A place to add railgun convenience code for use in modules
2011-12-24 15:59:46 -05:00
Tod Beardsley
b6d56e8410
Fixes VBS executable creator util
...
Fixes #6152 , using booleans instead of ints.
Tip o' the hat to cloder for the MSDN ref:
http://msdn.microsoft.com/en-us/library/aa265018%28v=vs.60%29.aspx
Tested works on winxp and win7 targets via the persistence meterpreter
script.
2011-12-22 13:13:34 -06:00
Joshua Smith
5166bdcb01
initial, working resource file tab completion, completes from <install_dir>/scripts/resource, see redmine no. 4611
2011-12-15 17:27:52 -05:00
Jonathan Cran
6165b7a1eb
This commit adds a junit_success method, which can be called to
...
generate a test case success xml. This is necessary for the parser to
recognize that tests were indeed run.
2011-12-13 21:13:31 -06:00
HD Moore
cb94b92e9c
What in nine hells was this.
2011-12-13 16:04:25 -06:00
HD Moore
f38a794b1c
Convert ` to '
2011-12-13 16:02:23 -06:00
HD Moore
cfa128a2c8
Show the actual module name in the stack trace (instead of eval)
2011-12-13 09:47:37 -06:00
HD Moore
1d244c4b27
Return the URL in the correct format from the model
2011-12-11 13:50:21 -06:00
HD Moore
17cc89ebad
Add IPv6 specific HTTP(S) handlers and payloads (simplifies
...
options/usage)
2011-12-11 13:26:48 -06:00
HD Moore
8e01312d0f
Formatting
2011-12-10 13:27:47 -06:00
HD Moore
e33ca5a7ba
Small typo fix
2011-12-10 13:26:47 -06:00
HD Moore
e46745b761
Add support for link-local scopes
2011-12-10 13:24:58 -06:00
HD Moore
9c887eb457
Fix displayed host name for IPv6 targets
2011-12-10 13:24:58 -06:00
HD Moore
e3f121929c
Accept IPv6 addresses in the return if getaddress
2011-12-10 13:24:58 -06:00
David Maloney
d939e33f1e
Allows for Loot and Tasks to be imported from an MSF ZIP.
...
This should bring any loots and tasks along with
everything else when doing an improt from an MSF ZIP file.
2011-12-05 22:30:34 -05:00
HD Moore
18e9b99e72
Fix permission (octal not decimal)
2011-12-05 16:49:16 -06:00
HD Moore
4748bf70cd
Use octal mode, duh
2011-12-05 13:07:36 -06:00
HD Moore
89caed444b
Add a helper method for modules to indicate IPv6 compatibility
2011-12-05 13:07:36 -06:00
HD Moore
5362e0cd24
Accept IPv6 addresses into the database routines, start flushing out
...
incompatibilities.
2011-12-05 13:07:36 -06:00
HD Moore
4829968107
Purge the old RPC API
2011-12-05 13:07:25 -06:00
HD Moore
f673b02308
Remove references to address6
2011-12-05 13:07:25 -06:00
HD Moore
27974c4c27
Merge branch 'master' of github.com:rapid7/metasploit-framework into fastlib
...
Conflicts:
modules/auxiliary/scanner/http/axis_login.rb
modules/exploits/multi/http/axis2_deployer.rb
modules/post/multi/gather/thunderbird_creds.rb
modules/post/windows/gather/credentials/imvu.rb
msfopcode
2011-12-03 14:07:09 -06:00
David Maloney
1db9177583
Revert "Merge pull request #22 from scriptjunkie/multithread"
...
This reverts commit 4f76f3bbb8
, reversing
changes made to e72dad4e81
.
2011-12-02 13:35:43 -05:00
HD Moore
424901b4b6
Change the encapsulation method to allow multiple methods without
...
conflict
2011-12-02 02:02:55 -06:00
HD Moore
4f76f3bbb8
Merge pull request #22 from scriptjunkie/multithread
...
RPC multithreading
2011-12-01 23:43:32 -08:00
HD Moore
626389f5ba
No longer track module archive paths, since the manager will load them from the main dir
2011-11-28 22:27:21 -06:00
HD Moore
591ef73f7d
Merge in updated module_manager that loads all .fastlibs
2011-11-28 22:24:27 -06:00
Tod Beardsley
ac33e55df5
Allow hyphens for fnames and ltypes for fileformat exploits
2011-11-28 19:16:30 -06:00
Tod Beardsley
44a47f9913
Fixing up OWA bruteforce module to conform with the usual print_status
...
messages.
2011-11-28 13:31:54 -06:00
David Maloney
d8cd16eb65
Typo in report_auth_info
...
that caused snmp creds to fail reporting.
fixes #6015
2011-11-26 17:57:46 -08:00
HD Moore
f714591b92
Purge the new version code, it triggers a stack and is a massive performance hit
2011-11-23 23:05:51 -06:00
Tod Beardsley
8ab41013d1
Updating the version information to check the SVN metadata first.
2011-11-23 23:05:51 -06:00
HD Moore
4285651455
Purge the new version code, it triggers a stack and is a massive performance hit
2011-11-23 14:32:38 -06:00
Tod Beardsley
94edf3a8ec
Updating the version information to check the SVN metadata first.
2011-11-22 18:33:44 -06:00
David Maloney
c4db49cccc
Fixes issues with telnet bruteforcing where prompts were not
...
being recognized properly.
2011-11-22 00:06:58 -06:00
David Maloney
7d626e3ad1
Fixes issues with telnet bruteforcing where prompts were not
...
being recognized properly.
2011-11-21 14:07:30 -08:00
HD Moore
7059e20315
Add support for .fastlib module archives to the module manager
2011-11-21 15:58:19 -06:00
James Lee
bf105f48cb
massive removal of spaces at EOL and some bad tabs
2011-11-20 12:32:06 +11:00
James Lee
9261d8ec25
spaces at EOL in base
2011-11-20 12:11:40 +11:00
James Lee
e7a545c483
spaces at EOL in core stuff
2011-11-20 12:10:08 +11:00
James Lee
79c2264263
more spaces at EOL and bad tabs
2011-11-20 12:05:14 +11:00
James Lee
aeeed02eee
more spaces at EOL
2011-11-20 12:01:19 +11:00
James Lee
441c5a22ab
more spaces at EOL
2011-11-20 12:00:07 +11:00
James Lee
4ac21afcbc
more spaces at EOL
2011-11-20 11:59:28 +11:00
Tod Beardsley
55367fad4f
Merge pull request #25 from rapid7/post_module_sudo
...
Post module sudo
2011-11-18 06:30:40 -08:00
Tod Beardsley
d8b77564ef
Tidying up, fixing csh echo behavior
2011-11-17 16:29:02 -06:00
Tod Beardsley
9878517f80
Cleanup and light refactoring, deal with slowpoke linux telnet cmd_exec()
2011-11-17 13:19:13 -06:00
scriptjunkie
c4eb32d2ff
Add an optional multithreading to stream server, and enable multithreading (one thread per client) to the RPC server.
2011-11-17 08:07:34 -08:00
Tod Beardsley
93a133d5de
Always try both export and setenv. Fixups to allow for correct reading from echoy nix shells. Fixes is_root? to not treat an empty string as 0
2011-11-16 16:48:19 -06:00
Wesley Cate
b923d952b3
module.execute() now returns a 'uuid' element which can be cross-referenced with the 'exploit_uuid' element returned in each entry in session.list.
...
this was hdm's preferred solution.
2011-11-15 18:36:45 -05:00
David Maloney
6306f8888a
Fix to the username normalisation routine to deal with creds that
...
have no username (i.e. VNC)
2011-11-15 08:52:18 -08:00
David Maloney
c8142043e9
Fixes to credential handling to downcase usernames whenever they are not case sensitive.
...
Also report_auth_info now checks to see if a non-case sensitive version of the cred
may already exist.
2011-11-14 22:50:52 -08:00
andurin
97f62d955f
Fixed very small typo
2011-11-14 11:19:16 +01:00
James Lee
16f0d6cbee
Fix a misplaced comma in a comment
2011-11-14 16:06:45 +11:00
James Lee
8ac4479b13
Use railgun for deleting services.
...
The registry method will make Windows to delete it on reboot, but this
causes it to happen right away.
2011-11-13 21:05:40 -07:00
HD Moore
7757a2df63
Make sure we wait at least half a second for a 401 reply
2011-11-13 12:54:48 -06:00
HD Moore
69fb9aa5b1
Make brute forcing of the XMLRPC/MSGPACKRPC services less rewarding through random delays.
2011-11-13 12:45:48 -06:00
James Lee
69cd56ed42
Merge branch 'master' of github-r7:rapid7/metasploit-framework
2011-11-12 15:15:38 -07:00
James Lee
f7ff350ebb
doesn't work without backslashes
2011-11-12 15:15:09 -07:00
James Lee
07e170f4e4
Add a server argument to the service management methods. Allows
...
creating/starting/stopping services on another machine using the current
session's token for authentication.
2011-11-12 14:40:15 -07:00
HD Moore
f4e42420ad
Small change to abstract the actual source read
2011-11-12 14:48:11 -06:00
David Maloney
4eb80b5ee4
Merge branch 'master' of github.com:rapid7/metasploit-framework
2011-11-11 17:20:47 -08:00
David Maloney
e3f6756e18
Quick fix to import to prevent services from being imported without a port.
2011-11-11 17:19:26 -08:00
James Lee
03f51793c2
Store john.pot in the user's config directory instead of in an
...
arch-specific dir under data/
2011-11-11 11:09:42 -07:00
Tod Beardsley
40614a3cf4
Merge branch 'iss5454'
2011-11-11 11:26:05 -06:00
Tom Samstag
7b7413d85e
Bash format for msfencode/msfvenom
...
This patch adds a Bash output format for msfencode and msfvenom. This is especially useful for local exploitation with shellcode in an environment variable.
Example output:
$ echo 'this is a test' | ./msfvenom -f bash
[-] Using X86 architecture and Windows platform for stdin payload to change use -a and --platform
export buf=\
$'\x74\x68\x69\x73\x20\x69\x73\x20\x61\x20\x74\x65\x73\x74'\
$'\x0a'
It adds unit tests for the new format and also fixes a unit test that was broken (assert_equal 'AAAAAAAAA', Rex::Text.pattern_create(9,['A'])) due to a bug in the shortcut in pattern_create.
2011-11-11 00:13:17 -08:00
David Maloney
a4d67f26c5
Merge branch 'iss5426'
2011-11-10 19:00:52 -08:00
David Maloney
e82c3ad486
Fixes #5426
2011-11-10 18:59:30 -08:00
HD Moore
c30f328560
Purge code deprecated in the 4.1.0 release
2011-11-10 20:16:14 -06:00
HD Moore
6cf59fc695
Small tweak to test mirroring
2011-11-09 22:45:49 -06:00
HD Moore
818ece916f
Add missing commit
2011-11-09 21:40:02 -06:00
Jonathan Cran
7885699ab1
rename the attribute to classname so parser doesn't barf
...
git-svn-id: file:///home/svn/framework3/trunk@14204 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-09 22:21:39 +00:00
HD Moore
2c47475aee
This adds the ability for RC scripts to generate junit/xunit style XML output files for error conditions
...
git-svn-id: file:///home/svn/framework3/trunk@14203 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-09 21:32:48 +00:00
HD Moore
80652126b0
This change automatically sets +x permissions for cpuinfo and jtr if the install did not set them.
...
git-svn-id: file:///home/svn/framework3/trunk@14202 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-09 16:44:07 +00:00
HD Moore
c504d295b2
Rescue EOFErrors by default as well (handle corner cases across a swath of modules)
...
git-svn-id: file:///home/svn/framework3/trunk@14200 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-09 06:10:10 +00:00
Matt Weeks
fdf13e5e0e
Fixes #5927
...
git-svn-id: file:///home/svn/framework3/trunk@14196 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-08 21:45:17 +00:00
Matt Weeks
4629c0867b
Address #5887 and #5888 for RPC DB and msfgui
...
git-svn-id: file:///home/svn/framework3/trunk@14167 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-05 18:12:10 +00:00
HD Moore
cd3c3daae1
Allow SkipDatabaseInit to be passed to new consoles to skip over DB initialization. Combined with r14161 this fixes #5902 by allowing this option to be passed down
...
git-svn-id: file:///home/svn/framework3/trunk@14164 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-04 22:25:09 +00:00
HD Moore
d7199d243d
This tweak allows a hash of options to be passed to console.create() and for this to bubble up to the WebConsole driver initialization
...
git-svn-id: file:///home/svn/framework3/trunk@14161 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-04 20:38:12 +00:00
David Maloney
131ffe4ab2
Fixed inconsistencies in how data was being passed to report_auth_info(). The command dispatcher and filezilla
...
server cred module both used the accessor :ptype but report_auth_info looks for :type.
While ptype is what the db field is called, almsot everything else references :type so it is better
for consistency to keep everything at :type.
Fixes #5906
git-svn-id: file:///home/svn/framework3/trunk@14141 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-02 02:47:28 +00:00
Tod Beardsley
2a6b002054
Fixes #5338 . Note that defined methods are always shared across bindings, no matter what. This patch allows for local variables and other locally-scoped things to behave the same way.
...
git-svn-id: file:///home/svn/framework3/trunk@14126 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-31 17:48:03 +00:00
Tod Beardsley
667175c650
Fixes #5797 , adds an environment variable controlled top level directory for msf config goodies. Thanks Kurt Grutzmacher!
...
git-svn-id: file:///home/svn/framework3/trunk@14125 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-31 16:53:45 +00:00
HD Moore
a4de179793
Bump versioning
...
git-svn-id: file:///home/svn/framework3/trunk@14121 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-30 05:09:20 +00:00
HD Moore
e4695b21ec
Correct the use of auth.logout and make some other items more consistent
...
git-svn-id: file:///home/svn/framework3/trunk@14105 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-28 22:47:26 +00:00
Carlos Perez
0fb9aad89e
Typo
...
git-svn-id: file:///home/svn/framework3/trunk@14096 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-28 13:34:05 +00:00
Tod Beardsley
4b4ef45e33
Fixes #3538 , adds store_local, changes the dest directory of all fileformat exploits, allows "save" to be passed to db_nmap to save scan results.
...
git-svn-id: file:///home/svn/framework3/trunk@14091 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-27 17:01:51 +00:00
HD Moore
993a56421e
Version bumpwq
...
git-svn-id: file:///home/svn/framework3/trunk@14072 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-26 09:12:44 +00:00
James Lee
5ce859d3ad
add tab completion to 'route remove'. this has bugged me for years.
...
git-svn-id: file:///home/svn/framework3/trunk@14065 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-25 16:54:21 +00:00
James Lee
d218852f0a
allow 'route del' as a synonym for 'route remove' since i can never remember to do it right; fix a bug with improper usage for cmd_route; add Prompt* to the list of known global options
...
git-svn-id: file:///home/svn/framework3/trunk@14063 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-25 16:31:35 +00:00
Tod Beardsley
e014401977
See #3472 , deleting some extraneous commenting about a TODO that WASDONE.
...
git-svn-id: file:///home/svn/framework3/trunk@14059 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-25 03:08:17 +00:00
Tod Beardsley
3d2e734ac1
Fixes #3472 with Jaime Filson's patch, with some extra pizzaz for reporting notes against the service, and reporting some notes as vulns as well.
...
See #5837 as well.
git-svn-id: file:///home/svn/framework3/trunk@14058 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-25 03:07:15 +00:00
James Lee
b016d8944e
whitespace at eol
...
git-svn-id: file:///home/svn/framework3/trunk@14056 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-25 00:13:32 +00:00
James Lee
06a3913910
print the number of loots deleted, fixes #5825 , thanks CJR!
...
git-svn-id: file:///home/svn/framework3/trunk@14049 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-24 19:33:00 +00:00
James Lee
07b402f29b
more whitespace, in HttpClient
...
git-svn-id: file:///home/svn/framework3/trunk@14044 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-24 04:58:59 +00:00
Jonathan Cran
78e507fe9b
erb processing for RC files. Allows you to do more generic things w/ rc files:
...
<rc_file>
<%
rhost = "192.168.1.1"
smbuser = "test"
smbpass = "pass"
payload = "windows/meterpreter/reverse_http"
puts "This will happen while i preprocess an erb-enabled rc file"
%>
use windows/smb/psexec
set RHOST <%= rhost %>
set SMBUser <%= smbuser %>
set SMBPass <%= smbpass %>
set PAYLOAD <%= payload %>
save
<ruby>
puts "Now, i should print the system path while running the actual resource file! "
puts ENV["PATH"]
puts "end"
</ruby>
<%= puts "This will also happen when i preprocess too" %>
</rc_file>
which will give you output like this:
<output>
[*] Processing /home/jcran/Desktop/test_erb_rc for ERB directives.
This will happen while i preprocess an erb-enabled rc file
This will also happen when i preprocess too
resource (/home/jcran/Desktop/test_erb_rc)> use windows/smb/psexec
resource (/home/jcran/Desktop/test_erb_rc)> set RHOST 192.168.1.1
RHOST => 192.168.1.1
resource (/home/jcran/Desktop/test_erb_rc)> set SMBUser test
SMBUser => test
resource (/home/jcran/Desktop/test_erb_rc)> set SMBPass pass
SMBPass => pass
resource (/home/jcran/Desktop/test_erb_rc)> set PAYLOAD windows/meterpreter/reverse_http
PAYLOAD => windows/meterpreter/reverse_http
resource (/home/jcran/Desktop/test_erb_rc)> save
Saved configuration to: /home/jcran/.msf4/config
[*] resource (/home/jcran/Desktop/test_erb_rc)> Ruby Code (115 bytes)
Now, i should print the system path while running the actual resource file!
/home/jcran/.rvm/gems/ruby-1.9.4-p1/bin:/home/jcran/.rvm/gems/ruby-1.9.4-p1@global/bin:/home/jcran/.rvm/rubies/ruby-1.9.4-p1/bin:/home/jcran/.rvm/bin
end
msf exploit(psexec) >
</output>
git-svn-id: file:///home/svn/framework3/trunk@14013 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-20 06:41:07 +00:00
HD Moore
fadeada83c
Bump this to 4.1.0-release (incoming!)
...
git-svn-id: file:///home/svn/framework3/trunk@13988 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-18 08:09:08 +00:00
HD Moore
ef3c8aa70c
Trailing slash is required after all
...
git-svn-id: file:///home/svn/framework3/trunk@13986 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-18 07:17:13 +00:00
Tod Beardsley
39ecc19546
Give a warning about an unreadable db config file.
...
git-svn-id: file:///home/svn/framework3/trunk@13982 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-17 21:41:22 +00:00
Tod Beardsley
3972fb1788
Just because you can't read database.yml shouldn't mean you crash.
...
git-svn-id: file:///home/svn/framework3/trunk@13981 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-17 21:23:59 +00:00
HD Moore
8a0eddc795
Handle closed_at in a consistent way as it applies to UTC ( closes #5572 )
...
git-svn-id: file:///home/svn/framework3/trunk@13955 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-16 19:03:59 +00:00
HD Moore
6d06ac3be1
Fixes #5405 by applying thelightcosine's patch
...
git-svn-id: file:///home/svn/framework3/trunk@13954 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-16 18:59:27 +00:00
HD Moore
729cfe713c
Applies a patch from Kieth Faber that fixes #5080
...
git-svn-id: file:///home/svn/framework3/trunk@13951 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-16 09:58:18 +00:00
HD Moore
cf8524b1b4
Fixes #5414 by applying Joshua Taylor's patch that corrects bad reference types
...
git-svn-id: file:///home/svn/framework3/trunk@13949 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-16 09:53:53 +00:00
HD Moore
62740172e4
Officially remove support for the buggy/non-functional MySQL backend
...
git-svn-id: file:///home/svn/framework3/trunk@13948 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-16 09:42:04 +00:00
James Lee
5c9ddb293d
add a few comments to reduce the sanity-blasting-ness
...
git-svn-id: file:///home/svn/framework3/trunk@13942 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-16 00:17:13 +00:00
James Lee
b615055c89
Fix a bug where we weren't actually trying to get the correct case for lm/ntlm hashes
...
git-svn-id: file:///home/svn/framework3/trunk@13927 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-15 04:35:06 +00:00
HD Moore
3c73c3c2f8
Pile of small bug fixes for the FTP server and mixin
...
git-svn-id: file:///home/svn/framework3/trunk@13924 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-14 23:07:09 +00:00
James Lee
ceb095b189
add -R and -o to the creds command
...
git-svn-id: file:///home/svn/framework3/trunk@13921 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-14 02:46:03 +00:00
Tod Beardsley
550746e7c2
Adding a fingerprint for Metasploit. Turnabout is fair play and all.
...
git-svn-id: file:///home/svn/framework3/trunk@13918 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-14 01:32:46 +00:00
HD Moore
0ff7f17cba
Cosmetic module and service name fixes
...
git-svn-id: file:///home/svn/framework3/trunk@13917 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-14 00:52:15 +00:00
HD Moore
d0ab01d332
Bump the revision to match
...
git-svn-id: file:///home/svn/framework3/trunk@13916 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-13 23:41:52 +00:00
Carlos Perez
f6d1fcd591
Add Cisco as a platform
...
git-svn-id: file:///home/svn/framework3/trunk@13914 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-13 22:41:48 +00:00
James Lee
4d56a8cad7
treat the user arg like a regex if it was given for a creds search; also, print the vulns help instead of creds help when the user types 'help vulns'
...
git-svn-id: file:///home/svn/framework3/trunk@13902 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-12 23:50:14 +00:00
Tod Beardsley
d9ea38d553
I blame bannedit for all his unless unless talk lately.
...
git-svn-id: file:///home/svn/framework3/trunk@13893 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-12 21:34:03 +00:00
Tod Beardsley
153a73c75f
Fixes #5684 by backing off of post module setup if we don't have enough of a meterpreter session to work with yet.
...
git-svn-id: file:///home/svn/framework3/trunk@13892 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-12 21:25:56 +00:00
HD Moore
a2f4e5ea28
Make it clear that db_autopwn is deprecated
...
git-svn-id: file:///home/svn/framework3/trunk@13849 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-10 01:19:58 +00:00
Chao Mu
9575bb3780
Fixes #5639 . added vprint_debug to module.rb alongside the other vprint_ methods. It calls print_debug when datastore['verbose']
...
git-svn-id: file:///home/svn/framework3/trunk@13840 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-09 05:34:30 +00:00
HD Moore
292aae8ab5
This small patch causes any input to RangeWalker that contains a host name to expand to all A records returned for that name. This allows RHOSTS to be set to a dns name that returns multiple addresses and for all addresses corresponding to the name to be tested.
...
git-svn-id: file:///home/svn/framework3/trunk@13837 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-09 01:07:51 +00:00
Jonathan Cran
1b4559199d
add the ability to read an environment variable in an rc file. resolves #5334
...
git-svn-id: file:///home/svn/framework3/trunk@13820 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-06 00:02:51 +00:00
HD Moore
77c86a2406
Fix a couple cosmetic warnings
...
git-svn-id: file:///home/svn/framework3/trunk@13818 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-05 15:31:56 +00:00
Tod Beardsley
f3663520f8
Deal with Windows 7 nexpose fingerprints a little better.
...
git-svn-id: file:///home/svn/framework3/trunk@13807 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-30 20:46:20 +00:00
Tod Beardsley
b79f4324f9
Quick model for my new table
...
git-svn-id: file:///home/svn/framework3/trunk@13806 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-30 15:49:01 +00:00
HD Moore
616913c4c1
Handle situations where the user set LHOST to 0.0.0.0 in the handler by defaulting LHOST to our locally visible IP for the specific client. Solves some integration issues where 0.0.0.0 was accidentally used
...
git-svn-id: file:///home/svn/framework3/trunk@13782 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-23 17:04:24 +00:00
Tod Beardsley
00f21c08ae
Fixes bug reported by Jérôme to the framework list.
...
git-svn-id: file:///home/svn/framework3/trunk@13776 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-23 01:22:00 +00:00
James Lee
7163710bcf
fix a typo and some whitespace, fixes #5480 . Thanks Kurt!
...
git-svn-id: file:///home/svn/framework3/trunk@13764 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-20 17:17:20 +00:00
James Lee
c0ddf56ec0
hmf, missed this one, too. see #5288
...
git-svn-id: file:///home/svn/framework3/trunk@13743 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-16 21:31:21 +00:00
James Lee
c10e56dcc4
aaaaand commit the correct file. see #3745 and r13739
...
git-svn-id: file:///home/svn/framework3/trunk@13740 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-16 20:33:58 +00:00
Matt Weeks
acae5dcdc8
Killing puts.
...
Die, puts, die!!
git-svn-id: file:///home/svn/framework3/trunk@13715 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-11 02:42:39 +00:00
Matt Weeks
94d77fbb4f
Fix MsgPack-related string encoding incompatibility.
...
git-svn-id: file:///home/svn/framework3/trunk@13713 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-10 19:33:34 +00:00
HD Moore
a63f1cb830
Make the comment honest
...
git-svn-id: file:///home/svn/framework3/trunk@13708 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-08 05:30:37 +00:00
James Lee
cc24962bc8
whitespace cleanup
...
git-svn-id: file:///home/svn/framework3/trunk@13703 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-07 19:32:16 +00:00
HD Moore
adb5ad7cc9
Be more pedantic about it
...
git-svn-id: file:///home/svn/framework3/trunk@13696 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-05 17:43:09 +00:00
HD Moore
0d6c889844
Let store_loot indicate the service as well (requires service object)
...
git-svn-id: file:///home/svn/framework3/trunk@13695 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-05 17:41:39 +00:00
HD Moore
5cd80b54f3
Correct this regex
...
git-svn-id: file:///home/svn/framework3/trunk@13679 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-01 14:55:38 +00:00
David Rude
60b14d3cdb
Adds the opts arg to http server mixin for heaplib
...
git-svn-id: file:///home/svn/framework3/trunk@13676 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-01 09:08:59 +00:00
Mario Ceballos
a7d95fad73
typo.. was working on some java sploit and found it.
...
git-svn-id: file:///home/svn/framework3/trunk@13667 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-30 22:23:00 +00:00
HD Moore
1c401908f1
Prefix the module name if it was not provided. Fixes #5309 by making this work either way
...
git-svn-id: file:///home/svn/framework3/trunk@13647 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-28 20:27:47 +00:00
Matt Weeks
a20195d9a4
Display all notes when no host specified, since not all notes include a host.
...
git-svn-id: file:///home/svn/framework3/trunk@13645 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-27 15:39:42 +00:00
amaloteaux
1dbc0e988e
more simple
...
git-svn-id: file:///home/svn/framework3/trunk@13637 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-25 20:49:12 +00:00
James Lee
21604f33e6
add a pry command to modules, move the ModuleCommandDispatcher into its own file
...
git-svn-id: file:///home/svn/framework3/trunk@13630 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-24 21:41:03 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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