1cb067e7ae
Merge branch 'cleanup/option_specs' of git://github.com/jlee-r7/metasploit-framework into jlee-r7-cleanup/option_specs
2012-12-12 21:22:07 -06:00
3d000eece9
Merge branch 'rspec-2.12' of git://github.com/jlee-r7/metasploit-framework into jlee-r7-rspec-2.12
2012-12-12 20:44:18 -06:00
79918d1ba1
Merge branch 'rapid7' into wchen-r7-old_keywords
2012-12-12 17:55:37 -06:00
67829756f8
fixed errors
2012-12-12 17:45:02 -06:00
7e5e504c9c
Merge remote branch 'origin/master'
2012-12-12 15:52:06 -06:00
014269cd25
Small changes
2012-12-12 15:47:04 -06:00
73f5986139
Upgrade rspec to 2.12
...
Adds .and_call_original, which is super handy.
2012-12-12 15:36:06 -06:00
e762ca0d9b
Merge remote branch 'jlee-r7/midnitesnake-postgres_payload'
2012-12-12 15:30:56 -06:00
de2efc60a1
Merge branch 'master' of github.com:rapid7/metasploit-framework into rapid7
2012-12-12 15:24:38 -06:00
d36f2df5b4
Merge branch 'dmaloney-r7-tests/rex/post/meterpreter_packet' into rapid7
2012-12-12 15:24:01 -06:00
da438cdcac
Merge remote branch 'jlee-r7/bug/modulemanager-each'
2012-12-12 15:20:03 -06:00
70c2093d1a
Merge pull request #2 from todb-r7/bug/modulemanager-each
...
Bug/modulemanager each
2012-12-12 12:54:49 -08:00
d6e2c3970d
Merge branch 'dmaloney-r7-feature/winrm_compat_mode'
2012-12-12 14:39:49 -06:00
a69a4fbbce
Extra spaces, be gone.
2012-12-12 14:38:00 -06:00
3a481c8e42
Merge branch 'feature/winrm_compat_mode' of git://github.com/dmaloney-r7/metasploit-framework into dmaloney-r7-feature/winrm_compat_mode
2012-12-12 14:31:04 -06:00
ee1aaac61f
Look for SVN keywords that no longer use.
2012-12-12 14:27:08 -06:00
0d8d5baf6d
Resolve merge conflict from jlee-r7
2012-12-12 14:24:47 -06:00
5856874cea
Login check fixes for exploit
2012-12-12 14:18:41 -06:00
482846942a
Fix: download_exec appends an extra / to request
...
The download_exec module parses the provided URL and appends an
unnecessary, nay--damaging I say!!!! '/' to the parsed URI. This
renders the module unusable for those who want a payload to
download and execute a file.
Before and after access.log snippets are in the redmine ticket
http://dev.metasploit.com/redmine/issues/7592
2012-12-12 14:01:31 -06:00
6b4e021607
Make ModuleManager Enumerable
...
Fixes tools/module_* and probably some other lurking bugs
2012-12-12 13:41:04 -06:00
d2fccf9a1c
Merge branch 'msftidy_badchars' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-msftidy_badchars
2012-12-12 19:09:44 +01:00
b465d20d61
Merge branch 'feature/winrm_compat_mode' of git://github.com/dmaloney-r7/metasploit-framework into dmaloney-r7-feature/winrm_compat_mode
2012-12-12 11:59:23 -06:00
86f41c4e6a
Forgot to remove some code
2012-12-12 11:57:28 -06:00
37efe53ac8
I hope this works better
2012-12-12 11:41:36 -06:00
aaa8716f5b
minor cleanup as per egypt
2012-12-12 10:12:42 -06:00
5e8b9a20a4
Fix boneheaded mistake
2012-12-12 09:18:03 -06:00
3e81fb2002
last cleanup for steam.rb
2012-12-12 11:48:46 +01:00
87f6b8bc89
Merge branch 'master' of https://github.com/nikolai-r/metasploit-framework into nikolai-r-master
2012-12-12 11:48:26 +01:00
f642aa67f9
CLeanup redundant code.
2012-12-12 00:00:27 -05:00
f7cf75063d
Cleanup and use Post::File api. Use store_loot for data collection
2012-12-11 23:41:50 -05:00
8f388eb226
fixing if typo
2012-12-11 23:28:21 +01:00
b5b5667539
Merge branch 'symantec_brightmail' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-symantec_brightmail
2012-12-11 23:27:56 +01:00
0ca1dbd14e
Account for the timeout condition
2012-12-11 16:24:42 -06:00
a8084d6412
Add badchars check for module title and author names
2012-12-11 16:17:29 -06:00
e09f4e609c
Merge remote branch 'jlee-r7/bug/rm7037-hash-iteration-redux'
2012-12-11 16:08:28 -06:00
3f4efea879
No twitter name, please.
2012-12-11 14:52:39 -06:00
20ea56e4b9
fixed type @wchen-r7 found
...
hopefully didn't miss any others
2012-12-11 15:29:53 -05:00
717799cffd
fix typos
...
negotiate spelled wrong in a couple spots
and only 3 g's in loggging
2012-12-11 15:00:21 -05:00
343a785420
Add OSVDB references
2012-12-11 12:47:08 -06:00
ceb6f81165
Merge branch 'ektron_xslt_exec_nicob' of git://github.com/jvazquez-r7/metasploit-framework into jvazquez-r7-ektron_xslt_exec_nicob
2012-12-11 12:40:45 -06:00
461f057c95
Merge branch 'loggedin_users' of https://github.com/R3dy/metasploit-framework into R3dy-loggedin_users
2012-12-11 17:33:31 +01:00
2eb4de815d
added c# code by Nicolas Gregoire
2012-12-11 16:33:41 +01:00
44633c4f5b
deleted incorrect cve ref
2012-12-11 12:16:47 +01:00
fdb457d82b
Merge branch 'refs_update' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-refs_update
2012-12-11 12:16:06 +01:00
6512eb4783
Merge branch 'naming_corrections' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-naming_corrections
2012-12-11 11:55:51 +01:00
283d37f2e3
Correct naming style
...
In order to match naming style consistency
2012-12-11 01:12:29 -06:00
b315a4eee4
Grammar
2012-12-11 00:19:15 -06:00
e3a126aa75
Added module for ZDI-10-174
2012-12-11 01:37:44 +01:00
25d888bebb
Add CVE-2012-4347 Symantec Messaging Gateway Log File Download
2012-12-10 18:09:29 -06:00
a673c363fd
Use a more descriptive variable name
...
Also removes commented-out code.
2012-12-10 13:36:09 -06:00
sinn3r
James Lee
nullbind
Tod Beardsley
jlee-r7
David Maloney
Raphael Mudge
jvazquez-r7
Nikolai Rusakov
Rob Fuller