scenarios: updating base box selectors to include type="server" (along side platform="linux") in preparation for kali basebox merge

2026-02-20 13:50:45 +00:00 · 2017-08-19 13:52:03 +01:00
parent 8b2a92915e
commit 0d5bd58fdc
87 changed files with 91 additions and 91 deletions
--- a/scenarios/ctf/basic_narrative.xml
+++ b/scenarios/ctf/basic_narrative.xml
@@ -8,7 +8,7 @@

  <system>
    <system_name>system</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <input into_datastore="accounts">
      <!-- [0]: Entry account -->
--- a/scenarios/ctf/flawed_fortress_1.xml
+++ b/scenarios/ctf/flawed_fortress_1.xml
@@ -7,7 +7,7 @@
 	<!--some basic decoding challenges-->
 	<system>
 		<system_name>decode_me</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!-- 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_reversible(strings_to_encode: encoder_flag_generator()) CONCAT ...) -->
@@ -68,7 +68,7 @@
 	<!--a few vulnerabilities that are in the wild, with some flags that need decoding, some red herring services to keep things interesting-->
 	<system>
 		<system_name>in_the_wild</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<vulnerability read_fact="strings_to_leak" access="remote" privilege="user_rwx">
 			<input into="strings_to_leak">
@@ -133,7 +133,7 @@
 	<!-- an example remote storage system, with a remotely exploitable vulnerability that can then be escalated to root -->
 	<system>
 		<system_name>that_escalated_quickly</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<vulnerability read_fact="images_to_leak" access="remote" privilege="user_rwx">
 			<input into="images_to_leak" >
--- a/scenarios/ctf/nw_cyber_games.xml
+++ b/scenarios/ctf/nw_cyber_games.xml
@@ -7,7 +7,7 @@
 	<!--some basic decoding challenges-->
 	<system>
 		<system_name>nw_cyber_games</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!-- 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_reversible(strings_to_encode: encoder_flag_generator()) CONCAT ...) -->
--- a/scenarios/default_scenario.xml
+++ b/scenarios/default_scenario.xml
@@ -7,7 +7,7 @@
 	<!-- an example remote storage system, with a remotely exploitable vulnerability that can then be escalated to root -->
 	<system>
 		<system_name>storage_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<vulnerability privilege="user_rwx" access="remote" />
 		<vulnerability privilege="root_rwx" access="local" />
--- a/scenarios/examples/datastore_examples/datastores_rather_than_nesting.xml
+++ b/scenarios/examples/datastore_examples/datastores_rather_than_nesting.xml
@@ -8,7 +8,7 @@
 	<!--comments describe using pseudo code-->
 	<system>
 		<system_name>decode_me</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!--  flag1 = encoder_flag_generator()   -->
 		<input into_datastore="flag1">
--- a/scenarios/examples/datastore_examples/example.xml
+++ b/scenarios/examples/datastore_examples/example.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<input into_datastore="business_name">
 			<value>BusinessName1</value>
--- a/scenarios/examples/datastore_examples/iteration_and_element_access.xml
+++ b/scenarios/examples/datastore_examples/iteration_and_element_access.xml
@@ -8,7 +8,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!--pre-calculate all flags at once, and store in flags datastore-->
 		<input into_datastore="flags">
--- a/scenarios/examples/datastore_examples/precalculate_strings.xml
+++ b/scenarios/examples/datastore_examples/precalculate_strings.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<input into_datastore="business_name">
 			<value>BusinessName1</value>
--- a/scenarios/examples/datastore_examples/store_flags.xml
+++ b/scenarios/examples/datastore_examples/store_flags.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
--- a/scenarios/examples/datastore_examples/website_with_datastore_scenario.xml
+++ b/scenarios/examples/datastore_examples/website_with_datastore_scenario.xml
@@ -7,7 +7,7 @@
  <!-- an example system hosting a parameterised randomly generated website -->
  <system>
    <system_name>web_server</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>


    <!-- FEED GENERATED 'BUSINESS' DATA ABOVE INTO VULNERABILITY MODULES. -->
--- a/scenarios/examples/parameterised_examples/encode_and_leak_multiple_values.xml
+++ b/scenarios/examples/parameterised_examples/encode_and_leak_multiple_values.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!-- encode and leak multiple values -->

