webinterface.git

@@ -57,12 +57,18 @@ if ($_SESSION['role'] != ROLE_ANONYMOUS && isset($_REQUEST['record']) && isset($

 {

   DEBUG('recording client-cert');

   if (isset($_SERVER[$redirect.'SSL_CLIENT_CERT']) && isset($_SERVER[$redirect.'SSL_CLIENT_S_DN']) && 

-      isset($_SERVER[$redirect.'SSL_CLIENT_I_DN']) && isset($_SERVER[$redirect.'SSL_CLIENT_M_SERIAL']))

+      isset($_SERVER[$redirect.'SSL_CLIENT_I_DN']) && isset($_SERVER[$redirect.'SSL_CLIENT_M_SERIAL']) &&

+      isset($_SERVER[$redirect.'SSL_CLIENT_V_START']) && isset($_SERVER[$redirect.'SSL_CLIENT_V_END'])

+      )

   {

     $_SESSION['clientcert_cert'] = $_SERVER[$redirect.'SSL_CLIENT_CERT'];

     $_SESSION['clientcert_dn'] = $_SERVER[$redirect.'SSL_CLIENT_S_DN'];

     $_SESSION['clientcert_issuer'] = $_SERVER[$redirect.'SSL_CLIENT_I_DN'];

     $_SESSION['clientcert_serial'] = $_SERVER[$redirect.'SSL_CLIENT_M_SERIAL'];

+    $vstart = new DateTime($_SERVER[$redirect.'SSL_CLIENT_V_START']);

+    $_SESSION['clientcert_valid_from'] = date_format($vstart, 'Y-m-d');

+    $vend = new DateTime($_SERVER[$redirect.'SSL_CLIENT_V_END']);

+    $_SESSION['clientcert_valid_until'] = date_format($vend, 'Y-m-d');

     header('Location: '.$prefix.$_REQUEST['backto'].encode_querystring(''));

     die();

   }

@@ -52,7 +52,8 @@ if (isset($_SESSION['clientcert_cert']))

   output('<p>Es wurde folgendes Client-Zertifikat von Ihrem Browser gesendet:</p>

 <div style="margin-left: 2em;"><strong>DN:</strong> '.filter_input_general($_SESSION['clientcert_dn']).'<br />

 <strong>Aussteller-DN:</strong> '.filter_input_general($_SESSION['clientcert_issuer']).'<br />

-<strong>Seriennummer:</strong> '.filter_input_general($_SESSION['clientcert_serial']).'</div>

+<strong>Seriennummer:</strong> '.filter_input_general($_SESSION['clientcert_serial']).'<br />

+<strong>Gültigkeit:</strong> '.filter_input_general($_SESSION['clientcert_valid_from']).' bis '.filter_input_general($_SESSION['clientcert_valid_until']).'</div>

 <p>Soll dieses Zertifikat für den Zugang für <strong>'.$username.'</strong> verwendet werden?</p>');

   output(html_form('clientcert_add', 'certsave.php', 'action=new', '<p><input type="submit" name="submit" value="Ja, dieses Zertifikat einrichten" /> &#160; '.internal_link('cert', 'Nein', 'clear').'</p>'));

   output('</div>');

@@ -65,7 +66,7 @@ if ($certs != NULL) {

   output('<p>Sie haben bereits Zertifikate für den Zugang eingerichtet.</p>

   <ul>');

   foreach ($certs AS $cert) {

-   	output('<li>'.$cert['dn'].' / Seriennummer '.$cert['serial'].'<br /><em>ausgestellt von </em>'.$cert['issuer']);

+   	output('<li>'.$cert['dn'].' / Seriennummer '.$cert['serial'].' / '.'Gültig von '.$cert['valid_from'].' bis '.$cert['valid_until'].'<br /><em>ausgestellt von </em>'.$cert['issuer']);

     output('<br />'.internal_link('certsave', 'Dieses Zertifikat löschen', 'action=delete&id='.$cert['id']));

     output('</li>');

   }

@@ -26,13 +26,16 @@ if ($_GET['action'] == 'new')

   if (! isset($_SESSION['clientcert_cert']))

     system_failure('Kein Zertifikat');

-  add_clientcert($_SESSION['clientcert_cert'], $_SESSION['clientcert_dn'], $_SESSION['clientcert_issuer'], $_SESSION['clientcert_serial']);

+  add_clientcert($_SESSION['clientcert_cert'], $_SESSION['clientcert_dn'], $_SESSION['clientcert_issuer'], 

+                 $_SESSION['clientcert_serial'], $_SESSION['clientcert_valid_from'], $_SESSION['clientcert_valid_until']);

   // Räume session auf

   unset($_SESSION['clientcert_cert']);

   unset($_SESSION['clientcert_dn']);

   unset($_SESSION['clientcert_issuer']);

   unset($_SESSION['clientcert_serial']);

+  unset($_SESSION['clientcert_valid_from']);

+  unset($_SESSION['clientcert_valid_until']);

   header('Location: cert');

 }

 elseif ($_GET['action'] == 'delete')

@@ -54,7 +57,7 @@ elseif ($_GET['action'] == 'delete')

   $sure = user_is_sure();

   if ($sure === NULL)

   {

-    are_you_sure("action=delete&id={$cert['id']}", "Möchten Sie das Zertifikat »{$cert['dn']}« (Seriennummer {$cert['serial']}) wirklich löschen?");

+    are_you_sure("action=delete&id={$cert['id']}", "Möchten Sie das Zertifikat »{$cert['dn']}« (Seriennummer {$cert['serial']}, Gültig von {$cert['valid_from']} bis {$cert['valid_until']}) wirklich löschen?");

   }

   elseif ($sure === true)

   {

@@ -41,7 +41,7 @@ function get_cert_by_id($id)

   $id = (int) $id;

 	if ($id == 0)

 	  system_failure('no ID');

-	$result = db_query("SELECT id,dn,issuer,serial,cert,username,startpage FROM system.clientcert WHERE `id`=?", array($id));

+	$result = db_query("SELECT id,dn,issuer,serial,valid_from,valid_until,cert,username,startpage FROM system.clientcert WHERE `id`=?", array($id));

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

 		return NULL;

 	$ret = $result->fetch();

@@ -54,7 +54,7 @@ function get_certs_by_username($username)

 {

 	if ($username == '')

 	  system_failure('empty username');

-	$result = db_query("SELECT id,dn,issuer,serial,cert,startpage FROM system.clientcert WHERE `username`=?", array($username));

+	$result = db_query("SELECT id,dn,issuer,serial,valid_from,valid_until,cert,startpage FROM system.clientcert WHERE `username`=?", array($username));

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

 		return NULL;

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

@@ -64,7 +64,7 @@ function get_certs_by_username($username)

 }

-function add_clientcert($certdata, $dn, $issuer, $serial, $startpage=NULL)

+function add_clientcert($certdata, $dn, $issuer, $serial, $vstart, $vend, $startpage=NULL)

 {

   $type = NULL;

   $username = NULL;

@@ -91,14 +91,16 @@ function add_clientcert($certdata, $dn, $issuer, $serial, $startpage=NULL)

   $args = array(":dn" => $dn,

                 ":issuer" => $issuer,

                 ":serial" => $serial,

+                ":vstart" => $vstart,

+                ":vend" => $vend,

                 ":certdata" => $certdata,

                 ":type" => $type,

                 ":username" => $username,

                 ":startpage" => $startpage);

   DEBUG($args);

-  db_query("INSERT INTO system.clientcert (`dn`, `issuer`, `serial`, `cert`, `type`, `username`, `startpage`) 

-VALUES (:dn, :issuer, :serial, :certdata, :type, :username, :startpage)", $args);

+  db_query("INSERT INTO system.clientcert (`dn`, `issuer`, `serial`, `valid_from`, `valid_until`, `cert`, `type`, `username`, `startpage`) 

+VALUES (:dn, :issuer, :serial, :vstart, :vend, :certdata, :type, :username, :startpage)", $args);

 }