Merge pull request #74 from SamuraiWTF/4.1.1

4.1.1

Vagrantfile

@@ -16,7 +16,7 @@ Vagrant.configure("2") do |config|
     samuraiwtf.vm.provider "virtualbox" do |vb|
     # Display the VirtualBox GUI when booting the machine
       vb.gui = true
-      vb.name = "SamuraiWTF-4.0.1"
+      vb.name = "SamuraiWTF-4.1.1"
     # Customize the amount of memory on the VM:
       vb.memory = "4096"
       vb.customize ["modifyvm", :id, "--vram", "128"]

config/startup_targets.sh

@@ -13,7 +13,7 @@ sudo docker run --rm -p 31000:80 -p 33006:3306 bit0pus/docker-dvwa &
 
 sudo docker run --rm -p 33080:80 -p 22222:22 -p 33333:3306 bit0pus/docker-mutillidae &
 
-cd /opt/targets/samurai-dojo-docker
+cd /opt/targets/samurai-dojo
 sudo docker-compose up &
 
 sudo service nginx restart;curl http://dojo-basic.wtf/reset-db.php

install/local_targets.sh

@@ -2,15 +2,20 @@
 
 echo 'Setting hosts entries for local targets'
 
-echo '127.0.0.1   juice-shop.wtf' | sudo tee -a /etc/hosts
+echo '# 127.0.0.0/24 are training targets' | sudo tee -a /etc/hosts
 echo '127.0.0.1   dojo-basic.wtf' | sudo tee -a /etc/hosts
-echo '127.0.0.1   dojo-scavenger.wtf' | sudo tee -a /etc/hosts
-echo '127.0.0.1   dvwa.wtf' | sudo tee -a /etc/hosts
-echo '127.0.0.1   mutillidae.wtf' | sudo tee -a /etc/hosts
-echo '127.0.0.1   professionallyevil.wtf' | sudo tee -a /etc/hosts
-echo '127.0.0.1   amoksecurity.wtf' | sudo tee -a /etc/hosts
-echo '127.0.0.1   client.cors.dem' | sudo tee -a /etc/hosts
-echo '127.0.0.1   api.cors.dem' | sudo tee -a /etc/hosts
+echo '127.0.0.2   dvwa.wtf' | sudo tee -a /etc/hosts
+echo '127.0.0.3   mutillidae.wtf' | sudo tee -a /etc/hosts
+echo '127.0.0.4   api.cors.dem' | sudo tee -a /etc/hosts
+
+echo '# 127.0.10.0/24 are training client systems' | sudo tee -a /etc/hosts
+echo '127.0.10.1   professionallyevil.wtf' | sudo tee -a /etc/hosts
+echo '127.0.10.2   amoksecurity.wtf' | sudo tee -a /etc/hosts
+echo '127.0.10.3   client.cors.dem' | sudo tee -a /etc/hosts
+
+echo '# 127.0.42.0/24 are the CtF targets' | sudo tee -a /etc/hosts
+echo '127.0.42.42   juice-shop.wtf' | sudo tee -a /etc/hosts
+echo '127.0.42.41   dojo-scavenger.wtf' | sudo tee -a /etc/hosts
 
 sudo mkdir /home/samurai/.scripts
 sudo tr '\r\n' '\n' < /tmp/config/startup_targets.sh > /home/samurai/.scripts/startup_targets.sh