--- a/scenarios/examples/parameterised_examples/encoder_examples/1337.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/1337.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
--- a/scenarios/examples/parameterised_examples/encoder_examples/base64.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/base64.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
--- a/scenarios/examples/parameterised_examples/encoder_examples/binary_encoder.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/binary_encoder.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
--- a/scenarios/examples/parameterised_examples/encoder_examples/caesar_shift.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/caesar_shift.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
--- a/scenarios/examples/parameterised_examples/encoder_examples/dec_encoder.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/dec_encoder.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
--- a/scenarios/examples/parameterised_examples/encoder_examples/hex_encoder.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/hex_encoder.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
--- a/scenarios/examples/parameterised_examples/encoder_examples/morse_code.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/morse_code.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
--- a/scenarios/examples/parameterised_examples/encoder_examples/oct_encoder.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/oct_encoder.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
--- a/scenarios/examples/parameterised_examples/encoder_examples/random_selection.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/random_selection.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!-- generate encode and leak multiple values -->

--- a/scenarios/examples/parameterised_examples/encoder_examples/random_shift_cipher.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/random_shift_cipher.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
--- a/scenarios/examples/parameterised_examples/encoder_examples/rot13.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/rot13.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
--- a/scenarios/examples/parameterised_examples/encoder_examples/vignere_cipher.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/vignere_cipher.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
--- a/scenarios/examples/parameterised_examples/generate_and_leak_multiple_values.xml
+++ b/scenarios/examples/parameterised_examples/generate_and_leak_multiple_values.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!-- generate and leak multiple values -->

--- a/scenarios/examples/parameterised_examples/generate_encode_and_leak_multiple_values.xml
+++ b/scenarios/examples/parameterised_examples/generate_encode_and_leak_multiple_values.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!-- generate encode and leak multiple values -->

--- a/scenarios/examples/parameterised_examples/generator_examples/encoded_diff.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/encoded_diff.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>diff_challenge_box</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<vulnerability name="NFS Share Leak">
 			<input into="strings_to_leak">
--- a/scenarios/examples/parameterised_examples/generator_examples/exif_metadata.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/exif_metadata.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!-- Generator which outputs an image with modified exif metadata code containing a flag. -->
 		<vulnerability read_fact="images_to_leak">
--- a/scenarios/examples/parameterised_examples/generator_examples/hello_world.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/hello_world.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
--- a/scenarios/examples/parameterised_examples/generator_examples/hidden_data_in_image_file.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/hidden_data_in_image_file.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!-- Generator which outputs an ascii_reversible encoded string (usually a flag) appended to raw image data. -->
 		<vulnerability read_fact="images_to_leak">
--- a/scenarios/examples/parameterised_examples/generator_examples/qr_code_generator.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/qr_code_generator.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!-- Generator which outputs an image with a QR code containing a flag. -->
 		<vulnerability read_fact="images_to_leak">
--- a/scenarios/examples/parameterised_examples/generator_examples/random_base64.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/random_base64.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
--- a/scenarios/examples/parameterised_examples/generator_examples/random_filename.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/random_filename.xml
@@ -5,7 +5,7 @@

  <system>
    <system_name>example_server</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <!--select a vulnerability that takes leaked_filenames-->
    <vulnerability read_fact="leaked_filenames">
--- a/scenarios/examples/parameterised_examples/generator_examples/random_flag.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/random_flag.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
--- a/scenarios/examples/parameterised_examples/generator_examples/random_hex.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/random_hex.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
--- a/scenarios/examples/parameterised_examples/generator_examples/random_word.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/random_word.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
--- a/scenarios/examples/parameterised_examples/generator_examples/security_audit_remit.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/security_audit_remit.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<vulnerability read_fact="strings_to_leak">
 			<input into="strings_to_leak">
--- a/scenarios/examples/parameterised_examples/generator_examples/xor_binary_strings.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/xor_binary_strings.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!-- Generator which outputs 2 binary strings that are XORable together to get the flag. -->
 		<vulnerability read_fact="strings_to_leak">
--- a/scenarios/examples/parameterised_examples/leak_multiple_values.xml
+++ b/scenarios/examples/parameterised_examples/leak_multiple_values.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<!-- leak multiple values -->

--- a/scenarios/examples/parameterised_examples/leeds_beckett_online_store.xml
+++ b/scenarios/examples/parameterised_examples/leeds_beckett_online_store.xml
@@ -6,7 +6,7 @@

  <system>
    <system_name>online_store</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <vulnerability module_path=".*onlinestore">
      <input into="domain">
