From 78124171a61c4ec16a3d556fa585f0731e2eacfa Mon Sep 17 00:00:00 2001
From: JD <j.davis2344@student.leedsbeckett.ac.uk>
Date: Mon, 20 Mar 2023 19:44:14 +0000
Subject: [PATCH] Successful secgen param tests

---
 .../unix/http/linuxki_rce/manifests/apache.pp         | 11 ++++-------
 .../unix/http/linuxki_rce/manifests/configure.pp      |  6 ++++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/modules/vulnerabilities/unix/http/linuxki_rce/manifests/apache.pp b/modules/vulnerabilities/unix/http/linuxki_rce/manifests/apache.pp
index b103ce21a..73ae60733 100644
--- a/modules/vulnerabilities/unix/http/linuxki_rce/manifests/apache.pp
+++ b/modules/vulnerabilities/unix/http/linuxki_rce/manifests/apache.pp
@@ -4,17 +4,15 @@
 class linuxki_rce::apache {
   Exec { path => ['/bin', '/usr/bin', '/usr/local/bin', '/sbin', '/usr/sbin'] }
 
-  $port = '80' #$secgen_parameters['port'][0]
+  $secgen_parameters = secgen_functions::get_parameters($::base64_inputs_file)
+  $port = $secgen_parameters['port'][0]
 
-  file { '/etc/apache2/sites-enabled/000-default.conf':
+  file { '/etc/apache2/sites-available/000-default.conf':
     ensure => absent,
   }
 
   class { '::apache':
-    default_vhost   => false,
-    default_mods    => ['rewrite'], # php5 via separate module
-    overwrite_ports => false,
-    mpm_module      => 'prefork',
+    default_vhost   => true,
   }
   -> ::apache::vhost { 'linuxki':
     port        => $port,
@@ -46,7 +44,6 @@ class linuxki_rce::apache {
   exec { 'append-directories':
     command   => "grep -qE '<Directory (\/opt\/)>|<Directory (\/var\/www\/)>' /etc/apache2/apache2.conf && echo '' || echo \"${dirmatch}\" | sudo tee -a /etc/apache2/apache2.conf",
   }
-  # restart apache
   -> exec { 'restart-apache-linuxki':
     command   => 'service apache2 restart',
     logoutput => true
diff --git a/modules/vulnerabilities/unix/http/linuxki_rce/manifests/configure.pp b/modules/vulnerabilities/unix/http/linuxki_rce/manifests/configure.pp
index fe943cec1..3fe270888 100644
--- a/modules/vulnerabilities/unix/http/linuxki_rce/manifests/configure.pp
+++ b/modules/vulnerabilities/unix/http/linuxki_rce/manifests/configure.pp
@@ -2,8 +2,10 @@
 # LinuxKI configuration
 #
 class linuxki_rce::configure {
-  $leaked_filenames = ['flagtest'] ##$secgen_parameters['leaked_filenames']
-  $strings_to_leak = ['this is a list of strings that are secrets / flags','another secret'] ##$secgen_parameters['strings_to_leak']
+  $secgen_parameters = secgen_functions::get_parameters($::base64_inputs_file)
+  $leaked_filenames = $secgen_parameters['leaked_filenames']
+
+  $strings_to_leak = $secgen_parameters['strings_to_leak']
 
   Exec { path => ['/bin', '/usr/bin', '/usr/local/bin', '/sbin', '/usr/sbin'] }