cacert/cacert-webdb
9
0
Fork 0
Code Issues Pull requests 3 Projects Releases 4 Wiki Activity

http://bugs.cacert.org/view.php?id=517

Browse source
This commit is contained in:
root 2009-04-19 23:00:56 +00:00
parent ab926495bd
commit 6969166ae8
1 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
www/gpg.php
View file

@ -40,7 +40,7 @@
{ {
$_SESSION['_config']['errmsg'] = _("You failed to paste a valid GPG/PGP key."); $_SESSION['_config']['errmsg'] = _("You failed to paste a valid GPG/PGP key.");
$id = $oldid; $id = $oldid;
unset($oldid); $oldid=0;
} }
} }
@ -79,7 +79,7 @@ function verifyEmail($email)
$ToBeDeleted=array(); $ToBeDeleted=array();
$state=0;
if($oldid == "0" && $CSR != "") if($oldid == "0" && $CSR != "")
{ {
$debugkey = $gpgkey = clean_csr($CSR); $debugkey = $gpgkey = clean_csr($CSR);
@ -106,9 +106,9 @@ function verifyEmail($email)
$lastvalidemail=""; $lastvalidemail="";
foreach(explode("\n", $gpg) as $line) foreach(explode("\n", $gpg) as $line)
{ {
$bits = explode(":", $line);
$resulttable.="<tr><td>".++$i."</td>"; $resulttable.="<tr><td>".++$i."</td>";
$name = $comment = ""; $name = $comment = "";
$bits = explode(":", $line);
if($bits[0] == "pub" && (!$keyid || !$when)) if($bits[0] == "pub" && (!$keyid || !$when))
{ {
$keyid = $bits[4]; $keyid = $bits[4];
@ -116,38 +116,13 @@ function verifyEmail($email)
if($bits[6] != "") if($bits[6] != "")
$expires = 1; $expires = 1;
} }
//if(!strstr($line, "@")) continue; $name="";
$comm="";
$pos = strpos($bits[9], "(") - 1;
$nocomment = 0;
if($pos < 0)
{
$nocomment = 1;
$pos = strpos($bits[9], "<") - 1;
}
if($pos < 0)
{
$pos = strlen($bits[9]);
}
$name = trim(hex2bin(trim(substr($bits[9], 0, $pos))));
$nameok=verifyName($name);
$resulttable.="<td bgcolor='#".($nameok?"c0ffc0":"ffc0c0")."'>$name</td>";
if($nocomment == 0 && (strpos($bits[9],")")>$pos))
{
$pos += 2;
$pos2 = strpos($bits[9], ")");
$comm = trim(hex2bin(trim(substr($bits[9], $pos, $pos2 - $pos))));
if($comm != "")
$comment[] = $comm;
$pos = $pos2 + 3;
} else {
$pos = strpos($bits[9], "<") + 1;
}
$mail=""; $mail="";
$uidformatwrong=0;
if(sizeof($bits)<10) $uidformatwrong=1;
if(preg_match("/\@.*\@/",$bits[9])) if(preg_match("/\@.*\@/",$bits[9]))
{ {
showheader(_("Welcome to CAcert.org")); showheader(_("Welcome to CAcert.org"));
@ -158,23 +133,48 @@ function verifyEmail($email)
unset($oldid); unset($oldid);
exit(); exit();
} }
if (preg_match("/<([\w.-]*\@[\w.-]*)>/", $bits[9],$match)) {
//echo "Found: ".$match[1]; // Name (Comment) <Email>
$mail = trim(hex2bin($match[1])); if(preg_match("/^([^\(\)\[@<>]+) \(([^\(\)@<>]*)\) <([\w=\/%.-]*\@[\w.-]*|[\w.-]*\![\w=\/%.-]*)>/",$bits[9],$matches))
{
$name=trim(hex2bin($matches[1]));
$nocomment=0;
$comm=trim(hex2bin($matches[2]));
$mail=trim(hex2bin($matches[3]));
} }
// Name <EMail>
elseif(preg_match("/^([^\(\)\[@<>]+) <([\w=\/%.-]*\@[\w.-]*|[\w.-]*\![\w=\/%.-]*)>/",$bits[9],$matches))
{
$name=trim(hex2bin($matches[1]));
$nocomment=1;
$comm="";
$mail=trim(hex2bin($matches[2]));
}
// Unrecognized format
else else
{ {
//echo "Not found!\n"; $nocomment=1;
$uidformatwrong=1;
} }
$nameok=verifyName($name);
$emailok=verifyEmail($mail); $emailok=verifyEmail($mail);
$resulttable.="<td bgcolor='#".($emailok?"c0ffc0":"ffc0c0")."'>$mail</td>";
if($comm != "")
$comment[] = $comm;
$resulttable.="<td bgcolor='#".($nameok?"c0ffc0":"ffc0c0")."'>".sanitizeHTML($name)."</td>";
$resulttable.="<td bgcolor='#".($emailok?"c0ffc0":"ffc0c0")."'>".sanitizeHTML($mail)."</td>";
$uidok=0; $uidok=0;
if($bits[1]=="r") if($bits[1]=="r")
{ {
$rmessage=_("Error: UID is revoked"); $rmessage=_("Error: UID is revoked");
} }
elseif($uidformatwrong==1)
{
$rmessage=_("The format of the UID was not recognized. Please use 'Name (comment) &lt;email@domain>' ");
}
elseif($mail=="" and $name=="") elseif($mail=="" and $name=="")
{ {
$rmessage=_("Error: Both Name and Email address are empty"); $rmessage=_("Error: Both Name and Email address are empty");
@ -222,7 +222,7 @@ function verifyEmail($email)
$nerr++; $nerr++;
//$ToBeDeleted[]=$i; //$ToBeDeleted[]=$i;
//echo "Adding UID $i\n"; //echo "Adding UID $i\n";
$resulttable.="<td bgcolor='#ffc0c0'>$rmessage</td>"; $resulttable.="<td bgcolor='#ffc0c0'>".sanitizeHTML($rmessage)."</td>";
} }
$resulttable.="</tr>\n"; $resulttable.="</tr>\n";
@ -368,7 +368,7 @@ function verifyEmail($email)
if(count($ToBeDeleted)>0) if(count($ToBeDeleted)>0)
{ {
$state=0;
$descriptorspec = array( $descriptorspec = array(
0 => array("pipe", "r"), // stdin is a pipe that the child will read from 0 => array("pipe", "r"), // stdin is a pipe that the child will read from