Commit Graph

26818 Commits (2f87c880dfdd585319f3f828f38095562907dde8)

Author SHA1 Message Date
jvazquez-r7 85b5c5a691 Refactor check_path 2014-08-04 11:48:13 -05:00
jvazquez-r7 1e29bef51b Fix msftidy warnings 2014-08-04 11:46:27 -05:00
jvazquez-r7 04bf0b4ab6 Fix forgotten comma 2014-08-04 11:34:12 -05:00
jvazquez-r7 68d8afc18d
Land #3604, @hmoore-r7's [FixRM #8838] smb_lookupsid nil class dereference 2014-08-04 10:38:42 -05:00
Joshua Smith 159ce3fbbe
Land 3587, add rubocop autoconfig 2014-08-04 01:18:34 -05:00
Joshua Smith 3e3caeb6ee
Land 3591, fix post/test/* modules' loadpath
some additional module cleanup here:
SHA: 6884c87cfa
2014-08-04 01:07:35 -05:00
Joshua Smith 6884c87cfa removes IDs/Revisions, resplats test/modules 2014-08-04 01:04:23 -05:00
Joshua Smith f2e4d41697
Land 3607, sqlmap plugin cleanup
after some additional cleanup here:
SHA: a4f2fb218c
2014-08-04 00:12:53 -05:00
Joshua Smith a4f2fb218c adds most rubocop cleanups, not all 2014-08-04 00:11:25 -05:00
Joshua Smith c08b1cb829 uses mult-assign & include? more readable 2014-08-03 23:59:03 -05:00
Joshua Smith 453d19713d
Land 3605, hides flash during cmd_psh_payload 2014-08-03 23:45:44 -05:00
Joshua Smith 282633fd9d
Land 3606, makefile typo fix for CVE-2013-2465 2014-08-03 23:28:20 -05:00
Joshua Smith 6c2b8f54cf rubocop cleanup, long lines, etc 2014-08-03 23:19:08 -05:00
OJ 2b021e647d Minor tidies to conform to standards 2014-08-03 23:19:08 -05:00
OJ 31c51eeb63 Move error messages to `check` 2014-08-03 23:19:08 -05:00
OJ cbf15660bf Add some small fixes to the MQAC local exploit
* Check for `INVALID_HANDLE_VALUE` when attempting to open the
  device, as this is what is returned when the device doesn't exist.
* Make sure that we only run the exploit against tartgets that we
  support directly to make sure we don't BSOD machines (such as what
  happens with SP1/SP2).
* Add a call to `check` in the exploit code.
2014-08-03 23:19:08 -05:00
Victor 3fd15d001d Update sqlmap.rb 2014-08-04 04:25:33 +04:00
Victor 2805af2a04 `\t` error msgs bug and some codestyle tweaks
Minor bugs: `\t` were used inside single quoted strings.
Tweak: `a, b = c` is the same as `a = c[0]; b = [1] if c.length > 1`.
Minor tweak: `qwe if rty` form instead of multiline when `qwe` is only one line long.
Minor tweak: thanks to `#{}` interpolation we can omit `.to_s`.
2014-08-04 04:11:49 +04:00
HD Moore 8cca4d7795 Fix the makefile to use the right directory
Reported by severos on IRC, the current output
class is in the right place, but the makefile
was broken.
2014-08-03 13:38:15 -05:00
Samuel Huckins dd550013ce Merge branch 'bug/MSP-10963/realm-uniqueness' into staging/electro-release 2014-08-02 17:48:40 -05:00
Samuel Huckins 49a91ac5bb
Updating metasploit-credential dep to v0.8.6 2014-08-02 17:43:08 -05:00
Tom Sellers 693e744da4 Hide icon flash on taskbar during cmd_psh_payload
When 'cmd_psh_payload' is run via 'cmd_exec' on a windows shell that is running in the context of an interactive user an icon will flash very quickly on the user's task bar.  This can be avoided (verified) by adding the /b switch to the start section of the command launcher text.  I have verified that this switch exists from Windows 2000 through Windows 2012 R2.
2014-08-02 15:52:52 -05:00
HD Moore 3bc8d1fee9 See #RM8838. Handle null domain_sid properly
This switches to the local sid if the domain sid is null, even if
the ACTION is set to DOMAIN. This solves the issue identified in

```
[*] 192.168.0.4 PIPE(LSARPC) LOCAL(NAS - 5-21-2272853860-1115691317-1341221697) DOMAIN(WORKGROUP - )
[-] 192.168.0.4 No domain SID identified, falling back to the local SID...
[*] 192.168.0.4 USER=guest RID=501
[*] 192.168.0.4 GROUP=None RID=513
```
2014-08-02 14:25:17 -05:00
Samuel Huckins 95e6599d5b Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release 2014-08-02 13:55:26 -05:00
us3r777 cd2e225359 Refactored auxilliary jboss_bshdeployer
Switch modules/auxiliary/admin/http/jboss_bshdeployer.rb to use the
changes.
2014-08-02 11:10:49 +02:00
Luke Imhoff 3bd4279038
Update metasploit-credential
MSP-10963
2014-08-02 01:01:53 -05:00
Luke Imhoff d696b5f4e5 Merge pull request #3602 from limhoff-r7/bug/MSP-10998/float-versions
MSP-10998

Remove Msf::Framework::VersionAPI and Msf::Framework::VersionCore
2014-08-02 00:57:11 -05:00
Luke Imhoff c69c06af89
Update metasploit-credential
MSP-10963
2014-08-01 22:05:45 -05:00
Luke Imhoff 3057af773a
Merge branch 'bug/MSP-10998/float-versions' into bug/MSP-10963/realm-uniqueness
MSP-10963
2014-08-01 22:04:34 -05:00
Luke Imhoff a37244c14e
Fix specs
MSP-10998
2014-08-01 21:55:10 -05:00
Luke Imhoff 6603443df4
Add missing require
MSP-10998
2014-08-01 21:54:41 -05:00
Luke Imhoff 9096a8a1f5
Remove Msf::Framework::VersionAPI
MSP-10998

It's compacting of the version parts into a single float doesn't work
with APIMinor over 10, so replace with Gem::Version, which compares
parts correctly.
2014-08-01 21:43:14 -05:00
Luke Imhoff 22db5aad8a
Remove Msf::Framework::VersionCore
MSP-10998

It can't handle 4.10.0 because it tries to compact the multiple part
version into one float using (1 / 10.0).
2014-08-01 21:31:48 -05:00
Samuel Huckins c45728509c Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release 2014-08-01 20:44:36 -05:00
Luke Imhoff 75dfcb2791
Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release 2014-08-01 20:04:23 -05:00
us3r777 a800e7f1ea Merge pull request #1 from jvazquez-r7/work_3540
Work on jboss refactoring
2014-08-02 01:02:53 +02:00
Tod Beardsley c31fc61617
Land #3270, @jlee-r7 deprecation ipv6 payloads
These are not needed, since you can just config the regular handler now
and pick either.

This resolves the conflict (rm'ed the old modules)

Conflicts:
	modules/payloads/stagers/windows/reverse_ipv6_http.rb
	modules/payloads/stagers/windows/reverse_ipv6_https.rb
2014-08-01 16:27:59 -05:00
darkbushido ceaffce727
Merge branch 'pr/3593' into staging/electro-release 2014-08-01 16:01:10 -05:00
David Maloney ab7111120b
and all the rest
finally!
2014-08-01 14:54:18 -05:00
David Maloney 4821851ae4
telnet and ssh next 2014-08-01 14:47:08 -05:00
David Maloney 12902b0a6d
the refactor continues! 2014-08-01 14:41:03 -05:00
David Maloney b74813b9a1
mysql and pop3 now 2014-08-01 14:30:33 -05:00
jvazquez-r7 73ca8c0f6d Work on jboss refactoring 2014-08-01 14:28:26 -05:00
David Maloney 2e7738c788
http and mssql now 2014-08-01 14:22:58 -05:00
Samuel Huckins 31b7ffe32d Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release 2014-08-01 13:14:11 -05:00
dmaloney-r7 e6a0e079b6 Merge pull request #3596 from darkbushido/bug/MSP-10937/adding-parent-to-cores-to-credential
.to_credential now assigns a parent
2014-08-01 13:13:48 -05:00
David Maloney 33f73a8af7
refactor db2 2014-08-01 13:00:27 -05:00
David Maloney 439b893fea
refactor axislogin 2014-08-01 12:30:16 -05:00
David Maloney 0fffb179fa
refactor afp_login 2014-08-01 12:10:52 -05:00
David Maloney c3691ba056
finish refactoring ftp_login 2014-08-01 12:06:13 -05:00