robin/smb
1
0
Fork 0
mirror of https://codeberg.org/icewind/SMB.git synced 2026-06-03 17:24:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

code style

Browse source
This commit is contained in:
Robin Appelman 2021-11-02 15:40:54 +01:00
commit 306ec135c8
3 changed files with 45 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/KerberosApacheAuth.php
View file

@ -28,22 +28,25 @@ use Icewind\SMB\Exception\Exception;
* Use existing kerberos ticket to authenticate and reuse the apache ticket cache (mod_auth_kerb)
*/
class KerberosApacheAuth extends KerberosAuth implements IAuth {
/** @var string */
private $ticketPath = "";
//only working with specific library (mod_auth_kerb, krb5, smbclient) versions
// only working with specific library (mod_auth_kerb, krb5, smbclient) versions
/** @var bool */
private $saveTicketInMemory = false;
public function __construct($saveTicketInMemory = false) {
/**
* @param bool $saveTicketInMemory
*/
public function __construct(bool $saveTicketInMemory = false) {
$this->saveTicketInMemory = $saveTicketInMemory;
$this->registerApacheKerberosTicket();
}
private function registerApacheKerberosTicket() {
private function registerApacheKerberosTicket(): void {
// inspired by https://git.typo3.org/TYPO3CMS/Extensions/fal_cifs.git
if (!extension_loaded("krb5")) {
// https://pecl.php.net/package/krb5
throw new DependencyException('Ensure php-krb5 is installed.');
}
@ -62,7 +65,7 @@ class KerberosApacheAuth extends KerberosAuth implements IAuth {
if ($this->saveTicketInMemory) {
putenv("KRB5CCNAME=" . $krb5->getName());
putenv("KRB5CCNAME=" . (string)$krb5->getName());
} else {
//workaround: smbclient is not working with the original apache ticket cache.
$tmpFilename = tempnam("/tmp", "krb5cc_php_");

14
src/Native/NativeState.php
View file

@ -38,9 +38,13 @@ class NativeState {
/** @var bool */
protected $connected = false;
// sync the garbage collection cycle
// __deconstruct() of KerberosAuth should not called too soon
protected $auth;
/**
* sync the garbage collection cycle
* __deconstruct() of KerberosAuth should not called too soon
*
* @var IAuth|null $auth
*/
protected $auth = null;
// see error.h
const EXCEPTION_MAP = [
@ -111,12 +115,12 @@ class NativeState {
}
$auth->setExtraSmbClientOptions($this->state);
/** @var bool $result */
// sync the garbage collection cycle
// __deconstruct() of KerberosAuth should not called too soon
// __deconstruct() of KerberosAuth should not caled too soon
$this->auth = $auth;
/** @var bool $result */
$result = @smbclient_state_init($this->state, $auth->getWorkgroup(), $auth->getUsername(), $auth->getPassword());
$this->testResult($result, '');