bunch of json updates

secdevops-cuse · Apr 20, 2019 · 9c0be62 · 9c0be62
1 parent 9f89087
commit 9c0be62
Show file tree

Hide file tree

Showing 33 changed files with 135 additions and 15 deletions.
diff --git a/tools/local_vm_to_aws/create_ami_from_ova.sh b/tools/local_vm_to_aws/create_ami_from_ova.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash -x
+# set newline character as the deliminator between results from the find cmd
+IFS=$'\n' ;
+
+# find json files to create ami's off of
+IFS=$'\n' ;
+
+
+#for i in $(ls /Volumes/backup/vm-exports); do aws s3 cp /Volumes/backup/vm-exports/$i s3://<bucket>/vulnvms/ ; done
+
+for json_full in $(find ./jsons/successful-ami-imports -name "*json"  ); do
+    json=$(echo $json_full | awk -F"/" '{print $5}'|sed 's/ //g');
+    echo $json " []" $json_full
+    aws ec2 import-image --description "$json" --license-type byol --disk-containers file://$json_full >> /tmp/ami-imports.london
+done
diff --git a/..._aws/jsons/defective/import_brainpan.json → ...s/failed-ami-imports/import_brainpan.json b/..._aws/jsons/defective/import_brainpan.json → ...s/failed-ami-imports/import_brainpan.json
diff --git a/tools/local_vm_to_aws/jsons/failed-ami-imports/import_defender_win2k16.json b/tools/local_vm_to_aws/jsons/failed-ami-imports/import_defender_win2k16.json
@@ -0,0 +1,10 @@
+[
+  {
+    "Description": "defender-win2016",
+    "Format": "ova",
+    "UserBucket": {
+      "S3Bucket": "xxxx",
+      "S3Key": "vulnvms/defender-win2016.ova"
+    }
+  }
+]
diff --git a/tools/local_vm_to_aws/jsons/failed-ami-imports/import_defender_win2k19.json b/tools/local_vm_to_aws/jsons/failed-ami-imports/import_defender_win2k19.json
@@ -0,0 +1,10 @@
+[
+  {
+    "Description": "defender-win2019",
+    "Format": "ova",
+    "UserBucket": {
+      "S3Bucket": "xxxx",
+      "S3Key": "vulnvms/defender-win2019.ova"
+    }
+  }
+]
diff --git a/...m_to_aws/jsons/defective/import_kali.json → ...jsons/failed-ami-imports/import_kali.json b/...m_to_aws/jsons/defective/import_kali.json → ...jsons/failed-ami-imports/import_kali.json
diff --git a/...s/jsons/defective/import_pwnlab_init.json → ...ailed-ami-imports/import_pwnlab_init.json b/...s/jsons/defective/import_pwnlab_init.json → ...ailed-ami-imports/import_pwnlab_init.json
diff --git a/...ws/jsons/defective/import_samuraiwtf.json → ...failed-ami-imports/import_samuraiwtf.json b/...ws/jsons/defective/import_samuraiwtf.json → ...failed-ami-imports/import_samuraiwtf.json
diff --git a/...ns/accounted_for/import_seed-andriod.json → ...iled-ami-imports/import_seed-andriod.json b/...ns/accounted_for/import_seed-andriod.json → ...iled-ami-imports/import_seed-andriod.json
diff --git a/..._to_aws/jsons/defective/import_win10.json → ...sons/failed-ami-imports/import_win10.json b/..._to_aws/jsons/defective/import_win10.json → ...sons/failed-ami-imports/import_win10.json
diff --git a/tools/local_vm_to_aws/jsons/failed-ami-imports/import_winxp.json b/tools/local_vm_to_aws/jsons/failed-ami-imports/import_winxp.json
@@ -0,0 +1,10 @@
+[
+  {
+    "Description": "winxp-ova",
+    "Format": "ova",
+    "UserBucket": {
+      "S3Bucket": "xxxx",
+      "S3Key": "vulnvms/winxp.ova"
+    }
+  }
+]
diff --git a/tools/local_vm_to_aws/jsons/successful-ami-imports/import_bulldog.json b/tools/local_vm_to_aws/jsons/successful-ami-imports/import_bulldog.json
@@ -0,0 +1,10 @@
+[
+  {
+    "Description": "bulldog",
+    "Format": "ova",
+    "UserBucket": {
+      "S3Bucket": "xxxx",
+      "S3Key": "vulnvms/Bulldog2.ova"
+    }
+  }
+]
diff --git a/tools/local_vm_to_aws/jsons/successful-ami-imports/import_commando.json b/tools/local_vm_to_aws/jsons/successful-ami-imports/import_commando.json
@@ -0,0 +1,10 @@
+[
+  {
+    "Description": "commando",
+    "Format": "ova",
+    "UserBucket": {
+      "S3Bucket": "xxxx",
+      "S3Key": "vulnvms/commando.ova"
+    }
+  }
+]
diff --git a/tools/local_vm_to_aws/jsons/successful-ami-imports/import_defender_win2k10.json b/tools/local_vm_to_aws/jsons/successful-ami-imports/import_defender_win2k10.json
@@ -0,0 +1,10 @@
+[
+  {
+    "Description": "defender-win2010",
+    "Format": "ova",
+    "UserBucket": {
+      "S3Bucket": "xxxx",
+      "S3Key": "vulnvms/defender-win2010.ova"
+    }
+  }
+]
diff --git a/...ons/accounted_for/import_fristileaks.json → ...ssful-ami-imports/import_fristileaks.json b/...ons/accounted_for/import_fristileaks.json → ...ssful-ami-imports/import_fristileaks.json
diff --git a/.../jsons/accounted_for/import_hackinos.json → ...ccessful-ami-imports/import_hackinos.json b/.../jsons/accounted_for/import_hackinos.json → ...ccessful-ami-imports/import_hackinos.json
diff --git a/...r/import_metasploitable3-ubuntu-1404.json → ...s/import_metasploitable3-ubuntu-1404.json b/...r/import_metasploitable3-ubuntu-1404.json → ...s/import_metasploitable3-ubuntu-1404.json
diff --git a/...ed_for/import_metasploitable3-win2k8.json → ...mports/import_metasploitable3-win2k8.json b/...ed_for/import_metasploitable3-win2k8.json → ...mports/import_metasploitable3-win2k8.json
diff --git a/...s/jsons/accounted_for/import_mrRobot.json → ...uccessful-ami-imports/import_mrRobot.json b/...s/jsons/accounted_for/import_mrRobot.json → ...uccessful-ami-imports/import_mrRobot.json
diff --git a/tools/local_vm_to_aws/jsons/successful-ami-imports/import_ms3_win2k12.json b/tools/local_vm_to_aws/jsons/successful-ami-imports/import_ms3_win2k12.json
@@ -0,0 +1,10 @@
+[
+  {
+    "Description": "metasploitable3-win2k12",
+    "Format": "ova",
+    "UserBucket": {
+      "S3Bucket": "xxxx",
+      "S3Key": "vulnvms/metasploitable3-win2k12.ova"
+    }
+  }
+]
diff --git a/.../jsons/accounted_for/import_myhouse7.json → ...ccessful-ami-imports/import_myhouse7.json b/.../jsons/accounted_for/import_myhouse7.json → ...ccessful-ami-imports/import_myhouse7.json
diff --git a/tools/local_vm_to_aws/jsons/successful-ami-imports/import_r7vm.json b/tools/local_vm_to_aws/jsons/successful-ami-imports/import_r7vm.json
@@ -0,0 +1,10 @@
+[
+  {
+    "Description": "r7va",
+    "Format": "ova",
+    "UserBucket": {
+      "S3Bucket": "xxxx",
+      "S3Key": "vulnvms/Rapid7VA.ova"
+    }
+  }
+]
diff --git a/...ccounted_for/import_seed-ubuntu-1604.json → ...-ami-imports/import_seed-ubuntu-1604.json b/...ccounted_for/import_seed-ubuntu-1604.json → ...-ami-imports/import_seed-ubuntu-1604.json
diff --git a/...jsons/accounted_for/import_sickOs1.2.json → ...cessful-ami-imports/import_sickOs1.2.json b/...jsons/accounted_for/import_sickOs1.2.json → ...cessful-ami-imports/import_sickOs1.2.json
diff --git a/.../jsons/accounted_for/import_skyTower.json → ...ccessful-ami-imports/import_skyTower.json b/.../jsons/accounted_for/import_skyTower.json → ...ccessful-ami-imports/import_skyTower.json
diff --git a/...s/jsons/accounted_for/import_stapler.json → ...uccessful-ami-imports/import_stapler.json b/...s/jsons/accounted_for/import_stapler.json → ...uccessful-ami-imports/import_stapler.json
diff --git a/tools/local_vm_to_aws/jsons/successful-ami-imports/import_tenable_core_nessus.json b/tools/local_vm_to_aws/jsons/successful-ami-imports/import_tenable_core_nessus.json
@@ -0,0 +1,10 @@
+[
+  {
+    "Description": "tenable-core-nessus",
+    "Format": "ova",
+    "UserBucket": {
+      "S3Bucket": "xxxx",
+      "S3Key": "vulnvms/Tenable-Core-Nessus-20190308.ova"
+    }
+  }
+]
diff --git a/tools/local_vm_to_aws/jsons/successful-ami-imports/import_tenable_core_nnm.json b/tools/local_vm_to_aws/jsons/successful-ami-imports/import_tenable_core_nnm.json
@@ -0,0 +1,10 @@
+[
+  {
+    "Description": "tenable-core-nnm",
+    "Format": "ova",
+    "UserBucket": {
+      "S3Bucket": "xxxx",
+      "S3Key": "vulnvms/Tenable-Core-NNM-20190308.ova"
+    }
+  }
+]
diff --git a/tools/local_vm_to_aws/jsons/successful-ami-imports/import_tenable_core_sc.json b/tools/local_vm_to_aws/jsons/successful-ami-imports/import_tenable_core_sc.json
@@ -0,0 +1,10 @@
+[
+  {
+    "Description": "tenable-core-sc",
+    "Format": "ova",
+    "UserBucket": {
+      "S3Bucket": "xxxx",
+      "S3Key": "vulnvms/Tenable-Core-SecurityCenter-20190308.ova"
+    }
+  }
+]
diff --git a/tools/local_vm_to_aws/jsons/successful-ami-imports/import_tenable_core_was.json b/tools/local_vm_to_aws/jsons/successful-ami-imports/import_tenable_core_was.json
@@ -0,0 +1,10 @@
+[
+  {
+    "Description": "tenable-core-was",
+    "Format": "ova",
+    "UserBucket": {
+      "S3Bucket": "xxxx",
+      "S3Key": "vulnvms/Tenable-Core-WAS-20190308.ova"
+    }
+  }
+]
diff --git a/.../jsons/accounted_for/import_vulnOSv2.json → ...ccessful-ami-imports/import_vulnOSv2.json b/.../jsons/accounted_for/import_vulnOSv2.json → ...ccessful-ami-imports/import_vulnOSv2.json
diff --git a/..._aws/jsons/accounted_for/import_win7.json → ...s/successful-ami-imports/import_win7.json b/..._aws/jsons/accounted_for/import_win7.json → ...s/successful-ami-imports/import_win7.json
diff --git a/..._aws/jsons/accounted_for/import_win8.json → ...s/successful-ami-imports/import_win8.json b/..._aws/jsons/accounted_for/import_win8.json → ...s/successful-ami-imports/import_win8.json
diff --git a/tools/local_vm_to_aws/upload_to_s3_and_start_import.sh b/tools/local_vm_to_aws/upload_to_s3_and_start_import.sh