--- a/scenarios/examples/parameterised_examples/website_scenario.xml
+++ b/scenarios/examples/parameterised_examples/website_scenario.xml
@@ -7,7 +7,7 @@
 	<!-- an example system hosting a parameterised randomly generated website -->
 	<system>
 		<system_name>web_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<service module_path="services/unix/http/parameterised_website"/>

--- a/scenarios/examples/public_network.xml
+++ b/scenarios/examples/public_network.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>storage_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 		<service /> <!-- random network service -->
 		<network type="public_network"/>
 	</system>
--- a/scenarios/examples/random_vuln_with_cleanup.xml
+++ b/scenarios/examples/random_vuln_with_cleanup.xml
@@ -6,7 +6,7 @@
  <!-- an example with a random vulnerability and the cleanup module with some inputs. -->
  <system>
    <system_name>storage_server</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <vulnerability/>

--- a/scenarios/examples/services_utilities_examples/2_apache_servers_one_with_mysql.xml
+++ b/scenarios/examples/services_utilities_examples/2_apache_servers_one_with_mysql.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>apache_server_with_mysql</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<service module_path="modules/services/unix/database/mysql"/>
 		<service module_path="modules/services/unix/http/apache"/>
@@ -16,7 +16,7 @@

 	<system>
 		<system_name>apache_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<service module_path="modules/services/unix/http/apache"/>

--- a/scenarios/examples/services_utilities_examples/apache_service.xml
+++ b/scenarios/examples/services_utilities_examples/apache_service.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>apache_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<service module_path="modules/services/unix/http/apache"/>

--- a/scenarios/examples/services_utilities_examples/clean_system_with_update_unix.xml
+++ b/scenarios/examples/services_utilities_examples/clean_system_with_update_unix.xml
@@ -7,7 +7,7 @@
  <!-- an example of a clean and updated linux system -->
  <system>
    <system_name>clean_system_with_update</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <utility module_path="modules/utilities/unix/update/unix_update"/>

--- a/scenarios/examples/services_utilities_examples/firewall_configuration_example.xml
+++ b/scenarios/examples/services_utilities_examples/firewall_configuration_example.xml
@@ -7,7 +7,7 @@
  <!-- an example remote storage system, with a remotely exploitable vulnerability that can then be escalated to root -->
  <system>
    <system_name>firewall_configuration_example</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <utility module_path="modules/utilities/unix/firewall/firewall"/>

--- a/scenarios/examples/services_utilities_examples/irc_service.xml
+++ b/scenarios/examples/services_utilities_examples/irc_service.xml
@@ -6,7 +6,7 @@

  <system>
    <system_name>irc_server</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <service type="irc"/>

--- a/scenarios/examples/services_utilities_examples/java_service.xml
+++ b/scenarios/examples/services_utilities_examples/java_service.xml
@@ -7,7 +7,7 @@
 	<!-- A secure system running java -->
 	<system>
 		<system_name>system_with_java</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<utility module_path="modules/utilities/unix/languages/java"/>

--- a/scenarios/examples/services_utilities_examples/lamp_service.xml
+++ b/scenarios/examples/services_utilities_examples/lamp_service.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>lamp_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<service module_path="modules/services/unix/http/lamp"/>

--- a/scenarios/examples/services_utilities_examples/nginx_service.xml
+++ b/scenarios/examples/services_utilities_examples/nginx_service.xml
@@ -7,7 +7,7 @@
 	<!-- an example remote storage system, with a remotely exploitable vulnerability that can then be escalated to root -->
 	<system>
 		<system_name>nginx_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<service module_path="modules/services/unix/http/nginx"></service>

--- a/scenarios/examples/services_utilities_examples/ntp_service.xml
+++ b/scenarios/examples/services_utilities_examples/ntp_service.xml
@@ -7,7 +7,7 @@
 	<!-- an example remote storage system, with a remotely exploitable vulnerability that can then be escalated to root -->
 	<system>
 		<system_name>ntp_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<service module_path="modules/services/unix/ntp/ntp"></service>

