From c7e074416e6996d62b8995a4c6612c1f59ad828b Mon Sep 17 00:00:00 2001 From: Kevin Johnson Date: Thu, 21 Mar 2019 20:20:16 -0400 Subject: [PATCH 1/4] Start of 4.1.1 and networking changes --- Vagrantfile | 2 +- install/local_targets.sh | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 8a5f184..5774174 100644 --- a/Vagrantfile +++ b/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"] diff --git a/install/local_targets.sh b/install/local_targets.sh index 6aed21b..f3a7f0c 100644 --- a/install/local_targets.sh +++ b/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 From 74cd78256fe00ca1c3215f836e62b3562101ac76 Mon Sep 17 00:00:00 2001 From: Kevin Johnson Date: Thu, 18 Apr 2019 15:10:38 -0400 Subject: [PATCH 2/4] Updayte gitignore to prevent burp pro liceses from being checked in --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2673935..a5727d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .vagrant *.log .DS_Store +config/home/Burp* \ No newline at end of file From 1f03151b9b85b11484e7c46456e776384687eaf5 Mon Sep 17 00:00:00 2001 From: Kevin Johnson Date: Thu, 18 Apr 2019 15:39:34 -0400 Subject: [PATCH 3/4] Updated for the jar --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a5727d2..696b21f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .vagrant *.log .DS_Store -config/home/Burp* \ No newline at end of file +config/home/Burp* +config/home/burp* \ No newline at end of file From 6e2f36e1a6b120fab4245689f41561d21b34f9b4 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 30 Apr 2019 17:19:43 -0400 Subject: [PATCH 4/4] Fixed issue #73 --- config/startup_targets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/startup_targets.sh b/config/startup_targets.sh index ffa4d04..c37bae5 100644 --- a/config/startup_targets.sh +++ b/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