Skip to content

Wallos: Open-source, self-hostable personal subscription tracker. Visualize your recurring expenses, manage your budget, and save money.

Add declarative OIDC (#1056)

Ali Khattabb9567c3d2ecc
diff --git a/README.md b/README.md
index 0126a81..2d4aa69 100644
--- a/README.md
+++ b/README.md
@@ -212,6 +212,27 @@ If you want to trigger an Update of the exchange rates, change your main currenc
## OIDC
OIDC can be enabled on the Admin page and can be used with providers that support OAuth.
+Wallos can also resolve OIDC settings declaratively from environment variables. When an `OIDC_*` variable is set, it overrides the corresponding database value at runtime without rewriting the database.
+
+If `OIDC_ISSUER` is set, Wallos will fetch `/.well-known/openid-configuration` at runtime and use discovery for the authorization, token, and user info endpoints unless a more specific endpoint variable is also set.
+
+| Environment Variable | UI Equivalent |
+| --- | --- |
+| `OIDC_ENABLED` | `Enable OIDC/OAuth` |
+| `OIDC_PROVIDER_NAME` | `Provider Name` |
+| `OIDC_CLIENT_ID` | `Client ID` |
+| `OIDC_CLIENT_SECRET` | `Client Secret` |
+| `OIDC_CLIENT_SECRET_FILE` | `Client Secret` |
+| `OIDC_ISSUER` | No direct UI field |
+| `OIDC_AUTH_URL` | `Auth URL` |
+| `OIDC_TOKEN_URL` | `Token URL` |
+| `OIDC_USERINFO_URL` | `User Info URL` |
+| `OIDC_REDIRECT_URL` | `Redirect URL` |
+| `OIDC_LOGOUT_URL` | `Logout URL` |
+| `OIDC_USER_IDENTIFIER` | `User Identifier Field` |
+| `OIDC_SCOPES` | `Scopes` |
+| `OIDC_AUTO_CREATE_USER` | `Create user automatically` |
+| `OIDC_DISABLE_PASSWORD_LOGIN` | `Disable password login` |
## API Documentation
diff --git a/admin.php b/admin.php
index 55bde19..0fa901b 100644
--- a/admin.php
+++ b/admin.php
@@ -1,5 +1,6 @@
<?php
require_once 'includes/header.php';
+require_once 'includes/oidc_settings.php';
if ($isAdmin != 1) {
header('Location: index.php');
@@ -11,32 +12,14 @@ $stmt = $db->prepare('SELECT * FROM admin');
$result = $stmt->execute();
$settings = $result->fetchArray(SQLITE3_ASSOC);
-// get OIDC settings
-$stmt = $db->prepare('SELECT * FROM oauth_settings WHERE id = 1');
-$result = $stmt->execute();
-$oidcSettings = $result->fetchArray(SQLITE3_ASSOC);
-
-if ($oidcSettings === false) {
- // Table is empty or no row with id=1, set defaults
- $oidcSettings = [
- 'name' => '',
- 'client_id' => '',
- 'client_secret' => '',
- 'authorization_url' => '',
- 'token_url' => '',
- 'user_info_url' => '',
- 'redirect_url' => '',
- 'logout_url' => '',
- 'user_identifier_field' => 'sub',
- 'scopes' => 'openid email profile',
- 'auth_style' => 'auto',
- 'auto_create_user' => 0,
- 'password_login_disabled' => 0,
- 'require_email_verified' => 1
- ];
-} else {
- // Column added via ALTER TABLE may return NULL for existing rows in SQLite
- $oidcSettings['require_email_verified'] = $oidcSettings['require_email_verified'] ?? 1;
+$oidcConfiguration = wallos_get_effective_oidc_configuration($db);
+$oidcSettings = $oidcConfiguration['settings'];
+$oidcManagedFields = $oidcConfiguration['managed_fields'];
+$oidcNotes = $oidcConfiguration['notes'];
+
+function oidc_input_attrs($field, $managedFields)
+{
+ return isset($managedFields[$field]) ? 'disabled data-managed-by="' . htmlspecialchars($managedFields[$field]) . '"' : '';
}
// get user accounts
@@ -219,61 +202,64 @@ $loginDisabledAllowed = $userCount == 1 && $settings['registrations_open'] == 0;
</header>
<div class="admin-form">
<div class="form-group-inline">
- <input type="checkbox" id="oidcEnabled" <?= $settings['oidc_oauth_enabled'] ? 'checked' : '' ?>
+ <input type="checkbox" id="oidcEnabled" <?= $oidcConfiguration['enabled'] ? 'checked' : '' ?>
+ <?= oidc_input_attrs('enabled', $oidcManagedFields) ?>
onchange="toggleOidcEnabled()" />
<label for="oidcEnabled"><?= translate('oidc_oauth_enabled', $i18n) ?></label>
</div>
<div class="form-group">
<input type="text" id="oidcName" placeholder="Provider Name" autocomplete="off"
- value="<?= htmlspecialchars($oidcSettings['name']) ?>" />
+ value="<?= htmlspecialchars($oidcSettings['name']) ?>" <?= oidc_input_attrs('name', $oidcManagedFields) ?> />
</div>
<div class="form-group">
<input type="text" id="oidcClientId" placeholder="Client ID" autocomplete="off"
- value="<?= htmlspecialchars($oidcSettings['client_id']) ?>" />
+ value="<?= htmlspecialchars($oidcSettings['client_id']) ?>" <?= oidc_input_attrs('client_id', $oidcManagedFields) ?> />
</div>
<div class="form-group">
<input type="text" id="oidcClientSecret" placeholder="Client Secret" autocomplete="off"
- value="<?= htmlspecialchars($oidcSettings['client_secret']) ?>" />
+ value="<?= htmlspecialchars($oidcSettings['client_secret']) ?>" <?= oidc_input_attrs('client_secret', $oidcManagedFields) ?> />
</div>
<div class="form-group">
<input type="text" id="oidcAuthUrl" placeholder="Auth URL" autocomplete="off"
- value="<?= htmlspecialchars($oidcSettings['authorization_url']) ?>" />
+ value="<?= htmlspecialchars($oidcSettings['authorization_url']) ?>" <?= oidc_input_attrs('authorization_url', $oidcManagedFields) ?> />
</div>
<div class="form-group">
<input type="text" id="oidcTokenUrl" placeholder="Token URL" autocomplete="off"
- value="<?= htmlspecialchars($oidcSettings['token_url']) ?>" />
+ value="<?= htmlspecialchars($oidcSettings['token_url']) ?>" <?= oidc_input_attrs('token_url', $oidcManagedFields) ?> />
</div>
<div class="form-group">
<input type="text" id="oidcUserInfoUrl" placeholder="User Info URL" autocomplete="off"
- value="<?= htmlspecialchars($oidcSettings['user_info_url']) ?>" />
+ value="<?= htmlspecialchars($oidcSettings['user_info_url']) ?>" <?= oidc_input_attrs('user_info_url', $oidcManagedFields) ?> />
</div>
<div class="form-group">
<input type="text" id="oidcRedirectUrl" placeholder="Redirect URL" autocomplete="off"
- value="<?= htmlspecialchars($oidcSettings['redirect_url']) ?>" />
+ value="<?= htmlspecialchars($oidcSettings['redirect_url']) ?>" <?= oidc_input_attrs('redirect_url', $oidcManagedFields) ?> />
</div>
<div class="form-group">
<input type="text" id="oidcLogoutUrl" placeholder="Logout URL" autocomplete="off"
- value="<?= htmlspecialchars($oidcSettings['logout_url']) ?>" />
+ value="<?= htmlspecialchars($oidcSettings['logout_url']) ?>" <?= oidc_input_attrs('logout_url', $oidcManagedFields) ?> />
</div>
<div class="form-group">
<input type="text" id="oidcUserIdentifierField" placeholder="User Identifier Field" autocomplete="off"
- value="<?= htmlspecialchars($oidcSettings['user_identifier_field']) ?>" />
+ value="<?= htmlspecialchars($oidcSettings['user_identifier_field']) ?>" <?= oidc_input_attrs('user_identifier_field', $oidcManagedFields) ?> />
</div>
<div class="form-group">
<input type="text" id="oidcScopes" placeholder="Scopes" autocomplete="off"
- value="<?= htmlspecialchars($oidcSettings['scopes']) ?>" />
+ value="<?= htmlspecialchars($oidcSettings['scopes']) ?>" <?= oidc_input_attrs('scopes', $oidcManagedFields) ?> />
</div>
<div class="form-group">
<input type="hidden" id="oidcAuthStyle" placeholder="Auth Style" autocomplete="off"
value="<?= htmlspecialchars($oidcSettings['auth_style']) ?>" />
</div>
<div class="form-group-inline">
- <input type="checkbox" id="oidcAutoCreateUser" <?= $oidcSettings['auto_create_user'] ? 'checked' : '' ?> />
+ <input type="checkbox" id="oidcAutoCreateUser" <?= $oidcSettings['auto_create_user'] ? 'checked' : '' ?>
+ <?= oidc_input_attrs('auto_create_user', $oidcManagedFields) ?> />
<label for="oidcAutoCreateUser"><?= translate('create_user_automatically', $i18n) ?></label>
</div>
<div class="form-group-inline">
<input type="checkbox" id="oidcPasswordLoginDisabled"
- <?= $oidcSettings['password_login_disabled'] ? 'checked' : '' ?> />
+ <?= $oidcSettings['password_login_disabled'] ? 'checked' : '' ?>
+ <?= oidc_input_attrs('password_login_disabled', $oidcManagedFields) ?> />
<label for="oidcPasswordLoginDisabled"><?= translate('disable_password_login', $i18n) ?></label>
</div>
<div class="form-group-inline">
@@ -281,6 +267,22 @@ $loginDisabledAllowed = $userCount == 1 && $settings['registrations_open'] == 0;
<?= $oidcSettings['require_email_verified'] ? 'checked' : '' ?> />
<label for="oidcRequireEmailVerified"><?= translate('require_email_verified_linking', $i18n) ?></label>
</div>
+ <?php if (!empty($oidcManagedFields) || !empty($oidcNotes)): ?>
+ <div class="settings-notes">
+ <?php if (!empty($oidcManagedFields)): ?>
+ <p>
+ <i class="fa-solid fa-circle-info"></i>
+ OIDC fields managed by environment variables are shown here but cannot be edited in the UI.
+ </p>
+ <?php endif; ?>
+ <?php foreach ($oidcNotes as $oidcNote): ?>
+ <p>
+ <i class="fa-solid fa-circle-info"></i>
+ <?= htmlspecialchars($oidcNote) ?>
+ </p>
+ <?php endforeach; ?>
+ </div>
+ <?php endif; ?>
<div class="buttons">
<input type="submit" class="thin mobile-grow" value="<?= translate('save', $i18n) ?>"
id="saveOidcSettingsButton" onClick="saveOidcSettingsButton()" />
@@ -546,4 +548,4 @@ $loginDisabledAllowed = $userCount == 1 && $settings['registrations_open'] == 0;
<?php
require_once 'includes/footer.php';
-?>
\ No newline at end of file
+?>
diff --git a/api/admin/get_oidc_settings.php b/api/admin/get_oidc_settings.php
index 8ce87ca..6022bf5 100644
--- a/api/admin/get_oidc_settings.php
+++ b/api/admin/get_oidc_settings.php
@@ -36,6 +36,7 @@ Example response:
*/
require_once '../../includes/connect_endpoint.php';
+require_once '../../includes/oidc_settings.php';
header('Content-Type: application/json; charset=UTF-8');
@@ -82,20 +83,16 @@ if ($_SERVER["REQUEST_METHOD"] === "POST" || $_SERVER["REQUEST_METHOD"] === "GET
exit;
}
- $sql = "SELECT * FROM 'oauth_settings' WHERE id = 1";
- $stmt = $db->prepare($sql);
- $result = $stmt->execute();
- $oidc_settings = $result->fetchArray(SQLITE3_ASSOC);
-
- if ($oidc_settings) {
- unset($oidc_settings['id']);
- }
+ $oidcConfiguration = wallos_get_effective_oidc_configuration($db);
+ $oidc_settings = $oidcConfiguration['settings'];
$response = [
"success" => true,
"title" => "oidc_settings",
"oidc_settings" => $oidc_settings,
- "notes" => []
+ "oidc_enabled" => $oidcConfiguration['enabled'],
+ "managed_fields" => $oidcConfiguration['managed_fields'],
+ "notes" => $oidcConfiguration['notes']
];
echo json_encode($response);
@@ -111,4 +108,4 @@ if ($_SERVER["REQUEST_METHOD"] === "POST" || $_SERVER["REQUEST_METHOD"] === "GET
exit;
}
-?>
\ No newline at end of file
+?>
diff --git a/api/admin/set_disable_password_login.php b/api/admin/set_disable_password_login.php
index c88afb7..2a03723 100644
--- a/api/admin/set_disable_password_login.php
+++ b/api/admin/set_disable_password_login.php
@@ -19,6 +19,7 @@ Example response:
*/
require_once '../../includes/connect_endpoint.php';
+require_once '../../includes/oidc_settings.php';
header('Content-Type: application/json; charset=UTF-8');
@@ -78,6 +79,15 @@ if (!in_array($disable, ['0', '1'], true)) {
exit;
}
+if (wallos_has_oidc_env_value('OIDC_DISABLE_PASSWORD_LOGIN')) {
+ echo json_encode([
+ 'success' => false,
+ 'title' => 'Managed by environment',
+ 'message' => 'Password login is managed by the OIDC_DISABLE_PASSWORD_LOGIN environment variable.'
+ ]);
+ exit;
+}
+
// Update the password_login_disabled setting
$updateSql = "UPDATE oauth_settings SET password_login_disabled = :disable WHERE id = 1";
$updateStmt = $db->prepare($updateSql);
diff --git a/docker-compose.yaml b/docker-compose.yaml
index aee3dbc..032edce 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -6,6 +6,22 @@ services:
- "8282:80/tcp"
environment:
TZ: 'America/Toronto'
+ # Optional OIDC environment variables
+ # OIDC_ENABLED: "true"
+ # OIDC_PROVIDER_NAME: "Authelia"
+ # OIDC_CLIENT_ID: "wallos"
+ # OIDC_CLIENT_SECRET: "replace-me"
+ # OIDC_CLIENT_SECRET_FILE: "/run/secrets/wallos_oidc_secret"
+ # OIDC_ISSUER: "https://auth.example.com"
+ # OIDC_AUTH_URL: "https://auth.example.com/oauth2/authorize"
+ # OIDC_TOKEN_URL: "https://auth.example.com/oauth2/token"
+ # OIDC_USERINFO_URL: "https://auth.example.com/oauth2/userinfo"
+ # OIDC_REDIRECT_URL: "https://wallos.example.com/index.php"
+ # OIDC_LOGOUT_URL: "https://auth.example.com/logout"
+ # OIDC_USER_IDENTIFIER: "sub"
+ # OIDC_SCOPES: "openid email profile"
+ # OIDC_AUTO_CREATE_USER: "true"
+ # OIDC_DISABLE_PASSWORD_LOGIN: "false"
# Volumes store your data between container upgrades
volumes:
- './db:/var/www/html/db'
diff --git a/endpoints/admin/enableoidc.php b/endpoints/admin/enableoidc.php
index 79b4a33..72fe99c 100644
--- a/endpoints/admin/enableoidc.php
+++ b/endpoints/admin/enableoidc.php
@@ -2,12 +2,20 @@
require_once '../../includes/connect_endpoint.php';
require_once '../../includes/validate_endpoint_admin.php';
+require_once '../../includes/oidc_settings.php';
$postData = file_get_contents("php://input");
$data = json_decode($postData, true);
$oidcEnabled = isset($data['oidcEnabled']) ? $data['oidcEnabled'] : 0;
+if (wallos_has_oidc_env_value('OIDC_ENABLED')) {
+ die(json_encode([
+ "success" => false,
+ "message" => "OIDC enablement is managed by the OIDC_ENABLED environment variable."
+ ]));
+}
+
$stmt = $db->prepare('UPDATE admin SET oidc_oauth_enabled = :oidcEnabled WHERE id = 1');
$stmt->bindParam(':oidcEnabled', $oidcEnabled, SQLITE3_INTEGER);
$stmt->execute();
@@ -22,4 +30,4 @@ if ($db->changes() > 0) {
"success" => false,
"message" => translate('error', $i18n)
]));
-}
\ No newline at end of file
+}
diff --git a/endpoints/admin/saveoidcsettings.php b/endpoints/admin/saveoidcsettings.php
index 55afff0..d111907 100644
--- a/endpoints/admin/saveoidcsettings.php
+++ b/endpoints/admin/saveoidcsettings.php
@@ -3,6 +3,7 @@
require_once '../../includes/connect_endpoint.php';
require_once '../../includes/validate_endpoint_admin.php';
require_once '../../includes/ssrf_helper.php';
+require_once '../../includes/oidc_settings.php';
$postData = file_get_contents("php://input");
$data = json_decode($postData, true);
@@ -22,14 +23,41 @@ $oidcAutoCreateUser = isset($data['oidcAutoCreateUser']) ? (int) $data['oidcAuto
$oidcPasswordLoginDisabled = isset($data['oidcPasswordLoginDisabled']) ? (int) $data['oidcPasswordLoginDisabled'] : 0;
$oidcRequireEmailVerified = isset($data['oidcRequireEmailVerified']) ? (int) $data['oidcRequireEmailVerified'] : 1;
-if ($oidcTokenUrl && validate_oidc_endpoint_url($oidcTokenUrl, $db) === false) {
+$oidcConfiguration = wallos_get_effective_oidc_configuration($db);
+$managedFields = $oidcConfiguration['managed_fields'];
+$dbSettings = wallos_get_db_oidc_settings($db);
+
+$submittedSettings = [
+ 'name' => $oidcName,
+ 'client_id' => $oidcClientId,
+ 'client_secret' => $oidcClientSecret,
+ 'authorization_url' => $oidcAuthUrl,
+ 'token_url' => $oidcTokenUrl,
+ 'user_info_url' => $oidcUserInfoUrl,
+ 'redirect_url' => $oidcRedirectUrl,
+ 'logout_url' => $oidcLogoutUrl,
+ 'user_identifier_field' => $oidcUserIdentifierField,
+ 'scopes' => $oidcScopes,
+ 'auth_style' => $oidcAuthStyle,
+ 'auto_create_user' => $oidcAutoCreateUser,
+ 'password_login_disabled' => $oidcPasswordLoginDisabled,
+ 'require_email_verified' => $oidcRequireEmailVerified,
+];
+
+foreach ($submittedSettings as $field => $value) {
+ if (!isset($managedFields[$field])) {
+ $dbSettings[$field] = $value;
+ }
+}
+
+if ($dbSettings['token_url'] && validate_oidc_endpoint_url($dbSettings['token_url'], $db) === false) {
die(json_encode([
"success" => false,
"message" => "Security Error: Token URL must not target link-local or loopback addresses."
]));
}
-if ($oidcUserInfoUrl && validate_oidc_endpoint_url($oidcUserInfoUrl, $db) === false) {
+if ($dbSettings['user_info_url'] && validate_oidc_endpoint_url($dbSettings['user_info_url'], $db) === false) {
die(json_encode([
"success" => false,
"message" => "Security Error: User Info URL must not target link-local or loopback addresses."
@@ -67,20 +95,20 @@ if ($row['count'] > 0) {
)');
}
-$stmt->bindParam(':oidcName', $oidcName, SQLITE3_TEXT);
-$stmt->bindParam(':oidcClientId', $oidcClientId, SQLITE3_TEXT);
-$stmt->bindParam(':oidcClientSecret', $oidcClientSecret, SQLITE3_TEXT);
-$stmt->bindParam(':oidcAuthUrl', $oidcAuthUrl, SQLITE3_TEXT);
-$stmt->bindParam(':oidcTokenUrl', $oidcTokenUrl, SQLITE3_TEXT);
-$stmt->bindParam(':oidcUserInfoUrl', $oidcUserInfoUrl, SQLITE3_TEXT);
-$stmt->bindParam(':oidcRedirectUrl', $oidcRedirectUrl, SQLITE3_TEXT);
-$stmt->bindParam(':oidcLogoutUrl', $oidcLogoutUrl, SQLITE3_TEXT);
-$stmt->bindParam(':oidcUserIdentifierField', $oidcUserIdentifierField, SQLITE3_TEXT);
-$stmt->bindParam(':oidcScopes', $oidcScopes, SQLITE3_TEXT);
-$stmt->bindParam(':oidcAuthStyle', $oidcAuthStyle, SQLITE3_TEXT);
-$stmt->bindParam(':oidcAutoCreateUser', $oidcAutoCreateUser, SQLITE3_INTEGER);
-$stmt->bindParam(':oidcPasswordLoginDisabled', $oidcPasswordLoginDisabled, SQLITE3_INTEGER);
-$stmt->bindParam(':oidcRequireEmailVerified', $oidcRequireEmailVerified, SQLITE3_INTEGER);
+$stmt->bindValue(':oidcName', $dbSettings['name'], SQLITE3_TEXT);
+$stmt->bindValue(':oidcClientId', $dbSettings['client_id'], SQLITE3_TEXT);
+$stmt->bindValue(':oidcClientSecret', $dbSettings['client_secret'], SQLITE3_TEXT);
+$stmt->bindValue(':oidcAuthUrl', $dbSettings['authorization_url'], SQLITE3_TEXT);
+$stmt->bindValue(':oidcTokenUrl', $dbSettings['token_url'], SQLITE3_TEXT);
+$stmt->bindValue(':oidcUserInfoUrl', $dbSettings['user_info_url'], SQLITE3_TEXT);
+$stmt->bindValue(':oidcRedirectUrl', $dbSettings['redirect_url'], SQLITE3_TEXT);
+$stmt->bindValue(':oidcLogoutUrl', $dbSettings['logout_url'], SQLITE3_TEXT);
+$stmt->bindValue(':oidcUserIdentifierField', $dbSettings['user_identifier_field'], SQLITE3_TEXT);
+$stmt->bindValue(':oidcScopes', $dbSettings['scopes'], SQLITE3_TEXT);
+$stmt->bindValue(':oidcAuthStyle', $dbSettings['auth_style'], SQLITE3_TEXT);
+$stmt->bindValue(':oidcAutoCreateUser', $dbSettings['auto_create_user'], SQLITE3_INTEGER);
+$stmt->bindValue(':oidcPasswordLoginDisabled', $dbSettings['password_login_disabled'], SQLITE3_INTEGER);
+$stmt->bindValue(':oidcRequireEmailVerified', $dbSettings['require_email_verified'], SQLITE3_INTEGER);
$stmt->execute();
if ($db->changes() > 0) {
@@ -95,4 +123,4 @@ if ($db->changes() > 0) {
"success" => false,
"message" => translate('error', $i18n)
]));
-}
\ No newline at end of file
+}
diff --git a/includes/oidc/handle_oidc_callback.php b/includes/oidc/handle_oidc_callback.php
index d18d00b..e08a638 100644
--- a/includes/oidc/handle_oidc_callback.php
+++ b/includes/oidc/handle_oidc_callback.php
@@ -1,5 +1,7 @@
<?php
+require_once __DIR__ . '/../oidc_settings.php';
+
function generate_username_from_email($email)
{
if (!$email || !filter_var($email, FILTER_VALIDATE_EMAIL)) {
@@ -12,10 +14,13 @@ function generate_username_from_email($email)
require_once __DIR__ . '/../ssrf_helper.php';
-// get OIDC settings
-$stmt = $db->prepare('SELECT * FROM oauth_settings WHERE id = 1');
-$result = $stmt->execute();
-$oidcSettings = $result->fetchArray(SQLITE3_ASSOC);
+$oidcConfiguration = wallos_get_effective_oidc_configuration($db);
+if ($oidcConfiguration['enabled'] !== 1 || !$oidcConfiguration['is_configured']) {
+ header("Location: login.php?error=oidc_user_not_found");
+ exit();
+}
+
+$oidcSettings = $oidcConfiguration['settings'];
$tokenUrl = $oidcSettings['token_url'];
$redirectUri = $oidcSettings['redirect_url'];
@@ -149,4 +154,4 @@ if ($userData) {
}
-?>
\ No newline at end of file
+?>
diff --git a/includes/oidc_settings.php b/includes/oidc_settings.php
new file mode 100644
index 0000000..dbcba52
--- /dev/null
+++ b/includes/oidc_settings.php
@@ -0,0 +1,255 @@
+<?php
+
+function wallos_get_oidc_defaults()
+{
+ return [
+ 'name' => '',
+ 'client_id' => '',
+ 'client_secret' => '',
+ 'authorization_url' => '',
+ 'token_url' => '',
+ 'user_info_url' => '',
+ 'redirect_url' => '',
+ 'logout_url' => '',
+ 'user_identifier_field' => 'sub',
+ 'scopes' => 'openid email profile',
+ 'auth_style' => 'auto',
+ 'auto_create_user' => 0,
+ 'password_login_disabled' => 0,
+ 'require_email_verified' => 1,
+ ];
+}
+
+function wallos_get_oidc_env_value($name)
+{
+ $value = getenv($name);
+ if ($value !== false) {
+ return $value;
+ }
+
+ if (array_key_exists($name, $_ENV)) {
+ return $_ENV[$name];
+ }
+
+ if (array_key_exists($name, $_SERVER)) {
+ return $_SERVER[$name];
+ }
+
+ return null;
+}
+
+function wallos_has_oidc_env_value($name)
+{
+ return wallos_get_oidc_env_value($name) !== null;
+}
+
+function wallos_parse_oidc_boolean($value)
+{
+ if (is_bool($value)) {
+ return $value ? 1 : 0;
+ }
+
+ $normalized = strtolower(trim((string) $value));
+ if (in_array($normalized, ['1', 'true', 'yes', 'on'], true)) {
+ return 1;
+ }
+
+ if (in_array($normalized, ['0', 'false', 'no', 'off'], true)) {
+ return 0;
+ }
+
+ return null;
+}
+
+function wallos_get_db_oidc_settings($db)
+{
+ $settings = wallos_get_oidc_defaults();
+
+ $stmt = $db->prepare('SELECT * FROM oauth_settings WHERE id = 1');
+ $result = $stmt->execute();
+ $row = $result ? $result->fetchArray(SQLITE3_ASSOC) : false;
+
+ if ($row) {
+ unset($row['id']);
+ $settings = array_merge($settings, $row);
+ }
+
+ // Column added via ALTER TABLE may return NULL for existing rows in SQLite
+ $settings['require_email_verified'] = $settings['require_email_verified'] ?? 1;
+
+ return $settings;
+}
+
+function wallos_get_db_oidc_enabled($db)
+{
+ $stmt = $db->prepare('SELECT oidc_oauth_enabled FROM admin WHERE id = 1');
+ $result = $stmt->execute();
+ $row = $result ? $result->fetchArray(SQLITE3_ASSOC) : false;
+
+ return $row ? (int) $row['oidc_oauth_enabled'] : 0;
+}
+
+function wallos_fetch_oidc_discovery_document($issuer)
+{
+ $issuer = rtrim(trim((string) $issuer), '/');
+ if ($issuer === '') {
+ return [null, 'OIDC_ISSUER is empty.'];
+ }
+
+ $url = $issuer . '/.well-known/openid-configuration';
+ $ch = curl_init($url);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+ curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
+ curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+ curl_setopt($ch, CURLOPT_MAXREDIRS, 3);
+ curl_setopt($ch, CURLOPT_HTTPHEADER, ['Accept: application/json']);
+ $response = curl_exec($ch);
+ $httpCode = (int) curl_getinfo($ch, CURLINFO_RESPONSE_CODE);
+ $curlError = curl_error($ch);
+ curl_close($ch);
+
+ if ($response === false || $httpCode >= 400) {
+ $error = $curlError !== '' ? $curlError : 'HTTP ' . $httpCode;
+ return [null, 'OIDC discovery failed for ' . $url . ': ' . $error];
+ }
+
+ $document = json_decode($response, true);
+ if (!is_array($document)) {
+ return [null, 'OIDC discovery returned invalid JSON for ' . $url . '.'];
+ }
+
+ return [$document, null];
+}
+
+function wallos_get_effective_oidc_configuration($db)
+{
+ $settings = wallos_get_db_oidc_settings($db);
+ $managedFields = [];
+ $notes = [];
+ $discoveryDocument = null;
+
+ $enabled = wallos_get_db_oidc_enabled($db);
+ if (wallos_has_oidc_env_value('OIDC_ENABLED')) {
+ $parsedEnabled = wallos_parse_oidc_boolean(wallos_get_oidc_env_value('OIDC_ENABLED'));
+ if ($parsedEnabled !== null) {
+ $enabled = $parsedEnabled;
+ $managedFields['enabled'] = 'OIDC_ENABLED';
+ } else {
+ $notes[] = 'Ignoring invalid boolean value in OIDC_ENABLED.';
+ }
+ }
+
+ if (wallos_has_oidc_env_value('OIDC_CLIENT_SECRET_FILE')) {
+ $managedFields['client_secret'] = 'OIDC_CLIENT_SECRET_FILE';
+ $settings['client_secret'] = '';
+ $secretFile = trim((string) wallos_get_oidc_env_value('OIDC_CLIENT_SECRET_FILE'));
+
+ if ($secretFile === '') {
+ $notes[] = 'OIDC_CLIENT_SECRET_FILE is empty.';
+ } elseif (is_readable($secretFile)) {
+ $settings['client_secret'] = rtrim((string) file_get_contents($secretFile), "\r\n");
+ } else {
+ $notes[] = 'OIDC client secret file is not readable: ' . $secretFile;
+ }
+ } elseif (wallos_has_oidc_env_value('OIDC_CLIENT_SECRET')) {
+ $settings['client_secret'] = (string) wallos_get_oidc_env_value('OIDC_CLIENT_SECRET');
+ $managedFields['client_secret'] = 'OIDC_CLIENT_SECRET';
+ }
+
+ if (wallos_has_oidc_env_value('OIDC_AUTO_CREATE_USER')) {
+ $parsedValue = wallos_parse_oidc_boolean(wallos_get_oidc_env_value('OIDC_AUTO_CREATE_USER'));
+ if ($parsedValue !== null) {
+ $settings['auto_create_user'] = $parsedValue;
+ $managedFields['auto_create_user'] = 'OIDC_AUTO_CREATE_USER';
+ } else {
+ $notes[] = 'Ignoring invalid boolean value in OIDC_AUTO_CREATE_USER.';
+ }
+ }
+
+ if (wallos_has_oidc_env_value('OIDC_DISABLE_PASSWORD_LOGIN')) {
+ $parsedValue = wallos_parse_oidc_boolean(wallos_get_oidc_env_value('OIDC_DISABLE_PASSWORD_LOGIN'));
+ if ($parsedValue !== null) {
+ $settings['password_login_disabled'] = $parsedValue;
+ $managedFields['password_login_disabled'] = 'OIDC_DISABLE_PASSWORD_LOGIN';
+ } else {
+ $notes[] = 'Ignoring invalid boolean value in OIDC_DISABLE_PASSWORD_LOGIN.';
+ }
+ }
+
+ if (wallos_has_oidc_env_value('OIDC_ISSUER')) {
+ $issuer = (string) wallos_get_oidc_env_value('OIDC_ISSUER');
+ $managedFields['issuer'] = 'OIDC_ISSUER';
+
+ foreach (['authorization_url', 'token_url', 'user_info_url'] as $field) {
+ $settings[$field] = '';
+ $managedFields[$field] = 'OIDC_ISSUER';
+ }
+
+ if (trim($issuer) !== '') {
+ [$discoveryDocument, $discoveryError] = wallos_fetch_oidc_discovery_document($issuer);
+ if ($discoveryError !== null) {
+ $notes[] = $discoveryError;
+ } elseif ($discoveryDocument !== null) {
+ $discoveryMap = [
+ 'authorization_url' => 'authorization_endpoint',
+ 'token_url' => 'token_endpoint',
+ 'user_info_url' => 'userinfo_endpoint',
+ ];
+
+ foreach ($discoveryMap as $field => $documentField) {
+ if (isset($discoveryDocument[$documentField])) {
+ $settings[$field] = $discoveryDocument[$documentField];
+ }
+ }
+ }
+ } else {
+ $notes[] = 'Ignoring empty OIDC_ISSUER value.';
+ }
+ }
+
+ $envFieldMap = [
+ 'name' => 'OIDC_PROVIDER_NAME',
+ 'client_id' => 'OIDC_CLIENT_ID',
+ 'authorization_url' => 'OIDC_AUTH_URL',
+ 'token_url' => 'OIDC_TOKEN_URL',
+ 'user_info_url' => 'OIDC_USERINFO_URL',
+ 'redirect_url' => 'OIDC_REDIRECT_URL',
+ 'logout_url' => 'OIDC_LOGOUT_URL',
+ 'user_identifier_field' => 'OIDC_USER_IDENTIFIER',
+ 'scopes' => 'OIDC_SCOPES',
+ ];
+
+ foreach ($envFieldMap as $field => $envVar) {
+ if (wallos_has_oidc_env_value($envVar)) {
+ $settings[$field] = (string) wallos_get_oidc_env_value($envVar);
+ $managedFields[$field] = $envVar;
+ }
+ }
+
+ $requiredFields = [
+ 'client_id',
+ 'client_secret',
+ 'authorization_url',
+ 'token_url',
+ 'user_info_url',
+ 'redirect_url',
+ 'user_identifier_field',
+ ];
+ $isConfigured = true;
+ foreach ($requiredFields as $field) {
+ if (trim((string) $settings[$field]) === '') {
+ $isConfigured = false;
+ break;
+ }
+ }
+
+ return [
+ 'enabled' => (int) $enabled,
+ 'settings' => $settings,
+ 'managed_fields' => $managedFields,
+ 'notes' => $notes,
+ 'discovery_document' => $discoveryDocument,
+ 'is_configured' => $isConfigured,
+ ];
+}
diff --git a/login.php b/login.php
index 54d0859..71301e6 100644
--- a/login.php
+++ b/login.php
@@ -1,6 +1,7 @@
<?php
require_once 'includes/connect.php';
require_once 'includes/checkuser.php';
+require_once 'includes/oidc_settings.php';
require_once 'includes/i18n/languages.php';
require_once 'includes/i18n/getlang.php';
@@ -118,50 +119,39 @@ if (isset($_COOKIE['colorTheme'])) {
$colorTheme = $_COOKIE['colorTheme'];
}
-// Check if OIDC is Enabled
+// Check if OIDC is enabled and resolve any environment overrides.
$password_login_disabled = false;
$oidcEnabled = false;
-$oidcQuery = "SELECT oidc_oauth_enabled FROM admin";
-$oidcResult = $db->query($oidcQuery);
-$oidcRow = $oidcResult->fetchArray(SQLITE3_ASSOC);
-if ($oidcRow) {
- $oidcEnabled = $oidcRow['oidc_oauth_enabled'] == 1;
- if ($oidcEnabled) {
- // Fetch OIDC settings
- $oidcSettingsQuery = "SELECT * FROM oauth_settings WHERE id = 1";
- $oidcSettingsResult = $db->query($oidcSettingsQuery);
- $oidcSettings = $oidcSettingsResult->fetchArray(SQLITE3_ASSOC);
- if (!$oidcSettings) {
- $oidcEnabled = false;
- } else {
- $oidc_name = $oidcSettings['name'] ?? '';
- $password_login_disabled = $oidcSettings['password_login_disabled'] == 1;
-
- // Generate a CSRF-protecting state string
- $secondsInMonth = 30 * 24 * 60 * 60;
- if (session_status() === PHP_SESSION_NONE) {
- session_set_cookie_params([
- 'lifetime' => $secondsInMonth,
- 'httponly' => true,
- 'samesite' => 'Lax'
- ]);
- session_start();
- }
- $state = bin2hex(random_bytes(16));
- $_SESSION['oidc_state'] = $state;
-
- // Build the OIDC authorization URL
- $params = http_build_query([
- 'response_type' => 'code',
- 'client_id' => $oidcSettings['client_id'],
- 'redirect_uri' => $oidcSettings['redirect_url'],
- 'scope' => $oidcSettings['scopes'],
- 'state' => $state,
- ]);
-
- $oidc_auth_url = rtrim($oidcSettings['authorization_url'], '?') . '?' . $params;
- }
+$oidcConfiguration = wallos_get_effective_oidc_configuration($db);
+$oidcEnabled = $oidcConfiguration['enabled'] == 1 && $oidcConfiguration['is_configured'];
+if ($oidcEnabled) {
+ $oidcSettings = $oidcConfiguration['settings'];
+ $oidc_name = $oidcSettings['name'] ?? '';
+ $password_login_disabled = (int) $oidcSettings['password_login_disabled'] === 1;
+
+ // Generate a CSRF-protecting state string
+ $secondsInMonth = 30 * 24 * 60 * 60;
+ if (session_status() === PHP_SESSION_NONE) {
+ session_set_cookie_params([
+ 'lifetime' => $secondsInMonth,
+ 'httponly' => true,
+ 'samesite' => 'Lax'
+ ]);
+ session_start();
}
+ $state = bin2hex(random_bytes(16));
+ $_SESSION['oidc_state'] = $state;
+
+ // Build the OIDC authorization URL
+ $params = http_build_query([
+ 'response_type' => 'code',
+ 'client_id' => $oidcSettings['client_id'],
+ 'redirect_uri' => $oidcSettings['redirect_url'],
+ 'scope' => $oidcSettings['scopes'],
+ 'state' => $state,
+ ]);
+
+ $oidc_auth_url = rtrim($oidcSettings['authorization_url'], '?') . '?' . $params;
}
$loginFailed = false;
@@ -464,4 +454,4 @@ if (isset($_GET['error'])) {
</script>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/logout.php b/logout.php
index 9de4727..0e34ad6 100644
--- a/logout.php
+++ b/logout.php
@@ -1,5 +1,6 @@
<?php
require_once 'includes/connect.php';
+require_once 'includes/oidc_settings.php';
$secondsInMonth = 30 * 24 * 60 * 60;
if (session_status() === PHP_SESSION_NONE) {
session_set_cookie_params([
@@ -15,10 +16,8 @@ $logoutOIDC = false;
// Check if user is logged in with OIDC
if (isset($_SESSION['from_oidc']) && $_SESSION['from_oidc'] === true) {
$logoutOIDC = true;
- // get OIDC settings
- $stmt = $db->prepare('SELECT * FROM oauth_settings WHERE id = 1');
- $result = $stmt->execute();
- $oidcSettings = $result->fetchArray(SQLITE3_ASSOC);
+ $oidcConfiguration = wallos_get_effective_oidc_configuration($db);
+ $oidcSettings = $oidcConfiguration['settings'];
$logoutUrl = $oidcSettings['logout_url'] ?? '';
}
@@ -61,4 +60,4 @@ if ($logoutOIDC && !empty($logoutUrl)) {
<body></body>
</html>
<?php
-exit();
\ No newline at end of file
+exit();