--- a/scenarios/examples/services_utilities_examples/proftpd_service.xml
+++ b/scenarios/examples/services_utilities_examples/proftpd_service.xml
@@ -7,7 +7,7 @@
 	<!-- An example secure ftp server using the service proftpd -->
 	<system>
 		<system_name>proftpd_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<service module_path="modules/services/unix/ftp/proftpd"></service>

--- a/scenarios/examples/services_utilities_examples/samba_service.xml
+++ b/scenarios/examples/services_utilities_examples/samba_service.xml
@@ -7,7 +7,7 @@
  <!-- A secure samba service -->
  <system>
    <system_name>samba_service</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <service module_path="modules/services/unix/smb/samba"></service>

--- a/scenarios/examples/services_utilities_examples/smbclient_utility.xml
+++ b/scenarios/examples/services_utilities_examples/smbclient_utility.xml
@@ -6,7 +6,7 @@

  <system>
    <system_name>smbclient_utility</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <utility module_path="modules/utilities/unix/smb/smbclient"></utility>

--- a/scenarios/examples/services_utilities_examples/user_test_scenario.xml
+++ b/scenarios/examples/services_utilities_examples/user_test_scenario.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>user_account_module_test</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<utility module_path="modules/utilities/unix/system/accounts"/>

--- a/scenarios/examples/services_utilities_examples/vsftpd_service.xml
+++ b/scenarios/examples/services_utilities_examples/vsftpd_service.xml
@@ -7,7 +7,7 @@
 	<!-- An example secure ftp server using the service vsftpd -->
 	<system>
 		<system_name>vsftpd_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<service module_path="modules/services/unix/ftp/vsftpd"></service>

--- a/scenarios/examples/services_utilities_examples/xfce_desktop.xml
+++ b/scenarios/examples/services_utilities_examples/xfce_desktop.xml
@@ -6,7 +6,7 @@

  <system>
    <system_name>desktop</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <utility module_path=".*xfce"/>
    <utility module_path=".*iceweasel" />
--- a/scenarios/examples/static_IP_address.xml
+++ b/scenarios/examples/static_IP_address.xml
@@ -7,13 +7,13 @@
 	<!-- an example of a system with static IP address resolution. -->
 	<system>
 		<system_name>storage_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 		<network type="private_network" range="172.16.0.0"/>
 	</system>

 	<system>
 		<system_name>another_system</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 		<network type="private_network" range="172.16.0.0"/>
 	</system>

--- a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/readable_shadow.xml
+++ b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/readable_shadow.xml
@@ -7,7 +7,7 @@
  <!-- An example access control misconfiguration, shadow file is readable -->
  <system>
    <system_name>access_control_misconfigurations_readable_shadow</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <vulnerability module_path="vulnerabilities/unix/access_control_misconfigurations/readable_shadow"/>

--- a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/suid_root_nano.xml
+++ b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/suid_root_nano.xml
@@ -7,7 +7,7 @@
  <!-- An example access control misconfiguration, setuid root nano  with a test account -->
  <system>
    <system_name>access_control_misconfigurations_suid_root_nano</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <vulnerability module_path="vulnerabilities/unix/access_control_misconfigurations/suid_root_nano"/>

--- a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/uid_bash_root.xml
+++ b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/uid_bash_root.xml
@@ -7,7 +7,7 @@
  <!-- An example access control misconfiguration, setuid on /bin/bash allows programs to run with root privileges -->
  <system>
    <system_name>access_control_misconfigurations_uid_bash_root</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <vulnerability module_path="vulnerabilities/unix/access_control_misconfigurations/uid_bash_root"/>

--- a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/uid_less_root.xml
+++ b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/uid_less_root.xml
@@ -7,7 +7,7 @@
  <!-- An example access control misconfiguration, setuid on less allows root read access -->
  <system>
    <system_name>access_control_misconfigurations_uid_less_root</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <vulnerability module_path="modules/vulnerabilities/unix/access_control_misconfigurations/uid_less_root"/>

--- a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/uid_vi_root.xml
+++ b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/uid_vi_root.xml
@@ -7,7 +7,7 @@
  <!-- An example access control misconfiguration, setuid on vi allows root read/write access -->
  <system>
    <system_name>access_control_misconfigurations_vi_root</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <vulnerability module_path="vulnerabilities/unix/access_control_misconfigurations/uid_vi_root"/>

