webinterface.git

@@ -1,79 +0,0 @@

-<?php

-/*

-This file belongs to the Webinterface of schokokeks.org Hosting

-

-Written 2008-2018 by schokokeks.org Hosting, namely

-  Bernd Wurst <bernd@schokokeks.org>

-  Hanno Böck <hanno@schokokeks.org>

-

-To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty.

-

-You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see 

-http://creativecommons.org/publicdomain/zero/1.0/

-

-Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code.

-*/

-

-// Setze das Arbeitsverzeichnis auf das Stammverzeichnis, damit die Voraussetzungen gleich sind wie bei allen anderen Requests

-chdir('..');

-

-require_once('config.php');

-global $prefix;

-$prefix = '../';

-

-// Das Parent-Verzeichnis in den Include-Pfad, da wir uns jetzt in einem anderen Verzeichnis befinden.

-ini_set('include_path', ini_get('include_path').':../');

-

-require_once('session/start.php');

-require_once('inc/base.php');

-require_once('inc/debug.php');

-require_once('inc/error.php');

-require_once('inc/theme.php');

-

-

-function prepare_cert($cert)

-{

-	return str_replace(array('-----BEGIN CERTIFICATE-----', '-----END CERTIFICATE-----', ' ', "\n"), array(), $cert);

-}

-

-

-function get_logins_by_cert($cert) 

-{

-	$cert = prepare_cert($cert);

-	$result = db_query("SELECT type,username,startpage FROM system.clientcert WHERE cert=?", array($cert));

-	if ($result->rowCount() < 1)

-		return NULL;

-	else {

-		$ret = array();

-		while ($row = $result->fetch()) {

-			$ret[] = $row;

-		}

-		return $ret;

-	}

-}

-

-DEBUG('$_SERVER:');

-DEBUG($_SERVER);

-

-header('Content-type: text/plain');

-

-if (isset($_SERVER['REDIRECT_SSL_CLIENT_CERT']) && 

-    isset($_SERVER['REDIRECT_SSL_CLIENT_S_DN']) && $_SERVER['REDIRECT_SSL_CLIENT_S_DN'] != '' && 

-    isset($_SERVER['REDIRECT_SSL_CLIENT_I_DN']) && $_SERVER['REDIRECT_SSL_CLIENT_I_DN'] != '') {

-  $ret = get_logins_by_cert($_SERVER['REDIRECT_SSL_CLIENT_CERT']);

-  if ($ret === NULL) {

-    echo 'error';

-    die();

-  }

-  if (count($ret) == 1) {

-    $uid = $ret[0]['username'];

-    $role = find_role($uid, '', True);

-    setup_session($role, $uid);

-    setcookie('CLIENTCERT_AUTOLOGIN', '1', time()+3600*24*365, '/');

-    echo 'ok';

-    die();

-  }

-}

-echo 'error';

-die();

-?>

@@ -107,7 +107,8 @@ else

       $uid = $ret[0]['username'];

       $role = find_role($uid, '', True);

       setup_session($role, $uid);

-      setcookie('CLIENTCERT_AUTOLOGIN', '1', time()+3600*24*365, '/');

+      DEBUG("Set Cookie!");

+      setcookie('CLIENTCERT_AUTOLOGIN', '1', strtotime("+ 1 year"), '/', '', true, true);

       $destination = 'go/index/index';

       if (check_path($ret[0]['startpage']))

         $destination = $ret[0]['startpage'];

@@ -120,7 +120,7 @@ function require_role($roles)

       $allow = true;

   if (! $allow)

     if ($_SESSION['role'] == ROLE_ANONYMOUS)

-      login_screen("Diese Seite können Sie erst benutzen, wenn Sie sich mit Ihren Zugangsdaten anmelden.");

+      login_screen();

     else

       login_screen("Diese Seite können Sie mit Ihren aktuellen Zugriffsrechten nicht benutzen, bitte melden Sie sich mit den benötigten Zugriffsrechten an!");

 }

@@ -129,11 +129,8 @@ function require_role($roles)

 function login_screen($why = NULL)

 {

   if (! $why) {

-    if (have_module('index')) {

       if (isset($_COOKIE['CLIENTCERT_AUTOLOGIN']) && $_COOKIE['CLIENTCERT_AUTOLOGIN'] == '1') {

-        require_once('modules/index/include/x509.php');

-        do_ajax_cert_login();

-      }

+          redirect("/certlogin/index.php?destination=".urlencode($_SERVER['REQUEST_URI']));

       }

   }

   require_once('inc/theme.php');

@@ -1,12 +0,0 @@

-function redirect(status) {

-  if (status == "ok") {

-    window.location.reload();

-  } else {

-    window.location.href="../../certlogin/";

-  }

-}

-

-$(function () {

-  $.get("../../certlogin/ajax.php", redirect);

-}

-);

@@ -1,34 +0,0 @@

-<?php

-/*

-This file belongs to the Webinterface of schokokeks.org Hosting

-

-Written 2008-2018 by schokokeks.org Hosting, namely

-  Bernd Wurst <bernd@schokokeks.org>

-  Hanno Böck <hanno@schokokeks.org>

-

-To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty.

-

-You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see 

-http://creativecommons.org/publicdomain/zero/1.0/

-

-Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code.

-*/

-

-require_once('x509.php');

-

-title('Login über SSL-Client-Zertifikat');

-

-if ($_SESSION['role'] == ROLE_ANONYMOUS) {

-  do_ajax_cert_login();

-} else {

-  redirect('index');

-}

-

-output('<p>Sie werden nun über Ihr SSL-Client-Zertifikat eingeloggt. Möglicherweise werden Sie von Ihrem Browser zunächst gebeten, ein Zertifikat auszuwählen.</p>');

-

-output('<p>Sollte der Login nicht funktionieren, klicken Sie bitte diesen Link:</p>

-<p><strong>'.internal_link('../../certlogin/', 'Login über SSL-Client-Zertifikat').'</strong></p>

-');

-

-

-

@@ -25,13 +25,16 @@ function do_ajax_cert_login() {

 function get_logins_by_cert($cert) 

 {

 	$result = db_query("SELECT type,username,startpage FROM system.clientcert WHERE cert=? ORDER BY type,username", array($cert));

-	if ($result->rowCount() < 1)

+	if ($result->rowCount() < 1) {

+        DEBUG("No certlogin found for this cert!");

 		return NULL;

-	else {

+	} else {

 		$ret = array();

 		while ($row = $result->fetch()) {

 			$ret[] = $row;

 		}

+        DEBUG("Logins for this cert:");

+        DEBUG($ret);

 		return $ret;

 	}

 }