Tod Beardsley
2ca134a2c3
Merge branch 'printjob_capture'
...
This lands #811 , and also brings in my changes from
ChrisJohnRiley/metasploit-framework#2
Thanks Chris!
2012-10-01 15:55:14 -05:00
Tod Beardsley
1e4f8591fd
Sneaking in an author credit
2012-10-01 11:42:56 -05:00
Tod Beardsley
c0bc764fd4
Retabbing for tabs, not spaces
...
I'm not a fan of the tabs either, any more. But, until we switch over
for real, let's stick with the project's whitespace conventions?
2012-10-01 11:26:58 -05:00
Tod Beardsley
802924d67a
Getting rid of continuation slashes. Plz don't.
...
Continuation slashes are the devil when it comes to reading Ruby,
especially if you're reading something like:
def hello
puts "Hello world!" \
if true
end
This looks like a syntax error and hurts my eyeballs.
Please avoid this convention in the future.
2012-10-01 11:23:06 -05:00
Tod Beardsley
489c9b701e
Whitespace
2012-09-28 12:47:15 -05:00
Tod Beardsley
1b2240d9bd
Commenting about IPP
2012-09-28 12:38:36 -05:00
Tod Beardsley
a15a2b522c
Removing IPP as a selectable mode
2012-09-28 12:38:17 -05:00
Tod Beardsley
6944aab46c
Removing Id SVN splat
2012-09-28 12:37:00 -05:00
Tod Beardsley
db4b19a2df
Adding Juan's fix for peerhost
2012-09-28 10:26:35 -05:00
Chris John Riley
ce441e95a6
Corrected typo, missing \ and minor regex match
2012-09-21 22:04:19 +03:00
Chris John Riley
9753494cba
Corrected regex scan vs. match issues
...
Altered PS and PCL to elsif to avoid
double detection of printjobs.
2012-09-21 13:20:14 +02:00
Chris John Riley
f7aaae614e
Reduced instances of #{name} to client
...
connections and disconnections. All other
output should be self explanatory and
doesn't need #{name}
2012-09-21 11:08:47 +02:00
Chris John Riley
78f77a3df2
Replaced if @verbose with vprint_status
...
Corrected bug in non-detected print types
2012-09-21 10:59:39 +02:00
jvazquez-r7
0032713198
description modified
2012-09-21 10:09:42 +02:00
Chris John Riley
3d254b69fd
Applied all requirements from pull/715
...
Reworked PCL regex to match PCL 6/XL
msftidy is still complaining about
an indent. Can't find why however!
New PULL created as per request from
jvazquez-r7
2012-09-20 18:04:36 +02:00
Dhiru Kholia
17f7e94f4d
Add support for dumping MySQL challenge-response pairs in JtR format
2012-09-20 13:54:12 +05:30
Rob Fuller
d0558218ee
Add non-authed OPTION response to support WebDAV
2012-08-23 15:11:10 -04:00
sinn3r
8d4b4fc7be
Some more changes before pushing to master
2012-08-20 15:43:39 -05:00
saint patrick
e6bda752ee
cleaned up and using HttpServer for handling requests and sending 401
2012-08-20 15:23:49 -05:00
saint patrick
10698e2f99
Updating HTTP Basic capture mod with edits based on MSF team suggestions
2012-08-19 19:47:01 -05:00
saint patrick
de380cfb46
Adding aux mod for HTTP Basic Auth capture
2012-08-19 01:51:01 -05:00
sinn3r
b46fb260a6
Comply with msftidy
...
*Knock, knock!* Who's there? Me, the msftidy nazi!
2012-08-07 15:59:01 -05:00
sinn3r
33ee6ee699
Merge branch 'sip-capture' of https://github.com/nevdull77/metasploit-framework into nevdull77-sip-capture
2012-07-22 03:36:13 -05:00
Patrik Karlsson
08f0f693b0
change sname in report_auth_info from sip_challenge to sip_client
2012-07-20 19:48:15 +02:00
Patrik Karlsson
5dc985c911
fix msftidy WARNING
2012-07-20 17:15:06 +02:00
Patrik Karlsson
3fc1c1db73
fix problem with report_auth_info that was passed invalid host and port params.
2012-07-20 17:07:42 +02:00
Patrik Karlsson
d494ed9bf7
add a function to sanitize source and dest ip's to avoid breaking JtR format.
2012-07-20 13:27:45 +02:00
Patrik Karlsson
7ec5c0d6e0
change module to use Rex::Socket::Udp instead of Ruby's ::UDPSocket.
2012-07-19 20:34:02 +02:00
sinn3r
1c6ce20ad8
Merge branch 'sip-capture' of https://github.com/nevdull77/metasploit-framework into nevdull77-sip-capture
2012-07-19 10:51:57 -05:00
sinn3r
9c510a738e
Improve outputs
2012-07-19 10:50:58 -05:00
sinn3r
7cb12921d6
Don't print cli addr twice
2012-07-19 10:43:55 -05:00
sinn3r
afd314701e
Improve outputs
2012-07-19 10:41:25 -05:00
sinn3r
3253929555
Fix indent
2012-07-19 10:21:30 -05:00
Patrik Karlsson
ad4a4b2ae3
add module for capturing SIP authentication challenge and response pairs.
...
The module starts a fake SIP server listening for incoming REGISTER requests.
It then triggers an authentication request at the client and captures the
response for cracking in JtR or Cain.
2012-07-18 20:45:08 +02:00
jvazquez-r7
6ac6e375a7
Changes according to hdm and sinn3r feedback
2012-07-17 12:02:24 +02:00
jvazquez-r7
7c2ea2ff23
Merge branch 'mysql-capture' of https://github.com/nevdull77/metasploit-framework into nevdull77-mysql-capture
2012-07-17 12:01:19 +02:00
sinn3r
3def2afb46
Correct e-mail format
2012-07-17 04:24:54 -05:00
Patrik Karlsson
88275620ab
removed JtR support due to bugs in cracking module.
2012-07-16 15:59:43 +02:00
Patrik Karlsson
25a78e6ab0
change so that both Cain and JTR hashes can be stored at the same time and
...
added username report_auth_info
2012-07-16 14:13:35 +02:00
Patrik Karlsson
4859e0809e
add missing username to john hash
2012-07-16 09:14:44 +02:00
HD Moore
10db74d480
Show the IP address in the output
2012-07-15 21:35:43 -05:00
Patrik Karlsson
8889d89eea
msftidy cleanup
2012-07-16 02:07:45 +02:00
Patrik Karlsson
6331c33472
add MySQL password capturing module
...
This module provides a fake MySQL service that is designed to
capture authentication credentials. It captures challenge and
response pairs that can be supplied to Cain or JTR for
cracking.
2012-07-16 01:55:22 +02:00
HD Moore
6cdd044e10
Remove a buggy payload that doesn't have NX support
2012-07-12 12:15:57 -05:00
jvazquez-r7
b12f13f837
Review of Pull request #594
2012-07-12 00:46:24 +02:00
jvazquez-r7
16cd847e5a
Merge branch 'mssql_review' of https://github.com/jvazquez-r7/metasploit-framework into jvazquez-r7-mssql_review
2012-07-12 00:36:54 +02:00
jvazquez-r7
a840ff8cf8
Review of pull request #598
2012-07-12 00:34:17 +02:00
jvazquez-r7
f933d98d38
Review of #595
2012-07-12 00:19:27 +02:00
HD Moore
1989f0ab46
IE 10/Win8 detection support
2012-06-25 00:36:04 -05:00
Rob Fuller
77022d10da
Added a bit of verbosity to SMB capture module to enhance logging and post exploitation
2012-06-18 15:55:40 -03:00
sinn3r
3f0431cf51
Massive whitespace destruction
...
Remove whitespace found at the end of the line
2012-06-06 00:36:17 -05:00
sinn3r
c30af98b53
Massive whitespace destruction
...
Remove all the lines that have nothing but whitespace
2012-06-06 00:22:36 -05:00
sinn3r
f77efbf89e
Change the rest of print_*
2012-04-25 14:24:17 -05:00
sinn3r
aeb691bbee
Massive whitespace cleanup
2012-03-18 00:07:27 -05:00
HD Moore
3fecda95be
Fix 1.8 compatibility issue
2012-02-22 02:05:44 -06:00
James Lee
464cf7f65f
Normalize service names
...
Downcases lots and standardizes a few. Notably, modules that reported a
service name of "TNS" are now "oracle". Modules that report http
now check for SSL and report https instead.
[Fixes #6437 ]
2012-02-21 22:59:20 -07:00
HD Moore
bce1c08623
Update modules/auxiliary/server/capture/http_javascript_keylogger.rb
2012-02-21 04:46:56 -06:00
HD Moore
7c1d48d6aa
Merge in MJC's javascript keylogger
2012-02-21 04:25:15 -06:00
HD Moore
ceb4888772
Fix up the boilerplate comment to use a better url
2012-02-20 19:40:50 -06:00
Tod Beardsley
8ad9beef75
Removing javascript_keylogger from master.
2012-02-06 09:37:16 -06:00
sinn3r
b2ae8a24dc
Fix go cow art (tabs are bad to align chars)
2012-02-05 02:20:31 -06:00
sinn3r
0dd3ad0efb
Remove naughty trailing commas
2012-02-05 02:03:49 -06:00
sinn3r
26f89f65bd
Fix the bug that causes store_loot() to run twice. Also, other minor format changes.
2012-02-05 02:00:03 -06:00
Marcus J. Carey
c06b0f7e72
cleaning up an editor glitch.
2012-02-02 17:59:51 -06:00
Marcus J. Carey
1a278c55b5
a bit more cleanup
2012-02-02 16:19:21 -06:00
Marcus J. Carey
45b58bea06
got rid of bmp generation
2012-02-02 16:07:27 -06:00
Marcus J. Carey
e96eceb145
Editing Javascript keylogger
2012-02-02 15:01:22 -06:00
Marcus J. Carey
7b3262958d
Merge branch 'master' of github.com:threatagent/metasploit-framework
...
Conflicts:
modules/auxiliary/server/capture/javascript_keylogger.rb
2012-02-02 14:58:23 -06:00
Marcus J. Carey
59a44f75ec
Updated Javascript Keylogger
2012-02-02 14:42:13 -06:00
Marcus J. Carey
f45528ec68
Update modules/auxiliary/server/capture/javascript_keylogger.rb
2012-02-02 10:33:33 -06:00
Marcus J. Carey
3bfb8b3c9d
Adding Javascript Keylogger
2012-02-02 10:30:55 -06:00
HD Moore
cd4d7d3c47
Handle IPv6 properly (host header parsing)
2011-12-10 13:24:58 -06:00
HD Moore
cf28713f9a
Mark specific modules as incompatible due to use of quad-dot code
2011-12-05 13:07:36 -06:00
James Lee
67120d4263
msftidy on aux modules, see #5749
2011-11-20 13:12:07 +11:00
David Maloney
aa4f6c1cae
More cred sourcing fixes
...
git-svn-id: file:///home/svn/framework3/trunk@14193 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-08 18:45:47 +00:00
Wei Chen
d98ab06464
This fixes the nil problem with arg. See bug #5848
...
git-svn-id: file:///home/svn/framework3/trunk@14070 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-25 20:48:17 +00:00
Joshua Drake
62c8c6ea9f
big msftidy pass, ping me if there are issues
...
git-svn-id: file:///home/svn/framework3/trunk@14034 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-23 11:56:13 +00:00
Wei Chen
975cc52bac
Fix spelling errors
...
git-svn-id: file:///home/svn/framework3/trunk@13983 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-18 00:54:05 +00:00
Tod Beardsley
30ac88694f
More msftidy fixes. Now I'm going to get a little more surgical to get this to move faster.
...
git-svn-id: file:///home/svn/framework3/trunk@13963 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-17 02:58:53 +00:00
Tod Beardsley
e9461c766e
Msftidy run against a bunch of whitespace violations, a few line too longs.
...
git-svn-id: file:///home/svn/framework3/trunk@13962 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-17 02:42:01 +00:00
amaloteaux
377c987c1d
report hashes captured by htp_ntlm server
...
git-svn-id: file:///home/svn/framework3/trunk@13496 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-06 14:50:15 +00:00
amaloteaux
08322fc7ea
smb capture: split creds.ptype from smb_net_hash to smb_netv1_hash and smb_netv2_hash
...
smb_netv1_hash correspond to netlmv1/netntlmv1 and netntlm2_session hash type
smb_netv2_hash correspond to netlmv2/netntlmv2 hash type
also removed the domain name from creds.user and added it to the pass column like this DOMAIN:NETLMHASH:NETNTLMHASH:CHALLENGE
git-svn-id: file:///home/svn/framework3/trunk@13372 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-27 17:53:09 +00:00
amaloteaux
95577d3b1b
smb_net_hash instead of smb_hash
...
git-svn-id: file:///home/svn/framework3/trunk@13356 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-27 01:49:53 +00:00
amaloteaux
67a3f7bd75
same for http_ntlm capture
...
git-svn-id: file:///home/svn/framework3/trunk@13354 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-26 23:47:40 +00:00
amaloteaux
8809182f62
smb capture : correct some minor bug and allow ntlm2_session hashes to be dumped in john and cain format has they can easily crack them too
...
git-svn-id: file:///home/svn/framework3/trunk@13353 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-26 23:36:45 +00:00
amaloteaux
ee55e0cf76
http_ntlm & smb capture : correct john/cain output, Fixes #4565 and completly Fixes #4362 now
...
git-svn-id: file:///home/svn/framework3/trunk@12683 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-22 14:05:55 +00:00
HD Moore
a8c474d7d6
Add the versioned (1.0) RPC backend
...
git-svn-id: file:///home/svn/framework3/trunk@12679 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-22 03:50:14 +00:00
amaloteaux
fd661770ed
Fix #4362 , thanks to Zack Fasel for report and initial patch
...
git-svn-id: file:///home/svn/framework3/trunk@12560 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-07 18:52:17 +00:00
amaloteaux
7e522d9979
http capture : add challenge as an option
...
git-svn-id: file:///home/svn/framework3/trunk@12231 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-03 23:31:14 +00:00
amaloteaux
544fb61aa2
server capture smb will check for empty pass and not display on screen
...
git-svn-id: file:///home/svn/framework3/trunk@11937 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-11 20:27:22 +00:00
amaloteaux
5f6995e8d3
enable ntlmv2 and signing for smb client stack (pth implementation is coming), fixes #11678 and #152
...
git-svn-id: file:///home/svn/framework3/trunk@11893 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-07 19:57:53 +00:00
Joshua Drake
8ef05017b8
style compliance fixes, naughty naughty
...
git-svn-id: file:///home/svn/framework3/trunk@11796 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-22 20:49:44 +00:00
HD Moore
ac651fba6b
Merge code from Alexandre Maloteaux, fixes #3615
...
git-svn-id: file:///home/svn/framework3/trunk@11678 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-30 19:26:35 +00:00
Joshua Drake
a0a8ea8cbd
re-order includes a bit
...
git-svn-id: file:///home/svn/framework3/trunk@11641 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 21:32:59 +00:00
James Lee
f2661e68db
don't respond with 404's for requests that don't match the URIPATH exactly. allows for more generic hash stealing and fixes 3442
...
git-svn-id: file:///home/svn/framework3/trunk@11576 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-13 20:57:33 +00:00
Joshua Drake
b30270e742
fix version
...
git-svn-id: file:///home/svn/framework3/trunk@11310 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-12 19:06:18 +00:00
HD Moore
cf500fb294
Subtract the stupid
...
git-svn-id: file:///home/svn/framework3/trunk@10792 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-23 07:09:59 +00:00
Joshua Drake
ae04e34cf7
fix some non-full-namespace includes
...
git-svn-id: file:///home/svn/framework3/trunk@10617 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 06:55:52 +00:00
Joshua Drake
840824e3e8
remove unexplained binary characters
...
git-svn-id: file:///home/svn/framework3/trunk@10588 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 16:22:16 +00:00
James Lee
0001550e6d
String#to_a was removed in 1.9.2, replace with [ str ] for compat
...
git-svn-id: file:///home/svn/framework3/trunk@10448 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 21:17:41 +00:00