Skip to content

fix(Krb): switch away from deprecated and broken KerberosApacheAuth() #53897

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
merged 2 commits into from
Jul 11, 2025
Merged

fix(Krb): switch away from deprecated and broken KerberosApacheAuth() #53897

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
fd799af
fix(Krb): switch away from deprecated and broken KerberosApacheAuth()
blizzz Jul 10, 2025
80f891e
style(PHP): code cleanup, no effective changes
blizzz Jul 10, 2025
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
25 changes: 11 additions & 14 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 @@ -9,8 +9,8 @@
namespace OCA\Files_External\Lib\Backend;

use Icewind\SMB\BasicAuth;
use Icewind\SMB\KerberosApacheAuth;
use Icewind\SMB\KerberosAuth;
use Icewind\SMB\KerberosTicket;
use Icewind\SMB\Native\NativeServer;
use Icewind\SMB\Wrapped\Server;
use OCA\Files_External\Lib\Auth\AuthMechanism;
Expand Down Expand Up @@ -60,10 +60,7 @@ public function __construct(IL10N $l, Password $legacyAuth) {
->setLegacyAuthMechanism($legacyAuth);
}

/**
* @return void
*/
public function manipulateStorageConfig(StorageConfig &$storage, ?IUser $user = null) {
public function manipulateStorageConfig(StorageConfig &$storage, ?IUser $user = null): void {
$auth = $storage->getAuthMechanism();
if ($auth->getScheme() === AuthMechanism::SCHEME_PASSWORD) {
if (!is_string($storage->getBackendOption('user')) || !is_string($storage->getBackendOption('password'))) {
Expand All @@ -85,33 +82,33 @@ public function manipulateStorageConfig(StorageConfig &$storage, ?IUser $user =
throw new \InvalidArgumentException('invalid authentication backend');
}
$credentialsStore = $auth->getCredentialsStore();
$kerbAuth = new KerberosApacheAuth();
$kerbAuth = new KerberosAuth();
$kerbAuth->setTicket(KerberosTicket::fromEnv());
// check if a kerberos ticket is available, else fallback to session credentials
if ($kerbAuth->checkTicket()) {
if ($kerbAuth->getTicket()?->isValid()) {
$smbAuth = $kerbAuth;
} else {
try {
$credentials = $credentialsStore->getLoginCredentials();
$user = $credentials->getLoginName();
$loginName = $credentials->getLoginName();
$pass = $credentials->getPassword();
preg_match('/(.*)@(.*)/', $user, $matches);
preg_match('/(.*)@(.*)/', $loginName, $matches);
$realm = $storage->getBackendOption('default_realm');
if (empty($realm)) {
$realm = 'WORKGROUP';
}
if (count($matches) === 0) {
$username = $user;
$username = $loginName;
$workgroup = $realm;
} else {
$username = $matches[1];
$workgroup = $matches[2];
[, $username, $workgroup] = $matches;
}
$smbAuth = new BasicAuth(
$username,
$workgroup,
$pass
);
} catch (\Exception $e) {
} catch (\Exception) {
throw new InsufficientDataForMeaningfulAnswerException('No session credentials saved');
}
}
Expand All @@ -125,7 +122,7 @@ public function manipulateStorageConfig(StorageConfig &$storage, ?IUser $user =
$storage->setBackendOption('auth', $smbAuth);
}

public function checkDependencies() {
public function checkDependencies(): array {
$system = \OCP\Server::get(SystemBridge::class);
if (NativeServer::available($system)) {
return [];
Expand Down
5 changes: 0 additions & 5 deletions build/psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1462,11 +1462,6 @@
<code><![CDATA[class-string<IStorage>]]></code>
</MoreSpecificReturnType>
</file>
<file src="apps/files_external/lib/Lib/Backend/SMB.php">
<DeprecatedClass>
<code><![CDATA[new KerberosApacheAuth()]]></code>
</DeprecatedClass>
</file>
<file src="apps/files_external/lib/Lib/Storage/SFTP.php">
<InternalMethod>
<code><![CDATA[put]]></code>
Expand Down
Loading