infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added a couple of valid status codes and defaulted SMBDomain to be blank

unstable
Meatballs1 2012-09-12 22:22:53 +01:00
parent 31ecc0da5f
commit 7d5b3b6066
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/auxiliary/scanner/smb/smb_login.rb
View File

@ -46,11 +46,15 @@ class Metasploit3 < Msf::Auxiliary
@accepts_guest_logins = {} @accepts_guest_logins = {}
@correct_credentials_status_codes = ["STATUS_INVALID_LOGON_HOURS", @correct_credentials_status_codes = ["STATUS_INVALID_LOGON_HOURS",
"STATUS_INVALID_WORKSTATION",
"STATUS_ACCOUNT_RESTRICTION", "STATUS_ACCOUNT_RESTRICTION",
"STATUS_ACCOUNT_EXPIRED", "STATUS_ACCOUNT_EXPIRED",
"STATUS_ACCOUNT_DISABLED", "STATUS_ACCOUNT_DISABLED",
"STATUS_ACCOUNT_LOCKED_OUT",
"STATUS_ACCOUNT_RESTRICTION",
"STATUS_PASSWORD_EXPIRED", "STATUS_PASSWORD_EXPIRED",
"STATUS_PASSWORD_MUST_CHANGE"] "STATUS_PASSWORD_MUST_CHANGE",
"STATUS_LOGON_TYPE_NOT_GRANTED"]
# These are normally advanced options, but for this module they have a # These are normally advanced options, but for this module they have a
# more active role, so make them regular options. # more active role, so make them regular options.
@ -58,7 +62,7 @@ class Metasploit3 < Msf::Auxiliary
[ [
OptString.new('SMBPass', [ false, "SMB Password" ]), OptString.new('SMBPass', [ false, "SMB Password" ]),
OptString.new('SMBUser', [ false, "SMB Username" ]), OptString.new('SMBUser', [ false, "SMB Username" ]),
OptString.new('SMBDomain', [ false, "SMB Domain", '.']), OptString.new('SMBDomain', [ false, "SMB Domain", '']),
OptBool.new('PRESERVE_DOMAINS', [ false, "Respect a username that contains a domain name.", true]), OptBool.new('PRESERVE_DOMAINS', [ false, "Respect a username that contains a domain name.", true]),
OptBool.new('RECORD_GUEST', [ false, "Record guest-privileged random logins to the database", false]), OptBool.new('RECORD_GUEST', [ false, "Record guest-privileged random logins to the database", false]),
], self.class) ], self.class)
@ -79,7 +83,7 @@ class Metasploit3 < Msf::Auxiliary
end end
end end
domain = datastore['SMBDomain'] || "." domain = datastore['SMBDomain'] || ""
begin begin
each_user_pass do |user, pass| each_user_pass do |user, pass|
@ -132,7 +136,7 @@ class Metasploit3 < Msf::Auxiliary
unless(simple.client.auth_user) unless(simple.client.auth_user)
guest = true guest = true
@accepts_guest_logins['rhost'] ||=[] unless @accepts_guest_logins.include?(rhost) #'rhost' should be rhost? @accepts_guest_logins['rhost'] ||=[] unless @accepts_guest_logins.include?(rhost)
report_note( report_note(
:host => rhost, :host => rhost,
:proto => 'tcp', :proto => 'tcp',