From 968fe8b26366f805e744c677c3a6f66a224920fb Mon Sep 17 00:00:00 2001
From: "Z. Cliffe Schreuders" <code.cliffe@schreuders.org>
Date: Tue, 30 Jan 2024 12:15:01 +0000
Subject: [PATCH] Update lab and module conflicts

---
 .../mysql_stretch_compatible/mysql/secgen_metadata.xml   | 9 ++++++++-
 .../mysql_wheezy_compatible/mysql/secgen_metadata.xml    | 8 ++++----
 modules/services/unix/http/lamp/secgen_metadata.xml      | 7 +++++--
 scenarios/labs/introducing_attacks/5_scanning.xml        | 2 +-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/secgen_metadata.xml b/modules/services/unix/database/mysql_stretch_compatible/mysql/secgen_metadata.xml
index 85dad2042..0ef103edc 100644
--- a/modules/services/unix/database/mysql_stretch_compatible/mysql/secgen_metadata.xml
+++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/secgen_metadata.xml
@@ -20,8 +20,15 @@
   <software_license>GPL v2</software_license>
 
   <conflict>
-    <name>.*Wheezy.*</name>
+    <module_path>.*debian_stretch.*</module_path>
   </conflict>
+  <conflict>
+    <module_path>.*kali_light.*</module_path>
+  </conflict>
+  <conflict>
+    <module_path>.*debian_wheezy.*</module_path>
+  </conflict>
+
   <!--Cannot co-exist with other MySQL installations-->
   <conflict>
     <software_name>mysql</software_name>
diff --git a/modules/services/unix/database/mysql_wheezy_compatible/mysql/secgen_metadata.xml b/modules/services/unix/database/mysql_wheezy_compatible/mysql/secgen_metadata.xml
index abadb93bb..dd796136a 100644
--- a/modules/services/unix/database/mysql_wheezy_compatible/mysql/secgen_metadata.xml
+++ b/modules/services/unix/database/mysql_wheezy_compatible/mysql/secgen_metadata.xml
@@ -19,14 +19,14 @@
   <software_name>mysql</software_name>
   <software_license>GPL v2</software_license>
 
-  <conflict>
-    <name>.*Stretch.*</name>
+   <conflict>
+    <module_path>.*debian_stretch.*</module_path>
   </conflict>
   <conflict>
-    <name>.*Buster.*</name>
+    <module_path>.*debian_buster.*</module_path>
   </conflict>
   <conflict>
-    <name>.*Kali.*</name>
+    <module_path>.*kali_light.*</module_path>
   </conflict>
   <!--Cannot co-exist with other MySQL installations-->
   <conflict>
diff --git a/modules/services/unix/http/lamp/secgen_metadata.xml b/modules/services/unix/http/lamp/secgen_metadata.xml
index 635363e39..bdec49295 100644
--- a/modules/services/unix/http/lamp/secgen_metadata.xml
+++ b/modules/services/unix/http/lamp/secgen_metadata.xml
@@ -35,10 +35,13 @@
 
   <!-- FIXME: Currently fails to install PHP on kali and Stretch... -->
   <conflict>
-    <name>Kali</name>
+    <module_path>.*debian_stretch.*</module_path>
   </conflict>
   <conflict>
-    <name>Stretch</name>
+    <module_path>.*debian_buster.*</module_path>
+  </conflict>
+  <conflict>
+    <module_path>.*kali_light.*</module_path>
   </conflict>
 
 </service>
\ No newline at end of file
diff --git a/scenarios/labs/introducing_attacks/5_scanning.xml b/scenarios/labs/introducing_attacks/5_scanning.xml
index c97cc09d0..d5d4f0265 100644
--- a/scenarios/labs/introducing_attacks/5_scanning.xml
+++ b/scenarios/labs/introducing_attacks/5_scanning.xml
@@ -81,7 +81,7 @@ This lab provides an in-depth exploration of scanning techniques. You will learn
       </input>
     </utility>
 
-    <service type="httpd"/>
+    <service type="httpd" module_path=".*/apache$"/>
     <service type="ftp"/>
 
     <network type="private_network">