From 0458ab5e8b049551dc054e986958486d76b86d7a Mon Sep 17 00:00:00 2001
From: Elizabeth Cray <liz@cray.lgbt>
Date: Sun, 1 Oct 2023 20:29:59 -0400
Subject: [PATCH] Move config into secret folder

---
 .gitignore                                        | 3 ++-
 auth/index.php                                    | 2 +-
 auth/setKey.php                                   | 4 ++--
 secret/README.md                                  | 3 +++
 config.json.example => secret/config.json.example | 0
 secret/rsa.php                                    | 2 ++
 6 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 secret/README.md
 rename config.json.example => secret/config.json.example (100%)
 create mode 100644 secret/rsa.php

diff --git a/.gitignore b/.gitignore
index 5411f93..a74ed96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 vendor/
-config.json
+secret/config.json
+secret/*.key
 composer.phar
 DOMAIN_OVERRIDE
 *.log
diff --git a/auth/index.php b/auth/index.php
index 241493b..3f11d49 100644
--- a/auth/index.php
+++ b/auth/index.php
@@ -1,5 +1,5 @@
 <?php
-$config = json_decode(file_get_contents("/var/www/usergen/config.json", true));
+$config = json_decode(file_get_contents("/var/www/usergen/secret/config.json", true));
     ini_set('display_errors', 1);
     ini_set('display_startup_errors', 1);
     error_reporting(E_ALL);
diff --git a/auth/setKey.php b/auth/setKey.php
index 5a0e8c1..f9618d0 100644
--- a/auth/setKey.php
+++ b/auth/setKey.php
@@ -1,6 +1,6 @@
 <?php
 // Create an account and apply SSH key
-$config = json_decode(file_get_contents("/var/www/usergen/config.json", true));
+$config = json_decode(file_get_contents("/var/www/usergen/secret/config.json", true));
 
 function checkParameters($parameterArray){
     $error = false;
@@ -75,4 +75,4 @@ if($UserGenCode != "0"){
 }
 success();
 
-?>
\ No newline at end of file
+?>
diff --git a/secret/README.md b/secret/README.md
new file mode 100644
index 0000000..6d5a025
--- /dev/null
+++ b/secret/README.md
@@ -0,0 +1,3 @@
+# The Secret Folder
+
+This MUST NOT be accessible by normal system users or the web server.
diff --git a/config.json.example b/secret/config.json.example
similarity index 100%
rename from config.json.example
rename to secret/config.json.example
diff --git a/secret/rsa.php b/secret/rsa.php
new file mode 100644
index 0000000..acb6c35
--- /dev/null
+++ b/secret/rsa.php
@@ -0,0 +1,2 @@
+<?php
+?>