adam/metasploit-gs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,236 Commits 27 Branches 1,043 Tags
2cedee1aefeafd91cbc2cfb8b7b5ebd3e49b4e0f
Commit Graph

7808 Commits

Author SHA1 Message Date
Samuel Huckins f452652f54 Merge pull request #61 from rapid7/feature/MSP-9708/ssh-bruteforce 
Functional steps updated and passing, along with specs. Proof being maintained seemed off, but it's not persisted, just used for setting platform.

MSP-9708 #land
 2014-06-12 18:37:44 -05:00
Samuel Huckins d215b8e5b2 Merge pull request #47 from rapid7/feature/MSP-9712/winrm-bruteforce 
45 merged, steps passing.

MSP-9712 #land
 2014-06-12 16:04:17 -05:00
Samuel Huckins df705c2edc Gotta keep 'em sepArated. 
MSP-9712
 2014-06-12 16:03:02 -05:00
David Maloney 96e492f572 Merge branch 'master' into staging/electro-release 2014-06-12 14:02:27 -05:00
Samuel Huckins fe33444858 Merge pull request #58 from rapid7/feature/MSP-9693/db2_auth 
Errors resolved, cred created

MSP-9693 #land
 2014-06-12 12:49:54 -05:00
David Maloney 5fd117a015 fix userpass file stack trace 
if an improperly formated userpass file was
supplied it could cause a stack trace. add some guarding around it
 2014-06-12 12:39:36 -05:00
dmaloney-r7 ed84336149 Merge pull request #60 from rapid7/feature/MSP-9992/creds-command 
Refactor the creds command
 2014-06-12 12:24:09 -05:00
sinn3r 2a7227f443 Land #3427 - Adds webcam module for firefox privileged sessions on OSX 2014-06-11 22:27:25 -05:00
David Maloney c074ebda7b refactor telnet_login 2014-06-11 17:46:42 -05:00
James Lee c8e1fab6ec Merge branch 'staging/electro-release' into feature/MSP-9708/ssh-bruteforce 
Conflicts:
	lib/metasploit/framework/credential.rb
 2014-06-11 16:28:01 -05:00
James Lee b756395eaa Merge branch 'staging/electro-release' into feature/MSP-9712/winrm-bruteforce 
Conflicts:
	lib/metasploit/framework/credential_collection.rb
	spec/lib/metasploit/framework/credential_collection_spec.rb
 2014-06-11 16:21:59 -05:00
dmaloney-r7 9affc753c0 Merge pull request #66 from rapid7/feature/cred-collection-prepend 
Add ability to prepend creds to a collection
 2014-06-11 14:34:54 -05:00
James Lee 3a8f6236ad Add ability to prepend creds to a collection 2014-06-11 14:30:45 -05:00
Samuel Huckins 84aa0d42ed Merge pull request #57 from rapid7/bug/MSP-10004/rubyzip 
Trevor added a 0.4.1 tag right before this PR landed, making this unmergable. Pulled in staging/electro-release, specs passing.
 2014-06-11 13:48:03 -05:00
Samuel Huckins 1903542683 Merge branch 'staging/electro-release' into bug/MSP-10004/rubyzip 
Conflicts:
	Gemfile
	Gemfile.lock
 2014-06-11 13:42:26 -05:00
Trevor Rosen e8752f9c56 Point to correct creds version 2014-06-11 13:38:35 -05:00
David Maloney 9593422f9c Merge branch 'master' into staging/electro-release 2014-06-11 10:23:56 -05:00
Tod Beardsley 4b8961a464 Land #3428, deprecation warns for payloads 2014-06-11 09:57:07 -05:00
James Lee fb8c1f4c4b Refactor ssh_login to use LoginScanner stuffs 
Also, Metasploit::Credential::Creation stuffs.
 2014-06-10 17:30:06 -05:00
James Lee c0c1bd40a9 Fix help spec 2014-06-10 17:28:55 -05:00
James Lee 82b2c1deae Make creds command show Metasploit::Credentials 
This attempts to change the output of the command as little as possible,
but removes the ability to add and delete for now. At some point, we'll
need to add that back in.
 2014-06-10 15:03:03 -05:00
Tod Beardsley b379dc014a Avoid double-printing with setup and init_ui 2014-06-10 13:57:25 -05:00
Luke Imhoff 4d923a4809 Update to Rubyzip 1.X API 
MSP-10004

`require 'zip'` instead of `'zip/zip'` and rename all classes to remove
redundant Zip prefix inside the Zip namespace.
 2014-06-10 13:41:42 -05:00
