diff --git a/resources/autoload.php b/resources/autoload.php index 0942efc6..2eb533a1 100644 --- a/resources/autoload.php +++ b/resources/autoload.php @@ -26,5 +26,5 @@ require_once __DIR__ . "/lib/UnityGithub.php"; require_once __DIR__ . "/lib/exceptions/SSOException.php"; -// run init script +require_once __DIR__ . "/config.php"; require __DIR__ . "/init.php"; diff --git a/resources/config.php b/resources/config.php new file mode 100644 index 00000000..ac43e9ed --- /dev/null +++ b/resources/config.php @@ -0,0 +1,5 @@ +exists(); $_SESSION["is_pi"] = $USER->isPI(); - $SEND_PIMESG_TO_ADMINS = $CONFIG["mail"]["send_pimesg_to_admins"]; + $SEND_PIMESG_TO_ADMINS = CONFIG["mail"]["send_pimesg_to_admins"]; $SQL->addLog( $OPERATOR->uid, diff --git a/resources/lib/UnityLDAP.php b/resources/lib/UnityLDAP.php index e34ff6e3..3c22de77 100644 --- a/resources/lib/UnityLDAP.php +++ b/resources/lib/UnityLDAP.php @@ -24,13 +24,7 @@ class UnityLDAP extends ldapConn "top" ); - // string vars for OUs - private $STR_BASEOU; - private $STR_USEROU; - private $STR_GROUPOU; - private $STR_PIGROUPOU; - private $STR_ORGGROUPOU; - private $STR_ADMINGROUP; + private $custom_mappings_path = __DIR__ . "/../../deployment/custom_user_mappings"; // Instance vars for various ldapEntry objects private $baseOU; @@ -40,45 +34,19 @@ class UnityLDAP extends ldapConn private $org_groupOU; private $adminGroup; private $userGroup; - - private $custom_mappings_path; - private $def_user_shell; - public function __construct( - $host, - $dn, - $pass, - $custom_user_mappings, - $base_ou, - $user_ou, - $group_ou, - $pigroup_ou, - $orggroup_ou, - $admin_group, - $user_group_dn, - $def_user_shell - ) { - parent::__construct($host, $dn, $pass); - - $this->STR_BASEOU = $base_ou; - $this->STR_USEROU = $user_ou; - $this->STR_GROUPOU = $group_ou; - $this->STR_PIGROUPOU = $pigroup_ou; - $this->STR_ORGGROUPOU = $orggroup_ou; - $this->STR_ADMINGROUP = $admin_group; - - $this->baseOU = $this->getEntry($base_ou); - $this->userOU = $this->getEntry($user_ou); - $this->groupOU = $this->getEntry($group_ou); - $this->pi_groupOU = $this->getEntry($pigroup_ou); - $this->org_groupOU = $this->getEntry($orggroup_ou); - $this->adminGroup = $this->getEntry($admin_group); - $this->userGroup = $this->getEntry($user_group_dn); - - $this->custom_mappings_path = $custom_user_mappings; - - $this->def_user_shell = $def_user_shell; + public function __construct() + { + parent::__construct(CONFIG["ldap"]["uri"], CONFIG["ldap"]["user"], CONFIG["ldap"]["pass"]); + $this->baseOU = $this->getEntry(CONFIG["ldap"]["basedn"]); + $this->userOU = $this->getEntry(CONFIG["ldap"]["user_ou"]); + $this->groupOU = $this->getEntry(CONFIG["ldap"]["group_ou"]); + $this->pi_groupOU = $this->getEntry(CONFIG["ldap"]["pigroup_ou"]); + $this->org_groupOU = $this->getEntry(CONFIG["ldap"]["orggroup_ou"]); + $this->adminGroup = $this->getEntry(CONFIG["ldap"]["admin_group"]); + $this->userGroup = $this->getEntry(CONFIG["ldap"]["user_group"]); + $this->def_user_shell = CONFIG["ldap"]["def_user_shell"]; } public function getUserOU() @@ -429,24 +397,24 @@ public function getAllOrgGroupsAttributes($attributes) public function getUserEntry($uid) { $uid = ldap_escape($uid, "", LDAP_ESCAPE_DN); - return $this->getEntry(unityLDAP::RDN . "=$uid," . $this->STR_USEROU); + return $this->getEntry(unityLDAP::RDN . "=$uid," . CONFIG["ldap"]["user_ou"]); } public function getGroupEntry($gid) { $gid = ldap_escape($gid, "", LDAP_ESCAPE_DN); - return $this->getEntry(unityLDAP::RDN . "=$gid," . $this->STR_GROUPOU); + return $this->getEntry(unityLDAP::RDN . "=$gid," . CONFIG["ldap"]["group_ou"]); } public function getPIGroupEntry($gid) { $gid = ldap_escape($gid, "", LDAP_ESCAPE_DN); - return $this->getEntry(unityLDAP::RDN . "=$gid," . $this->STR_PIGROUPOU); + return $this->getEntry(unityLDAP::RDN . "=$gid," . CONFIG["ldap"]["pigroup_ou"]); } public function getOrgGroupEntry($gid) { $gid = ldap_escape($gid, "", LDAP_ESCAPE_DN); - return $this->getEntry(unityLDAP::RDN . "=$gid," . $this->STR_ORGGROUPOU); + return $this->getEntry(unityLDAP::RDN . "=$gid," . CONFIG["ldap"]["orggroup_ou"]); } } diff --git a/resources/lib/UnityMailer.php b/resources/lib/UnityMailer.php index c976f30f..9a8d4756 100644 --- a/resources/lib/UnityMailer.php +++ b/resources/lib/UnityMailer.php @@ -10,8 +10,8 @@ */ class UnityMailer extends PHPMailer { - private $template_dir; // location of all email templates - private $override_template_dir; + private $template_dir = __DIR__ . "/../mail"; // location of all email templates + private $override_template_dir = __DIR__ . "/../../deployment/mail_overrides"; private $MSG_LINKREF; private $MSG_SENDER_EMAIL; @@ -23,38 +23,31 @@ class UnityMailer extends PHPMailer private $MSG_PI_APPROVAL_EMAIL; private $MSG_PI_APPROVAL_NAME; - public function __construct( - $template_dir, - $override_template_dir, - $hostname, - $port, - $security, - $user, - $pass, - $ssl_verify, - $msg_linkref, - $msg_sender_email, - $msg_sender_name, - $msg_support_email, - $msg_support_name, - $msg_admin_email, - $msg_admin_name, - $msg_pi_approval_email, - $msg_pi_approval_name - ) { + public function __construct() + { parent::__construct(); $this->isSMTP(); - if (empty($hostname)) { + $this->MSG_LINKREF = CONFIG["site"]["url"] . CONFIG["site"]["prefix"]; + $this->MSG_SENDER_EMAIL = CONFIG["mail"]["sender"]; + $this->MSG_SENDER_NAME = CONFIG["mail"]["sender_name"]; + $this->MSG_SUPPORT_EMAIL = CONFIG["mail"]["support"]; + $this->MSG_SUPPORT_NAME = CONFIG["mail"]["support_name"]; + $this->MSG_ADMIN_EMAIL = CONFIG["mail"]["admin"]; + $this->MSG_ADMIN_NAME = CONFIG["mail"]["admin_name"]; + $this->MSG_PI_APPROVAL_EMAIL = CONFIG["mail"]["pi_approve"]; + $this->MSG_PI_APPROVAL_NAME = CONFIG["mail"]["pi_approve_name"]; + if (empty(CONFIG["smtp"]["host"])) { throw new Exception("SMTP server hostname not set"); } - $this->Host = $hostname; + $this->Host = CONFIG["smtp"]["host"]; - if (empty($port)) { + if (empty(CONFIG["smtp"]["port"])) { throw new Exception("SMTP server port not set"); } - $this->Port = $port; + $this->Port = CONFIG["smtp"]["port"]; + $security = CONFIG["smtp"]["security"]; $security_conf_valid = empty($security) || $security == "tls" || $security == "ssl"; if (!$security_conf_valid) { throw new Exception( @@ -63,18 +56,18 @@ public function __construct( } $this->SMTPSecure = $security; - if (!empty($user)) { + if (!empty(CONFIG["smtp"]["user"])) { $this->SMTPAuth = true; - $this->Username = $user; + $this->Username = CONFIG["smtp"]["user"]; } else { $this->SMTPAuth = false; } - if (!empty($pass)) { - $this->Password = $pass; + if (!empty(CONFIG["smtp"]["pass"])) { + $this->Password = CONFIG["smtp"]["pass"]; } - if ($ssl_verify == "false") { + if (CONFIG["smtp"]["ssl_verify"] == "false") { $this->SMTPOptions = array( 'ssl' => array( 'verify_peer' => false, @@ -83,19 +76,6 @@ public function __construct( ) ); } - - $this->template_dir = $template_dir; - $this->override_template_dir = $override_template_dir; - - $this->MSG_LINKREF = $msg_linkref; - $this->MSG_SENDER_EMAIL = $msg_sender_email; - $this->MSG_SENDER_NAME = $msg_sender_name; - $this->MSG_SUPPORT_EMAIL = $msg_support_email; - $this->MSG_SUPPORT_NAME = $msg_support_name; - $this->MSG_ADMIN_EMAIL = $msg_admin_email; - $this->MSG_ADMIN_NAME = $msg_admin_name; - $this->MSG_PI_APPROVAL_EMAIL = $msg_pi_approval_email; - $this->MSG_PI_APPROVAL_NAME = $msg_pi_approval_name; } public function sendMail($recipients, $template = null, $data = null) diff --git a/resources/lib/UnityRedis.php b/resources/lib/UnityRedis.php index 5a467445..4dcf6693 100644 --- a/resources/lib/UnityRedis.php +++ b/resources/lib/UnityRedis.php @@ -11,8 +11,10 @@ class UnityRedis private $enabled; - public function __construct($host, $port) + public function __construct() { + $host = @CONFIG["redis"]["host"] ?? ""; + $port = @CONFIG["redis"]["port"] ?? ""; if (empty($host)) { $this->enabled = false; } else { diff --git a/resources/lib/UnitySQL.php b/resources/lib/UnitySQL.php index f623c895..dad0e0bd 100644 --- a/resources/lib/UnitySQL.php +++ b/resources/lib/UnitySQL.php @@ -24,9 +24,13 @@ class UnitySQL private $conn; - public function __construct($db_host, $db, $db_user, $db_pass) + public function __construct() { - $this->conn = new PDO("mysql:host=" . $db_host . ";dbname=" . $db, $db_user, $db_pass); + $this->conn = new PDO( + "mysql:host=" . CONFIG["sql"]["host"] . ";dbname=" . CONFIG["sql"]["dbname"], + CONFIG["sql"]["user"], + CONFIG["sql"]["pass"] + ); $this->conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); } diff --git a/resources/lib/UnityWebhook.php b/resources/lib/UnityWebhook.php index c2fd5749..3f479eb2 100644 --- a/resources/lib/UnityWebhook.php +++ b/resources/lib/UnityWebhook.php @@ -4,24 +4,16 @@ class UnityWebhook { - private $template_dir; - private $override_template_dir; - private $url; + private $template_dir = __DIR__ . "/../mail"; + private $override_template_dir = __DIR__ . "/../../deployment/mail_overrides"; + private $url = CONFIG["webhook"]["url"]; private $MSG_LINKREF; private $Subject; // set by template - public function __construct( - $template_dir, - $override_template_dir, - $url, - $msg_linkref - ) { - $this->template_dir = $template_dir; - $this->override_template_dir = $override_template_dir; - $this->url = $url; - $this->MSG_LINKREF = $msg_linkref; + public function __construct() + { + $this->MSG_LINKREF = CONFIG["site"]["url"] . CONFIG["site"]["prefix"]; } - public function htmlToMarkdown($html) { // Define regex patterns for each markdown format diff --git a/resources/templates/footer.php b/resources/templates/footer.php index 9c74c223..e5cd3d2c 100644 --- a/resources/templates/footer.php +++ b/resources/templates/footer.php @@ -4,13 +4,13 @@
- "; } ?> @@ -19,20 +19,20 @@
Unity Web Portal Version - "> - + "> +  | - ">Terms of Service + ">Terms of Service
- - - - + + + + diff --git a/resources/templates/header.php b/resources/templates/header.php index adb42b3a..496c79f1 100644 --- a/resources/templates/header.php +++ b/resources/templates/header.php @@ -8,7 +8,7 @@ && (@$_POST["form_type"] ?? null) == "clearView" ) { unset($_SESSION["viewUser"]); - UnitySite::redirect($CONFIG["site"]["prefix"] . "/admin/user-mgmt.php"); + UnitySite::redirect(CONFIG["site"]["prefix"] . "/admin/user-mgmt.php"); } // Webroot files need to handle their own POSTs before loading the header // so that they can do UnitySite::badRequest before anything else has been printed. @@ -16,7 +16,7 @@ // header also needs to handle POST data. So this header does the PRG redirect // for all pages. unset($_POST); // unset ensures that header must not come before POST handling - UnitySite::redirect($CONFIG["site"]["prefix"] . $_SERVER['REQUEST_URI']); + UnitySite::redirect(CONFIG["site"]["prefix"] . $_SERVER['REQUEST_URI']); } if (isset($SSO)) { @@ -24,7 +24,7 @@ !$_SESSION["user_exists"] && !str_ends_with($_SERVER['PHP_SELF'], "/panel/new_account.php") ) { - UnitySite::redirect($CONFIG["site"]["prefix"] . "/panel/new_account.php"); + UnitySite::redirect(CONFIG["site"]["prefix"] . "/panel/new_account.php"); } } @@ -41,7 +41,7 @@ $var_value) { + foreach (CONFIG["colors"] as $var_name => $var_value) { echo "--$var_name: $var_value;"; } echo "}"; @@ -49,7 +49,7 @@ @@ -60,20 +60,20 @@ ?> - "> + "> - <?php echo $CONFIG["site"]["name"]; ?> + <?php echo CONFIG["site"]["name"]; ?>
/assets/"> + src="/assets/"> @@ -81,14 +81,14 @@
- +
diff --git a/test/phpunit-bootstrap.php b/test/phpunit-bootstrap.php index 6aba6af2..fd167e28 100644 --- a/test/phpunit-bootstrap.php +++ b/test/phpunit-bootstrap.php @@ -14,7 +14,6 @@ require_once __DIR__ . "/../resources/lib/UnityMailer.php"; require_once __DIR__ . "/../resources/lib/UnitySSO.php"; require_once __DIR__ . "/../resources/lib/UnitySite.php"; -require_once __DIR__ . "/../resources/lib/UnityConfig.php"; require_once __DIR__ . "/../resources/lib/UnityWebhook.php"; require_once __DIR__ . "/../resources/lib/UnityRedis.php"; require_once __DIR__ . "/../resources/lib/UnityGithub.php"; @@ -64,7 +63,7 @@ function switchUser( string $mail, string|null $session_id = null ): void { - global $CONFIG, $REDIS, $LDAP, $SQL, $MAILER, $WEBHOOK, $GITHUB, $SITE, $SSO, $OPERATOR, $USER, $SEND_PIMESG_TO_ADMINS, $LOC_HEADER, $LOC_FOOTER; + global $REDIS, $LDAP, $SQL, $MAILER, $WEBHOOK, $GITHUB, $SITE, $SSO, $OPERATOR, $USER, $SEND_PIMESG_TO_ADMINS, $LOC_HEADER, $LOC_FOOTER; session_write_close(); if (is_null($session_id)) { session_id(str_replace(["_", "@", "."], "-", uniqid($eppn . "_"))); @@ -83,7 +82,7 @@ function switchUser( function http_post(string $phpfile, array $post_data): void { - global $CONFIG, $REDIS, $LDAP, $SQL, $MAILER, $WEBHOOK, $GITHUB, $SITE, $SSO, $OPERATOR, $USER, $SEND_PIMESG_TO_ADMINS, $LOC_HEADER, $LOC_FOOTER; + global $REDIS, $LDAP, $SQL, $MAILER, $WEBHOOK, $GITHUB, $SITE, $SSO, $OPERATOR, $USER, $SEND_PIMESG_TO_ADMINS, $LOC_HEADER, $LOC_FOOTER; $_PREVIOUS_SERVER = $_SERVER; $_SERVER["REQUEST_METHOD"] = "POST"; $_SERVER["PHP_SELF"] = preg_replace("/.*webroot\//", "/", $phpfile); @@ -106,7 +105,7 @@ function http_post(string $phpfile, array $post_data): void function http_get(string $phpfile, array $get_data = array()): void { - global $CONFIG, $REDIS, $LDAP, $SQL, $MAILER, $WEBHOOK, $GITHUB, $SITE, $SSO, $OPERATOR, $USER, $SEND_PIMESG_TO_ADMINS, $LOC_HEADER, $LOC_FOOTER; + global $REDIS, $LDAP, $SQL, $MAILER, $WEBHOOK, $GITHUB, $SITE, $SSO, $OPERATOR, $USER, $SEND_PIMESG_TO_ADMINS, $LOC_HEADER, $LOC_FOOTER; $_PREVIOUS_SERVER = $_SERVER; $_SERVER["REQUEST_METHOD"] = "GET"; $_SERVER["PHP_SELF"] = preg_replace("/.*webroot\//", "/", $phpfile); diff --git a/webroot/admin/content.php b/webroot/admin/content.php index d0821e07..9cab5ba8 100644 --- a/webroot/admin/content.php +++ b/webroot/admin/content.php @@ -51,7 +51,7 @@ .catch(error => { console.error(error) }); - const prefix = ''; + const prefix = ''; $("#pageForm > select[name=pageSel]").change(function(e) { $.ajax({ url: `${prefix}/admin/ajax/get_page_contents.php?pageid=` + $(this).val(), diff --git a/webroot/admin/pi-mgmt.php b/webroot/admin/pi-mgmt.php index efcf798f..86edbd0a 100644 --- a/webroot/admin/pi-mgmt.php +++ b/webroot/admin/pi-mgmt.php @@ -135,7 +135,7 @@ class="filterSearch" } }); - var ajax_url = "/admin/ajax/get_group_members.php?gid="; + var ajax_url = "/admin/ajax/get_group_members.php?gid="; getPage($CONFIG["page"]["home"])["content"]; +echo $SQL->getPage(CONFIG["page"]["home"])["content"]; ?>

Cluster Notices

diff --git a/webroot/panel/account.php b/webroot/panel/account.php index 7eac043f..d8a51c93 100644 --- a/webroot/panel/account.php +++ b/webroot/panel/account.php @@ -204,7 +204,7 @@
@@ -69,7 +69,7 @@ function generateKey(type) { var endingSection = ""; $.ajax({ - url: "/js/ajax/ssh_generate.php?type=" + type, + url: "/js/ajax/ssh_generate.php?type=" + type, success: function(result) { var pubKey = result.substr(result.indexOf(pubSection) + pubSection.length, result.indexOf(endingSection) - result.indexOf(pubSection) - pubSection.length); @@ -98,7 +98,7 @@ function generateKey(type) { $("textarea[name=key]").on("input", function() { var key = $(this).val(); $.ajax({ - url: "/js/ajax/ssh_validate.php", + url: "/js/ajax/ssh_validate.php", type: "POST", data: { key: key diff --git a/webroot/panel/modal/new_pi.php b/webroot/panel/modal/new_pi.php index 9394be5e..53368e96 100644 --- a/webroot/panel/modal/new_pi.php +++ b/webroot/panel/modal/new_pi.php @@ -6,7 +6,7 @@
/panel/groups.php" + action="/panel/groups.php" >
@@ -19,7 +19,7 @@