sinn3r
2776047553
Merge branch 'smb_cap' of github.com:Meatballs1/metasploit-framework into Meatballs1-smb_cap
2013-01-09 16:09:35 -06:00
Meatballs
4cadffc06a
msftidy
2013-01-09 10:37:40 +00:00
Meatballs
46139849a9
Move to .empty? over length
2013-01-09 10:36:06 +00:00
Meatballs
a8400030f8
Also correct outut of hash when length is 0
2013-01-09 10:26:57 +00:00
Meatballs
d36fcd5441
Fix smb capture error
2013-01-09 09:50:21 +00:00
Tod Beardsley
33751c7ce4
Merges and resolves CJR's normalize_uri fixes
...
Merge remote-tracking branch 'ChrisJohnRiley/set_normalize_uri_on_modules'
into set_normalize_uri_on_modules
Note that this trips all kinds of msftidy warnings, but that's for another
day.
Conflicts:
modules/exploits/unix/webapp/tikiwiki_jhot_exec.rb
modules/exploits/windows/http/xampp_webdav_upload_php.rb
2013-01-07 11:16:58 -06:00
Christian Mehlmauer
95948b9d7c
msftidy: remove $Revision$
2013-01-03 00:58:09 +01:00
Christian Mehlmauer
ca890369b1
msftidy: remove $Id$
2013-01-03 00:54:48 +01:00
Tod Beardsley
c2586d0907
Instead of raising, offer advice on BPF filtering
...
Many people don't know how to disable ICMP echo responses off the top of
their head. However, the problem is solvable with a decent BPF filter.
2012-12-27 15:18:18 -06:00
Tod Beardsley
c6533621a0
Oops removing debug prints
2012-12-27 14:58:52 -06:00
Tod Beardsley
c695f429d5
Mirror upstream PacketFu fix on ICMP size
2012-12-27 14:56:49 -06:00
Tod Beardsley
121353b360
Fixing EOLs to unix
...
In vim:
:set fileformat=unix
:wq
ta-da
2012-12-27 13:54:50 -06:00
Tod Beardsley
9fa6c9f4c4
Merge remote branch 'ChrisJohnRiley/icmp_exfil' into icmp_exfil
2012-12-27 13:52:19 -06:00
Rob Fuller
20ea56e4b9
fixed type @wchen-r7 found
...
hopefully didn't miss any others
2012-12-11 15:29:53 -05:00
Rob Fuller
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
Chris John Riley
46f3b8f47d
Minor changes to get Travis to rerun (The Travis build failed)
2012-11-22 16:00:38 +01:00
Chris John Riley
8c60035a2d
Renamed functions to meet coding standards
...
Added client-side tool suggestion in description and references
(newlines in the description might help readability, if this is possible?)
Added some minor logic change to stop empty filenames
2012-11-20 18:48:18 +01:00
Chris John Riley
5667cffb77
Fixed typos
2012-11-20 09:06:15 +01:00
Chris John Riley
430227a460
msftidy cleanup
2012-11-19 16:04:35 +01:00
Chris John Riley
082bba3342
Rewrite
...
Removed unrequired global vars
Added flexibility in start, continue, end responses
Added ability to set filename in BOF packet or not
Fixed BEGIN RESCUE blocks to not catch errors themselves
BEGIN ENSURE block still needed to trigger save to loot on CTRL+C
2012-11-19 16:02:53 +01:00
Chris John Riley
f88ec5cbc8
Add normalize_uri to modules that may have
...
been missed by PULL 1045.
Please ensure PULL 1045 is in place prior to
looking at this (as it implements normalize_uri)
ref --> https://github.com/rapid7/metasploit-framework/pull/1045
2012-11-08 17:42:48 +01:00
Michael Schierl
e9f7873afc
Version cleanup
...
Remove all values that are neither 0 nor $Revision$.
2012-10-22 20:57:02 +02:00
sinn3r
201518b66f
msftidy corrections
2012-10-17 17:22:26 -05:00
jvazquez-r7
51e70c44e3
fix error message after cleanup
2012-10-03 18:44:33 +02:00
jvazquez-r7
0755cbe411
cleanup: clear strings, delete unused variables, author email foramt, use of unpack
2012-10-03 18:28:03 +02:00
Dhiru Kholia
a0422fe500
Make failing username dynamic
2012-10-03 19:17:32 +05:30
Dhiru Kholia
e33da009ea
add PostgreSQL password capturing module
2012-10-02 15:16:37 +05:30
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
David Maloney
aa8a713a30
Fix added datastore item in BAP
2012-09-26 11:55:12 -05:00
scriptjunkie
0158312615
Java meterpreter can run scripts too!
2012-09-22 16:49:16 -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
jvazquez-r7
f6baf7fe34
Merge branch 'MySQL-JtR' of https://github.com/halfie/metasploit-framework into halfie-MySQL-JtR
2012-09-21 10:08:34 +02:00
David Maloney
7fcc34766a
Added datastore items to BAP handlers
...
Added two datastore items to handlers created by BAP
2012-09-20 15:21:08 -05: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
Tod Beardsley
8d187b272d
Some error handling on ntlm relayer
...
Instead of a cryptic exception, let the user know if the HTTP target
isn't actually asking for WWW-Authenticate.
There are likely many more opportunities to catch errors, but this is
the most obvious.
2012-08-21 16:13:00 -05:00
Tod Beardsley
635710402b
Removing bullet points from module description
...
Due to the vagaries of various Metasploit module description viewers, we
can't guarantee things like lists and bullet points render right.
Descriptions should avoid using these things.
2012-08-21 16:00:04 -05:00