Skip to content

[stable22] add KerberosApacheAuth support to files_external #30780

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

Merged
skjnldsv merged 7 commits into from
Jan 20, 2022
Merged

[stable22] add KerberosApacheAuth support to files_external #30780

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3dc1ed8
add KerberosApacheAuth support to files_external
blizzz Oct 20, 2021
ab98369
add changes from Sebastian/dassIT and move default_realm to backend
blizzz Oct 29, 2021
926aa94
do not use deprecated query() method
blizzz Nov 3, 2021
017e5a1
update icewind/smb to 3.5.1
icewind1991 Nov 4, 2021
a64bcb2
update to release smb lib
icewind1991 Nov 4, 2021
70e13a4
update icewind/smb to 3.5.2
icewind1991 Jan 20, 2022
c651fc2
Add test for samba kerberos sso in ci
icewind1991 Jan 20, 2022
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
Prev Previous commit
Next Next commit
update to release smb lib 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @backportbot
icewind1991 authored and backportbot[bot] committed Jan 20, 2022
commit a64bcb22be0dcfbd89cfc7e976d82816b1a28f32
8 changes: 4 additions & 4 deletions apps/files_external/lib/Lib/Backend/SMB.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = n
throw new \InvalidArgumentException('invalid authentication backend');
}
$credentialsStore = $auth->getCredentialsStore();
$kerb_auth = new KerberosApacheAuth();
if ($kerb_auth->checkTicket()) {
$kerb_auth->registerApacheKerberosTicket();
$smbAuth = $kerb_auth;
$kerbAuth = new KerberosApacheAuth();
// check if a kerberos ticket is available, else fallback to session credentials
if ($kerbAuth->checkTicket()) {
$smbAuth = $kerbAuth;
} else {
try {
$credentials = $credentialsStore->getLoginCredentials();
Expand Down