f4e42420ad
Small change to abstract the actual source read
2011-11-12 14:48:11 -06:00
4eb80b5ee4
Merge branch 'master' of github.com:rapid7/metasploit-framework
2011-11-11 17:20:47 -08:00
e3f6756e18
Quick fix to import to prevent services from being imported without a port.
2011-11-11 17:19:26 -08:00
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
40614a3cf4
Merge branch 'iss5454'
2011-11-11 11:26:05 -06:00
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
a4d67f26c5
Merge branch 'iss5426'
2011-11-10 19:00:52 -08:00
e82c3ad486
Fixes #5426
2011-11-10 18:59:30 -08:00
c30f328560
Purge code deprecated in the 4.1.0 release
2011-11-10 20:16:14 -06:00
30a86c9378
Merge patch to fix #5271
2011-11-10 20:01:50 -06:00
6cf59fc695
Small tweak to test mirroring
2011-11-09 22:45:49 -06:00
818ece916f
Add missing commit
2011-11-09 21:40:02 -06:00
16f45fc894
Add empty directories from svn repo.
2011-11-09 18:41:40 -06:00
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
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
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
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
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
9dccd49662
Fixes #5931 Some junk characters were added to the end of the file by mistake
...
git-svn-id: file:///home/svn/framework3/trunk@14176 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-06 22:13:42 +00:00
64e1484d71
Fix #5928
...
git-svn-id: file:///home/svn/framework3/trunk@14173 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-06 20:40:20 +00:00
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
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
0658d8068b
remove extra quotes
...
git-svn-id: file:///home/svn/framework3/trunk@14163 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-04 21:31:12 +00:00
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
7c9608e8a2
typo
...
git-svn-id: file:///home/svn/framework3/trunk@14147 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-03 01:44:10 +00:00
a012cac5d4
bugfix in meterpreter modifier & downcase all find_by_vmid requests
...
git-svn-id: file:///home/svn/framework3/trunk@14144 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-02 20:59:32 +00:00
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
66135f5afa
add a hostname accessor
...
git-svn-id: file:///home/svn/framework3/trunk@14138 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-01 21:22:47 +00:00
402ffb3cfa
adds a method for running remote commands and fixes a slew of bugs with the esx driver
...
git-svn-id: file:///home/svn/framework3/trunk@14136 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-01 16:15:51 +00:00
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
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
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
b689796678
msf*scan is busted with -i because of "uninitialized constant Rex::Socket". This addresses that issue.
...
git-svn-id: file:///home/svn/framework3/trunk@14117 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-29 18:54:24 +00:00
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
0fb9aad89e
Typo
...
git-svn-id: file:///home/svn/framework3/trunk@14096 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-28 13:34:05 +00:00
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
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
401ed7d3cf
add a rescue around modifier inclusion & stub out a dos modifier
...
git-svn-id: file:///home/svn/framework3/trunk@14071 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-26 02:49:11 +00:00
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
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
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
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
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
fed2e9a611
Fixes #2052 . The supplied patch wanted to do it in the to_s, but it seems to make more sense to do this kind of thing in the sort_rows() method.
...
Thanks for the patch, though. Note, it's slightly easier to locate which file you're diffing if you diff from the top of /trunk.
git-svn-id: file:///home/svn/framework3/trunk@14051 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-24 20:41:26 +00:00
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
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
437e2e79be
whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@14043 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-24 04:54:03 +00:00
70bf92edae
whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@14042 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-24 04:52:22 +00:00
9622c2e3d7
More current regex for more current pcaprub versions.
...
git-svn-id: file:///home/svn/framework3/trunk@14024 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-22 03:31:44 +00:00
5fec13a389
Propogate the timeout in send_recv() down to the TCP connect call as well
...
git-svn-id: file:///home/svn/framework3/trunk@14021 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-21 15:41:37 +00:00
HD Moore