webservices/sharing-gallery
1
0
Fork 0
Code Issues Pull Requests Releases Activity

bugfixes after first tests

Browse Source
This commit is contained in:
Marc Wäckerlin
2017-02-27 20:54:12 +00:00
parent 59f1ee76c2
commit b5543a6c62
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
etc/authentication.php
View File

@@ -1,22 +1,27 @@
<?php <?php
$realm = "MY REALM HERE"; $realm = "MY REALM HERE";
$ldaphost = "my.ldap.host"; $ldaphost = "my.ldap.host";
$ldaptls = "yes";
$ldapbase = "dc=my,dc=server,dc=com"; $ldapbase = "dc=my,dc=server,dc=com";
if (!isset($_SERVER['PHP_AUTH_USER'])) { function basicAuth() {
header('WWW-Authenticate: Basic realm="'.$REALM.'"'); header('WWW-Authenticate: Basic realm="'.$REALM.'"');
header('HTTP/1.0 401 Unauthorized'); header('HTTP/1.0 401 Unauthorized');
exit; exit;
}
if (!isset($_SERVER['PHP_AUTH_USER'])) {
basicAuth();
} else { } else {
$tstusername = ereg_replace('/^[a-z]/', '-', $_SERVER['PHP_AUTH_USER']); $tstusername = preg_replace('/[^a-z]/', '-', $_SERVER['PHP_AUTH_USER']);
$password = $_SERVER['PHP_AUTH_PW']; $password = $_SERVER['PHP_AUTH_PW'];
$ldapconn = ldap_connect($ldaphost, 389) $ldapconn = ldap_connect($ldaphost, 389)
or error_die("connection to LDAP host failed"); or error_die("connection to LDAP host failed");
ldap_set_option($ldapconn, LDAP_OPT_PROTOCOL_VERSION, 3) ldap_set_option($ldapconn, LDAP_OPT_PROTOCOL_VERSION, 3)
or error_die("failed to set LDAP protocol version 3"); or error_die("failed to set LDAP protocol version 3");
if ($ldaptls!="no" && $ldaptls!=0 && $ldaptlS)
ldap_start_tls($ldapconn) ldap_start_tls($ldapconn)
or error_die($ldapconn, "cannot start LDAP TLS"); or error_die($ldapconn, "cannot start LDAP TLS");
$ldapbind = @ldap_bind($ldapconn, 'uid='.$tstusername.','.$ldapbase, $password) $ldapbind = @ldap_bind($ldapconn, 'uid='.$tstusername.','.$ldapbase, $password)
or error_die("login failed for $username", '403 Forbidden'); or basicAuth();
$username = $tstuserbname; $username = $tstuserbname;
} }
?> ?>

2
etc/makefile.am
View File

@@ -11,3 +11,5 @@
pkgsysconfdir = ${PKGSYSCONFDIR} pkgsysconfdir = ${PKGSYSCONFDIR}
dist_pkgsysconf_DATA = settings.php authentication.php dist_pkgsysconf_DATA = settings.php authentication.php
MAINTAINERCLEANFILES = makefile.in

2
html/index.php
View File

@@ -59,7 +59,7 @@
} }
function checkPath($pathToCheck) { function checkPath($pathToCheck) {
global $imagepath, $subpath; global $imagepath, $subpath;
$fullpath = $imagepath.'/'.$pathToCheck $fullpath = $imagepath.'/'.$pathToCheck;
if ($fullpath==realpath($fullpath) && is_dir($fullpath)) { if ($fullpath==realpath($fullpath) && is_dir($fullpath)) {
$subpath=$pathToCheck; $subpath=$pathToCheck;
$imagepath = $fullpath; $imagepath = $fullpath;