7090a4a82f
adds check for empty data b4 sending to parser [RM7269]
...
[fixes RM7269]
we discussed the solution to this bug a lot on IRC and in the ticket
itself, the consensus was to fix it as far upstream as possible before
sending to the parsers so as to avoid any future bugs of the same
nature, so this commit adds a check to import_nmap_xml to see if the
data is empty before passing it on to the parser, whether that parser
is nokogiri or the legacy parser.
db_nmap -h now produces the expected output and db_nmap still works as
expected.
2013-01-17 00:18:13 -06:00
4fd4af1f43
Fix typo that breaks record_mic command
2013-01-16 16:30:38 -06:00
51ba500b9f
msftidy compliant
2013-01-16 12:28:09 +01:00
49b36710c4
Merge branch 'freesshd_authbypass_update' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-freesshd_authbypass_update
2013-01-16 12:27:42 +01:00
f6d34b52a5
Merge branch 'verb_auth_bypass_update' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-verb_auth_bypass_update
2013-01-16 12:19:49 +01:00
2348a0b066
final cleanup and testing
2013-01-16 11:55:14 +01:00
b43242d131
Merge branch 'module-nagios3_history_cgi' of https://github.com/jselvi/metasploit-framework into jselvi-module-nagios3_history_cgi
2013-01-16 11:54:51 +01:00
0f24671cf7
Changes how the usernames are loaded.
...
Allows usernames to be loaded as a file (wordlist), that way the
it's much easier to manage. It defaults to unix_users.txt,
because these usernames are common in any SSH hosts out there.
If the user only wants to try a specific user (which is better,
because you reduce traffic noise that way), then he/she can set
the USERNAME option, and that should be the only one tried --
similar to how AuthBrute behaves.
I also fixed the regex in check().
2013-01-16 02:14:52 -06:00
c621e83ffe
Merge branch 'feature/stage_encoding' of github.com:jlee-r7/metasploit-framework into jlee-r7-feature/stage_encoding
2013-01-15 23:31:40 -06:00
064ea63a72
Fixes
2013-01-16 05:22:43 +01:00
2ee0c0d8fb
Add simple specs for Rex::Encoding::Xor*
2013-01-15 16:59:01 -06:00
26b40666ce
Merge branch 'rapid7' into feature/stage_encoding
2013-01-15 15:10:58 -06:00
9dc42e93e7
Reduce unnecessary indent level
2013-01-15 14:36:41 -06:00
5109cc97fe
Add more verbs
...
[SeeRM: #7138 ] by jabra
2013-01-15 14:11:53 -06:00
b3291c0329
Merge branch 'master' of git://github.com/rapid7/metasploit-framework
2013-01-15 14:10:47 -06:00
ee14c1c613
Merge remote-tracking branch 'R3dy/psexec-mixin2' into rapid7
2013-01-15 12:58:50 -06:00
4883cf4b01
Minor doc comment additions
2013-01-15 12:49:43 -06:00
b5167e7695
Merge branch 'add_bap_to_itms_overflow' of github.com:jvennix-r7/metasploit-framework into jvennix-r7-add_bap_to_itms_overflow
2013-01-15 12:25:07 -06:00
6508964171
For consistency with other post modules, also do a store_loot
2013-01-15 12:16:32 -06:00
c1794e9195
Merge branch 'bulletproof_ftp_creds' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-bulletproof_ftp_creds
2013-01-15 11:41:42 -06:00
d36e38fca6
Move encoding into handle_connection
...
* Allows payloads that override generate_stage to still take advantage
of stage encoding
* Also adds doc comments for a few methods
2013-01-15 10:34:31 -06:00
54883da8cd
Merge branch 'master' of git://github.com/rapid7/metasploit-framework
2013-01-15 10:25:05 -06:00
18f81fd6f4
Nagios3 history.cgi exploit
2013-01-15 15:32:32 +01:00
9d4366fdab
Merge remote-tracking branch 'wchen-r7/irb_terminatelineinput'
2013-01-15 01:50:15 -08:00
6064dfcb71
Merge remote-tracking branch 'wchen-r7/fail_to_reload_fix'
2013-01-15 01:43:07 -08:00
279a61d0f4
Add the optional pause for Windows
2013-01-15 13:44:59 -06:00
db4a392de2
Msfupdate should check for installation validity
...
This fix will allow people to at least solve their own msfupdate
problems by registering for Community Edition.
[SeeRM #7690 ]
2013-01-15 13:44:59 -06:00
1e64d36320
avoid begin rescue blocks
2013-01-15 02:05:58 +01:00
a1e853500f
Merge branch 'bug/optint_empty' into feature/stage_encoding
2013-01-14 15:50:39 -06:00
21c18b78e6
Don't bother nil check, to_s handles it
2013-01-14 15:47:58 -06:00
0c90171fa7
Deal with alread-normalized ints
...
[See #1308 ][See #1304 ]
2013-01-14 15:31:14 -06:00
fb19ec1005
Merge branch 'rapid7' into feature/stage_encoding
2013-01-14 15:20:23 -06:00
83877b6c76
Merge branch 'master' of github.com:rapid7/metasploit-framework into rapid7
2013-01-14 15:19:27 -06:00
347cc3f879
Merge branch 'bug/rm7680-psexec_command-convert-nil-into-integer' of github.com:lmercer-r7/metasploit-framework into lmercer-r7-bug/rm7680-psexec_command-convert-nil-into-integer
2013-01-14 15:12:43 -06:00
04b35a38ff
Update MSB ref
2013-01-14 14:59:32 -06:00
b2ecb18a71
Allow OptInt to pass "" for special reasons
...
Cheap fix
2013-01-14 14:55:48 -06:00
a89db93891
psexec_command - Unable to execute specified command: can't convert nil into Integer
...
Patched as described in Redmine bug #7680
2013-01-14 15:54:40 -05:00
07d15baf89
Merge branch 'bug/opt_int_hex' of github.com:jlee-r7/metasploit-framework into jlee-r7-bug/opt_int_hex
2013-01-14 14:40:25 -06:00
bbb3fa25be
Allow negative values for OptInt
...
[FixRM #7540 ]
2013-01-14 14:18:56 -06:00
c6c59ace46
final cleanup
2013-01-14 20:53:19 +01:00
5ecb0701ea
Merge branch 'freesshd_authbypass' of https://github.com/danielemartini/metasploit-framework into danielemartini-freesshd_authbypass
2013-01-14 20:52:45 +01:00
3eaa07afae
documenting magic numbers
2013-01-14 19:43:34 +01:00
530df0acf0
delete comments
2013-01-14 19:22:39 +01:00
57be789f2c
Fix comments by egypt
2013-01-14 19:22:02 +01:00
702638a6a3
final cleanup
2013-01-14 17:36:24 +01:00
b0a339708d
Merge branch 'w3totalcache' of https://github.com/FireFart/metasploit-framework into FireFart-w3totalcache
2013-01-14 17:35:48 +01:00
b11fd48b05
implemented juans feedback
2013-01-14 17:06:52 +01:00
8b85f7d977
fix msftidy
2013-01-14 14:55:53 +01:00
0acbcfd964
fix url path
2013-01-14 14:39:50 +01:00
c17ee70e66
Use target_uri for the wordpress url
2013-01-14 14:34:34 +01:00
kernelsmith
James Lee
jvazquez-r7
sinn3r
Jose Selvi
Tod Beardsley
lmercer
Christian Mehlmauer