From ce19d13ee4e9ae90d4e489d582bef5a67a671263 Mon Sep 17 00:00:00 2001
From: ts <thomashaw@localhost.localdomain>
Date: Mon, 8 Oct 2018 21:01:45 +0100
Subject: [PATCH] webapp secgen_metadata.xml updates

---
 .../unix/webapp/gitlist_040/secgen_metadata.xml        |  8 ++++----
 .../unix/webapp/wordpress_1x/secgen_metadata.xml       |  6 +++++-
 .../unix/webapp/wordpress_2x/secgen_metadata.xml       | 10 +++++++---
 .../unix/webapp/wordpress_3x/secgen_metadata.xml       |  9 ++++++++-
 .../unix/webapp/wordpress_4x/secgen_metadata.xml       | 10 +++++++++-
 5 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/modules/vulnerabilities/unix/webapp/gitlist_040/secgen_metadata.xml b/modules/vulnerabilities/unix/webapp/gitlist_040/secgen_metadata.xml
index 1b0741155..33588d598 100644
--- a/modules/vulnerabilities/unix/webapp/gitlist_040/secgen_metadata.xml
+++ b/modules/vulnerabilities/unix/webapp/gitlist_040/secgen_metadata.xml
@@ -49,14 +49,14 @@
   <msf_module>exploit/linux/http/gitlist_exec</msf_module>
   <hint>Visit the webapp in a browser at: ip:80/gitlist </hint>
 
-  <!--<conflict>-->
-    <!--<name>Stretch</name>-->
-  <!--</conflict>-->
-
   <requires>
     <module_path>.*apache.*</module_path>
   </requires>
 
+  <requires>
+    <module_path>.*mysql.*</module_path>
+  </requires>
+
   <requires>
     <module_path>.*php.*</module_path>
   </requires>
diff --git a/modules/vulnerabilities/unix/webapp/wordpress_1x/secgen_metadata.xml b/modules/vulnerabilities/unix/webapp/wordpress_1x/secgen_metadata.xml
index 92e7eabc9..2600bc2a7 100644
--- a/modules/vulnerabilities/unix/webapp/wordpress_1x/secgen_metadata.xml
+++ b/modules/vulnerabilities/unix/webapp/wordpress_1x/secgen_metadata.xml
@@ -63,11 +63,15 @@
   </requires>
 
   <requires>
-    <module_path>.*/apache.*</module_path>
+    <module_path>.*/apache_wheezy.*</module_path>
   </requires>
 
   <requires>
     <module_path>.*/mysql_wheezy.*</module_path>
   </requires>
 
+  <requires>
+    <module_path>.*/php_wheezy.*</module_path>
+  </requires>
+
 </vulnerability>
diff --git a/modules/vulnerabilities/unix/webapp/wordpress_2x/secgen_metadata.xml b/modules/vulnerabilities/unix/webapp/wordpress_2x/secgen_metadata.xml
index 31cc09a92..8079ea4c9 100644
--- a/modules/vulnerabilities/unix/webapp/wordpress_2x/secgen_metadata.xml
+++ b/modules/vulnerabilities/unix/webapp/wordpress_2x/secgen_metadata.xml
@@ -56,7 +56,7 @@
   </default_input>
 
   <conflict>
-    <name>Wheezy</name>
+    <name>Stretch</name>
   </conflict>
 
   <requires>
@@ -68,11 +68,15 @@
   </requires>
 
   <requires>
-    <module_path>.*/apache.*</module_path>
+    <module_path>.*/apache_wheezy.*</module_path>
   </requires>
 
   <requires>
-    <module_path>.*/mysql_stretch.*</module_path>
+    <module_path>.*/mysql_wheezy.*</module_path>
+  </requires>
+
+  <requires>
+    <module_path>.*/php_wheezy.*</module_path>
   </requires>
 
 </vulnerability>
diff --git a/modules/vulnerabilities/unix/webapp/wordpress_3x/secgen_metadata.xml b/modules/vulnerabilities/unix/webapp/wordpress_3x/secgen_metadata.xml
index 5d35a9d6a..add1e1450 100644
--- a/modules/vulnerabilities/unix/webapp/wordpress_3x/secgen_metadata.xml
+++ b/modules/vulnerabilities/unix/webapp/wordpress_3x/secgen_metadata.xml
@@ -55,6 +55,9 @@
     <generator type="username_generator"/>
   </default_input>
 
+  <conflict>
+    <name>Stretch</name>
+  </conflict>
 
   <requires>
     <module_path>.*/cron</module_path>
@@ -69,11 +72,15 @@
   </requires>
 
   <requires>
-    <module_path>.*/apache.*</module_path>
+    <module_path>.*/apache_wheezy.*</module_path>
   </requires>
 
   <requires>
     <module_path>.*/mysql_wheezy.*</module_path>
   </requires>
 
+  <requires>
+    <module_path>.*/php_wheezy.*</module_path>
+  </requires>
+
 </vulnerability>
diff --git a/modules/vulnerabilities/unix/webapp/wordpress_4x/secgen_metadata.xml b/modules/vulnerabilities/unix/webapp/wordpress_4x/secgen_metadata.xml
index 3a47ead16..71e670698 100644
--- a/modules/vulnerabilities/unix/webapp/wordpress_4x/secgen_metadata.xml
+++ b/modules/vulnerabilities/unix/webapp/wordpress_4x/secgen_metadata.xml
@@ -55,6 +55,10 @@
     <generator type="username_generator"/>
   </default_input>
 
+  <conflict>
+    <name>Wheezy</name>
+  </conflict>
+
   <requires>
     <module_path>.*/puppet_module/wordpress</module_path>
   </requires>
@@ -64,11 +68,15 @@
   </requires>
 
   <requires>
-    <module_path>.*/apache.*</module_path>
+    <module_path>.*/apache_stretch.*</module_path>
   </requires>
 
   <requires>
     <module_path>.*/mysql_stretch.*</module_path>
   </requires>
 
+  <requires>
+    <module_path>.*/php_stretch.*</module_path>
+  </requires>
+
 </vulnerability>