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-01 16:28:18 +01:00
commit 93b1f14b5d
2 changed files with 12 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/KerberosApacheAuth.php
View file

@ -24,22 +24,18 @@ namespace Icewind\SMB;
use Icewind\SMB\Exception\DependencyException;
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 {
private $ticketPath = "";
private $ticketPath = "";
//only working with specific library (mod_auth_kerb, krb5, smbclient) versions
private $saveTicketInMemory = false;
//only working with specific library (mod_auth_kerb, krb5, smbclient) versions
private $saveTicketInMemory = false;
public function __construct($saveTicketInMemory = false) {
$this->saveTicketInMemory = $saveTicketInMemory;
$this->registerApacheKerberosTicket();
}
private function registerApacheKerberosTicket() {
@ -54,23 +50,20 @@ class KerberosApacheAuth extends KerberosAuth implements IAuth {
//read apache kerberos ticket cache
$cacheFile = getenv("KRB5CCNAME");
if(!$cacheFile) {
if (!$cacheFile) {
throw new Exception('No kerberos ticket cache environment variable (KRB5CCNAME) found.');
}
$krb5 = new \KRB5CCache();
$krb5->open($cacheFile);
if(!$krb5->isValid()) {
if (!$krb5->isValid()) {
throw new Exception('Kerberos ticket cache is not valid.');
}
if($this->saveTicketInMemory) {
if ($this->saveTicketInMemory) {
putenv("KRB5CCNAME=" . $krb5->getName());
}
else {
} else {
//workaround: smbclient is not working with the original apache ticket cache.
$tmpFilename = tempnam("/tmp", "krb5cc_php_");
$tmpCacheFile = "FILE:" . $tmpFilename;
@ -78,17 +71,12 @@ class KerberosApacheAuth extends KerberosAuth implements IAuth {
$this->ticketPath = $tmpFilename;
putenv("KRB5CCNAME=" . $tmpCacheFile);
}
}
public function __destruct() {
if(!empty($this->ticketPath) && file_exists($this->ticketPath) && is_file($this->ticketPath)) {
unlink($this->ticketPath);
if (!empty($this->ticketPath) && file_exists($this->ticketPath) && is_file($this->ticketPath)) {
unlink($this->ticketPath);
}
}
}

4
src/Native/NativeState.php
View file

@ -39,8 +39,8 @@ class NativeState {
protected $connected = false;
// sync the garbage collection cycle
// __deconstruct() of KerberosAuth should not called too soon
protected $auth;
// __deconstruct() of KerberosAuth should not called too soon
protected $auth;
// see error.h
const EXCEPTION_MAP = [