Commit Graph

29371 Commits (4a106089b9074e23e48920c1c54daaaeee1928b3)

Author SHA1 Message Date
Tod Beardsley 80dc781625
Email over E-mail
While I believe "e-mail" is the actually correct spelling, we tend to
say "email" everywhere else. See:

````
todb@mazikeen:~/git/rapid7/metasploit-framework$ grep -ri "print.*email"
modules/ | wc -l
19
[ruby-2.1.5@metasploit-framework](fixup-grammar)
todb@mazikeen:~/git/rapid7/metasploit-framework$ grep -ri
"print.*e-mail" modules/ | wc -l
1
````
2014-12-08 10:55:26 -06:00
Christian Mehlmauer 738fc78883
Land #4220, outlook gather post module 2014-12-07 22:41:28 +01:00
jvazquez-r7 37fbe963b5
Land #3729, @us3r777's Jboss deploymentfilerepository refactoring 2014-12-06 21:51:27 -06:00
jvazquez-r7 54705eee48 Fix option parsing 2014-12-06 21:50:54 -06:00
jvazquez-r7 19effa7eb9 Fix feedback's review 2014-12-06 21:47:55 -06:00
jvazquez-r7 21742b6469 Test #3729 2014-12-06 21:20:52 -06:00
wez3 e7503bf69f Merge pull request #2 from FireFart/outlook_fix
Outlook fix
2014-12-06 12:08:06 +01:00
Christian Mehlmauer cc63d435c7
another whitespace 2014-12-06 09:32:22 +01:00
William Vu 1cc6dc61cd
Land #4286, rm documentation
Moved to GitHub.
2014-12-05 17:52:45 -06:00
Christian Mehlmauer f0a47f98bc
final formatting 2014-12-06 00:38:05 +01:00
Christian Mehlmauer f1f743804e
more formatting 2014-12-06 00:31:38 +01:00
Christian Mehlmauer 9187a409ec
outlook post module fixes 2014-12-06 00:28:44 +01:00
Jon Hart 39790a95a0
Land #4313, @wchen-r7's fix for #4304 2014-12-05 15:08:35 -08:00
Jon Hart da92e4705c
Land #4319, @wchen-r7's fix for #4307 2014-12-05 12:08:39 -08:00
William Vu 2f98a46241
Land #4314, @todb-r7's module cleanup 2014-12-05 14:05:09 -06:00
William Vu 38d1b21eba
Land #4303, Travis build blacklist
gh-pages, metakitty
2014-12-05 14:03:38 -06:00
Tod Beardsley 0431720a07
Land #4294, msfconsole speedups on module load
Related to #4257 and #4195 vaguely, and possibly even #4147.
2014-12-05 13:45:11 -06:00
sinn3r abf199f924 Remove junk code 2014-12-05 11:01:34 -06:00
Jon Hart 85e0d72711
Land #4229, @tatehansen's module for CVE-2014-7992 2014-12-04 17:20:49 -08:00
Jon Hart f0cfcd4faf
Update dlsw_leak_capture name and print_
This makes it more obvious exactly what is being scanned for
2014-12-04 17:20:01 -08:00
sinn3r cfc1acfcae Fix #4307 - Check action for nil
Auxiiary modules already do this, but looks like we forgot to do the
same for post modules.

I also changed the error to allow "reason" in order to be more
informative about what the user should do.

Fix #4307
2014-12-04 17:07:59 -06:00
Tod Beardsley 9f42dbd51c
Land #4317 and #4306, fix netmask tomfoolery 2014-12-04 16:28:54 -06:00
Brent Cook 051d2f1c39
Land #4302, zeroSteiner's fix getuid for the python meterpreter 2014-12-04 16:11:55 -06:00
Jon Hart 743e9fca9d
Correctly set default SECRET 2014-12-04 14:06:22 -08:00
Jon Hart 1e423f415e
Add missing opt , 2014-12-04 14:05:17 -08:00
Spencer McIntyre 83b0ac0209 Fix stdapi_sys_config_getenv for Python3 2014-12-04 15:58:17 -06:00
Spencer McIntyre 44816b84aa Prefer the pwd module for getuid when available 2014-12-04 15:58:17 -06:00
Jon Hart 52851d59c0
Update GATEWAY to GATEWAY_PROBE_HOST, add GATEWAY_PROBE_PORT 2014-12-04 13:26:16 -08:00
Jon Hart b35eee3935 Merge branch '4306' into 4305 2014-12-04 13:22:42 -08:00
Jon Hart 6bd56ac225
Update any modules that deregistered NETMASK 2014-12-04 13:22:06 -08:00
Jon Hart 7f425fc3ab
Configurable fix for #4305
Rename UDP_SECRET to just SECRET, as it is used for more than just UDP

