summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2014-03-13 00:14:36 +0100
committerMichael Tänzer <neo@nhng.de>2014-03-13 00:14:36 +0100
commit37e72c24334d45d699dea669d6831f4c06bef5cd (patch)
tree3b906240ad85b47a111da6e7e573b66e1590663b
parent8568089afac180c1f3ff323a8775f974071a5cda (diff)
downloadcacert-devel-37e72c24334d45d699dea669d6831f4c06bef5cd.tar.gz
cacert-devel-37e72c24334d45d699dea669d6831f4c06bef5cd.tar.xz
cacert-devel-37e72c24334d45d699dea669d6831f4c06bef5cd.zip
bug 1258: drop the SSO option for client certsbug-1258
Signed-off-by: Michael Tänzer <neo@nhng.de>
-rw-r--r--includes/account.php16
-rw-r--r--pages/account/3.php12
2 files changed, 7 insertions, 21 deletions
diff --git a/includes/account.php b/includes/account.php
index 7c3748d..5f8f328 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -245,17 +245,15 @@ function buildSubjectFromSession() {
exit;
}
- if(!(array_key_exists('addid',$_REQUEST) && is_array($_REQUEST['addid'])) && $_REQUEST['SSO'] != '1')
+ if( !(array_key_exists('addid',$_REQUEST) && is_array($_REQUEST['addid'])) )
{
showheader(_("My CAcert.org Account!"));
echo _("I didn't receive a valid Certificate Request, hit the back button and try again.");
showfooter();
exit;
}
-
- $_SESSION['_config']['SSO'] = intval($_REQUEST['SSO']);
-
$_SESSION['_config']['addid'] = $_REQUEST['addid'];
+
if($_SESSION['profile']['points'] >= 50)
$_SESSION['_config']['incname'] = intval($_REQUEST['incname']);
if(array_key_exists('codesign',$_REQUEST) && $_REQUEST['codesign'] != 0 && ($_SESSION['profile']['codesign'] == 0 || $_SESSION['profile']['points'] < 100))
@@ -318,6 +316,7 @@ function buildSubjectFromSession() {
$emails = "";
$addys = array();
$defaultemail="";
+
if(is_array($_SESSION['_config']['addid']))
foreach($_SESSION['_config']['addid'] as $id)
{
@@ -332,7 +331,7 @@ function buildSubjectFromSession() {
$addys[] = intval($row['id']);
}
}
- if($count <= 0 && $_SESSION['_config']['SSO'] != 1)
+ if($count <= 0)
{
$id = 4;
showheader(_("My CAcert.org Account!"));
@@ -340,10 +339,8 @@ function buildSubjectFromSession() {
showfooter();
exit;
}
- $user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".$_SESSION['profile']['id']."'"));
- if($_SESSION['_config']['SSO'] == 1)
- $emails .= "$count.emailAddress = ".$user['uniqueID']."\n";
+ $user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".$_SESSION['profile']['id']."'"));
if(strlen($user['mname']) == 1)
$user['mname'] .= '.';
if(!array_key_exists('incname',$_SESSION['_config']) || $_SESSION['_config']['incname'] <= 0 || $_SESSION['_config']['incname'] > 4)
@@ -440,6 +437,7 @@ function buildSubjectFromSession() {
$csrsubject = "/CN=".$user['fname']." ".$user['lname']." ".$user['suffix'];
if($_SESSION['_config']['incname'] == 4)
$csrsubject = "/CN=".$user['fname']." ".$user['mname']." ".$user['lname']." ".$user['suffix'];
+
if(is_array($_SESSION['_config']['addid']))
foreach($_SESSION['_config']['addid'] as $id)
{
@@ -453,8 +451,6 @@ function buildSubjectFromSession() {
$addys[] = $row['id'];
}
}
- if($_SESSION['_config']['SSO'] == 1)
- $csrsubject .= "/emailAddress = ".$user['uniqueID'];
$tmpname = tempnam("/tmp", "id4csr");
$do = `/usr/bin/openssl req -in $tmpfname -out $tmpname`; // -subj "$csr"`;
diff --git a/pages/account/3.php b/pages/account/3.php
index 7e34300..000fb45 100644
--- a/pages/account/3.php
+++ b/pages/account/3.php
@@ -103,23 +103,13 @@ if($_SESSION['profile']['points'] >= 50)
<?=_("Show advanced options")?>
</td>
</tr>
-
- <tr name="expert">
- <td class="DataTD" colspan="2" align="left">
- <input type="radio" name="SSO" value="0" checked /> <?=_("No Single Sign On ID")?><br />
- <input type="radio" name="SSO" value="1" /> <?=_("Add Single Sign On ID Information")?><br />
- <?=str_replace("\n", "<br>\n", wordwrap(_("By adding Single Sign On (SSO) ID information to your certificates this could be used to track you, you can also issue certificates with no email addresses that are useful only for Authentication. Please see a more detailed description on our WIKI about it."), 125))?>
- <a href="http://wiki.cacert.org/wiki/SSO"><?=_("SSO WIKI Entry")?></a>
- </td>
- </tr>
-
-
<tr name="expert">
<td class="DataTD" colspan="2"><?=_("Optional Client CSR, no information on the certificate will be used")?></td>
</tr>
<tr name="expert">
<td class="DataTD" colspan="2"><textarea name="optionalCSR" cols="80" rows="5"></textarea></td>
</tr>
+
<tr>
<td class="DataTD">
<input type="checkbox" name="CCA" />