mirror/api
1
0
Fork 0
mirror of https://github.com/unraid/api.git synced 2026-01-01 06:01:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: sso unreliable if API outputs more than raw json (#1353)

Browse Source 
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

- **Bug Fixes**
- Enhanced the SSO login process by improving the handling of response
data. This update increases reliability when unexpected response formats
occur during authentication.
- **New Features**
- Introduced a new function for validating user credentials and SSO
tokens, enhancing the login functionality with improved error handling.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
Eli Bosley
2025-04-14 12:10:22 -04:00
committed by GitHub
parent 33ad1fd63b
commit e65775f878
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/unraid-api/unraid-file-modifier/modifications/__test__/snapshots/.login.php.modified.snapshot.php
View File

@@ -33,7 +33,13 @@ function verifyUsernamePasswordAndSSO(string $username, string $password): bool
} }
try { try {
$response = json_decode($output[0], true); // Split on first { and take everything after it
$jsonParts = explode('{', $output[0], 2);
if (count($jsonParts) < 2) {
my_logger("SSO Login Attempt Failed: No JSON found in response");
return false;
}
$response = json_decode('{' . $jsonParts[1], true);
if (isset($response['valid']) && $response['valid'] === true) { if (isset($response['valid']) && $response['valid'] === true) {
return true; return true;
} }

14
api/src/unraid-api/unraid-file-modifier/modifications/patches/sso.patch
View File

@@ -2,7 +2,7 @@ Index: /usr/local/emhttp/plugins/dynamix/include/.login.php
=================================================================== ===================================================================
--- /usr/local/emhttp/plugins/dynamix/include/.login.php original --- /usr/local/emhttp/plugins/dynamix/include/.login.php original
+++ /usr/local/emhttp/plugins/dynamix/include/.login.php modified +++ /usr/local/emhttp/plugins/dynamix/include/.login.php modified
@@ -1,6 +1,51 @@ @@ -1,6 +1,57 @@
<?php <?php
+ +
+ +
@@ -38,7 +38,13 @@ Index: /usr/local/emhttp/plugins/dynamix/include/.login.php
+ } + }
+ +
+ try { + try {
+ $response = json_decode($output[0], true); + // Split on first { and take everything after it
+ $jsonParts = explode('{', $output[0], 2);
+ if (count($jsonParts) < 2) {
+ my_logger("SSO Login Attempt Failed: No JSON found in response");
+ return false;
+ }
+ $response = json_decode('{' . $jsonParts[1], true);
+ if (isset($response['valid']) && $response['valid'] === true) { + if (isset($response['valid']) && $response['valid'] === true) {
+ return true; + return true;
+ } + }
@@ -54,7 +60,7 @@ Index: /usr/local/emhttp/plugins/dynamix/include/.login.php
// Only start a session to check if they have a cookie that looks like our session // Only start a session to check if they have a cookie that looks like our session
$server_name = strtok($_SERVER['HTTP_HOST'],":"); $server_name = strtok($_SERVER['HTTP_HOST'],":");
if (!empty($_COOKIE['unraid_'.md5($server_name)])) { if (!empty($_COOKIE['unraid_'.md5($server_name)])) {
@@ -202,11 +247,11 @@ @@ -202,11 +253,11 @@
if ($failCount == $maxFails) my_logger("Ignoring login attempts for {$username} from {$remote_addr}"); if ($failCount == $maxFails) my_logger("Ignoring login attempts for {$username} from {$remote_addr}");
throw new Exception(_('Too many invalid login attempts')); throw new Exception(_('Too many invalid login attempts'));
} }
@@ -67,7 +73,7 @@ Index: /usr/local/emhttp/plugins/dynamix/include/.login.php
if (isWildcardCert() && $twoFactorRequired && !verifyTwoFactorToken($username, $token)) throw new Exception(_('Invalid 2FA token')); if (isWildcardCert() && $twoFactorRequired && !verifyTwoFactorToken($username, $token)) throw new Exception(_('Invalid 2FA token'));
// Successful login, start session // Successful login, start session
@@ -536,10 +581,11 @@ @@ -536,10 +587,11 @@
document.body.textContent = ''; document.body.textContent = '';
document.body.appendChild(errorElement); document.body.appendChild(errorElement);
} }

10
api/src/unraid-api/unraid-file-modifier/modifications/sso.modification.ts
View File

@@ -12,7 +12,7 @@ export default class SSOFileModification extends FileModification {
protected async generatePatch(overridePath?: string): Promise<string> { protected async generatePatch(overridePath?: string): Promise<string> {
// Define the new PHP function to insert // Define the new PHP function to insert
/* eslint-disable no-useless-escape */ /* eslint-disable no-useless-escape */
const newFunction = ` const newFunction = /** PHP */ `
function verifyUsernamePasswordAndSSO(string $username, string $password): bool { function verifyUsernamePasswordAndSSO(string $username, string $password): bool {
if ($username != "root") return false; if ($username != "root") return false;
@@ -45,7 +45,13 @@ function verifyUsernamePasswordAndSSO(string $username, string $password): bool
} }
try { try {
$response = json_decode($output[0], true); // Split on first { and take everything after it
$jsonParts = explode('{', $output[0], 2);
if (count($jsonParts) < 2) {
my_logger("SSO Login Attempt Failed: No JSON found in response");
return false;
}
$response = json_decode('{' . $jsonParts[1], true);
if (isset($response['valid']) && $response['valid'] === true) { if (isset($response['valid']) && $response['valid'] === true) {
return true; return true;
} }