Land rapid7#7892, Enhance the creds command to allow creating logins

Author: Brent Cook

lib/msf/ui/console/command_dispatcher/creds.rb

@@ -202,7 +202,7 @@ def creds_add(*args)
     end
 
     begin
-      params.assert_valid_keys('user','password','realm','realm-type','ntlm','ssh-key','hash','host','port')
+      params.assert_valid_keys('user','password','realm','realm-type','ntlm','ssh-key','hash','address','port','protocol', 'service-name')
     rescue ArgumentError => e
       print_error(e.message)
     end
@@ -213,6 +213,13 @@ def creds_add(*args)
       print_error("You can only specify a single Private type. Private types given: #{private_keys.join(', ')}")
       return
     end
+    
+    login_keys = params.slice('address','port','protocol','service-name')
+    if login_keys.any? and login_keys.length < 3
+      missing_login_keys = ['host','port','proto','service-name'] - login_keys.keys
+      print_error("Creating a login requires a address, a port, and a protocol. Missing params: #{missing_login_keys}")
+      return
+    end
 
     data = {
       workspace_id: framework.db.workspace,
@@ -260,9 +267,17 @@ def creds_add(*args)
       data[:private_type] = :nonreplayable_hash
       data[:private_data] = params['hash']
     end
-    
+        
     begin
-      create_credential(data)
+      if login_keys.any?
+        data[:address] = params['address']
+        data[:port] = params['port']
+        data[:protocol] = params['protocol']
+        data[:service_name] = params['service-name']
+        create_credential_and_login(data)
+      else
+        create_credential(data)
+      end
     rescue ActiveRecord::RecordInvalid => e
       print_error("Failed to add #{data['private_type']}: #{e}")
     end