Make it possible to provide a non-default RPORT

[nrathaus]

Related to: #19072

Make it possible to add a non-default (139, 445) port to the SMB test, by using Set rather than list/array and adding the datastore RPORT to the mix

[smcintyre-r7]

So now that #19095 has been landed, the #connect method has the direct keyword argument. That means this can proceed, it just needs to be rebased and then to consolidate the port options into just RPORT instead of individual datastore options for each.

The pattern now included in smb_enumusers should fit here where it'll check 139 and 445 if RPORT is not set. If RPORT is set, it'll be the only port checked. That should meet the requirements of the original request, maintain backwards compatibility and be relatively intuitive for users due to the reuse of the existing datastore options for their intended purposes.

metasploit-framework/modules/auxiliary/scanner/smb/smb_enumusers.rb

Lines 44 to 58 in aef3cc5

	if datastore['RPORT'].blank? || datastore['RPORT'] == 0
	smb_services = [
	{ port: 139, direct: false },
	{ port: 445, direct: true }
	]
	else
	smb_services = [
	{ port: datastore['RPORT'], direct: datastore['SMBDirect'] }
	]
	end
	smb_services.each do |smb_service|
	run_service(smb_service[:port], smb_service[:direct])
	end
	end

[smcintyre-r7]

Are you still interested in making these changes?

[nrathaus]

@smcintyre-r7 I am not quite following what is needed as a change, is it this:

   if datastore['RPORT'].blank? || datastore['RPORT'] == 0 
     smb_services = [ 
       { port: 139, direct: false }, 
       { port: 445, direct: true } 
     ] 
   else 
     smb_services = [ 
       { port: datastore['RPORT'], direct: datastore['SMBDirect'] } 
     ] 
   end

I changes I proposed earlier you said are not what you hoped

[smcintyre-r7]

Sorry for the confusion but I opened a PR with what I had in mind in #19163. Using that, we can retain the original functionality of trying 139 and 445 automatically, or allow the user to specify a port of their choosing in which case it'll be the only one tested. It also reuses the existing RPORT and SMBDirect datastore options instead of adding new ones such as SMB_RPORT / RPC_RPORT.

[nrathaus]

Great