--- a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/writable_groups.xml
+++ b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/writable_groups.xml
@@ -7,7 +7,7 @@
 	<!-- An example access control misconfiguration, /etc/groups file is globally writable -->
 	<system>
 		<system_name>access_control_misconfigurations_writable_groups</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<vulnerability module_path="vulnerabilities/unix/access_control_misconfigurations/writable_groups"/>

--- a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/writable_passwd.xml
+++ b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/writable_passwd.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<vulnerability module_path=".*writable_passwd" type="access_control_misconfiguration"/>

--- a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/writable_shadow.xml
+++ b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/writable_shadow.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<vulnerability module_path=".*writable_shadow" type="access_control_misconfiguration"/>

--- a/scenarios/examples/vulnerability_examples/access_control_misconfigurations_uid_vi_root.xml
+++ b/scenarios/examples/vulnerability_examples/access_control_misconfigurations_uid_vi_root.xml
@@ -7,7 +7,7 @@
  <!-- An example access control misconfiguration, allows vi to run as root for any user -->
  <system>
    <system_name>access_control_misconfigurations_vi_root</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <vulnerability module_path="vulnerabilities/unix/access_control_misconfigurations/uid_vi_root"/>

--- a/scenarios/examples/vulnerability_examples/chkrootkit_local_escalation.xml
+++ b/scenarios/examples/vulnerability_examples/chkrootkit_local_escalation.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>new_vuln_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<vulnerability access="remote" privilege="user_rwx" />
 		<vulnerability module_path=".*chkrootkit" />
--- a/scenarios/examples/vulnerability_examples/ctf_module_examples/dc16_amadhj.xml
+++ b/scenarios/examples/vulnerability_examples/ctf_module_examples/dc16_amadhj.xml
@@ -8,7 +8,7 @@
 			username/pw: challenges/password  -->
 	<system>
 		<system_name>reverse_me</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<vulnerability module_path=".*dc16_amadhj.*"/>

--- a/scenarios/examples/vulnerability_examples/ctf_module_examples/hidden_file.xml
+++ b/scenarios/examples/vulnerability_examples/ctf_module_examples/hidden_file.xml
@@ -7,7 +7,7 @@
 	<!-- example usage of the hidden_file CTF challenge module. -->
 	<system>
 		<system_name>a_system</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<vulnerability module_path=".*hidden_file.*">
 			<input into="storage_directory">
--- a/scenarios/examples/vulnerability_examples/ctf_module_examples/symlinks.xml
+++ b/scenarios/examples/vulnerability_examples/ctf_module_examples/symlinks.xml
@@ -6,7 +6,7 @@

  <system>
    <system_name>symlinks</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <vulnerability module_path=".*symlinks" />

--- a/scenarios/examples/vulnerability_examples/ctf_module_examples/two_shell_calls.xml
+++ b/scenarios/examples/vulnerability_examples/ctf_module_examples/two_shell_calls.xml
@@ -6,7 +6,7 @@

  <system>
    <system_name>ssh_leaked_keys</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <vulnerability module_path=".*two_shell_calls"/>

--- a/scenarios/examples/vulnerability_examples/distcc_vulnerability.xml
+++ b/scenarios/examples/vulnerability_examples/distcc_vulnerability.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>distcc_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<vulnerability module_path="vulnerabilities/unix/misc/distcc_exec" />

--- a/scenarios/examples/vulnerability_examples/gitlist_webapp_vulnerability.xml
+++ b/scenarios/examples/vulnerability_examples/gitlist_webapp_vulnerability.xml
@@ -6,7 +6,7 @@

  <system>
    <system_name>file_server</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <vulnerability module_path=".*gitlist_040"/>

--- a/scenarios/examples/vulnerability_examples/moinmoin_195_vulnerabilitiy.xml
+++ b/scenarios/examples/vulnerability_examples/moinmoin_195_vulnerabilitiy.xml
@@ -6,7 +6,7 @@

  <system>
    <system_name>file_server</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <vulnerability module_path="vulnerabilities/unix/webapp/moinmoin_195"/>

--- a/scenarios/examples/vulnerability_examples/nfs_overshare_vulnerability.xml
+++ b/scenarios/examples/vulnerability_examples/nfs_overshare_vulnerability.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>file_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<vulnerability module_path=".*nfs_overshare">
 			<input into="strings_to_leak">
--- a/scenarios/examples/vulnerability_examples/online_store.xml
+++ b/scenarios/examples/vulnerability_examples/online_store.xml
@@ -6,7 +6,7 @@

  <system>
    <system_name>online_store</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <vulnerability module_path=".*onlinestore" />

