David Maloney
dcddd2d671
use the bit-struct gem
...
removed vendored copy of bit-struct and use the gem
instead
MS-1699
2016-06-28 15:58:47 -05:00
David Maloney
0a83b34a85
Land #7025 , dev's PR for rex-java
...
lands the pr for moving Rex::Java into it's own gem
2016-06-28 14:40:02 -05:00
David Maloney
d90f0779f8
Land #7009 , egypt's rubyntlm cleanup
...
Land egypt's PR to replace all of our NTLM code with
the rubyntlm gem
2016-06-28 14:15:34 -05:00
David Maloney
97f9ca4028
Merge branch 'master' into egypt/ruby-ntlm
2016-06-28 14:14:56 -05:00
Metasploit
e3e360cc83
Bump version of framework to 4.12.10
2016-06-28 12:13:26 -07:00
Louis Sato
d5d0b9e9b8
Revert "Land #6729 , Speed up the datastore"
...
This reverts commit c6b1955a5a
, reversing
changes made to 4fb7472391
.
2016-06-28 13:39:52 -05:00
dmohanty-r7
c2f3d411c3
Replace rex/java with rex-java gem
2016-06-27 14:52:49 -05:00
Metasploit
fd07da3519
Bump version of framework to 4.12.9
2016-06-27 11:54:04 -07:00
James Lee
058115c21f
Land #7015 , sdavis' swagger exploit
2016-06-24 16:13:51 -05:00
James Lee
5d4cc7ab40
Add nodejs to list of defaults
2016-06-24 16:06:50 -05:00
James Lee
0126ec61d8
Style
2016-06-22 10:15:23 -05:00
James Lee
b3f59ebd19
Whitespace
2016-06-22 10:15:23 -05:00
James Lee
07f7e5e148
Convert non-loginscanner MSSQL to rubyntlm
2016-06-22 10:15:22 -05:00
James Lee
4b3f6c5d29
Use rubyntlm for mssql login scanner
2016-06-22 10:15:22 -05:00
James Lee
039e8f5899
Use rubyntlm for HTTP Negotiate auth
2016-06-22 10:15:22 -05:00
James Lee
c2a063c8ae
Start using rubyntlm for ssp auth
2016-06-22 10:15:16 -05:00
David Maloney
1e053c110a
Merge branch 'master' into feature/rex-cleanup/first-gems
2016-06-22 09:20:44 -05:00
David Maloney
69e2d05a5d
rip out old rex code and replace with gems
...
rex-text, rex-random_identifier, rex-powershell, rex-zip, and rex-registry
are now being pulled in as gems instead of part of the spgehtti code that is lib/rex
2016-06-21 13:56:36 -05:00
wchen-r7
129b449355
Add Msf::Util::EXE.to_zip
...
This adds a new method in Msf::Util::EXE to be able to create a
zip file with an array of binary data.
2016-06-20 13:36:59 -05:00
William Webb
98ad2489db
Land #6970 , #make_fast_nops for HUGE nop chunks
2016-06-17 12:56:26 -05:00
wchen-r7
c6b1955a5a
Land #6729 , Speed up the datastore
2016-06-15 17:55:42 -05:00
thao doan
f5bfc84453
Land #6977 , Add a more verbose message when generating module documentation
2016-06-15 14:55:55 -07:00
h00die
78775f7833
first attempt at 6964
2016-06-15 07:44:32 -04:00
William Webb
563b8206c5
Land #6962 , Apache Continuum Exploit
2016-06-13 16:41:53 -05:00
wchen-r7
337e48dc07
Create #make_fast_nops for huge NOP chunks
...
This creates a new method called #make_fast_nops for exploits that
actually need large chunks of NOPs.
2016-06-13 15:25:46 -05:00
William Vu
f7d261516d
Land #6968 , get_uri URIPORT fix (again)
2016-06-13 10:52:29 -05:00
William Vu
b7139da624
Clean up whitespace
2016-06-13 10:51:38 -05:00
Trenton Ivey
776dd57803
get_uri missing port fix
2016-06-12 19:27:34 -05:00
h00die
7831cb53c5
print status of opening browser at file
2016-06-11 21:13:31 -04:00
William Vu
5adc360b2a
Make opts truly optional
2016-06-10 20:35:40 -05:00
Metasploit
fd4a51cadb
Bump version of framework to 4.12.8
2016-06-10 10:01:27 -07:00
wchen-r7
0d7b587b5d
Avoid printing rhost:rport from AuthBrute
...
When AuthBurte is mixed with other modules using the TCP mixin,
rhost:rport is printed twice. This info should come from the
protocol level mixin.
2016-06-08 14:32:58 -05:00
Metasploit
815685992a
Bump version of framework to 4.12.7
2016-06-07 13:14:34 -07:00
Brian Patterson
6d72b5b19f
Land #6946 Fix a bug with OptPort validation when not req
2016-06-07 14:43:10 -05:00
David Maloney
53b989f283
fix normalisation so we don't coerce to 0
...
don't coerce nil to 0
2016-06-07 14:29:13 -05:00
David Maloney
16030cda30
simpler fix
...
talking with adam shows that there is a simpler solution
to this problem
2016-06-07 14:13:10 -05:00
David Maloney
9de27e0b9c
add more specific normalise method to otpport
...
add a normalise method that prevents emtpy string
from being converted to 0 for OptPort avoiding
a bad behaviour
2016-06-07 14:03:34 -05:00
David Maloney
27b5d961fd
fixes a bug with OptPort validation when not req
...
OptPort lost the check for whether the option was required causing it
to incorrectly return false in certain cases
MS-1633
2016-06-07 13:48:57 -05:00
Louis Sato
d3a13f4b0c
Merge pull request #6942 from acammack-r7/bug/MS-1517/fix-acunetix-again
...
Fix Acunetix import with a blacklist
2016-06-05 23:00:48 -05:00
Adam Cammack
08f1e68487
Fix Acunetix import with a blacklist
...
If a host is blacklisted, we won't create the service for it. If we
don't create the service, we don't want to create entries for the web
pages.
MS-1517
2016-06-03 19:40:29 -05:00
Brent Cook
da532ecc5e
Land #6919 , Move LURI into a full URI for a new 'Payload opts" column in jobs output
2016-06-03 13:57:47 -05:00
James Barnett
e0cf4721c5
Land #6927 , Fix exception handling in #exploit_simple
2016-06-02 11:15:25 -05:00
David Maloney
ffa4177575
missed a few joins
...
missed a few joins statements before
MS-1593
2016-06-01 15:32:51 -05:00
David Maloney
2047475901
host tags commands eagerloaded instead of joining
...
someone tried to fix a rails deprecation warning by doing an
eager load, but caused an actual exception instead. switching to
propper joins makes everything work properly
MS-1593
2016-06-01 13:50:38 -05:00
David Maloney
a27d10c200
fixes the exception handling in #exploit_simple
...
The exception handling in the #exploit_simple method tries to set
error on exploit but exploit is defined within the begin block
causing a noMethodError on nilClass
MS-1608
2016-05-31 11:46:05 -05:00
Metasploit
c35322ec3f
Bump version of framework to 4.12.6
2016-05-30 22:34:13 -07:00
James Lee
f7382f5b3b
Make `jobs` display a full uri
...
Addresses the problem of LURI taking the place of URIPATH, which has
different semantics.
See #4623
2016-05-27 11:15:12 -05:00
Brendan Watters
00b18c8ac5
Land #6917 , Fix minor issues with the RC4 stager
2016-05-26 10:12:54 -05:00
Brent Cook
a3d2cba698
Land #6906 , Improve msfvenom error handling and spec coverage
2016-05-26 07:58:37 -05:00
Brent Cook
96c459c71d
fix #6915 , handle nil payloads and alert to the user
2016-05-26 07:22:09 -05:00