261e095e5e
Handle exceptions in mysql_login
2013-01-07 16:02:59 -06:00
268de941c7
Merge branch 'tasos-r7-web-modules'
2013-01-07 13:37:32 -06:00
b53e8c794f
Fix indent level
2013-01-07 13:36:55 -06:00
a59c474e3e
Merge branch 'jvazquez-r7-ibm_cognos_tm1admsd_bof'
2013-01-07 13:34:52 -06:00
36adf86184
Various and sundry fixes for normalize_uri
2013-01-07 12:02:08 -06:00
6a9445966a
Caught missing paren
2013-01-07 11:21:55 -06:00
33751c7ce4
Merges and resolves CJR's normalize_uri fixes
...
Merge remote-tracking branch 'ChrisJohnRiley/set_normalize_uri_on_modules'
into set_normalize_uri_on_modules
Note that this trips all kinds of msftidy warnings, but that's for another
day.
Conflicts:
modules/exploits/unix/webapp/tikiwiki_jhot_exec.rb
modules/exploits/windows/http/xampp_webdav_upload_php.rb
2013-01-07 11:16:58 -06:00
986435c598
Fix typo
...
Typo found by @schierlm but mentioned after the commit of pull request #1187
Info: https://github.com/rapid7/metasploit-framework/pull/1187#commitcomment-2340457
2013-01-06 01:47:15 -05:00
b6011e6013
Merge branch 'meaningful_error' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-meaningful_error
2013-01-06 01:09:01 +01:00
f2245ea573
Merge branch 'msftidy_fix' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-msftidy_fix
2013-01-06 00:45:50 +01:00
3d3799d38d
Ok... even more explicit
2013-01-05 13:39:31 -06:00
4ff186c23d
Change the .text-too-small error message.
...
The original error message apparently confuses people, and this
can be easily improved. See the following:
https://community.rapid7.com/thread/2356
2013-01-05 01:57:41 -06:00
883b3446f3
license text
2013-01-05 08:03:25 +01:00
0a13f01f23
Added module for ZDI-12-101
2013-01-05 07:40:32 +01:00
990957917f
Merge branch 'FireFart-msftidy_1'
2013-01-04 14:13:08 -06:00
acdce4c876
Correct unicode probs
2013-01-04 14:09:37 -06:00
e1885cab0b
Merge remote-tracking branch 'upstream/master' into web-modules
2013-01-04 21:33:17 +02:00
3d4d6e9860
Crawler aux mixin updated to catch the mysterious and anonymous timeout exception and re-raise it as a Timeout::Error
2013-01-04 21:32:18 +02:00
7d1752d858
Merge pull request #1246 from rsmudge/armitage
...
Armitage Updates and Bug Fixes
2013-01-04 11:19:03 -08:00
5348127fd2
Metasploit 4.5 Installer Environment Tweak
...
Armitage on Windows requires the user to specify their MSF
install folder. This tweak checks for an MSF 4.5 environment
and updates the specified folder to make everything work.
Like magic.
2013-01-04 13:08:47 -05:00
a79f2fa8d1
Armitage Updates and Bug Fixes
...
This is Armitage release 01.04.13. This update fixes several bugs
and improves the user experience launching *_login modules from
Armitage. This update adds a Windows 8 icon and includes a fix to
better work with the Metasploit 1.45 installer's environment.
2013-01-04 12:05:09 -05:00
6654faf55e
Msftidy fixes
2013-01-04 09:29:34 +01:00
b50e040e69
Fix e-mail format, and the extra comma
2013-01-04 01:11:40 -06:00
cd10de3cd8
Merge branch 'tidy-hook' of github.com:todb-r7/metasploit-framework into todb-r7-tidy-hook
2013-01-04 00:48:33 -06:00
d17a6f99e5
Merge branch 'feature/deprecated-module-mixin' of github.com:jlee-r7/metasploit-framework into jlee-r7-feature/deprecated-module-mixin
2013-01-04 00:38:01 -06:00
f79ca25976
Add a reference that's good for reading
2013-01-04 00:35:59 -06:00
595c99a0d8
Merge branch 'master' of github.com:carnal0wnage/metasploit-framework into carnal0wnage-master
2013-01-04 00:35:08 -06:00
6d4abe947d
Merge branch 'id_revision' of github.com:FireFart/metasploit-framework into FireFart-id_revision
2013-01-04 00:23:03 -06:00
92e1604018
Merge branch 'master' of github.com:rapid7/metasploit-framework
2013-01-03 17:52:51 -06:00
6f50410e5f
Merge branch 'patch-1' of github.com:mubix/metasploit-framework into mubix-patch-1
2013-01-03 17:51:54 -06:00
f74d306318
Merge branch 'master' of github.com:rapid7/metasploit-framework into rapid7
2013-01-03 17:50:01 -06:00
38de5d63d8
Merge branch 'master' of github.com:rapid7/metasploit-framework
2013-01-03 17:49:24 -06:00
8f2dd8e2ce
msftidy: Remove $Revision$
2013-01-04 00:48:10 +01:00
b061a0f9c1
Merge branch 'enterasys_netsight_syslog_bof' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-enterasys_netsight_syslog_bof
2013-01-03 17:45:24 -06:00
25aaf7a676
msftidy: Remove $Id$
2013-01-04 00:41:44 +01:00
7158806acd
Merge branch 'rapid7' into bturner-r7-msfgui-setup-env
2013-01-03 17:38:53 -06:00
a0b4045b4b
trying to fix the variable offset length
2013-01-04 00:25:34 +01:00
da70074184
Load environment before starting msfgui
...
msfgui checks for the msgpack gem before spinning up, however if this
gem is installed in lib/gemcache it will not be found.
This commit loads the normal msf environment, including lib/gemcache if
applicable, before starting msfgui.
2013-01-03 17:06:02 -06:00
9e912a23ff
Merge branch 'rapid7' into FireFart-msftidy_aux_1
2013-01-03 16:54:25 -06:00
b190342e3f
Merge branch 'master' of github.com:rapid7/metasploit-framework into rapid7
2013-01-03 16:53:52 -06:00
2f0e4cbd39
Merge pull request #1179 from rapid7/bug/bap-compro-hosts
...
Changes to BAP session storage
2013-01-03 14:27:13 -08:00
aa9f7dac6a
Merge branch 'rapid7' into tkisason-patch-1
2013-01-03 16:13:32 -06:00
724fa62019
Merge branch 'enterasys_netsight_syslog_bof' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-enterasys_netsight_syslog_bof
2013-01-03 15:35:29 -06:00
39e81fb07f
Update modules/auxiliary/scanner/http/wordpress_login_enum.rb
...
Simple fix for msfconsole start error.
2013-01-03 21:52:10 +01:00
6fd35482cc
This exploit should be in browser auto pwn
2013-01-03 14:45:00 -06:00
011ff18c98
Remove $
2013-01-03 14:06:32 -06:00
233378f0fb
Remove stupid debugging load()
2013-01-03 14:05:45 -06:00
328b740c44
mssql brute resource script
2013-01-03 14:11:12 -05:00
9cea2d9af9
reference updated
2013-01-03 19:39:18 +01:00
45808a3a44
Added module for ZDI-11-350
2013-01-03 19:17:45 +01:00
sinn3r
Tod Beardsley
Rob Fuller
jvazquez-r7
Tasos Laskos
Tod Beardsley
Raphael Mudge
Christian Mehlmauer
James Lee
Brandon Turner
jvennix-r7
Tonimir Kisasondi
CG