Commit Graph

14840 Commits (12de87e682ca0053ecd89124e2e11a5c13315e18)

Author SHA1 Message Date
James Lee 12de87e682 Merge branch 'rapid7' into mubix-remove_delicious
[Closes #946]
2012-10-22 14:18:05 -05:00
Rob Fuller 49948faa9b remove non-functional enum_delicious module 2012-10-22 14:46:52 -04:00
sinn3r 469f04d3c4 Merge branch 'mubix-dns_postmods' 2012-10-22 02:04:46 -05:00
sinn3r a3c86f386b Merge branch 'dns_postmods' of git://github.com/mubix/metasploit-framework into mubix-dns_postmods 2012-10-22 01:57:21 -05:00
Rob Fuller d5bb7b1e5b Fix all-inclusive rescue on resolve_hostname as well 2012-10-22 02:32:51 -04:00
Rob Fuller 6a281b22c4 Fix all-inclusive rescue per @wchen-r7 suggestion 2012-10-22 02:22:56 -04:00
sinn3r 997d5b9a22 Merge branch 'post_enum_proxy' of git://github.com/mubix/metasploit-framework into mubix-post_enum_proxy 2012-10-22 00:45:06 -05:00
sinn3r 716f4ab3d2 Merge branch 'post_clone_proxy' of git://github.com/mubix/metasploit-framework into mubix-post_clone_proxy 2012-10-22 00:41:36 -05:00
sinn3r e6df113a05 Merge branch 'dns_postmods' of git://github.com/mubix/metasploit-framework into mubix-dns_postmods 2012-10-21 23:44:50 -05:00
Rob Fuller 84d1c2315c change to OptPath 2012-10-21 22:27:20 -04:00
sinn3r d22010e3ba Merge branch 'lincoln-corelan-turboftp_exploit' 2012-10-21 16:40:06 -05:00
sinn3r ad9946689e Update description 2012-10-21 16:40:01 -05:00
sinn3r 1821c11369 Code cleanup 2012-10-21 16:40:01 -05:00
sinn3r c404b72d08 Doesn't make a lot of sense setting DefaultTarget to an older one 2012-10-21 16:40:01 -05:00
lincoln@corelan.be c7d12d94b7 turboftp exploit 2012-10-21 16:40:00 -05:00
sinn3r 4e40317faa Update description 2012-10-21 16:38:24 -05:00
sinn3r 72d70b6bc2 Code cleanup 2012-10-21 16:27:24 -05:00
sinn3r 6bccfcd376 Doesn't make a lot of sense setting DefaultTarget to an older one 2012-10-21 16:23:14 -05:00
sinn3r 3f81c06d82 Merge branch 'turboftp_exploit' of git://github.com/lincoln-corelan/metasploit-framework into lincoln-corelan-turboftp_exploit 2012-10-21 16:19:44 -05:00
Rob Fuller 5f99f27899 add proxy setting cloning module 2012-10-21 03:13:35 -04:00
Rob Fuller 86c73e92d4 Add ability to remotely start registry for read 2012-10-21 01:34:34 -04:00
HD Moore 2436ac3a58 Revert "Merge branch 'migrator' of git://github.com/scriptjunkie/metasploit-framework into scriptjunkie-migrator"
This reverts commit ca07bdbad6, reversing
changes made to ed3f87b738.
2012-10-20 22:38:31 -05:00
Rob Fuller 431dc31eac proxy parsing post module 2012-10-20 23:25:40 -04:00
Rob Fuller a16e3704d8 fix HOSTFILE parsing issues 2012-10-20 18:10:51 -04:00
HD Moore 04e1856a4f Fix a copypasta error triggered by a failed load 2012-10-20 15:00:11 -05:00
Rob Fuller fedef90937 Add PTR lookups and extend A to support list in file 2012-10-20 11:32:23 -04:00
sinn3r ae690f5fd3 Remove that extra "," that breaks Ruby 1.8 2012-10-20 02:11:49 -05:00
sinn3r ca07bdbad6 Merge branch 'migrator' of git://github.com/scriptjunkie/metasploit-framework into scriptjunkie-migrator 2012-10-19 15:25:45 -05:00
scriptjunkie 3d08c0c12d Merge pull request #2 from todb-r7/sj-prepend-migrate
Adding prepend_migrate? from todb
2012-10-19 12:55:51 -07:00
Tod Beardsley b7652b44d5 Adding prepend_migrate? 2012-10-19 14:24:13 -05:00
James Lee ed3f87b738 Merge branch 'wchen-r7-print_warning' into rapid7
[Closes #899]
2012-10-19 13:51:57 -05:00
James Lee ffa4373242 Merge branch 'rapid7' into wchen-r7-print_warning
[Closes #899]
2012-10-19 13:49:32 -05:00
lincoln@corelan.be b80b91f6b9 turboftp exploit 2012-10-19 11:05:44 -07:00
Tod Beardsley de26743a31 Merge pull request #931 from jvazquez-r7/apache_activemq_traversal_osvdb
OSVDB reference added
2012-10-19 08:16:01 -07:00
jvazquez-r7 4ad6fcc30e osvdb added 2012-10-19 17:04:47 +02:00
jvazquez-r7 205dc8870a Merge branch 'prependsetguid' of https://github.com/mephos/metasploit-framework into mephos-prependsetguid 2012-10-19 10:33:56 +02:00
sinn3r f3bf69a162 Todb says spaces 2012-10-18 13:42:19 -05:00
sinn3r d7e702891d Merge branch 'cleanup/specs' of git://github.com/jlee-r7/metasploit-framework into jlee-r7-cleanup/specs 2012-10-18 13:19:44 -05:00
James Lee 5f1ec459ee Disambiguate with parens
Removes a "ruby -c -W" warning
2012-10-18 12:46:08 -05:00
James Lee 37522a4bf0 Remove debugging output 2012-10-18 11:47:21 -05:00
James Lee 258c8800fc Add a spec for Util::EXE.to_executable_fmt 2012-10-18 11:40:44 -05:00
jvazquez-r7 291ad27a69 Merge branch 'msftidy_police' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-msftidy_police 2012-10-18 11:32:55 +02:00
sinn3r dbbf1eceaf Merge branch 'find_next_fix' of git://github.com/Meatballs1/metasploit-framework into Meatballs1-find_next_fix 2012-10-17 22:43:09 -05:00
sinn3r 0675a6171b Cosmetic changes 2012-10-17 17:30:16 -05:00
sinn3r 201518b66f msftidy corrections 2012-10-17 17:22:26 -05:00
Meatballs e1a4ec2fcc Fix to SMB Client when using find_first on a directory with exactly 20 files. 2012-10-17 21:58:20 +01:00
jvazquez-r7 7b1c35624e Merge branch 'mssql_ntlm_stealer' of https://github.com/nullbind/metasploit-framework into nullbind-mssql_ntlm_stealer 2012-10-17 22:50:54 +02:00
Scott Sutherland b14a980462 Merge pull request #1 from jvazquez-r7/nullbind_test1
Looks good and works as excepted. Thanks for the updates!
- jvazquez-r7 did some nice clean up
2012-10-17 13:45:11 -07:00
jvazquez-r7 1f55e02535 minor cleanup 2012-10-17 22:21:28 +02:00
jvazquez-r7 4c6b331bdc Merge branch 'mssql_ntlm_stealer_sqli' of https://github.com/nullbind/metasploit-framework into nullbind-mssql_ntlm_stealer_sqli 2012-10-17 22:21:00 +02:00