c3fa62cd59
Whitespace at EOL
2013-03-07 18:16:57 -06:00
01e2e8951e
Merge branch 'master' of github.com:rapid7/metasploit-framework into rapid7
2013-03-07 17:58:04 -06:00
2160718250
Fix file header comment
...
[See #1555 ]
2013-03-07 17:53:19 -06:00
725fbea851
Merge pull request #1563 from rapid7/bug/yard-guard
...
[Story #45771305 ]
Conflicts:
Rakefile
2013-03-07 17:35:03 -06:00
43c076ed96
Merge remote-tracking branch 'tasos-r7/bug/web-vuln-logging' into rapid7
...
[Closes #1559 ]
2013-03-07 17:23:59 -06:00
3b87ba8c6f
Merges 'sempervictus/wmap_delete_site'
...
Adds a -d switch to wmap_sites
[Closes #1561 ]
2013-03-07 16:46:37 -06:00
addb73ec28
Update the 0.6.1 tag to the merged commit
...
[Story #45771305 ]
2013-03-07 16:15:54 -06:00
2892b9dee2
Merge branch 'master' of github.com:rapid7/metasploit-framework into rapid7
2013-03-07 14:46:16 -06:00
f321cea4cd
Slightly more readable assertion
2013-03-07 14:45:58 -06:00
b92f621456
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
2013-03-07 21:36:51 +01:00
64398d2b60
deleting some commas
2013-03-07 21:34:51 +01:00
8abcc5a1d4
Whitespace
2013-03-07 14:34:44 -06:00
ab44e3e643
cleanup for fb_cnct_group
2013-03-07 21:34:07 +01:00
969490771f
Merge branch 'module-fb_cnct_group' of https://github.com/zeroSteiner/metasploit-framework into zeroSteiner-module-fb_cnct_group
2013-03-07 21:33:33 +01:00
e912bec2db
Update gemcache to metasploit_data_models 0.6.1
...
[#45771305 ]
2013-03-07 14:30:29 -06:00
7ca33c12bd
Update Gemfile to metasploit_data_models 0.6.1
...
[#45771305 ]
MetasploitDataModels 0.6.1 adds a re-usable yard.rake so that all
Metasploit project don't have to define their own. It also adds guards
so that the YARD tasks aren't defined (and don't cause errors) if YARD
is not available.
This also adds support for making the Rakefile work with `bundle install
--without development test` so it still functions in the bundle building
environment for Pro.
2013-03-07 14:22:35 -06:00
b74fce7e24
indentation compliance
2013-03-07 14:57:03 -05:00
c5e61f1e9d
Merge branch 'msftidy_ssl_shells' of https://github.com/sempervictus/metasploit-framework into sempervictus-msftidy_ssl_shells
2013-03-07 20:47:11 +01:00
6e8f3ff8fe
Allow WMAP plugin to delete site by index
...
WMAP plugin currently lacks the ability to delete sites, meaning
that console users have to remove sites via IRB/Pry. Given the
indexed output of wmap_sites -l, the index is used in delete_site.
If required, deletion by resolving the url,host format can be
added.
2013-03-07 14:40:50 -05:00
f05431791f
Merge branch 'dmaloney-r7-feature/ssl/add_cipher_support' into rapid7
2013-03-07 12:54:39 -06:00
27f43d3d1c
Param name goes before type
2013-03-07 12:50:43 -06:00
c41bfa9141
Whitespace
2013-03-07 12:45:01 -06:00
8131366b91
Merge remote-tracking branch 'upstream/master' into bug/web-vuln-logging
2013-03-07 20:17:27 +02:00
cf3df4b179
Auxiliary::Web::HTTP: added error output
...
Instead of using elog when an HTTP request callback throws an
exception, use the HTTP class' parent #print_error.
2013-03-07 20:14:38 +02:00
06443ea4d0
yarddoc cleanup
2013-03-07 11:52:58 -06:00
007b26d918
dry up enumerators
2013-03-07 11:35:34 -06:00
7332d31523
fix some style things for egypt
2013-03-07 11:11:48 -06:00
b9de9150bf
Merge L1ghtn1ng's license info comment docs
...
While this was a manual edit, it would be nice to see a fix to msftidy
to deal with this check as well; if you're MSF_LICENSE'ed, you should
have the comment doc at the top.
[Closes #1555 ]
2013-03-07 10:54:59 -06:00
1b8371e695
Merge remote-tracking branch 'upstream/master' into bug/web-vuln-logging
2013-03-07 18:13:13 +02:00
398d13e053
Initial commit of the Firebird CNCT Group Number Buffer Overflow.
2013-03-07 09:51:05 -05:00
e1859ae4b6
Merge branch 'rsmudge-armitage'
2013-03-06 19:31:44 -06:00
db1f4d7e1d
added license info
2013-03-07 00:20:02 +00:00
e8c1899dc2
added license info
2013-03-07 00:18:32 +00:00
3946cdf91e
added license info
2013-03-07 00:17:55 +00:00
1b493d0e4c
added license info
2013-03-07 00:16:26 +00:00
9e89d9608f
added license info
2013-03-07 00:11:45 +00:00
56639e7f15
added license info
2013-03-07 00:10:46 +00:00
7f80692457
everyone will comply, resistance is futile
2013-03-06 18:38:14 -05:00
a30b61e4aa
Merge branch 'rsmudge-armitage'
2013-03-06 16:39:00 -06:00
24aec8ae27
Merge branch 'nahualito-codesys_gateway_server_remote_execution.rb'
2013-03-06 16:38:13 -06:00
b65f410048
Updates the description
2013-03-06 16:37:41 -06:00
fee07678dd
Rename module to better describe the bug.
2013-03-06 16:33:41 -06:00
79d3597d31
That's not a real check...
2013-03-06 16:32:53 -06:00
16d7b625bc
Format cleanup
2013-03-06 16:31:39 -06:00
e13bf6d03c
Empty commit, please ignore.
...
Testing some deploy magic.
2013-03-06 16:18:26 -06:00
7219c7b4aa
Merge branch 'codesys_gateway_server_remote_execution.rb' of github.com:nahualito/metasploit-framework into nahualito-codesys_gateway_server_remote_execution.rb
2013-03-06 16:15:24 -06:00
c3b3da4254
Merge remote-tracking branch 'upstream/master' into bug/web-vuln-logging
2013-03-06 23:04:10 +02:00
5dff043e3c
Whitespace
2013-03-06 14:52:32 -06:00
aa5c9461ae
Fixed more styling issues, EOL, tabs and headers
2013-03-06 10:50:31 -08:00
437d6d6ba6
Fixed EOL, bad indent, added header, removed #!/usr/env/ruby
2013-03-06 10:44:29 -08:00
James Lee
Brandon Turner
Tod Beardsley
jvazquez-r7
Luke Imhoff
RageLtMan
Tasos Laskos
David Maloney
Spencer McIntyre
sinn3r
J.Townsend
Enrique A. Sanchez Montellano