Rename and properly document GATEWAY option

Introduce an option to configure what UDP port will be probed
2014-12-04 13:17:34 -08:00
Tod Beardsley 79f2708a6e
Slight fixes to grammar/desc/whitespace
Note that the format_all_drives module had a pile of CRLFs that should
have been caught by msftidy. Not sure why it didn't.
2014-12-04 13:11:33 -06:00
Jon Hart f22d7191cd Test fix for #4305 2014-12-04 10:59:57 -08:00
sinn3r 9cc04e59eb Fix #4304 - Blank password is tried when it shouldn't happen
Fix #4304
2014-12-04 12:59:51 -06:00
wez3 7c62fa5c95 Add Windows post module for reading/searching Outlook e-mail #8 2014-12-04 14:28:40 +01:00
tate 3aecd3a10e added DLSw v1 and v2 check, added check for \x00 in leak segment 2014-12-03 23:27:11 -07:00
Jon Hart d8b1401545
Test fix for #4306 2014-12-03 19:54:31 -08:00
Tod Beardsley 1a4f2eb8e4
Restore the hallowed developer's guide
See #4286, @tdoan-r7 and @wchen-r7's comments on why that should stay
(for now).
2014-12-03 16:50:18 -06:00
Tod Beardsley 4aa0785076
Also .gitignore the source directory for metakitty 2014-12-03 16:12:30 -06:00
James Lee 8f2e444aca
Land #4281, ::Queue workarounds for 2.1.x
Conflicts:
	lib/msf/core/handler/reverse_tcp.rb
2014-12-03 15:48:20 -06:00
sinn3r 8bf50bb4fb
Land #4213 - IE8 support for MS13-080 2014-12-03 14:13:47 -06:00
sinn3r 2fcbcc0c26 Resolve merge conflict for ie_setmousecapture_uaf (#4213)
Conflicts:
	modules/exploits/windows/browser/ie_setmousecapture_uaf.rb
2014-12-03 14:12:15 -06:00
Tod Beardsley 2c9018ac0e
Travis shouldnt test gh-pages and friends
This adds a blacklist of branches that Travis shouldn't run tests
against.
2014-12-03 13:58:06 -06:00
Jon Hart fee712bf23
Land #4300, @wchen-r7's fix for #3886 2014-12-03 10:58:50 -08:00
wez3 3cadcb942a Add Windows post module for reading/searching Outlook e-mail #7 2014-12-03 18:30:22 +01:00
dmaloney-r7 947a64dc2d Merge pull request #4299 from techpeace/bump-metasploit-credential
Bump metasploit-credential version
2014-12-02 18:01:21 -06:00
sinn3r f6f0050f56 Fix #3886 - Backtrace for #check when session is invalid
If the user supplies an invalid session (as in not on the session
list), it will cause a backtrace, because the setup method from
Msf::PostMixin isn't actually called.

We have thought about implementing this in a new OptSession instead.
But you can't use or even pass framework to option_container.rb, so
this is NOT possible.

The original PR was #3956.
2014-12-02 17:22:46 -06:00
Matt Buck a84ee27aef
Bump metasploit-credential version 2014-12-02 17:13:25 -06:00
Fernando Arias fb439258b9
Land #4298, arbitrary Ruby extension for replicant
MSP-11673

* Adds Msf::Module#register_extensions
* Extensions are arbitrary Ruby modules
* Allows overriding of psuedo callbacks
2014-12-02 14:59:37 -06:00
William Vu 3a978e1147
Land #4280, frontpage_login improvements 2014-12-02 14:56:57 -06:00