Minor fixes of some task implementation for AWS

Author: Razvan

instantiation/attacks_emulation/attack_paramiko_ssh.py

@@ -88,6 +88,6 @@ def ssh_connect():
     elif basevm_type == 'aws':
         correct_date = subprocess.check_output("date +%Y%m%d", shell=True)
         correct_time = subprocess.check_output("date +%T", shell=True)
-        os.system("ssh -i TESTKEY.pem ec2-user@{0} date +%Y%m%d -s {1}".format(attacked_addr, correct_date))
-        os.system("ssh -i TESTKEY.pem ec2-user@{0} date +%T -s {1}".format(attacked_addr, correct_time))
-        os.system("ssh -i TESTKEY.pem ec2-user@{0} sort --stable --reverse --key=1,2 /var/log/secure -o /var/log/secure".format(attacked_addr))
+        os.system("ssh -i TESTKEY.pem ec2-user@{0} sudo date +%Y%m%d -s {1}".format(attacked_addr, correct_date))
+        os.system("ssh -i TESTKEY.pem ec2-user@{0} sudo date +%T -s {1}".format(attacked_addr, correct_time))
+        os.system("ssh -i TESTKEY.pem ec2-user@{0} sudo sort --stable --reverse --key=1,2 /var/log/secure -o /var/log/secure".format(attacked_addr))

instantiation/content_copy_program_run/copy_content.sh

@@ -34,7 +34,8 @@ elif [ ${basevm_type} = "aws" ]; then
             ssh -i TESTKEY.pem -o StrictHostKeyChecking=no ec2-user@${image_addr} "sudo mkdir -p ${dst}"
         fi
         scp -r -i TESTKEY.pem -o StrictHostKeyChecking=no ${src} ec2-user@${image_addr}:
-        ssh -i TESTKEY.pem -o StrictHostKeyChecking=no ec2-user@${image_addr} "sudo mv ${src} ${dst}"
+        # Special syntax for ${src} to preserve the last part of the name (after /) for the local 'mv'
+        ssh -i TESTKEY.pem -o StrictHostKeyChecking=no ec2-user@${image_addr} "sudo mv ${src##*/} ${dst}"
     elif [ ${os_type} = "ubuntu_20" -o ${os_type} = "ubuntu_18" -o ${os_type} = "ubuntu_16" ]; then
         if (ssh -i TESTKEY.pem -o StrictHostKeyChecking=no ubuntu@${image_addr} "[ -d ${dst} ]")
         then
@@ -43,6 +44,7 @@ elif [ ${basevm_type} = "aws" ]; then
             ssh -i TESTKEY.pem -o StrictHostKeyChecking=no ubuntu@${image_addr} "sudo mkdir -p ${dst}"
         fi
         scp -r -i TESTKEY.pem -o StrictHostKeyChecking=no ${src} ubuntu@${image_addr}:
-        ssh -i TESTKEY.pem -o StrictHostKeyChecking=no ubuntu@${image_addr} "sudo mv ${src} ${dst}"
+        # Special syntax for ${src} to preserve the last part of the name (after /) for the local 'mv'
+        ssh -i TESTKEY.pem -o StrictHostKeyChecking=no ubuntu@${image_addr} "sudo mv ${src##*/} ${dst}"
     fi
 fi

instantiation/malware_creation/malware_launch.sh

@@ -34,7 +34,7 @@ elif [ ${basevm_type} = "aws" ]; then
             scp -r -i TESTKEY.pem -o StrictHostKeyChecking=no ${abs_path}${inst_dir}/malware_creation/cpulimit/src/cpulimit ec2-user@${addr}:
             command="\"exec -a cpusage cpulimit -l ${crspd_option} ${malware_name} ${mode} 1000 &\"";
             #ssh -i TESTKEY.pem -o StrictHostKeyChecking=no ec2-user@${addr} "chmod +x cpulimit; sudo mv cpulimit /usr/bin"
-            ssh -i TESTKEY.pem -o StrictHostKeyChecking=no ec2-user@${addr} "chmod +x cpulimit; sudo mv cpulimit /usr/bin; sudo chmod 777 /etc/rc.d/rc.local; echo 'bash -c ${command}'  >> /etc/rc.d/rc.local";
+            ssh -i TESTKEY.pem -o StrictHostKeyChecking=no ec2-user@${addr} "chmod +x cpulimit; sudo mv cpulimit /usr/bin; sudo chmod 777 /etc/rc.d/rc.local; echo 'bash -c ${command}' >> /etc/rc.d/rc.local";
         else
             command="${malware_name} ${mode} ${crspd_option} &";
             ssh -i TESTKEY.pem -o StrictHostKeyChecking=no ec2-user@${addr} "echo '${command}'  >> /etc/rc.d/rc.local";