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

Jump to bottom

[stable-5.1] refactor(Controller): read parameter only once #791

Merged
merged 2 commits into from
Nov 29, 2023
Merged

[stable-5.1] refactor(Controller): read parameter only once #791

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97e2ae0
refactor(Controller): read parameter only once
blizzz Nov 28, 2023
3c34ebe
build(compat)!: cut support for NC <23 and >24
blizzz Nov 29, 2023
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
21 changes: 17 additions & 4 deletions lib/Controller/SAMLController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
use OCP\IURLGenerator;
use OCP\IUserSession;
use OCP\Security\ICrypto;
use OCP\Security\ITrustedDomainHelper;
use OneLogin\Saml2\Auth;
use OneLogin\Saml2\Error;
use OneLogin\Saml2\Settings;
Expand Down Expand Up @@ -74,6 +75,10 @@ class SAMLController extends Controller {
* @var ICrypto
*/
private $crypto;
/**
* @var ITrustedDomainHelper
*/
private $trustedDomainHelper;

/**
* @param string $appName
Expand All @@ -100,7 +105,8 @@ public function __construct(
IL10N $l,
UserResolver $userResolver,
UserData $userData,
ICrypto $crypto
ICrypto $crypto,
ITrustedDomainHelper $trustedDomainHelper
) {
parent::__construct($appName, $request);
$this->session = $session;
Expand All @@ -114,6 +120,7 @@ public function __construct(
$this->userResolver = $userResolver;
$this->userData = $userData;
$this->crypto = $crypto;
$this->trustedDomainHelper = $trustedDomainHelper;
}

/**
Expand Down Expand Up @@ -203,11 +210,17 @@ protected function assertGroupMemberships(): void {
* @throws \Exception
*/
public function login(int $idp = 1) {
$originalUrl = (string)$this->request->getParam('originalUrl', '');
if (!$this->trustedDomainHelper->isTrustedUrl($originalUrl)) {
$originalUrl = '';
}

$type = $this->config->getAppValue($this->appName, 'type');
switch ($type) {
case 'saml':
$auth = new Auth($this->samlSettings->getOneLoginSettingsArray($idp));
$returnUrl = $this->request->getParam('originalUrl', $this->urlGenerator->linkToRouteAbsolute('user_saml.SAML.login'));

$returnUrl = $originalUrl ?: $this->urlGenerator->linkToRouteAbsolute('user_saml.SAML.login');
$ssoUrl = $auth->login($returnUrl, [], false, false, true);
$response = new Http\RedirectResponse($ssoUrl);

Expand All @@ -226,7 +239,7 @@ public function login(int $idp = 1) {
// Pack data as JSON so we can properly extract it later
$data = json_encode([
'AuthNRequestID' => $auth->getLastRequestID(),
'OriginalUrl' => $this->request->getParam('originalUrl', ''),
'OriginalUrl' => $originalUrl,
'Idp' => $idp,
'flow' => $flowData,
]);
Expand All @@ -240,7 +253,7 @@ public function login(int $idp = 1) {
$response->addCookie('saml_data', $data, null, 'None');
break;
case 'environment-variable':
$ssoUrl = $this->request->getParam('originalUrl', '');
$ssoUrl = $originalUrl;
if (empty($ssoUrl)) {
$ssoUrl = $this->urlGenerator->getAbsoluteURL('/');
}
Expand Down
7 changes: 6 additions & 1 deletion tests/unit/Controller/SAMLControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
use OCP\IURLGenerator;
use OCP\IUser;
use OCP\IUserSession;
use OCP\Security\ITrustedDomainHelper;
use PHPUnit\Framework\MockObject\MockObject;
use OCP\Security\ICrypto;
use Test\TestCase;
Expand Down Expand Up @@ -70,6 +71,8 @@ class SAMLControllerTest extends TestCase {
private $crypto;
/** @var SAMLController */
private $samlController;
/** @var ITrustedDomainHelper|MockObject */
private $trustedDomainController;

protected function setUp(): void {
parent::setUp();
Expand All @@ -86,6 +89,7 @@ protected function setUp(): void {
$this->userResolver = $this->createMock(UserResolver::class);
$this->userData = $this->createMock(UserData::class);
$this->crypto = $this->createMock(ICrypto::class);
$this->trustedDomainController = $this->createMock(ITrustedDomainHelper::class);

$this->l->expects($this->any())->method('t')->willReturnCallback(
function ($param) {
Expand All @@ -111,7 +115,8 @@ function ($param) {
$this->l,
$this->userResolver,
$this->userData,
$this->crypto
$this->crypto,
$this->trustedDomainController
);
}

Expand Down
Loading