Land rapid7#8526, Refactor QNAP and airOS modules for creds

Author: jmartin-tech

modules/auxiliary/gather/qnap_backtrace_admin_hash.rb

@@ -90,12 +90,15 @@ def run
 
     if admin_hash
       print_good("Hopefully this is your hash: #{admin_hash}")
-      report_note(
-        host: rhost,
-        port: rport,
-        type: 'qnap.admin.hash',
-        data: admin_hash
-      )
+      credential_data = {
+        workspace_id:    myworkspace_id,
+        module_fullname: self.fullname,
+        username:        'admin',
+        private_data:    admin_hash,
+        private_type:    :nonreplayable_hash,
+        jtr_format:      'md5crypt'
+      }.merge(service_details)
+      create_credential(credential_data)
     else
       print_error('Looks like we didn\'t find the hash :(')
     end

modules/exploits/linux/ssh/ubiquiti_airos_file_upload.rb

@@ -148,18 +148,25 @@ def ssh_login
         refs: self.references,
         info: ssh.transport.server_version.version
       )
-      report_note(
-        host: rhost,
-        port: datastore['SSH_PORT'],
-        type: 'airos.ssh.key',
-        data: private_key
+      store_valid_credential(
+        user:         username,
+        private:      private_key,
+        private_type: :ssh_key
       )
       return Net::SSH::CommandStream.new(ssh, '/bin/sh', true)
     end
 
     nil
   end
 
+  # This is for store_valid_credential above
+  def service_details
+    super.merge(
+      port:         datastore['SSH_PORT'],
+      service_name: 'ssh'
+    )
+  end
+
   #
   # Persistence and cleanup methods
   #