Commit Graph

25739 Commits (467c686701e247df5c5b73bf5bc56e4ebcb3ff2c)

Author SHA1 Message Date
Luke Imhoff 467c686701
Merge branch 'bug/MSP-10663/core-opts-needs-a-task-id' into staging/electro-release
MSP-10663
2014-07-08 19:45:11 -05:00
Luke Imhoff dd75c645c3
Update metasploit-credential
MSP-10663
2014-07-08 19:44:38 -05:00
dmaloney-r7 b65989ff0c Merge pull request #100 from rapid7/bug/MSP-10661/glob-rb-files
Use glob instead of entries
2014-07-08 14:29:24 -05:00
Lance Sanchez 9d3caf9c2f
Merge branch 'feature/MSP-10658/to_credential' into staging/electro-release 2014-07-08 11:17:17 -05:00
Lance Sanchez 6e11a4f789 changing the private_type
chainging trys to show these may all come back nil.

MSP-10658
2014-07-08 11:07:39 -05:00
Lance Sanchez e6f13f6607 reformatting the hash
MSP-10658
2014-07-08 11:07:25 -05:00
James Lee 567435f508
Use glob instead of entries
Fixes the case where a non-ruby file exists in the login_scanner/
directory
2014-07-08 11:00:33 -05:00
David Maloney 38419dae83
fix to_credential on core
the Metasploit::Credential::Core to_credential
method now seats private_type and realm_key correctly
2014-07-07 18:05:04 -05:00
Lance Sanchez d178b1f788
Merge branch 'bug/MSP-10654/compatibility' into staging/electro-release 2014-07-07 17:13:16 -05:00
Lance Sanchez d7450dcbdf
updating dependencies
metasploit-credential to pre.electro.pre.release
metasploit-data-models to 0.18.0

MSP-10654
2014-07-07 17:02:22 -05:00
David Maloney aeda74f394
Merge branch 'master' into staging/electro-release
Conflicts:
	Gemfile
	Gemfile.lock
2014-07-07 16:41:23 -05:00
dmaloney-r7 80bee35b70 Merge pull request #97 from rapid7/feature/MSP-10656/unify-ssh-scanners
Feature/msp 10656/unify ssh scanners
2014-07-07 16:37:41 -05:00
David Maloney 2c13ff4038
Merge branch 'staging/electro-release' into feature/MSP-10656/unify-ssh-scanners 2014-07-07 16:32:39 -05:00
dmaloney-r7 db8b0c907b Merge pull request #94 from rapid7/feature/MSP-10648/login-scanner-creation
Feature/msp 10648/login scanner creation
2014-07-07 16:04:09 -05:00
dmaloney-r7 c4c7ff519f Merge pull request #96 from rapid7/feature/MSP-10657/add-private-type
Add private_type and realm_key accessors to Framework::Credential
2014-07-07 15:43:18 -05:00
David Maloney b52c13228c
make private_type validation conditional
there are times when this won't be filled in
but the credential is still valid
2014-07-07 15:40:52 -05:00
Luke Imhoff 271fae07cf
Update to compatible dependencies
MSP-10654
2014-07-07 14:41:03 -05:00
dmaloney-r7 eda7e7297e Merge pull request #95 from rapid7/feature/MSP-10649/remove-successes
Remove successes and failures
2014-07-07 13:58:40 -05:00
cdoughty-r7 e5b5439e47 Merge pull request #3500 from todb-r7/fixup-release
Release fixup: Description/whitespace changes (minor)
2014-07-07 13:56:07 -05:00
James Lee 4d4b8078f8
Unify SSH specs as well 2014-07-07 13:41:08 -05:00
James Lee 2a9ac0a007
Axe SSHKey in favor of a unified SSH 2014-07-07 13:35:17 -05:00
James Lee 71cbbc5388
Merge branch 'feature/MSP-10648/login-scanner-creation' into feature/MSP-10656/unify-ssh-scanners 2014-07-07 13:19:34 -05:00
James Lee b7cfc927c4
Add private_type and realm_key accessors 2014-07-07 13:07:28 -05:00
Tod Beardsley 9fef2ca0f3
Description/whitespace changes (minor)
Four modules updated for the weekly release with minor cosmetic fixes.

