NB-Public/user_saml
14
0
Fork 0
mirror of https://github.com/netzbegruenung/user_saml.git synced 2024-05-02 09:14:50 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #554 from nextcloud/bugfix/noid/autoprovision-decoded

Browse source 
Use effective uid for autoprovisioning new users
This commit is contained in:
blizzz 2021-10-27 23:24:11 +02:00 committed by GitHub
parent 4c7e32a661 7930503cc3
commit d0e2667e20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Controller/SAMLController.php
View file

@ -148,8 +148,8 @@ class SAMLController extends Controller {
}
return;
}
$uid = $this->userData->getOriginalUid();
$uid = $this->userData->testEncodedObjectGUID($uid);
if(!$userExists && !$autoProvisioningAllowed) {
throw new NoUserFoundException('Auto provisioning not allowed and user ' . $uid . ' does not exist');
} elseif(!$userExists && $autoProvisioningAllowed) {

2
lib/UserBackend.php
View file

@ -494,8 +494,6 @@ class UserBackend implements IApacheBackend, UserInterface, IUserBackend {
}
if($uid !== '' && $this->userExists($uid)) {
$uid = $this->userData->testEncodedObjectGUID($uid);
$this->session->set('last-password-confirm', strtotime('+4 year', time()));
return $uid;
}

6
tests/unit/Controller/SAMLControllerTest.php
View file

@ -250,6 +250,12 @@ class SAMLControllerTest extends TestCase {
->expects(isset($samlUserData['uid']) ? $this->any() : $this->never())
->method('getOriginalUid')
->willReturn('MyUid');
$this->userData
->expects($this->any())
->method('testEncodedObjectGUID')
->willReturnCallback(function ($uid) {
return $uid;
});
$this->userData
->expects($this->any())
->method('getEffectiveUid')