Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle LoginException when authenticating with Apache #910

Merged
merged 2 commits into from
Dec 3, 2024
Merged

Handle LoginException when authenticating with Apache #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dedd93
Handle LoginException when authenticating with Apache
danxuliu Nov 26, 2024
2e9f5bc
Add integration test for authenticating as a disabled user
danxuliu Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion appinfo/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

use OC\User\LoginException;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there should be a fitting Exception or interface in the OCP space, no?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The exception thrown is OC\User\LoginException, which directly inherits from \Exception, and is not wrapped and converted to any other exception in handleApacheAuth() 🤷

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sheesh 😨

use OCA\User_SAML\GroupBackend;
use OCA\User_SAML\SAMLSettings;
use OCA\User_SAML\UserBackend;
Expand Down Expand Up @@ -63,7 +64,21 @@
return;
}

OC_User::handleApacheAuth();
try {
OC_User::handleApacheAuth();
} catch (LoginException $e) {
if ($request->getPathInfo() === '/apps/user_saml/saml/error') {
return;
}
$targetUrl = $urlGenerator->linkToRouteAbsolute(
'user_saml.SAML.genericError',
[
'message' => $e->getMessage()
]
);
header('Location: ' . $targetUrl);
exit();
}
}

if ($returnScript === true) {
Expand Down
10 changes: 10 additions & 0 deletions tests/integration/features/EnvironmentVariable.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,13 @@ Feature: EnvironmentVariable
And The environment variable "REMOTE_USER" is set to "certainly-not-provisioned-user"
When I send a GET request to "http://localhost:8080/index.php/login"
Then I should be redirected to "http://localhost:8080/index.php/apps/user_saml/saml/notProvisioned"

Scenario: Authenticating using environment variable with SSO as a disabled user on backend
Given A local user with uid "provisioned-disabled-user" exists
And A local user with uid "provisioned-disabled-user" is disabled
And The setting "type" is set to "environment-variable"
And The setting "general-require_provisioned_account" is set to "1"
And The setting "general-uid_mapping" is set to "REMOTE_USER"
And The environment variable "REMOTE_USER" is set to "provisioned-disabled-user"
When I send a GET request to "http://localhost:8080/index.php/login"
Then I should be redirected to "http://localhost:8080/index.php/apps/user_saml/saml/error"
15 changes: 15 additions & 0 deletions tests/integration/features/bootstrap/FeatureContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,21 @@ public function aLocalUserWithUidExists($uid) {
);
}

/**
* @Given A local user with uid :uid is disabled
* @param string $uid
*/
public function aLocalUserWithUidIsDisabled($uid) {
shell_exec(
sprintf(
'OC_PASS=password %s %s user:disable %s',
PHP_BINARY,
__DIR__ . '/../../../../../../occ',
$uid
)
);
}

/**
* @Then I hack :uid into existence
*/
Expand Down
Loading