Luke Imhoff f37ce795a1 Remove lib/zip 
MSP-10004
 2014-06-10 13:39:05 -05:00
David Maloney e9d9806408 invalidate_login 
added invalidate_login call
also made to_s on credential drop the @
if there is no realm present
 2014-06-10 11:07:15 -05:00
jvennix-r7 92414d3688 Merge pull request #53 from rapid7/bug/MSP-9994/framework-db-driver 
Set `framework.db.driver` when connection already established.
 2014-06-10 10:49:00 -05:00
Luke Imhoff 2cbbaad6b4 Set drivers and driver when connection already established 
MSP-9994

3 database commands in msfconsole check for framework.db.driver to be
set, so driver must be set when the connection is already established by
the Rails initialization.
 2014-06-09 14:26:59 -05:00
Luke Imhoff 1ee35ec68a Handle unconnected config in connection_established? 
MSP-9994

Rescue `ActiveRecord::ConnectionNotEstablished` in
`Msf::DBManager#connection_established?` in addition to
`PG::ConnectionBad` to handle when the connection has been removed.
 2014-06-09 14:26:45 -05:00
David Maloney 482aa2ea08 Merge branch 'master' into staging/electro-release 2014-06-09 10:27:22 -05:00
Meatballs bf1a665259 Land #2657, Dynamic generation of windows service executable functions 
Allows a user to specify non service executables as EXE::Template as
long as the file has enough size to store the payload.
 2014-06-07 13:28:20 +01:00
Meatballs 897ad6f963 Some service yarddoc 2014-06-07 13:27:32 +01:00
Meatballs 5218ca4d89 Give warning on module load 2014-06-06 23:04:40 +01:00
joev d990fb4999 Remove a number of stray edits and bs. 2014-06-06 16:24:45 -05:00
joev 4a9f50bb60 Clean up some dead code. 2014-06-06 16:20:40 -05:00
joev 7c762ad42c Fix some minor bugs in webrtc stuff, inline API code. 2014-06-06 16:18:39 -05:00
James Lee 552899ef13 Add a couple more specs for CredentialCollection 
Also fixes some typos in docs
 2014-06-06 12:12:32 -05:00
David Maloney 4d53c18ac4 fix version 2014-06-06 12:07:22 -05:00
dmaloney-r7 ff8e6d2c50 Merge pull request #45 from rapid7/feature/MSP-9988/credential-collection 
Add a CredCollection class and refactor WinRM bruteforce module
 2014-06-06 11:53:28 -05:00
Brandon Turner bacf82acb1 Merge branch 'release' into 'master' 2014-06-06 09:59:00 -05:00
Brandon Turner 21be4f21a6 Bump version to 4.9.3 2014-06-06 09:52:01 -05:00
Luke Imhoff f2a56c041b Merge branch 'staging/electro-release' into feature/MSP-9653/use-metasploit-concern-in-pro 
MSP-9653

Conflicts:
	Gemfile
	Gemfile.lock
 2014-06-05 16:22:02 -05:00
David Maloney c61b47063d vnc add missing exception catch 
linux throws a different exception than osx
when the vnc client fails to connect
this caused issues with the specs running. this now
catches that additional exception
 2014-06-05 15:32:08 -05:00
James Lee b1136752be Add Credential#== to facilitate specs 2014-06-05 11:37:48 -05:00
James Lee 8b6e188ba8 Add support for realm in CredentialCollection 
MSP-9988
 2014-06-04 17:03:52 -05:00
James Lee b1ff6b95b5 Better docs 2014-06-04 14:44:53 -05:00
James Lee 41644970bf Add a CredentialCollection 
Also moves Metasploit::Framework::LoginScanner::Credential to
Metasploit::Framework::Credential
 2014-06-04 13:01:09 -05:00
David Maloney 28bf29980e Merge branch 'master' into staging/electro-release 2014-06-04 10:21:08 -05:00
Trevor Rosen ad15e6fe17 Merge pull request #35 from rapid7/feature/MSP-9678/pop3-login-scanner 
Feature/msp 9678/pop3 login scanner

MSP-9678 #land
 2014-06-03 12:11:17 -05:00
Lance Sanchez edc9f94d41 fixing issues raised in code review 
MSP-9678
 2014-06-03 11:15:26 -05:00
Tod Beardsley d0d389598a Land #3086, Android Java Meterpreter updates 
w00t.
 2014-06-02 17:28:38 -05:00