mirror/php-ifm
1
0
Fork 0
mirror of https://github.com/misterunknown/ifm.git synced 2025-08-17 13:30:38 +02:00
Code Issues Releases Wiki Activity

Merge pull request #116 from cryol/master

Browse Source 
LDAP filter + logout button fix
This commit is contained in:
Marco Dickert
2019-12-04 13:58:26 +01:00
committed by GitHub
parent 77fa0c2479 ac1e73850c
commit 572e753658
3 changed files with 55 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
build/libifm.php
View File

File diff suppressed because one or more lines are too long

31
ifm.php
View File

File diff suppressed because one or more lines are too long

20
src/main.php
View File

@@ -410,7 +410,6 @@ f00bar;
$ret = $this->config; $ret = $this->config;
$ret['inline'] = ( $this->mode == "inline" ) ? true : false; $ret['inline'] = ( $this->mode == "inline" ) ? true : false;
$ret['isDocroot'] = ( $this->getRootDir() == $this->getScriptRoot() ) ? true : false; $ret['isDocroot'] = ( $this->getRootDir() == $this->getScriptRoot() ) ? true : false;
unset( $ret['auth'] );
unset( $ret['auth_source'] ); unset( $ret['auth_source'] );
$this->jsonResponse( $ret ); $this->jsonResponse( $ret );
} }
@@ -1043,7 +1042,13 @@ f00bar;
break; break;
case "ldap": case "ldap":
$authenticated = false; $authenticated = false;
list( $ldap_server, $rootdn ) = explode( ";", $srcopt ); $ldapopts = explode( ";", $srcopt );
if( count( $ldapopts ) === 3 ) {
list( $ldap_server, $rootdn, $ufilter ) = explode( ";", $srcopt );
} else {
list( $ldap_server, $rootdn ) = explode( ";", $srcopt );
$ufilter = false;
}
$u = "uid=" . $user . "," . $rootdn; $u = "uid=" . $user . "," . $rootdn;
if( ! $ds = ldap_connect( $ldap_server ) ) { if( ! $ds = ldap_connect( $ldap_server ) ) {
trigger_error( "Could not reach the ldap server.", E_USER_ERROR ); trigger_error( "Could not reach the ldap server.", E_USER_ERROR );
@@ -1053,7 +1058,16 @@ f00bar;
if( $ds ) { if( $ds ) {
$ldbind = @ldap_bind( $ds, $u, $pass ); $ldbind = @ldap_bind( $ds, $u, $pass );
if( $ldbind ) { if( $ldbind ) {
$authenticated = true; if( $ufilter ) {
if( ldap_count_entries( $ds, ldap_search( $ds, $rootdn, $ufilter ) ) > 0 ){
$authenticated = true;
} else {
trigger_error( "User not allowed.", E_USER_ERROR );
$authenticated = false;
}
} else {
$authenticated = true;
}
} else { } else {
trigger_error( ldap_error( $ds ), E_USER_ERROR ); trigger_error( ldap_error( $ds ), E_USER_ERROR );
$authenticated = false; $authenticated = false;