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

show current users certificates on profile page

Browse source
This commit is contained in:
Christian Weiske 2011-05-09 18:16:53 +02:00
parent 2fba302003
commit 967ba79ece
7 changed files with 136 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
data/templates/editprofile-sslclientcerts.tpl.php Normal file
View file

@ -0,0 +1,25 @@
<h3><?php echo T_('SSL client certificates'); ?></h3>
<?php if (count($sslClientCerts)) { ?>
<table>
<thead>
<tr>
<th><?php echo T_('Serial'); ?></th>
<th><?php echo T_('Name'); ?></th>
<th><?php echo T_('Email'); ?></th>
<th><?php echo T_('Issuer'); ?></th>
</tr>
</thead>
<tbody>
<?php foreach($sslClientCerts as $cert) { ?>
<tr <?php if ($cert->isCurrent()) { echo 'class="ssl-current"'; } ?>>
<td><?php echo htmlspecialchars($cert->sslSerial); ?></td>
<td><?php echo htmlspecialchars($cert->sslName); ?></td>
<td><?php echo htmlspecialchars($cert->sslEmail); ?></td>
<td><?php echo htmlspecialchars($cert->sslClientIssuerDn); ?></td>
</tr>
<?php } ?>
</tbody>
</table>
<?php } else { ?>
<p><?php echo T_('No certificates registered'); ?></p>
<?php } ?>

4
data/templates/editprofile.tpl.php
View file

@ -50,13 +50,15 @@ $this->includeTemplate($GLOBALS['top_include']);
<td><input type="submit" name="submitted" value="<?php echo T_('Save Changes'); ?>" /></td>
</tr>
</table>
<?php include 'editprofile-sslclientcerts.tpl.php'; ?>
<h3><?php echo T_('Actions'); ?></h3>
<table class="profile">
<tr>
<th align="left"><?php echo T_('Export bookmarks'); ?></th>
<td>
<a href="../api/export_html.php"><?php echo T_('HTML file (for browsers)')?></a> /
<a href="../api/posts_all.php"><?php echo T_('XML file (like del.icio.us)')?></a> /
<a href="../api/posts_all.php"><?php echo T_('XML file (like del.icio.us)')?></a> /
<a href="../api/export_csv.php"><?php echo T_('CSV file (for spreadsheet tools)')?></a>
</td>
</tr>

72
src/SemanticScuttle/Model/User/SslClientCert.php Normal file
View file

@ -0,0 +1,72 @@
<?php
/**
* SemanticScuttle - your social bookmark manager.
*
* PHP version 5.
*
* @category Bookmarking
* @package SemanticScuttle
* @author Christian Weiske <cweiske@cweiske.de>
* @license AGPL http://www.gnu.org/licenses/agpl.html
* @link http://sourceforge.net/projects/semanticscuttle
*/
/**
* SSL client certificate model. Represents one single client certificate
*
* @category Bookmarking
* @package SemanticScuttle
* @author Christian Weiske <cweiske@cweiske.de>
* @license AGPL http://www.gnu.org/licenses/agpl.html
* @link http://sourceforge.net/projects/semanticscuttle
*/
class SemanticScuttle_Model_User_SslClientCert
{
public $id;
public $uId;
public $sslSerial;
public $sslClientIssuerDn;
public $sslName;
public $sslEmail;
/**
* Creates and returns a new object and fills it with
* tha passed values from the database.
*
* @param array $arCertRow Database row array
*
* @return SemanticScuttle_Model_User_SslClientCert
*/
public static function fromDb($arCertRow)
{
$cert = new self();
foreach (get_object_vars($cert) as $variable => $dummy) {
if (isset($arCertRow[$variable])) {
$cert->$variable = $arCertRow[$variable];
}
}
return $cert;
}
/**
* Tells you if this certificate is the one the user is currently browsing
* with.
*
* @return boolean True if this certificate is the current browser's
*/
public function isCurrent()
{
if (!isset($_SERVER['SSL_CLIENT_M_SERIAL'])
|| !isset($_SERVER['SSL_CLIENT_I_DN'])
) {
return false;
}
return $this->sslSerial == $_SERVER['SSL_CLIENT_M_SERIAL']
&& $this->sslClientIssuerDn == $_SERVER['SSL_CLIENT_I_DN'];
}
}
?>

28
src/SemanticScuttle/Service/User/SslClientCert.php
View file

@ -180,5 +180,33 @@ class SemanticScuttle_Service_User_SslClientCert extends SemanticScuttle_DbServi
return (int)$row['uId'];
}
/**
* Fetches all registered certificates for the user from the database
* and returns it.
*
* @return array Array with all certificates for the user. Empty if
* there are none, SemanticScuttle_Model_User_SslClientCert
* objects otherwise.
*/
public function getUserCerts($uId)
{
$query = 'SELECT * FROM ' . $this->getTableName()
. ' ORDER BY sslSerial DESC';
if (!($dbresult = $this->db->sql_query($query))) {
message_die(
GENERAL_ERROR, 'Could not load SSL client certificates',
'', __LINE__, __FILE__, $query, $this->db
);
return array();
}
$certs = array();
while ($row = $this->db->sql_fetchrow($dbresult)) {
$certs[] = SemanticScuttle_Model_User_SslClientCert::fromDb($row);
}
$this->db->sql_freeresult($dbresult);
return $certs;
}
}
?>

1
src/SemanticScuttle/header.php
View file

@ -84,6 +84,7 @@ require_once 'SemanticScuttle/Service/Factory.php';
require_once 'SemanticScuttle/functions.php';
require_once 'SemanticScuttle/Model/Bookmark.php';
require_once 'SemanticScuttle/Model/UserArray.php';
require_once 'SemanticScuttle/Model/User/SslClientCert.php';
if (count($GLOBALS['serviceoverrides']) > 0
&& !defined('UNIT_TEST_MODE')

4
www/profile.php
View file

@ -121,7 +121,9 @@ if (!$userservice->isLoggedOn() || $currentUser->getId() != $userid) {
$templatename = 'editprofile.tpl.php';
$tplVars['formaction'] = createURL('profile', $user);
$tplVars['token'] = $_SESSION['token'];
$tplVars['sslClientCerts'] = SemanticScuttle_Service_Factory::get(
'User_SslClientCert'
)->getUserCerts($currentUser->getId());
}
$tplVars['objectUser'] = $userinfo;

4
www/scuttle.css
View file

@ -455,6 +455,10 @@ table.profile th {
width: 10em;
}
table tr.ssl-current td {
background-color: #AFA;
}
/* OTHER GUFF */
dd {