aliens/SemanticScuttle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

also match client issuer (CA)

Browse source
This commit is contained in:
Christian Weiske 2011-05-05 12:01:39 +02:00
parent b212c837f0
commit c7ec370b47
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/schema/6.sql
View file

@ -7,6 +7,7 @@ CREATE TABLE `sc_users_sslclientcerts` (
`id` INT NOT NULL AUTO_INCREMENT , `id` INT NOT NULL AUTO_INCREMENT ,
`uId` INT NOT NULL , `uId` INT NOT NULL ,
`sslSerial` VARCHAR( 32 ) NOT NULL , `sslSerial` VARCHAR( 32 ) NOT NULL ,
`sslClientIssuerDn` VARCHAR( 1024 ) NOT NULL ,
`sslName` VARCHAR( 64 ) NOT NULL , `sslName` VARCHAR( 64 ) NOT NULL ,
`sslEmail` VARCHAR( 64 ) NOT NULL , `sslEmail` VARCHAR( 64 ) NOT NULL ,
PRIMARY KEY ( `id` ) , PRIMARY KEY ( `id` ) ,

1
data/tables.sql
View file

@ -81,6 +81,7 @@ CREATE TABLE `sc_users_sslclientcerts` (
`id` INT NOT NULL AUTO_INCREMENT , `id` INT NOT NULL AUTO_INCREMENT ,
`uId` INT NOT NULL , `uId` INT NOT NULL ,
`sslSerial` VARCHAR( 32 ) NOT NULL , `sslSerial` VARCHAR( 32 ) NOT NULL ,
`sslClientIssuerDn` VARCHAR( 1024 ) NOT NULL ,
`sslName` VARCHAR( 64 ) NOT NULL , `sslName` VARCHAR( 64 ) NOT NULL ,
`sslEmail` VARCHAR( 64 ) NOT NULL , `sslEmail` VARCHAR( 64 ) NOT NULL ,
PRIMARY KEY ( `id` ) , PRIMARY KEY ( `id` ) ,

14
src/SemanticScuttle/Service/User.php
View file

@ -439,18 +439,26 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
{ {
if (!isset($_SERVER['SSL_CLIENT_M_SERIAL']) if (!isset($_SERVER['SSL_CLIENT_M_SERIAL'])
|| !isset($_SERVER['SSL_CLIENT_V_END']) || !isset($_SERVER['SSL_CLIENT_V_END'])
|| !isset($_SERVER['SSL_CLIENT_VERIFY'])
|| $_SERVER['SSL_CLIENT_VERIFY'] !== 'SUCCESS'
|| !isset($_SERVER['SSL_CLIENT_I_DN'])
) { ) {
return false; return false;
} }
//TODO: verify this var is always there
if ($_SERVER['SSL_CLIENT_V_REMAIN'] <= 0) { if ($_SERVER['SSL_CLIENT_V_REMAIN'] <= 0) {
return false; return false;
} }
$serial = $_SERVER['SSL_CLIENT_M_SERIAL']; $serial = $_SERVER['SSL_CLIENT_M_SERIAL'];
$clientIssuerDn = $_SERVER['SSL_CLIENT_I_DN'];
$query = 'SELECT uId' $query = 'SELECT uId'
. ' FROM ' . $this->getTableName() . '_sslclientcerts' . ' FROM ' . $this->getTableName() . '_sslclientcerts'
. ' WHERE sslSerial = \'' . $this->db->sql_escape($serial) . '\''; . ' WHERE sslSerial = \'' . $this->db->sql_escape($serial) . '\''
. ' AND sslClientIssuerDn = \''
. $this->db->sql_escape($clientIssuerDn)
. '\'';
if (!($dbresult = $this->db->sql_query($query))) { if (!($dbresult = $this->db->sql_query($query))) {
message_die( message_die(
GENERAL_ERROR, 'Could not load user for client certificate', GENERAL_ERROR, 'Could not load user for client certificate',