Skip to content

add KerberosApacheAuth support to files_external #29349

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

add KerberosApacheAuth support to files_external #29349

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a96d461
add KerberosApacheAuth support to files_external
blizzz Oct 20, 2021
a836aa3
add changes from Sebastian/dassIT and move default_realm to backend
blizzz Oct 29, 2021
b391d57
do not use deprecated query() method
blizzz Nov 3, 2021
a9619c3
update icewind/smb to 3.5.1
icewind1991 Nov 4, 2021
0bed61f
update to release smb lib
icewind1991 Nov 4, 2021
a33e1dc
update icewind/smb to 3.5.2
icewind1991 Jan 20, 2022
4fe70de
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
add changes from Sebastian/dassIT and move default_realm to backend 
- Sebastian added the switch depending on the preg_match result and with it
  the fall back to login credentials
- I turned default_realm to a backend option (was previously suggested as
  system config key)

Signed-off-by: Arthur Schiwon <[email protected]>
  • Loading branch information
@blizzz @icewind1991
blizzz authored and icewind1991 committed Jan 20, 2022
commit a836aa34a66da4d970d0120a08ea15d70f5e1894
9 changes: 8 additions & 1 deletion apps/files_external/lib/Lib/Auth/SMB/KerberosApacheAuth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
namespace OCA\Files_External\Lib\Auth\SMB;

use OCA\Files_External\Lib\Auth\AuthMechanism;
use OCA\Files_External\Lib\DefinitionParameter;
use OCP\Authentication\LoginCredentials\IStore;
use OCP\IL10N;

Expand All @@ -33,10 +34,16 @@ class KerberosApacheAuth extends AuthMechanism {
private $credentialsStore;

public function __construct(IL10N $l, IStore $credentialsStore) {
$realm = new DefinitionParameter('default_realm', 'Default realm');
$realm
->setType(DefinitionParameter::VALUE_TEXT)
->setFlag(DefinitionParameter::FLAG_OPTIONAL)
->setTooltip($l->t('Kerberos default realm, defaults to "WORKGROUP"'));
$this
->setIdentifier('smb::kerberosapache')
->setScheme(self::SCHEME_SMB)
->setText($l->t('Kerberos ticket apache mode'));
->setText($l->t('Kerberos ticket apache mode'))
->addParameter($realm);
$this->credentialsStore = $credentialsStore;
}

Expand Down
23 changes: 19 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 @@ -32,6 +32,7 @@
use Icewind\SMB\KerberosAuth;
use OCA\Files_External\Lib\Auth\AuthMechanism;
use OCA\Files_External\Lib\Auth\Password\Password;
use OCA\Files_External\Lib\Auth\SMB\KerberosApacheAuth as KerberosApacheAuthMechanism;
use OCA\Files_External\Lib\DefinitionParameter;
use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException;
use OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
Expand Down Expand Up @@ -89,6 +90,9 @@ public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = n
$smbAuth = new KerberosAuth();
break;
case 'smb::kerberosapache':
if (!$auth instanceof KerberosApacheAuthMechanism) {
throw new \InvalidArgumentException('invalid authentication backend');
}
$credentialsStore = $auth->getCredentialsStore();
$kerb_auth = new KerberosApacheAuth();
if ($kerb_auth->checkTicket()) {
Expand All @@ -99,12 +103,23 @@ public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = n
$credentials = $credentialsStore->getLoginCredentials();
$user = $credentials->getLoginName();
$pass = $credentials->getPassword();
if (preg_match('/(.*)@(.*)/', $user, $matches) !== 1) {
throw new InsufficientDataForMeaningfulAnswerException('No valid session credentials');
preg_match('/(.*)@(.*)/', $user, $matches);
$realm = $storage->getBackendOption('default_realm');
if (empty($realm)) {
$realm = 'WORKGROUP';
}
$userPart = $matches[1];
$domainPart = $matches[2];
if (count($matches) === 0) {
$username = $user;
$workgroup = $realm;
} else {
$username = $userPart;
$workgroup = $domainPart;
}
$smbAuth = new BasicAuth(
$matches[0],
$matches[1],
$username,
$workgroup,
$pass
);
} catch (\Exception $e) {
Expand Down