1 Commits

Author SHA1 Message Date
02c397bca2 Add Sentry (#127)
Signed-off-by: Luke Tainton <luke@tainton.uk>
2020-08-18 18:32:29 +01:00
5 changed files with 1821 additions and 27 deletions

View File

@@ -13,3 +13,5 @@ OIDC_HOST = ""
OIDC_CLIENT_ID = "" OIDC_CLIENT_ID = ""
OIDC_CLIENT_SECRET = "" OIDC_CLIENT_SECRET = ""
OIDC_DISABLE_SSL = "" OIDC_DISABLE_SSL = ""
SENTRY_ENVIRONMENT = ""

View File

@@ -2,6 +2,7 @@
"require": { "require": {
"ramsey/uuid": "^4.0", "ramsey/uuid": "^4.0",
"vlucas/phpdotenv": "^5.0", "vlucas/phpdotenv": "^5.0",
"jumbojett/openid-connect-php": "^0.9.0" "jumbojett/openid-connect-php": "^0.9.0",
"sentry/sdk": "^2.1"
} }
} }

1785
app/composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -6,6 +6,25 @@
return $version; return $version;
} }
function oidc_set_vars($sub, $uid, $fname, $lname, $email)
{
$_SESSION['uuid'] = $sub;
$_SESSION['username'] = $uid;
$_SESSION['given_name'] = $fname;
$_SESSION['family_name'] = $lname;
$_SESSION['full_name'] = $fname . " " . $lname;
$_SESSION['email'] = $email;
}
function is_signed_in()
{
if (isset($_SESSION['is_signed_in'])) {
return true;
} else {
return false;
}
}
function user_exists($db, $uuid) function user_exists($db, $uuid)
{ {
try { try {
@@ -15,7 +34,7 @@
$sql->setFetchMode(PDO::FETCH_ASSOC); $sql->setFetchMode(PDO::FETCH_ASSOC);
$result = $sql->fetchAll(); $result = $sql->fetchAll();
} catch (PDOException $e) { } catch (PDOException $e) {
$alert = array("danger", "Error during check for user record: " . $e->getMessage()); throw new Exception("Error in user_exists(): " . $e->getMessage());
die(); die();
} }
if (empty($result)) { if (empty($result)) {
@@ -34,7 +53,8 @@
$sql->setFetchMode(PDO::FETCH_ASSOC); $sql->setFetchMode(PDO::FETCH_ASSOC);
$result = $sql->fetchAll(); $result = $sql->fetchAll();
} catch (PDOException $e) { } catch (PDOException $e) {
echo("Error: " . $e->getMessage()); throw new Exception("Error in get_all_users(): " . $e->getMessage());
die();
} }
return $result; return $result;
} }
@@ -50,7 +70,8 @@
$result = $sql->fetchAll(); $result = $sql->fetchAll();
$usr = $result[0]['given_name'] . " " . $result[0]['family_name']; $usr = $result[0]['given_name'] . " " . $result[0]['family_name'];
} catch (PDOException $e) { } catch (PDOException $e) {
echo("Error: " . $e->getMessage()); throw new Exception("Error in get_user_name(): " . $e->getMessage());
die();
} }
return $usr; return $usr;
} }

View File

@@ -7,6 +7,15 @@ require_once __DIR__ . "/../vendor/autoload.php";
$dotenv = Dotenv\Dotenv::createImmutable(__DIR__ . "/.."); $dotenv = Dotenv\Dotenv::createImmutable(__DIR__ . "/..");
$dotenv->load(); $dotenv->load();
// Custom functions
require_once __DIR__ . "/app_functions.php";
// Sentry
Sentry\init([
'dsn' => 'https://8d8f4632fe3e4ec9b005a1b60b660ba5@o435706.ingest.sentry.io/5395475',
'release' => get_version(),
]);
// Database auto-generation // Database auto-generation
if (file_exists("/../includes/install.php")) { if (file_exists("/../includes/install.php")) {
return; return;
@@ -34,25 +43,3 @@ if ($_ENV['OIDC_DISABLE_SSL'] == "true") {
$oidc->setVerifyHost(false); $oidc->setVerifyHost(false);
$oidc->setVerifyPeer(false); $oidc->setVerifyPeer(false);
} }
// Custom functions
require_once __DIR__ . "/app_functions.php";
function oidc_set_vars($sub, $uid, $fname, $lname, $email) {
$_SESSION['uuid'] = $sub;
$_SESSION['username'] = $uid;
$_SESSION['given_name'] = $fname;
$_SESSION['family_name'] = $lname;
$_SESSION['full_name'] = $fname . " " . $lname;
$_SESSION['email'] = $email;
}
function is_signed_in() {
if (isset($_SESSION['is_signed_in'])) {
return true;
} else {
return false;
}
}