--- a/scenarios/examples/vulnerability_examples/proftpd_133c_backdoor_vulnerability.xml
+++ b/scenarios/examples/vulnerability_examples/proftpd_133c_backdoor_vulnerability.xml
@@ -7,7 +7,7 @@
  <!-- an example remote linux system with the ProFTPd 1.3.3c backdoor vulnerability -->
  <system>
    <system_name>file_server</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <vulnerability module_path="vulnerabilities/unix/ftp/proftpd_133c_backdoor"/>

--- a/scenarios/examples/vulnerability_examples/samba_symlink_traversal_vulnerability.xml
+++ b/scenarios/examples/vulnerability_examples/samba_symlink_traversal_vulnerability.xml
@@ -7,7 +7,7 @@
  <!-- an example remote storage system running samba, with a misconfiguration vulnerability which enables symlink traversal -->
  <system>
    <system_name>samba_service</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <vulnerability module_path="modules/vulnerabilities/unix/smb/samba_symlink_traversal"/>

--- a/scenarios/examples/vulnerability_examples/setuid_nmap_escalation_vulnerability.xml
+++ b/scenarios/examples/vulnerability_examples/setuid_nmap_escalation_vulnerability.xml
@@ -5,7 +5,7 @@
          xsi:schemaLocation="http://www.github/cliffe/SecGen/scenario">
  <system>
    <system_name>box_with_remote_user_level_vuln_and_setuid_nmap_priv_escalation</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <!--We need a remote user privilege vulnerability so we can escalate to root with setuid_nmap -->
    <vulnerability access="remote" privilege="user_rwx"/>
--- a/scenarios/examples/vulnerability_examples/shellshock_apache_vulnerability.xml
+++ b/scenarios/examples/vulnerability_examples/shellshock_apache_vulnerability.xml
@@ -6,7 +6,7 @@

  <system>
    <system_name>storage_server</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <vulnerability module_path=".*shellshock_apache_cgi.*"/>

--- a/scenarios/examples/vulnerability_examples/shellshock_vulnerability.xml
+++ b/scenarios/examples/vulnerability_examples/shellshock_vulnerability.xml
@@ -6,7 +6,7 @@

  <system>
    <system_name>storage_server</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <vulnerability module_path="modules/vulnerabilities/unix/bash/shellshock"/>

--- a/scenarios/examples/vulnerability_examples/ssh_leaked_keys.xml
+++ b/scenarios/examples/vulnerability_examples/ssh_leaked_keys.xml
@@ -6,7 +6,7 @@

  <system>
    <system_name>ssh_leaked_keys</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <vulnerability module_path="modules/vulnerabilities/unix/system/ssh_leaked_keys"/>

--- a/scenarios/examples/vulnerability_examples/ssh_root_login.xml
+++ b/scenarios/examples/vulnerability_examples/ssh_root_login.xml
@@ -6,7 +6,7 @@

  <system>
    <system_name>ssh_leaked_keys</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>

    <vulnerability module_path=".*ssh_root_login"/>

--- a/scenarios/examples/vulnerability_examples/vsftpd_vulnerability.xml
+++ b/scenarios/examples/vulnerability_examples/vsftpd_vulnerability.xml
@@ -6,7 +6,7 @@

 	<system>
 		<system_name>file_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>

 		<vulnerability software_name="vsftpd"/>

--- a/scenarios/examples/vulnerability_examples/xfce_lightdm_root_login.xml
+++ b/scenarios/examples/vulnerability_examples/xfce_lightdm_root_login.xml
@@ -6,7 +6,7 @@

  <system>
    <system_name>xfce_lightdm_root_login</system_name>
-    <base platform="linux"/>
+    <base platform="linux" distro="Debian 7.8"/>

    <vulnerability module_path=".*xfce_lightdm_root_login"/>

--- a/scenarios/security_audit/team_project_scenario.xml
+++ b/scenarios/security_audit/team_project_scenario.xml
@@ -213,7 +213,7 @@
  <!-- Desktop Client on NIC2 -->
  <system>
    <system_name>desktop</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
    <vulnerability module_path=".*xfce_lightdm_root_login"/>
    <utility module_path=".*iceweasel" />
    <network module_path=".*private_network_2"/>