From 815a5915e68a0430a88d4034bee2a27c1925396d Mon Sep 17 00:00:00 2001
From: thomashaw <thomashaw@gmail.com>
Date: Mon, 1 May 2017 14:44:32 +0100
Subject: [PATCH] moved parameterised_website from vulnerabilities to services

---
 .../files/css/bootstrap-theme.min.css                     | 0
 .../parameterised_website/files/css/bootstrap.min.css     | 0
 .../parameterised_website/files/js/bootstrap.min.js       | 0
 .../unix/webapp/parameterised_website/files/js/default.js | 0
 .../parameterised_website/files/js/jquery-1.12.4.js       | 0
 .../webapp/parameterised_website/files/js/jquery-ui.js    | 0
 .../manifests/acceptable_use_policy.pp                    | 0
 .../webapp/parameterised_website/manifests/install.pp     | 0
 .../manifests/security_audit_remit.pp                     | 0
 .../webapp/parameterised_website/parameterised_website.pp | 0
 .../unix/webapp/parameterised_website/secgen_metadata.xml | 8 +++-----
 .../templates/acceptable_use_page.html.erb                | 0
 .../parameterised_website/templates/contact.html.erb      | 0
 .../parameterised_website/templates/default.css.erb       | 0
 .../webapp/parameterised_website/templates/index.html.erb | 0
 .../templates/intranet_index.html.erb                     | 0
 .../templates/security_audit_remit_page.html.erb          | 0
 .../templates/subtemplates/acceptable_use_policy.html.erb | 0
 .../templates/subtemplates/footer.html.erb                | 0
 .../templates/subtemplates/header.html.erb                | 0
 .../templates/subtemplates/main_container.html.erb        | 0
 .../templates/subtemplates/navbar.html.erb                | 0
 .../templates/subtemplates/tab_panel.html.erb             | 0
 scenarios/ctf/edge_hill_scenario.xml                      | 4 ++--
 .../website_with_datastore_scenario.xml                   | 4 ++--
 .../examples/parameterised_examples/website_scenario.xml  | 2 +-
 scenarios/security_audit/team_project_scenario.xml        | 8 ++++----
 27 files changed, 12 insertions(+), 14 deletions(-)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/files/css/bootstrap-theme.min.css (100%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/files/css/bootstrap.min.css (100%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/files/js/bootstrap.min.js (100%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/files/js/default.js (100%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/files/js/jquery-1.12.4.js (100%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/files/js/jquery-ui.js (100%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/manifests/acceptable_use_policy.pp (100%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/manifests/install.pp (100%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/manifests/security_audit_remit.pp (100%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/parameterised_website.pp (100%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/secgen_metadata.xml (94%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/templates/acceptable_use_page.html.erb (100%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/templates/contact.html.erb (100%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/templates/default.css.erb (100%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/templates/index.html.erb (100%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/templates/intranet_index.html.erb (100%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/templates/security_audit_remit_page.html.erb (100%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/templates/subtemplates/acceptable_use_policy.html.erb (100%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/templates/subtemplates/footer.html.erb (100%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/templates/subtemplates/header.html.erb (100%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/templates/subtemplates/main_container.html.erb (100%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/templates/subtemplates/navbar.html.erb (100%)
 rename modules/{vulnerabilities => services}/unix/webapp/parameterised_website/templates/subtemplates/tab_panel.html.erb (100%)

diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/files/css/bootstrap-theme.min.css b/modules/services/unix/webapp/parameterised_website/files/css/bootstrap-theme.min.css
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/files/css/bootstrap-theme.min.css
rename to modules/services/unix/webapp/parameterised_website/files/css/bootstrap-theme.min.css
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/files/css/bootstrap.min.css b/modules/services/unix/webapp/parameterised_website/files/css/bootstrap.min.css
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/files/css/bootstrap.min.css
rename to modules/services/unix/webapp/parameterised_website/files/css/bootstrap.min.css
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/files/js/bootstrap.min.js b/modules/services/unix/webapp/parameterised_website/files/js/bootstrap.min.js
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/files/js/bootstrap.min.js
rename to modules/services/unix/webapp/parameterised_website/files/js/bootstrap.min.js
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/files/js/default.js b/modules/services/unix/webapp/parameterised_website/files/js/default.js
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/files/js/default.js
rename to modules/services/unix/webapp/parameterised_website/files/js/default.js
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/files/js/jquery-1.12.4.js b/modules/services/unix/webapp/parameterised_website/files/js/jquery-1.12.4.js
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/files/js/jquery-1.12.4.js
rename to modules/services/unix/webapp/parameterised_website/files/js/jquery-1.12.4.js
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/files/js/jquery-ui.js b/modules/services/unix/webapp/parameterised_website/files/js/jquery-ui.js
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/files/js/jquery-ui.js
rename to modules/services/unix/webapp/parameterised_website/files/js/jquery-ui.js
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/manifests/acceptable_use_policy.pp b/modules/services/unix/webapp/parameterised_website/manifests/acceptable_use_policy.pp
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/manifests/acceptable_use_policy.pp
rename to modules/services/unix/webapp/parameterised_website/manifests/acceptable_use_policy.pp
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/manifests/install.pp b/modules/services/unix/webapp/parameterised_website/manifests/install.pp
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/manifests/install.pp
rename to modules/services/unix/webapp/parameterised_website/manifests/install.pp
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/manifests/security_audit_remit.pp b/modules/services/unix/webapp/parameterised_website/manifests/security_audit_remit.pp
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/manifests/security_audit_remit.pp
rename to modules/services/unix/webapp/parameterised_website/manifests/security_audit_remit.pp
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/parameterised_website.pp b/modules/services/unix/webapp/parameterised_website/parameterised_website.pp
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/parameterised_website.pp
rename to modules/services/unix/webapp/parameterised_website/parameterised_website.pp
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/secgen_metadata.xml b/modules/services/unix/webapp/parameterised_website/secgen_metadata.xml
similarity index 94%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/secgen_metadata.xml
rename to modules/services/unix/webapp/parameterised_website/secgen_metadata.xml
index 33957bccb..8569f35a8 100644
--- a/modules/vulnerabilities/unix/webapp/parameterised_website/secgen_metadata.xml
+++ b/modules/services/unix/webapp/parameterised_website/secgen_metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<vulnerability xmlns="http://www.github/cliffe/SecGen/vulnerability"
+<service xmlns="http://www.github/cliffe/SecGen/service"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://www.github/cliffe/SecGen/vulnerability">
+               xsi:schemaLocation="http://www.github/cliffe/SecGen/service">
 
   <name>Random Parameterised Website</name>
   <author>Thomas Shaw</author>
@@ -9,8 +9,6 @@
   <description>Parameterised website filled with SecGen generated content.</description>
 
   <type>webapp</type>
-  <privilege>info_leak</privilege>
-  <access>remote</access>
   <platform>linux</platform>
 
   <read_fact>strings_to_leak</read_fact>
@@ -97,4 +95,4 @@
     <module_path>modules/services/unix/http/apache</module_path>
   </requires>
 
-</vulnerability>
\ No newline at end of file
+</service>
\ No newline at end of file
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/templates/acceptable_use_page.html.erb b/modules/services/unix/webapp/parameterised_website/templates/acceptable_use_page.html.erb
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/templates/acceptable_use_page.html.erb
rename to modules/services/unix/webapp/parameterised_website/templates/acceptable_use_page.html.erb
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/templates/contact.html.erb b/modules/services/unix/webapp/parameterised_website/templates/contact.html.erb
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/templates/contact.html.erb
rename to modules/services/unix/webapp/parameterised_website/templates/contact.html.erb
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/templates/default.css.erb b/modules/services/unix/webapp/parameterised_website/templates/default.css.erb
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/templates/default.css.erb
rename to modules/services/unix/webapp/parameterised_website/templates/default.css.erb
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/templates/index.html.erb b/modules/services/unix/webapp/parameterised_website/templates/index.html.erb
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/templates/index.html.erb
rename to modules/services/unix/webapp/parameterised_website/templates/index.html.erb
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/templates/intranet_index.html.erb b/modules/services/unix/webapp/parameterised_website/templates/intranet_index.html.erb
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/templates/intranet_index.html.erb
rename to modules/services/unix/webapp/parameterised_website/templates/intranet_index.html.erb
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/templates/security_audit_remit_page.html.erb b/modules/services/unix/webapp/parameterised_website/templates/security_audit_remit_page.html.erb
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/templates/security_audit_remit_page.html.erb
rename to modules/services/unix/webapp/parameterised_website/templates/security_audit_remit_page.html.erb
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/templates/subtemplates/acceptable_use_policy.html.erb b/modules/services/unix/webapp/parameterised_website/templates/subtemplates/acceptable_use_policy.html.erb
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/templates/subtemplates/acceptable_use_policy.html.erb
rename to modules/services/unix/webapp/parameterised_website/templates/subtemplates/acceptable_use_policy.html.erb
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/templates/subtemplates/footer.html.erb b/modules/services/unix/webapp/parameterised_website/templates/subtemplates/footer.html.erb
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/templates/subtemplates/footer.html.erb
rename to modules/services/unix/webapp/parameterised_website/templates/subtemplates/footer.html.erb
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/templates/subtemplates/header.html.erb b/modules/services/unix/webapp/parameterised_website/templates/subtemplates/header.html.erb
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/templates/subtemplates/header.html.erb
rename to modules/services/unix/webapp/parameterised_website/templates/subtemplates/header.html.erb
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/templates/subtemplates/main_container.html.erb b/modules/services/unix/webapp/parameterised_website/templates/subtemplates/main_container.html.erb
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/templates/subtemplates/main_container.html.erb
rename to modules/services/unix/webapp/parameterised_website/templates/subtemplates/main_container.html.erb
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/templates/subtemplates/navbar.html.erb b/modules/services/unix/webapp/parameterised_website/templates/subtemplates/navbar.html.erb
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/templates/subtemplates/navbar.html.erb
rename to modules/services/unix/webapp/parameterised_website/templates/subtemplates/navbar.html.erb
diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/templates/subtemplates/tab_panel.html.erb b/modules/services/unix/webapp/parameterised_website/templates/subtemplates/tab_panel.html.erb
similarity index 100%
rename from modules/vulnerabilities/unix/webapp/parameterised_website/templates/subtemplates/tab_panel.html.erb
rename to modules/services/unix/webapp/parameterised_website/templates/subtemplates/tab_panel.html.erb
diff --git a/scenarios/ctf/edge_hill_scenario.xml b/scenarios/ctf/edge_hill_scenario.xml
index 33c85733b..1d711b52a 100644
--- a/scenarios/ctf/edge_hill_scenario.xml
+++ b/scenarios/ctf/edge_hill_scenario.xml
@@ -11,7 +11,7 @@
 
 		<!-- comment describes using pseudo code (C#-like methods with named optional arguments) -->
 		<!-- vulnerability_nfs_share_leak(strings_to_leak: encoder_flag_generator() CONCAT encoder_ascii_reversable(strings_to_encode: encoder_flag_generator()) CONCAT ...) -->
-		<vulnerability name="Random Parameterised Website">
+		<service name="Random Parameterised Website">
 			<input into="visible_tabs">
 				<generator type="html_snippet_generator" >
 					<input into="heading">
@@ -122,7 +122,7 @@
 					</input>
 				</generator>
 			</input>
-		</vulnerability>
+		</service>
 
 		<!-- Remote privilege escalation -->
 		<vulnerability read_fact="strings_to_leak" access="remote" privilege="user_rwx">
diff --git a/scenarios/examples/datastore_examples/website_with_datastore_scenario.xml b/scenarios/examples/datastore_examples/website_with_datastore_scenario.xml
index ae988333b..59b302bf0 100644
--- a/scenarios/examples/datastore_examples/website_with_datastore_scenario.xml
+++ b/scenarios/examples/datastore_examples/website_with_datastore_scenario.xml
@@ -120,7 +120,7 @@
 
     <!-- FEED GENERATED 'BUSINESS' DATA ABOVE INTO VULNERABILITY MODULES. -->
 
-    <vulnerability module_path="vulnerabilities/unix/webapp/parameterised_website">
+    <service module_path="vulnerabilities/unix/webapp/parameterised_website">
       <input into="business_name">
         <datastore>business_name</datastore>
       </input>
@@ -145,7 +145,7 @@
       <input into="product_name">
         <datastore>product_name</datastore>
       </input>
-    </vulnerability>
+    </service>
 
     <network type="private_network" range="dhcp"/>
   </system>
diff --git a/scenarios/examples/parameterised_examples/website_scenario.xml b/scenarios/examples/parameterised_examples/website_scenario.xml
index c92944126..dd4a6038a 100644
--- a/scenarios/examples/parameterised_examples/website_scenario.xml
+++ b/scenarios/examples/parameterised_examples/website_scenario.xml
@@ -9,7 +9,7 @@
 		<system_name>web_server</system_name>
 		<base platform="linux"/>
 
-		<vulnerability module_path="vulnerabilities/unix/webapp/parameterised_website"/>
+		<service module_path="vulnerabilities/unix/webapp/parameterised_website"/>
 
 		<network type="private_network" range="dhcp"/>
 	</system>
diff --git a/scenarios/security_audit/team_project_scenario.xml b/scenarios/security_audit/team_project_scenario.xml
index 023d249ef..03af73081 100644
--- a/scenarios/security_audit/team_project_scenario.xml
+++ b/scenarios/security_audit/team_project_scenario.xml
@@ -89,7 +89,7 @@
       </generator>
     </input>
 
-    <vulnerability module_path="vulnerabilities/unix/webapp/parameterised_website">
+    <service module_path="vulnerabilities/unix/webapp/parameterised_website">
       <input into="business_name">
         <datastore>business_name</datastore>
       </input>
@@ -121,7 +121,7 @@
       <input into="product_name" into_datastore="product_name">
         <generator type="product"/>
       </input>
-    </vulnerability>
+    </service>
 
     <vulnerability privilege="user_rwx" access="remote" type="^((?!webapp).)*$">
       <input into="business_domain">
@@ -182,7 +182,7 @@
       </input>
     </vulnerability>
 
-    <vulnerability module_path="vulnerabilities/unix/webapp/parameterised_website">
+    <service module_path="vulnerabilities/unix/webapp/parameterised_website">
       <input into="host_acceptable_use_policy">
         <value>true</value>
       </input>
@@ -221,7 +221,7 @@
       <input into="product_name">
         <datastore>product_name</datastore>
       </input>
-    </vulnerability>
+    </service>
 
     <service/>
     <service/>