deon/phpldapadmin
1
0
Fork 0
Code Issues 36 Pull Requests Packages Projects Releases Wiki Activity

Enabled cookie as a valid auth_type

Browse Source
This commit is contained in:
Deon George 2011-04-26 00:08:59 +10:00
parent c5f045756e
commit 7aba733961
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/HTMLTree.php
View File

@ -126,6 +126,7 @@ class HTMLTree extends Tree {
# We are not logged in, draw a login... link. # We are not logged in, draw a login... link.
} else { } else {
switch ($server->getAuthType()) { switch ($server->getAuthType()) {
case 'cookie':
case 'http': case 'http':
case 'session': case 'session':
$this->draw_login_link(); $this->draw_login_link();

24
lib/ds.php
View File

@ -133,6 +133,7 @@ abstract class DS {
debug_log('Entered (%%)',17,0,__FILE__,__LINE__,__METHOD__,$fargs); debug_log('Entered (%%)',17,0,__FILE__,__LINE__,__METHOD__,$fargs);
switch ($this->getValue('login','auth_type')) { switch ($this->getValue('login','auth_type')) {
case 'cookie':
case 'config': case 'config':
case 'http': case 'http':
case 'proxy': case 'proxy':
@ -165,6 +166,13 @@ abstract class DS {
return null; return null;
switch ($this->getAuthType()) { switch ($this->getAuthType()) {
case 'cookie':
if (! isset($_COOKIE[$method.'-USER']))
# If our bind_id is set, we'll pass that back for logins.
return (! is_null($this->getValue('login','bind_id')) && $method == 'login') ? $this->getValue('login','bind_id') : null;
else
return blowfish_decrypt($_COOKIE[$method.'-USER']);
case 'config': case 'config':
if (! isset($_SESSION['USER'][$this->index][$method]['name'])) if (! isset($_SESSION['USER'][$this->index][$method]['name']))
return $this->getValue('login','bind_id'); return $this->getValue('login','bind_id');
@ -201,6 +209,11 @@ abstract class DS {
$method = $this->getMethod($method); $method = $this->getMethod($method);
switch ($this->getAuthType()) { switch ($this->getAuthType()) {
case 'cookie':
set_cookie($method.'-USER',blowfish_encrypt($user),NULL,'/');
set_cookie($method.'-PASS',blowfish_encrypt($pass),NULL,'/');
return TRUE;
case 'config': case 'config':
return true; return true;
@ -238,6 +251,13 @@ abstract class DS {
return null; return null;
switch ($this->getAuthType()) { switch ($this->getAuthType()) {
case 'cookie':
if (! isset($_COOKIE[$method.'-PASS']))
# If our bind_id is set, we'll pass that back for logins.
return (! is_null($this->getValue('login','bind_pass')) && $method == 'login') ? $this->getValue('login','bind_pass') : null;
else
return blowfish_decrypt($_COOKIE[$method.'-PASS']);
case 'config': case 'config':
case 'proxy': case 'proxy':
if (! isset($_SESSION['USER'][$this->index][$method]['pass'])) if (! isset($_SESSION['USER'][$this->index][$method]['pass']))
@ -375,6 +395,10 @@ abstract class DS {
unset ($_SESSION['cache'][$this->index]); unset ($_SESSION['cache'][$this->index]);
switch ($this->getAuthType()) { switch ($this->getAuthType()) {
case 'cookie':
set_cookie($method.'-USER','',time()-3600,'/');
set_cookie($method.'-PASS','',time()-3600,'/');
case 'config': case 'config':
return true; return true;