Fix: auxiliary/kerberos_enumusers stops after first match

rapid7 · Nov 6, 2019 · 247546f · 247546f
1 parent f4cea61
commit 247546f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/modules/auxiliary/analyze/jtr_mssql_fast.rb b/modules/auxiliary/analyze/jtr_mssql_fast.rb
@@ -97,7 +97,7 @@ def run
   def hash_file
     wrote_hash = false
     hashlist = Rex::Quickfile.new("hashes_tmp")
-    Metasploit::Credential::NonreplayableHash.joins(:cores).where(metasploit_credential_cores: { workspace_id: myworkspace.id }, jtr_format: ['mssql', 'mssql05', 'mssql12']).each do |hash|
+    Metasploit::Credential::NonreplayableHash.joins(:cores).where(metasploit_credential_cores: { workspace_id: myworkspace_id }, jtr_format: ['mssql', 'mssql05', 'mssql12']).each do |hash|
       # Track the formats that we've seen so we do not attempt a format that isn't relevant
       @formats << hash.jtr_format
       hash.cores.each do |core|

diff --git a/modules/auxiliary/gather/kerberos_enumusers.rb b/modules/auxiliary/gather/kerberos_enumusers.rb
@@ -93,7 +93,7 @@ def report_cred(opts)
       address: opts[:host],
       port: opts[:port],
       protocol: 'udp',
-      workspace_id: myworkspace.id,
+      workspace_id: myworkspace_id,
       service_name: opts[:creds_name]
     }
 

diff --git a/modules/auxiliary/gather/konica_minolta_pwd_extract.rb b/modules/auxiliary/gather/konica_minolta_pwd_extract.rb
@@ -229,7 +229,7 @@ def register_creds(service_name, remote_host, remote_port, username, password)
     credential_data = {
       origin_type: :service,
       module_fullname: self.fullname,
-      workspace_id: myworkspace.id,
+      workspace_id: myworkspace_id,
       private_data: password,
       private_type: :password,
       username: username

diff --git a/modules/auxiliary/gather/lansweeper_collector.rb b/modules/auxiliary/gather/lansweeper_collector.rb
@@ -115,7 +115,7 @@ def report_cred(opts)
       address: opts[:host],
       port: opts[:port],
       protocol: 'tcp',
-      workspace_id: myworkspace.id,
+      workspace_id: myworkspace_id,
       service_name: opts[:creds_name]
     }
 

diff --git a/modules/auxiliary/gather/xerox_pwd_extract.rb b/modules/auxiliary/gather/xerox_pwd_extract.rb
@@ -158,7 +158,7 @@ def register_creds(service_name, remote_host, remote_port, username, password)
     credential_data = {
       origin_type: :service,
       module_fullname: self.fullname,
-      workspace_id: myworkspace.id,
+      workspace_id: myworkspace_id,
       private_data: password,
       private_type: :password,
       username: username

diff --git a/modules/auxiliary/gather/xerox_workcentre_5xxx_ldap.rb b/modules/auxiliary/gather/xerox_workcentre_5xxx_ldap.rb
@@ -274,7 +274,7 @@ def register_creds(service_name, remote_host, remote_port, username, password)
     credential_data = {
       origin_type: :service,
       module_fullname: self.fullname,
-      workspace_id: myworkspace.id,
+      workspace_id: myworkspace_id,
       private_data: password,
       private_type: :password,
       username: username