- [ ] See all affected modules still load.
- [ ] See all affected modules have expected `info`
2014-07-07 12:39:05 -05:00
James Lee cff2e1a1c1
And remove specs referencing obsolete accessors 2014-07-07 12:37:14 -05:00
James Lee 5c406a2aa5
Remove successes and failures
No reason to store them and they could fill a ton of unnecessary memory.
2014-07-07 12:33:15 -05:00
James Lee 7035064f3d
Assignment alignment for Dave 2014-07-07 12:30:04 -05:00
jvazquez-r7 f1fcc23a08
Land #3499, Yokogawa's CVE-2014-3888 module 2014-07-07 11:37:11 -05:00
jvazquez-r7 cd6b83858b
Add new Yokogawa SCADA exploit 2014-07-07 11:20:49 -05:00
HD Moore f8d738d062
Fix QWORD usage, merges #3498 2014-07-07 10:43:48 -05:00
OJ bdf27b1834 Fix up the TLVs that are now QWORD values in MSF
Various values were adjusted to become QWORD values in MSF an windows
meterpreter, but the changes were not ported over to python, php and
java. This commit fixes this inconsistency.
2014-07-07 10:42:58 -05:00
James Lee 8df3ada087
Better docs 2014-07-07 10:18:42 -05:00
James Lee 325d2d25b9
Fix requires and derp typos 2014-07-07 10:09:45 -05:00
HD Moore 8f39590f0f
Framework is currently pegged to 0.17.0. Closes #3495 2014-07-07 09:43:05 -05:00
Luke Imhoff d7908e3050
Update schema.rb
MSP-10654
2014-07-07 09:41:46 -05:00
OJ ddfd912354 Fix up the TLVs that are now QWORD values in MSF
Various values were adjusted to become QWORD values in MSF an windows
meterpreter, but the changes were not ported over to python, php and
java. This commit fixes this inconsistency.
2014-07-07 19:46:54 +10:00
HD Moore 5961861c97
Merge #2809 into master 2014-07-06 23:46:10 -05:00
HD Moore 6f433db609
Minor typo fix 2014-07-06 23:44:17 -05:00
HD Moore 3ef35f19dc Prefer strip over chomp 2014-07-06 23:17:09 -05:00
HD Moore d76081bcef Prefer strip over chomp 2014-07-06 23:16:56 -05:00
HD Moore ab7848a895
Merge master for testing of #2809 2014-07-06 22:27:58 -05:00
jvazquez-r7 5e7f356f31
Land #3494, @Firefart's update for Mailpoet's exploit 2014-07-06 11:27:18 -05:00
Christian Mehlmauer d5843f8eaf
Updated Mailpoet exploit to work with another version 2014-07-06 10:53:40 +02:00
William Vu cf5d29c53b
Add EOF newline to satisfy msftidy 2014-07-05 13:51:12 -05:00
William Vu 84a3b94679
Land #3493, small fixes for WP MailPoet module 2014-07-05 13:50:09 -05:00
HD Moore 6d9bf83ded Small fixes for the recent WP MailPoet module
Correct casing in the title
Anchor the use of ::File
Force body.to_s since it can be nil in corner cases
2014-07-05 13:17:23 -05:00
jvazquez-r7 98a82bd145
Land #3486, @brandonprry's exploit for CVE-2014-4511 gitlist RCE 2014-07-04 16:41:04 -05:00
jvazquez-r7 59881323b9 Clean code 2014-07-04 16:40:16 -05:00
James Lee 311f43f1e4
Constpocalypse 2014-07-03 18:49:46 -05:00
jvazquez-r7 aedd347191
Land all the commits on #3491, @jlee-r7's patch for php meterpreter 2014-07-03 18:14:52 -05:00