diff options
103 files changed, 11727 insertions, 8812 deletions
diff --git a/CommModule/.gitignore b/CommModule/.gitignore new file mode 100644 index 0000000..40a9309 --- /dev/null +++ b/CommModule/.gitignore @@ -0,0 +1,19 @@ +# Ignore autogenerated serial conf file +/serial.conf +/serialserver.conf + +# Ignore *-active files +/client.pl-active +/server.pl-active + +# Ignore log files +/logfile20??-??-??.txt +/nohup.out +/oldlogs/ + +# Ignore working files generated by the signer +/currentcrls/ +/delta?.diff +/revoke-root?.crl +/timesync.sh +/work/ diff --git a/CommModule/client.pl b/CommModule/client.pl index bd3eb02..8b29d62 100755 --- a/CommModule/client.pl +++ b/CommModule/client.pl @@ -40,8 +40,8 @@ my $paranoid=1; my $debug=0; -#my $serialport="/dev/ttyS0"; -my $serialport="/dev/ttyUSB0"; +my $serialport="/dev/ttyS1"; +#my $serialport="/dev/ttyUSB0"; my $gpgbin="/usr/bin/gpg"; @@ -444,9 +444,9 @@ sub calculateDays($) my @sum = $dbh->selectrow_array("select sum(`points`) as `total` from `notary` where `to`='".$_[0]."' group by `to`"); SysLog("Summe: $sum[0]\n") if($debug); - return ($sum[0]>=50)?730:180; + return ($sum[0]>=50)?30:3; } - return 180; + return 3; } sub X509extractSAN($) @@ -832,7 +832,7 @@ sub HandleCerts($$) SysLog "SAN: --$SAN--\n" if($debug); SysLog "memid: $row{'memid'}\n" if($debug); - my $days=$org?($server?(365*2):365):calculateDays($row{"memid"}); + my $days=$org?($server?(30):7):calculateDays($row{"memid"}); my $md_id = 0; $md_id = 1 if( $row{'md'} eq "md5"); diff --git a/CommModule/serial.conf b/CommModule/serial.conf deleted file mode 100755 index bd9980c..0000000 --- a/CommModule/serial.conf +++ /dev/null @@ -1,32 +0,0 @@ -Device::SerialPort_Configuration_File -- DO NOT EDIT -- -/dev/ttyUSB0 - -C_CFLAG,7346 -C_IFLAG,0 -C_ISPEED,4098 -C_LFLAG,2608 -C_OFLAG,4 -C_OSPEED,4098 -C_VERASE,127 -C_VQUIT,28 -C_VSUSP,26 -C_VINTR,3 -C_VSTOP,19 -C_VSTART,17 -C_VKILL,21 -C_VMIN,0 -C_VEOF,4 -C_VEOL,0 -C_VTIME,0 -CFG_1,none -RCONST,0 -CFG_2,none -HNAME,localhost -ALIAS,/dev/ttyUSB0 -CFG_3,none -U_MSG,0 -DATYPE,raw -E_MSG,0 -HADDR,0 -RTOT,0 -DVTYPE,none diff --git a/config/ttp.ini b/config/ttp.ini new file mode 100644 index 0000000..d0a0913 --- /dev/null +++ b/config/ttp.ini @@ -0,0 +1,6 @@ +; list of countries and the TTP CAP form to be used +[ttp_country] +Australia=ttp +Puerto Rico=ttp +US Virgin Island=ttp +USA =ttp
\ No newline at end of file @@ -0,0 +1 @@ +# This directory has to be writeable by the web server @@ -0,0 +1 @@ +# This directory has to be writeable by the web server diff --git a/includes/account.php b/includes/account.php index 7e85cac..372028b 100644 --- a/includes/account.php +++ b/includes/account.php @@ -83,6 +83,9 @@ function buildSubjectFromSession() { $orgid = array_key_exists('orgid',$_REQUEST) ? intval($_REQUEST['orgid']) : 0; $memid = array_key_exists('memid',$_REQUEST) ? intval($_REQUEST['memid']) : 0; $domid = array_key_exists('domid',$_REQUEST) ? intval($_REQUEST['domid']) : 0; + $ticketno = array_key_exists('ticketno',$_REQUEST) ? $_REQUEST['ticketno'] : ""; + $ticketvalidation = FALSE; + $actionrequest = array_key_exists('action',$_REQUEST) ? $_REQUEST['action'] : ""; if(!$_SESSION['mconn']) @@ -981,8 +984,12 @@ function buildSubjectFromSession() { continue; } mysql_query("update `domaincerts` set `revoked`='1970-01-01 10:00:01' where `id`='$id'"); - printf(_("Certificate for '%s' has been revoked.")."<br>\n", $row['CN']); + printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'<br/>', htmlspecialchars($row['CN']), htmlspecialchars($row['serial'])); } + + // TRANSLATORS: Please don't translate "Certificate Revocation List (CRL)", it's a technical term + echo '<br/>'._('All listed certificates will be added to the Certificate Revocation List (CRL) soon.').'<br/>'; + } else { @@ -1137,8 +1144,11 @@ function buildSubjectFromSession() { continue; } mysql_query("update `emailcerts` set `revoked`='1970-01-01 10:00:01' where `id`='$id'"); - printf(_("Certificate for '%s' has been revoked.")."<br>\n", $row['CN']); + printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'<br/>', htmlspecialchars($row['CN']), htmlspecialchars($row['serial'])); } + + // TRANSLATORS: Please don't translate "Certificate Revocation List (CRL)", it's a technical term + echo '<br/>'._('All listed certificates will be added to the Certificate Revocation List (CRL) soon.').'<br/>'; } else { @@ -1200,6 +1210,23 @@ function buildSubjectFromSession() { exit; } + if($oldid == 6 && $_REQUEST['certid'] != "") + { + if(trim($_REQUEST['description']) != ""){ + $description= trim(mysql_real_escape_string(stripslashes($_REQUEST['description']))); + }else{ + $description= ""; + } + + if(trim($_REQUEST['disablelogin']) == "1"){ + $disablelogin = 1; + }else{ + $disablelogin = 0; + } + + mysql_query("update `emailcerts` set `disablelogin`='$disablelogin', `description`='$description' where `id`='".$_REQUEST['certid']."' and `memid`='".$_SESSION['profile']['id']."'"); + } + if($oldid == 13 && $process != "" && $showdetails!="") { csrf_check("perschange"); @@ -1265,7 +1292,7 @@ function buildSubjectFromSession() { if($oldid == 13 && $process != "") { - $ddquery = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['profile']['id']."' group by `to`"; + $ddquery = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['profile']['id']."' and `deleted` = 0 group by `to`"; $ddres = mysql_query($ddquery); $ddrow = mysql_fetch_assoc($ddres); $_SESSION['profile']['points'] = $ddrow['total']; @@ -1337,7 +1364,7 @@ function buildSubjectFromSession() { $_SESSION['profile'] = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".$_SESSION['profile']['id']."'")); $_SESSION['profile']['loggedin'] = 1; - $ddquery = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['profile']['id']."' group by `to`"; + $ddquery = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['profile']['id']."' and `deleted` = 0 group by `to`"; $ddres = mysql_query($ddquery); $ddrow = mysql_fetch_assoc($ddres); $_SESSION['profile']['points'] = $ddrow['total']; @@ -1768,8 +1795,11 @@ function buildSubjectFromSession() { continue; } mysql_query("update `orgemailcerts` set `revoked`='1970-01-01 10:00:01' where `id`='$id'"); - printf(_("Certificate for '%s' has been revoked.")."<br>\n", $row['CN']); + printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'<br/>', htmlspecialchars($row['CN']), htmlspecialchars($row['serial'])); } + + // TRANSLATORS: Please don't translate "Certificate Revocation List (CRL)", it's a technical term + echo '<br/>'._('All listed certificates will be added to the Certificate Revocation List (CRL) soon.').'<br/>'; } else { @@ -2128,8 +2158,11 @@ function buildSubjectFromSession() { continue; } mysql_query("update `orgdomaincerts` set `revoked`='1970-01-01 10:00:01' where `id`='$id'"); - printf(_("Certificate for '%s' has been revoked.")."<br>\n", $row['CN']); + printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'<br/>', htmlspecialchars($row['CN']), htmlspecialchars($row['serial'])); } + + // TRANSLATORS: Please don't translate "Certificate Revocation List (CRL)", it's a technical term + echo '<br/>'._('All listed certificates will be added to the Certificate Revocation List (CRL) soon.').'<br/>'; } else { @@ -2691,7 +2724,17 @@ function buildSubjectFromSession() { $oldid=0; } - if($oldid == 43 && $_REQUEST['action'] == "updatedob") + //check if ticket number was entered + if ( $id == 43 || $oldid == 43 || $id == 44 || $oldid == 44 ) { + if ($ticketno != "" ) { + $ticketno = mysql_real_escape_string(trim($_REQUEST['ticketno'])); + $ticketvalidation = valid_ticket_number($ticketno); + } + + $_SESSION['ticketno'] = $ticketno; + } + + if($oldid == 43 && $actionrequest == "updatedob" && $ticketvalidation == TRUE) { $id = 43; $oldid=0; @@ -2703,20 +2746,25 @@ function buildSubjectFromSession() { $month = intval($_REQUEST['month']); $year = intval($_REQUEST['year']); $userid = intval($_REQUEST['userid']); - $query = "select `fname`,`mname`,`lname`,`suffix`,`dob` from `users` where `id`='$userid'"; - $details = mysql_fetch_assoc(mysql_query($query)); - $query = "insert into `adminlog` set `when`=NOW(),`old-lname`='${details['lname']}',`old-dob`='${details['dob']}', - `new-lname`='$lname',`new-dob`='$year-$month-$day',`uid`='$userid',`adminid`='".$_SESSION['profile']['id']."'"; - mysql_query($query); $query = "update `users` set `fname`='$fname',`mname`='$mname',`lname`='$lname',`suffix`='$suffix',`dob`='$year-$month-$day' where `id`='$userid'"; mysql_query($query); + write_se_log($userid, $_SESSION['profile']['id'],'SE Name/DOB Change',$ticketno); + }elseif($oldid == 43 && $actionrequest == "updatedob" && $ticketvalidation == FALSE){ + $id = 43; + $oldid=0; + $_SESSION['ticketmsg']='No action (name/dob change) taken. Ticket number is missing!'; } - if($oldid == 43 && $_REQUEST['action'] == 'revokecert') + if($oldid == 43 && $actionrequest == 'revokecert' && $ticketvalidation == TRUE) { $userid = intval($_REQUEST['userid']); revoke_all_private_cert($userid); + write_se_log($userid, $_SESSION['profile']['id'], 'SE Revoke all certificates',$ticketno); $id=43; + }elseif($oldid == 43 && $actionrequest == "revokecert" && $ticketvalidation == FALSE){ + $id = 43; + $oldid=0; + $_SESSION['ticketmsg']='No certificates revokes. Ticket number is missing!'; } if($oldid == 48 && $_REQUEST['domain'] == "") @@ -2733,7 +2781,7 @@ function buildSubjectFromSession() { if($id == 44) { - if($_REQUEST['userid'] != "") + if(intval($_REQUEST['userid']) != "") $_REQUEST['userid'] = intval($_REQUEST['userid']); $row = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($_REQUEST['userid'])."'")); if($row['email'] == "") @@ -2742,7 +2790,7 @@ function buildSubjectFromSession() { $_REQUEST['email'] = $row['email']; } - if($oldid == 44) + if($oldid == 44 && $ticketvalidation == TRUE) { showheader(_("My CAcert.org Account!")); if(intval($_REQUEST['userid']) <= 0) @@ -2753,7 +2801,8 @@ function buildSubjectFromSession() { $row = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($_REQUEST['userid'])."'")); printf(_("The password for %s has been updated successfully in the system."), sanitizeHTML($row['email'])); - + $my_translation = L10n::get_translation(); + L10n::set_recipient_language(intval($_REQUEST['userid'])); $body = sprintf(_("Hi %s,"),$row['fname'])."\n\n"; $body .= _("You are receiving this email because a CAcert administrator ". "has changed the password on your account.")."\n\n"; @@ -2762,12 +2811,17 @@ function buildSubjectFromSession() { sendmail($row['email'], "[CAcert.org] "._("Password Update Notification"), $body, "support@cacert.org", "", "", "CAcert Support"); + L10n::set_translation($my_translation); + write_se_log(intval($_REQUEST['userid']), $_SESSION['profile']['id'],'SE reset password',$ticketno); } showfooter(); exit; + }elseif($oldid == 44 && $ticketvalidation == FALSE){ + $_SESSION['ticketmsg']='No password reset taken. Ticket number is missing!'; } + if($process != "" && $oldid == 45) { $CSR = clean_csr($CSR); @@ -2860,16 +2914,20 @@ function buildSubjectFromSession() { } } - if($id == 43 && array_key_exists('tverify',$_REQUEST) && $_REQUEST['tverify'] > 0) + /* presently not needed + if($id == 43 && array_key_exists('tverify',$_REQUEST) && $_REQUEST['tverify'] > 0 && $ticketvalidation==TRUE) { $memid = $_REQUEST['userid'] = intval($_REQUEST['tverify']); $query = "select * from `users` where `id`='$memid'"; $row = mysql_fetch_assoc(mysql_query($query)); $ver = !$row['tverify']; mysql_query("update `users` set `tverify`='$ver' where `id`='$memid'"); + write_se_log($memid, $_SESSION['profile']['id'],'SE Change tverify status',$ticketno); + }else{ + $_SESSION['ticketmsg']='No action taken. Ticket number is missing!'; } - - if($id == 43 && array_key_exists('assurer',$_REQUEST) && $_REQUEST['assurer'] > 0) + */ + if($id == 43 && array_key_exists('assurer',$_REQUEST) && $_REQUEST['assurer'] > 0 && $ticketvalidation == TRUE) { csrf_check('admsetassuret'); $memid = $_REQUEST['userid'] = intval($_REQUEST['assurer']); @@ -2877,18 +2935,26 @@ function buildSubjectFromSession() { $row = mysql_fetch_assoc(mysql_query($query)); $ver = !$row['assurer']; mysql_query("update `users` set `assurer`='$ver' where `id`='$memid'"); + write_se_log($memid, $_SESSION['profile']['id'],'SE Change assurer status',$ticketno); + }elseif($id == 43 && array_key_exists('assurer',$_REQUEST) && $_REQUEST['assurer'] > 0 && $ticketvalidation == FALSE){ + $_REQUEST['userid'] = intval($_REQUEST['assurer']); + $_SESSION['ticketmsg']='No action (Change assurer status) taken. Ticket number is missing!'; } - if($id == 43 && array_key_exists('assurer_blocked',$_REQUEST) && $_REQUEST['assurer_blocked'] > 0) + if($id == 43 && array_key_exists('assurer_blocked',$_REQUEST) && $_REQUEST['assurer_blocked'] > 0 && $ticketvalidation == TRUE) { $memid = $_REQUEST['userid'] = intval($_REQUEST['assurer_blocked']); $query = "select * from `users` where `id`='$memid'"; $row = mysql_fetch_assoc(mysql_query($query)); $ver = !$row['assurer_blocked']; mysql_query("update `users` set `assurer_blocked`='$ver' where `id`='$memid'"); + write_se_log($memid, $_SESSION['profile']['id'],'SE Change assurer blocked status',$ticketno); + }elseif($id == 43 && array_key_exists('assurer_blocked',$_REQUEST) && $_REQUEST['assurer_blocked'] > 0 && $ticketvalidation == FALSE){ + $_REQUEST['userid'] = intval($_REQUEST['assurer_blocked']); + $_SESSION['ticketmsg']='No action taken. Ticket number is missing!'; } - if($id == 43 && array_key_exists('locked',$_REQUEST) && $_REQUEST['locked'] > 0) + if($id == 43 && array_key_exists('locked',$_REQUEST) && $_REQUEST['locked'] > 0 && $ticketvalidation == TRUE) { csrf_check('admactlock'); $memid = $_REQUEST['userid'] = intval($_REQUEST['locked']); @@ -2896,9 +2962,13 @@ function buildSubjectFromSession() { $row = mysql_fetch_assoc(mysql_query($query)); $ver = !$row['locked']; mysql_query("update `users` set `locked`='$ver' where `id`='$memid'"); + write_se_log($memid, $_SESSION['profile']['id'],'SE Change locked status',$ticketno); + }elseif($id == 43 && array_key_exists('locked',$_REQUEST) && $_REQUEST['locked'] > 0 && $ticketvalidation == FALSE){ + $_REQUEST['userid'] = intval($_REQUEST['locked']); + $_SESSION['ticketmsg']='No action taken. Ticket number is missing!'; } - if($id == 43 && array_key_exists('codesign',$_REQUEST) && $_REQUEST['codesign'] > 0) + if($id == 43 && array_key_exists('codesign',$_REQUEST) && $_REQUEST['codesign'] > 0 && $ticketvalidation == TRUE) { csrf_check('admcodesign'); $memid = $_REQUEST['userid'] = intval($_REQUEST['codesign']); @@ -2906,9 +2976,13 @@ function buildSubjectFromSession() { $row = mysql_fetch_assoc(mysql_query($query)); $ver = !$row['codesign']; mysql_query("update `users` set `codesign`='$ver' where `id`='$memid'"); + write_se_log($memid, $_SESSION['profile']['id'],'SE Change codesign status',$ticketno); + }elseif($id == 43 && array_key_exists('codesign',$_REQUEST) && $_REQUEST['codesign'] > 0 && $ticketvalidation == FALSE){ + $_REQUEST['userid'] = intval($_REQUEST['codesign']); + $_SESSION['ticketmsg']='No action taken. Ticket number is missing!'; } - if($id == 43 && array_key_exists('orgadmin',$_REQUEST) && $_REQUEST['orgadmin'] > 0) + if($id == 43 && array_key_exists('orgadmin',$_REQUEST) && $_REQUEST['orgadmin'] > 0 && $ticketvalidation == TRUE) { csrf_check('admorgadmin'); $memid = $_REQUEST['userid'] = intval($_REQUEST['orgadmin']); @@ -2916,9 +2990,13 @@ function buildSubjectFromSession() { $row = mysql_fetch_assoc(mysql_query($query)); $ver = !$row['orgadmin']; mysql_query("update `users` set `orgadmin`='$ver' where `id`='$memid'"); + write_se_log($memid, $_SESSION['profile']['id'],'SE Change org assuer status',$ticketno); + }elseif($id == 43 && array_key_exists('orgadmin',$_REQUEST) && $_REQUEST['orgadmin'] > 0 && $ticketvalidation == FALSE){ + $_REQUEST['userid'] = intval($_REQUEST['orgadmin']); + $_SESSION['ticketmsg']='No action taken. Ticket number is missing!'; } - if($id == 43 && array_key_exists('ttpadmin',$_REQUEST) && $_REQUEST['ttpadmin'] > 0) + if($id == 43 && array_key_exists('ttpadmin',$_REQUEST) && $_REQUEST['ttpadmin'] > 0 && $ticketvalidation == TRUE) { csrf_check('admttpadmin'); $memid = $_REQUEST['userid'] = intval($_REQUEST['ttpadmin']); @@ -2926,9 +3004,13 @@ function buildSubjectFromSession() { $row = mysql_fetch_assoc(mysql_query($query)); $ver = !$row['ttpadmin']; mysql_query("update `users` set `ttpadmin`='$ver' where `id`='$memid'"); + write_se_log($memid, $_SESSION['profile']['id'],'SE Change ttp admin status',$ticketno); + }elseif($id == 43 && array_key_exists('ttpadmin',$_REQUEST) && $_REQUEST['ttpadmin'] > 0 && $ticketvalidation == FALSE){ + $_REQUEST['userid'] = intval($_REQUEST['ttpadmin']); + $_SESSION['ticketmsg']='No action taken. Ticket number is missing!'; } - if($id == 43 && array_key_exists('adadmin',$_REQUEST) && $_REQUEST['adadmin'] > 0) + if($id == 43 && array_key_exists('adadmin',$_REQUEST) && $_REQUEST['adadmin'] > 0 && $ticketvalidation == TRUE) { $memid = $_REQUEST['userid'] = intval($_REQUEST['adadmin']); $query = "select * from `users` where `id`='$memid'"; @@ -2937,18 +3019,26 @@ function buildSubjectFromSession() { if($ver > 2) $ver = 0; mysql_query("update `users` set `adadmin`='$ver' where `id`='$memid'"); + write_se_log($memid, $_SESSION['profile']['id'],'SE Change advertising admin status',$ticketno); + }elseif($id == 43 && array_key_exists('adadmin',$_REQUEST) && $_REQUEST['adadmin'] > 0 && $ticketvalidation == FALSE){ + $_REQUEST['userid'] = intval($_REQUEST['adadmin']); + $_SESSION['ticketmsg']='No action taken. Ticket number is missing!'; } - if($id == 43 && array_key_exists('locadmin',$_REQUEST) && $_REQUEST['locadmin'] > 0) + if($id == 43 && array_key_exists('locadmin',$_REQUEST) && $_REQUEST['locadmin'] > 0 && $ticketvalidation == TRUE) { $memid = $_REQUEST['userid'] = intval($_REQUEST['locadmin']); $query = "select * from `users` where `id`='$memid'"; $row = mysql_fetch_assoc(mysql_query($query)); $ver = !$row['locadmin']; mysql_query("update `users` set `locadmin`='$ver' where `id`='$memid'"); + write_se_log($memid, $_SESSION['profile']['id'],'SE Change location admin status',$ticketno); + }elseif($id == 43 && array_key_exists('locadmin',$_REQUEST) && $_REQUEST['locadmin'] > 0 && $ticketvalidation == FALSE){ + $_REQUEST['userid'] = intval($_REQUEST['locadmin']); + $_SESSION['ticketmsg']='No action taken. Ticket number is missing!'; } - if($id == 43 && array_key_exists('admin',$_REQUEST) && $_REQUEST['admin'] > 0) + if($id == 43 && array_key_exists('admin',$_REQUEST) && $_REQUEST['admin'] > 0 && $ticketvalidation == TRUE) { csrf_check('admsetadmin'); $memid = $_REQUEST['userid'] = intval($_REQUEST['admin']); @@ -2956,47 +3046,67 @@ function buildSubjectFromSession() { $row = mysql_fetch_assoc(mysql_query($query)); $ver = !$row['admin']; mysql_query("update `users` set `admin`='$ver' where `id`='$memid'"); + write_se_log($memid, $_SESSION['profile']['id'],'SE Change SE status',$ticketno); + }elseif($id == 43 && array_key_exists('admin',$_REQUEST) && $_REQUEST['admin'] > 0 && $ticketvalidation == FALSE){ + $_REQUEST['userid'] = intval($_REQUEST['admin']); + $_SESSION['ticketmsg']='No action taken. Ticket number is missing!'; } - if($id == 43 && array_key_exists('general',$_REQUEST) && $_REQUEST['general'] > 0) + if($id == 43 && array_key_exists('general',$_REQUEST) && $_REQUEST['general'] > 0 && $ticketvalidation == TRUE) { $memid = $_REQUEST['userid'] = intval($_REQUEST['general']); $query = "select * from `alerts` where `memid`='$memid'"; $row = mysql_fetch_assoc(mysql_query($query)); $ver = !$row['general']; mysql_query("update `alerts` set `general`='$ver' where `memid`='$memid'"); + write_se_log($memid, $_SESSION['profile']['id'],'SE Change general status',$ticketno); + }elseif($id == 43 && array_key_exists('general',$_REQUEST) && $_REQUEST['general'] > 0 && $ticketvalidation == FALSE){ + $_REQUEST['userid'] = intval($_REQUEST['general']); + $_SESSION['ticketmsg']='No action taken. Ticket number is missing!'; } - if($id == 43 && array_key_exists('country',$_REQUEST) && $_REQUEST['country'] > 0) + if($id == 43 && array_key_exists('country',$_REQUEST) && $_REQUEST['country'] > 0 && $ticketvalidation == TRUE) { $memid = $_REQUEST['userid'] = intval($_REQUEST['country']); $query = "select * from `alerts` where `memid`='$memid'"; $row = mysql_fetch_assoc(mysql_query($query)); $ver = !$row['country']; mysql_query("update `alerts` set `country`='$ver' where `memid`='$memid'"); + write_se_log($memid, $_SESSION['profile']['id'],'SE Change country status',$ticketno); + }elseif($id == 43 && array_key_exists('country',$_REQUEST) && $_REQUEST['country'] > 0 && $ticketvalidation == FALSE){ + $_REQUEST['userid'] = intval($_REQUEST['country']); + $_SESSION['ticketmsg']='No action taken. Ticket number is missing!'; } - if($id == 43 && array_key_exists('regional',$_REQUEST) && $_REQUEST['regional'] > 0) + if($id == 43 && array_key_exists('regional',$_REQUEST) && $_REQUEST['regional'] > 0 && $ticketvalidation == TRUE) { $memid = $_REQUEST['userid'] = intval($_REQUEST['regional']); $query = "select * from `alerts` where `memid`='$memid'"; $row = mysql_fetch_assoc(mysql_query($query)); $ver = !$row['regional']; mysql_query("update `alerts` set `regional`='$ver' where `memid`='$memid'"); + write_se_log($memid, $_SESSION['profile']['id'],'SE Change regional status',$ticketno); + }elseif($id == 43 && array_key_exists('regional',$_REQUEST) && $_REQUEST['regional'] > 0 && $ticketvalidation == FALSE){ + $_REQUEST['userid'] = intval($_REQUEST['regional']); + $_SESSION['ticketmsg']='No action taken. Ticket number is missing!'; } - if($id == 43 && array_key_exists('radius',$_REQUEST) && $_REQUEST['radius'] > 0) + if($id == 43 && array_key_exists('radius',$_REQUEST) && $_REQUEST['radius'] > 0 && $ticketvalidation == TRUE) { $memid = $_REQUEST['userid'] = intval($_REQUEST['radius']); $query = "select * from `alerts` where `memid`='$memid'"; $row = mysql_fetch_assoc(mysql_query($query)); $ver = !$row['radius']; mysql_query("update `alerts` set `radius`='$ver' where `memid`='$memid'"); + write_se_log($memid, $_SESSION['profile']['id'],'SE Change radius status',$ticketno); + }elseif($id == 43 && array_key_exists('radius',$_REQUEST) && $_REQUEST['radius'] > 0 && $ticketvalidation == false){ + $_REQUEST['userid'] = intval($_REQUEST['radius']); + $_SESSION['ticketmsg']='No action taken. Ticket number is missing!'; } if($id == 50) { - if(array_key_exists('userid',$_REQUEST) && $_REQUEST['userid'] != "") + if(array_key_exists('userid',$_REQUEST) && intval($_REQUEST['userid']) != "") $_REQUEST['userid'] = intval($_REQUEST['userid']); $row = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($_REQUEST['userid'])."'")); @@ -3018,38 +3128,54 @@ function buildSubjectFromSession() { if (trim($_REQUEST['arbitrationno'])==""){ showheader(_("My CAcert.org Account!")); echo _("You did not enter an arbitration number entry."); + printf('<br/><a href="account.php?id=43&userid=' . intval($_REQUEST['userid']) . '">' . _('Back to previous page.') .'</a>'); showfooter(); exit; } if ( 1 !== preg_match('/^[a-z]\d{8}\.\d+\.\d+$/i',trim($_REQUEST['arbitrationno'])) ) { showheader(_("My CAcert.org Account!")); printf(_("'%s' is not a valid arbitration number entry."), sanitizeHTML(trim($_REQUEST['arbitrationno']))); + printf('<br/><a href="account.php?id=43&userid=' . intval($_REQUEST['userid']) . '">' . _('Back to previous page.') .'</a>'); showfooter(); exit; } if (check_email_exists(trim($_REQUEST['arbitrationno']).'@cacert.org')) { showheader(_("My CAcert.org Account!")); printf(_("The email address '%s' is already in a different account. Can't continue."), sanitizeHTML($_REQUEST['arbitrationno'].'@cacert.org')); + printf('<br/><a href="account.php?id=43&userid=' . intval($_REQUEST['userid']) . '">' . _('Back to previous page.') .'</a>'); showfooter(); exit; } - if (check_client_cert_running($_REQUEST['userid'],1) || - check_server_cert_running($_REQUEST['userid'],1) || - check_gpg_cert_running($_REQUEST['userid'],1)) { + if (check_client_cert_running(intval($_REQUEST['userid']),1) || + check_server_cert_running(intval($_REQUEST['userid']),1) || + check_gpg_cert_running(intval($_REQUEST['userid']),1)) { showheader(_("My CAcert.org Account!")); printf(_("The CCA retention time for at least one certificate is not over. Can't continue.")); + printf('<br/><a href="account.php?id=43&userid=' . intval($_REQUEST['userid']) . '">' . _('Back to previous page.') .'</a>'); showfooter(); exit; } - if (check_is_orgadmin($_REQUEST['userid'],1)) { + if (check_is_orgadmin(intval($_REQUEST['userid']),1)) { showheader(_("My CAcert.org Account!")); printf(_("The user is listed as Organisation Administrator. Can't continue.")); + printf('<br/><a href="account.php?id=43&userid=' . intval($_REQUEST['userid']) . '">' . _('Back to previous page.') .'</a>'); showfooter(); exit; } - account_delete($_REQUEST['userid'], trim($_REQUEST['arbitrationno']), $_SESSION['profile']['id']); + account_delete(intval($_REQUEST['userid']), trim($_REQUEST['arbitrationno']), $_SESSION['profile']['id']); + write_se_log(intval($_REQUEST['userid']), $_SESSION['profile']['id'], 'SE Account delete', trim($_REQUEST['arbitrationno'])); + } + + if(($id == 51 || $id == 52 || $oldid == 52)) + { + showheader(_("My CAcert.org Account!")); + echo _("You don't have access to this area.\nThe Tverify programme is terminated as of 16th November 2010" ); + showfooter(); + exit; } + /* this area not needed as the The Tverify programme is Terminated as of 16th November 2010 + if(($id == 51 || $id == 52 || $oldid == 52) && $_SESSION['profile']['tverify'] <= 0) { showheader(_("My CAcert.org Account!")); @@ -3057,7 +3183,6 @@ function buildSubjectFromSession() { showfooter(); exit; } - if($oldid == 52) { $uid = intval($_REQUEST['uid']); @@ -3105,7 +3230,7 @@ function buildSubjectFromSession() { $tverify = mysql_fetch_assoc(mysql_query("select * from `tverify` where `id`='$uid'")); $memid = $tverify['memid']; $user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='$memid'")); - $tmp = mysql_fetch_assoc(mysql_query("select sum(`points`) as `points` from `notary` where `to`='$memid'")); + $tmp = mysql_fetch_assoc(mysql_query("select sum(`points`) as `points` from `notary` where `to`='$memid' and `deleted` = 0")); $points = 0; if($tverify['URL'] != "" && $tverify['photoid'] != "") @@ -3163,6 +3288,20 @@ function buildSubjectFromSession() { showfooter(); exit; } + */ + if($id == 59){ + if ($oldid == 43 && $_SESSION['profile']['admin'] == 1) { + $_SESSION['support']=1; + }ELSEIF ($oldid == 13 && intval($_REQUEST['userid']) == $_SESSION['profile']['id']){ + $_SESSION['support']=0; + }ELSE{ + showheader(_("My CAcert.org Account!")); + echo _("You do not have access to this page."); + showfooter(); + exit; + } + } + if(intval($cert) > 0) $_SESSION['_config']['cert'] = intval($cert); diff --git a/includes/account_stuff.php b/includes/account_stuff.php index dbebf6a..e2f60f6 100644 --- a/includes/account_stuff.php +++ b/includes/account_stuff.php @@ -22,6 +22,7 @@ function showheader($title = "CAcert.org", $title2 = "") { global $id, $PHP_SELF; + $PHP_SELF = &$_SERVER['PHP_SELF']; $expand=""; $tmpid = $id; if($PHP_SELF == "/wot.php") @@ -35,46 +36,51 @@ switch($tmpid) { - case 1: - case 2: $expand = " explode('emailacc');"; break; - case 3: - case 4: - case 5: - case 6: $expand = " explode('clicerts');"; break; - case 7: - case 8: - case 9: $expand = " explode('domains');"; break; - case 10: - case 11: - case 12: - case 15: $expand = " explode('servercert');"; break; - case 13: - case 14: - case 36: - case 41: + case 1: // Add email address + case 2: $expand = " explode('emailacc');"; break; // View email addresses + case 3: // Add Client certificate + case 4: // Confirm Client Certificate Request + case 5: // View Client Certificates + case 6: $expand = " explode('clicerts');"; break; // Client Certificate page + case 7: // Add new domain + case 8: // Confirm Domain page + case 9: $expand = " explode('domains');"; break; // View Domains + case 10: // Add Server Certifiacte + case 11: // Confirm Server Certificate Rewust + case 12: // View Server Cerificate + case 15: $expand = " explode('servercert');"; break; // Server Certificate page + case 13: // ViewEdit + case 14: // Change password + case 36: // My Alert settings + case 41: // Language Settings + case 55: // Trainings + case 59: // Account History case 507: - case 508: - case 513: $expand = " explode('mydetails');"; break; - case 16: - case 17: - case 18: - case 19: $expand = " explode('clientorg');"; break; - case 20: - case 21: - case 22: - case 23: $expand = " explode('serverorg');"; break; - case 24: - case 25: - case 26: - case 27: - case 28: - case 29: - case 30: + case 508: // My Listing + case 510: // Old points calculation + case 515: // New points calculation + case 513: $expand = " explode('mydetails');"; break; // My Location + case 16: // Add Org Client Cert + case 17: // Confirm Org Client Certificate Request + case 18: // View Org Client Certificate + case 19: $expand = " explode('clientorg');"; break; // Org Cleint Cert page + case 20: // Add Org Server Cert + case 21: // Conform Org Server Cert Request + case 22: // View Org Server Certs + case 23: $expand = " explode('serverorg');"; break; // Org Server Certificate page + case 24: // Add new Organisation + case 25: // View Organisation List + case 26: // View Organisation Domains + case 27: // Edit Org Account + case 28: // View Add Org Domain + case 29: // Edit Org Domain + case 30: // Delete Org Domain case 31: - case 32: - case 33: - case 34: - case 35: $expand = " explode('orgadmin');"; break; + case 32: // View Org Admin + case 33: // Add Org Admin + case 34: // Delete Org Admin + case 60: // View Organisation Account History + case 35: $expand = " explode('orgadmin');"; break; // View Org Admin Organisation List case 42: case 43: case 44: @@ -86,20 +92,19 @@ case 50: case 54: case 53: $expand = " explode('sysadmin');"; break; - case 500: + case 500: // CAcert Web of Trust case 501: - case 502: - case 503: - case 504: - case 505: + case 502: // Become an Assurer + case 503: // CAcert Web of Trust Roles + case 504: // TTP + case 505: // Assurer Some one case 506: case 509: - case 510: case 511: - case 512: $expand = " explode('WoT');"; break; + case 512: $expand = " explode('WoT');"; break; // Find Assurer case 1000: case 1001: - case 1002: + case 1002: // View GPG key case 1003: case 1004: case 1005: @@ -108,9 +113,9 @@ case 1008: case 1009: case 1010: $expand = " explode('gpg');"; break; - case 1500: - case 1501: - case 1502: + case 1500: // Dipute + case 1501: // Dispute Email Request + case 1502: // ViewEdit case 1503: case 1504: case 1505: @@ -137,7 +142,6 @@ <title><?=$title?></title> <? if(array_key_exists('header',$_SESSION) && $_SESSION['_config']['header'] != "") { ?><?=$_SESSION['_config']['header']?><? } ?> <link rel="stylesheet" href="/styles/default.css" type="text/css" /> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <script language="JavaScript" type="text/javascript"> function explode(e) { if (document.getElementById(e).style.display == 'none') { @@ -172,9 +176,11 @@ function hideall() { </div> <div class="relatedLinks"> <h3 class="pointer" onclick="explode('mydetails')">+ <?=_("My Details")?></h3> - <ul class="menu" id="mydetails"><li><a href="account.php?id=13"><?=_("View/Edit")?></a></li><li><a href="account.php?id=14"><?=_("Change Password")?></a></li><li><a href="account.php?id=41"><?=_("Default Language")?></a></li><li><a href="wot.php?id=8"><?=_("My Listing")?></a></li><li><a href="wot.php?id=13"><?=_("My Location")?></a></li><li><a href="account.php?id=36"><?=_("My Alert Settings")?></a></li><li><a href="wot.php?id=10"><?=_("My Points")?></a></li><? + <ul class="menu" id="mydetails"><li><a href="account.php?id=13"><?=_("View/Edit")?></a></li><li><a href="account.php?id=14"><?=_("Change Password")?></a></li><li><a href="account.php?id=41"><?=_("Default Language")?></a></li><li><a href="wot.php?id=8"><?=_("My Listing")?></a></li><li><a href="wot.php?id=13"><?=_("My Location")?></a></li><li><a href="account.php?id=36"><?=_("My Alert Settings")?></a></li><li><a href="account.php?id=55"><?=_("My Trainings")?></a></li><li><a href="wot.php?id=10"><?=_("My Points")?></a></li><? +/* to delete if($_SESSION['profile']['id'] == 1 || $_SESSION['profile']['id'] == 5897) echo "<li><a href='sqldump.php'>SQL Dump</a></li>"; +*/ ?></ul> </div> <div class="relatedLinks"> @@ -217,7 +223,7 @@ function hideall() { <? } ?> <div class="relatedLinks"> <h3 class="pointer" onclick="explode('WoT')">+ <?=_("CAcert Web of Trust")?></h3> - <ul class="menu" id="WoT"><li><a href="wot.php?id=0"><?=_("About")?></a></li><li><a href="wot.php?id=12"><?=_("Find an Assurer")?></a></li><li><a href="wot.php?id=3"><?=_("Rules")?></a></li><li><? if($_SESSION['profile']['assurer'] != 1) { ?><a href="wot.php?id=2"><?=_("Becoming an Assurer")?></a><? } else { ?><a href="wot.php?id=5"><?=_("Assure Someone")?></a><? } ?></li><li><a href="wot.php?id=4"><?=_("Trusted ThirdParties")?></a></li><? if($_SESSION['profile']['points'] >= 500) { ?><li><a href="wot.php?id=11"><div style="white-space:nowrap"><?=_("Organisation Assurance")?></div></a></li><? } ?><li><a href="account.php?id=55"><?=_("Training")?></a></li></ul> + <ul class="menu" id="WoT"><li><a href="wot.php?id=0"><?=_("About")?></a></li><li><a href="wot.php?id=12"><?=_("Find an Assurer")?></a></li><li><a href="wot.php?id=3"><?=_("Rules")?></a></li><li><? if($_SESSION['profile']['assurer'] != 1) { ?><a href="wot.php?id=2"><?=_("Becoming an Assurer")?></a><? } else { ?><a href="wot.php?id=5"><?=_("Assure Someone")?></a><? } ?></li><li><a href="wot.php?id=4"><?=_("Trusted ThirdParties")?></a></li><? if($_SESSION['profile']['points'] >= 500) { ?><li><a href="wot.php?id=11"><div style="white-space:nowrap"><?=_("Organisation Assurance")?></div></a></li><? } ?></ul> </div> <div class="relatedLinks"> <h3 class="pointer" onclick="explode('WoTForms')">+ <?=_("CAP Forms")?></h3><? diff --git a/includes/general.php b/includes/general.php index d89c0e6..fca4563 100644 --- a/includes/general.php +++ b/includes/general.php @@ -28,6 +28,12 @@ // if($_SESSION['profile']['id'] > 0) // session_regenerate_id(); + //cf. http://stackoverflow.com/a/14532168 + if(!defined('ENT_HTML401')) define('ENT_HTML401', 0); + if(!defined('ENT_XML1')) define('ENT_XML1', 16); + if(!defined('ENT_XHTML')) define('ENT_XHTML', 32); + if(!defined('ENT_HTML5')) define('ENT_HTML5', (32|16)); + $pageLoadTime_Start = microtime(true); $junk = array(_("Face to Face Meeting"), _("Trusted Third Parties"), _("Thawte Points Transfer"), _("Administrative Increase"), @@ -57,7 +63,7 @@ exit; } - if(array_key_exists('HTTP_HOST',$_SERVER) && + if(array_key_exists('HTTP_HOST',$_SERVER) && ($_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname'] || $_SERVER['HTTP_HOST'] == $_SESSION['_config']['tverify'])) { @@ -82,7 +88,7 @@ $locked = mysql_fetch_assoc(mysql_query("select `locked` from `users` where `id`='".$_SESSION['profile']['id']."'")); if($locked['locked'] == 0) { - $query = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['profile']['id']."' group by `to`"; + $query = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['profile']['id']."' and `deleted` = 0 group by `to`"; $res = mysql_query($query); $row = mysql_fetch_assoc($res); $_SESSION['profile']['points'] = $row['total']; @@ -169,19 +175,19 @@ $points++; //echo "Points due to length and charset: $points<br/>"; - + // check for historical password proposal if ($pwd === "Fr3d Sm|7h") { return 0; } - + return $points; } function checkpw($pwd, $email, $fname, $mname, $lname, $suffix) { $points = checkpwlight($pwd); - + if(@strstr(strtolower($pwd), strtolower($email))) $points--; @@ -219,7 +225,7 @@ //echo "Points due to name matches: $points<br/>"; $shellpwd = escapeshellarg($pwd); - $do = `grep $shellpwd /usr/share/dict/american-english`; + $do = `grep -F -- $shellpwd /usr/share/dict/american-english`; if($do) $points--; @@ -232,7 +238,7 @@ { $bits = explode(": ", $_SESSION['_config']['subject'], 2); $bits = str_replace(", ", "|", str_replace("/", "|", array_key_exists('1',$bits)?$bits['1']:"")); - $bits = explode("|", $bits); + $bits = explode("|", $bits); $_SESSION['_config']['cnc'] = $_SESSION['_config']['subaltc'] = 0; $_SESSION['_config']['OU'] = ""; @@ -477,7 +483,7 @@ if($id <= 0) $id = $_SESSION['profile']['id']; - $query = "select sum(`points`) as `points` from `notary` where `to`='$id' group by `to`"; + $query = "select sum(`points`) as `points` from `notary` where `to`='$id' and `deleted` = 0 group by `to`"; $row = mysql_fetch_assoc(mysql_query($query)); $points = $row['points']; @@ -557,7 +563,7 @@ $fp = @fsockopen($domain,25,$errno,$errstr,5); if($fp) { - + $line = fgets($fp, 4096); while(substr($line, 0, 4) == "220-") $line = fgets($fp, 4096); @@ -581,7 +587,7 @@ $line = mysql_real_escape_string(trim(strip_tags($line))); $query = "insert into `pinglog` set `when`=NOW(), `email`='$myemail', `result`='$line'"; - if(is_array($_SESSION['profile'])) $query.=", `uid`='".$_SESSION['profile']['id']."'"; + if(isset($_SESSION['profile']) && is_array($_SESSION['profile']) && isset($_SESSION['profile']['id'])) $query.=", `uid`='".$_SESSION['profile']['id']."'"; mysql_query($query); if(substr($line, 0, 3) != "250") @@ -662,7 +668,7 @@ return $ticket; } - function sanitizeHTML($input) + function sanitizeHTML($input) { return htmlentities(strip_tags($input), ENT_QUOTES); //In case of problems, please use the following line again: @@ -732,7 +738,7 @@ $text=preg_replace("/[^\w-.@]/","",$text); return($text); } - + // returns text message to be shown to the user given the result of is_no_assurer function no_assurer_text($Status) @@ -775,7 +781,7 @@ $name="../$type/$kind/".intval($id/1000)."/$kind-".intval($id).".$type"; if (!is_dir("../csr")) { mkdir("../csr",0777); } if (!is_dir("../crt")) { mkdir("../crt",0777); } - + if (!is_dir("../csr/$kind")) { mkdir("../csr/$kind",0777); } if (!is_dir("../crt/$kind")) { mkdir("../crt/$kind",0777); } if (!is_dir("../csr/$kind/".intval($id/1000))) { mkdir("../csr/$kind/".intval($id/1000)); } diff --git a/includes/general_stuff.php b/includes/general_stuff.php index 4c1bd30..10c4e0a 100644 --- a/includes/general_stuff.php +++ b/includes/general_stuff.php @@ -38,7 +38,7 @@ google_color_text = "000000"; google_color_border = "FFFFFF"; //--> </script> -<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script><? } else { +<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script><? } else { ?><h2><?=_("Free digital certificates!")?></h2><? } ?></div> </div> <div id="pageNav"> @@ -47,15 +47,15 @@ google_color_border = "FFFFFF"; <? if(array_key_exists('mconn',$_SESSION) && $_SESSION['mconn']) { ?> <a href="https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=1"><?=_("Join")?></a> <? } ?> - <a href="/policy/CAcertCommunityAgreement.php"><?=_("Community Agreement")?></a> + <a href="/policy/CAcertCommunityAgreement.html"><?=_("Community Agreement")?></a> <a href="/index.php?id=3"><?=_("Root Certificate")?></a> </div> <? if(array_key_exists('mconn',$_SESSION) && $_SESSION['mconn']) { ?> <div class="relatedLinks"> <h3 class="pointer"><?=_("My Account")?></h3> - <a href="https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=4"><?=_("Password Login")?></a> + <a href="https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=4"><?=_("Password Login")?></a> <a href="https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=5"><?=_("Lost Password")?></a> - <a href="https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=4&noauto=1"><?=_("Net Cafe Login")?></a> + <a href="https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=4&noauto=1"><?=_("Net Cafe Login")?></a> <a href="https://<?=$_SESSION['_config']['securehostname']?>/index.php?id=4"><?=_("Certificate Login")?></a> </div> <? } ?> @@ -137,8 +137,8 @@ if(!function_exists("showfooter")) <a href="/policy/PrivacyPolicy.html"><?=_("Privacy Policy")?></a> | <a href="/index.php?id=51"><?=_("Mission Statement")?></a> | <a href="/index.php?id=11"><?=_("Contact Us")?></a> | ©2002-<?=date("Y")?> <?=_("by CAcert")?></div> -</div> -</body> +</div> +</body> </html><? } } diff --git a/includes/lib/account.php b/includes/lib/account.php index 30d68a3..81bd59b 100644 --- a/includes/lib/account.php +++ b/includes/lib/account.php @@ -51,7 +51,7 @@ function fix_assurer_flag($userID = NULL) SELECT SUM(`points`) FROM `notary` AS `n` WHERE `n`.`to` = `u`.`id` AND (`n`.`expire` > now() - OR `n`.`expire` IS NULL) + OR `n`.`expire` IS NULL) and `n`.`deleted` = 0 ) >= 100'; $query = mysql_query($sql); @@ -85,7 +85,7 @@ function fix_assurer_flag($userID = NULL) AND ( `n`.`expire` > now() OR `n`.`expire` IS NULL - ) + ) and `n`.`deleted` = 0 ) < 100 )'; diff --git a/includes/lib/general.php b/includes/lib/general.php index 85b132d..5458788 100644 --- a/includes/lib/general.php +++ b/includes/lib/general.php @@ -18,10 +18,10 @@ /** * Checks if the user may log in and retrieve the user id - * + * * Usually called with $_SERVER['SSL_CLIENT_M_SERIAL'] and * $_SERVER['SSL_CLIENT_I_DN_CN'] - * + * * @param $serial string * usually $_SERVER['SSL_CLIENT_M_SERIAL'] * @param $issuer_cn string @@ -32,9 +32,9 @@ function get_user_id_from_cert($serial, $issuer_cn) { $query = "select `memid` from `emailcerts` where - `serial`='".mysql_escape_string($serial)."' and + `serial`='".mysql_real_escape_string($serial)."' and `rootcert`= (select `id` from `root_certs` where - `Cert_Text`='".mysql_escape_string($issuer_cn)."') and + `Cert_Text`='".mysql_real_escape_string($issuer_cn)."') and `revoked`=0 and disablelogin=0 and UNIX_TIMESTAMP(`expire`) - UNIX_TIMESTAMP() > 0"; $res = mysql_query($query); @@ -43,7 +43,7 @@ function get_user_id_from_cert($serial, $issuer_cn) $row = mysql_fetch_assoc($res); return intval($row['memid']); } - + return -1; } @@ -71,7 +71,7 @@ function failWithId($errormessage) { /** * Runs a command on the shell and return it's exit code and output - * + * * @param string $command * The command to run. Make sure that you escapeshellarg() any non-constant * parts as this is executed on a shell! @@ -85,7 +85,7 @@ function failWithId($errormessage) { * @param string|bool $errors * The output the command wrote to STDERR (this is passed as reference), * if true (default) the output will be written to the real STDERR - * + * * @return int|bool * The exit code of the command, true if the execution of the command * failed (true because then @@ -93,38 +93,38 @@ function failWithId($errormessage) { */ function runCommand($command, $input = "", &$output = null, &$errors = true) { $descriptorspec = array(); - + if ($input !== true) { $descriptorspec[0] = array("pipe", "r"); // STDIN for child } - + if ($output !== true) { $descriptorspec[1] = array("pipe", "w"); // STDOUT for child } - + if ($errors !== true) { $descriptorspec[2] = array("pipe", "w"); // STDERR for child } - + $proc = proc_open($command, $descriptorspec, $pipes); - + if (is_resource($proc)) { if ($input !== true) { fwrite($pipes[0], $input); fclose($pipes[0]); } - + if ($output !== true) { $output = stream_get_contents($pipes[1]); } - + if ($errors !== true) { $errors = stream_get_contents($pipes[2]); } - + return proc_close($proc); - + } else { return true; } @@ -145,19 +145,18 @@ function runCommand($command, $input = "", &$output = null, &$errors = true) { { $Result |= 5; } - - $query = mysql_query('SELECT SUM(`points`) AS `points` FROM `notary` AS `n` WHERE `n`.`to` = \''.(int)intval($userID).'\' AND `n`.`expire` < now()'); + + $query = mysql_query('SELECT SUM(`points`) AS `points` FROM `notary` AS `n` WHERE `n`.`to` = \''.(int)intval($userID).'\' AND `n`.`expire` < now() and `deleted` = 0'); $row = mysql_fetch_assoc($query); if ($row['points'] < 100) { $Result |= 3; } - + $query = mysql_query('SELECT `assurer_blocked` FROM `users` WHERE `id` = \''.(int)intval($userID).'\''); $row = mysql_fetch_assoc($query); if ($row['assurer_blocked'] > 0) { $Result |= 9; } - + return $Result; } -
\ No newline at end of file diff --git a/includes/lib/l10n.php b/includes/lib/l10n.php index 85b7aff..41d785d 100644 --- a/includes/lib/l10n.php +++ b/includes/lib/l10n.php @@ -340,4 +340,21 @@ class L10n { bindtextdomain($domain, $_SESSION['_config']['filepath'].'/locale'); textdomain($domain); } -}
\ No newline at end of file + + public static function set_recipient_language($accountid) { + //returns the language of a recipient to make sure that the language is correct + //use together with + $query = "select `language` from `users` where `id`='".intval($accountid)."'"; + $res = mysql_query($query); + if (mysql_num_rows($res)>=0) { + $row = mysql_fetch_assoc($res); + if (NULL==$row['language'] || $row['language']=='') { + self::set_translation('en'); + } else { + self::set_translation($row['language']); + } + } else { + self::set_translation('en'); + } + } +} diff --git a/includes/loggedin.php b/includes/loggedin.php index 4f9b8e8..edd0af0 100644 --- a/includes/loggedin.php +++ b/includes/loggedin.php @@ -19,6 +19,7 @@ include_once("../includes/lib/general.php"); require_once("../includes/lib/l10n.php"); include_once("../includes/mysql.php"); + require_once('../includes/notary.inc.php'); if(!isset($_SESSION['profile']) || !is_array($_SESSION['profile'])) { $_SESSION['profile'] = array( 'id' => 0, 'loggedin' => 0 ); @@ -49,7 +50,7 @@ else unset($_SESSION['profile']); } - + if($_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname'] && ($_SESSION['profile']['id'] == 0 || $_SESSION['profile']['loggedin'] == 0)) { $user_id = get_user_id_from_cert($_SERVER['SSL_CLIENT_M_SERIAL'], @@ -87,33 +88,21 @@ //session_unregister($key); } - $_SESSION['_config']['oldlocation'] = ''; - - foreach($_GET as $key => $val) - { - if($_SESSION['_config']['oldlocation']) - $_SESSION['_config']['oldlocation'] .= "&"; - - $key = str_replace(array("\n", "\r"), '', $key); - $val = str_replace(array("\n", "\r"), '', $val); - $_SESSION['_config']['oldlocation'] .= "$key=$val"; - } - $_SESSION['_config']['oldlocation'] = substr($_SERVER['SCRIPT_NAME'], 1)."?".$_SESSION['_config']['oldlocation']; - - header("location: https://".$_SESSION['_config']['securehostname']."/index.php?id=4"); + $_SESSION['_config']['oldlocation'] = $_SERVER['REQUEST_URI']; + header("Location: https://{$_SESSION['_config']['securehostname']}/index.php?id=4"); exit; } } if($_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname'] && ($_SESSION['profile']['id'] <= 0 || $_SESSION['profile']['loggedin'] == 0)) { - header("location: https://".$_SESSION['_config']['normalhostname']); + header("Location: https://{$_SESSION['_config']['normalhostname']}"); exit; } if($_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname'] && $_SESSION['profile']['id'] > 0 && $_SESSION['profile']['loggedin'] > 0) { - $query = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['profile']['id']."' group by `to`"; + $query = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['profile']['id']."' and `deleted` = 0 group by `to`"; $res = mysql_query($query); $row = mysql_fetch_assoc($res); $_SESSION['profile']['points'] = $row['total']; @@ -141,27 +130,23 @@ //session_unregister($key); } - header("location: https://".$normalhost."/index.php"); + header("Location: https://{$normalhost}/index.php"); exit; } if($_SESSION['profile']['loggedin'] < 1) { - $_SESSION['_config']['oldlocation'] = ''; - - foreach($_REQUEST as $key => $val) - { - if('' != $_SESSION['_config']['oldlocation']) - $_SESSION['_config']['oldlocation'] .= "&"; + $_SESSION['_config']['oldlocation'] = $_SERVER['REQUEST_URI']; + header("Location: https://{$_SERVER['HTTP_HOST']}/index.php?id=4"); + exit; + } - $key = str_replace(array("\n", "\r"), '', $key); - $val = str_replace(array("\n", "\r"), '', $val); - $_SESSION['_config']['oldlocation'] .= "$key=$val"; + if (!isset($_SESSION['profile']['ccaagreement']) || !$_SESSION['profile']['ccaagreement']) { + $_SESSION['profile']['ccaagreement']=get_user_agreement_status($_SESSION['profile']['id'],'CCA'); + if (!$_SESSION['profile']['ccaagreement']) { + $_SESSION['_config']['oldlocation'] = $_SERVER['REQUEST_URI']; + header("Location: https://{$_SERVER['HTTP_HOST']}/index.php?id=52"); + exit; } - $_SESSION['_config']['oldlocation'] = substr($_SERVER['SCRIPT_NAME'], 1)."?".$_SESSION['_config']['oldlocation']; - $hostname=$_SERVER['HTTP_HOST']; - $hostname = str_replace(array("\n", "\r"), '', $hostname); - header("location: https://".$hostname."/index.php?id=4"); - exit; } ?> diff --git a/includes/notary.inc.php b/includes/notary.inc.php index b34b2f4..a1f87b9 100644 --- a/includes/notary.inc.php +++ b/includes/notary.inc.php @@ -35,7 +35,7 @@ function get_number_of_assurances ($userid) { $res = query_init ("SELECT count(*) AS `list` FROM `notary` - WHERE `method` = 'Face to Face Meeting' AND `from`='".intval($userid)."' "); + WHERE `method` = 'Face to Face Meeting' AND `from`='".intval($userid)."' and `deleted` = 0"); $row = query_getnextrow($res); return intval($row['list']); @@ -44,7 +44,7 @@ function get_number_of_ttpassurances ($userid) { $res = query_init ("SELECT count(*) AS `list` FROM `notary` - WHERE (`method`='Trusted Third Parties' or `method`='TTP-Assisted') AND `to`='".intval($userid)."' "); + WHERE (`method`='Trusted Third Parties' or `method`='TTP-Assisted') AND `to`='".intval($userid)."' and `deleted` = 0"); $row = query_getnextrow($res); return intval($row['list']); @@ -53,7 +53,7 @@ function get_number_of_assurees ($userid) { $res = query_init ("SELECT count(*) AS `list` FROM `notary` - WHERE `method` = 'Face to Face Meeting' AND `to`='".intval($userid)."' "); + WHERE `method` = 'Face to Face Meeting' AND `to`='".intval($userid)."' and `deleted` = 0"); $row = query_getnextrow($res); return intval($row['list']); @@ -62,7 +62,7 @@ function get_top_assurer_position ($no_of_assurances) { $res = query_init ("SELECT count(*) AS `list` FROM `notary` - WHERE `method` = 'Face to Face Meeting' + WHERE `method` = 'Face to Face Meeting' and `deleted` = 0 GROUP BY `from` HAVING count(*) > '".intval($no_of_assurances)."'"); return intval(query_get_number_of_rows($res)+1); } @@ -70,32 +70,54 @@ function get_top_assuree_position ($no_of_assurees) { $res = query_init ("SELECT count(*) AS `list` FROM `notary` - WHERE `method` = 'Face to Face Meeting' + WHERE `method` = 'Face to Face Meeting' and `deleted` = 0 GROUP BY `to` HAVING count(*) > '".intval($no_of_assurees)."'"); return intval(query_get_number_of_rows($res)+1); } - function get_given_assurances ($userid) + /** + * get_given_assurances() + * returns the list of assurances given by the user + * @param mixed $userid - user id for the account for report + * @param integer $log - for log output = 1 + * @return + */ + function get_given_assurances ($userid, $log=0) { - $res = query_init ("select * from `notary` where `from`='".intval($userid)."' and `from` != `to` order by `id` asc"); + $deleted=''; + if ($log == 0) { + $deleted = ' and `deleted` = 0 '; + } + $res = query_init ("select * from `notary` where `from`='".intval($userid)."' and `from` != `to` $deleted order by `id` asc"); return $res; } - function get_received_assurances ($userid) + /** + * get_received_assurances() + * returns the list of assurances received by the user + * @param mixed $userid - user id for the account for report + * @param integer $log - for log output = 1 + * @return + */ + function get_received_assurances ($userid, $log=0) { - $res = query_init ("select * from `notary` where `to`='".intval($userid)."' and `from` != `to` order by `id` asc "); + $deleted=''; + if ($log == 0) { + $deleted = ' and `deleted` = 0 '; + } + $res = query_init ("select * from `notary` where `to`='".intval($userid)."' and `from` != `to` $deleted order by `id` asc "); return $res; } function get_given_assurances_summary ($userid) { - $res = query_init ("select count(*) as number,points,awarded,method from notary where `from`='".intval($userid)."' group by points,awarded,method"); + $res = query_init ("select count(*) as number,points,awarded,method from notary where `from`='".intval($userid)."' and `deleted` = 0 group by points,awarded,method"); return $res; } function get_received_assurances_summary ($userid) { - $res = query_init ("select count(*) as number,points,awarded,method from notary where `to`='".intval($userid)."' group by points,awarded,method"); + $res = query_init ("select count(*) as number,points,awarded,method from notary where `to`='".intval($userid)."' and `deleted` = 0 group by points,awarded,method"); return $res; } @@ -201,15 +223,15 @@ ?> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> - <tr> - <td class="title"><?=_("Assurer Ranking")?></td> - </tr> - <tr> - <td class="DataTD"><?=sprintf(_("You have made %s assurances which ranks you as the #%s top assurer."), intval($num_of_assurances), intval($rank_of_assurer) )?></td> - </tr> - <tr> - <td class="DataTD"><?=sprintf(_("You have received %s assurances which ranks you as the #%s top assuree."), intval($num_of_assurees), intval($rank_of_assuree) )?></td> - </tr> + <tr> + <td class="title"><?=_("Assurer Ranking")?></td> + </tr> + <tr> + <td class="DataTD"><?=sprintf(_("You have made %s assurances which ranks you as the #%s top assurer."), intval($num_of_assurances), intval($rank_of_assurer) )?></td> + </tr> + <tr> + <td class="DataTD"><?=sprintf(_("You have received %s assurances which ranks you as the #%s top assuree."), intval($num_of_assurees), intval($rank_of_assuree) )?></td> + </tr> </table> <br/> <? @@ -219,124 +241,123 @@ { ?> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> - <tr> + <tr> <? if ($support == "1") { ?> - <td colspan="10" class="title"><?=$title?></td> + <td colspan="10" class="title"><?=$title?></td> <? } else { ?> - <td colspan="7" class="title"><?=$title?></td> + <td colspan="7" class="title"><?=$title?></td> <? } ?> - </tr> - <tr> - <td class="DataTD"><strong><?=_("ID")?></strong></td> - <td class="DataTD"><strong><?=_("Date")?></strong></td> + </tr> + <tr> + <td class="DataTD"><strong><?=_("ID")?></strong></td> + <td class="DataTD"><strong><?=_("Date")?></strong></td> <? if ($support == "1") { ?> - <td class="DataTD"><strong><?=_("When")?></strong></td> - <td class="DataTD"><strong><?=_("Email")?></strong></td> + <td class="DataTD"><strong><?=_("When")?></strong></td> + <td class="DataTD"><strong><?=_("Email")?></strong></td> <? } ?> - <td class="DataTD"><strong><?=_("Who")?></strong></td> - <td class="DataTD"><strong><?=_("Points")?></strong></td> - <td class="DataTD"><strong><?=_("Location")?></strong></td> - <td class="DataTD"><strong><?=_("Method")?></strong></td> - <td class="DataTD"><strong><?=_("Experience Points")?></strong></td> + <td class="DataTD"><strong><?=_("Who")?></strong></td> + <td class="DataTD"><strong><?=_("Points")?></strong></td> + <td class="DataTD"><strong><?=_("Location")?></strong></td> + <td class="DataTD"><strong><?=_("Method")?></strong></td> + <td class="DataTD"><strong><?=_("Experience Points")?></strong></td> <? if ($support == "1") { ?> - <td class="DataTD"><strong><?=_("Revoke")?></strong></td> + <td class="DataTD"><strong><?=_("Revoke")?></strong></td> <? } ?> - </tr> + </tr> <? } function output_assurances_footer($points_txt,$points,$experience_txt,$sumexperience,$support) { ?> - <tr> + <tr> <td<?=($support == "1")?' colspan="5"':' colspan="3"'?> class="DataTD"><strong><?=$points_txt?>:</strong></td> - <td class="DataTD"><?=$points?></td> - <td class="DataTD"> </td> - <td class="DataTD"><strong><?=$experience_txt?>:</strong></td> - <td class="DataTD"><?=$sumexperience?></td> + <td class="DataTD"><?=$points?></td> + <td class="DataTD"> </td> + <td class="DataTD"><strong><?=$experience_txt?>:</strong></td> + <td class="DataTD"><?=$sumexperience?></td> <? if ($support == "1") { ?> - <td class="DataTD"> </td> + <td class="DataTD"> </td> <? } ?> - </tr> + </tr> </table> <br/> <? } - function output_assurances_row($assuranceid,$date,$when,$email,$name,$awarded,$points,$location,$method,$experience,$userid,$support,$revoked) + function output_assurances_row($assuranceid,$date,$when,$email,$name,$awarded,$points,$location,$method,$experience,$userid,$support,$revoked, $ticketno) { - $tdstyle=""; - $emopen=""; - $emclose=""; + $tdstyle=""; + $emopen=""; + $emclose=""; - if ($awarded == $points) + if ($awarded == $points) + { + if ($awarded == "0") { - if ($awarded == "0") + if ($when < "2006-09-01") { - if ($when < "2006-09-01") - { - $tdstyle="style='background-color: #ffff80'"; - $emopen="<em>"; - $emclose="</em>"; - } + $tdstyle="style='background-color: #ffff80'"; + $emopen="<em>"; + $emclose="</em>"; } } + } ?> - <tr> - <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$assuranceid?><?=$emclose?></td> - <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$date?><?=$emclose?></td> + <tr> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$assuranceid?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$date?><?=$emclose?></td> <? - if ($support == "1") - { + if ($support == "1") + { ?> <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$when?><?=$emclose?></td> <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$email?><?=$emclose?></td> -<? - } +<? } ?> - <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$name?><?=$emclose?></td> - <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$awarded?><?=$emclose?></td> - <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$location?><?=$emclose?></td> - <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$method?><?=$emclose?></td> - <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$experience?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$name?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$awarded?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$location?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$method?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$experience?><?=$emclose?></td> <? - if ($support == "1") + if ($support == "1") + { + if ($revoked == true) { - if ($revoked == true) - { ?> - <td class="DataTD" <?=$tdstyle?>> </td> + <td class="DataTD" <?=$tdstyle?>> </td> <? } else { ?> - <td class="DataTD" <?=$tdstyle?>><?=$emopen?><a href="account.php?id=43&userid=<?=intval($userid)?>&assurance=<?=intval($assuranceid)?>&csrf=<?=make_csrf('admdelassurance')?>" onclick="return confirm('<?=sprintf(_("Are you sure you want to revoke the assurance with ID "%s"?"),$assuranceid)?>');"><?=_("Revoke")?></a><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><a href="account.php?id=43&userid=<?=intval($userid)?>&assurance=<?=intval($assuranceid)?>&csrf=<?=make_csrf('admdelassurance')?>&ticketno=<?=$ticketno?>" onclick="return confirm('<?=sprintf(_("Are you sure you want to revoke the assurance with ID "%s"?"),$assuranceid)?>');"><?=_("Revoke")?></a><?=$emclose?></td> <? - } } + } ?> </tr> <? @@ -346,14 +367,14 @@ { ?> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> - <tr> - <td colspan="4" class="title"><?=_("Summary of your Points")?></td> - </tr> - <tr> - <td class="DataTD"><strong><?=_("Description")?></strong></td> - <td class="DataTD"><strong><?=_("Points")?></strong></td> - <td class="DataTD"><strong><?=_("Countable Points")?></strong></td> - <td class="DataTD"><strong><?=_("Remark")?></strong></td> + <tr> + <td colspan="4" class="title"><?=_("Summary of your Points")?></td> + </tr> + <tr> + <td class="DataTD"><strong><?=_("Description")?></strong></td> + <td class="DataTD"><strong><?=_("Points")?></strong></td> + <td class="DataTD"><strong><?=_("Countable Points")?></strong></td> + <td class="DataTD"><strong><?=_("Remark")?></strong></td> </tr> <? } @@ -369,19 +390,19 @@ function output_summary_row($title,$points,$points_countable,$remark) { ?> - <tr> - <td class="DataTD"><strong><?=$title?></strong></td> - <td class="DataTD"><?=$points?></td> - <td class="DataTD"><?=$points_countable?></td> - <td class="DataTD"><?=$remark?></td> - </tr> + <tr> + <td class="DataTD"><strong><?=$title?></strong></td> + <td class="DataTD"><?=$points?></td> + <td class="DataTD"><?=$points_countable?></td> + <td class="DataTD"><?=$remark?></td> + </tr> <? } // ************* output given assurances ****************** - function output_given_assurances_content($userid,&$points,&$sum_experience,$support) + function output_given_assurances_content($userid,&$points,&$sum_experience,$support, $ticketno) { $points = 0; $sumexperience = 0; @@ -392,24 +413,24 @@ $apoints = calc_experience ($row,$points,$experience,$sum_experience,$revoked); $name = show_user_link ($fromuser['fname']." ".$fromuser['lname'],intval($row['to'])); $email = show_email_link ($fromuser['email'],intval($row['to'])); - output_assurances_row (intval($row['id']),$row['date'],$row['when'],$email,$name,$apoints,intval($row['points']),$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience,$userid,$support,$revoked); + output_assurances_row (intval($row['id']),$row['date'],$row['when'],$email,$name,$apoints,intval($row['points']),$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience,$userid,$support,$revoked, $ticketno); } } // ************* output received assurances ****************** - function output_received_assurances_content($userid,&$points,&$sum_experience,$support) + function output_received_assurances_content($userid,&$points,&$sum_experience,$support, $ticketno) { $points = 0; $sumexperience = 0; - $res = get_received_assurances(intval($userid)); + $res = get_received_assurances(intval($userid), $support); while($row = mysql_fetch_assoc($res)) { $fromuser = get_user (intval($row['from'])); calc_assurances ($row,$points,$experience,$sum_experience,$awarded,$revoked); $name = show_user_link ($fromuser['fname']." ".$fromuser['lname'],intval($row['from'])); $email = show_email_link ($fromuser['email'],intval($row['from'])); - output_assurances_row (intval($row['id']),$row['date'],$row['when'],$email,$name,$awarded,intval($row['points']),$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience,$userid,$support,$revoked); + output_assurances_row (intval($row['id']),$row['date'],$row['when'],$email,$name,$awarded,intval($row['points']),$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience,$userid,$support,$revoked, $ticketno); } } @@ -591,17 +612,17 @@ return $issue_points; } - function output_given_assurances($userid,$support=0) + function output_given_assurances($userid, $support=0, $ticketno='') { output_assurances_header(_("Assurance Points You Issued"),$support); - output_given_assurances_content($userid,$points,$sum_experience,$support); + output_given_assurances_content($userid,$points,$sum_experience,$support, $ticketno); output_assurances_footer(_("Total Points Issued"),$points,_("Total Experience Points"),$sum_experience,$support); } - function output_received_assurances($userid,$support=0) + function output_received_assurances($userid,$support=0, $ticketno='') { output_assurances_header(_("Your Assurance Points"),$support); - output_received_assurances_content($userid,$points,$sum_experience,$support); + output_received_assurances_content($userid,$points,$sum_experience,$support, $ticketno); output_assurances_footer(_("Total Assurance Points"),$points,_("Total Experience Points"),$sum_experience,$support); } @@ -698,6 +719,17 @@ return $rec; } +function get_user_agreement($memid){ + $query="(SELECT u.`document`, u.`date`, u.`method`, u.`comment`, 1 as `active` FROM user_agreements u WHERE u.`document` = 'CCA' AND (u.`memid`=".$memid." ) order by u.`date` ) + union + (SELECT u.`document`, u.`date`, u.`method`, u.`comment`, 0 as `active` FROM user_agreements u WHERE u.`document` = 'CCA' AND ( u.`secmemid`=".$memid.") order by u.`date`) + union + (SELECT u.`document`, u.`date`, u.`method`, u.`comment`, 0 as `active` FROM user_agreements u WHERE u.`document` != 'CCA' AND ( u.`memid`=".$memid.") order by u.u.`document`, u.`date`) " ; + $res = mysql_query($query); + + return mysql_query($query); +} + /** * delete_user_agreement() * deletes all entries for a given type from user_agreement of a given user, if type is not given all @@ -706,7 +738,6 @@ * @return */ function delete_user_agreement($memid, $type=false){ - //deletes all entries to an user for the given type of user agreements if ($type === false) { $filter = ''; } else { @@ -774,7 +805,7 @@ <? } else { ?> - <input type="hidden" name="<?=$val?>" value="<?=$methods[0]?>" /> + <input type="hidden" name="method" value="<?=$methods[0]?>" /> <? } } @@ -909,11 +940,6 @@ } //change personal information to arbitration number and DOB=1900-01-01 - $query = "select `fname`,`mname`,`lname`,`suffix`,`dob` from `users` where `id`='$userid'"; - $details = mysql_fetch_assoc(mysql_query($query)); - $query = "insert into `adminlog` set `when`=NOW(),`old-lname`='${details['lname']}',`old-dob`='${details['dob']}', - `new-lname`='$arbno',`new-dob`='1900-01-01',`uid`='$id',`adminid`='".$adminid."'"; - mysql_query($query); $query = "update `users` set `fname`='".$arbno."', `mname`='".$arbno."', `lname`='".$arbno."', @@ -1125,3 +1151,830 @@ function check_date_difference($date, $diff=1){ return (strtotime($date)<=time()+$diff*86400); } + + + /** + * get_array_from_ini() + * gets an array from an ini file and trims all entries + * @param mixed $inifile, path and filename of the ini file + * @return + */ + function get_array_from_ini($inifile){ + $array = parse_ini_file('../config/ttp.ini'); + ksort($array); + foreach($array as $key => $value) + { + unset($array[$key]); + $array[trim($key)] = trim($value); + } + return $array; + } + + /** + * create_selectbox_HTML() + * + * @param mixed $name, name for the select element + * @param mixed $options, array with the data for the dropdown + * @param string $value, TRUE if the value for the option should be added + * @param string $firstline, if the should be a first line like´Choose country + * @param string $selected, if selection matches option key the + * entry is preselected in the dropdownbox + * @return + */ + function create_selectbox_HTML($name, array $options, $firstline = '', $value='', $selected = ''){ + $return_str='<select name="' . $name . '">'; + if (''!= $firstline) { + $return_str .= '<option>' . $firstline .'</option>'; + } + foreach ($options as $key => $avalue) { + $return_str.='<option'; + if ($value) { + $return_str.=' value="'.$avalue.'"'; + } + if ($key==$selected){ + $return_str.=' selected="selected"'; + } + $return_str.='>'.$key.'</option>'; + } + $return_str.='</select>'; + return $return_str; + } + +/** + * write_se_log() + * writes an information to the adminlog + * + * @param mixed $uid - id of the user account + * @param mixed $adminid - id of the admin + * @param mixed $type - what was changed + * @param mixed $info - the ticket / arbitration no or other information + * @return + */ +function write_se_log($uid, $adminid, $type, $info){ + //records all support engineer actions changing a user account + $uid = intval($uid); + $adminid = intval($adminid); + $type = mysql_real_escape_string($type); + $info = mysql_real_escape_string($info); + $query="insert into `adminlog` (`when`, `uid`, `adminid`,`type`,`information`) values + (Now(), $uid, $adminid, '$type', '$info')"; + mysql_query($query); +} + +/** + * valid_ticket_number() + * checks if the entered information is a valid ticket or arbitration number + * @param mixed $ticketno + * @return + */ +function valid_ticket_number($ticketno){ + //return if a given ticket number is valid + //a arbitration case + //d dispute action + //s support case + //m board motion + $pattern='/[adsmADSM]\d{8}\./'; + if (preg_match($pattern, $ticketno)) { + return true; + } + return false; +} + +// function for handling account/43.php +/** + * get_user_data() + * returns all data of to an account given by the id + * @param mixed $userid - account id + * @param mixed $deleted - states if deleted data should be visible , default = 0 - not visible + * @return + */ +function get_user_data($userid, $deleted=0){ + $userid = intval($userid); + $filter=''; + if (0==$deleted) { + $filter=' and `users`.`deleted`=0'; + } + $query = "select * from `users` where `users`.`id`='$userid' ".$filter; + return mysql_query($query); +} + +/** + * get_alerts() + * retrns all alert settings for one user + * @param mixed $userid for the requested account + * @return + */ +function get_alerts($userid){ + return mysql_fetch_assoc(mysql_query("select * from `alerts` where `memid`='".intval($userid)."'")); +} + +/** + * get_email_address() + * returns all email address linked to one account + * @param mixed $userid + * @param string $primary if given the primary email address is not retirned + * @param integer $deleted - states if deleted data should be visible , default = 0 - not visible + * @return + */ +function get_email_address($userid, $primary,$deleted=0){ + //should be entered in account/2.php + $userid = intval($userid); + $filter=''; + if (0==$deleted) { + $filter=' and `deleted`=0'; + } + if ($primary) { + $filter= $filter." and `email`!='".mysql_real_escape_string($primary)."'"; + } + $query = "select * from `email` where `memid`='".$userid."'".$filter." order by `created`"; + return mysql_query($query); +} + +/** + * get_domains() + * returns all domains to an account + * @param mixed $userid + * @param integer $deleted - states if deleted data should be visible , default = 0 - not visible + * @return + */ +function get_domains($userid, $deleted=0){ + //should be entered in account/9.php + $userid = intval($userid); + $filter=''; + if (0==$deleted) { + $filter=' and `deleted`=0'; + } + $query = "select * from `domains` where `memid`='".$userid."' and `hash`=''".$filter." order by `created`"; + return mysql_query($query); +} + +/** + * get_training_result() + * returns all training results to an account + * @param mixed $userid + * @return + */ +function get_training_result($userid){ + //should be entered in account/55.php + $userid = intval($userid); + $query = "SELECT `CP`.`pass_date`, `CT`.`type_text`, `CV`.`test_text` ". + " FROM `cats_passed` AS CP, `cats_variant` AS CV, `cats_type` AS CT ". + " WHERE `CP`.`variant_id`=`CV`.`id` AND `CV`.`type_id`=`CT`.`id` AND `CP`.`user_id` ='".$userid."'". + " ORDER BY `CP`.`pass_date`"; + return mysql_query($query); +} + +/** + * get_se_log() + * returns all SE log entries to an account + * @param mixed $userid + * @return + */ +function get_se_log($userid){ + $userid = intval($userid); + $query = "SELECT `adminlog`.`when`, `adminlog`.`type`, `adminlog`.`information`, `users`.`fname`, `users`.`lname` + FROM `adminlog`, `users` + WHERE `adminlog`.`adminid` = `users`.`id` and `adminlog`.`uid`=".$userid." + ORDER BY `adminlog`.`when`"; + return mysql_query($query); +} + +/** + * get_client_certs() + * returns all client certificates to an account + * @param mixed $userid + * @param integer $viewall- states if expired certs should be visible , default = 0 - not visible + * @return + */ +//add to account/5.php +function get_client_certs($userid,$viewall=0){ + $userid = intval($userid); + $query = "select UNIX_TIMESTAMP(`emailcerts`.`created`) as `created`, + UNIX_TIMESTAMP(`emailcerts`.`expire`) - UNIX_TIMESTAMP() as `timeleft`, + UNIX_TIMESTAMP(`emailcerts`.`expire`) as `expired`, + `emailcerts`.`expire` as `expires`, + `emailcerts`.`revoked` as `revoke`, + UNIX_TIMESTAMP(`emailcerts`.`revoked`) as `revoked`, + `emailcerts`.`id`, + `emailcerts`.`CN`, + `emailcerts`.`serial`, + `emailcerts`.`disablelogin` as `disablelogin`, + `emailcerts`.`description` + from `emailcerts` + where `emailcerts`.`memid`='".$userid."'"; + if($viewall != 1) + $query .= " AND `revoked`=0 AND `renewed`=0 "; + $query .= " GROUP BY `emailcerts`.`id` "; + if($viewall != 1) + $query .= " HAVING `timeleft` > 0 "; + $query .= " ORDER BY `emailcerts`.`modified` desc"; + return mysql_query($query); +} + +/** + * get_server_certs() + * returns all server certs to an account + * @param mixed $userid + * @param integer $viewall states if expired certs should be visible , default = 0 - not visible + * @return + */ +function get_server_certs($userid,$viewall=0){ + //add to account/12.php + $userid = intval($userid); + $query = "select UNIX_TIMESTAMP(`domaincerts`.`created`) as `created`, + UNIX_TIMESTAMP(`domaincerts`.`expire`) - UNIX_TIMESTAMP() as `timeleft`, + UNIX_TIMESTAMP(`domaincerts`.`expire`) as `expired`, + `domaincerts`.`expire` as `expires`, `revoked` as `revoke`, + UNIX_TIMESTAMP(`revoked`) as `revoked`, `CN`, `domaincerts`.`serial`, `domaincerts`.`id` as `id`, + `domaincerts`.`description` + from `domaincerts`,`domains` + where `memid`='".$userid."' and `domaincerts`.`domid`=`domains`.`id` "; + if($viewall != 1) + { + $query .= "AND `revoked`=0 AND `renewed`=0 "; + $query .= "HAVING `timeleft` > 0 "; + } + $query .= "ORDER BY `domaincerts`.`modified` desc"; + return mysql_query($query); +} + +/** + * get_gpg_certs() + * retruns all gpg certs to an account + * @param mixed $userid + * @param integer $viewall states if expired certs should be visible , default = 0 - not visible + * @return + */ +function get_gpg_certs($userid,$viewall=0){ + //add to gpg/2.php + $userid = intval($userid); + $query = $query = "select UNIX_TIMESTAMP(`issued`) as `issued`, + UNIX_TIMESTAMP(`expire`) - UNIX_TIMESTAMP() as `timeleft`, + UNIX_TIMESTAMP(`expire`) as `expired`, + `expire` as `expires`, `id`, `level`, + `email`,`keyid`,`description` from `gpg` where `memid`='".$userid."' + ORDER BY `issued` desc"; + return mysql_query($query); +} + + + +/** + * output_log_email_header() + * shows the table header to the email table + * @return + */ +function output_log_email_header(){ + ?> + <tr> + <td class="DataTD bold"><?= _("Email, primary bold") ?></td> + <td class="DataTD bold"><?= _("Created") ?></td> + <td class="DataTD bold"><?= _("Deleted") ?></td> + </tr> + + <? +} +/** + * output_log_email() + * shows all email data + * @param mixed $row - sql-query array + * @param mixed $primary - if given the primary address is highlighted + * @return + */ +function output_log_email($row,$primary){ + $primaryemailaddress=''; + $deletedemailaddress=''; + if ($row['deleted'] > 0) { + $deletedemailaddress=' deletedemailaddress'; + } + if ($primary==$row['email'] && $row['deleted'] == 0) { + $primaryemailaddress= ' primaryemailaddress'; + } + ?> + <tr> + <td class="DataTD<?= $primaryemailaddress . $deletedemailaddress ?>"><?=$row['email']?></td> + <td class="DataTD<?= $primaryemailaddress . $deletedemailaddress ?>"><?=$row['created']?></td> + <td class="DataTD<?= $primaryemailaddress . $deletedemailaddress ?>"><?=$row['deleted']?></td> + </tr> + <? +} + +/** + * output_log_domains_header() + * shows the table header to the domains table + * @return + */ +function output_log_domains_header(){ + ?> + <tr> + <td class="DataTD bold"><?= _("Domain") ?></td> + <td class="DataTD bold"><?= _("Created") ?></td> + <td class="DataTD bold"><?= _("Deleted") ?></td> + </tr> + + <? +} + +/** + * output_log_domains() + * shows the domain data + * @param mixed $row - sql-query array + * @return + */ +function output_log_domains($row){ + $italic=''; + if (0==$row['deleted']) { + $italic='italic '; + } + ?> + <tr> + <td class="DataTD <? $italic ?>"><?=$row['domain']?></td> + <td class="DataTD <? $italic ?>"><?=$row['created']?></td> + <td class="DataTD <? $italic ?>"><?=$row['deleted']?></td> + </tr> + <? +} + +/** + * output_log_agreement_header() + * shows the table header to the user agreement table + * @return + */ +function output_log_agreement_header(){ + ?> + <tr> + <td class="DataTD bold"><?= _("Agreement") ?></td> + <td class="DataTD bold"><?= _("Date") ?></td> + <td class="DataTD bold"><?= _("Method") ?></td> + <td class="DataTD bold"><?= _("Active ") ?></td> + </tr> + <? +} + +/** + * output_log_agreement() + * shows the agreement data + * @param mixed $row - sql-query array + * @return + */ +function output_log_agreement($row){ + ?> + <tr> + <td class="DataTD" ><?=$row['document']?></td> + <td class="DataTD" ><?=$row['date']?></td> + <td class="DataTD" ><?=$row['method']?></td> + <td class="DataTD"><?= ($row['active']==0)? _('passive'):_('active')?></td> + </tr> + <? +} + +/** + * output_log_training_header() + * shows the table header to the training table + * @return + */ +function output_log_training_header(){ + //should be entered in account/55.php + ?> + <tr> + <td class="DataTD bold"><?= _("Agreement") ?></td> + <td class="DataTD bold"><?= _("Test") ?></td> + <td class="DataTD bold"><?= _("Variant") ?></td> + </tr> + <? +} + +/** + * output_log_training() + * shows the training data + * @param mixed $row - sql-query array + * @return + */ +function output_log_training($row){ + //should be entered in account/55.php + ?> + <tr> + <td class="DataTD"><?=$row['pass_date']?></td> + <td class="DataTD"><?=$row['type_text']?></td> + <td class="DataTD"><?=$row['test_text']?></td> + </tr> + <? +} + +/** + * output_log_se_header() + * shows the table header to the SE log table + * @param integer $support - if support = 1 some columns ar not visible + * @return + */ +function output_log_se_header($support=0){ + ?> + <tr> + <td class="DataTD bold"><?= _("Date") ?></td> + <td class="DataTD bold"><?= _("Type") ?></td> + <?if (1==$support) { + ?> + <td class="DataTD bold"><?= _("Information") ?></td> + <td class="DataTD bold"><?= _("Admin") ?></td> + <? + }?> + </tr> + <? +} + +/** + * output_log_se() + * show the SE log data + * @param mixed $row - sql-query array + * @param integer $support - if support = 1 some columns are added + * @return + */ +function output_log_se($row, $support=0){ + //should be entered in account/55.php + ?> + <tr> + <td class="DataTD"><?=$row['when']?></td> + <td class="DataTD"><?=$row['type']?></td> + <?if (1==$support) { + ?> + <td class="DataTD"><?=$row['information']?></td> + <td class="DataTD"><?=$row['fname'].' '.$row['lname']?></td> + <? + }?> + </tr> + <? +} + +/** + * output_client_cert_header() + * shows the table header to the cleint cert table + * @param integer $support - if support = 1 some columns ar not visible + * @return + */ +function output_client_cert_header($support=0){ + //should be added to account/5.php + ?> + <tr> + <?if ($support !=1) { ?> + <td class="DataTD"><?=_("Renew/Revoke/Delete")?></td> + <? } ?> + <td class="DataTD"><?=_("Status")?></td> + <td class="DataTD"><?=_("Email Address")?></td> + <td class="DataTD"><?=_("SerialNumber")?></td> + <td class="DataTD"><?=_("Revoked")?></td> + <td class="DataTD"><?=_("Expires")?></td> + <td class="DataTD"><?=_("Login")?></td> + <?if ($support !=1) { ?> + <td colspan="2" class="DataTD"><?=_("Comment *")?></td> + <? } ?> + </tr> + <? +} + +/** + * output_client_cert() + * show the client cert data + * @param mixed $row - sql-query array + * @param integer $support - if support = 1 some columns are not visible + * @return + */ +function output_client_cert($row, $support=0){ + //should be entered in account/5.php + $verified=""; + if($row['timeleft'] > 0) + $verified = _("Valid"); + if($row['timeleft'] < 0) + $verified = _("Expired"); + if($row['expired'] == 0) + $verified = _("Pending"); + if($row['revoked'] > 0) + $verified = _("Revoked"); + if($row['revoked'] == 0) + $row['revoke'] = _("Not Revoked"); + ?> + <tr> + <? + if($verified != _("Pending") && $verified != _("Revoked")) { + if ($support !=1) { ?> + <td class="DataTD"><input type="checkbox" name="revokeid[]" value="<?=$row['id']?>"></td> + <? } ?> + <td class="DataTD"><?=$verified?></td> + <? if ($support !=1) { ?> + <td class="DataTD"><a href="account.php?id=6&cert=<?=$row['id']?>"><?=(trim($row['CN'])=="" ? _("empty") : $row['CN'])?></a></td> + <? } ELSE {?> + <td class="DataTD"><?=(trim($row['CN'])=="" ? _("empty") : $row['CN'])?></td> + <? } ?> + <? } else if($verified != _("Revoked")) { + if ($support !=1) { ?> + <td class="DataTD"><input type="checkbox" name="delid[]" value="<?=$row['id']?>"></td> + <? } ?> + <td class="DataTD"><?=$verified?></td> + <td class="DataTD"><?=(trim($row['CN'])=="" ? _("empty") : $row['CN'])?></td> + <? } else { + if ($support !=1) { ?> + <td class="DataTD"> </td> + <? } ?> + <td class="DataTD"><?=$verified?></td> + <td class="DataTD"><?=(trim($row['CN'])=="" ? _("empty") : $row['CN'])?></td> + <? } ?> + + <td class="DataTD"><?=$row['serial']?></td> + <td class="DataTD"><?=$row['revoke']?></td> + <td class="DataTD"><?=$row['expires']?></td> + + <? if ($support !=1) { ?> + <td class="DataTD"> + <input type="checkbox" name="disablelogin_<?=$row['id']?>" value="1" <?=$row['disablelogin']?"":"checked='checked'"?>/> + <input type="hidden" name="cert_<?=$row['id']?>" value="1" /> + </td> + <? } ELSE { ?> + <td class="DataTD"> + <input type="checkbox" name="disablelogin_<?=$row['id']?>" value="1" <?=$row['disablelogin']?"":"checked='checked'"?> DISABLED/> + </td> + <? } + if ($support !=1) { ?> + <td class="DataTD"><input name="comment_<?=$row['id']?>" type="text" value="<?=htmlspecialchars($row['description'])?>" /></td> + <td class="DataTD"><input type="checkbox" name="check_comment_<?=$row['id']?>" /></td> + <? }?> + </tr> + + <? +} + +/** + * output_log_server_certs_header() + * shows the table header to the server cert table + * @param integer $support - if support = 1 some columns ar not visible + * @return + */ +function output_log_server_certs_header($support=0){ + //should be entered in account/12.php + ?> + <tr> + <?if ($support !=1) { ?> + <td class="DataTD"><?=_("Renew/Revoke/Delete")?></td> + <? } ?> + <td class="DataTD"><?=_("Status")?></td> + <td class="DataTD"><?=_("CommonName")?></td> + <td class="DataTD"><?=_("SerialNumber")?></td> + <td class="DataTD"><?=_("Revoked")?></td> + <td class="DataTD"><?=_("Expires")?></td> + <?if ($support !=1) { ?> + <td colspan="2" class="DataTD"><?=_("Comment *")?></td> + <? } ?> + </tr> + <? +} + +/** + * output_log_server_certs() + * show the server cert data + * @param mixed $row - sql-query array + * @param integer $support - if support = 1 some columns are not visible + * @return + */ +function output_log_server_certs($row, $support=0){ + //should be entered in account/12.php + if($row['timeleft'] > 0) + $verified = _("Valid"); + if($row['timeleft'] < 0) + $verified = _("Expired"); + if($row['expired'] == 0) + $verified = _("Pending"); + if($row['revoked'] > 0) + $verified = _("Revoked"); + if($row['revoked'] == 0) + $row['revoke'] = _("Not Revoked"); + ?> + <tr> + <? if ($support !=1) { + if($verified != _("Pending") && $verified != _("Revoked")) { ?> + <td class="DataTD"><input type="checkbox" name="revokeid[]" value="<?=$row['id']?>"/></td> + <? } else if($verified != _("Revoked")) { ?> + <td class="DataTD"><input type="checkbox" name="delid[]" value="<?=$row['id']?>"/></td> + <? } else { ?> + <td class="DataTD"> </td> + <? } + }?> + <td class="DataTD"><?=$verified?></td> + <?if ($support !=1) { ?> + <td class="DataTD"><a href="account.php?id=15&cert=<?=$row['id']?>"><?=$row['CN']?></a></td> + <? }ELSE{ ?> + <td class="DataTD"><?=$row['CN']?></td> + <?}?> + <td class="DataTD"><?=$row['serial']?></td> + <td class="DataTD"><?=$row['revoke']?></td> + <td class="DataTD"><?=$row['expires']?></td> + <?if ($support !=1) { ?> + <td class="DataTD"><input name="comment_<?=$row['id']?>" type="text" value="<?=htmlspecialchars($row['description'])?>" /></td> + <td class="DataTD"><input type="checkbox" name="check_comment_<?=$row['id']?>" /></td> + <?}?> + </tr> <? +} + +/** + * output_gpg_certs_header() + * shows the table header to the gpg cert table + * @param integer $support - if support = 1 some columns ar not visible + * @return + */ +function output_gpg_certs_header($support=0){ + ?> + <tr> + <td class="DataTD"><?=_("Status")?></td> + <td class="DataTD"><?=_("Email Address")?></td> + <td class="DataTD"><?=_("Expires")?></td> + <td class="DataTD"><?=_("Key ID")?></td> + <?if ($support !=1) { ?> + <td colspan="2" class="DataTD"><?=_("Comment *")?></td> + <? }?> + </tr> + <? +} + +/** + * output_gpg_certs() + * show the gpg cert data + * @param mixed $row - sql-query array + * @param integer $support - if support = 1 some columns are not visible + * @return + */ +function output_gpg_certs($row, $support=0){ + //should be entered in account/55.php + if($row['timeleft'] > 0) + $verified = _("Valid"); + if($row['timeleft'] < 0) + $verified = _("Expired"); + if($row['expired'] == 0) + $verified = _("Pending"); + ?> + <tr> + <? if($verified == _("Valid")) { ?> + <td class="DataTD"><?=$verified?></td> + <?if ($support !=1) { ?> + <td class="DataTD"><a href="gpg.php?id=3&cert=<?=$row['id']?>"><?=$row['email']?></a></td> + <? } else { ?> + <td class="DataTD"><?=$row['email']?></td> + <? } ?> + <? } else if($verified == _("Pending")) { ?> + <td class="DataTD"><?=$verified?></td> + <td class="DataTD"><?=$row['email']?></td> + <? } else { ?> + <td class="DataTD"><?=$verified?></td> + <?if ($support !=1) { ?> + <td class="DataTD"><a href="gpg.php?id=3&cert=<?=$row['id']?>"><?=$row['email']?></a></td> + <? } else { ?> + <td class="DataTD"><?=$row['email']?></td> + <? } ?> + <? } ?> + <td class="DataTD"><?=$row['expires']?></td> + <?if ($support != 1) { ?> + <td class="DataTD"><a href="gpg.php?id=3&cert=<?=$row['id']?>"><?=$row['keyid']?></a></td> + <? } else { ?> + <td class="DataTD"><?=$row['keyid']?></td> + <? } ?> + <?if ($support !=1) { ?> + <td class="DataTD"><input name="comment_<?=$row['id']?>" type="text" value="<?=htmlspecialchars($row['description'])?>" /></td> + <td class="DataTD"><input type="checkbox" name="check_comment_<?=$row['id']?>" /></td> + <? } ?> + </tr> + <? +} + +/** + * output_log_given_assurances() + * returns the list of all given assurances + * @param mixed $userid - user id for the output + * @param integer $support - support view = 1 + * @return + */ +function output_log_given_assurances($userid, $support=0) +{ + output_assurances_header(_("Assurance given"),$support); + output_log_given_assurances_content($userid, $support); +} + +/** + * output_log_given_assurances_content() + * + * @param mixed $userid + * @param mixed $support + * @return + */ +function output_log_given_assurances_content($userid, $support) +{ + $res = get_given_assurances(intval($userid), 1); + while($row = mysql_fetch_assoc($res)) + { + $fromuser = get_user (intval($row['to'])); + $apoints = calc_experience ($row,$points,$experience,$sum_experience,$revoked); + $name = show_user_link ($fromuser['fname']." ".$fromuser['lname'],intval($row['to'])); + $email = show_email_link ($fromuser['email'],intval($row['to'])); + $revoked = ''; + if ($row['date'] != 0) { + $revoked = $row['deleted']; + } + output_log_assurances_row(intval($row['id']),$row['date'],$row['when'],$email,$name,$apoints,intval($row['points']),$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience,$userid,$support,$revoked); + } +} + +/** + * output_log_received_assurances() + * + * @param mixed $userid + * @param integer $support + * @return + */ +function output_log_received_assurances($userid, $support=0) +{ + output_assurances_header(_("Assurance received"), $support); + output_log_received_assurances_content($userid, $support); +} + +/** + * output_log_received_assurances_content() + * + * @param mixed $userid + * @param mixed $support + * @param mixed $points + * @param mixed $sum_experience + * @param mixed $ticketno + * @return + */ +function output_log_received_assurances_content($userid, $support) +{ + $res = get_received_assurances(intval($userid), 1); + while($row = mysql_fetch_assoc($res)) + { + $fromuser = get_user (intval($row['from'])); + calc_assurances ($row,$points,$experience,$sum_experience,$awarded,$revoked); + $name = show_user_link ($fromuser['fname']." ".$fromuser['lname'],intval($row['from'])); + $email = show_email_link ($fromuser['email'],intval($row['from'])); + $revoked = ''; + if ($row['date'] != 0) { + $revoked = $revoked = $row['deleted']; + } + output_log_assurances_row(intval($row['id']),$row['date'],$row['when'],$email,$name,$awarded,intval($row['points']),$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience,$userid,$support,$revoked); + } +} + +/** + * output_log_assurances_row() + * + * @param mixed $assuranceid + * @param mixed $date + * @param mixed $when + * @param mixed $email + * @param mixed $name + * @param mixed $awarded + * @param mixed $points + * @param mixed $location + * @param mixed $method + * @param mixed $experience + * @param mixed $userid + * @param mixed $support + * @param mixed $revoked + * @return + */ +function output_log_assurances_row($assuranceid,$date,$when,$email,$name,$awarded,$points,$location,$method,$experience,$userid,$support,$revoked) +{ + + $tdstyle=""; + $emopen=""; + $emclose=""; + + if ($awarded == $points) + { + if ($awarded == "0") + { + if ($when < "2006-09-01") + { + $tdstyle="style='background-color: #ffff80'"; + $emopen="<em>"; + $emclose="</em>"; + } + } + } + ?> + <tr> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$assuranceid?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$date?><?=$emclose?></td> + <? + if ($support == "1") + { + ?> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$when?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$email?><?=$emclose?></td> + <? + } + ?> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$name?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$awarded?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$location?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$method?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$experience?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$revoked?><?=$emclose?></td> + </tr> + <? +} + diff --git a/pages/account/13.php b/pages/account/13.php index 08f325d..7e2adfc 100644 --- a/pages/account/13.php +++ b/pages/account/13.php @@ -124,6 +124,9 @@ </tr> <? } ?> <tr> + <td colspan="2" class="title"><a href="account.php?id=59&oldid=13&userid=<?=$_SESSION['profile']['id']?>"><?=_('Show account history')?></a></td> + </tr> + <tr> <td colspan="2" class="title"><a href="account.php?id=13&showdetails=<?=!$showdetails?>"><?=_("View secret question & answers and OTP phrases")?></a></td> </tr> <? if($showdetails){ ?> diff --git a/pages/account/41.php b/pages/account/41.php index d61d8db..f644025 100644 --- a/pages/account/41.php +++ b/pages/account/41.php @@ -57,7 +57,7 @@ require_once($_SESSION['_config']['filepath'].'/includes/lib/l10n.php'); $res = mysql_query($query); while($row = mysql_fetch_assoc($res)) { - $lang = mysql_fetch_assoc(mysql_query("select * from `languages` where `locale`='".mysql_escape_string($row['lang'])."'")); + $lang = mysql_fetch_assoc(mysql_query("select * from `languages` where `locale`='".mysql_real_escape_string($row['lang'])."'")); ?> <tr> <td class="DataTD"><?=_("Additional Language")?>:</td> diff --git a/pages/account/43.php b/pages/account/43.php index 53b24d3..2e094c8 100644 --- a/pages/account/43.php +++ b/pages/account/43.php @@ -18,26 +18,41 @@ <? include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); +$ticketno=''; +$ticketvalidation=FALSE; + +if (isset($_SESSION['ticketno'])) { + $ticketno = $_SESSION['ticketno']; + $ticketvalidation = valid_ticket_number($ticketno); +} +if (isset($_SESSION['ticketmsg'])) { + $ticketmsg = $_SESSION['ticketmsg']; +} else { + $ticketmsg = ''; +} + if(array_key_exists('assurance',$_REQUEST) && $_REQUEST['assurance'] > 0) { $assurance = mysql_escape_string(intval($_REQUEST['assurance'])); $row = 0; - $res = mysql_query("select `to` from `notary` where `id`='$assurance'"); + $res = mysql_query("select `to` from `notary` where `id`='$assurance' and `deleted` = 0"); if ($res) { $row = mysql_fetch_assoc($res); - } - mysql_query("delete from `notary` where `id`='$assurance'"); - if ($row) { - fix_assurer_flag($row['to']); + mysql_query("update `notary` set `deleted`=NOW() where `id`='$assurance'"); + if ($row) { + fix_assurer_flag($row['to']); + } } } - if(intval(array_key_exists('userid',$_REQUEST)?$_REQUEST['userid']:0) <= 0) - { + +// search for an account by email search, if more than one is found display list to choose +if(intval(array_key_exists('userid',$_REQUEST)?$_REQUEST['userid']:0) <= 0) +{ $_REQUEST['userid'] = 0; - $emailsearch = $email = mysql_escape_string(stripslashes($_REQUEST['email'])); + $emailsearch = $email = mysql_real_escape_string(stripslashes($_REQUEST['email'])); //Disabled to speed up the queries //if(!strstr($email, "%")) @@ -45,877 +60,1024 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); // bug-975 ted+uli changes --- begin if(preg_match("/^[0-9]+$/", $email)) { - // $email consists of digits only ==> search for IDs - // Be defensive here (outer join) if primary mail is not listed in email table - $query = "select `users`.`id` as `id`, `email`.`email` as `email` - from `users` left outer join `email` on (`users`.`id`=`email`.`memid`) - where (`email`.`id`='$email' or `users`.`id`='$email') - and `users`.`deleted`=0 - group by `users`.`id` limit 100"; + // $email consists of digits only ==> search for IDs + // Be defensive here (outer join) if primary mail is not listed in email table + $query = "select `users`.`id` as `id`, `email`.`email` as `email` + from `users` left outer join `email` on (`users`.`id`=`email`.`memid`) + where (`email`.`id`='$email' or `users`.`id`='$email') + and `users`.`deleted`=0 + group by `users`.`id` limit 100"; } else { - // $email contains non-digits ==> search for mail addresses - // Be defensive here (outer join) if primary mail is not listed in email table - $query = "select `users`.`id` as `id`, `email`.`email` as `email` - from `users` left outer join `email` on (`users`.`id`=`email`.`memid`) - where (`email`.`email` like '$emailsearch' - or `users`.`email` like '$emailsearch') - and `users`.`deleted`=0 - group by `users`.`id` limit 100"; + // $email contains non-digits ==> search for mail addresses + // Be defensive here (outer join) if primary mail is not listed in email table + $query = "select `users`.`id` as `id`, `email`.`email` as `email` + from `users` left outer join `email` on (`users`.`id`=`email`.`memid`) + where (`email`.`email` like '$emailsearch' + or `users`.`email` like '$emailsearch') + and `users`.`deleted`=0 + group by `users`.`id` limit 100"; } // bug-975 ted+uli changes --- end $res = mysql_query($query); - if(mysql_num_rows($res) > 1) { ?> -<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> - <tr> - <td colspan="5" class="title"><?=_("Select Specific Account Details")?></td> - </tr> - <tr> - <td class="DataTD"><?=_("User ID")?></td> - <td class="DataTD"><?=_("Email")?></td> - </tr> -<? - while($row = mysql_fetch_assoc($res)) - { ?> - <tr> - <td class="DataTD"><a href="account.php?id=43&userid=<?=intval($row['id'])?>"><?=intval($row['id'])?></a></td> - <td class="DataTD"><a href="account.php?id=43&userid=<?=intval($row['id'])?>"><?=sanitizeHTML($row['email'])?></a></td> - </tr> -<? } if(mysql_num_rows($res) >= 100) { ?> - <tr> - <td class="DataTD" colspan="2"><?=_("Only the first 100 rows are displayed.")?></td> - </tr> -<? } else { ?> - <tr> - <td class="DataTD" colspan="2"><? printf(_("%s rows displayed."), mysql_num_rows($res)); ?></td> - </tr> -<? } ?> -</table><br><br> -<? } elseif(mysql_num_rows($res) == 1) { - $row = mysql_fetch_assoc($res); - $_REQUEST['userid'] = $row['id']; - } else { - printf(_("No users found matching %s"), sanitizeHTML($email)); - } - } - - if(intval($_REQUEST['userid']) > 0) - { - $userid = intval($_REQUEST['userid']); - $query = "select * from `users` where `users`.`id`='$userid' and `users`.`deleted`=0"; - $res = mysql_query($query); - if(mysql_num_rows($res) <= 0) - { - echo _("I'm sorry, the user you were looking for seems to have disappeared! Bad things are a foot!"); - } else { - $row = mysql_fetch_assoc($res); - $query = "select sum(`points`) as `points` from `notary` where `to`='".intval($row['id'])."'"; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $alerts = mysql_fetch_assoc(mysql_query("select * from `alerts` where `memid`='".intval($row['id'])."'")); + if(mysql_num_rows($res) > 1) { ?> -<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> - <tr> - <td colspan="5" class="title"><? printf(_("%s's Account Details"), sanitizeHTML($row['email'])); ?></td> - </tr> - <tr> - <td class="DataTD"><?=_("Email")?>:</td> - <td class="DataTD"><?=sanitizeHTML($row['email'])?></td> - </tr> - <tr> - <td class="DataTD"><?=_("First Name")?>:</td> - <td class="DataTD"><form method="post" action="account.php" onSubmit="if(!confirm('<?=_("Are you sure you want to modify this DOB and/or last name?")?>')) return false;"> - <input type="hidden" name="csrf" value="<?=make_csrf('admchangepers')?>" /> - <input type="text" name="fname" value="<?=sanitizeHTML($row['fname'])?>"></td> - </tr> - <tr> - <td class="DataTD"><?=_("Middle Name")?>:</td> - <td class="DataTD"><input type="text" name="mname" value="<?=sanitizeHTML($row['mname'])?>"></td> - </tr> - <tr> - <td class="DataTD"><?=_("Last Name")?>:</td> - <td class="DataTD"> <input type="hidden" name="oldid" value="43"> - <input type="hidden" name="action" value="updatedob"> - <input type="hidden" name="userid" value="<?=intval($userid)?>"> - <input type="text" name="lname" value="<?=sanitizeHTML($row['lname'])?>"></td> - </tr> - <tr> - <td class="DataTD"><?=_("Suffix")?>:</td> - <td class="DataTD"><input type="text" name="suffix" value="<?=sanitizeHTML($row['suffix'])?>"></td> - </tr> - <tr> - <td class="DataTD"><?=_("Date of Birth")?>:</td> - <td class="DataTD"> + <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="5" class="title"><?=_("Select Specific Account Details")?></td> + </tr> + <tr> + <td class="DataTD"><?=_("User ID")?></td> + <td class="DataTD"><?=_("Email")?></td> + </tr> <? - $year = intval(substr($row['dob'], 0, 4)); - $month = intval(substr($row['dob'], 5, 2)); - $day = intval(substr($row['dob'], 8, 2)); - ?><nobr><select name="day"> -<? - for($i = 1; $i <= 31; $i++) + while($row = mysql_fetch_assoc($res)) { - echo "<option"; - if($day == $i) - echo " selected='selected'"; - echo ">$i</option>"; - } ?> - </select> - <select name="month"> + <tr> + <td class="DataTD"><a href="account.php?id=43&userid=<?=intval($row['id'])?>"><?=intval($row['id'])?></a></td> + <td class="DataTD"><a href="account.php?id=43&userid=<?=intval($row['id'])?>"><?=sanitizeHTML($row['email'])?></a></td> + </tr> <? - for($i = 1; $i <= 12; $i++) - { - echo "<option value='$i'"; - if($month == $i) - echo " selected='selected'"; - echo ">".ucwords(strftime("%B", mktime(0,0,0,$i,1,date("Y"))))."</option>"; } + + if(mysql_num_rows($res) >= 100) { ?> - </select> - <input type="text" name="year" value="<?=$year?>" size="4"> - <input type="submit" value="Go"></form></nobr></td> - </tr> - <tr> - <td class="DataTD"><?=_("CCA accepted")?>:</td> - <td class="DataTD"><a href="account.php?id=57&userid=<?=intval($row['id'])?>"><?=intval(get_user_agreement_status($row['id'])) ? _("Yes") : _("No") ?></a></td> - </tr> - <tr> - <td class="DataTD"><?=_("Trainings")?>:</td> - <td class="DataTD"><a href="account.php?id=55&userid=<?=intval($row['id'])?>">show</a></td> - </tr> - <tr> - <td class="DataTD"><?=_("Is Assurer")?>:</td> - <td class="DataTD"><a href="account.php?id=43&assurer=<?=intval($row['id'])?>&csrf=<?=make_csrf('admsetassuret')?>"><?=$row['assurer']?></a></td> - </tr> - <tr> - <td class="DataTD"><?=_("Blocked Assurer")?>:</td> - <td class="DataTD"><a href="account.php?id=43&assurer_blocked=<?=intval($row['id'])?>"><?=$row['assurer_blocked']?></a></td> - </tr> - <tr> - <td class="DataTD"><?=_("Account Locking")?>:</td> - <td class="DataTD"><a href="account.php?id=43&locked=<?=$row['id']?>&csrf=<?=make_csrf('admactlock')?>"><?=$row['locked']?></a></td> - </tr> - <tr> - <td class="DataTD"><?=_("Code Signing")?>:</td> - <td class="DataTD"><a href="account.php?id=43&codesign=<?=$row['id']?>&csrf=<?=make_csrf('admcodesign')?>"><?=$row['codesign']?></a></td> - </tr> - <tr> - <td class="DataTD"><?=_("Org Assurer")?>:</td> - <td class="DataTD"><a href="account.php?id=43&orgadmin=<?=$row['id']?>&csrf=<?=make_csrf('admorgadmin')?>"><?=$row['orgadmin']?></a></td> - </tr> - <tr> - <td class="DataTD"><?=_("TTP Admin")?>:</td> - <td class="DataTD"><a href="account.php?id=43&ttpadmin=<?=$row['id']?>&csrf=<?=make_csrf('admttpadmin')?>"><?=$row['ttpadmin']?></a></td> - </tr> - <tr> - <td class="DataTD"><?=_("Location Admin")?>:</td> - <td class="DataTD"><a href="account.php?id=43&locadmin=<?=$row['id']?>"><?=$row['locadmin']?></a></td> - </tr> - <tr> - <td class="DataTD"><?=_("Admin")?>:</td> - <td class="DataTD"><a href="account.php?id=43&admin=<?=$row['id']?>&csrf=<?=make_csrf('admsetadmin')?>"><?=$row['admin']?></a></td> - </tr> - <tr> - <td class="DataTD"><?=_("Ad Admin")?>:</td> - <td class="DataTD"><a href="account.php?id=43&adadmin=<?=$row['id']?>"><?=$row['adadmin']?></a> (0 = none, 1 = submit, 2 = approve)</td> - </tr> - <tr> - <td class="DataTD"><?=_("Tverify Account")?>:</td> - <td class="DataTD"><a href="account.php?id=43&tverify=<?=$row['id']?>"><?=$row['tverify']?></a></td> - </tr> - <tr> - <td class="DataTD"><?=_("General Announcements")?>:</td> - <td class="DataTD"><a href="account.php?id=43&general=<?=$row['id']?>"><?=$alerts['general']?></a></td> - </tr> - <tr> - <td class="DataTD"><?=_("Country Announcements")?>:</td> - <td class="DataTD"><a href="account.php?id=43&country=<?=$row['id']?>"><?=$alerts['country']?></a></td> - </tr> - <tr> - <td class="DataTD"><?=_("Regional Announcements")?>:</td> - <td class="DataTD"><a href="account.php?id=43&regional=<?=$row['id']?>"><?=$alerts['regional']?></a></td> - </tr> - <tr> - <td class="DataTD"><?=_("Within 200km Announcements")?>:</td> - <td class="DataTD"><a href="account.php?id=43&radius=<?=$row['id']?>"><?=$alerts['radius']?></a></td> - </tr> - <tr> - <td class="DataTD"><?=_("Change Password")?>:</td> - <td class="DataTD"><a href="account.php?id=44&userid=<?=$row['id']?>"><?=_("Change Password")?></a></td> - </tr> - <tr> - <td class="DataTD"><?=_("Delete Account")?>:</td> - <td class="DataTD"><a href="account.php?id=50&userid=<?=$row['id']?>&csrf=<?=make_csrf('admdelaccount')?>"><?=_("Delete Account")?></a></td> - </tr> + <tr> + <td class="DataTD" colspan="2"><?=_("Only the first 100 rows are displayed.")?></td> + </tr> <? - // This is intensionally a $_GET for audit purposes. DO NOT CHANGE!!! - if(array_key_exists('showlostpw',$_GET) && $_GET['showlostpw'] == "yes") { + } else { ?> - <tr> - <td class="DataTD"><?=_("Lost Password")?> - Q1:</td> - <td class="DataTD"><?=sanitizeHTML($row['Q1'])?></td> - </tr> - <tr> - <td class="DataTD"><?=_("Lost Password")?> - A1:</td> - <td class="DataTD"><?=sanitizeHTML($row['A1'])?></td> - </tr> - <tr> - <td class="DataTD"><?=_("Lost Password")?> - Q2:</td> - <td class="DataTD"><?=sanitizeHTML($row['Q2'])?></td> - </tr> - <tr> - <td class="DataTD"><?=_("Lost Password")?> - A2:</td> - <td class="DataTD"><?=sanitizeHTML($row['A2'])?></td> - </tr> - <tr> - <td class="DataTD"><?=_("Lost Password")?> - Q3:</td> - <td class="DataTD"><?=sanitizeHTML($row['Q3'])?></td> - </tr> - <tr> - <td class="DataTD"><?=_("Lost Password")?> - A3:</td> - <td class="DataTD"><?=sanitizeHTML($row['A3'])?></td> - </tr> - <tr> - <td class="DataTD"><?=_("Lost Password")?> - Q4:</td> - <td class="DataTD"><?=sanitizeHTML($row['Q4'])?></td> - </tr> - <tr> - <td class="DataTD"><?=_("Lost Password")?> - A4:</td> - <td class="DataTD"><?=sanitizeHTML($row['A4'])?></td> - </tr> - <tr> - <td class="DataTD"><?=_("Lost Password")?> - Q5:</td> - <td class="DataTD"><?=sanitizeHTML($row['Q5'])?></td> - </tr> - <tr> - <td class="DataTD"><?=_("Lost Password")?> - A5:</td> - <td class="DataTD"><?=sanitizeHTML($row['A5'])?></td> - </tr> -<? } else { ?> - <tr> - <td class="DataTD" colspan="2"><a href="account.php?id=43&userid=<?=$row['id']?>&showlostpw=yes"><?=_("Show Lost Password Details")?></a></td> - </tr> -<? } ?> - <tr> - <td class="DataTD"><?=_("Assurance Points")?>:</td> - <td class="DataTD"><?=intval($drow['points'])?></td> - </tr> -</table> -<br><? - $query = "select * from `email` where `memid`='".intval($row['id'])."' and `deleted`=0 and `hash`='' - and `email`!='".mysql_escape_string($row['email'])."'"; - $dres = mysql_query($query); - if(mysql_num_rows($dres) > 0) { ?> -<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> - <tr> - <td colspan="5" class="title"><?=_("Alternate Verified Email Addresses")?></td> - </tr><? - $rc = mysql_num_rows($dres); - while($drow = mysql_fetch_assoc($dres)) - { ?> - <tr> - <td class="DataTD"><?=_("Secondary Emails")?>:</td> - <td class="DataTD"><?=sanitizeHTML($drow['email'])?></td> - </tr> -<? } ?> -</table> -<br><? } ?> -<? - $query = "select * from `domains` where `memid`='".intval($row['id'])."' and `deleted`=0 and `hash`=''"; - $dres = mysql_query($query); - if(mysql_num_rows($dres) > 0) { ?> -<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> - <tr> - <td colspan="5" class="title"><?=_("Verified Domains")?></td> - </tr><? - $rc = mysql_num_rows($dres); - while($drow = mysql_fetch_assoc($dres)) - { ?> - <tr> - <td class="DataTD"><?=_("Domain")?>:</td> - <td class="DataTD"><?=sanitizeHTML($drow['domain'])?></td> - </tr> -<? } ?> -</table> -<br> -<? } ?> -<? // Begin - Debug infos ?> -<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> - <tr> - <td colspan="2" class="title"><?=_("Account State")?></td> - </tr> - + <tr> + <td class="DataTD" colspan="2"><? printf(_("%s rows displayed."), mysql_num_rows($res)); ?></td> + </tr> <? - // --- bug-975 begin --- - // potential db inconsistency like in a20110804.1 - // Admin console -> don't list user account - // User login -> impossible - // Assurer, assure someone -> user displayed - /* regular user account search with regular settings - - --- Admin Console find user query - $query = "select `users`.`id` as `id`, `email`.`email` as `email` from `users`,`email` - where `users`.`id`=`email`.`memid` and - (`email`.`email` like '$emailsearch' or `email`.`id`='$email' or `users`.`id`='$email') and - `email`.`hash`='' and `email`.`deleted`=0 and `users`.`deleted`=0 - group by `users`.`id` limit 100"; - => requirements - 1. email.hash = '' - 2. email.deleted = 0 - 3. users.deleted = 0 - 4. email.email = primary-email (???) or'd - not covered by admin console find user routine, but may block users login - 5. users.verified = 0|1 - further "special settings" - 6. users.locked (setting displayed in display form) - 7. users.assurer_blocked (setting displayed in display form) - - --- User login user query - select * from `users` where `email`='$email' and (`password`=old_password('$pword') or `password`=sha1('$pword') or - `password`=password('$pword')) and `verified`=1 and `deleted`=0 and `locked`=0 - => requirements - 1. users.verified = 1 - 2. users.deleted = 0 - 3. users.locked = 0 - 4. users.email = primary-email - - --- Assurer, assure someone find user query - select * from `users` where `email`='".mysql_escape_string(stripslashes($_POST['email']))."' - and `deleted`=0 - => requirements - 1. users.deleted = 0 - 2. users.email = primary-email - Admin User Assurer - bit Console Login assure someone - - 1. email.hash = '' Yes No No - 2. email.deleted = 0 Yes No No - 3. users.deleted = 0 Yes Yes Yes - 4. users.verified = 1 No Yes No - 5. users.locked = 0 No Yes No - 6. users.email = prim-email No Yes Yes - 7. email.email = prim-email Yes No No - - full usable account needs all 7 requirements fulfilled - so if one setting isn't set/cleared there is an inconsistency either way - if eg email.email is not avail, admin console cannot open user info - but user can login and assurer can display user info - if user verified is not set to 1, admin console displays user record - but user cannot login, but assurer can search for the user and the data displays - - consistency check: - 1. search primary-email in users.email - 2. search primary-email in email.email - 3. userid = email.memid - 4. check settings from table 1. - 5. - - */ - - $inconsistency = 0; - $inconsistencydisp = ""; - $inccause = ""; - // current userid intval($row['id']) - $query = "select `email` as `uemail`, `deleted` as `udeleted`, `verified`, `locked` - from `users` where `id`='".intval($row['id'])."' "; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $uemail = $drow['uemail']; - $udeleted = $drow['udeleted']; - $uverified = $drow['verified']; - $ulocked = $drow['locked']; - - $query = "select `hash`, `email` as `eemail` from `email` - where `memid`='".intval($row['id'])."' and - `email` ='".$uemail."' and - `deleted` = 0"; - $dres = mysql_query($query); - if ($drow = mysql_fetch_assoc($dres)) { - $drow['edeleted'] = 0; - } else { - // try if there are deleted entries - $query = "select `hash`, `deleted` as `edeleted`, `email` as `eemail` from `email` - where `memid`='".intval($row['id'])."' and - `email` ='".$uemail."'"; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - } - - if ($drow) { - $eemail = $drow['eemail']; - $edeleted = $drow['edeleted']; - $ehash = $drow['hash']; - if ($udeleted!=0) { - $inconsistency += 1; - $inccause .= (empty($inccause)?"":"<br>")._("Users record set to deleted"); - } - if ($uverified!=1) { - $inconsistency += 2; - $inccause .= (empty($inccause)?"":"<br>")._("Users record verified not set"); - } - if ($ulocked!=0) { - $inconsistency += 4; - $inccause .= (empty($inccause)?"":"<br>")._("Users record locked set"); - } - if ($edeleted!=0) { - $inconsistency += 8; - $inccause .= (empty($inccause)?"":"<br>")._("Email record set deleted"); - } - if ($ehash!='') { - $inconsistency += 16; - $inccause .= (empty($inccause)?"":"<br>")._("Email record hash not unset"); - } - } else { - $inconsistency = 32; - $inccause = _("Prim. email, Email record doesn't exist"); - } - if ($inconsistency>0) { - // $inconsistencydisp = _("Yes"); -?> - <tr> - <td class="DataTD"><?=_("Account inconsistency")?>:</td> - <td class="DataTD"><?=$inccause?><br>code: <?=$inconsistency?></td> - </tr> - <tr> - <td colspan="2" class="DataTD" style="max-width: 75ex"> - <?=_("Account inconsistency can cause problems in daily account ". - "operations and needs to be fixed manually through arbitration/critical ". - "team.")?> - </td> - </tr> -<? } - - // --- bug-975 end --- + } ?> -</table> -<br> + </table><br><br> <? - // End - Debug infos -?> + } elseif(mysql_num_rows($res) == 1) { + $row = mysql_fetch_assoc($res); + $_REQUEST['userid'] = $row['id']; + } else { + printf(_("No users found matching %s"), sanitizeHTML($email)); + } +} -<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> - <tr> - <td colspan="6" class="title"><?=_("Certificates")?></td> - </tr> - - <tr> - <td class="DataTD"><?=_("Cert Type")?>:</td> - <td class="DataTD"><?=_("Total")?></td> - <td class="DataTD"><?=_("Valid")?></td> - <td class="DataTD"><?=_("Expired")?></td> - <td class="DataTD"><?=_("Revoked")?></td> - <td class="DataTD"><?=_("Latest Expire")?></td> - </tr> -<!-- server certificates --> - <tr> - <td class="DataTD"><?=_("Server")?>:</td> - <? - $query = "select COUNT(*) as `total`, - MAX(`domaincerts`.`expire`) as `maxexpire` - from `domains` inner join `domaincerts` - on `domains`.`id` = `domaincerts`.`domid` - where `domains`.`memid` = '".intval($row['id'])."' "; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $total = $drow['total']; - - $maxexpire = "0000-00-00 00:00:00"; - if ($drow['maxexpire']) { - $maxexpire = $drow['maxexpire']; - } - - if($total > 0) { - $query = "select COUNT(*) as `valid` - from `domains` inner join `domaincerts` - on `domains`.`id` = `domaincerts`.`domid` - where `domains`.`memid` = '".intval($row['id'])."' - and `revoked` = '0000-00-00 00:00:00' - and `expire` > NOW()"; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $valid = $drow['valid']; - - $query = "select COUNT(*) as `expired` - from `domains` inner join `domaincerts` - on `domains`.`id` = `domaincerts`.`domid` - where `domains`.`memid` = '".intval($row['id'])."' - and `expire` <= NOW()"; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $expired = $drow['expired']; - - $query = "select COUNT(*) as `revoked` - from `domains` inner join `domaincerts` - on `domains`.`id` = `domaincerts`.`domid` - where `domains`.`memid` = '".intval($row['id'])."' - and `revoked` != '0000-00-00 00:00:00'"; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $revoked = $drow['revoked']; - ?> - <td class="DataTD"><?=intval($total)?></td> - <td class="DataTD"><?=intval($valid)?></td> - <td class="DataTD"><?=intval($expired)?></td> - <td class="DataTD"><?=intval($revoked)?></td> - <td class="DataTD"><?=($maxexpire != "0000-00-00 00:00:00")? - substr($maxexpire, 0, 10) : _("Pending")?></td> - <? - } else { // $total > 0 - ?> - <td colspan="5" class="DataTD"><?=_("None")?></td> - <? - } ?> - </tr> -<!-- client certificates --> - <tr> - <td class="DataTD"><?=_("Client")?>:</td> - <? - $query = "select COUNT(*) as `total`, MAX(`expire`) as `maxexpire` - from `emailcerts` - where `memid` = '".intval($row['id'])."' "; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $total = $drow['total']; - - $maxexpire = "0000-00-00 00:00:00"; - if ($drow['maxexpire']) { - $maxexpire = $drow['maxexpire']; - } - - if($total > 0) { - $query = "select COUNT(*) as `valid` - from `emailcerts` - where `memid` = '".intval($row['id'])."' - and `revoked` = '0000-00-00 00:00:00' - and `expire` > NOW()"; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $valid = $drow['valid']; - - $query = "select COUNT(*) as `expired` - from `emailcerts` - where `memid` = '".intval($row['id'])."' - and `expire` <= NOW()"; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $expired = $drow['expired']; - - $query = "select COUNT(*) as `revoked` - from `emailcerts` - where `memid` = '".intval($row['id'])."' - and `revoked` != '0000-00-00 00:00:00'"; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $revoked = $drow['revoked']; - ?> - <td class="DataTD"><?=intval($total)?></td> - <td class="DataTD"><?=intval($valid)?></td> - <td class="DataTD"><?=intval($expired)?></td> - <td class="DataTD"><?=intval($revoked)?></td> - <td class="DataTD"><?=($maxexpire != "0000-00-00 00:00:00")? - substr($maxexpire, 0, 10) : _("Pending")?></td> - <? - } else { // $total > 0 - ?> - <td colspan="5" class="DataTD"><?=_("None")?></td> - <? - } ?> - </tr> -<!-- gpg certificates --> - <tr> - <td class="DataTD"><?=_("GPG")?>:</td> - <? - $query = "select COUNT(*) as `total`, MAX(`expire`) as `maxexpire` - from `gpg` - where `memid` = '".intval($row['id'])."' "; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $total = $drow['total']; - - $maxexpire = "0000-00-00 00:00:00"; - if ($drow['maxexpire']) { - $maxexpire = $drow['maxexpire']; - } - - if($total > 0) { - $query = "select COUNT(*) as `valid` - from `gpg` - where `memid` = '".intval($row['id'])."' - and `expire` > NOW()"; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $valid = $drow['valid']; - - $query = "select COUNT(*) as `expired` - from `gpg` - where `memid` = '".intval($row['id'])."' - and `expire` <= NOW()"; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $expired = $drow['expired']; - - ?> - <td class="DataTD"><?=intval($total)?></td> - <td class="DataTD"><?=intval($valid)?></td> - <td class="DataTD"><?=intval($expired)?></td> - <td class="DataTD"></td> - <td class="DataTD"><?=($maxexpire != "0000-00-00 00:00:00")? - substr($maxexpire, 0, 10) : _("Pending")?></td> - <? - } else { // $total > 0 - ?> - <td colspan="5" class="DataTD"><?=_("None")?></td> - <? - } ?> - </tr> -<!-- org server certificates --> - <tr> - <td class="DataTD"><a href="account.php?id=58&userid=<?=intval($row['id'])?>"><?=_("Org Server")?></a>:</td> - <? - $query = "select COUNT(*) as `total`, - MAX(`orgcerts`.`expire`) as `maxexpire` - from `orgdomaincerts` as `orgcerts` inner join `org` - on `orgcerts`.`orgid` = `org`.`orgid` - where `org`.`memid` = '".intval($row['id'])."' "; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $total = $drow['total']; - - $maxexpire = "0000-00-00 00:00:00"; - if ($drow['maxexpire']) { - $maxexpire = $drow['maxexpire']; - } - - if($total > 0) { - $query = "select COUNT(*) as `valid` - from `orgdomaincerts` as `orgcerts` inner join `org` - on `orgcerts`.`orgid` = `org`.`orgid` - where `org`.`memid` = '".intval($row['id'])."' - and `orgcerts`.`revoked` = '0000-00-00 00:00:00' - and `orgcerts`.`expire` > NOW()"; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $valid = $drow['valid']; - - $query = "select COUNT(*) as `expired` - from `orgdomaincerts` as `orgcerts` inner join `org` - on `orgcerts`.`orgid` = `org`.`orgid` - where `org`.`memid` = '".intval($row['id'])."' - and `orgcerts`.`expire` <= NOW()"; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $expired = $drow['expired']; - - $query = "select COUNT(*) as `revoked` - from `orgdomaincerts` as `orgcerts` inner join `org` - on `orgcerts`.`orgid` = `org`.`orgid` - where `org`.`memid` = '".intval($row['id'])."' - and `orgcerts`.`revoked` != '0000-00-00 00:00:00'"; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $revoked = $drow['revoked']; - ?> - <td class="DataTD"><?=intval($total)?></td> - <td class="DataTD"><?=intval($valid)?></td> - <td class="DataTD"><?=intval($expired)?></td> - <td class="DataTD"><?=intval($revoked)?></td> - <td class="DataTD"><?=($maxexpire != "0000-00-00 00:00:00")? - substr($maxexpire, 0, 10) : _("Pending")?></td> - <? - } else { // $total > 0 - ?> - <td colspan="5" class="DataTD"><?=_("None")?></td> - <? - } ?> - </tr> -<!-- org client certificates --> - <tr> - <td class="DataTD"><?=_("Org Client")?>:</td> - <? - $query = "select COUNT(*) as `total`, - MAX(`orgcerts`.`expire`) as `maxexpire` - from `orgemailcerts` as `orgcerts` inner join `org` - on `orgcerts`.`orgid` = `org`.`orgid` - where `org`.`memid` = '".intval($row['id'])."' "; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $total = $drow['total']; - - $maxexpire = "0000-00-00 00:00:00"; - if ($drow['maxexpire']) { - $maxexpire = $drow['maxexpire']; - } - - if($total > 0) { - $query = "select COUNT(*) as `valid` - from `orgemailcerts` as `orgcerts` inner join `org` - on `orgcerts`.`orgid` = `org`.`orgid` - where `org`.`memid` = '".intval($row['id'])."' - and `orgcerts`.`revoked` = '0000-00-00 00:00:00' - and `orgcerts`.`expire` > NOW()"; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $valid = $drow['valid']; - - $query = "select COUNT(*) as `expired` - from `orgemailcerts` as `orgcerts` inner join `org` - on `orgcerts`.`orgid` = `org`.`orgid` - where `org`.`memid` = '".intval($row['id'])."' - and `orgcerts`.`expire` <= NOW()"; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $expired = $drow['expired']; - - $query = "select COUNT(*) as `revoked` - from `orgemailcerts` as `orgcerts` inner join `org` - on `orgcerts`.`orgid` = `org`.`orgid` - where `org`.`memid` = '".intval($row['id'])."' - and `orgcerts`.`revoked` != '0000-00-00 00:00:00'"; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $revoked = $drow['revoked']; - ?> - <td class="DataTD"><?=intval($total)?></td> - <td class="DataTD"><?=intval($valid)?></td> - <td class="DataTD"><?=intval($expired)?></td> - <td class="DataTD"><?=intval($revoked)?></td> - <td class="DataTD"><?=($maxexpire != "0000-00-00 00:00:00")? - substr($maxexpire, 0, 10) : _("Pending")?></td> - <? - } else { // $total > 0 - ?> - <td colspan="5" class="DataTD"><?=_("None")?></td> - <? - } ?> - </tr> - <tr> - <td colspan="6" class="title"> - <form method="post" action="account.php" onSubmit="if(!confirm('<?=_("Are you sure you want to revoke all private certificates?")?>')) return false;"> - <input type="hidden" name="action" value="revokecert"> - <input type="hidden" name="oldid" value="43"> - <input type="hidden" name="userid" value="<?=intval($userid)?>"> - <input type="submit" value="<?=_('revoke certificates')?>"> - </form> - </td> - </tr> -</table> -<br> - - -<a href="account.php?id=43&userid=<?=$row['id']?>&shownotary=assuredto"><?=_("Show Assurances the user got")?></a> - (<a href="account.php?id=43&userid=<?=$row['id']?>&shownotary=assuredto15"><?=_("New calculation")?></a>) -<br /> -<a href="account.php?id=43&userid=<?=$row['id']?>&shownotary=assuredby"><?=_("Show Assurances the user gave")?></a> - (<a href="account.php?id=43&userid=<?=$row['id']?>&shownotary=assuredby15"><?=_("New calculation")?></a>) -<br /> +// display user information for given user id +if(intval($_REQUEST['userid']) > 0) { + $userid = intval($_REQUEST['userid']); + $res =get_user_data($userid); + if(mysql_num_rows($res) <= 0) { + echo _("I'm sorry, the user you were looking for seems to have disappeared! Bad things are a foot!"); + } else { + $row = mysql_fetch_assoc($res); + $query = "select sum(`points`) as `points` from `notary` where `to`='".intval($row['id'])."' and `deleted` = 0"; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $alerts =get_alerts(intval($row['id'])); -<? -// if(array_key_exists('assuredto',$_GET) && $_GET['assuredto'] == "yes") { +//display account data -function showassuredto() -{ -?> -<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> - <tr> - <td colspan="8" class="title"><?=_("Assurance Points")?></td> - </tr> - <tr> - <td class="DataTD"><b><?=_("ID")?></b></td> - <td class="DataTD"><b><?=_("Date")?></b></td> - <td class="DataTD"><b><?=_("Who")?></b></td> - <td class="DataTD"><b><?=_("Email")?></b></td> - <td class="DataTD"><b><?=_("Points")?></b></td> - <td class="DataTD"><b><?=_("Location")?></b></td> - <td class="DataTD"><b><?=_("Method")?></b></td> - <td class="DataTD"><b><?=_("Revoke")?></b></td> - </tr> -<? - $query = "select * from `notary` where `to`='".intval($_GET['userid'])."'"; - $dres = mysql_query($query); - $points = 0; - while($drow = mysql_fetch_assoc($dres)) - { - $fromuser = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($drow['from'])."'")); - $points += $drow['points']; -?> - <tr> - <td class="DataTD"><?=$drow['id']?></td> - <td class="DataTD"><?=sanitizeHTML($drow['date'])?></td> - <td class="DataTD"><a href="wot.php?id=9&userid=<?=intval($drow['from'])?>"><?=sanitizeHTML($fromuser['fname'])." ".sanitizeHTML($fromuser['lname'])?></td> - <td class="DataTD"><a href="account.php?id=43&userid=<?=intval($drow['from'])?>"><?=sanitizeHTML($fromuser['email'])?></a></td> - <td class="DataTD"><?=intval($drow['points'])?></td> - <td class="DataTD"><?=sanitizeHTML($drow['location'])?></td> - <td class="DataTD"><?=sanitizeHTML($drow['method'])?></td> - <td class="DataTD"><a href="account.php?id=43&userid=<?=intval($drow['to'])?>&assurance=<?=intval($drow['id'])?>&csrf=<?=make_csrf('admdelassurance')?>" onclick="return confirm('<?=sprintf(_("Are you sure you want to revoke the assurance with ID "%s"?"),$drow['id'])?>');"><?=_("Revoke")?></a></td> - </tr> -<? } ?> - <tr> - <td class="DataTD" colspan="4"><b><?=_("Total Points")?>:</b></td> - <td class="DataTD"><?=$points?></td> - <td class="DataTD" colspan="3"> </td> - </tr> -</table> -<? } ?> +//deletes an assurance + if(array_key_exists('assurance',$_REQUEST) && $_REQUEST['assurance'] > 0 && $ticketvalidation == true) + { + $assurance = mysql_escape_string(intval($_REQUEST['assurance'])); + $trow = 0; + $res = mysql_query("select `to` from `notary` where `id`='$assurance'"); + if ($res) { + $trow = mysql_fetch_assoc($res); + } + mysql_query("update `notary` set `deleted`=NOW() where `id`='$assurance'"); + if ($trow) { + fix_assurer_flag($trow['to']); + write_se_log($userid, $_SESSION['profile']['id'], 'SE assurance revoke', $ticketno); + } + } elseif(array_key_exists('assurance',$_REQUEST) && $_REQUEST['assurance'] > 0 && $ticketvalidation == FALSE) { + $ticketmsg=_('No assurance revoked. Ticket number is missing!'); + } -<? -function showassuredby() -{ +//Ticket number ?> -<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> - <tr> - <td colspan="8" class="title"><?=_("Assurance Points The User Issued")?></td> - </tr> - <tr> - <td class="DataTD"><b><?=_("ID")?></b></td> - <td class="DataTD"><b><?=_("Date")?></b></td> - <td class="DataTD"><b><?=_("Who")?></b></td> - <td class="DataTD"><b><?=_("Email")?></b></td> - <td class="DataTD"><b><?=_("Points")?></b></td> - <td class="DataTD"><b><?=_("Location")?></b></td> - <td class="DataTD"><b><?=_("Method")?></b></td> - <td class="DataTD"><b><?=_("Revoke")?></b></td> - </tr> + +<form method="post" action="account.php?id=43&userid=<?=intval($_REQUEST['userid'])?>"> + <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="2" class="title"><?=_('Ticket handling') ?></td> + </tr> + <tr> + <td class="DataTD"><?=_('Ticket no')?>:</td> + <td class="DataTD"><input type="text" name="ticketno" value="<?=$ticketno?>"/></td> + </tr> + <tr> + <td colspan="2" class="DataTDError"><?=$ticketmsg?></td><?php $_SESSION['ticketmsg']='' ?> + </tr> + <tr> + <td colspan="2" ><input type="submit" value="<?=_('Set ticket number') ?>"></td> + </tr> + </table> +</form> +<br/> + + +<!-- display data table --> + <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="5" class="title"><? printf(_("%s's Account Details"), sanitizeHTML($row['email'])); ?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Email")?>:</td> + <td class="DataTD"><?=sanitizeHTML($row['email'])?></td> + </tr> + <tr> + <td class="DataTD"><?=_("First Name")?>:</td> + <td class="DataTD"><form method="post" action="account.php" onSubmit="if(!confirm('<?=_("Are you sure you want to modify this DOB and/or last name?")?>')) return false;"> + <input type="hidden" name="csrf" value="<?=make_csrf('admchangepers')?>" /> + <input type="text" name="fname" value="<?=sanitizeHTML($row['fname'])?>"> + </td> + </tr> + <tr> + <td class="DataTD"><?=_("Middle Name")?>:</td> + <td class="DataTD"><input type="text" name="mname" value="<?=sanitizeHTML($row['mname'])?>"></td> + </tr> + <tr> + <td class="DataTD"><?=_("Last Name")?>:</td> + <td class="DataTD"> <input type="hidden" name="oldid" value="43"> + <input type="hidden" name="action" value="updatedob"> + <input type="hidden" name="userid" value="<?=intval($userid)?>"> + <input type="text" name="lname" value="<?=sanitizeHTML($row['lname'])?>"> + </td> + </tr> + <tr> + <td class="DataTD"><?=_("Suffix")?>:</td> + <td class="DataTD"><input type="text" name="suffix" value="<?=sanitizeHTML($row['suffix'])?>"></td> + </tr> + <tr> + <td class="DataTD"><?=_("Date of Birth")?>:</td> + <td class="DataTD"> + <? + $year = intval(substr($row['dob'], 0, 4)); + $month = intval(substr($row['dob'], 5, 2)); + $day = intval(substr($row['dob'], 8, 2)); + ?> + <nobr> + <select name="day"> + <? + for($i = 1; $i <= 31; $i++) { + echo "<option"; + if($day == $i) { + echo " selected='selected'"; + } + echo ">$i</option>"; + } + ?> + </select> + <select name="month"> + <? + for($i = 1; $i <= 12; $i++) { + echo "<option value='$i'"; + if($month == $i) + echo " selected='selected'"; + echo ">".ucwords(strftime("%B", mktime(0,0,0,$i,1,date("Y"))))."</option>"; + } + ?> + </select> + <input type="text" name="year" value="<?=$year?>" size="4"> + <input type="submit" value="Go"> + <input type="hidden" name="ticketno" value="<?=$ticketno?>"/> + </form> + </nobr> + </td> + </tr> + + <? // list of flags ?> + <tr> + <td class="DataTD"><?=_("CCA accepted")?>:</td> + <td class="DataTD"><a href="account.php?id=57&userid=<?=intval($row['id'])?>"><?=intval(get_user_agreement_status($row['id'])) ? _("Yes") : _("No") ?></a></td> + </tr> + <tr> + <td class="DataTD"><?=_("Trainings")?>:</td> + <td class="DataTD"><a href="account.php?id=55&userid=<?=intval($row['id'])?>">show</a></td> + </tr> + <tr> + <td class="DataTD"><?=_("Is Assurer")?>:</td> + <td class="DataTD"><a href="account.php?id=43&assurer=<?=intval($row['id'])?>&csrf=<?=make_csrf('admsetassuret')?>&ticketno=<?=$ticketno?>"><?=$row['assurer']?></a></td> + </tr> + <tr> + <td class="DataTD"><?=_("Blocked Assurer")?>:</td> + <td class="DataTD"><a href="account.php?id=43&assurer_blocked=<?=intval($row['id'])?>&ticketno=<?=$ticketno?>"><?=$row['assurer_blocked']?></a></td> + </tr> + <tr> + <td class="DataTD"><?=_("Account Locking")?>:</td> + <td class="DataTD"><a href="account.php?id=43&locked=<?=$row['id']?>&csrf=<?=make_csrf('admactlock')?>&ticketno=<?=$ticketno?>"><?=$row['locked']?></a></td> + </tr> + <tr> + <td class="DataTD"><?=_("Code Signing")?>:</td> + <td class="DataTD"><a href="account.php?id=43&codesign=<?=$row['id']?>&csrf=<?=make_csrf('admcodesign')?>&ticketno=<?=$ticketno?>"><?=$row['codesign']?></a></td> + </tr> + <tr> + <td class="DataTD"><?=_("Org Assurer")?>:</td> + <td class="DataTD"><a href="account.php?id=43&orgadmin=<?=$row['id']?>&csrf=<?=make_csrf('admorgadmin')?>&ticketno=<?=$ticketno?>"><?=$row['orgadmin']?></a></td> + </tr> + <tr> + <td class="DataTD"><?=_("TTP Admin")?>:</td> + <td class="DataTD"><a href="account.php?id=43&ttpadmin=<?=$row['id']?>&csrf=<?=make_csrf('admttpadmin')?>&ticketno=<?=$ticketno?>"><?=$row['ttpadmin']?></a></td> + </tr> + <tr> + <td class="DataTD"><?=_("Location Admin")?>:</td> + <td class="DataTD"><a href="account.php?id=43&locadmin=<?=$row['id']?>&ticketno=<?=$ticketno?>"><?=$row['locadmin']?></a></td> + </tr> + <tr> + <td class="DataTD"><?=_("Admin")?>:</td> + <td class="DataTD"><a href="account.php?id=43&admin=<?=$row['id']?>&csrf=<?=make_csrf('admsetadmin')?>&ticketno=<?=$ticketno?>"><?=$row['admin']?></a></td> + </tr> + <tr> + <td class="DataTD"><?=_("Ad Admin")?>:</td> + <td class="DataTD"><a href="account.php?id=43&adadmin=<?=$row['id']?>&ticketno=<?=$ticketno?>"><?=$row['adadmin']?></a> (0 = none, 1 = submit, 2 = approve)</td> + </tr> + <!-- presently not needed + <tr> + <td class="DataTD"><?=_("Tverify Account")?>:</td> + <td class="DataTD"><a href="account.php?id=43&tverify=<?=$row['id']?>&ticketno=<?=$ticketno?>"><?=$row['tverify']?></a></td> + </tr> + --> + <tr> + <td class="DataTD"><?=_("General Announcements")?>:</td> + <td class="DataTD"><a href="account.php?id=43&general=<?=$row['id']?>&ticketno=<?=$ticketno?>"><?=$alerts['general']?></a></td> + </tr> + <tr> + <td class="DataTD"><?=_("Country Announcements")?>:</td> + <td class="DataTD"><a href="account.php?id=43&country=<?=$row['id']?>&ticketno=<?=$ticketno?>"><?=$alerts['country']?></a></td> + </tr> + <tr> + <td class="DataTD"><?=_("Regional Announcements")?>:</td> + <td class="DataTD"><a href="account.php?id=43&regional=<?=$row['id']?>&ticketno=<?=$ticketno?>"><?=$alerts['regional']?></a></td> + </tr> + <tr> + <td class="DataTD"><?=_("Within 200km Announcements")?>:</td> + <td class="DataTD"><a href="account.php?id=43&radius=<?=$row['id']?>&ticketno=<?=$ticketno?>"><?=$alerts['radius']?></a></td> + </tr> + <? //change password, view secret questions and delete account section ?> + <tr> + <td class="DataTD"><?=_("Change Password")?>:</td> + <td class="DataTD"><a href="account.php?id=44&userid=<?=$row['id']?>&ticketno=<?=$ticketno?>"><?=_("Change Password")?></a></td> + </tr> + <tr> + <td class="DataTD"><?=_("Delete Account")?>:</td> + <td class="DataTD"><a href="account.php?id=50&userid=<?=$row['id']?>&csrf=<?=make_csrf('admdelaccount')?>&ticketno=<?=$ticketno?>"><?=_("Delete Account")?></a></td> + </tr> + <? + // This is intensionally a $_GET for audit purposes. DO NOT CHANGE!!! + if(array_key_exists('showlostpw',$_GET) && $_GET['showlostpw'] == "yes" && $ticketvalidation==true) { + write_se_log($userid, $_SESSION['profile']['id'], 'SE view lost password information', $ticketno); + ?> + <tr> + <td class="DataTD"><?=_("Lost Password")?> - Q1:</td> + <td class="DataTD"><?=sanitizeHTML($row['Q1'])?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Lost Password")?> - A1:</td> + <td class="DataTD"><?=sanitizeHTML($row['A1'])?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Lost Password")?> - Q2:</td> + <td class="DataTD"><?=sanitizeHTML($row['Q2'])?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Lost Password")?> - A2:</td> + <td class="DataTD"><?=sanitizeHTML($row['A2'])?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Lost Password")?> - Q3:</td> + <td class="DataTD"><?=sanitizeHTML($row['Q3'])?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Lost Password")?> - A3:</td> + <td class="DataTD"><?=sanitizeHTML($row['A3'])?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Lost Password")?> - Q4:</td> + <td class="DataTD"><?=sanitizeHTML($row['Q4'])?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Lost Password")?> - A4:</td> + <td class="DataTD"><?=sanitizeHTML($row['A4'])?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Lost Password")?> - Q5:</td> + <td class="DataTD"><?=sanitizeHTML($row['Q5'])?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Lost Password")?> - A5:</td> + <td class="DataTD"><?=sanitizeHTML($row['A5'])?></td> + </tr> + <? + } elseif (array_key_exists('showlostpw',$_GET) && $_GET['showlostpw'] == "yes" && $ticketvalidation==false) { + ?> + <tr> + <td class="DataTD" colspan="2"><?=_('No access granted. Ticket number is missing')?></td> + </tr> + <tr> + <td class="DataTD" colspan="2"><a href="account.php?id=43&userid=<?=$row['id']?>&showlostpw=yes&ticketno=<?=$ticketno?>"><?=_("Show Lost Password Details")?></a></td> + </tr> + <? + } else { + ?> + <tr> + <td class="DataTD" colspan="2"><a href="account.php?id=43&userid=<?=$row['id']?>&showlostpw=yes&ticketno=<?=$ticketno?>"><?=_("Show Lost Password Details")?></a></td> + </tr> + <? } + + // list assurance points + ?> + <tr> + <td class="DataTD"><?=_("Assurance Points")?>:</td> + <td class="DataTD"><?=intval($drow['points'])?></td> + </tr> + <? + // show account history + ?> + <tr> + <td class="DataTD" colspan="2"><a href="account.php?id=59&oldid=43&userid=<?=intval($row['id'])?>&ticketno=<?=$ticketno?>"><?=_('Show account history')?></a></td> + </tr> + </table> + <br/> + <? + //list secondary email addresses + $dres = get_email_address(intval($row['id']),mysql_real_escape_string($row['email'])); + if(mysql_num_rows($dres) > 0) { + ?> + <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="5" class="title"><?=_("Alternate Verified Email Addresses")?></td> + </tr> + <? + $rc = mysql_num_rows($dres); + while($drow = mysql_fetch_assoc($dres)) { + ?> + <tr> + <td class="DataTD"><?=_("Secondary Emails")?>:</td> + <td class="DataTD"><?=sanitizeHTML($drow['email'])?></td> + </tr> + <? + } + ?> + </table> + <br/> + <? + } + + // list of domains domains + $dres=get_domains(intval($row['id'])); + if(mysql_num_rows($dres) > 0) { + ?> + <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="5" class="title"><?=_("Verified Domains")?></td> + </tr> + <? + $rc = mysql_num_rows($dres); + while($drow = mysql_fetch_assoc($dres)) { + ?> + <tr> + <td class="DataTD"><?=_("Domain")?>:</td> + <td class="DataTD"><?=sanitizeHTML($drow['domain'])?></td> + </tr> + <? + } + ?> + </table> + <br/> + <? + } + ?> + <? // Begin - Debug infos ?> + <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="2" class="title"><?=_("Account State")?></td> + </tr> + + <? + // --- bug-975 begin --- + // potential db inconsistency like in a20110804.1 + // Admin console -> don't list user account + // User login -> impossible + // Assurer, assure someone -> user displayed + /* regular user account search with regular settings + + --- Admin Console find user query + $query = "select `users`.`id` as `id`, `email`.`email` as `email` from `users`,`email` + where `users`.`id`=`email`.`memid` and + (`email`.`email` like '$emailsearch' or `email`.`id`='$email' or `users`.`id`='$email') and + `email`.`hash`='' and `email`.`deleted`=0 and `users`.`deleted`=0 + group by `users`.`id` limit 100"; + => requirements + 1. email.hash = '' + 2. email.deleted = 0 + 3. users.deleted = 0 + 4. email.email = primary-email (???) or'd + not covered by admin console find user routine, but may block users login + 5. users.verified = 0|1 + further "special settings" + 6. users.locked (setting displayed in display form) + 7. users.assurer_blocked (setting displayed in display form) + + --- User login user query + select * from `users` where `email`='$email' and (`password`=old_password('$pword') or `password`=sha1('$pword') or + `password`=password('$pword')) and `verified`=1 and `deleted`=0 and `locked`=0 + => requirements + 1. users.verified = 1 + 2. users.deleted = 0 + 3. users.locked = 0 + 4. users.email = primary-email + + --- Assurer, assure someone find user query + select * from `users` where `email`='".mysql_real_escape_string(stripslashes($_POST['email']))."' + and `deleted`=0 + => requirements + 1. users.deleted = 0 + 2. users.email = primary-email + + Admin User Assurer + bit Console Login assure someone + + 1. email.hash = '' Yes No No + 2. email.deleted = 0 Yes No No + 3. users.deleted = 0 Yes Yes Yes + 4. users.verified = 1 No Yes No + 5. users.locked = 0 No Yes No + 6. users.email = prim-email No Yes Yes + 7. email.email = prim-email Yes No No + + full usable account needs all 7 requirements fulfilled + so if one setting isn't set/cleared there is an inconsistency either way + if eg email.email is not avail, admin console cannot open user info + but user can login and assurer can display user info + if user verified is not set to 1, admin console displays user record + but user cannot login, but assurer can search for the user and the data displays + + consistency check: + 1. search primary-email in users.email + 2. search primary-email in email.email + 3. userid = email.memid + 4. check settings from table 1. - 5. + + */ + + $inconsistency = 0; + $inconsistencydisp = ""; + $inccause = ""; + + // current userid intval($row['id']) + $query = "select `email` as `uemail`, `deleted` as `udeleted`, `verified`, `locked` + from `users` where `id`='".intval($row['id'])."' "; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $uemail = $drow['uemail']; + $udeleted = $drow['udeleted']; + $uverified = $drow['verified']; + $ulocked = $drow['locked']; + + $query = "select `hash`, `email` as `eemail` from `email` + where `memid`='".intval($row['id'])."' and + `email` ='".$uemail."' and + `deleted` = 0"; + $dres = mysql_query($query); + if ($drow = mysql_fetch_assoc($dres)) { + $drow['edeleted'] = 0; + } else { + // try if there are deleted entries + $query = "select `hash`, `deleted` as `edeleted`, `email` as `eemail` from `email` + where `memid`='".intval($row['id'])."' and + `email` ='".$uemail."'"; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + } + + if ($drow) { + $eemail = $drow['eemail']; + $edeleted = $drow['edeleted']; + $ehash = $drow['hash']; + if ($udeleted!=0) { + $inconsistency += 1; + $inccause .= (empty($inccause)?"":"<br>")._("Users record set to deleted"); + } + if ($uverified!=1) { + $inconsistency += 2; + $inccause .= (empty($inccause)?"":"<br>")._("Users record verified not set"); + } + if ($ulocked!=0) { + $inconsistency += 4; + $inccause .= (empty($inccause)?"":"<br>")._("Users record locked set"); + } + if ($edeleted!=0) { + $inconsistency += 8; + $inccause .= (empty($inccause)?"":"<br>")._("Email record set deleted"); + } + if ($ehash!='') { + $inconsistency += 16; + $inccause .= (empty($inccause)?"":"<br>")._("Email record hash not unset"); + } + } else { + $inconsistency = 32; + $inccause = _("Prim. email, Email record doesn't exist"); + } + if ($inconsistency>0) { + // $inconsistencydisp = _("Yes"); + ?> + <tr> + <td class="DataTD"><?=_("Account inconsistency")?>:</td> + <td class="DataTD"><?=$inccause?><br>code: <?=$inconsistency?></td> + </tr> + <tr> + <td colspan="2" class="DataTD" style="max-width: 75ex;"> + <?=_("Account inconsistency can cause problems in daily account operations and needs to be fixed manually through arbitration/critical team.")?> + </td> + </tr> + <? + } + + // --- bug-975 end --- + ?> + </table> + <br /> + <? + // End - Debug infos + + // certificate overview + ?> + + <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="6" class="title"><?=_("Certificates")?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Cert Type")?>:</td> + <td class="DataTD"><?=_("Total")?></td> + <td class="DataTD"><?=_("Valid")?></td> + <td class="DataTD"><?=_("Expired")?></td> + <td class="DataTD"><?=_("Revoked")?></td> + <td class="DataTD"><?=_("Latest Expire")?></td> + </tr> + <!-- server certificates --> + <tr> + <td class="DataTD"><?=_("Server")?>:</td> + <? + $query = " + select COUNT(*) as `total`, + MAX(`domaincerts`.`expire`) as `maxexpire` + from `domains` inner join `domaincerts` + on `domains`.`id` = `domaincerts`.`domid` + where `domains`.`memid` = '".intval($row['id'])."' + "; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $total = $drow['total']; + + $maxexpire = "0000-00-00 00:00:00"; + if ($drow['maxexpire']) { + $maxexpire = $drow['maxexpire']; + } + + if($total > 0) { + $query = " + select COUNT(*) as `valid` + from `domains` inner join `domaincerts` + on `domains`.`id` = `domaincerts`.`domid` + where `domains`.`memid` = '".intval($row['id'])."' + and `revoked` = '0000-00-00 00:00:00' + and `expire` > NOW() + "; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $valid = $drow['valid']; + + $query = " + select COUNT(*) as `expired` + from `domains` inner join `domaincerts` + on `domains`.`id` = `domaincerts`.`domid` + where `domains`.`memid` = '".intval($row['id'])."' + and `expire` <= NOW() + "; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $expired = $drow['expired']; + + $query = " + select COUNT(*) as `revoked` + from `domains` inner join `domaincerts` + on `domains`.`id` = `domaincerts`.`domid` + where `domains`.`memid` = '".intval($row['id'])."' + and `revoked` != '0000-00-00 00:00:00' + "; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $revoked = $drow['revoked']; + ?> + <td class="DataTD"><?=intval($total)?></td> + <td class="DataTD"><?=intval($valid)?></td> + <td class="DataTD"><?=intval($expired)?></td> + <td class="DataTD"><?=intval($revoked)?></td> + <td class="DataTD"><?=($maxexpire != "0000-00-00 00:00:00")?substr($maxexpire, 0, 10) : _("Pending")?></td> + <? + } else { // $total > 0 + ?> + <td colspan="5" class="DataTD"><?=_("None")?></td> + <? + } + ?> + </tr> + <!-- client certificates --> + <tr> + <td class="DataTD"><?=_("Client")?>:</td> + <? + $query = " + select COUNT(*) as `total`, MAX(`expire`) as `maxexpire` + from `emailcerts` + where `memid` = '".intval($row['id'])."' + "; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $total = $drow['total']; + + $maxexpire = "0000-00-00 00:00:00"; + if ($drow['maxexpire']) { + $maxexpire = $drow['maxexpire']; + } + + if($total > 0) { + $query = " + select COUNT(*) as `valid` + from `emailcerts` + where `memid` = '".intval($row['id'])."' + and `revoked` = '0000-00-00 00:00:00' + and `expire` > NOW() + "; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $valid = $drow['valid']; + + $query = " + select COUNT(*) as `expired` + from `emailcerts` + where `memid` = '".intval($row['id'])."' + and `expire` <= NOW() + "; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $expired = $drow['expired']; + + $query = " + select COUNT(*) as `revoked` + from `emailcerts` + where `memid` = '".intval($row['id'])."' + and `revoked` != '0000-00-00 00:00:00' + "; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $revoked = $drow['revoked']; + ?> + <td class="DataTD"><?=intval($total)?></td> + <td class="DataTD"><?=intval($valid)?></td> + <td class="DataTD"><?=intval($expired)?></td> + <td class="DataTD"><?=intval($revoked)?></td> + <td class="DataTD"><?=($maxexpire != "0000-00-00 00:00:00")?substr($maxexpire, 0, 10) : _("Pending")?></td> + <? + } else { // $total > 0 + ?> + <td colspan="5" class="DataTD"><?=_("None")?></td> + <? + } + ?> + </tr> + <!-- gpg certificates --> + <tr> + <td class="DataTD"><?=_("GPG")?>:</td> + <? + $query = " + select COUNT(*) as `total`, MAX(`expire`) as `maxexpire` + from `gpg` + where `memid` = '".intval($row['id'])."' + "; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $total = $drow['total']; + + $maxexpire = "0000-00-00 00:00:00"; + if ($drow['maxexpire']) { + $maxexpire = $drow['maxexpire']; + } + + if($total > 0) { + $query = " + select COUNT(*) as `valid` + from `gpg` + where `memid` = '".intval($row['id'])."' + and `expire` > NOW() + "; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $valid = $drow['valid']; + + $query = " + select COUNT(*) as `expired` + from `gpg` + where `memid` = '".intval($row['id'])."' + and `expire` <= NOW() + "; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $expired = $drow['expired']; + ?> + <td class="DataTD"><?=intval($total)?></td> + <td class="DataTD"><?=intval($valid)?></td> + <td class="DataTD"><?=intval($expired)?></td> + <td class="DataTD"></td> + <td class="DataTD"><?=($maxexpire != "0000-00-00 00:00:00")?substr($maxexpire, 0, 10) : _("Pending")?></td> + <? + } else { // $total > 0 + ?> + <td colspan="5" class="DataTD"><?=_("None")?></td> + <? + } + ?> + </tr> + <!-- org server certificates --> + <tr> + <td class="DataTD"><a href="account.php?id=58&userid=<?=intval($row['id'])?>"><?=_("Org Server")?></a>:</td> + <? + $query = " + select COUNT(*) as `total`, + MAX(`orgcerts`.`expire`) as `maxexpire` + from `orgdomaincerts` as `orgcerts` inner join `org` + on `orgcerts`.`orgid` = `org`.`orgid` + where `org`.`memid` = '".intval($row['id'])."' + "; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $total = $drow['total']; + + $maxexpire = "0000-00-00 00:00:00"; + if ($drow['maxexpire']) { + $maxexpire = $drow['maxexpire']; + } + + if($total > 0) { + $query = " + select COUNT(*) as `valid` + from `orgdomaincerts` as `orgcerts` inner join `org` + on `orgcerts`.`orgid` = `org`.`orgid` + where `org`.`memid` = '".intval($row['id'])."' + and `orgcerts`.`revoked` = '0000-00-00 00:00:00' + and `orgcerts`.`expire` > NOW() + "; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $valid = $drow['valid']; + + $query = " + select COUNT(*) as `expired` + from `orgdomaincerts` as `orgcerts` inner join `org` + on `orgcerts`.`orgid` = `org`.`orgid` + where `org`.`memid` = '".intval($row['id'])."' + and `orgcerts`.`expire` <= NOW() + "; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $expired = $drow['expired']; + + $query = " + select COUNT(*) as `revoked` + from `orgdomaincerts` as `orgcerts` inner join `org` + on `orgcerts`.`orgid` = `org`.`orgid` + where `org`.`memid` = '".intval($row['id'])."' + and `orgcerts`.`revoked` != '0000-00-00 00:00:00' + "; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $revoked = $drow['revoked']; + ?> + <td class="DataTD"><?=intval($total)?></td> + <td class="DataTD"><?=intval($valid)?></td> + <td class="DataTD"><?=intval($expired)?></td> + <td class="DataTD"><?=intval($revoked)?></td> + <td class="DataTD"><?=($maxexpire != "0000-00-00 00:00:00")?substr($maxexpire, 0, 10) : _("Pending")?></td> + <? + } else { // $total > 0 + ?> + <td colspan="5" class="DataTD"><?=_("None")?></td> + <? + } + ?> + </tr> + <!-- org client certificates --> + <tr> + <td class="DataTD"><?=_("Org Client")?>:</td> + <? + $query = " + select COUNT(*) as `total`, + MAX(`orgcerts`.`expire`) as `maxexpire` + from `orgemailcerts` as `orgcerts` inner join `org` + on `orgcerts`.`orgid` = `org`.`orgid` + where `org`.`memid` = '".intval($row['id'])."' + "; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $total = $drow['total']; + + $maxexpire = "0000-00-00 00:00:00"; + if ($drow['maxexpire']) { + $maxexpire = $drow['maxexpire']; + } + + if($total > 0) { + $query = " + select COUNT(*) as `valid` + from `orgemailcerts` as `orgcerts` inner join `org` + on `orgcerts`.`orgid` = `org`.`orgid` + where `org`.`memid` = '".intval($row['id'])."' + and `orgcerts`.`revoked` = '0000-00-00 00:00:00' + and `orgcerts`.`expire` > NOW() + "; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $valid = $drow['valid']; + + $query = " + select COUNT(*) as `expired` + from `orgemailcerts` as `orgcerts` inner join `org` + on `orgcerts`.`orgid` = `org`.`orgid` + where `org`.`memid` = '".intval($row['id'])."' + and `orgcerts`.`expire` <= NOW() + "; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $expired = $drow['expired']; + + $query = " + select COUNT(*) as `revoked` + from `orgemailcerts` as `orgcerts` inner join `org` + on `orgcerts`.`orgid` = `org`.`orgid` + where `org`.`memid` = '".intval($row['id'])."' + and `orgcerts`.`revoked` != '0000-00-00 00:00:00' + "; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $revoked = $drow['revoked']; + ?> + <td class="DataTD"><?=intval($total)?></td> + <td class="DataTD"><?=intval($valid)?></td> + <td class="DataTD"><?=intval($expired)?></td> + <td class="DataTD"><?=intval($revoked)?></td> + <td class="DataTD"><?=($maxexpire != "0000-00-00 00:00:00")?substr($maxexpire, 0, 10) : _("Pending")?></td> + <? + } else { // $total > 0 + ?> + <td colspan="5" class="DataTD"><?=_("None")?></td> + <? + } + ?> + </tr> + <tr> + <td colspan="6" class="title"> + <form method="post" action="account.php" onSubmit="if(!confirm('<?=_("Are you sure you want to revoke all private certificates?")?>')) return false;"> + <input type="hidden" name="action" value="revokecert"> + <input type="hidden" name="oldid" value="43"> + <input type="hidden" name="userid" value="<?=intval($userid)?>"> + <input type="submit" value="<?=_('revoke certificates')?>"> + <input type="hidden" name="ticketno" value="<?=$ticketno?>"/> + </form> + </td> + </tr> + </table> + <br /> + <? // list assurances ?> + <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td class="DataTD"> + <a href="account.php?id=43&userid=<?=$row['id']?>&shownotary=assuredto&ticketno=<?=$ticketno?>"><?=_("Show Assurances the user got")?></a> + (<a href="account.php?id=43&userid=<?=$row['id']?>&shownotary=assuredto15&ticketno=<?=$ticketno?>"><?=_("New calculation")?></a>) + </td> + </tr> + <tr> + <td class="DataTD"> + <a href="account.php?id=43&userid=<?=$row['id']?>&shownotary=assuredby&ticketno=<?=$ticketno?>"><?=_("Show Assurances the user gave")?></a> + (<a href="account.php?id=43&userid=<?=$row['id']?>&shownotary=assuredby15&ticketno=<?=$ticketno?>"><?=_("New calculation")?></a>) + </td> + </tr> + </table> + <? + // if(array_key_exists('assuredto',$_GET) && $_GET['assuredto'] == "yes") { + + function showassuredto($ticketno) + { + ?> + <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="8" class="title"><?=_("Assurance Points")?></td> + </tr> + <tr> + <td class="DataTD"><b><?=_("ID")?></b></td> + <td class="DataTD"><b><?=_("Date")?></b></td> + <td class="DataTD"><b><?=_("Who")?></b></td> + <td class="DataTD"><b><?=_("Email")?></b></td> + <td class="DataTD"><b><?=_("Points")?></b></td> + <td class="DataTD"><b><?=_("Location")?></b></td> + <td class="DataTD"><b><?=_("Method")?></b></td> + <td class="DataTD"><b><?=_("Revoke")?></b></td> + </tr> + <? + $query = "select * from `notary` where `to`='".intval($_GET['userid'])."' and `deleted` = 0"; + $dres = mysql_query($query); + $points = 0; + while($drow = mysql_fetch_assoc($dres)) { + $fromuser = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($drow['from'])."'")); + $points += $drow['points']; + ?> + <tr> + <td class="DataTD"><?=$drow['id']?></td> + <td class="DataTD"><?=sanitizeHTML($drow['date'])?></td> + <td class="DataTD"><a href="wot.php?id=9&userid=<?=intval($drow['from'])?>"><?=sanitizeHTML($fromuser['fname'])." ".sanitizeHTML($fromuser['lname'])?></td> + <td class="DataTD"><a href="account.php?id=43&userid=<?=intval($drow['from'])?>"><?=sanitizeHTML($fromuser['email'])?></a></td> + <td class="DataTD"><?=intval($drow['points'])?></td> + <td class="DataTD"><?=sanitizeHTML($drow['location'])?></td> + <td class="DataTD"><?=sanitizeHTML($drow['method'])?></td> + <td class="DataTD"><a href="account.php?id=43&userid=<?=intval($drow['to'])?>&assurance=<?=intval($drow['id'])?>&csrf=<?=make_csrf('admdelassurance')?>&ticketno=<?=$ticketno?>" onclick="return confirm('<?=sprintf(_("Are you sure you want to revoke the assurance with ID "%s"?"),$drow['id'])?>');"><?=_("Revoke")?></a></td> + </tr> + <? + } + ?> + <tr> + <td class="DataTD" colspan="4"><b><?=_("Total Points")?>:</b></td> + <td class="DataTD"><?=$points?></td> + <td class="DataTD" colspan="3"> </td> + </tr> + </table> + <? + } + + function showassuredby($ticketno) + { + ?> + <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="8" class="title"><?=_("Assurance Points The User Issued")?></td> + </tr> + <tr> + <td class="DataTD"><b><?=_("ID")?></b></td> + <td class="DataTD"><b><?=_("Date")?></b></td> + <td class="DataTD"><b><?=_("Who")?></b></td> + <td class="DataTD"><b><?=_("Email")?></b></td> + <td class="DataTD"><b><?=_("Points")?></b></td> + <td class="DataTD"><b><?=_("Location")?></b></td> + <td class="DataTD"><b><?=_("Method")?></b></td> + <td class="DataTD"><b><?=_("Revoke")?></b></td> + </tr> + <? + $query = "select * from `notary` where `from`='".intval($_GET['userid'])."' and `deleted` = 0"; + $dres = mysql_query($query); + $points = 0; + while($drow = mysql_fetch_assoc($dres)) { + $fromuser = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".$drow['to']."'")); + $points += $drow['points']; + ?> + <tr> + <td class="DataTD"><?=$drow['id']?></td> + <td class="DataTD"><?=$drow['date']?></td> + <td class="DataTD"><a href="wot.php?id=9&userid=<?=$drow['to']?>"><?=$fromuser['fname']." ".$fromuser['lname']?></td> + <td class="DataTD"><a href="account.php?id=43&userid=<?=intval($drow['to'])?>"><?=sanitizeHTML($fromuser['email'])?></a></td> + <td class="DataTD"><?=$drow['points']?></td> + <td class="DataTD"><?=$drow['location']?></td> + <td class="DataTD"><?=$drow['method']?></td> + <td class="DataTD"><a href="account.php?id=43&userid=<?=$drow['from']?>&assurance=<?=$drow['id']?>&csrf=<?=make_csrf('admdelassurance')?>&ticketno=<?=$ticketno?>" onclick="return confirm('<?=sprintf(_("Are you sure you want to revoke the assurance with ID "%s"?"),$drow['id'])?>');"><?=_("Revoke")?></a></td> + </tr> + <? + } + ?> + <tr> + <td class="DataTD" colspan="4"><b><?=_("Total Points")?>:</b></td> + <td class="DataTD"><?=$points?></td> + <td class="DataTD" colspan="3"> </td> + </tr> + </table> + <?} ?> +<br/><br/> <? - $query = "select * from `notary` where `from`='".intval($_GET['userid'])."'"; - $dres = mysql_query($query); - $points = 0; - while($drow = mysql_fetch_assoc($dres)) - { - $fromuser = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".$drow['to']."'")); - $points += $drow['points']; -?> - <tr> - <td class="DataTD"><?=$drow['id']?></td> - <td class="DataTD"><?=$drow['date']?></td> - <td class="DataTD"><a href="wot.php?id=9&userid=<?=$drow['to']?>"><?=$fromuser['fname']." ".$fromuser['lname']?></td> - <td class="DataTD"><a href="account.php?id=43&userid=<?=intval($drow['to'])?>"><?=sanitizeHTML($fromuser['email'])?></a></td> - <td class="DataTD"><?=$drow['points']?></td> - <td class="DataTD"><?=$drow['location']?></td> - <td class="DataTD"><?=$drow['method']?></td> - <td class="DataTD"><a href="account.php?id=43&userid=<?=$drow['from']?>&assurance=<?=$drow['id']?>&csrf=<?=make_csrf('admdelassurance')?>" onclick="return confirm('<?=sprintf(_("Are you sure you want to revoke the assurance with ID "%s"?"),$drow['id'])?>');"><?=_("Revoke")?></a></td> - </tr> -<? } ?> - <tr> - <td class="DataTD" colspan="4"><b><?=_("Total Points")?>:</b></td> - <td class="DataTD"><?=$points?></td> - <td class="DataTD" colspan="3"> </td> - </tr> -</table> -<? } ?> -<br><br> -<? } } +} } if(isset($_GET['shownotary'])) { switch($_GET['shownotary']) { case 'assuredto': - showassuredto(); + showassuredto($ticketno); break; case 'assuredby': - showassuredby(); + showassuredby($ticketno); break; case 'assuredto15': - output_received_assurances(intval($_GET['userid']),1); + output_received_assurances(intval($_GET['userid']),1,$ticketno); break; case 'assuredby15': - output_given_assurances(intval($_GET['userid']),1); + output_given_assurances(intval($_GET['userid']),1, $ticketno); break; } } diff --git a/pages/account/44.php b/pages/account/44.php index fd34612..16bfa8c 100644 --- a/pages/account/44.php +++ b/pages/account/44.php @@ -15,7 +15,16 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> -<? if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "") { ?><div color="orange">ERROR: <?=$_SESSION['_config']['error']?></div><? unset($_SESSION['_config']['error']); } ?> +<? if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "") { ?><div color="orange">ERROR: <?=$_SESSION['_config']['error']?></div><? unset($_SESSION['_config']['error']); } + +$ticketno = ""; if(array_key_exists('ticketno', $_SESSION)) $ticketno = $_SESSION['ticketno']; +if (!valid_ticket_number($ticketno)) { + printf(_("I'm sorry, you did not enter a ticket number!%sYou cannot reset the password.%s"), '<br/>', '<br/><a href="account.php?id=43&userid=' . intval($_REQUEST['userid']) .'">'. _('Back to previous page.').'</a>'); + showfooter(); + exit; + } +?> + <form method="post" action="account.php"> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> <tr> @@ -35,4 +44,5 @@ </table> <input type="hidden" name="userid" value="<?=intval($_REQUEST['userid'])?>"> <input type="hidden" name="oldid" value="<?=$id?>"> +<input type="hidden" name="ticketno" value="<?=$ticketno?>"/> </form> diff --git a/pages/account/49.php b/pages/account/49.php index 0218fa0..fed1cb9 100644 --- a/pages/account/49.php +++ b/pages/account/49.php @@ -19,7 +19,7 @@ $userid=0; if(array_key_exists('userid',$_GET)) $userid=intval($_GET['userid']); if($userid <= 0) { - $domainsearch = $domain = mysql_escape_string(stripslashes($_POST['domain'])); + $domainsearch = $domain = mysql_real_escape_string(stripslashes($_POST['domain'])); if(!strstr($domain, "%")) $domainsearch = "%$domain%"; if(preg_match("/^\d+$/",$domain)) diff --git a/pages/account/52.php b/pages/account/52.php index 77a3bae..ce2025f 100644 --- a/pages/account/52.php +++ b/pages/account/52.php @@ -35,7 +35,7 @@ exit; } - $query = "select sum(`points`) as `points` from `notary` where `to`='$memid'"; + $query = "select sum(`points`) as `points` from `notary` where `to`='$memid' and `deleted` = 0"; $notary = mysql_fetch_assoc(mysql_query($query)); $query = "select * from `users` where `id`='$memid'"; $user = mysql_fetch_assoc(mysql_query($query)); @@ -65,7 +65,7 @@ <input type="hidden" name="oldid" value="<?=intval($_GET['id'])?>"> <input type="hidden" name="uid" value="<?=$uid?>"> </form> -<? } else { +<? } else { $query = "select * from `tverify` where `id`='$uid' and `modified`=1"; $res = mysql_query($query); if(mysql_num_rows($res) > 0) @@ -74,7 +74,7 @@ } else { if($uid) echo _("Unable to locate a valid request for that UID.")."<br/>"; } - + // Search for open requests: $query = "select * from `tverify` where `modified`=0"; $res = mysql_query($query); @@ -83,14 +83,14 @@ echo "<br/>"._("The following requests are still open:")."<br/><ul>"; while($row = mysql_fetch_assoc($res)) { - $uid=intval($row['id']); + $uid=intval($row['id']); $query3 = "select * from `tverify-vote` where `tverify`='$uid' and `memid`='".intval($_SESSION['profile']['id'])."'"; $rc3 = mysql_num_rows(mysql_query($query3)); if($rc3 <= 0) { echo "<li><a href='account.php?id=52&uid=".intval($row['id'])."'>".intval($row['id'])."</a></li>\n"; } - } + } echo "</ul>\n<br>\n"; } else diff --git a/pages/account/53.php b/pages/account/53.php index cc9e2d6..1ec04b2 100644 --- a/pages/account/53.php +++ b/pages/account/53.php @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> <? - $town = array_key_exists('town',$_REQUEST)?mysql_escape_string(stripslashes($_REQUEST['town'])):""; + $town = array_key_exists('town',$_REQUEST)?mysql_real_escape_string(stripslashes($_REQUEST['town'])):""; $regid = array_key_exists('regid',$_REQUEST)?intval($_REQUEST['regid']):0; $ccid = array_key_exists('ccid',$_REQUEST)?intval($_REQUEST['ccid']):0; $start = array_key_exists('start',$_REQUEST)?intval($_REQUEST['start']):0; diff --git a/pages/account/54.php b/pages/account/54.php index 753b4af..35dce33 100644 --- a/pages/account/54.php +++ b/pages/account/54.php @@ -19,7 +19,7 @@ $ccid = array_key_exists('ccid',$_REQUEST)?intval($_REQUEST['ccid']):0; $regid = array_key_exists('regid',$_REQUEST)?intval($_REQUEST['regid']):0; $locid = array_key_exists('locid',$_REQUEST)?intval($_REQUEST['locid']):0; - $name = array_key_exists('name',$_REQUEST)?mysql_escape_string($_REQUEST['name']):""; + $name = array_key_exists('name',$_REQUEST)?mysql_real_escape_string($_REQUEST['name']):""; if($ccid > 0 && $_REQUEST['action'] == "add") { ?> <form method="post" action="account.php"> diff --git a/pages/account/55.php b/pages/account/55.php index ec401a0..0358504 100644 --- a/pages/account/55.php +++ b/pages/account/55.php @@ -23,7 +23,7 @@ <tr>
<td colspan="5" class="title"><?=_("Your passed Tests")?></td>
</tr>
- <tr>
+ <tr> <td class="DataTD"><?=_("The list of tests you did pass at").' <a href="https://cats.cacert.org/">https://cats.cacert.org/</a>'?></td>
</tr>
</table>
@@ -60,9 +60,9 @@ " FROM `cats_passed` AS CP, `cats_variant` AS CV, `cats_type` AS CT ".
" WHERE `CP`.`variant_id`=`CV`.`id` AND `CV`.`type_id`=`CT`.`id` AND `CP`.`user_id` ='".(int)$user_id."'".
" ORDER BY `CP`.`pass_date`";
-
+ $res = mysql_query($query);
-
+ $HaveTest=0;
while($row = mysql_fetch_array($res, MYSQL_NUM))
{
@@ -75,19 +75,19 @@ <td class="DataTD"><?=$row[1]?></td>
<td class="DataTD"><?=$row[2]?></td>
</tr>
-<? }
+<? } ?>
</table>
<br>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
- <tr>
+ <tr> <?
if ($_SESSION['profile']['admin'] == 1 && array_key_exists('userid',$_REQUEST) && intval($_REQUEST['userid']) > 0) {
?>
<tr><td colspan="3" class="DataTD"><a href="account.php?id=43&userid=<?=$user_id ?>">back</a></td></tr>
<? } else {
$query = 'SELECT `u`.id, `u`.`assurer`, SUM(`points`) FROM `users` AS `u`, `notary` AS `n` '.
- ' WHERE `u`.`id` = \''.(int)intval($_SESSION['profile']['id']).'\' AND `n`.`to` = `u`.`id` AND `expire` < now() '.
+ ' WHERE `u`.`id` = \''.(int)intval($_SESSION['profile']['id']).'\' AND `n`.`to` = `u`.`id` AND `expire` < now() and and `n`.`deleted` = 0'. ' GROUP BY `u`.id, `u`.`assurer`';
$res = mysql_query($query);
if (!$res) {
diff --git a/pages/account/57.php b/pages/account/57.php index 76eee27..0356eeb 100644 --- a/pages/account/57.php +++ b/pages/account/57.php @@ -17,12 +17,12 @@ */ ?> <? include_once($_SESSION['_config']['filepath'].'/includes/notary.inc.php'); - + if ($_SESSION['profile']['admin'] != 1 || !array_key_exists('userid',$_REQUEST) || intval($_REQUEST['userid']) < 1) { echo _('You do not have access to this page'); - } else { + } else { $user_id = intval($_REQUEST['userid']); $query = "select * from `users` where `id`='$user_id' and `users`.`deleted`=0"; $res = mysql_query($query); @@ -38,7 +38,7 @@ </tr> </table> - + <br> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> <tr> @@ -57,8 +57,8 @@ ?> <tr> <td class="DataTD"><?=_('First active CCA')?></td> - <td class="DataTD"><?=$data['date']?></td> - <td class="DataTD"><?=$data['method']?></td> + <td class="DataTD"><?=isset($data['date'])?$data['date']:''?></td> + <td class="DataTD"><?=isset($data['method'])?$data['method']:''?></td> <td class="DataTD"><?=$type?></td> </tr> <? @@ -71,8 +71,8 @@ ?> <tr> <td class="DataTD"><?=_('First passive CCA')?></td> - <td class="DataTD"><?=$data['date']?></td> - <td class="DataTD"><?=$data['method']?></td> + <td class="DataTD"><?=isset($data['date'])?$data['date']:''?></td> + <td class="DataTD"><?=isset($data['method'])?$data['method']:''?></td> <td class="DataTD"><?=$type?></td> </tr> <? @@ -87,19 +87,19 @@ ?> <tr> <td class="DataTD"><?=_('Last CCA')?></td> - <td class="DataTD"><?=$data['date']?></td> - <td class="DataTD"><?=$data['method']?></td> + <td class="DataTD"><?=isset($data['date'])?$data['date']:''?></td> + <td class="DataTD"><?=isset($data['method'])?$data['method']:''?></td> <td class="DataTD"><?=$type?></td> </tr> </table> <br> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> - <tr> + <tr> <? if ($_SESSION['profile']['admin'] == 1 && array_key_exists('userid',$_REQUEST) && intval($_REQUEST['userid']) > 0) { ?> <tr><td colspan="3" class="DataTD"><a href="account.php?id=43&userid=<?=$user_id ?>">back</a></td></tr> -<? } +<? } ?> </table> <? } diff --git a/pages/account/59.php b/pages/account/59.php new file mode 100644 index 0000000..51eb6ef --- /dev/null +++ b/pages/account/59.php @@ -0,0 +1,308 @@ +<?/* + LibreSSL - CAcert web application + Copyright (C) 2004-2008 CAcert Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ +include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); + + +$colspandefault=2; +$userid = intval($_REQUEST['userid']); +$res =get_user_data($userid); + + + +if(mysql_num_rows($res) <= 0) +{ + echo _("I'm sorry, the user you were looking for seems to have disappeared! Bad things are a foot!"); + exit; +} + +$row = mysql_fetch_assoc($res); + +$fname = $row['fname']; +$mname = $row['mname']; +$lname = $row['lname']; +$suffix = $row['suffix']; +$dob = $row['dob']; +$username = $fname." ".$mname." ".$lname." ".$suffix; +$email = $row['email']; +$alerts =get_alerts($userid); +$support=0; +if(intval($_REQUEST['oldid'])==43){ + $support=$_SESSION['profile']['admin']; +} +$ticketno = ""; if(array_key_exists('ticketno', $_SESSION)) $ticketno = $_SESSION['ticketno']; +if (!valid_ticket_number($ticketno) && $support == 1) { + printf(_("I'm sorry, you did not enter a ticket number!%sSupport is not allowed to view the account history without a ticket number.%s"), '<br/>', '<br/><a href="account.php?id=43&userid=' . intval($_REQUEST['userid']) .'">'. _('Back to previous page.').'</a>'); + showfooter(); + exit; +} +if ( $support == 1) { + write_se_log($userid, $_SESSION['profile']['id'], 'SE View account history', $_REQUEST['ticketno']); +} +?> +<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="<?=$colspandefault ?>" class="title"><?=sprintf(_('Account history of %s'),$username)?></td> + </tr> + <tr> + <td colspan="<?=$colspandefault ?>" class="title"><?=_('User actions')?></td> + </tr> + <tr> + <td class="DataTD"><?=_('User name')?></td> + <td class="DataTD"><?=$username?></td> + </tr> + <tr> + <td class="DataTD"><?=_('Date of Birth')?></td> + <td class="DataTD"><?=$dob?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Is Assurer")?>:</td> + <td class="DataTD"><?= ($row['assurer']==0)? _('No'):_('Yes')?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Blocked Assurer")?>:</td> + <td class="DataTD"><?= ($row['assurer_blocked']==0)? _('No'):_('Yes')?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Account Locking")?>:</td> + <td class="DataTD"><?= ($row['locked']==0)? _('No'):_('Yes')?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Code Signing")?>:</td> + <td class="DataTD"><?= ($row['codesign']==0)? _('No'):_('Yes')?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Org Assurer")?>:</td> + <td class="DataTD"><?= ($row['orgadmin']==0)? _('No'):_('Yes')?></td> + </tr> + <tr> + <td class="DataTD"><?=_("TTP Admin")?>:</td> + <td class="DataTD"><?= $row['ttpadmin']._(' - 0 = none, 1 = TTP Admin, 2 = TTP TOPUP admin')?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Location Admin")?>:</td> + <td class="DataTD"><?= ($row['locadmin']==0)? _('No'):_('Yes')?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Admin")?>:</td> + <td class="DataTD"><?= ($row['admin']==0)? _('No'):_('Yes')?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Ad Admin")?>:</td> + <td class="DataTD"><?= $row['adadmin']._(' - 0 = none, 1 = submit, 2 = approve')?></td> + </tr> + <tr> + <td class="DataTD"><?=_("General Announcements")?>:</td> + <td class="DataTD"><?= ($alerts['general']==0)? _('No'):_('Yes')?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Country Announcements")?>:</td> + <td class="DataTD"><?= ($row['id']==0)? _('No'):_('Yes')?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Regional Announcements")?>:</td> + <td class="DataTD"><?= ($row['id']==0)? _('No'):_('Yes')?></td> + </tr> + <tr> + <td class="DataTD"><?=_("Within 200km Announcements")?>:</td> + <td class="DataTD"><?= ($row['id']==0)? _('No'):_('Yes')?></td> + </tr> +</table> +<br/> +<? +$dres = get_email_address($userid,'',1); +if(mysql_num_rows($dres) > 0) { +?> + <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="3" class="title"><?=_('Email addresses')?></td> + </tr> +<? + output_log_email_header(); + while($drow = mysql_fetch_assoc($dres)) + { + output_log_email($drow,$email); + } ?> +</table> +<br/> +<?} +$dres = get_domains($userid,'',1); +?> +<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="3" class="title"><?=_('Domains')?></td> + </tr> +<? +if(mysql_num_rows($dres) > 0) { + output_log_domains_header(); + while($drow = mysql_fetch_assoc($dres)) + { + output_log_domains($drow,$email); + } +}ELSE{?> + <td colspan="3" ><?=_('no entry avialable')?></td> +<?}?> +</table> +<br/> + +<? +$dres = get_training_result($userid); +?> +<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="3" class="title"><?=_('Trainings')?></td> + </tr> +<? + if(mysql_num_rows($dres) > 0) { + output_log_training_header(); + while($drow = mysql_fetch_assoc($dres)) + { + output_log_training($drow); + } + }ELSE{ + ?><td colspan="3" ><?=_('no entry avialable')?></td><? + }?> +</table> +<br/> + +<? +$dres = get_user_agreement($userid,'',1); +?> +<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="4" class="title"><?=_('User agreements')?></td> + </tr> +<? + if(mysql_num_rows($dres) > 0) { + output_log_agreement_header(); + while($drow = mysql_fetch_assoc($dres)) + { + output_log_agreement($drow); + } + }ELSE{ + ?><td colspan="4" ><?=_('no entry avialable')?></td><? + }?> +</table> +<br/> + +<? +$dres = get_client_certs($userid,1); +$colspan=10; +if (1==$support) { + $colspan=7; +} +?> +<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="<?=$colspan?>" class="title"><?=_('Client certificates')?></td> + </tr> +<? + if(mysql_num_rows($dres) > 0) { + output_client_cert_header($support); + while($drow = mysql_fetch_assoc($dres)) + { + output_client_cert($drow,$support); + } + }ELSE{ + ?><td colspan="<?=$colspan?>" ><?=_('no entry avialable')?></td><? + }?> +</table> +<br/> + +<? +$dres = get_server_certs($userid,1); +$colspan = 8; +if (1 == $support) { + $colspan = 5; +} +?> +<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="<?=$colspan?>" class="title"><?=_('Server certificates')?></td> + </tr> +<? + if(mysql_num_rows($dres) > 0) { + output_log_server_certs_header($support); + while($drow = mysql_fetch_assoc($dres)) + { + output_log_server_certs($drow,$support); + } + }ELSE{ + ?><td colspan="<?=$colspan?>" ><?=_('no entry avialable')?></td><? + }?> +</table> +<br/> + +<? +$dres = get_gpg_certs($userid,1); +$colspan = 6; +if (1 == $support) { + $colspan = 4; +} +?> +<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="<?=$colspan?>" class="title"><?=_('GPG/PGP certificates')?></td> + </tr> +<? + if(mysql_num_rows($dres) > 0) { + output_gpg_certs_header($support); + while($drow = mysql_fetch_assoc($dres)) + { + output_gpg_certs($drow,$support); + } + }ELSE{ + ?><td colspan="<?=$colspan?>" ><?=_('no entry avialable')?></td><? + }?> +</table> +<br/> + +<? + +output_log_given_assurances($userid, $support); +?><br/><? + +output_log_received_assurances($userid, $support); +?><br/><? + +$dres = get_se_log($userid); +$colspan = 2; +if (1 == $support) { + $colspan = 4; +} +?> +<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="<?=$colspan?>" class="title"><?=_('Admin log')?></td> + </tr> +<? + if(mysql_num_rows($dres) > 0) { + output_log_se_header($support); + while($drow = mysql_fetch_assoc($dres)) + { + output_log_se($drow,$support); + } + }ELSE{ + ?><td colspan="<?=$colspan?>" ><?=_('no entry avialable')?></td><? + } + if ($support==1) { + ?><td colspan="<?=$colspan?>" ><a href="account.php?id=43&userid=<?= $userid ?>"><?= _('Back to previous page.')?></a></td><? + } + + ?> + +</table> diff --git a/pages/account/6.php b/pages/account/6.php index 8455499..2dc4277 100644 --- a/pages/account/6.php +++ b/pages/account/6.php @@ -113,8 +113,8 @@ if (array_key_exists('format', $_REQUEST)) { $crtname=escapeshellarg($row['crt_name']); $cert = `/usr/bin/openssl x509 -in $crtname -outform PEM`; echo "<pre>$cert</pre>"; +?> - ?> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> <tr> <td colspan="2" class="title"><?=_("Information about the certificate")?></td> diff --git a/pages/index/0.php b/pages/index/0.php index c5301d3..de5cb7c 100644 --- a/pages/index/0.php +++ b/pages/index/0.php @@ -19,11 +19,11 @@ <p><?=_("CAcert.org is a community-driven Certificate Authority that issues certificates to the public at large for free.")?></p> -<p><?=_("CAcert's goal is to promote awareness and education on computer security through the use of encryption, specifically by providing cryptographic certificates. These certificates can be used to digitally sign and encrypt email, authenticate and authorize users connecting to websites and secure data transmission over the internet. Any application that supports the Secure Socket Layer Protocol (SSL or TLS) can make use of certificates signed by CAcert, as can any application that uses X.509 certificates, e.g. for encryption or code signing and document signatures.")?></p> +<p><?=_("CAcert's goal is to promote awareness and education on computer security through the use of encryption, specifically by providing cryptographic certificates. These certificates can be used to digitally sign and encrypt email, authenticate and authorize users connecting to websites and secure data transmission over the internet. Any application that supports the Secure Socket Layer protocol (SSL or TLS) can make use of certificates signed by CAcert, as can any application that uses X.509 certificates, e.g. for encryption or code signing and document signatures.")?></p> <p><?=sprintf(_("If you want to have free certificates issued to you, %s join the CAcert Community %s."),'<a href="https://www.cacert.org/index.php?id=1">', '</a>')?></p> -<p><?=sprintf(_("If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."),'<a href="/policy/RootDistributionLicense.php">',"</a>")?> +<p><?=sprintf(_("If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."),'<a href="/policy/RootDistributionLicense.html">',"</a>")?> <?=sprintf(_("This license applies to using the CAcert %s root keys %s."),'<a href="/index.php?id=3">','</a>')?></p> @@ -87,7 +87,7 @@ <p><?=sprintf(_("Have you passed the CAcert %s Assurer Challenge %s yet?"),'<a href="http://wiki.cacert.org/wiki/AssurerChallenge">','</a>')?></p> -<p><?=sprintf(_("Have you read the CAcert %sCommunity Agreement%s yet?"),'<a href="/policy/CAcertCommunityAgreement.php">','</a>')?></p> +<p><?=sprintf(_("Have you read the CAcert %sCommunity Agreement%s yet?"),'<a href="/policy/CAcertCommunityAgreement.html">','</a>')?></p> <p><?=sprintf(_("For general documentation and help, please visit the CAcert %sWiki Documentation site %s."),'<a href="http://wiki.CAcert.org">','</a>')?> <?=sprintf(_("For specific policies, see the CAcert %sApproved Policies page%s."),'<a href="/policy/">',"</a>")?></p> diff --git a/pages/index/1.php b/pages/index/1.php index 4f0ca83..05e59df 100644 --- a/pages/index/1.php +++ b/pages/index/1.php @@ -35,32 +35,32 @@ <tr> <td class="DataTD" width="125"><?=_("First Name")?>: </td> - <td class="DataTD" width="125"><input type="text" name="fname" value="<?=array_key_exists('fname',$_REQUEST)?sanitizeHTML($_REQUEST['fname']):""?>" autocomplete="off"></td> - <td rowspan="4" class="DataTD" width="125"><? printf(_("Help on Names %sin the wiki%s"),'<a href="//wiki.cacert.org/FAQ/HowToEnterNamesInJoinForm" target="_blank">','</a>')?></td> + <td class="DataTD" width="125"><input type="text" name="fname" size="30" value="<?=array_key_exists('fname',$_REQUEST)?sanitizeHTML($_REQUEST['fname']):""?>" tabindex="1" autocomplete="off"></td> + <td rowspan="4" class="DataTD" width="125"><? printf(_("Help on Names %sin the wiki%s"),'<a tabindex="1" href="//wiki.cacert.org/FAQ/HowToEnterNamesInJoinForm" target="_blank">','</a>')?></td> </tr> <tr> <td class="DataTD" valign="top"><?=_("Middle Name(s)")?><br> (<?=_("optional")?>) </td> - <td class="DataTD"><input type="text" name="mname" value="<?=array_key_exists('mname',$_REQUEST)?sanitizeHTML($_REQUEST['mname']):""?>" autocomplete="off"></td> + <td class="DataTD"><input type="text" name="mname" size="30" value="<?=array_key_exists('mname',$_REQUEST)?sanitizeHTML($_REQUEST['mname']):""?>" tabindex="3" autocomplete="off"></td> </tr> <tr> <td class="DataTD"><?=_("Last Name")?>: </td> - <td class="DataTD"><input type="text" name="lname" value="<?=array_key_exists('lname',$_REQUEST)?sanitizeHTML($_REQUEST['lname']):""?>" autocomplete="off"></td> + <td class="DataTD"><input type="text" name="lname" size="30" value="<?=array_key_exists('lname',$_REQUEST)?sanitizeHTML($_REQUEST['lname']):""?>" tabindex="4" autocomplete="off"></td> </tr> <tr> <td class="DataTD"><?=_("Suffix")?><br> (<?=_("optional")?>)</td> - <td class="DataTD"><input type="text" name="suffix" value="<?=array_key_exists('suffix',$_REQUEST)?sanitizeHTML($_REQUEST['suffix']):""?>" autocomplete="off"><br><?=sprintf(_("Please only write Name Suffixes into this field."))?></td> + <td class="DataTD"><input type="text" name="suffix" size="30" value="<?=array_key_exists('suffix',$_REQUEST)?sanitizeHTML($_REQUEST['suffix']):""?>" tabindex="5" autocomplete="off"><br><?=sprintf(_("Please only write Name Suffixes into this field."))?></td> </tr> <tr> <td class="DataTD"><?=_("Date of Birth")?><br> (<?=_("dd/mm/yyyy")?>)</td> - <td class="DataTD"><nobr><select name="day"> + <td class="DataTD"><nobr><select name="day" tabindex="6"> <? for($i = 1; $i <= 31; $i++) { @@ -71,7 +71,7 @@ } ?> </select> - <select name="month"> + <select name="month" tabindex="7"> <? for($i = 1; $i <= 12; $i++) { @@ -82,25 +82,25 @@ } ?> </select> - <input type="text" name="year" value="<?=array_key_exists('year',$_SESSION['signup']) ? sanitizeHTML($_SESSION['signup']['year']):""?>" size="4" autocomplete="off"></nobr> + <input type="text" name="year" value="<?=array_key_exists('year',$_SESSION['signup']) ? sanitizeHTML($_SESSION['signup']['year']):""?>" size="4" tabindex="8" autocomplete="off"></nobr> </td> <td class="DataTD"> </td> </tr> <tr> <td class="DataTD"><?=_("Email Address")?>: </td> - <td class="DataTD"><input type="text" name="email" value="<?=array_key_exists('email',$_REQUEST)?sanitizeHTML($_REQUEST['email']):""?>" autocomplete="off"></td> + <td class="DataTD"><input type="text" name="email" size="30" value="<?=array_key_exists('email',$_REQUEST)?sanitizeHTML($_REQUEST['email']):""?>" tabindex="9" autocomplete="off"></td> <td class="DataTD"><?=_("I own or am authorised to control this email address")?></td> </tr> <tr> <td class="DataTD"><?=_("Pass Phrase")?><font color="red">*</font>: </td> - <td class="DataTD"><input type="password" name="pword1" autocomplete="off"></td> + <td class="DataTD"><input type="password" name="pword1" size="30" tabindex="10" autocomplete="off"></td> <td class="DataTD" rowspan="2"> </td> </tr> <tr> <td class="DataTD"><?=_("Pass Phrase Again")?><font color="red">*</font>: </td> - <td class="DataTD"><input type="password" name="pword2" autocomplete="off"></td> + <td class="DataTD"><input type="password" name="pword2" size="30" tabindex="11" autocomplete="off"></td> </tr> <tr> @@ -112,29 +112,39 @@ </tr> <tr> - <td class="DataTD">1) <input type="text" name="Q1" size="15" value="<?=array_key_exists('Q1',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q1']):""?>"></td> - <td class="DataTD"><input type="text" name="A1" value="<?=array_key_exists('A1',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A1']):""?>" autocomplete="off"></td> - <td class="DataTD" rowspan="5"> </td> + <td class="DataTD"> </td> + <td class="DataTD"><?=_("Question")?></td> + <td class="DataTD"><?=_("Answer")?></td> </tr> <tr> - <td class="DataTD">2) <input type="text" name="Q2" size="15" value="<?=array_key_exists('Q2',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q2']):""?>"></td> - <td class="DataTD"><input type="text" name="A2" value="<?=array_key_exists('A2',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A2']):""?>" autocomplete="off"></td> + <td class="DataTD">1)</td> + <td class="DataTD"><input type="text" name="Q1" size="30" value="<?=array_key_exists('Q1',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q1']):""?>" tabindex="12"></td> + <td class="DataTD"><input type="text" name="A1" size="30" value="<?=array_key_exists('A1',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A1']):""?>" tabindex="13" autocomplete="off"></td> </tr> <tr> - <td class="DataTD">3) <input type="text" name="Q3" size="15" value="<?=array_key_exists('Q3',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q3']):""?>"></td> - <td class="DataTD"><input type="text" name="A3" value="<?=array_key_exists('A3',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A3']):""?>" autocomplete="off"></td> + <td class="DataTD">2)</td> + <td class="DataTD"><input type="text" name="Q2" size="30" value="<?=array_key_exists('Q2',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q2']):""?>" tabindex="14"></td> + <td class="DataTD"><input type="text" name="A2" size="30" value="<?=array_key_exists('A2',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A2']):""?>" tabindex="15" autocomplete="off"></td> </tr> <tr> - <td class="DataTD">4) <input type="text" name="Q4" size="15" value="<?=array_key_exists('Q4',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q4']):""?>"></td> - <td class="DataTD"><input type="text" name="A4" value="<?=array_key_exists('A4',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A4']):""?>" autcomplete="off"></td> + <td class="DataTD">3)</td> + <td class="DataTD"><input type="text" name="Q3" size="30" value="<?=array_key_exists('Q3',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q3']):""?>" tabindex="16"></td> + <td class="DataTD"><input type="text" name="A3" size="30"value="<?=array_key_exists('A3',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A3']):""?>" tabindex="17" autocomplete="off"></td> </tr> <tr> - <td class="DataTD">5) <input type="text" name="Q5" size="15" value="<?=array_key_exists('Q5',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q5']):""?>"></td> - <td class="DataTD"><input type="text" name="A5" value="<?=array_key_exists('A5',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A5']):""?>" autocomplete="off"></td> + <td class="DataTD">4)</td> + <td class="DataTD"><input type="text" name="Q4" size="30"" value="<?=array_key_exists('Q4',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q4']):""?>" tabindex="18"></td> + <td class="DataTD"><input type="text" name="A4" size="30" value="<?=array_key_exists('A4',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A4']):""?>" tabindex="19" autcomplete="off"></td> + </tr> + + <tr> + <td class="DataTD">5)</td> + <td class="DataTD"><input type="text" name="Q5" size="30" value="<?=array_key_exists('Q5',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q5']):""?>" tabindex="20"></td> + <td class="DataTD"><input type="text" name="A5" size="30" value="<?=array_key_exists('A5',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A5']):""?>" tabindex="21" autocomplete="off"></td> </tr> <tr> @@ -144,10 +154,10 @@ <tr> <td class="DataTD" valign="top"><?=_("Alert me if")?>: </td> <td class="DataTD" align="left"> - <input type="checkbox" name="general" value="1" <?=array_key_exists('general',$_SESSION['signup'])? ($_SESSION['signup']['general'] == "0" ?"":"checked=\"checked\""):"checked=\"checked\"" ?>><?=_("General Announcements")?><br> - <input type="checkbox" name="country" value="1" <?=array_key_exists('country',$_SESSION['signup'])? ($_SESSION['signup']['country'] == "0" ?"":"checked=\"checked\""):"checked=\"checked\"" ?>><?=_("Country Announcements")?><br> - <input type="checkbox" name="regional" value="1" <?=array_key_exists('regional',$_SESSION['signup'])? ($_SESSION['signup']['regional'] == "0" ?"":"checked=\"checked\""):"checked=\"checked\"" ?>><?=_("Regional Announcements")?><br> - <input type="checkbox" name="radius" value="1" <?=array_key_exists('radius',$_SESSION['signup'])? ($_SESSION['signup']['radius'] == "0" ?"":"checked=\"checked\""):"checked=\"checked\"" ?>><?=_("Within 200km Announcements")?></td> + <input type="checkbox" name="general" value="1" tabindex="22" <?=array_key_exists('general',$_SESSION['signup'])? ($_SESSION['signup']['general'] == "0" ?"":"checked=\"checked\""):"checked=\"checked\"" ?>><?=_("General Announcements")?><br> + <input type="checkbox" name="country" value="1" tabindex="23" <?=array_key_exists('country',$_SESSION['signup'])? ($_SESSION['signup']['country'] == "0" ?"":"checked=\"checked\""):"checked=\"checked\"" ?>><?=_("Country Announcements")?><br> + <input type="checkbox" name="regional" value="1" tabindex="24" <?=array_key_exists('regional',$_SESSION['signup'])? ($_SESSION['signup']['regional'] == "0" ?"":"checked=\"checked\""):"checked=\"checked\"" ?>><?=_("Regional Announcements")?><br> + <input type="checkbox" name="radius" value="1" tabindex="25" <?=array_key_exists('radius',$_SESSION['signup'])? ($_SESSION['signup']['radius'] == "0" ?"":"checked=\"checked\""):"checked=\"checked\"" ?>><?=_("Within 200km Announcements")?></td> <td class="DataTD"> </td> </tr> @@ -155,11 +165,15 @@ <td class="DataTD" colspan="3"><?=_("When you click on next, we will send a confirmation email to the email address you have entered above.")?></td> </tr> <tr> - <td class="DataTD" colspan="3"><input type="checkbox" name="cca_agree" value="1" <?=array_key_exists('cca_agree',$_SESSION['signup'])? ($_SESSION['signup']['cca_agree'] == "1" ?"checked=\"checked\"":""):"" ?> ><?=_("I agree to the terms and conditions of the CAcert Community Agreement")?>: <a href="/policy/CAcertCommunityAgreement.php">http://www.cacert.org/policy/CAcertCommunityAgreement.php</a></td> + <td class="DataTD" colspan="3"> + <input type="checkbox" name="cca_agree" tabindex="26" value="1" <?=array_key_exists('cca_agree',$_SESSION['signup'])? ($_SESSION['signup']['cca_agree'] == "1" ?"checked=\"checked\"":""):"" ?> > + <br/> + <?=_("I agree to the terms and conditions of the CAcert Community Agreement")?>: <a href="/policy/CAcertCommunityAgreement.html" tabindex="28" >http://www.cacert.org/policy/CAcertCommunityAgreement.php</a> + </td> </tr> <tr> - <td class="DataTD" colspan="3"><input type="submit" name="process" value="<?=_("Next")?>"></td> + <td class="DataTD" colspan="3"><input type="submit" name="process" value="<?=_("Next")?>" tabindex="27"></td> </tr> </table> diff --git a/pages/index/10.php b/pages/index/10.php index 7280e09..7dd8200 100644 --- a/pages/index/10.php +++ b/pages/index/10.php @@ -17,5 +17,5 @@ */ header('HTTP/1.0 301 Moved Permanently'); - header('Location: http://www.cacert.org/policy/CertificationPracticeStatement.php'); + header('Location: http://www.cacert.org/policy/CertificationPracticeStatement.html'); exit(); diff --git a/pages/index/16.php b/pages/index/16.php index c2cb391..ba3b4ed 100644 --- a/pages/index/16.php +++ b/pages/index/16.php @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> -<p><?=sprintf(_("You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."),"<a href='/policy/RootDistributionLicense.php'>","</a>")?></p> +<p><?=sprintf(_("You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."),"<a href='/policy/RootDistributionLicense.html'>","</a>")?></p> <p> Class 1 <?=_("PKI Key")?><br> diff --git a/pages/index/3.php b/pages/index/3.php index a107c29..7c52447 100644 --- a/pages/index/3.php +++ b/pages/index/3.php @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> -<p><?=sprintf(_("You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."),"<a href='/policy/RootDistributionLicense.php'>","</a>")?></p> +<p><?=sprintf(_("You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."),"<a href='/policy/RootDistributionLicense.html'>","</a>")?></p> <h3><?=_("Windows Installer") ?></h3> <ul class="no_indent"> @@ -29,6 +29,7 @@ <ul class="no_indent"> <li><a href="certs/root.crt"><?=_("Root Certificate (PEM Format)")?></a></li> <li><a href="certs/root.der"><?=_("Root Certificate (DER Format)")?></a></li> + <li><a href="certs/root.cer"><?=_("Root Certificate (CER Format base64 encoded)")?></a></li> <li><a href="certs/root.txt"><?=_("Root Certificate (Text Format)")?></a></li> <li><a href="<?=$_SERVER['HTTPS']?"https":"http"?>://crl.cacert.org/revoke.crl">CRL</a></li> <li><?=_("SHA1 Fingerprint:")?> 13:5C:EC:36:F4:9C:B8:E9:3B:1A:B2:70:CD:80:88:46:76:CE:8F:33</li> @@ -39,6 +40,7 @@ <ul class="no_indent"> <li><a href="certs/class3.crt"><?=_("Intermediate Certificate (PEM Format)")?></a></li> <li><a href="certs/class3.der"><?=_("Intermediate Certificate (DER Format)")?></a></li> + <li><a href="certs/class3.der"><?=_("Intermediate Certificate (CER Format base64 encoded)")?></a></li> <li><a href="certs/class3.txt"><?=_("Intermediate Certificate (Text Format)")?></a></li> <li><a href="<?=$_SERVER['HTTPS']?"https":"http"?>://crl.cacert.org/class3-revoke.crl">CRL</a></li> <?php /* diff --git a/pages/index/52.php b/pages/index/52.php new file mode 100644 index 0000000..9132b8b --- /dev/null +++ b/pages/index/52.php @@ -0,0 +1,32 @@ +<?/* + LibreSSL - CAcert web application + Copyright (C) 2004-2008 CAcert Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +?> + +<div style="text-align: center;"> + <h1><?=_('CAcert Community Agreement Acceptance')?></h1> + <p><?=sprintf(_('To get access to your account you need to accept the %s CAcert Community Agreement %s (CCA).'),'<a href="/policy/CAcertCommunityAgreement.php">', '</a>')?></p> + <p><?=_('#### Explanation why #### Please replace me ####')?></p> + <p><?=sprintf(_('If you do not want to accept the CCA you should think about closing your account. In this case please send an email to support (%s).'),'<a href="mailto:support@cacert.org">support@cacert.org</a>')?></p> + <form method="post" action="index.php"> + <input type="submit" name="agree" value="<?=_('I agree CCA')?>"> + <input type="submit" name="disagree" value="<?=_('I do not want to accept the CCA')?>"> + + <input type="hidden" name="oldid" value="<?=$id?>"> + </form> +</div> diff --git a/pages/index/feed.rss b/pages/index/feed.rss new file mode 100644 index 0000000..def221f --- /dev/null +++ b/pages/index/feed.rss @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?><!-- generator="WordPress/2.5.1" --> +<rss version="0.92"> + <channel> + <title>CAcert NEWS Blog</title> + <link>http://blog.cacert.org</link> + <description>CAcert NEWS and up coming events.</description> + <lastBuildDate>Fri, 20 Aug 2010 11:54:30 +0000</lastBuildDate> + <docs>http://backend.userland.com/rss092</docs> + <language>en</language> + + <item> + <title>Looking for confirmation email on creating account?</title> + <description>Please go to https://ca-mgr1.it-sls.de/login login with your just created account and password. Under MAIL you'll find your individual confirmation email. + </description> + <link>https://ca-mgr1.it-sls.de/testsystemdoc.html</link> + </item> + <item> + <title>You are interested in helping Testing ?</title> + <description>Create your test account on the Testserver. Beware of the confirmation email (see above) Entry page for Testers: https://wiki.cacert.org/Software/CurrentTest. Please contact Ulrich becoming a Testteam member.</description> + <link>https://wiki.cacert.org/Software/CurrentTest</link> + </item> + <item> + <title>Dear Testers</title> + <description>We had one work with no activity on the testserver caused by inactivity by the Software-Assessment team, caused by router problems at the hosting site of the testserver. Probably latter has been fixed. + + The reported bugs can be categorized into + 1. Testserver-Mgmt-System related + 2. Production Server recovery process to Testserver + 3. general software errors + + Group 1+2 are essential for our current test phase, as they covers the problems in building the base testserver environment that is needed for testing. + + So language and country selection support is an essential feature we've worked on the last week. + + One problem couldn't be solved till today: secondary language selection all other country and language related bugs should be fixed in the meantime. + + Also the Show my Points details now has the correct script (after some confusion in the Software-Assessment team and one developer), comparable to the script on the production website. + + On the main entry page for testers https://wiki.cacert.org/Software/CurrentTest the updates on the bugs are marked with (i) so here comes the 2nd test round ... + + Please report your found bugs and also success reports to the listed bug numbers + + Thanks for your assistance .... ;)</description> + <link>https://cacert1.it-sls.de/</link> + </item> + </channel> +</rss> diff --git a/pages/wot/1.php b/pages/wot/1.php index a45b5df..99c2b9f 100644 --- a/pages/wot/1.php +++ b/pages/wot/1.php @@ -91,7 +91,7 @@ { $query = "select *, `users`.`id` as `id` from `users`,`notary` where `listme`='1' and `ccid`='".$ccid."' and `regid`='".$regid."' and - `locid`='".$locid."' and `users`.`id`=`notary`.`to` + `locid`='".$locid."' and `users`.`id`=`notary`.`to` and `notary`.`deleted`=0 group by `notary`.`to` HAVING SUM(`points`) >= 100 order by `points` desc"; $list = mysql_query($query); if(mysql_num_rows($list) > 0) @@ -115,7 +115,7 @@ <td class="DataTD"><?=$row['assurer']?_("Yes"):("<font color=\"#ff0000\">"._("Not yet!")."</font>")?></td> </tr> -<? } +<? } } ?> </table> diff --git a/pages/wot/10.php b/pages/wot/10.php index bc76a86..24b8a70 100644 --- a/pages/wot/10.php +++ b/pages/wot/10.php @@ -24,7 +24,7 @@ <td colspan="5" class="title"><?=_("Assurer Ranking")?></td> </tr> <tr> -<? +<?// the rank calculation is not adjusted to the new deletion method $query = "SELECT `users`. *, count(*) AS `list` FROM `users`, `notary` WHERE `users`.`id` = `notary`.`from` AND `notary`.`from` != `notary`.`to` AND `from`='".intval($_SESSION['profile']['id'])."' GROUP BY `notary`.`from`"; @@ -36,8 +36,8 @@ WHERE `users`.`id` = `notary`.`from` AND `notary`.`from` != `notary`.`to` GROUP BY `notary`.`from` HAVING count(*) > '$rc' ORDER BY `notary`.`when` DESC"; */ - $query = "SELECT count(*) AS `list` FROM `users` - inner join `notary` on `users`.`id` = `notary`.`from` + $query = "SELECT count(*) AS `list` FROM `users` + inner join `notary` on `users`.`id` = `notary`.`from` GROUP BY `notary`.`from` HAVING count(*) > '$rc'"; $rank = mysql_num_rows(mysql_query($query)) + 1; @@ -64,11 +64,11 @@ <td class="DataTD"><b><?=_("Method")?></b></td> </tr> <? - $query = "select * from `notary` where `to`='".intval($_SESSION['profile']['id'])."'"; + $query = "select `id`, `date`, `points`, `location`, `method` from `notary` where `to`='".intval($_SESSION['profile']['id'])."' and `deleted`=0"; $res = mysql_query($query); while($row = mysql_fetch_assoc($res)) { - $fromuser = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($row['from'])."'")); + $fromuser = mysql_fetch_assoc(mysql_query("select `fname`, `lname` from `users` where `id`='".intval($row['from'])."'")); ?> <tr> <td class="DataTD"><?=$row['id']?></td> @@ -114,11 +114,11 @@ if ($thawte) </tr> <? $points = 0; - $query = "select * from `notary` where `from`='".intval($_SESSION['profile']['id'])."' and `to`!='".intval($_SESSION['profile']['id'])."'"; + $query = "select `id`, `date`, `points`, `to`, `location`, `method` from `notary` where `from`='".intval($_SESSION['profile']['id'])."' and `to`!='".intval($_SESSION['profile']['id'])."' and `deleted`=0" ; $res = mysql_query($query); while($row = mysql_fetch_assoc($res)) { - $fromuser = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($row['to'])."'")); + $fromuser = mysql_fetch_assoc(mysql_query("select `fname`, `lname` from `users` where `id`='".intval($row['to'])."'")); $points += $row['points']; $name = trim($fromuser['fname']." ".$fromuser['lname']); if($name == "") diff --git a/pages/wot/12.php b/pages/wot/12.php index a0bbf50..e6b20ca 100644 --- a/pages/wot/12.php +++ b/pages/wot/12.php @@ -65,9 +65,9 @@ document.f.location.focus(); { $bits = explode(",", $_REQUEST['location']); - $loc = trim(mysql_escape_string($bits['0'])); - $reg = ""; if(array_key_exists('1',$bits)) $reg=trim(mysql_escape_string($bits['1'])); - $ccname = ""; if(array_key_exists('2',$bits)) $ccname=trim(mysql_escape_string($bits['2'])); + $loc = trim(mysql_real_escape_string($bits['0'])); + $reg = ""; if(array_key_exists('1',$bits)) $reg=trim(mysql_real_escape_string($bits['1'])); + $ccname = ""; if(array_key_exists('2',$bits)) $ccname=trim(mysql_real_escape_string($bits['2'])); $query = "select `locations`.`id` as `locid` from `locations`, `regions`, `countries` where `locations`.`name` like '$loc%' and `regions`.`name` like '$reg%' and `countries`.`name` like '$ccname%' and diff --git a/pages/wot/13.php b/pages/wot/13.php index eac7e18..1143769 100644 --- a/pages/wot/13.php +++ b/pages/wot/13.php @@ -21,9 +21,9 @@ if(array_key_exists('location',$_REQUEST) && $_REQUEST['location'] != "") { { $bits = explode(",", $_REQUEST['location']); - $loc = trim(mysql_escape_string($bits['0'])); - $reg = ''; if(array_key_exists('1',$bits)) $reg=trim(mysql_escape_string($bits['1'])); - $ccname = ''; if(array_key_exists('2',$bits)) $ccname=trim(mysql_escape_string($bits['2'])); + $loc = trim(mysql_real_escape_string($bits['0'])); + $reg = ''; if(array_key_exists('1',$bits)) $reg=trim(mysql_real_escape_string($bits['1'])); + $ccname = ''; if(array_key_exists('2',$bits)) $ccname=trim(mysql_real_escape_string($bits['2'])); $query = "select `locations`.`id` as `locid` from `locations`, `regions`, `countries` where `locations`.`name` like '$loc%' and `regions`.`name` like '$reg%' and `countries`.`name` like '$ccname%' and `locations`.`regid`=`regions`.`id` and `locations`.`ccid`=`countries`.`id` diff --git a/pages/wot/15.php b/pages/wot/15.php index cca2702..c1f3e0f 100644 --- a/pages/wot/15.php +++ b/pages/wot/15.php @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ +*/ require_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); diff --git a/pages/wot/16.php b/pages/wot/16.php new file mode 100644 index 0000000..069b7a2 --- /dev/null +++ b/pages/wot/16.php @@ -0,0 +1,143 @@ +<?php +/*LibreSSL - CAcert web application +Copyright (C) 2004-2008 CAcert Inc. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; version 2 of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +//******************* TTP Console ************ + +if ($_SESSION['profile']['ttpadmin'] < 1) { + echo _("You are not allowed to view this page."); + exit; +} + +//Check for test or productive environment, in case of test the user data for the print out is extended by 'test system' +$testserver=''; +if ($_SESSION['_config']['normalhostname']=='cacert1.it-sls.de') { + $testserver=' test system'; +} + +$row = $_SESSION['_config']['notarise']; +$fname = $row['fname']; +$mname = $row['mname']; +$lname = $row['lname']; +$suffix = $row['suffix']; +$fullname = $fname." ".$mname." ".$lname." ".$suffix; +$email = $row['email']; +$dob = date_format(new DateTime($row['dob']), 'Y-m-d'); +$userid = $row['id']; + +//List TTP Assurances and TotalPoints +//changed get_received_assurances ($userid, $support) + +//include_once($_SESSION['_config']['filepath']."/includes/wot.inc.php"); +include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); + +output_received_assurances(intval($userid),2); //support==2 => TTP + + +$query = "select sum(`points`) as `points` from `notary` where `to`='".intval($userid)."'"; +$dres = mysql_query($query); +$drow = mysql_fetch_assoc($dres); + +$points=$drow['points']; +if ($points<1) { + $points=0; +} + +$res = get_received_assurances(intval($userid), 2); +$ttp_assurances_count=$num_rows = mysql_num_rows($res); + +//Form +?> +<table align="center" class="wrapper"> + <tr> + <td class="title"><?=sprintf(_('Total assurance points for %s'),$fullname)?></td> + </tr> + <tr> + <td><?=sprintf(_('%s points'), $points)?></td> + </tr> +</table> +<br/> +<form action="https://pdf.cacert.eu/cacertpdf.php" method="get" accept-charset="UTF-8"> + <table align="center" class="wrapper"> + <tr> + <td colspan="2" class="title"><?= _('TTP CAP form creation')?></td> + </tr> + <tr> + <td colspan="2" class="title"><?= _('User information')?></td> + </tr> + <tr> + <td><?=_('Fullname')?><input type="hidden" name="fullname" value="<?=$fullname.$testserver?>"/></td> + <td><?=$fullname?></td> + </tr> + <tr> + <td><?=_('Date of Birth')?><input type="hidden" name="dob" value="<?=$dob.$testserver?>"/></td> + <td><?=$dob?></td> + </tr> + <tr> + <td><?=_('Email')?><input type="hidden" name="email" value="<?=$email.$testserver?>"/></td> + <td><?=$email?></td> + </tr> + <tr></tr> + <tr> + <td><?=_('Country where the TTP will be visited')?></td> + <td> + <? + $ttpcountries=get_array_from_ini('../config/ttp.ini'); + echo create_selectbox_HTML('type',$ttpcountries, '',TRUE); + ?> + </td> + </tr> + <tr> + <td colspan="2" class="title"><?=_('TTP Admin postal address, including name, street, country etc.')?></td> + </tr> + <tr> + <td><?=_('Line').' 1'?></td> + <td><input type="text" name="adress" /></td> + </tr> + <tr> + <td><?=_('Line').' 2'?></td> + <td><input type="text" name="adress1" /></td> + </tr> + <tr> + <td><?=_('Line').' 3'?></td> + <td><input type="text" name="adress2" /></td> + </tr> + <tr> + <td><?=_('Line').' 4'?></td> + <td><input type="text" name="adress3" /></td> + </tr> + <tr> + <td><?=_('Line').' 5'?></td> + <td><input type="text" name="adress4" /></td> + </tr> + <tr> + <td colspan="2" class="title"> + <? + if ($points>=100 || $ttp_assurances_count>=2) { + echo _('No TTP assurance allowed'); + }else{ + ?><input type="submit" value="<?=_('Create TTP CAP pdf file')?>"/><? + }?> + </td> + </tr> + </table> + <input type="hidden" name="lang" value="en"/> +</form> + +<div class="blockcenter"> + <a href="wot.php?id=6&userid=<?=$userid ?>"><?=_("Back")?></a> +</div> diff --git a/pages/wot/4.php b/pages/wot/4.php index 628e6a5..954bc76 100644 --- a/pages/wot/4.php +++ b/pages/wot/4.php @@ -43,12 +43,13 @@ if ($_SESSION['profile']['points']<100){ <form method="post" action="wot.php"> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> <tr> - <td class="DataTD"><?=_("Country where you want to visit the TTP")?></td> - <td class="DataTD"><select size="1" name="country"> - <option>Australia</option> - <option>Puerto Rico</option> - <option>USA</option> - </select></td> + <td class="DataTD"><?=_('Country where you want to visit the TTP')?></td> + <td class="DataTD"> + <? + $ttpcountries=get_array_from_ini('../config/ttp.ini'); + echo create_selectbox_HTML('country',$ttpcountries, _('Choose country')); + ?> + </td> </tr> <tr> <td class="DataTD"><?=_("I want to take part in the TTP Topup programme")?></td> @@ -72,7 +73,7 @@ if ($_SESSION['profile']['points']<100){ </form> */ ?> - <p><?=_("We are working to develop the TTP TOPUP process to be able to fill the gap of the missing 30 assurance points to 100 assurance points. Meanwhile you have to close this gap with face to face assurances from CAcert Assurers. Think not only travelling to populated countries, but as well to assurers visiting your country or area.")?></p> + <p><?=_("We are working to develop the TTP TOPUP process to be able to fill the gap of the missing 30 assurance points to 100 assurance points. Meanwhile you have to close this gap with face to face assurances from CAcert Assurers. Think not only travelling to populated countries, but as well to assurers visiting your country or area.")?></p> <? } } else { diff --git a/pages/wot/5.php b/pages/wot/5.php index c1a6438..a9c3dcb 100644 --- a/pages/wot/5.php +++ b/pages/wot/5.php @@ -18,14 +18,24 @@ include_once("../includes/shutdown.php"); require_once("../includes/lib/l10n.php"); ?> -<? - if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "") +<? + if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "") { ?><font color="orange" size="+1"> <? echo _("ERROR").": ".$_SESSION['_config']['error'] ?> </font> <?unset($_SESSION['_config']['error']); - } + } + + if (!isset($_SESSION['assuresomeone']['year'])) { + $_SESSION['assuresomeone']['year'] = ''; + } + if (!isset($_SESSION['assuresomeone']['month'])) { + $_SESSION['assuresomeone']['month'] = ''; + } + if (!isset($_SESSION['assuresomeone']['day'])) { + $_SESSION['assuresomeone']['day'] = ''; + } ?> <? if(array_key_exists('noemailfound',$_SESSION['_config']) && $_SESSION['_config']['noemailfound'] == 1) { ?> <form method="post" action="wot.php"> @@ -60,6 +70,37 @@ <td class="DataTD"><input type="text" name="email" id="email" value="<?=array_key_exists('email',$_POST)?sanitizeHTML($_POST['email']):""?>"></td> <? } ?> </tr> + <tr> + <td class="DataTD"> + <?=_("Date of Birth")?><br/> + (<?=_("yyyy/mm/dd")?>)</td> + <td class="DataTD"> + <input type="text" name="year" value="<?=array_key_exists('year',$_SESSION['assuresomeone']) ? sanitizeHTML($_SESSION['assuresomeone']['year']):""?>" size="4" autocomplete="off"></nobr> + <select name="month"> +<? +for($i = 1; $i <= 12; $i++) +{ + echo "<option value='$i'"; + if(array_key_exists('month',$_SESSION['assuresomeone']) && $_SESSION['assuresomeone']['month'] == $i) + echo " selected=\"selected\""; + echo ">".ucwords(strftime("%B", mktime(0,0,0,$i,1,date("Y"))))." ($i)</option>\n"; +} +?> + </select> + <select name="day"> +<? +for($i = 1; $i <= 31; $i++) +{ + echo "<option"; + if(array_key_exists('day',$_SESSION['assuresomeone']) && $_SESSION['assuresomeone']['day'] == $i) + echo " selected=\"selected\""; + echo ">$i</option>"; +} +?> + </select> + </td> + </tr> + <tr> <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Next")?>"></td> </tr> diff --git a/pages/wot/6.php b/pages/wot/6.php index a565aa7..d48fc21 100644 --- a/pages/wot/6.php +++ b/pages/wot/6.php @@ -17,20 +17,23 @@ */ ?> <? - if(!array_key_exists('notarise',$_SESSION['_config'])) +if(!array_key_exists('notarise',$_SESSION['_config'])) { - echo "Error: No user data found."; - exit; + echo "Error: No user data found."; + exit; } $row = $_SESSION['_config']['notarise']; + $_SESSION['assuresomeone']['year'] = ''; + $_SESSION['assuresomeone']['month'] = ''; + $_SESSION['assuresomeone']['day'] = ''; - if($_SESSION['profile']['ttpadmin'] == 1) -// $methods = array("Face to Face Meeting", "Trusted 3rd Parties", "TopUP"); -// else - $methods = array("Face to Face Meeting", "Trusted 3rd Parties"); + if($_SESSION['profile']['ttpadmin'] == 2) + $methods = array('Face to Face Meeting', 'TTP-Assisted', 'TTP-TOPUP'); + elseif($_SESSION['profile']['ttpadmin'] == 1) + $methods = array('Face to Face Meeting', 'TTP-Assisted'); else - $methods = array("Face to Face Meeting"); + $methods = array('Face to Face Meeting'); $mnames = array( '01' => _('January'), @@ -79,7 +82,12 @@ AssureTextLine("",_("Only tick the next box if the Assurance was face to face.")); AssureBoxLine("assertion",_("I believe that the assertion of identity I am making is correct, complete and verifiable. I have seen original documentation attesting to this identity. I accept that the CAcert Arbitrator may call upon me to provide evidence in any dispute, and I may be held responsible."),array_key_exists('assertion',$_POST) && $_POST['assertion'] == 1); AssureBoxLine("rules",_("I have read and understood the CAcert Community Agreement (CCA), Assurance Policy and the Assurance Handbook. I am making this Assurance subject to and in compliance with the CCA, Assurance policy and handbook."),array_key_exists('rules',$_POST) && $_POST['rules'] == 1); - AssureTextLine(_("Policy"),"<a href=\"/policy/CAcertCommunityAgreement.php\" target=\"_blank\">"._("CAcert Community Agreement")."</a> -<a href=\"/policy/AssurancePolicy.php\" target=\"_blank\">"._("Assurance Policy")."</a> - <a href=\"http://wiki.cacert.org/AssuranceHandbook2\" target=\"_blank\">"._("Assurance Handbook")."</a>"); + AssureTextLine(_("Policy"),"<a href=\"/policy/CAcertCommunityAgreement.html\" target=\"_blank\">"._("CAcert Community Agreement")."</a> - <a href=\"/policy/AssurancePolicy.html\" target=\"_blank\">"._("Assurance Policy")."</a> - <a href=\"http://wiki.cacert.org/AssuranceHandbook2\" target=\"_blank\">"._("Assurance Handbook")."</a>"); AssureInboxLine("points",_("Points"),"","<br />(Max. ".maxpoints().")"); AssureFoot($id,_("I confirm this Assurance")); + + if($_SESSION['profile']['ttpadmin'] >= 1) { + ?><div class='blockcenter'><a href="wot.php?id=16"><?=_('Show TTP details')?></a></div><? + } + ?> diff --git a/pages/wot/9.php b/pages/wot/9.php index bfa7a98..b492ff6 100644 --- a/pages/wot/9.php +++ b/pages/wot/9.php @@ -15,9 +15,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - + require_once($_SESSION['_config']['filepath'].'/includes/lib/l10n.php'); - + $res = mysql_query("select * from `users` where `id`='".intval($_REQUEST['userid'])."' and `listme`='1'"); if(mysql_num_rows($res) <= 0) @@ -28,7 +28,7 @@ $user = mysql_fetch_array($res); $userlang = $user['language']; $points = mysql_num_rows(mysql_query("select sum(`points`) as `total` from `notary` - where `to`='".$user['id']."' group by `to` HAVING SUM(`points`) > 0")); + where `to`='".$user['id']."' and `deleted`=0 group by `to` HAVING SUM(`points`) > 0")); if($points <= 0) { echo _("Sorry, I was unable to locate that user."); diff --git a/scripts/cron/refresh_stats.php b/scripts/cron/refresh_stats.php index 2a3d2b5..3b446ba 100755 --- a/scripts/cron/refresh_stats.php +++ b/scripts/cron/refresh_stats.php @@ -23,7 +23,7 @@ require_once(dirname(__FILE__).'/../../includes/mysql.php'); /** * Wrapper around mysql_query() to provide some error handling. Prints an error * message and dies if query fails - * + * * @param string $sql * the SQL statement to execute * @return resource|boolean @@ -35,7 +35,7 @@ function sql_query($sql) { fwrite(STDERR, "MySQL query failed:\n\"$sql\"\n".mysql_error()); die(1); } - + return $res; } @@ -54,7 +54,7 @@ function updateCache($stats) { $sql = "insert into `statscache` (`timestamp`, `cache`) values ('$timestamp', '".mysql_real_escape_string(serialize($stats))."')"; sql_query($sql); - + // Make sure the new statistic was inserted successfully $res = sql_query( "select 1 from `statscache` where `timestamp` = '$timestamp'"); @@ -62,7 +62,7 @@ function updateCache($stats) { fwrite(STDERR, "Error on inserting the new statistic"); return false; } - + sql_query("delete from `statscache` where `timestamp` != '$timestamp'"); return true; } @@ -74,22 +74,22 @@ function updateCache($stats) { */ function getDataFromLive() { echo "Calculating current statistics\n"; - + $stats = array(); $stats['verified_users'] = number_format(tc( "select count(*) as `count` from `users` where `verified` = 1 and `deleted` = 0 and `locked` = 0")); - + $stats['verified_emails'] = number_format(tc( "select count(*) as `count` from `email` where `hash` = '' and `deleted` = 0")); - + $stats['verified_domains'] = number_format(tc( "select count(*) as `count` from `domains` where `hash` = '' and `deleted` = 0")); - + $certs = tc("select count(*) as `count` from `domaincerts` where `expire` != 0"); $certs += tc("select count(*) as `count` from `emailcerts` @@ -101,7 +101,7 @@ function getDataFromLive() { $certs += tc("select count(*) as `count` from `orgemailcerts` where `expire` != 0"); $stats['verified_certificates'] = number_format($certs); - + $certs = tc("select count(*) as `count` from `domaincerts` where `revoked` = 0 and `expire` > NOW()"); $certs += tc("select count(*) as `count` from `emailcerts` @@ -113,11 +113,12 @@ function getDataFromLive() { $certs += tc("select count(*) as `count` from `orgemailcerts` where `revoked` = 0 and `expire` > NOW()"); $stats['valid_certificates'] = number_format($certs); - + $stats['assurances_made'] = number_format(tc( "select count(*) as `count` from `notary` - where `method` = '' or `method` = 'Face to Face Meeting'")); - + where (`method` = '' or `method` = 'Face to Face Meeting') + and `deleted` = 0")); + $stats['users_1to49'] = number_format(tc( "select count(*) as `count` from ( select 1 from `notary` @@ -125,7 +126,7 @@ function getDataFromLive() { group by `to` having sum(`points`) > 0 and sum(`points`) < 50 ) as `low_points`")); - + $stats['users_50to99'] = number_format(tc( "select count(*) as `count` from ( select 1 from `notary` @@ -133,7 +134,7 @@ function getDataFromLive() { group by `to` having sum(`points`) >= 50 and sum(`points`) < 100 ) as `high_points`")); - + $stats['assurer_candidates'] = number_format(tc( "select count(*) as `count` from `users` where ( @@ -148,7 +149,7 @@ function getDataFromLive() { and `cv`.`type_id`=1 )" )); - + $stats['aussurers_with_test'] = number_format(tc( "select count(*) as `count` from `users` where ( @@ -163,7 +164,7 @@ function getDataFromLive() { and `cv`.`type_id`=1 )" )); - + $stats['points_issued'] = number_format(tc( "select sum(greatest(`points`, `awarded`)) as `count` from `notary` where `deleted` = 0 @@ -177,16 +178,16 @@ function getDataFromLive() { $next_month_ts = mktime(0, 0, 0, date("m") - $i + 1, 1, date("Y")); $first = date("Y-m-d", $first_ts); $next_month = date("Y-m-d", $next_month_ts); - + echo "Calculating statistics for month $first\n"; - + $totalusers += $users = tc( - "select count(*) as `count` from `users` + "select count(*) as `count` from `users` where `created` >= '$first' and `created` < '$next_month' and `verified` = 1 and `deleted` = 0 and `locked` = 0"); - + $totassurers += $assurers = tc( "select count(*) as `count` from ( select 1 from `notary` @@ -195,7 +196,7 @@ function getDataFromLive() { and `deleted` = 0 group by `to` having sum(`points`) >= 100 ) as `assurer_candidates`"); - + $certs = tc( "select count(*) as `count` from `domaincerts` where `created` >= '$first' and `created` < '$next_month' @@ -240,16 +241,16 @@ function getDataFromLive() { $next_year_ts = mktime(0, 0, 0, 1, 1, $i + 1); $first = date("Y-m-d", $first_ts); $next_year = date("Y-m-d", $next_year_ts); - + echo "Calculating statistics for year $i\n"; - + $totalusers += $users = tc( - "select count(*) as `count` from `users` + "select count(*) as `count` from `users` where `created` >= '$first' and `created` < '$next_year' and `verified` = 1 and `deleted` = 0 and `locked` = 0"); - + $totassurers += $assurers = tc( "select count(*) as `count` from ( select 1 from `notary` @@ -258,7 +259,7 @@ function getDataFromLive() { and `deleted` = 0 group by `to` having sum(`points`) >= 100 ) as `assurer_candidates`"); - + $certs = tc( "select count(*) as `count` from `domaincerts` where `created` >= '$first' and `created` < '$next_year' @@ -286,7 +287,7 @@ function getDataFromLive() { $tmp_arr['new_users'] = number_format($users); $tmp_arr['new_assurers'] = number_format($assurers); $tmp_arr['new_certificates'] = number_format($certs); - + $stats['growth_last_years'][] = $tmp_arr; } $stats['growth_last_years_total'] = array( diff --git a/scripts/cron/warning.php b/scripts/cron/warning.php index 0c97ba2..0cffc02 100755 --- a/scripts/cron/warning.php +++ b/scripts/cron/warning.php @@ -18,6 +18,7 @@ */ require_once(dirname(__FILE__).'/../../includes/mysql.php'); + require_once(dirname(__FILE__).'/../../includes/lib/l10n.php'); $days = array("1" => "3", "15" => "2", "30" => "1", "45" => "0"); @@ -34,6 +35,7 @@ $res = mysql_query($query); while($row = mysql_fetch_assoc($res)) { + L10n::set_recipient_language(intval($row['id'])); if($row['subject'] == "") { $row['crt_name'] = str_replace("../", "www/", $row['crt_name']); @@ -106,6 +108,7 @@ echo $row['fname']." ".$row['lname']." <".$row['email']."> (memid: ".$row['memid $res = mysql_query($query); while($row = mysql_fetch_assoc($res)) { + L10n::set_recipient_language(intval($row['memid'])); if($row['subject'] == "") $row['subject'] = $row['CN']; diff --git a/scripts/db_migrations/version5.sh b/scripts/db_migrations/version5.sh new file mode 100644 index 0000000..fa64367 --- /dev/null +++ b/scripts/db_migrations/version5.sh @@ -0,0 +1,294 @@ +#!/bin/sh +# LibreSSL - CAcert web application +# Copyright (C) 2004-2011 CAcert Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + + +# script to do database migrations + +# This particular version migrates from the preversioned state to version 5 +# If you want to reuse it for further migrations you probably should pay special +# attention because you have to adjust it a bit + +set -e # script fails if any command fails + +STDIN=0 +STDOUT=1 +STDERR=2 + +if [ "$1" = "--help" ]; then + cat >&$STDERR <<- USAGE + Usage: $0 [MYSQL_OPTIONS] + You have to specify all options needed by "mysql" as if you had started + the MySQL command line client directly (including the name of the + database to operate on). The MySQL user used has to have enough + privileges to do all necessary operations (among others CREATE, ALTER, + DROP, UPDATE, INSERT, DELETE). + You might need to enter the mysql password multiple times if you + specify the -p option. + USAGE + exit 1 +fi + +mysql_opt=" --batch --skip-column-names $@" + +schema_version=$( mysql $mysql_opt <<- 'SQL' + + SELECT MAX(`version`) FROM `schema_version`; +SQL +) +if [ $schema_version != 4 ]; then + cat >&$STDERR <<- ERROR + Error: database schema is not in the right version to do the migration! + Expected version: 4 (i.e. the version before there was versioning) + ERROR + exit 2 +fi + +mysql $mysql_opt <<- 'SQL' + +-- Move myISAM to InnoDB bug #1172 + +ALTER TABLE schema_version ENGINE=INNODB; + +echo "table schema_version altered to InnoDB" + + +ALTER TABLE abuserreports ENGINE=INNODB; + +echo "table abusereports altered to InnoDB" + + +ALTER TABLE addlang ENGINE=INNODB; + +echo "table addlang altered to InnoDB" + + +ALTER TABLE adminlog ENGINE=INNODB; + +echo "table adminlog altered to InnoDB" + + +ALTER TABLE advertising ENGINE=INNODB; + +echo "table advertising altered to InnoDB" + + +ALTER TABLE alerts ENGINE=INNODB; + +echo "table alerts altered to InnoDB" + + +ALTER TABLE baddomains ENGINE=INNODB; + +echo "table baddomains altered to InnoDB" + + +ALTER TABLE cats_passed ENGINE=INNODB; + +echo "table cats_passed altered to InnoDB" + + +ALTER TABLE cats_type ENGINE=INNODB; + +echo "table cats_type altered to InnoDB" + + +ALTER TABLE cats_variant ENGINE=INNODB; + +echo "table cats_variant altered to InnoDB" + + +ALTER TABLE countries ENGINE=INNODB; + +echo "table countries altered to InnoDB" + + +ALTER TABLE disputedomain ENGINE=INNODB; + +echo "table disputedomain altered to InnoDB" + + +ALTER TABLE disputeemail ENGINE=INNODB; + +echo "table disputeemail altered to InnoDB" + + +ALTER TABLE gpg ENGINE=INNODB; + +echo "table gpg altered to InnoDB" + + +ALTER TABLE localias ENGINE=INNODB; + +echo "table localias altered to InnoDB" + + +ALTER TABLE news ENGINE=INNODB; + +echo "table news altered to InnoDB" + + +ALTER TABLE otphashes ENGINE=INNODB; + +echo "table otphashes altered to InnoDB" + + +ALTER TABLE pinglog ENGINE=INNODB; + +echo "table pinglog altered to InnoDB" + + +ALTER TABLE root_certs ENGINE=INNODB; + +echo "table root_certs altered to InnoDB" + + +ALTER TABLE stampcache ENGINE=INNODB; + +echo "table stampcache altered to InnoDB" + + +ALTER TABLE tickets ENGINE=INNODB; + +echo "table tickets altered to InnoDB" + + +ALTER TABLE languages ENGINE=INNODB; + +echo "table languages altered to InnoDB" + + +ALTER TABLE locations ENGINE=INNODB; + +echo "table locations altered to InnoDB" + + +ALTER TABLE regions ENGINE=INNODB; + +echo "table regions altered to InnoDB" + + +ALTER TABLE domaincerts ENGINE=INNODB; + +echo "table domainderts altered to InnoDB" + + +ALTER TABLE domains ENGINE=INNODB; + +echo "table domains altered to InnoDB" + + +ALTER TABLE domLink ENGINE=INNODB; + +echo "table domLink altered to InnoDB" + + +ALTER TABLE emailcerts ENGINE=INNODB; + +echo "table emailcerts altered to InnoDB" + + +ALTER TABLE emaillink ENGINE=INNODB; + +echo "table emaillink altered to InnoDB" + + +ALTER TABLE email ENGINE=INNODB; + +echo "table email altered to InnoDB" + + +ALTER TABLE notary ENGINE=INNODB; + +echo "table notary altered to InnoDB" + + +ALTER TABLE tverify ENGINE=INNODB; + +echo "table tverify altered to InnoDB" + + +ALTER TABLE tverify-vote ENGINE=INNODB; + +echo "table tverify-vote altered to InnoDB" + + +ALTER TABLE userlocations ENGINE=INNODB; + +echo "table userlocations altered to InnoDB" + + +ALTER TABLE users ENGINE=INNODB; + +echo "table users altered to InnoDB" + + +ALTER TABLE user_agreements ENGINE=INNODB; + +echo "table user_agreements altered to InnoDB" + + +ALTER TABLE orgdomaincerts ENGINE=INNODB; + +echo "table orgdomaincerts altered to InnoDB" + + +ALTER TABLE orgdomains ENGINE=INNODB; + +echo "table orgdomains altered to InnoDB" + + +ALTER TABLE orgdomlink ENGINE=INNODB; + +echo "table orgdomlink altered to InnoDB" + + +ALTER TABLE orgemailcerts ENGINE=INNODB; + +echo "table orgemailcerts altered to InnoDB" + + +ALTER TABLE orgemaillink ENGINE=INNODB; + +echo "table orgemaillink altered to InnoDB" + + +ALTER TABLE orginfo ENGINE=INNODB; + +echo "table orginfo altered to InnoDB" + + +ALTER TABLE org ENGINE=INNODB; + +echo "table org altered to InnoDB" + + +ALTER TABLE statscache ENGINE=INNODB; + +echo "table statscache altered to InnoDB" + + + -- Update schema version number + INSERT INTO `schema_version` + (`version`, `when`) VALUES + ('5' , NOW() ); +SQL + + +echo "Database successfully migrated to version 5" +exit 0 + diff --git a/stamp/common.php b/stamp/common.php index ff814dd..d0a71f4 100644 --- a/stamp/common.php +++ b/stamp/common.php @@ -117,7 +117,7 @@ if($org == 0) { $query = "SELECT *, sum(`points`) AS `total` FROM `users`, `notary` WHERE `users`.`id` = '$cert[memid]' AND - `notary`.`to` = `users`.`id` and `notary`.`when` <= '$cert[issued]' GROUP BY `notary`.`to`"; + `notary`.`to` = `users`.`id` and `notary`.`when` <= '$cert[issued]' and `notary`.`deleted`=0 GROUP BY `notary`.`to`"; $user = mysql_fetch_assoc(mysql_query($query)); } else { $query = "select * from `orginfo` where `id`='$cert[orgid]'"; diff --git a/tverify/index.php b/tverify/index.php index 8976341..d3a0fd5 100644 --- a/tverify/index.php +++ b/tverify/index.php @@ -49,10 +49,10 @@ if($id == 1) { - $email = mysql_escape_string(trim($_REQUEST["email"])); - $password = mysql_escape_string(stripslashes(trim($_REQUEST["pword"]))); - $URL = mysql_escape_string(trim($_REQUEST["notaryURL"])); - $CN = mysql_escape_string($_SESSION['_config']['CN']); + $email = mysql_real_escape_string(trim($_REQUEST["email"])); + $password = mysql_real_escape_string(stripslashes(trim($_REQUEST["pword"]))); + $URL = mysql_real_escape_string(trim($_REQUEST["notaryURL"])); + $CN = mysql_real_escape_string($_SESSION['_config']['CN']); $memid = intval($_SESSION['_config']['uid']); $user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='$memid'")); $tmp = mysql_fetch_assoc(mysql_query("select sum(`points`) as `points` from `notary` where `to`='$memid'")); @@ -99,7 +99,7 @@ if($nofile == 0) { $filename = $photoid['tmp_name']; - $newfile = mysql_escape_string('/www/photoid/'.$tverify.".".$ext); + $newfile = mysql_real_escape_string('/www/photoid/'.$tverify.".".$ext); move_uploaded_file($filename, $newfile); $query = "update `tverify` set `photoid`='$newfile' where `id`='$tverify'"; mysql_query($query); diff --git a/www/.gitignore b/www/.gitignore new file mode 100644 index 0000000..faca589 --- /dev/null +++ b/www/.gitignore @@ -0,0 +1,5 @@ +# Ignore CRLs autogenerated by the CommModule +/class3-revoke.crl +/class3-revoke.crl.patch +/revoke.crl +/revoke.crl.patch diff --git a/www/.htaccess b/www/.htaccess index bd01047..cc48170 100644 --- a/www/.htaccess +++ b/www/.htaccess @@ -4,4 +4,4 @@ errordocument 404 /error404.php errordocument 403 /error403.php errordocument 401 /error401.php -RedirectPermanent /cps.php http://www.cacert.org/policy/CertificationPracticeStatement.php +RedirectPermanent /cps.php http://www.cacert.org/policy/CertificationPracticeStatement.html diff --git a/www/alert_hash_collision.php b/www/alert_hash_collision.php index bad60e8..f5eaa9c 100644 --- a/www/alert_hash_collision.php +++ b/www/alert_hash_collision.php @@ -14,13 +14,13 @@ if (!preg_match('/^(mem|org)-[0-9]+$/', @$_POST['usernym'])) if (preg_match('/^mem-[0-9]+$/', @$_POST['usernym'])) { - mysql_query("update emailcerts set coll_found=1 where memid='".mysql_escape_string(substr(@$_POST['usernym'],4))."' and pkhash!='' and pkhash='".$_POST['pkhash']."';"); - mysql_query("update domaincerts set coll_found=1 where memid='".mysql_escape_string(substr(@$_POST['usernym'],4))."' and pkhash!='' and pkhash='".$_POST['pkhash']."';"); + mysql_query("update emailcerts set coll_found=1 where memid='".mysql_real_escape_string(substr(@$_POST['usernym'],4))."' and pkhash!='' and pkhash='".$_POST['pkhash']."';"); + mysql_query("update domaincerts set coll_found=1 where memid='".mysql_real_escape_string(substr(@$_POST['usernym'],4))."' and pkhash!='' and pkhash='".$_POST['pkhash']."';"); } else { - mysql_query("update orgemailcerts set coll_found=1 where memid='".mysql_escape_string(substr(@$_POST['usernym'],4))."' and pkhash!='' and pkhash='".$_POST['pkhash']."';"); - mysql_query("update orgdomaincerts set coll_found=1 where memid='".mysql_escape_string(substr(@$_POST['usernym'],4))."' and pkhash!='' and pkhash='".$_POST['pkhash']."';"); + mysql_query("update orgemailcerts set coll_found=1 where memid='".mysql_real_escape_string(substr(@$_POST['usernym'],4))."' and pkhash!='' and pkhash='".$_POST['pkhash']."';"); + mysql_query("update orgdomaincerts set coll_found=1 where memid='".mysql_real_escape_string(substr(@$_POST['usernym'],4))."' and pkhash!='' and pkhash='".$_POST['pkhash']."';"); } //exec(REPORT_WEAK . ' ' . $_POST['usernym'] . ' ' . lower($_POST['pkhash'])); diff --git a/www/api/ccsr.php b/www/api/ccsr.php index 7efdf8d..aa33baa 100644 --- a/www/api/ccsr.php +++ b/www/api/ccsr.php @@ -42,7 +42,7 @@ require_once '../../includes/lib/check_weak_key.php'; } if(count($emails) <= 0) die("404,Wasn't able to match any emails sent against your account"); - $query = "select sum(`points`) as `points` from `notary` where `to`='$memid' group by `to`"; + $query = "select sum(`points`) as `points` from `notary` where `to`='$memid' and `notary`.`deleted`=0 group by `to`"; $row = mysql_fetch_assoc(mysql_query($query)); $points = $row['points']; @@ -62,12 +62,12 @@ require_once '../../includes/lib/check_weak_key.php'; $codesign = 1; $CSR = trim($_REQUEST['optionalCSR']); - + if (($weakKey = checkWeakKeyCSR($CSR)) !== "") { die("403, $weakKey"); } - + $incsr = tempnam("/tmp", "ccsrIn"); $checkedcsr = tempnam("/tmp", "ccsrOut"); $fp = fopen($incsr, "w"); diff --git a/www/api/cemails.php b/www/api/cemails.php index 0d067ea..0ef6b4a 100644 --- a/www/api/cemails.php +++ b/www/api/cemails.php @@ -15,8 +15,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - $username = mysql_escape_string($_REQUEST['username']); - $password = mysql_escape_string($_REQUEST['password']); + $username = mysql_real_escape_string($_REQUEST['username']); + $password = mysql_real_escape_string($_REQUEST['password']); $query = "select * from `users` where `email`='$username' and (`password`=old_password('$password') or `password`=sha1('$password'))"; $res = mysql_query($query); @@ -25,7 +25,7 @@ echo "200,Authentication Ok\n"; $user = mysql_fetch_assoc($res); $memid = $user['id']; - $query = "select sum(`points`) as `points` from `notary` where `to`='$memid' group by `to`"; + $query = "select sum(`points`) as `points` from `notary` where `to`='$memid' and `notary`.`deleted`=0 group by `to`"; $row = mysql_fetch_assoc(mysql_query($query)); $points = $row['points']; echo "CS=".intval($user['codesign'])."\n"; diff --git a/www/api/edu.php b/www/api/edu.php index 27b7b1b..80a4e79 100644 --- a/www/api/edu.php +++ b/www/api/edu.php @@ -20,7 +20,7 @@ if ($ipadress=='72.36.220.19' && $_SERVER['HTTPS']=="on") { - $serial=mysql_escape_string($_REQUEST["serial"]); + $serial=mysql_real_escape_string($_REQUEST["serial"]); $root=intval($_REQUEST["root"]); $sql="select memid from emailcerts where serial='$serial' and rootcert='$root'"; diff --git a/www/cacert1-class3-revoke.crl b/www/cacert1-class3-revoke.crl new file mode 120000 index 0000000..3bcd255 --- /dev/null +++ b/www/cacert1-class3-revoke.crl @@ -0,0 +1 @@ +class3-revoke.crl
\ No newline at end of file diff --git a/www/cacert1-revoke.crl b/www/cacert1-revoke.crl new file mode 120000 index 0000000..e7b822f --- /dev/null +++ b/www/cacert1-revoke.crl @@ -0,0 +1 @@ +revoke.crl
\ No newline at end of file diff --git a/www/cap.html.php b/www/cap.html.php index cc3fad6..8e5fe01 100644 --- a/www/cap.html.php +++ b/www/cap.html.php @@ -146,7 +146,7 @@ echo '<tbody>', "\n"; echo '<tr>', "\n"; echo ' <td colspan="3">'._("Make sure you have read and agreed with the CAcert Community Agreement"); - echo '(<a href="http://www.cacert.org/policy/CAcertCommunityAgreement.php">CCA</a>)<br>', "\n"; + echo '(<a href="http://www.cacert.org/policy/CAcertCommunityAgreement.html">CCA</a>)<br>', "\n"; echo '</td>', " \n", '</tr>', "\n"; /* echo '</tbody>', "\n"; @@ -158,7 +158,7 @@ echo '</td>', "\n".'</tr>', "\n"; echo '<tr>', "\n". ' <td colspan="3"><input type="checkbox" checked name="checked" value="2"> '; echo _("I agree to the CAcert Community Agreement.").' ('; - echo '<a href="http://www.cacert.org/policy/CAcertCommunityAgreement.php">CCA</a>)</dd>', "\n"; + echo '<a href="http://www.cacert.org/policy/CAcertCommunityAgreement.html">CCA</a>)</dd>', "\n"; echo '</td>', "\n".'</tr>', "\n"; /* echo '</tbody>', "\n"; diff --git a/www/cap.php b/www/cap.php index dc283fb..40b269a 100644 --- a/www/cap.php +++ b/www/cap.php @@ -146,7 +146,7 @@ $this->SetFont("Arial", "", "9"); if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','',9); - $this->MultiCell($this->w - 29, 3, recode($_SESSION['_config']['recode'], _("I agree to the CAcert Community Agreement.")." ( http://www.cacert.org/policy/CAcertCommunityAgreement.php )")); + $this->MultiCell($this->w - 29, 3, recode($_SESSION['_config']['recode'], _("I agree to the CAcert Community Agreement.")." ( http://www.cacert.org/policy/CAcertCommunityAgreement.html )")); // new da end $this->SetXY(13, $top + 55); //45->55 $this->Write(0, recode($_SESSION['_config']['recode'], _("Applicant's signature")).": __________________________________"); @@ -265,7 +265,7 @@ $this->Write(0, str_pad($date, 13, " ")); } - } + } } $format = array_key_exists('format',$_REQUEST)?$_REQUEST['format']:""; @@ -283,7 +283,7 @@ $pdf->AddPage(); $pdf->Body(array_key_exists('name',$_REQUEST)?$_REQUEST['name']:"", array_key_exists('dob',$_REQUEST)?$_REQUEST['dob']:"", array_key_exists('email',$_REQUEST)?$_REQUEST['email']:"", array_key_exists('assurer',$_REQUEST)?$_REQUEST['assurer']:"", array_key_exists('date',$_REQUEST)?$_REQUEST['date']:"", $maxpoints, array_key_exists('document1',$_REQUEST)?$_REQUEST['document1']:"", array_key_exists('document2',$_REQUEST)?$_REQUEST['document2']:"", array_key_exists('location',$_REQUEST)?$_REQUEST['location']:""); header("Expires: ".gmdate("D, j M Y G:i:s \G\M\T", time()+10800)); - header("Content-Disposition: attachment; filename=cap.pdf"); + header("Content-Disposition: attachment; filename=cap.pdf"); header("Cache-Control: public, max-age=10800"); header("Pragma: cache"); $pdf->output(); diff --git a/www/capnew.php b/www/capnew.php index 41a0894..273b0e6 100644 --- a/www/capnew.php +++ b/www/capnew.php @@ -68,7 +68,7 @@ define('REV', '$Revision: 1.4 $'); ** On transliteration and abbreviation of a name: ** if shoes a std way show accepted conversion as pdf comment ** Orientation: on landscape (dflt) print 2-up -** PDF URL links are used to web, wiki, and faq for more info search +** PDF URL links are used to web, wiki, and faq for more info search ** Only on non-ascii chars in a name the utf8 routines are loaded ** PDF reader has wiki info url's and easy email feedback ** ENABLED: @@ -92,7 +92,7 @@ define('REV', '$Revision: 1.4 $'); ** recode(), recode_string(0 is said to have too many (japanese) defeats ** recode_string() is only used on GET[] input (html->utf-8), ** UTF-8 use routines from http://www.sourceforge.net/projects/phputf8 -** which replaces php recode() package. +** which replaces php recode() package. ** on many places own utf-8 handling code exists and is loaded (tcpdf problem) ** _() translation routine. The returned HTML string is translated to utf-8 string. ** the GET() routines expects utf-8 code (see test defs) but might be changed @@ -196,7 +196,7 @@ define('REV', '$Revision: 1.4 $'); ** Form Revision string is generated from RCS revision string. ** More info on PDF fields: ** http://www.adobe.com/devnet/acrobat/pdfs/js_developer_guide.pdf -** +** */ // use next define if you test this code @@ -235,7 +235,7 @@ if( defined( 'TEST' ) ) { //$_GET['orientation'] = 'portrait'; // default 2 pages, or portrait } $_GET['nocca'] = isset($_SERVER['CCA']) ? $_SERVER['CCA'] : ''; - //$_GET['policy1'] = 'policy/PolicyOnPolicy.php'; + //$_GET['policy1'] = 'policy/PolicyOnPolicy.html'; if( isset($_SERVER['FORM']) AND $_SERVER['FORM'] == 'noform' ) $_GET['noform'] = 'true'; @@ -310,7 +310,7 @@ define('ARBIT', WIKI.'/ArbitrationForum'); // CAcert Community Agreement define('CCA', 'CAcertCommunityAgreement'); // default policy to print define('POLICY','policy/'); // default polciy doc directory -define('EXT','.php'); // default polciy doc extention, should be html +define('EXT','.html'); // default polciy doc extention, should be html /* finger print CAcert Root Key */ // should obtain this automatically define('CLASS1_SHA1','135C EC36 F49C B8E9 3B1A B270 CD80 8846 76CE 8F33'); define('CLASS3_SHA1','AD7C 3F64 FC44 39FE F4E9 0BE8 F47C 6CFA 8AAD FDCE'); @@ -484,16 +484,16 @@ class CAPPDF extends TCPDF { //number of colums /*protected*/ var $ncols=1; - + // columns width /*protected*/ var $colwidth=0; // space between columns /*protected*/ var $column_space = 0; - + //Current column /*protected*/ var $col=0; - + //Ordinate of column start /*protected*/ var $y0; @@ -535,7 +535,7 @@ class CAPPDF extends TCPDF { $this->SetDisplayMode(intval($this->scale), 'SinglePage', 'UseOC'); return( $format ); } - + //Set position at a given column /*private*/ function SetCol($col = -1) { static $pagecolwidth = 1.0; @@ -576,7 +576,7 @@ class CAPPDF extends TCPDF { $this->myFooter(); // print footer msg if defined } if( $col >= $this->ncols ) { - $this->addPage(); $col = 0; + $this->addPage(); $col = 0; $this->ScaleXY($this->scale,0,0); $this->y0 = 0; //no header/footer done... } elseif ( $col > 0 AND $col < $this->ncols) { @@ -599,7 +599,7 @@ class CAPPDF extends TCPDF { $this->PrintTable('', 0); // if in table reprint title table $this->InFooter = false; } - + //Method accepting or not automatic page break /*public*/ function AcceptPageBreak() { $this->SetCol(); @@ -688,7 +688,7 @@ class CAPPDF extends TCPDF { elseif( preg_match('/\./', $nm ) ) { if( $first_name < 0 ) $first_name = $j; if( $first_name >= 0 ) $success = TRUE; // was abbreviated - continue; // title + continue; // title } if( $first_name < 0 ) $first_name = $j; if( $married == 0 ) $fam = $j; @@ -710,7 +710,7 @@ class CAPPDF extends TCPDF { elseif( preg_match('/\./', $nm ) ) $name .= $nm; elseif( $j < $fam ) { // need to abbreviate // not utf8 - // and abbreviate + // and abbreviate if( $j == $first_name ) $abr = '('. $substr( $nm, 1 ) . ')'; else $abr = '.'; @@ -724,7 +724,7 @@ class CAPPDF extends TCPDF { $nm = $tk[0]; if( $ext < 0 AND preg_match('/(^[^A-Z]|\.)/', $nm ) ) continue; if( $ext < 0 ) $ext = $j+1; - if( preg_match('/\./', $nm ) ) { $success = TRUE; break; } + if( preg_match('/\./', $nm ) ) { $success = TRUE; break; } } return( $success? $name : '' ); // and return abbriviated name } @@ -841,7 +841,7 @@ class CAPPDF extends TCPDF { $this->StatementAssuree( $assuree['date']); $this->StatementAssurer( $assurer, $assurance ); } - + //Add form and/or CCA (on duplex only when more as one page is printed) /*public*/ function PrintForm( $assuree = NULL, $assurer = NULL, $assurance = NULL, $page = NULL ) { @@ -1033,7 +1033,7 @@ class CAPPDF extends TCPDF { $this->Line($this->lMargin,$tSide+$height,$this->lMargin+$this->colwidth,$tSide+$height); $this->Line($this->lMargin+$this->colwidth,$tSide-1, $this->lMargin+$this->colwidth, $tSide+$height); $this->SetDrawColor(0); - $this->SetY($tSide + $height + 1); // set Y ordinate to plus 7 + $this->SetY($tSide + $height + 1); // set Y ordinate to plus 7 $tSide = -1; $title = ''; return($this->GetY()); } @@ -1045,7 +1045,7 @@ class CAPPDF extends TCPDF { $id_type = $names == NULL ? '' : $names['idtype']; // store current margin values static $nr = 0; - static $idtypes = NULL; + static $idtypes = NULL; static $listpoints = NULL; static $ComboProps = array( 'fillColor'=> LBLUE, 'strokeColor'=> LLBLUE, 'editable'=> 'true', 'textSize' => 9, 'rotate'=> '0'); static $TextProps = array('strokeColor'=> LLBLUE, 'value' => ' ', 'fillColor'=> LBLUE, 'doNotScrole'=> 'false', 'textSize' => 12, 'rotate'=> '0'); @@ -1146,7 +1146,7 @@ class CAPPDF extends TCPDF { $this->SetFont(FONT, 'B', (F_SIZE+1)/6*H); $this->Cell($this->colwidth-37, 2, '('.$id_type .')', 0, 0, 'R'); // hide id type print on screen with the formfields, just nicety - // one could extend the name field, but this has more drawbacks + // one could extend the name field, but this has more drawbacks $this->TextField(sprintf('AssureeNames_%d_None',$nr), $this->SetFieldXY($this->lMargin+$this->colwidth-38,$savey+0.5,20), 7/6*H, $TextBlankProps); $this->SetFieldXY(); } @@ -1200,7 +1200,7 @@ class CAPPDF extends TCPDF { // all (max) three names with ID type right aligned. $cnt = $assuree['namecnt']; $space = $this->getPageHeight()/$this->scale*100.0 -MINH ; // margin - for( $i = 0; $i < $cnt; $i++ ) { // names to be printed + for( $i = 0; $i < $cnt; $i++ ) { // names to be printed $this->PrintName( $assuree['names'][$i], $assurer['maxpoints'] < 0? 35: $assurer['maxpoints'] ); if( $space < $this->getY() ) break; } @@ -1390,7 +1390,7 @@ class CAPPDF extends TCPDF { $this->SetFieldXY(); $TextProps['value'] = $assurer['email'] ? $assurer['email'] : $this->unhtmlentities( _('email') ) . '?'; $TextProps['userName'] = $this->unhtmlentities( _('On mutual assurance provide email address of Assurer.') ); - $this->TextField('AssurerEmail', $this->SetFieldXY($this->lMargin+68.5, $savey+1, 35), 5, $TextProps ); + $this->TextField('AssurerEmail', $this->SetFieldXY($this->lMargin+68.5, $savey+1, 35), 5, $TextProps ); $this->SetFieldXY(); $this->SetXY($this->lMargin+2, $savey+5); @@ -1457,7 +1457,7 @@ class CAPPDF extends TCPDF { // get $form, $orientation, $assuree, $assurer, $assurance info // FONT and BW are set already -// import info +// import info function GET( $key = '' ) { return ( array_key_exists( $key, $_GET) ? $_GET[$key] : ''); } @@ -1532,7 +1532,7 @@ for( $i = 1; $i <= 9 AND $j < 2; $i++) { // max 9 names we only print 4 max... $assuree[ 'namecnt' ]++; $assuree[ 'names' ] [] = array ( 'name' => $name ? $name : '', - 'idtype' => my_recode(GET(Dstr('ID',$i)))? my_recode(GET(Dstr('ID',$i))) : '', + 'idtype' => my_recode(GET(Dstr('ID',$i)))? my_recode(GET(Dstr('ID',$i))) : '', 'points' => my_recode(GET(Dstr('Pnts',$i))) != '' ? intval(my_recode(GET(Dstr('Pnts',$i)))) : -1 ); if( $name != '' AND @@ -1565,7 +1565,7 @@ unset( $document ); unset( $i ); unset( $j); // unset($_GET); PDF_UNIT /* mm */, /* PDF_PAGE_FORMAT */ $page['format'], true - ); + ); $pdf->SetFormat( $page['format'] ); // set paper size scaling // protection is encryption and this will cause 3.5 times performance loss @@ -1588,10 +1588,10 @@ unset( $document ); unset( $i ); unset( $j); // unset($_GET); $pdf->SetAutoPageBreak(TRUE, MARGIN*0.707); //set image scale factor - $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO); + $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO); //set some language-dependent strings - $pdf->setLanguageArray($l); + $pdf->setLanguageArray($l); //initialize document $pdf->AliasNbPages(); @@ -1608,6 +1608,6 @@ unset( $document ); unset( $i ); unset( $j); // unset($_GET); $pdf->Output('CAcert CAP.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ ?> diff --git a/www/cats/cats_import.php b/www/cats/cats_import.php index feb92d4..eefbb85 100644 --- a/www/cats/cats_import.php +++ b/www/cats/cats_import.php @@ -31,8 +31,10 @@ function sanitize_string($buffer) { } define ('UNDEFINED', 'nd'); -define ('ALLOWED_IP', '213.154.225.243'); -define ('ALLOWED_IP2', '172.16.2.27'); +// Specific for testserver: Accept Test-CATS-Server +define ('ALLOWED_IP', '192.109.159.27'); +//define ('ALLOWED_IP', '213.154.225.243'); +define ('ALLOWED_IP2', '192.109.159.28'); define ('CONFIG_FILEPATH', '/www/'); $remote_addr = (isset($_SERVER['REMOTE_ADDR']))?$_SERVER['REMOTE_ADDR']:UNDEFINED; diff --git a/www/certs/cacert.asc b/www/certs/cacert.asc index 120f516..e526392 100644 --- a/www/certs/cacert.asc +++ b/www/certs/cacert.asc @@ -1,30 +1,31 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.2 (GNU/Linux) +Version: GnuPG v1.4.9 (GNU/Linux) -mQGiBD8OdRwRBACEr0/NPA88qp8f6KyIMMveLQ1FOuLi0aDQDPybG7u1nrBoi3VI -tSRyfYcdExVxWQjTGd9qbShzXBw2DsxjA6YjiGzWKpVcqtj9uUDpSlylBaoadUzu -Sf3r3IkOHR2QJeC+9v2il30xy5XLMxDRbQYaSmf4uwTlIOUWNn118KpdawCgoNny -p4DR9EvRgCmY5z6IKHA2WscD/AhAKDVHCIAoZHzSB/puNOuVUSKRbIWNAqUAYosz -GRzYWb8O/3Ja4fNb3IMQ1gIsEcnUJFHnzID3pTjqWyiCId/NSX3fLuQxZHZE9n8P -PqlZIvqMrOfCT0RJQa0zTFcrgepnmnHLj7qmtXQZm+YkTvlihOZNtVA4JNzrxDrQ -egkqA/4hr0LezNJfkUhWnbW604p7AmmKK7Hi/ZixAfnxN0adgnV7oC3Q4VM8aB2i -gReSuifluHiaJmf/WsA3KH4bdyLRbagz6dOPkXY8bQKy9yRxQz9oYwudlluYoZXe -gSQI2Jle9U2ENefa9ouvVlsB0he1qzF6VzHXAXpLsANt5smDh7Q0Q0EgQ2VydCBT -aWduaW5nIEF1dGhvcml0eSAoUm9vdCBDQSkgPGdwZ0BjYWNlcnQub3JnPohfBBMR -AgAfBQI/DnUcBQk4ZAkABAsHAwIDFQIDAxYCAQIeAQIXgAAKCRDSuw0BZdD9WEFX -AJ9C6WBcYfTYw1uvZ+N85TPGG5PMKQCcCM1tyULC5J6pfwevywS6cEwfagW5Ag0E -Pw51MBAIANUbl1u0j+mnVJk1fKbJ+Ul6SAYpNtordfgrgrmlnOhMCFcROrCzsaaI -1ehohxMbTnIj0RP0g/KotahAurqB98qzHIxXZMEJSzBE2OCNvlIXqUyT1jwhAUN6 -e71s084Lml84gD4cIr7+2YtwIu+6zrE+YdjfMT1NibM3vmiXaknrk4aADb02ZS5U -iDeRstUO5PG7qVg4umR0HZJ1Ck2U7Kdjaekzzlm0q/vYMZKTYX37NkZRUU0QFLsM -tACEaZnwKf9hMAWJwG1OFyJeLVH8xvzCkI4I+fpAvAQj6LVAh41SHl7EivH6SiTp -/+61idoz/CGqeLBxuex6Z+Y53U54FmcAAwUH/2chzBs1YWFX5LuLGEW3R3UW/wDb -RnYpsSR+pnMBVh18WS0nF08R/SXtb12RsqN5H+GtELOZng6IWL5hhgNaYvF1F4sW -Ezm2nyVmTsu7/DtHLmXtzz1oNLQ9pzJkoqP2pGtPYQKvmiuoNbt+l1prwjt5zn1D -slLn8w0+9/PP1YdKpuZ/189yQP6iYsLHxBxg/50MbSzoFwiT22aJCdF+OJ7zRwDy -GhjnfV7HVwdEDV5rvb7aRolRmZZF2UADSPu52BWT4PI0nVnewAgivyELqVU3Zc3P -aWqmH5BAh22MjbsbXrWZXK/WOfZCNlPVdfHxwFGxnlwsHgmyrkPAs3szJGiITAQY -EQIADAUCPw51MAUJOGQJAAAKCRDSuw0BZdD9WMw8AJwIVUzB2WQJGAbf/aXzCABn -QWdKwACdEWUSf69RZiJgp4oMfXMx0fDEh2I= -=OaPO +mQGiBE3TAtQRBACuFhUNT3BOIXflZx8ENFN2hf0KHDgReWMW5+hcx8M2C9mueAST +89x0QxtdWUbsrMFSr3UvDIKjoPFVzV+WT/dez5aADSrnR4OxYPfzcNIWPjm8su/9 +HrH6+ivaH+iOoBOuhYrHthun+1fsqLedhTMNqb+tt6OfzqIuyFkmpm+FqwCg5ECF +s53E7j6BJuKYLeWqFDqFOH0D/1pnXyBF78YurXcwwA7eSQWoc3f1g5lwyqOWwcLv +ynI/dcPV5BosEUcqEjaNEyBR0LFRZC7tnw2VLPzr65aLA6SrFqEJ2bEdWkO9vM5g +8InhmcqTz7Yg/QGnyGT0iNBMG8zg4Ajz20Ty6GE887HMao6qpYKXSbujMRWVjVLn +VjpgA/9i1gsBjpGwr5rJ67dyDLVkJ5XMEP2ivgAhzKQ/inyLk2N3Nbm0YKWgrZRE ++pEcZVsLn2jHqd5yu1zVr3Cm44HHaB/A4ew+hRio9vbhJy7cfanfZpAL8Rg8wZbQ +t4x6zvrs0fXXNuD1BiSucOK4qGZ2vWukggmhAlHu5x5hws5qtbRLQ0FjZXJ0IFRl +c3QgU2VydmVyIFNpZ25pbmcgQXV0aG9yaXR5IChmb3IgdGVzdGluZyBvbmx5ISEh +KSA8Z3BnQGNhY2VydC5vcmc+iGYEExECACYFAk3TAtQCGwMFCSWYBgAGCwkIBwMC +BBUCCAMEFgIDAQIeAQIXgAAKCRBL5zSBd/dRrLxrAJ9kaSLRAlcy9e57yuAAxoZy +weX20ACg44B1AA26G0OePf9o3YBdUTjPsES5Ag0ETdMC1BAIAI9UEZ2NKbJfVWc+ +CBb5kKhO6qazLDnRsRkMY5WE1PTBP09ieAaQ7cv424e6fKdZxSO5vUQ27tLmcQXo +ICoREsDuSyESvEPbyBOro5LIY+z52TihqEHLPUN7OxlbPLX81AIKOCgEIUtpcYoX +MiwXPVO50Swo3PCCQiOQ7ewvkd32ZbSPl50B+/59JiDsQsnx1o+Ls7WkALzQ6w7T +UxLIVYWuFd9Hg/VOXBH67e81p/O7SDy6pMkDQaA9F22rA5Vv5TBJ2BAKWYfYK47i +HxtUhw2/WBUzhcw2AGqCnCy9nrYELLAqljnlCdWLyvhuWyUAG87D/1/5qD0+9idh +jcFWH/MAAwUH/2R7AWSZzbomxTcO5Q7/WxzTDtgUEy7eRbjqFMAusiQlTYDdeHz8 +PfWok6mGhUapJaGnA05hy6aYBIzl4idmQgz39xD47O0qeDWve6YwrDuLYju6JIwv +YfNiNAOjrZcRW4PCYeJfIK0WHV3+3kkneOX4Mql9QNKWs5W2LReMnHyq6POWasuf +EgDu0TfqaJTeK3IXKrEJI8G4R4xdHXmZ16Is5T49w09mvMan+TTGczzjWn0aWD3D +DOlTKK7h+82MSNCTiCi7aNoEyMTfeadSsrbqiaqtF0P/fyBDpGWFj3/A4foAcgtx +KVt0UHf1Va1g8M+czG3pCOne6dyafZGAe7qITwQYEQIADwUCTdMC1AIbDAUJJZgG +AAAKCRBL5zSBd/dRrAC5AKDdxp26zp4Km3jItBdeMD/gv8qxMgCgmmH1kizLe5Rk +yYchS2oleEWXIqM= +=9tD2 -----END PGP PUBLIC KEY BLOCK----- diff --git a/www/certs/class3.crt b/www/certs/class3.crt index 087ca0e..1899afb 100644 --- a/www/certs/class3.crt +++ b/www/certs/class3.crt @@ -1,42 +1,43 @@ -----BEGIN CERTIFICATE----- -MIIHWTCCBUGgAwIBAgIDCkGKMA0GCSqGSIb3DQEBCwUAMHkxEDAOBgNVBAoTB1Jv -b3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAGA1UEAxMZ -Q0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSc3VwcG9y -dEBjYWNlcnQub3JnMB4XDTExMDUyMzE3NDgwMloXDTIxMDUyMDE3NDgwMlowVDEU -MBIGA1UEChMLQ0FjZXJ0IEluYy4xHjAcBgNVBAsTFWh0dHA6Ly93d3cuQ0FjZXJ0 -Lm9yZzEcMBoGA1UEAxMTQ0FjZXJ0IENsYXNzIDMgUm9vdDCCAiIwDQYJKoZIhvcN -AQEBBQADggIPADCCAgoCggIBAKtJNRFIfNImflOUz0Op3SjXQiqL84d4GVh8D57a -iX3h++tykA10oZZkq5+gJJlz2uJVdscXe/UErEa4w75/ZI0QbCTzYZzA8pD6Ueb1 -aQFjww9W4kpCz+JEjCUoqMV5CX1GuYrz6fM0KQhF5Byfy5QEHIGoFLOYZcRD7E6C -jQnRvapbjZLQ7N6QxX8KwuPr5jFaXnQ+lzNZ6MMDPWAzv/fRb0fEze5ig1JuLgia -pNkVGJGmhZJHsK5I6223IeyFGmhyNav/8BBdwPSUp2rVO5J+TJAFfpPBLIukjmJ0 -FXFuC3ED6q8VOJrU0gVyb4z5K+taciX5OUbjchs+BMNkJyIQKopPWKcDrb60LhPt -XapI19V91Cp7XPpGBFDkzA5CW4zt2/LP/JaT4NsRNlRiNDiPDGCbO5dWOK3z0luL -oFvqTpa4fNfVoIZwQNORKbeiPK31jLvPGpKK5DR7wNhsX+kKwsOnIJpa3yxdUly6 -R9Wb7yQocDggL9V/KcCyQQNokszgnMyXS0XvOhAKq3A6mJVwrTWx6oUrpByAITGp -rmB6gCZIALgBwJNjVSKRPFbnr9s6JfOPMVTqJouBWfmh0VMRxXudA/Z0EeBtsSw/ -LIaRmXGapneLNGDRFLQsrJ2vjBDTn8Rq+G8T/HNZ92ZCdB6K4/jc0m+YnMtHmJVA -BfvpAgMBAAGjggINMIICCTAdBgNVHQ4EFgQUdahxYEyIE/B42Yl3tW3Fid+8sXow -gaMGA1UdIwSBmzCBmIAUFrUyG9TH8+DmjvO90rA67rI5GNGhfaR7MHkxEDAOBgNV -BAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAG -A1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYS -c3VwcG9ydEBjYWNlcnQub3JnggEAMA8GA1UdEwEB/wQFMAMBAf8wXQYIKwYBBQUH -AQEEUTBPMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5DQWNlcnQub3JnLzAoBggr -BgEFBQcwAoYcaHR0cDovL3d3dy5DQWNlcnQub3JnL2NhLmNydDBKBgNVHSAEQzBB -MD8GCCsGAQQBgZBKMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9y -Zy9pbmRleC5waHA/aWQ9MTAwNAYJYIZIAYb4QgEIBCcWJWh0dHA6Ly93d3cuQ0Fj -ZXJ0Lm9yZy9pbmRleC5waHA/aWQ9MTAwUAYJYIZIAYb4QgENBEMWQVRvIGdldCB5 -b3VyIG93biBjZXJ0aWZpY2F0ZSBmb3IgRlJFRSwgZ28gdG8gaHR0cDovL3d3dy5D -QWNlcnQub3JnMA0GCSqGSIb3DQEBCwUAA4ICAQApKIWuRKm5r6R5E/CooyuXYPNc -7uMvwfbiZqARrjY3OnYVBFPqQvX56sAV2KaC2eRhrnILKVyQQ+hBsuF32wITRHhH -Va9Y/MyY9kW50SD42CEH/m2qc9SzxgfpCYXMO/K2viwcJdVxjDm1Luq+GIG6sJO4 -D+Pm1yaMMVpyA4RS5qb1MyJFCsgLDYq4Nm+QCaGrvdfVTi5xotSu+qdUK+s1jVq3 -VIgv7nSf7UgWyg1I0JTTrKSi9iTfkuO960NAkW4cGI5WtIIS86mTn9S8nK2cde5a -lxuV53QtHA+wLJef+6kzOXrnAzqSjiL2jA3k2X4Ndhj3AfnvlpaiVXPAPHG0HRpW -Q7fDCo1y/OIQCQtBzoyUoPkD/XFzS4pXM+WOdH4VAQDmzEoc53+VGS3FpQyLu7Xt -hbNc09+4ufLKxw0BFKxwWMWMjTPUnWajGlCVI/xI4AZDEtnNp4Y5LzZyo4AQ5OHz -0ctbGsDkgJp8E3MGT9ujayQKurMcvEp4u+XjdTilSKeiHq921F73OIZWWonO1sOn -ebJSoMbxhbQljPI/lrMQ2Y1sVzufb4Y6GIIiNsiwkTjbKqGTqoQ/9SdlrnPVyNXT -d+pLncdBu8fA46A/5H2kjXPmEkvfoXNzczqA6NXLji/L6hOn1kGLrPo8idck9U60 -4GGSt/M3mMS+lqO3ig== +MIIHgjCCBWqgAwIBAgICEBswDQYJKoZIhvcNAQELBQAwgYcxCzAJBgNVBAYTAkFV +MRgwFgYDVQQIEw9OZXcgU291dGggV2FsZXMxGjAYBgNVBAoTEUNBY2VydCBUZXN0 +c2VydmVyMSEwHwYDVQQLExhodHRwOi8vY2FjZXJ0MS5pdC1zbHMuZGUxHzAdBgNV +BAMTFkNBY2VydCBUZXN0c2VydmVyIFJvb3QwHhcNMTEwNTAxMTgyNTA5WhcNMjEw +NDI4MTgyNTA5WjBiMRkwFwYDVQQKExBDQWNlcnQgVGVzdHNldmVyMSEwHwYDVQQL +ExhodHRwOi8vY2FjZXJ0MS5pdC1zbHMuZGUxIjAgBgNVBAMTGUNBY2VydCBUZXN0 +c2VydmVyIENsYXNzIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDI +576JQukwI58zuNidaS0HUYVCBmy4mpV7VhydDtW07hDu5lYGmbcuBW+SfjPCjMMR +QVEiNrWv3tLclBKah/ubOmgP1HenQxRfGiJkuPk7dwlM7qqPfRn/H1Pm1w1bj/e1 +yZkeNc0UzMPdRbD9InR3/hwHQ1hfLHKGbbYc6uTb+0UOgGAsMwb/WVb+8mSrgERZ +9pFhw8uK5+BFgJwSdsTsN68h5ZDL4VIf9Zq8z8jNGcXK0DSoZ0vT0y6EyVdXiXNS +PF/zAPTbBBQcBGmhKBlcTLwcPHLeHIEfwRGf72wqBYNNrT0J37yTci31x+xC0/iQ +wjPD4rRhYFxm/UW9sFtEJVtIf9o/oj2Mh2FGRa0DDk0oX+jewZEnTy+MUd0k4LFy +Md6Ucn4lJsb3uHnjZ8ayz5DEMDQ/3Mzjf6CjhOc4oXm5UXuE2gsZyno93fLtTXAc +4w0KzMcZ2diAp5Tdpq0w3pMJUAFoehFScBRK7Kb9xuXVPxoSvGCVPNXXUsEioIlf +T2StKvDVBPBTtWRnE0BLYTJaWQAnWp64QgWiVn+JmdGkIm4sHpB1FweN4msdkgic +6JAlYJRp71tSjuEnJwVtgqLqpUtLPTpJ64/0lDlazCJ5NaduTpAA+MSqXlHSA/Rb +Q1VSaKdRadqLYOUoqGFwHdldeyZpAwp0ibM62GmVrQIDAQABo4ICGjCCAhYwHQYD +VR0OBBYEFISE4B0WSV6xxeXnzy2oVnRL6JKUMIG0BgNVHSMEgawwgamAFIXXBQrW +j/IELV7ry/32aYsfTgb+oYGNpIGKMIGHMQswCQYDVQQGEwJBVTEYMBYGA1UECBMP +TmV3IFNvdXRoIFdhbGVzMRowGAYDVQQKExFDQWNlcnQgVGVzdHNlcnZlcjEhMB8G +A1UECxMYaHR0cDovL2NhY2VydDEuaXQtc2xzLmRlMR8wHQYDVQQDExZDQWNlcnQg +VGVzdHNlcnZlciBSb290ggEAMA8GA1UdEwEB/wQFMAMBAf8wXQYIKwYBBQUHAQEE +UTBPMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5DQWNlcnQub3JnLzAoBggrBgEF +BQcwAoYcaHR0cDovL3d3dy5DQWNlcnQub3JnL2NhLmNydDBGBgNVHSAEPzA9MDsG +BCsGAQUwMzAxBggrBgEFBQcCARYlaHR0cDovL3d3dy5DQWNlcnQub3JnL2luZGV4 +LnBocD9pZD0xMDA0BglghkgBhvhCAQgEJxYlaHR0cDovL3d3dy5DQWNlcnQub3Jn +L2luZGV4LnBocD9pZD0xMDBQBglghkgBhvhCAQ0EQxZBVG8gZ2V0IHlvdXIgb3du +IGNlcnRpZmljYXRlIGZvciBGUkVFLCBnbyB0byBodHRwOi8vd3d3LkNBY2VydC5v +cmcwDQYJKoZIhvcNAQELBQADggIBAFWedxYAhAD+hiOxIqMoynyAdMaBbmCg7zJc +Eq6pgbP7cHL+4zzIP4Zc/tPsmbL7il3cILb0+ETwmXRnC6c9E2xWke6jv9qzQ0Aj +QI7FQdD/0cJgKagMTn+aBgyiGG6U0zTKU7cK3Ae3zSjtdaibEJyQoQlLuEzZzDYO +LBXJXDEInhrZ+gqWRnWDOJwdr/19alqgF8nvxKQ136vV8Lqmsrzcs0O+6v53YeVj +9AYyeCLK2XPCyhGpia2t7uPIN1zolCgJLXQcJEg3dGRqsmAeuB7PylOz9xuxXjYR +Sq6fcOP31CxhSeHwTqTxzkuz/u+l4RBq/0LkMS/QBBmnjaqPy3TbEwner/xMWxyL +i9DPLPrXnJXrxczV5ScUt+0cMYWDY+A+pnxwd0s/TzfDIChidSTKSbY9kPcbxCVO +W+Pz6muoYWrPuj02rZDIN29rIQAe73vh3C++zvAB6SfbfTTMij97K86fc9Rs6amK +CwdhKWKFibL6z0FhxAvjpxo3Fugm4q9sDAzx3GHUJ1vzq3ZJAbY1CiPglUb9rAi+ +cpFkrnSP9paa/w5iYrSTOBduGdBp8kcrHXB9RuSLndL+J41xexIBb+tSTQ8H8pzk +iRTOfmYoGiizERHM1OUl9BPW/2+UZ9o4KUl7sPakniMkpm1dBKhvXj9rcA8+SUpp +Raog64+T -----END CERTIFICATE----- diff --git a/www/certs/class3.der b/www/certs/class3.der Binary files differindex 56f8c88..e13d2b9 100644 --- a/www/certs/class3.der +++ b/www/certs/class3.der diff --git a/www/certs/class3.txt b/www/certs/class3.txt index a77aa14..68533d8 100644 --- a/www/certs/class3.txt +++ b/www/certs/class3.txt @@ -1,59 +1,59 @@ Certificate: Data: Version: 3 (0x2) - Serial Number: 672138 (0xa418a) + Serial Number: 4123 (0x101b) Signature Algorithm: sha256WithRSAEncryption - Issuer: O=Root CA, OU=http://www.cacert.org, CN=CA Cert Signing Authority/emailAddress=support@cacert.org + Issuer: C=AU, ST=New South Wales, O=CAcert Testserver, OU=http://cacert1.it-sls.de, CN=CAcert Testserver Root Validity - Not Before: May 23 17:48:02 2011 GMT - Not After : May 20 17:48:02 2021 GMT - Subject: O=CAcert Inc., OU=http://www.CAcert.org, CN=CAcert Class 3 Root + Not Before: May 1 18:25:09 2011 GMT + Not After : Apr 28 18:25:09 2021 GMT + Subject: O=CAcert Testsever, OU=http://cacert1.it-sls.de, CN=CAcert Testserver Class 3 Subject Public Key Info: Public Key Algorithm: rsaEncryption RSA Public Key: (4096 bit) Modulus (4096 bit): - 00:ab:49:35:11:48:7c:d2:26:7e:53:94:cf:43:a9: - dd:28:d7:42:2a:8b:f3:87:78:19:58:7c:0f:9e:da: - 89:7d:e1:fb:eb:72:90:0d:74:a1:96:64:ab:9f:a0: - 24:99:73:da:e2:55:76:c7:17:7b:f5:04:ac:46:b8: - c3:be:7f:64:8d:10:6c:24:f3:61:9c:c0:f2:90:fa: - 51:e6:f5:69:01:63:c3:0f:56:e2:4a:42:cf:e2:44: - 8c:25:28:a8:c5:79:09:7d:46:b9:8a:f3:e9:f3:34: - 29:08:45:e4:1c:9f:cb:94:04:1c:81:a8:14:b3:98: - 65:c4:43:ec:4e:82:8d:09:d1:bd:aa:5b:8d:92:d0: - ec:de:90:c5:7f:0a:c2:e3:eb:e6:31:5a:5e:74:3e: - 97:33:59:e8:c3:03:3d:60:33:bf:f7:d1:6f:47:c4: - cd:ee:62:83:52:6e:2e:08:9a:a4:d9:15:18:91:a6: - 85:92:47:b0:ae:48:eb:6d:b7:21:ec:85:1a:68:72: - 35:ab:ff:f0:10:5d:c0:f4:94:a7:6a:d5:3b:92:7e: - 4c:90:05:7e:93:c1:2c:8b:a4:8e:62:74:15:71:6e: - 0b:71:03:ea:af:15:38:9a:d4:d2:05:72:6f:8c:f9: - 2b:eb:5a:72:25:f9:39:46:e3:72:1b:3e:04:c3:64: - 27:22:10:2a:8a:4f:58:a7:03:ad:be:b4:2e:13:ed: - 5d:aa:48:d7:d5:7d:d4:2a:7b:5c:fa:46:04:50:e4: - cc:0e:42:5b:8c:ed:db:f2:cf:fc:96:93:e0:db:11: - 36:54:62:34:38:8f:0c:60:9b:3b:97:56:38:ad:f3: - d2:5b:8b:a0:5b:ea:4e:96:b8:7c:d7:d5:a0:86:70: - 40:d3:91:29:b7:a2:3c:ad:f5:8c:bb:cf:1a:92:8a: - e4:34:7b:c0:d8:6c:5f:e9:0a:c2:c3:a7:20:9a:5a: - df:2c:5d:52:5c:ba:47:d5:9b:ef:24:28:70:38:20: - 2f:d5:7f:29:c0:b2:41:03:68:92:cc:e0:9c:cc:97: - 4b:45:ef:3a:10:0a:ab:70:3a:98:95:70:ad:35:b1: - ea:85:2b:a4:1c:80:21:31:a9:ae:60:7a:80:26:48: - 00:b8:01:c0:93:63:55:22:91:3c:56:e7:af:db:3a: - 25:f3:8f:31:54:ea:26:8b:81:59:f9:a1:d1:53:11: - c5:7b:9d:03:f6:74:11:e0:6d:b1:2c:3f:2c:86:91: - 99:71:9a:a6:77:8b:34:60:d1:14:b4:2c:ac:9d:af: - 8c:10:d3:9f:c4:6a:f8:6f:13:fc:73:59:f7:66:42: - 74:1e:8a:e3:f8:dc:d2:6f:98:9c:cb:47:98:95:40: - 05:fb:e9 + 00:c8:e7:be:89:42:e9:30:23:9f:33:b8:d8:9d:69: + 2d:07:51:85:42:06:6c:b8:9a:95:7b:56:1c:9d:0e: + d5:b4:ee:10:ee:e6:56:06:99:b7:2e:05:6f:92:7e: + 33:c2:8c:c3:11:41:51:22:36:b5:af:de:d2:dc:94: + 12:9a:87:fb:9b:3a:68:0f:d4:77:a7:43:14:5f:1a: + 22:64:b8:f9:3b:77:09:4c:ee:aa:8f:7d:19:ff:1f: + 53:e6:d7:0d:5b:8f:f7:b5:c9:99:1e:35:cd:14:cc: + c3:dd:45:b0:fd:22:74:77:fe:1c:07:43:58:5f:2c: + 72:86:6d:b6:1c:ea:e4:db:fb:45:0e:80:60:2c:33: + 06:ff:59:56:fe:f2:64:ab:80:44:59:f6:91:61:c3: + cb:8a:e7:e0:45:80:9c:12:76:c4:ec:37:af:21:e5: + 90:cb:e1:52:1f:f5:9a:bc:cf:c8:cd:19:c5:ca:d0: + 34:a8:67:4b:d3:d3:2e:84:c9:57:57:89:73:52:3c: + 5f:f3:00:f4:db:04:14:1c:04:69:a1:28:19:5c:4c: + bc:1c:3c:72:de:1c:81:1f:c1:11:9f:ef:6c:2a:05: + 83:4d:ad:3d:09:df:bc:93:72:2d:f5:c7:ec:42:d3: + f8:90:c2:33:c3:e2:b4:61:60:5c:66:fd:45:bd:b0: + 5b:44:25:5b:48:7f:da:3f:a2:3d:8c:87:61:46:45: + ad:03:0e:4d:28:5f:e8:de:c1:91:27:4f:2f:8c:51: + dd:24:e0:b1:72:31:de:94:72:7e:25:26:c6:f7:b8: + 79:e3:67:c6:b2:cf:90:c4:30:34:3f:dc:cc:e3:7f: + a0:a3:84:e7:38:a1:79:b9:51:7b:84:da:0b:19:ca: + 7a:3d:dd:f2:ed:4d:70:1c:e3:0d:0a:cc:c7:19:d9: + d8:80:a7:94:dd:a6:ad:30:de:93:09:50:01:68:7a: + 11:52:70:14:4a:ec:a6:fd:c6:e5:d5:3f:1a:12:bc: + 60:95:3c:d5:d7:52:c1:22:a0:89:5f:4f:64:ad:2a: + f0:d5:04:f0:53:b5:64:67:13:40:4b:61:32:5a:59: + 00:27:5a:9e:b8:42:05:a2:56:7f:89:99:d1:a4:22: + 6e:2c:1e:90:75:17:07:8d:e2:6b:1d:92:08:9c:e8: + 90:25:60:94:69:ef:5b:52:8e:e1:27:27:05:6d:82: + a2:ea:a5:4b:4b:3d:3a:49:eb:8f:f4:94:39:5a:cc: + 22:79:35:a7:6e:4e:90:00:f8:c4:aa:5e:51:d2:03: + f4:5b:43:55:52:68:a7:51:69:da:8b:60:e5:28:a8: + 61:70:1d:d9:5d:7b:26:69:03:0a:74:89:b3:3a:d8: + 69:95:ad Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Subject Key Identifier: - 75:A8:71:60:4C:88:13:F0:78:D9:89:77:B5:6D:C5:89:DF:BC:B1:7A + 84:84:E0:1D:16:49:5E:B1:C5:E5:E7:CF:2D:A8:56:74:4B:E8:92:94 X509v3 Authority Key Identifier: - keyid:16:B5:32:1B:D4:C7:F3:E0:E6:8E:F3:BD:D2:B0:3A:EE:B2:39:18:D1 - DirName:/O=Root CA/OU=http://www.cacert.org/CN=CA Cert Signing Authority/emailAddress=support@cacert.org + keyid:85:D7:05:0A:D6:8F:F2:04:2D:5E:EB:CB:FD:F6:69:8B:1F:4E:06:FE + DirName:/C=AU/ST=New South Wales/O=CAcert Testserver/OU=http://cacert1.it-sls.de/CN=CAcert Testserver Root serial:00 X509v3 Basic Constraints: critical @@ -63,7 +63,7 @@ Certificate: CA Issuers - URI:http://www.CAcert.org/ca.crt X509v3 Certificate Policies: - Policy: 1.3.6.1.4.1.18506 + Policy: Security CPS: http://www.CAcert.org/index.php?id=10 Netscape CA Policy Url: @@ -71,74 +71,75 @@ Certificate: Netscape Comment: To get your own certificate for FREE, go to http://www.CAcert.org Signature Algorithm: sha256WithRSAEncryption - 29:28:85:ae:44:a9:b9:af:a4:79:13:f0:a8:a3:2b:97:60:f3: - 5c:ee:e3:2f:c1:f6:e2:66:a0:11:ae:36:37:3a:76:15:04:53: - ea:42:f5:f9:ea:c0:15:d8:a6:82:d9:e4:61:ae:72:0b:29:5c: - 90:43:e8:41:b2:e1:77:db:02:13:44:78:47:55:af:58:fc:cc: - 98:f6:45:b9:d1:20:f8:d8:21:07:fe:6d:aa:73:d4:b3:c6:07: - e9:09:85:cc:3b:f2:b6:be:2c:1c:25:d5:71:8c:39:b5:2e:ea: - be:18:81:ba:b0:93:b8:0f:e3:e6:d7:26:8c:31:5a:72:03:84: - 52:e6:a6:f5:33:22:45:0a:c8:0b:0d:8a:b8:36:6f:90:09:a1: - ab:bd:d7:d5:4e:2e:71:a2:d4:ae:fa:a7:54:2b:eb:35:8d:5a: - b7:54:88:2f:ee:74:9f:ed:48:16:ca:0d:48:d0:94:d3:ac:a4: - a2:f6:24:df:92:e3:bd:eb:43:40:91:6e:1c:18:8e:56:b4:82: - 12:f3:a9:93:9f:d4:bc:9c:ad:9c:75:ee:5a:97:1b:95:e7:74: - 2d:1c:0f:b0:2c:97:9f:fb:a9:33:39:7a:e7:03:3a:92:8e:22: - f6:8c:0d:e4:d9:7e:0d:76:18:f7:01:f9:ef:96:96:a2:55:73: - c0:3c:71:b4:1d:1a:56:43:b7:c3:0a:8d:72:fc:e2:10:09:0b: - 41:ce:8c:94:a0:f9:03:fd:71:73:4b:8a:57:33:e5:8e:74:7e: - 15:01:00:e6:cc:4a:1c:e7:7f:95:19:2d:c5:a5:0c:8b:bb:b5: - ed:85:b3:5c:d3:df:b8:b9:f2:ca:c7:0d:01:14:ac:70:58:c5: - 8c:8d:33:d4:9d:66:a3:1a:50:95:23:fc:48:e0:06:43:12:d9: - cd:a7:86:39:2f:36:72:a3:80:10:e4:e1:f3:d1:cb:5b:1a:c0: - e4:80:9a:7c:13:73:06:4f:db:a3:6b:24:0a:ba:b3:1c:bc:4a: - 78:bb:e5:e3:75:38:a5:48:a7:a2:1e:af:76:d4:5e:f7:38:86: - 56:5a:89:ce:d6:c3:a7:79:b2:52:a0:c6:f1:85:b4:25:8c:f2: - 3f:96:b3:10:d9:8d:6c:57:3b:9f:6f:86:3a:18:82:22:36:c8: - b0:91:38:db:2a:a1:93:aa:84:3f:f5:27:65:ae:73:d5:c8:d5: - d3:77:ea:4b:9d:c7:41:bb:c7:c0:e3:a0:3f:e4:7d:a4:8d:73: - e6:12:4b:df:a1:73:73:73:3a:80:e8:d5:cb:8e:2f:cb:ea:13: - a7:d6:41:8b:ac:fa:3c:89:d7:24:f5:4e:b4:e0:61:92:b7:f3: - 37:98:c4:be:96:a3:b7:8a + 55:9e:77:16:00:84:00:fe:86:23:b1:22:a3:28:ca:7c:80:74: + c6:81:6e:60:a0:ef:32:5c:12:ae:a9:81:b3:fb:70:72:fe:e3: + 3c:c8:3f:86:5c:fe:d3:ec:99:b2:fb:8a:5d:dc:20:b6:f4:f8: + 44:f0:99:74:67:0b:a7:3d:13:6c:56:91:ee:a3:bf:da:b3:43: + 40:23:40:8e:c5:41:d0:ff:d1:c2:60:29:a8:0c:4e:7f:9a:06: + 0c:a2:18:6e:94:d3:34:ca:53:b7:0a:dc:07:b7:cd:28:ed:75: + a8:9b:10:9c:90:a1:09:4b:b8:4c:d9:cc:36:0e:2c:15:c9:5c: + 31:08:9e:1a:d9:fa:0a:96:46:75:83:38:9c:1d:af:fd:7d:6a: + 5a:a0:17:c9:ef:c4:a4:35:df:ab:d5:f0:ba:a6:b2:bc:dc:b3: + 43:be:ea:fe:77:61:e5:63:f4:06:32:78:22:ca:d9:73:c2:ca: + 11:a9:89:ad:ad:ee:e3:c8:37:5c:e8:94:28:09:2d:74:1c:24: + 48:37:74:64:6a:b2:60:1e:b8:1e:cf:ca:53:b3:f7:1b:b1:5e: + 36:11:4a:ae:9f:70:e3:f7:d4:2c:61:49:e1:f0:4e:a4:f1:ce: + 4b:b3:fe:ef:a5:e1:10:6a:ff:42:e4:31:2f:d0:04:19:a7:8d: + aa:8f:cb:74:db:13:09:de:af:fc:4c:5b:1c:8b:8b:d0:cf:2c: + fa:d7:9c:95:eb:c5:cc:d5:e5:27:14:b7:ed:1c:31:85:83:63: + e0:3e:a6:7c:70:77:4b:3f:4f:37:c3:20:28:62:75:24:ca:49: + b6:3d:90:f7:1b:c4:25:4e:5b:e3:f3:ea:6b:a8:61:6a:cf:ba: + 3d:36:ad:90:c8:37:6f:6b:21:00:1e:ef:7b:e1:dc:2f:be:ce: + f0:01:e9:27:db:7d:34:cc:8a:3f:7b:2b:ce:9f:73:d4:6c:e9: + a9:8a:0b:07:61:29:62:85:89:b2:fa:cf:41:61:c4:0b:e3:a7: + 1a:37:16:e8:26:e2:af:6c:0c:0c:f1:dc:61:d4:27:5b:f3:ab: + 76:49:01:b6:35:0a:23:e0:95:46:fd:ac:08:be:72:91:64:ae: + 74:8f:f6:96:9a:ff:0e:62:62:b4:93:38:17:6e:19:d0:69:f2: + 47:2b:1d:70:7d:46:e4:8b:9d:d2:fe:27:8d:71:7b:12:01:6f: + eb:52:4d:0f:07:f2:9c:e4:89:14:ce:7e:66:28:1a:28:b3:11: + 11:cc:d4:e5:25:f4:13:d6:ff:6f:94:67:da:38:29:49:7b:b0: + f6:a4:9e:23:24:a6:6d:5d:04:a8:6f:5e:3f:6b:70:0f:3e:49: + 4a:69:45:aa:20:eb:8f:93 -----BEGIN CERTIFICATE----- -MIIHWTCCBUGgAwIBAgIDCkGKMA0GCSqGSIb3DQEBCwUAMHkxEDAOBgNVBAoTB1Jv -b3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAGA1UEAxMZ -Q0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSc3VwcG9y -dEBjYWNlcnQub3JnMB4XDTExMDUyMzE3NDgwMloXDTIxMDUyMDE3NDgwMlowVDEU -MBIGA1UEChMLQ0FjZXJ0IEluYy4xHjAcBgNVBAsTFWh0dHA6Ly93d3cuQ0FjZXJ0 -Lm9yZzEcMBoGA1UEAxMTQ0FjZXJ0IENsYXNzIDMgUm9vdDCCAiIwDQYJKoZIhvcN -AQEBBQADggIPADCCAgoCggIBAKtJNRFIfNImflOUz0Op3SjXQiqL84d4GVh8D57a -iX3h++tykA10oZZkq5+gJJlz2uJVdscXe/UErEa4w75/ZI0QbCTzYZzA8pD6Ueb1 -aQFjww9W4kpCz+JEjCUoqMV5CX1GuYrz6fM0KQhF5Byfy5QEHIGoFLOYZcRD7E6C -jQnRvapbjZLQ7N6QxX8KwuPr5jFaXnQ+lzNZ6MMDPWAzv/fRb0fEze5ig1JuLgia -pNkVGJGmhZJHsK5I6223IeyFGmhyNav/8BBdwPSUp2rVO5J+TJAFfpPBLIukjmJ0 -FXFuC3ED6q8VOJrU0gVyb4z5K+taciX5OUbjchs+BMNkJyIQKopPWKcDrb60LhPt -XapI19V91Cp7XPpGBFDkzA5CW4zt2/LP/JaT4NsRNlRiNDiPDGCbO5dWOK3z0luL -oFvqTpa4fNfVoIZwQNORKbeiPK31jLvPGpKK5DR7wNhsX+kKwsOnIJpa3yxdUly6 -R9Wb7yQocDggL9V/KcCyQQNokszgnMyXS0XvOhAKq3A6mJVwrTWx6oUrpByAITGp -rmB6gCZIALgBwJNjVSKRPFbnr9s6JfOPMVTqJouBWfmh0VMRxXudA/Z0EeBtsSw/ -LIaRmXGapneLNGDRFLQsrJ2vjBDTn8Rq+G8T/HNZ92ZCdB6K4/jc0m+YnMtHmJVA -BfvpAgMBAAGjggINMIICCTAdBgNVHQ4EFgQUdahxYEyIE/B42Yl3tW3Fid+8sXow -gaMGA1UdIwSBmzCBmIAUFrUyG9TH8+DmjvO90rA67rI5GNGhfaR7MHkxEDAOBgNV -BAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAG -A1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYS -c3VwcG9ydEBjYWNlcnQub3JnggEAMA8GA1UdEwEB/wQFMAMBAf8wXQYIKwYBBQUH -AQEEUTBPMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5DQWNlcnQub3JnLzAoBggr -BgEFBQcwAoYcaHR0cDovL3d3dy5DQWNlcnQub3JnL2NhLmNydDBKBgNVHSAEQzBB -MD8GCCsGAQQBgZBKMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9y -Zy9pbmRleC5waHA/aWQ9MTAwNAYJYIZIAYb4QgEIBCcWJWh0dHA6Ly93d3cuQ0Fj -ZXJ0Lm9yZy9pbmRleC5waHA/aWQ9MTAwUAYJYIZIAYb4QgENBEMWQVRvIGdldCB5 -b3VyIG93biBjZXJ0aWZpY2F0ZSBmb3IgRlJFRSwgZ28gdG8gaHR0cDovL3d3dy5D -QWNlcnQub3JnMA0GCSqGSIb3DQEBCwUAA4ICAQApKIWuRKm5r6R5E/CooyuXYPNc -7uMvwfbiZqARrjY3OnYVBFPqQvX56sAV2KaC2eRhrnILKVyQQ+hBsuF32wITRHhH -Va9Y/MyY9kW50SD42CEH/m2qc9SzxgfpCYXMO/K2viwcJdVxjDm1Luq+GIG6sJO4 -D+Pm1yaMMVpyA4RS5qb1MyJFCsgLDYq4Nm+QCaGrvdfVTi5xotSu+qdUK+s1jVq3 -VIgv7nSf7UgWyg1I0JTTrKSi9iTfkuO960NAkW4cGI5WtIIS86mTn9S8nK2cde5a -lxuV53QtHA+wLJef+6kzOXrnAzqSjiL2jA3k2X4Ndhj3AfnvlpaiVXPAPHG0HRpW -Q7fDCo1y/OIQCQtBzoyUoPkD/XFzS4pXM+WOdH4VAQDmzEoc53+VGS3FpQyLu7Xt -hbNc09+4ufLKxw0BFKxwWMWMjTPUnWajGlCVI/xI4AZDEtnNp4Y5LzZyo4AQ5OHz -0ctbGsDkgJp8E3MGT9ujayQKurMcvEp4u+XjdTilSKeiHq921F73OIZWWonO1sOn -ebJSoMbxhbQljPI/lrMQ2Y1sVzufb4Y6GIIiNsiwkTjbKqGTqoQ/9SdlrnPVyNXT -d+pLncdBu8fA46A/5H2kjXPmEkvfoXNzczqA6NXLji/L6hOn1kGLrPo8idck9U60 -4GGSt/M3mMS+lqO3ig== +MIIHgjCCBWqgAwIBAgICEBswDQYJKoZIhvcNAQELBQAwgYcxCzAJBgNVBAYTAkFV +MRgwFgYDVQQIEw9OZXcgU291dGggV2FsZXMxGjAYBgNVBAoTEUNBY2VydCBUZXN0 +c2VydmVyMSEwHwYDVQQLExhodHRwOi8vY2FjZXJ0MS5pdC1zbHMuZGUxHzAdBgNV +BAMTFkNBY2VydCBUZXN0c2VydmVyIFJvb3QwHhcNMTEwNTAxMTgyNTA5WhcNMjEw +NDI4MTgyNTA5WjBiMRkwFwYDVQQKExBDQWNlcnQgVGVzdHNldmVyMSEwHwYDVQQL +ExhodHRwOi8vY2FjZXJ0MS5pdC1zbHMuZGUxIjAgBgNVBAMTGUNBY2VydCBUZXN0 +c2VydmVyIENsYXNzIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDI +576JQukwI58zuNidaS0HUYVCBmy4mpV7VhydDtW07hDu5lYGmbcuBW+SfjPCjMMR +QVEiNrWv3tLclBKah/ubOmgP1HenQxRfGiJkuPk7dwlM7qqPfRn/H1Pm1w1bj/e1 +yZkeNc0UzMPdRbD9InR3/hwHQ1hfLHKGbbYc6uTb+0UOgGAsMwb/WVb+8mSrgERZ +9pFhw8uK5+BFgJwSdsTsN68h5ZDL4VIf9Zq8z8jNGcXK0DSoZ0vT0y6EyVdXiXNS +PF/zAPTbBBQcBGmhKBlcTLwcPHLeHIEfwRGf72wqBYNNrT0J37yTci31x+xC0/iQ +wjPD4rRhYFxm/UW9sFtEJVtIf9o/oj2Mh2FGRa0DDk0oX+jewZEnTy+MUd0k4LFy +Md6Ucn4lJsb3uHnjZ8ayz5DEMDQ/3Mzjf6CjhOc4oXm5UXuE2gsZyno93fLtTXAc +4w0KzMcZ2diAp5Tdpq0w3pMJUAFoehFScBRK7Kb9xuXVPxoSvGCVPNXXUsEioIlf +T2StKvDVBPBTtWRnE0BLYTJaWQAnWp64QgWiVn+JmdGkIm4sHpB1FweN4msdkgic +6JAlYJRp71tSjuEnJwVtgqLqpUtLPTpJ64/0lDlazCJ5NaduTpAA+MSqXlHSA/Rb +Q1VSaKdRadqLYOUoqGFwHdldeyZpAwp0ibM62GmVrQIDAQABo4ICGjCCAhYwHQYD +VR0OBBYEFISE4B0WSV6xxeXnzy2oVnRL6JKUMIG0BgNVHSMEgawwgamAFIXXBQrW +j/IELV7ry/32aYsfTgb+oYGNpIGKMIGHMQswCQYDVQQGEwJBVTEYMBYGA1UECBMP +TmV3IFNvdXRoIFdhbGVzMRowGAYDVQQKExFDQWNlcnQgVGVzdHNlcnZlcjEhMB8G +A1UECxMYaHR0cDovL2NhY2VydDEuaXQtc2xzLmRlMR8wHQYDVQQDExZDQWNlcnQg +VGVzdHNlcnZlciBSb290ggEAMA8GA1UdEwEB/wQFMAMBAf8wXQYIKwYBBQUHAQEE +UTBPMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5DQWNlcnQub3JnLzAoBggrBgEF +BQcwAoYcaHR0cDovL3d3dy5DQWNlcnQub3JnL2NhLmNydDBGBgNVHSAEPzA9MDsG +BCsGAQUwMzAxBggrBgEFBQcCARYlaHR0cDovL3d3dy5DQWNlcnQub3JnL2luZGV4 +LnBocD9pZD0xMDA0BglghkgBhvhCAQgEJxYlaHR0cDovL3d3dy5DQWNlcnQub3Jn +L2luZGV4LnBocD9pZD0xMDBQBglghkgBhvhCAQ0EQxZBVG8gZ2V0IHlvdXIgb3du +IGNlcnRpZmljYXRlIGZvciBGUkVFLCBnbyB0byBodHRwOi8vd3d3LkNBY2VydC5v +cmcwDQYJKoZIhvcNAQELBQADggIBAFWedxYAhAD+hiOxIqMoynyAdMaBbmCg7zJc +Eq6pgbP7cHL+4zzIP4Zc/tPsmbL7il3cILb0+ETwmXRnC6c9E2xWke6jv9qzQ0Aj +QI7FQdD/0cJgKagMTn+aBgyiGG6U0zTKU7cK3Ae3zSjtdaibEJyQoQlLuEzZzDYO +LBXJXDEInhrZ+gqWRnWDOJwdr/19alqgF8nvxKQ136vV8Lqmsrzcs0O+6v53YeVj +9AYyeCLK2XPCyhGpia2t7uPIN1zolCgJLXQcJEg3dGRqsmAeuB7PylOz9xuxXjYR +Sq6fcOP31CxhSeHwTqTxzkuz/u+l4RBq/0LkMS/QBBmnjaqPy3TbEwner/xMWxyL +i9DPLPrXnJXrxczV5ScUt+0cMYWDY+A+pnxwd0s/TzfDIChidSTKSbY9kPcbxCVO +W+Pz6muoYWrPuj02rZDIN29rIQAe73vh3C++zvAB6SfbfTTMij97K86fc9Rs6amK +CwdhKWKFibL6z0FhxAvjpxo3Fugm4q9sDAzx3GHUJ1vzq3ZJAbY1CiPglUb9rAi+ +cpFkrnSP9paa/w5iYrSTOBduGdBp8kcrHXB9RuSLndL+J41xexIBb+tSTQ8H8pzk +iRTOfmYoGiizERHM1OUl9BPW/2+UZ9o4KUl7sPakniMkpm1dBKhvXj9rcA8+SUpp +Raog64+T -----END CERTIFICATE----- diff --git a/www/certs/root.crt b/www/certs/root.crt index e7dfc82..fa9d766 100644 --- a/www/certs/root.crt +++ b/www/certs/root.crt @@ -1,41 +1,43 @@ -----BEGIN CERTIFICATE----- -MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290 -IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB -IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA -Y2FjZXJ0Lm9yZzAeFw0wMzAzMzAxMjI5NDlaFw0zMzAzMjkxMjI5NDlaMHkxEDAO -BgNVBAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEi -MCAGA1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJ -ARYSc3VwcG9ydEBjYWNlcnQub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC -CgKCAgEAziLA4kZ97DYoB1CW8qAzQIxL8TtmPzHlawI229Z89vGIj053NgVBlfkJ -8BLPRoZzYLdufujAWGSuzbCtRRcMY/pnCujW0r8+55jE8Ez64AO7NV1sId6eINm6 -zWYyN3L69wj1x81YyY7nDl7qPv4coRQKFWyGhFtkZip6qUtTefWIonvuLwphK42y -fk1WpRPs6tqSnqxEQR5YYGUFZvjARL3LlPdCfgv3ZWiYUQXw8wWRBB0bF4LsyFe7 -w2t6iPGwcswlWyCR7BYCEo8y6RcYSNDHBS4CMEK4JZwFaz+qOqfrU0j36NK2B5jc -G8Y0f3/JHIJ6BVgrCFvzOKKrF11myZjXnhCLotLddJr3cQxyYN/Nb5gznZY0dj4k -epKwDpUeb+agRThHqtdB7Uq3EvbXG4OKDy7YCbZZ16oE/9KTfWgu3YtLq1i6L43q -laegw1SJpfvbi1EinbLDvhG+LJGGi5Z4rSDTii8aP8bQUWWHIbEZAWV/RRyH9XzQ -QUxPKZgh/TMfdQwEUfoZd9vUFBzugcMd9Zi3aQaRIt0AUMyBMawSB3s42mhb5ivU -fslfrejrckzzAeVLIL+aplfKkQABi6F1ITe1Yw1nPkZPcCBnzsXWWdsC4PDSy826 -YreQQejdIOQpvGQpQsgi3Hia/0PsmBsJUUtaWsJx8cTLc6nloQsCAwEAAaOCAc4w -ggHKMB0GA1UdDgQWBBQWtTIb1Mfz4OaO873SsDrusjkY0TCBowYDVR0jBIGbMIGY -gBQWtTIb1Mfz4OaO873SsDrusjkY0aF9pHsweTEQMA4GA1UEChMHUm9vdCBDQTEe -MBwGA1UECxMVaHR0cDovL3d3dy5jYWNlcnQub3JnMSIwIAYDVQQDExlDQSBDZXJ0 -IFNpZ25pbmcgQXV0aG9yaXR5MSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGNhY2Vy -dC5vcmeCAQAwDwYDVR0TAQH/BAUwAwEB/zAyBgNVHR8EKzApMCegJaAjhiFodHRw -czovL3d3dy5jYWNlcnQub3JnL3Jldm9rZS5jcmwwMAYJYIZIAYb4QgEEBCMWIWh0 -dHBzOi8vd3d3LmNhY2VydC5vcmcvcmV2b2tlLmNybDA0BglghkgBhvhCAQgEJxYl -aHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMDBWBglghkgBhvhC -AQ0ESRZHVG8gZ2V0IHlvdXIgb3duIGNlcnRpZmljYXRlIGZvciBGUkVFIGhlYWQg -b3ZlciB0byBodHRwOi8vd3d3LmNhY2VydC5vcmcwDQYJKoZIhvcNAQEEBQADggIB -ACjH7pyCArpcgBLKNQodgW+JapnM8mgPf6fhjViVPr3yBsOQWqy1YPaZQwGjiHCc -nWKdpIevZ1gNMDY75q1I08t0AoZxPuIrA2jxNGJARjtT6ij0rPtmlVOKTV39O9lg -18p5aTuxZZKmxoGCXJzN600BiqXfEVWqFcofN8CCmHBh22p8lqOOLlQ+TyGpkO/c -gr/c6EWtTZBzCDyUZbAEmXZ/4rzCahWqlwQ3JNgelE5tDlG+1sSPypZt90Pf6DBl -Jzt7u0NDY8RD97LsaMzhGY4i+5jhe1o+ATc7iwiwovOVThrLm82asduycPAtStvY -sONvRUgzEv/+PDIqVPfE94rwiCPCR/5kenHA0R6mY7AHfqQv0wGP3J8rtsYIqQ+T -SCX8Ev2fQtzzxD72V7DX3WnRBnc0CkvSyqD/HMaMyRa+xMwyN2hzXwj7UfdJUzYF -CpUCTPJ5GhD22Dp1nPMd8aINcGeGG7MW9S/lpOt5hvk9C8JzC6WZrG/8Z7jlLwum -GCSNe9FINSkYQKyTYOGWhlC0elnYjyELn8+CkcY7v2vcB5G5l1YjqrZslMZIBjzk -zk6q5PYvCdxTby78dOs6Y5nCpqyJvKeyRKANihDjbPIky/qbn3BHLt4Ui9SyIAmW -omTxJBzcoTWcFbLUvFUufQb1nA5V9FrWk9p2rSVzTMVD +MIIHpzCCBY+gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMCQVUx +GDAWBgNVBAgTD05ldyBTb3V0aCBXYWxlczEaMBgGA1UEChMRQ0FjZXJ0IFRlc3Rz +ZXJ2ZXIxITAfBgNVBAsTGGh0dHA6Ly9jYWNlcnQxLml0LXNscy5kZTEfMB0GA1UE +AxMWQ0FjZXJ0IFRlc3RzZXJ2ZXIgUm9vdDAeFw0xMTAzMjkyMDQ1MjBaFw0yMTAz +MjYyMDQ1MjBaMIGHMQswCQYDVQQGEwJBVTEYMBYGA1UECBMPTmV3IFNvdXRoIFdh +bGVzMRowGAYDVQQKExFDQWNlcnQgVGVzdHNlcnZlcjEhMB8GA1UECxMYaHR0cDov +L2NhY2VydDEuaXQtc2xzLmRlMR8wHQYDVQQDExZDQWNlcnQgVGVzdHNlcnZlciBS +b290MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA5fvQIrtzGpSbyWam +2kHfXMCXgRuTHSuQwbvkqdLAqtiI4ZQkF4jTy+7D6LVnDd3kw/hC1EAhcV79WuTn +PrrpjM1JdliOOOvb5sh9SQrdT4w1IO2JBmHrykcHCcvh7tLcm8iKA3iIIxO76SXZ +Pd7buDEQQrP8z6AXBgCRIdtS9uA5WxAmmbj2ToL8UaViijB062zVO9euOuMdN5Qk +pCVOj9tfzotJDHw3sNvP65G/C63ZJ0ysUhohncXe+e6UIPHVS+V54nBENz+4HY/d +zchFFHhnhuCSyhPfSz975IlnBSgMqhVPEYuFpAkDUSUpc8kXoe+cVVSjPBw0exUJ +X4OUjEUf3HgdPyaoeeAPbkQ2pd118vMHzTzAX7t/GzVxROkYSzFvuSljI7ivFx9Y +lPRsMW5L9TRIjxCPBLoqTNKgQQOfZiib+T4PY/ii+qU17lMZK9L9hnAMjW8L2dzx +Z6/qrhM58vKqt6Rd9bsUt109WWflKY39YenlGaCJU+0qgsUcbl2qHjgbkz8rvJJM +10BkVROvVvqnPjkSc8ZPD+1Si9pP0pztAl7vXsDM30jtL6Jv/DyTFKUljpb0tqA9 +22SyOxUu0kkKBYXY1HrqL6Ahvjeorv5aDzrUqAYTYB6Z82ykx0bG5FsAK4ShoTv1 +3ir9ejhln4JPGiyQTdMXgRaHX/kCAwEAAaOCAhowggIWMB0GA1UdDgQWBBSF1wUK +1o/yBC1e68v99mmLH04G/jCBtAYDVR0jBIGsMIGpgBSF1wUK1o/yBC1e68v99mmL +H04G/qGBjaSBijCBhzELMAkGA1UEBhMCQVUxGDAWBgNVBAgTD05ldyBTb3V0aCBX +YWxlczEaMBgGA1UEChMRQ0FjZXJ0IFRlc3RzZXJ2ZXIxITAfBgNVBAsTGGh0dHA6 +Ly9jYWNlcnQxLml0LXNscy5kZTEfMB0GA1UEAxMWQ0FjZXJ0IFRlc3RzZXJ2ZXIg +Um9vdIIBADAPBgNVHRMBAf8EBTADAQH/MF0GCCsGAQUFBwEBBFEwTzAjBggrBgEF +BQcwAYYXaHR0cDovL29jc3AuQ0FjZXJ0Lm9yZy8wKAYIKwYBBQUHMAKGHGh0dHA6 +Ly93d3cuQ0FjZXJ0Lm9yZy9jYS5jcnQwRgYDVR0gBD8wPTA7BgQrBgEFMDMwMQYI +KwYBBQUHAgEWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9yZy9pbmRleC5waHA/aWQ9MTAw +NAYJYIZIAYb4QgEIBCcWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9yZy9pbmRleC5waHA/ +aWQ9MTAwUAYJYIZIAYb4QgENBEMWQVRvIGdldCB5b3VyIG93biBjZXJ0aWZpY2F0 +ZSBmb3IgRlJFRSwgZ28gdG8gaHR0cDovL3d3dy5DQWNlcnQub3JnMA0GCSqGSIb3 +DQEBBQUAA4ICAQDQjXJDogH/NiU53JEUaw7jEF7qgp8vLjO2AXkwwpdKOWKS6lm9 +BQXiKs6HUdVYwsdST30kSvF1dD9Y9gCgFVyN662Tk2LwaPyKRq9cxlUXwqKEczfE +4yFPhYXS1giIGL8aSUx0lok6KWRXNgspgBIZ+0tFV+9GLNTP5y+ofU2ME1xw6+zM +tN/rgN2Xt6oVO24tJlKWVvodIgfq8QPscxZHwFqyHWh8hsL8q4mSDZZ0B7wHy51F +gliDzcq+WG8tk29WV++7uHRnN2rqJSoGc91IAHN2YmBW/mCeiqPH0Ms1x7Oo1DuZ +C5pc1GGyxGun252NxRM9jEz7UsWqHRCCyyA6Tyo2E6b3gdiatmohW1JIUTk+WONZ +41+Htgz+vhGFzTOnAWUQLapPllNeYjs/b1Ub8vpycx2O0FU3ZPtC+41GriPHQ2rJ +/ToQVI4ZAHUp7O6n4+r7Onhf5qylVeux+Qzy+IV2Db7rj0KXBoHjW3S0hIfIJE0x +1T5Ldj+YBFvCLvd6RrcNgoS/HaKAV/42AENy1V1eBBP6TJ8kmXWVbyRpzRFgZmmB +z6jLle2M0/kaPER2s5QFvxu+Y6mwrQ237im9oPHzY4kGv8eeF+AMUOmSC+M5jb3m ++IafDexcFnjchflKWV/RRHSj28kJ3ops1lgpkx4+TJo3M62Udepphw0ItA== -----END CERTIFICATE----- diff --git a/www/certs/root.der b/www/certs/root.der Binary files differindex 719b0ff..9166696 100644 --- a/www/certs/root.der +++ b/www/certs/root.der diff --git a/www/certs/root.txt b/www/certs/root.txt index 96bb2cd..26c1593 100644 --- a/www/certs/root.txt +++ b/www/certs/root.txt @@ -2,139 +2,144 @@ Certificate: Data: Version: 3 (0x2) Serial Number: 0 (0x0) - Signature Algorithm: md5WithRSAEncryption - Issuer: O=Root CA, OU=http://www.cacert.org, CN=CA Cert Signing Authority/emailAddress=support@cacert.org + Signature Algorithm: sha1WithRSAEncryption + Issuer: C=AU, ST=New South Wales, O=CAcert Testserver, OU=http://cacert1.it-sls.de, CN=CAcert Testserver Root Validity - Not Before: Mar 30 12:29:49 2003 GMT - Not After : Mar 29 12:29:49 2033 GMT - Subject: O=Root CA, OU=http://www.cacert.org, CN=CA Cert Signing Authority/emailAddress=support@cacert.org + Not Before: Mar 29 20:45:20 2011 GMT + Not After : Mar 26 20:45:20 2021 GMT + Subject: C=AU, ST=New South Wales, O=CAcert Testserver, OU=http://cacert1.it-sls.de, CN=CAcert Testserver Root Subject Public Key Info: Public Key Algorithm: rsaEncryption RSA Public Key: (4096 bit) Modulus (4096 bit): - 00:ce:22:c0:e2:46:7d:ec:36:28:07:50:96:f2:a0: - 33:40:8c:4b:f1:3b:66:3f:31:e5:6b:02:36:db:d6: - 7c:f6:f1:88:8f:4e:77:36:05:41:95:f9:09:f0:12: - cf:46:86:73:60:b7:6e:7e:e8:c0:58:64:ae:cd:b0: - ad:45:17:0c:63:fa:67:0a:e8:d6:d2:bf:3e:e7:98: - c4:f0:4c:fa:e0:03:bb:35:5d:6c:21:de:9e:20:d9: - ba:cd:66:32:37:72:fa:f7:08:f5:c7:cd:58:c9:8e: - e7:0e:5e:ea:3e:fe:1c:a1:14:0a:15:6c:86:84:5b: - 64:66:2a:7a:a9:4b:53:79:f5:88:a2:7b:ee:2f:0a: - 61:2b:8d:b2:7e:4d:56:a5:13:ec:ea:da:92:9e:ac: - 44:41:1e:58:60:65:05:66:f8:c0:44:bd:cb:94:f7: - 42:7e:0b:f7:65:68:98:51:05:f0:f3:05:91:04:1d: - 1b:17:82:ec:c8:57:bb:c3:6b:7a:88:f1:b0:72:cc: - 25:5b:20:91:ec:16:02:12:8f:32:e9:17:18:48:d0: - c7:05:2e:02:30:42:b8:25:9c:05:6b:3f:aa:3a:a7: - eb:53:48:f7:e8:d2:b6:07:98:dc:1b:c6:34:7f:7f: - c9:1c:82:7a:05:58:2b:08:5b:f3:38:a2:ab:17:5d: - 66:c9:98:d7:9e:10:8b:a2:d2:dd:74:9a:f7:71:0c: - 72:60:df:cd:6f:98:33:9d:96:34:76:3e:24:7a:92: - b0:0e:95:1e:6f:e6:a0:45:38:47:aa:d7:41:ed:4a: - b7:12:f6:d7:1b:83:8a:0f:2e:d8:09:b6:59:d7:aa: - 04:ff:d2:93:7d:68:2e:dd:8b:4b:ab:58:ba:2f:8d: - ea:95:a7:a0:c3:54:89:a5:fb:db:8b:51:22:9d:b2: - c3:be:11:be:2c:91:86:8b:96:78:ad:20:d3:8a:2f: - 1a:3f:c6:d0:51:65:87:21:b1:19:01:65:7f:45:1c: - 87:f5:7c:d0:41:4c:4f:29:98:21:fd:33:1f:75:0c: - 04:51:fa:19:77:db:d4:14:1c:ee:81:c3:1d:f5:98: - b7:69:06:91:22:dd:00:50:cc:81:31:ac:12:07:7b: - 38:da:68:5b:e6:2b:d4:7e:c9:5f:ad:e8:eb:72:4c: - f3:01:e5:4b:20:bf:9a:a6:57:ca:91:00:01:8b:a1: - 75:21:37:b5:63:0d:67:3e:46:4f:70:20:67:ce:c5: - d6:59:db:02:e0:f0:d2:cb:cd:ba:62:b7:90:41:e8: - dd:20:e4:29:bc:64:29:42:c8:22:dc:78:9a:ff:43: - ec:98:1b:09:51:4b:5a:5a:c2:71:f1:c4:cb:73:a9: - e5:a1:0b + 00:e5:fb:d0:22:bb:73:1a:94:9b:c9:66:a6:da:41: + df:5c:c0:97:81:1b:93:1d:2b:90:c1:bb:e4:a9:d2: + c0:aa:d8:88:e1:94:24:17:88:d3:cb:ee:c3:e8:b5: + 67:0d:dd:e4:c3:f8:42:d4:40:21:71:5e:fd:5a:e4: + e7:3e:ba:e9:8c:cd:49:76:58:8e:38:eb:db:e6:c8: + 7d:49:0a:dd:4f:8c:35:20:ed:89:06:61:eb:ca:47: + 07:09:cb:e1:ee:d2:dc:9b:c8:8a:03:78:88:23:13: + bb:e9:25:d9:3d:de:db:b8:31:10:42:b3:fc:cf:a0: + 17:06:00:91:21:db:52:f6:e0:39:5b:10:26:99:b8: + f6:4e:82:fc:51:a5:62:8a:30:74:eb:6c:d5:3b:d7: + ae:3a:e3:1d:37:94:24:a4:25:4e:8f:db:5f:ce:8b: + 49:0c:7c:37:b0:db:cf:eb:91:bf:0b:ad:d9:27:4c: + ac:52:1a:21:9d:c5:de:f9:ee:94:20:f1:d5:4b:e5: + 79:e2:70:44:37:3f:b8:1d:8f:dd:cd:c8:45:14:78: + 67:86:e0:92:ca:13:df:4b:3f:7b:e4:89:67:05:28: + 0c:aa:15:4f:11:8b:85:a4:09:03:51:25:29:73:c9: + 17:a1:ef:9c:55:54:a3:3c:1c:34:7b:15:09:5f:83: + 94:8c:45:1f:dc:78:1d:3f:26:a8:79:e0:0f:6e:44: + 36:a5:dd:75:f2:f3:07:cd:3c:c0:5f:bb:7f:1b:35: + 71:44:e9:18:4b:31:6f:b9:29:63:23:b8:af:17:1f: + 58:94:f4:6c:31:6e:4b:f5:34:48:8f:10:8f:04:ba: + 2a:4c:d2:a0:41:03:9f:66:28:9b:f9:3e:0f:63:f8: + a2:fa:a5:35:ee:53:19:2b:d2:fd:86:70:0c:8d:6f: + 0b:d9:dc:f1:67:af:ea:ae:13:39:f2:f2:aa:b7:a4: + 5d:f5:bb:14:b7:5d:3d:59:67:e5:29:8d:fd:61:e9: + e5:19:a0:89:53:ed:2a:82:c5:1c:6e:5d:aa:1e:38: + 1b:93:3f:2b:bc:92:4c:d7:40:64:55:13:af:56:fa: + a7:3e:39:12:73:c6:4f:0f:ed:52:8b:da:4f:d2:9c: + ed:02:5e:ef:5e:c0:cc:df:48:ed:2f:a2:6f:fc:3c: + 93:14:a5:25:8e:96:f4:b6:a0:3d:db:64:b2:3b:15: + 2e:d2:49:0a:05:85:d8:d4:7a:ea:2f:a0:21:be:37: + a8:ae:fe:5a:0f:3a:d4:a8:06:13:60:1e:99:f3:6c: + a4:c7:46:c6:e4:5b:00:2b:84:a1:a1:3b:f5:de:2a: + fd:7a:38:65:9f:82:4f:1a:2c:90:4d:d3:17:81:16: + 87:5f:f9 Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Subject Key Identifier: - 16:B5:32:1B:D4:C7:F3:E0:E6:8E:F3:BD:D2:B0:3A:EE:B2:39:18:D1 + 85:D7:05:0A:D6:8F:F2:04:2D:5E:EB:CB:FD:F6:69:8B:1F:4E:06:FE X509v3 Authority Key Identifier: - keyid:16:B5:32:1B:D4:C7:F3:E0:E6:8E:F3:BD:D2:B0:3A:EE:B2:39:18:D1 - DirName:/O=Root CA/OU=http://www.cacert.org/CN=CA Cert Signing Authority/emailAddress=support@cacert.org + keyid:85:D7:05:0A:D6:8F:F2:04:2D:5E:EB:CB:FD:F6:69:8B:1F:4E:06:FE + DirName:/C=AU/ST=New South Wales/O=CAcert Testserver/OU=http://cacert1.it-sls.de/CN=CAcert Testserver Root serial:00 X509v3 Basic Constraints: critical CA:TRUE - X509v3 CRL Distribution Points: - URI:https://www.cacert.org/revoke.crl + Authority Information Access: + OCSP - URI:http://ocsp.CAcert.org/ + CA Issuers - URI:http://www.CAcert.org/ca.crt + + X509v3 Certificate Policies: + Policy: Security + CPS: http://www.CAcert.org/index.php?id=10 - Netscape CA Revocation Url: - https://www.cacert.org/revoke.crl Netscape CA Policy Url: - http://www.cacert.org/index.php?id=10 + http://www.CAcert.org/index.php?id=10 Netscape Comment: - To get your own certificate for FREE head over to http://www.cacert.org - Signature Algorithm: md5WithRSAEncryption - 28:c7:ee:9c:82:02:ba:5c:80:12:ca:35:0a:1d:81:6f:89:6a: - 99:cc:f2:68:0f:7f:a7:e1:8d:58:95:3e:bd:f2:06:c3:90:5a: - ac:b5:60:f6:99:43:01:a3:88:70:9c:9d:62:9d:a4:87:af:67: - 58:0d:30:36:3b:e6:ad:48:d3:cb:74:02:86:71:3e:e2:2b:03: - 68:f1:34:62:40:46:3b:53:ea:28:f4:ac:fb:66:95:53:8a:4d: - 5d:fd:3b:d9:60:d7:ca:79:69:3b:b1:65:92:a6:c6:81:82:5c: - 9c:cd:eb:4d:01:8a:a5:df:11:55:aa:15:ca:1f:37:c0:82:98: - 70:61:db:6a:7c:96:a3:8e:2e:54:3e:4f:21:a9:90:ef:dc:82: - bf:dc:e8:45:ad:4d:90:73:08:3c:94:65:b0:04:99:76:7f:e2: - bc:c2:6a:15:aa:97:04:37:24:d8:1e:94:4e:6d:0e:51:be:d6: - c4:8f:ca:96:6d:f7:43:df:e8:30:65:27:3b:7b:bb:43:43:63: - c4:43:f7:b2:ec:68:cc:e1:19:8e:22:fb:98:e1:7b:5a:3e:01: - 37:3b:8b:08:b0:a2:f3:95:4e:1a:cb:9b:cd:9a:b1:db:b2:70: - f0:2d:4a:db:d8:b0:e3:6f:45:48:33:12:ff:fe:3c:32:2a:54: - f7:c4:f7:8a:f0:88:23:c2:47:fe:64:7a:71:c0:d1:1e:a6:63: - b0:07:7e:a4:2f:d3:01:8f:dc:9f:2b:b6:c6:08:a9:0f:93:48: - 25:fc:12:fd:9f:42:dc:f3:c4:3e:f6:57:b0:d7:dd:69:d1:06: - 77:34:0a:4b:d2:ca:a0:ff:1c:c6:8c:c9:16:be:c4:cc:32:37: - 68:73:5f:08:fb:51:f7:49:53:36:05:0a:95:02:4c:f2:79:1a: - 10:f6:d8:3a:75:9c:f3:1d:f1:a2:0d:70:67:86:1b:b3:16:f5: - 2f:e5:a4:eb:79:86:f9:3d:0b:c2:73:0b:a5:99:ac:6f:fc:67: - b8:e5:2f:0b:a6:18:24:8d:7b:d1:48:35:29:18:40:ac:93:60: - e1:96:86:50:b4:7a:59:d8:8f:21:0b:9f:cf:82:91:c6:3b:bf: - 6b:dc:07:91:b9:97:56:23:aa:b6:6c:94:c6:48:06:3c:e4:ce: - 4e:aa:e4:f6:2f:09:dc:53:6f:2e:fc:74:eb:3a:63:99:c2:a6: - ac:89:bc:a7:b2:44:a0:0d:8a:10:e3:6c:f2:24:cb:fa:9b:9f: - 70:47:2e:de:14:8b:d4:b2:20:09:96:a2:64:f1:24:1c:dc:a1: - 35:9c:15:b2:d4:bc:55:2e:7d:06:f5:9c:0e:55:f4:5a:d6:93: - da:76:ad:25:73:4c:c5:43 + To get your own certificate for FREE, go to http://www.CAcert.org + Signature Algorithm: sha1WithRSAEncryption + d0:8d:72:43:a2:01:ff:36:25:39:dc:91:14:6b:0e:e3:10:5e: + ea:82:9f:2f:2e:33:b6:01:79:30:c2:97:4a:39:62:92:ea:59: + bd:05:05:e2:2a:ce:87:51:d5:58:c2:c7:52:4f:7d:24:4a:f1: + 75:74:3f:58:f6:00:a0:15:5c:8d:eb:ad:93:93:62:f0:68:fc: + 8a:46:af:5c:c6:55:17:c2:a2:84:73:37:c4:e3:21:4f:85:85: + d2:d6:08:88:18:bf:1a:49:4c:74:96:89:3a:29:64:57:36:0b: + 29:80:12:19:fb:4b:45:57:ef:46:2c:d4:cf:e7:2f:a8:7d:4d: + 8c:13:5c:70:eb:ec:cc:b4:df:eb:80:dd:97:b7:aa:15:3b:6e: + 2d:26:52:96:56:fa:1d:22:07:ea:f1:03:ec:73:16:47:c0:5a: + b2:1d:68:7c:86:c2:fc:ab:89:92:0d:96:74:07:bc:07:cb:9d: + 45:82:58:83:cd:ca:be:58:6f:2d:93:6f:56:57:ef:bb:b8:74: + 67:37:6a:ea:25:2a:06:73:dd:48:00:73:76:62:60:56:fe:60: + 9e:8a:a3:c7:d0:cb:35:c7:b3:a8:d4:3b:99:0b:9a:5c:d4:61: + b2:c4:6b:a7:db:9d:8d:c5:13:3d:8c:4c:fb:52:c5:aa:1d:10: + 82:cb:20:3a:4f:2a:36:13:a6:f7:81:d8:9a:b6:6a:21:5b:52: + 48:51:39:3e:58:e3:59:e3:5f:87:b6:0c:fe:be:11:85:cd:33: + a7:01:65:10:2d:aa:4f:96:53:5e:62:3b:3f:6f:55:1b:f2:fa: + 72:73:1d:8e:d0:55:37:64:fb:42:fb:8d:46:ae:23:c7:43:6a: + c9:fd:3a:10:54:8e:19:00:75:29:ec:ee:a7:e3:ea:fb:3a:78: + 5f:e6:ac:a5:55:eb:b1:f9:0c:f2:f8:85:76:0d:be:eb:8f:42: + 97:06:81:e3:5b:74:b4:84:87:c8:24:4d:31:d5:3e:4b:76:3f: + 98:04:5b:c2:2e:f7:7a:46:b7:0d:82:84:bf:1d:a2:80:57:fe: + 36:00:43:72:d5:5d:5e:04:13:fa:4c:9f:24:99:75:95:6f:24: + 69:cd:11:60:66:69:81:cf:a8:cb:95:ed:8c:d3:f9:1a:3c:44: + 76:b3:94:05:bf:1b:be:63:a9:b0:ad:0d:b7:ee:29:bd:a0:f1: + f3:63:89:06:bf:c7:9e:17:e0:0c:50:e9:92:0b:e3:39:8d:bd: + e6:f8:86:9f:0d:ec:5c:16:78:dc:85:f9:4a:59:5f:d1:44:74: + a3:db:c9:09:de:8a:6c:d6:58:29:93:1e:3e:4c:9a:37:33:ad: + 94:75:ea:69:87:0d:08:b4 -----BEGIN CERTIFICATE----- -MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290 -IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB -IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA -Y2FjZXJ0Lm9yZzAeFw0wMzAzMzAxMjI5NDlaFw0zMzAzMjkxMjI5NDlaMHkxEDAO -BgNVBAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEi -MCAGA1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJ -ARYSc3VwcG9ydEBjYWNlcnQub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC -CgKCAgEAziLA4kZ97DYoB1CW8qAzQIxL8TtmPzHlawI229Z89vGIj053NgVBlfkJ -8BLPRoZzYLdufujAWGSuzbCtRRcMY/pnCujW0r8+55jE8Ez64AO7NV1sId6eINm6 -zWYyN3L69wj1x81YyY7nDl7qPv4coRQKFWyGhFtkZip6qUtTefWIonvuLwphK42y -fk1WpRPs6tqSnqxEQR5YYGUFZvjARL3LlPdCfgv3ZWiYUQXw8wWRBB0bF4LsyFe7 -w2t6iPGwcswlWyCR7BYCEo8y6RcYSNDHBS4CMEK4JZwFaz+qOqfrU0j36NK2B5jc -G8Y0f3/JHIJ6BVgrCFvzOKKrF11myZjXnhCLotLddJr3cQxyYN/Nb5gznZY0dj4k -epKwDpUeb+agRThHqtdB7Uq3EvbXG4OKDy7YCbZZ16oE/9KTfWgu3YtLq1i6L43q -laegw1SJpfvbi1EinbLDvhG+LJGGi5Z4rSDTii8aP8bQUWWHIbEZAWV/RRyH9XzQ -QUxPKZgh/TMfdQwEUfoZd9vUFBzugcMd9Zi3aQaRIt0AUMyBMawSB3s42mhb5ivU -fslfrejrckzzAeVLIL+aplfKkQABi6F1ITe1Yw1nPkZPcCBnzsXWWdsC4PDSy826 -YreQQejdIOQpvGQpQsgi3Hia/0PsmBsJUUtaWsJx8cTLc6nloQsCAwEAAaOCAc4w -ggHKMB0GA1UdDgQWBBQWtTIb1Mfz4OaO873SsDrusjkY0TCBowYDVR0jBIGbMIGY -gBQWtTIb1Mfz4OaO873SsDrusjkY0aF9pHsweTEQMA4GA1UEChMHUm9vdCBDQTEe -MBwGA1UECxMVaHR0cDovL3d3dy5jYWNlcnQub3JnMSIwIAYDVQQDExlDQSBDZXJ0 -IFNpZ25pbmcgQXV0aG9yaXR5MSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGNhY2Vy -dC5vcmeCAQAwDwYDVR0TAQH/BAUwAwEB/zAyBgNVHR8EKzApMCegJaAjhiFodHRw -czovL3d3dy5jYWNlcnQub3JnL3Jldm9rZS5jcmwwMAYJYIZIAYb4QgEEBCMWIWh0 -dHBzOi8vd3d3LmNhY2VydC5vcmcvcmV2b2tlLmNybDA0BglghkgBhvhCAQgEJxYl -aHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMDBWBglghkgBhvhC -AQ0ESRZHVG8gZ2V0IHlvdXIgb3duIGNlcnRpZmljYXRlIGZvciBGUkVFIGhlYWQg -b3ZlciB0byBodHRwOi8vd3d3LmNhY2VydC5vcmcwDQYJKoZIhvcNAQEEBQADggIB -ACjH7pyCArpcgBLKNQodgW+JapnM8mgPf6fhjViVPr3yBsOQWqy1YPaZQwGjiHCc -nWKdpIevZ1gNMDY75q1I08t0AoZxPuIrA2jxNGJARjtT6ij0rPtmlVOKTV39O9lg -18p5aTuxZZKmxoGCXJzN600BiqXfEVWqFcofN8CCmHBh22p8lqOOLlQ+TyGpkO/c -gr/c6EWtTZBzCDyUZbAEmXZ/4rzCahWqlwQ3JNgelE5tDlG+1sSPypZt90Pf6DBl -Jzt7u0NDY8RD97LsaMzhGY4i+5jhe1o+ATc7iwiwovOVThrLm82asduycPAtStvY -sONvRUgzEv/+PDIqVPfE94rwiCPCR/5kenHA0R6mY7AHfqQv0wGP3J8rtsYIqQ+T -SCX8Ev2fQtzzxD72V7DX3WnRBnc0CkvSyqD/HMaMyRa+xMwyN2hzXwj7UfdJUzYF -CpUCTPJ5GhD22Dp1nPMd8aINcGeGG7MW9S/lpOt5hvk9C8JzC6WZrG/8Z7jlLwum -GCSNe9FINSkYQKyTYOGWhlC0elnYjyELn8+CkcY7v2vcB5G5l1YjqrZslMZIBjzk -zk6q5PYvCdxTby78dOs6Y5nCpqyJvKeyRKANihDjbPIky/qbn3BHLt4Ui9SyIAmW -omTxJBzcoTWcFbLUvFUufQb1nA5V9FrWk9p2rSVzTMVD +MIIHpzCCBY+gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMCQVUx +GDAWBgNVBAgTD05ldyBTb3V0aCBXYWxlczEaMBgGA1UEChMRQ0FjZXJ0IFRlc3Rz +ZXJ2ZXIxITAfBgNVBAsTGGh0dHA6Ly9jYWNlcnQxLml0LXNscy5kZTEfMB0GA1UE +AxMWQ0FjZXJ0IFRlc3RzZXJ2ZXIgUm9vdDAeFw0xMTAzMjkyMDQ1MjBaFw0yMTAz +MjYyMDQ1MjBaMIGHMQswCQYDVQQGEwJBVTEYMBYGA1UECBMPTmV3IFNvdXRoIFdh +bGVzMRowGAYDVQQKExFDQWNlcnQgVGVzdHNlcnZlcjEhMB8GA1UECxMYaHR0cDov +L2NhY2VydDEuaXQtc2xzLmRlMR8wHQYDVQQDExZDQWNlcnQgVGVzdHNlcnZlciBS +b290MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA5fvQIrtzGpSbyWam +2kHfXMCXgRuTHSuQwbvkqdLAqtiI4ZQkF4jTy+7D6LVnDd3kw/hC1EAhcV79WuTn +PrrpjM1JdliOOOvb5sh9SQrdT4w1IO2JBmHrykcHCcvh7tLcm8iKA3iIIxO76SXZ +Pd7buDEQQrP8z6AXBgCRIdtS9uA5WxAmmbj2ToL8UaViijB062zVO9euOuMdN5Qk +pCVOj9tfzotJDHw3sNvP65G/C63ZJ0ysUhohncXe+e6UIPHVS+V54nBENz+4HY/d +zchFFHhnhuCSyhPfSz975IlnBSgMqhVPEYuFpAkDUSUpc8kXoe+cVVSjPBw0exUJ +X4OUjEUf3HgdPyaoeeAPbkQ2pd118vMHzTzAX7t/GzVxROkYSzFvuSljI7ivFx9Y +lPRsMW5L9TRIjxCPBLoqTNKgQQOfZiib+T4PY/ii+qU17lMZK9L9hnAMjW8L2dzx +Z6/qrhM58vKqt6Rd9bsUt109WWflKY39YenlGaCJU+0qgsUcbl2qHjgbkz8rvJJM +10BkVROvVvqnPjkSc8ZPD+1Si9pP0pztAl7vXsDM30jtL6Jv/DyTFKUljpb0tqA9 +22SyOxUu0kkKBYXY1HrqL6Ahvjeorv5aDzrUqAYTYB6Z82ykx0bG5FsAK4ShoTv1 +3ir9ejhln4JPGiyQTdMXgRaHX/kCAwEAAaOCAhowggIWMB0GA1UdDgQWBBSF1wUK +1o/yBC1e68v99mmLH04G/jCBtAYDVR0jBIGsMIGpgBSF1wUK1o/yBC1e68v99mmL +H04G/qGBjaSBijCBhzELMAkGA1UEBhMCQVUxGDAWBgNVBAgTD05ldyBTb3V0aCBX +YWxlczEaMBgGA1UEChMRQ0FjZXJ0IFRlc3RzZXJ2ZXIxITAfBgNVBAsTGGh0dHA6 +Ly9jYWNlcnQxLml0LXNscy5kZTEfMB0GA1UEAxMWQ0FjZXJ0IFRlc3RzZXJ2ZXIg +Um9vdIIBADAPBgNVHRMBAf8EBTADAQH/MF0GCCsGAQUFBwEBBFEwTzAjBggrBgEF +BQcwAYYXaHR0cDovL29jc3AuQ0FjZXJ0Lm9yZy8wKAYIKwYBBQUHMAKGHGh0dHA6 +Ly93d3cuQ0FjZXJ0Lm9yZy9jYS5jcnQwRgYDVR0gBD8wPTA7BgQrBgEFMDMwMQYI +KwYBBQUHAgEWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9yZy9pbmRleC5waHA/aWQ9MTAw +NAYJYIZIAYb4QgEIBCcWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9yZy9pbmRleC5waHA/ +aWQ9MTAwUAYJYIZIAYb4QgENBEMWQVRvIGdldCB5b3VyIG93biBjZXJ0aWZpY2F0 +ZSBmb3IgRlJFRSwgZ28gdG8gaHR0cDovL3d3dy5DQWNlcnQub3JnMA0GCSqGSIb3 +DQEBBQUAA4ICAQDQjXJDogH/NiU53JEUaw7jEF7qgp8vLjO2AXkwwpdKOWKS6lm9 +BQXiKs6HUdVYwsdST30kSvF1dD9Y9gCgFVyN662Tk2LwaPyKRq9cxlUXwqKEczfE +4yFPhYXS1giIGL8aSUx0lok6KWRXNgspgBIZ+0tFV+9GLNTP5y+ofU2ME1xw6+zM +tN/rgN2Xt6oVO24tJlKWVvodIgfq8QPscxZHwFqyHWh8hsL8q4mSDZZ0B7wHy51F +gliDzcq+WG8tk29WV++7uHRnN2rqJSoGc91IAHN2YmBW/mCeiqPH0Ms1x7Oo1DuZ +C5pc1GGyxGun252NxRM9jEz7UsWqHRCCyyA6Tyo2E6b3gdiatmohW1JIUTk+WONZ +41+Htgz+vhGFzTOnAWUQLapPllNeYjs/b1Ub8vpycx2O0FU3ZPtC+41GriPHQ2rJ +/ToQVI4ZAHUp7O6n4+r7Onhf5qylVeux+Qzy+IV2Db7rj0KXBoHjW3S0hIfIJE0x +1T5Ldj+YBFvCLvd6RrcNgoS/HaKAV/42AENy1V1eBBP6TJ8kmXWVbyRpzRFgZmmB +z6jLle2M0/kaPER2s5QFvxu+Y6mwrQ237im9oPHzY4kGv8eeF+AMUOmSC+M5jb3m ++IafDexcFnjchflKWV/RRHSj28kJ3ops1lgpkx4+TJo3M62Udepphw0ItA== -----END CERTIFICATE----- diff --git a/www/coap.html.php b/www/coap.html.php index 8c2479c..6291ea2 100644 --- a/www/coap.html.php +++ b/www/coap.html.php @@ -29,7 +29,7 @@ <body> -<style type="text/css"> +<style type="text/css"> table#TAB1 {border-color: rgb(173,197,215); border-top: solid 5px rgb(173,197,215); border-left: solid 5px rgb(173,197,215);} table#TAB1 td { border: 0 } </style> @@ -121,7 +121,7 @@ table#TAB1 td { border: 0 } <?php for ( $i = 0; $i < 2; $i++ ) { echo '<tr>', "\n", ' <td>'; - if ( $i < 1 ) { echo _("Registered Trade Names");} + if ( $i < 1 ) { echo _("Registered Trade Names");} echo '</td>', "\n"; for ( $j = 1; $j <= 3; $j++ ) { printf(" <td align=\"%s\"><input size=\"25\" maxlength=\"80\" name=\"dba%d\"></td>\n", $j > 2 ? "right" : ($j > 2 ? "center" : "left") , $i * 3 + $j); @@ -189,7 +189,7 @@ table#TAB1 td { border: 0 } <?php echo _("Make sure you have read and agreed with the CAcert Community Agreement"); ?> - (<a href="http://www.cacert.org/policy/CAcertCommunityAgreement.php">CCA</a>)</i><br></td> + (<a href="http://www.cacert.org/policy/CAcertCommunityAgreement.html">CCA</a>)</i><br></td> </tr> <tr><td colspan=2><p></td></tr> <tr> @@ -210,7 +210,7 @@ table#TAB1 td { border: 0 } <?php echo ' '. _("I agree to the CAcert Community Agreement.").' ('; ?> -<a href="http://www.cacert.org/policy/CAcertCommunityAgreement.php">CCA</a>)</dd></td> +<a href="http://www.cacert.org/policy/CAcertCommunityAgreement.html">CCA</a>)</dd></td> </tr> <tr> <td colspan="2"><input type="checkbox" checked name="checked" value="2"> @@ -281,7 +281,7 @@ table#TAB1 td { border: 0 } <tr><td colspan="2"></td><tr> </tbody> </table> -<div style="text-align: right;"><small><small><span>© +<div style="text-align: right;"><small><small><span>© <?php echo date('Y').' CAcert Inc., V2, '.date('Y-n-j'); ?> @@ -327,7 +327,7 @@ table#TAB1 td { border: 0 } 'http://svn.cacert.org/CAcert/Policies/OrganisationAssurancePolicy/OrganisationAssuranceSubPolicyEurope.html', 'Organisation Assurance Subpolicy for the United States' => 'http://svn.cacert.org/CAcert/Policies/OrganisationAssurancePolicy/OrganizationAssuranceSubPolicyUnitedStates.html', - ); + ); $cnt = 0; while( list($key, $ref) = each($policies) ) { $cnt++; @@ -338,7 +338,7 @@ table#TAB1 td { border: 0 } } if( $cnt > 0 ) { echo "</dd>\n"; - } + } echo "</dl>\n"; echo _("Submit the form").': <button type="submit" style="background-color: rgb(112, 154, 186); color: white;"> '._("generate PDF file"); echo "</button>\n"; diff --git a/www/coapnew.php b/www/coapnew.php index 4f69247..5a161b4 100644 --- a/www/coapnew.php +++ b/www/coapnew.php @@ -70,7 +70,7 @@ define('REV', '$Revision: 1.4 $'); ** On transliteration and abbreviation of a name: ** if shoes a std way show accepted conversion as pdf comment ** Orientation: on landscape (dflt) print 2-up -** PDF URL links are used to web, wiki, and faq for more info search +** PDF URL links are used to web, wiki, and faq for more info search ** Only on non-ascii chars in a name the utf8 routines are loaded ** PDF reader has wiki info url's and easy email feedback ** ENABLED: @@ -94,7 +94,7 @@ define('REV', '$Revision: 1.4 $'); ** recode(), recode_string(0 is said to have too many (japanese) defeats ** recode_string() is only used on GET[] input (html->utf-8), ** UTF-8 use routines from http://www.sourceforge.net/projects/phputf8 -** which replaces php recode() package. +** which replaces php recode() package. ** on many places own utf-8 handling code exists and is loaded (tcpdf problem) ** _() translation routine. The returned HTML string is translated to utf-8 string. ** the GET() routines expects utf-8 code (see test defs) but might be changed @@ -221,7 +221,7 @@ define('REV', '$Revision: 1.4 $'); ** Form Revision string is generated from RCS revision string. ** More info on PDF fields: ** http://www.adobe.com/devnet/acrobat/pdfs/js_developer_guide.pdf -** +** */ // use next define if you test this code @@ -281,7 +281,7 @@ if( defined( 'TEST' ) ) { // trade office information $_GET['identifier'] = "NL-238603-AA02"; $_GET['tor'] = "Kamer van Koophandel"; - $_GET['torregion'] = "Amsterdam"; + $_GET['torregion'] = "Amsterdam"; //$_GET['tordate'] = "2008-04-03"; // contact name(s) $_GET['domain1'] = "oophaga.org, oophaga.nl"; @@ -345,7 +345,7 @@ define('ARBIT', WIKI."/ArbitrationForum"); // CAcert Community Agreement define('CCA', "CAcertCommunityAgreement"); // default policy to print define('POLICY','policy/'); // default polciy doc directory -define('EXT','.php'); // default polciy doc extention, should be html +define('EXT','.html'); // default polciy doc extention, should be html /* finger print CAcert Root Key */ // should obtain this automatically define('CLASS1_SHA1','135C EC36 F49C B8E9 3B1A B270 CD80 8846 76CE 8F33'); define('CLASS3_SHA1','AD7C 3F64 FC44 39FE F4E9 0BE8 F47C 6CFA 8AAD FDCE'); @@ -427,7 +427,7 @@ class COAPPDF extends TCPDF { strtok(REV, " "); return(strtok(" ")); } - + /*public*/ function myHeader( $msg = NULL, $url = NULL ) { static $my_url = NULL; @@ -450,7 +450,7 @@ class COAPPDF extends TCPDF { $this->setXY($this->lMargin, MARGIN+3); $this->y0 = $this->getY(); } - + // undefine default header and footer handling // default routines do not handle columns function Footer() { } @@ -458,7 +458,7 @@ class COAPPDF extends TCPDF { function Mark( $string = "" ) { return array( $string, 1+substr_count($string,'.') ); } - + /*public*/ function myFooter( $msg = NULL, $url = NULL ) { static $my_url = NULL; @@ -501,7 +501,7 @@ class COAPPDF extends TCPDF { $this->StopTransform(); $this->SetXY($savex,$savey); } - + if( !empty($font_fam ) ) $this->SetFont($font_fam,$font_style,$font_size); $this->InFooter = false; @@ -519,16 +519,16 @@ class COAPPDF extends TCPDF { //number of colums /*protected*/ var $ncols=1; - + // columns width /*protected*/ var $colwidth=0; // space between columns /*protected*/ var $column_space = 0; - + //Current column /*protected*/ var $col=0; - + //Ordinate of column start /*protected*/ var $y0; @@ -570,7 +570,7 @@ class COAPPDF extends TCPDF { $this->SetDisplayMode(intval($this->scale), 'SinglePage', 'UseOC'); return( $format ); } - + //Set position at a given column /*private*/ function SetCol($col = -1) { static $pagecolwidth = 1.0; @@ -610,7 +610,7 @@ class COAPPDF extends TCPDF { $this->myFooter(); // print footer msg if defined } if( $col >= $this->ncols ) { - $this->addPage(); $col = 0; + $this->addPage(); $col = 0; $this->ScaleXY($this->scale,0,0); $this->y0 = 0; //no header/footer done... } elseif ( $col > 0 AND $col < $this->ncols) { @@ -710,7 +710,7 @@ class COAPPDF extends TCPDF { elseif( preg_match('/\./', $nm ) ) { if( $first_name < 0 ) $first_name = $j; if( $first_name >= 0 ) $success = TRUE; // was abbreviated - continue; // title + continue; // title } if( $first_name < 0 ) $first_name = $j; if( $married == 0 ) $fam = $j; @@ -732,7 +732,7 @@ class COAPPDF extends TCPDF { elseif( preg_match('/\./', $nm ) ) $name .= $nm; elseif( $j < $fam ) { // need to abbreviate // not utf8 - // and abbreviate + // and abbreviate if( $j == $first_name ) $abr = "(". $substr( $nm, 1 ) . ")"; else $abr = "."; @@ -746,7 +746,7 @@ class COAPPDF extends TCPDF { $nm = $tk[0]; if( $ext < 0 AND preg_match('/(^[^A-Z]|\.)/', $nm ) ) continue; if( $ext < 0 ) $ext = $j+1; - if( preg_match('/\./', $nm ) ) { $success = TRUE; break; } + if( preg_match('/\./', $nm ) ) { $success = TRUE; break; } } return( $success? $name : "" ); // and return abbriviated name } @@ -859,7 +859,7 @@ class COAPPDF extends TCPDF { $this->StatementOrganisation($organisation); $this->StatementAssurer( $assurer, $assurance ); } - + //Add form and/or CCA (on duplex only when more as one page is printed) /*public*/ function PrintForm( $organisation = NULL, $registry = NULL, $assurer = NULL, $page = NULL ) { @@ -1045,7 +1045,7 @@ class COAPPDF extends TCPDF { $this->Line($this->lMargin,$tSide+$height,$this->lMargin+$this->colwidth,$tSide+$height); $this->Line($this->lMargin+$this->colwidth,$tSide-1, $this->lMargin+$this->colwidth, $tSide+$height); $this->SetDrawColor(0); - $this->SetY($tSide + $height + 1); // set Y ordinate to plus 7 + $this->SetY($tSide + $height + 1); // set Y ordinate to plus 7 $tSide = -1; $title = ""; return($this->GetY()); } @@ -1078,7 +1078,7 @@ class COAPPDF extends TCPDF { if ( BW ) { $this->SetFillColor(241); } else { - //$this->SetFillColor(173,197,215); + //$this->SetFillColor(173,197,215); $this->SetFillColor(234, 241, 246); } $this->Rect($this->lMargin+37.5,$this->GetY()+0.1, @@ -1141,7 +1141,7 @@ class COAPPDF extends TCPDF { if( $phone ) { $TextProps['value'] = $phone ? $phone : $this->unhtmlentities( _('phone nr') ) . "?"; $TextProps['userName'] = $this->unhtmlentities( _('For organisation administrators and assurer: provide email address and optionally your phone number.') ); - $this->TextField($field.'Phone', $this->SetFieldXY($this->lMargin+$this->colwidth-25, $savey, 24), 4.5, $TextProps ); + $this->TextField($field.'Phone', $this->SetFieldXY($this->lMargin+$this->colwidth-25, $savey, 24), 4.5, $TextProps ); $this->SetFieldXY(); } $savey += 3; @@ -1156,7 +1156,7 @@ class COAPPDF extends TCPDF { if( $email ) { $TextProps['value'] = $email ? $email : $this->unhtmlentities( _('email') ) . "?"; $TextProps['userName'] = $this->unhtmlentities( _('For organisation administrators and assurer: provide email address and optionally your phone number.') ); - $this->TextField($field.'Email', $this->SetFieldXY($this->lMargin+2+$l, $savey, $this->colwidth-$l-28), 4.5, $TextProps); + $this->TextField($field.'Email', $this->SetFieldXY($this->lMargin+2+$l, $savey, $this->colwidth-$l-28), 4.5, $TextProps); $this->SetFieldXY(); $savey += 3; } // phone number @@ -1166,7 +1166,7 @@ class COAPPDF extends TCPDF { } // All information of Applicant goes in one table -/*public*/ function InfoOrganisation( $organisation = NULL, $registry = NULL ){ +/*public*/ function InfoOrganisation( $organisation = NULL, $registry = NULL ){ // Applicant Identity information part $tSide = $this->PrintTable($this->unhtmlentities( _('Organisation Identity Information') ))+1; @@ -1220,7 +1220,7 @@ class COAPPDF extends TCPDF { $strg, NULL, NULL, true); $this->Ln(0.4); - $strg = ""; foreach( $organisation['domains'] as $i ) + $strg = ""; foreach( $organisation['domains'] as $i ) $strg .= ($strg != "" ? ", " : "") . $i; $this->PrintName( $this->unhtmlentities( _('The internet domain name(s) the organisation controls and owns. The names will be checked with WHOIS with e.g. the DNS official top domain registrar e.g. the country ccTLD .<country code> registrar.') ), @@ -1233,7 +1233,7 @@ class COAPPDF extends TCPDF { // contact info o-admin address assuree $cnt = $organisation['admincnt']; $space = $this->getPageHeight()/$this->scale*100.0 -MINH ; // margin - for( $i = 0; $i < $cnt; $i++ ) { // names to be printed + for( $i = 0; $i < $cnt; $i++ ) { // names to be printed $this->PrintName( $this->unhtmlentities( _('The organisation administrator (CAcert Assurer) contact information. The administrator is appointed by the organisation director to administer the organisation domain certificates, secure the certificates and maintain them.') ), $this->unhtmlentities( _('Organisation Administrator') ), @@ -1400,7 +1400,7 @@ class COAPPDF extends TCPDF { // get $form, $orientation, $assuree, $assurer, $assurance info // FONT and BW are set already -// import info +// import info $utf8 = false; function GET( $key = "" ) { global $utf8; @@ -1457,7 +1457,7 @@ $registry = array ( $organisation = array ( 'names' => array( ), // [0] full name, [>0] DBA's 'namecnt' => 0, - 'date' => my_recode(GET('date')) == "now" ? date("Y-m-d") : + 'date' => my_recode(GET('date')) == "now" ? date("Y-m-d") : my_recode(GET('date')), 'address' => my_recode(GET('address')), 'state' => my_recode(GET('state')), @@ -1507,7 +1507,7 @@ for( $i = 0; $i <= 25 AND $j < 2; $i++ ) { if( $domains != "" ) $domains .= ","; $domains .= strtolower($name); } else $j ++; -} +} $i = 0; if( $domains ) { // csv list to array and trim white spaces $domains = strtok($domains,','); @@ -1547,7 +1547,7 @@ unset( $i ); unset( $j); unset( $utf8 ); // unset($_GET); PDF_UNIT /* mm */, /* PDF_PAGE_FORMAT */ $page['format'], true - ); + ); $pdf->SetFormat( $page['format'] ); // set paper size scaling // protection is encryption and this will cause 3.5 times performance loss @@ -1570,10 +1570,10 @@ unset( $i ); unset( $j); unset( $utf8 ); // unset($_GET); $pdf->SetAutoPageBreak(TRUE, MARGIN*0.707); //set image scale factor - $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO); + $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO); //set some language-dependent strings - $pdf->setLanguageArray($l); + $pdf->setLanguageArray($l); //initialize document $pdf->AliasNbPages(); @@ -1589,6 +1589,6 @@ unset( $i ); unset( $j); unset( $utf8 ); // unset($_GET); $pdf->Output("CAcert COAP.pdf", "I"); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ ?> diff --git a/www/disputes.php b/www/disputes.php index 34a447a..eab3d68 100644 --- a/www/disputes.php +++ b/www/disputes.php @@ -17,6 +17,7 @@ */ ?> <? require_once("../includes/loggedin.php"); + require_once("../includes/lib/l10n.php"); require_once("../includes/notary.inc.php"); loadem("account"); @@ -27,7 +28,7 @@ if($type == "reallyemail") { $emailid = intval($_SESSION['_config']['emailid']); - $hash = mysql_escape_string(trim($_SESSION['_config']['hash'])); + $hash = mysql_real_escape_string(trim($_SESSION['_config']['hash'])); $res = mysql_query("select * from `disputeemail` where `id`='$emailid' and `hash`='$hash'"); if(mysql_num_rows($res) <= 0) @@ -80,7 +81,7 @@ if($type == "email") { $emailid = intval($_REQUEST['emailid']); - $hash = trim(mysql_escape_string(stripslashes($_REQUEST['hash']))); + $hash = trim(mysql_real_escape_string(stripslashes($_REQUEST['hash']))); if($emailid <= 0 || $hash == "") { showheader(_("Email Dispute")); @@ -126,7 +127,7 @@ if($type == "reallydomain") { $domainid = intval($_SESSION['_config']['domainid']); - $hash = mysql_escape_string(trim($_SESSION['_config']['hash'])); + $hash = mysql_real_escape_string(trim($_SESSION['_config']['hash'])); $res = mysql_query("select * from `disputedomain` where `id`='$domainid' and `hash`='$hash'"); if(mysql_num_rows($res) <= 0) @@ -167,7 +168,7 @@ if($type == "domain") { $domainid = intval($_REQUEST['domainid']); - $hash = trim(mysql_escape_string(stripslashes($_REQUEST['hash']))); + $hash = trim(mysql_real_escape_string(stripslashes($_REQUEST['hash']))); if($domainid <= 0 || $hash == "") { showheader(_("Domain Dispute")); @@ -213,7 +214,7 @@ if($oldid == "1") { csrf_check('emaildispute'); - $email = trim(mysql_escape_string(stripslashes($_REQUEST['dispute']))); + $email = trim(mysql_real_escape_string(stripslashes($_REQUEST['dispute']))); if($email == "") { showheader(_("Email Dispute")); @@ -287,11 +288,15 @@ `IP`='".$_SERVER['REMOTE_ADDR']."'"; mysql_query($query); + $my_translation = L10n::get_translation(); + L10n::set_recipient_language($oldmemid); + $body = sprintf(_("You have been sent this email as the email address '%s' is being disputed. You have the option to accept or reject this request, after 2 days the request will automatically be discarded. Click the following link to accept or reject the dispute:"), $email)."\n\n"; $body .= "https://".$_SESSION['_config']['normalhostname']."/disputes.php?type=email&emailid=$emailid&hash=$hash\n\n"; $body .= _("Best regards")."\n"._("CAcert.org Support!"); sendmail($email, "[CAcert.org] "._("Dispute Probe"), $body, "support@cacert.org", "", "", "CAcert Support"); + L10n::set_translation($my_translation); showheader(_("Email Dispute")); printf(_("The email address '%s' has been entered into the dispute system, the email address will now be sent an email which will give the recipent the option of accepting or rejecting the request, if after 2 days we haven't received a valid response for or against we will discard the request."), sanitizeHTML($email)); @@ -302,7 +307,7 @@ if($oldid == "2") { csrf_check('domaindispute'); - $domain = trim(mysql_escape_string(stripslashes($_REQUEST['dispute']))); + $domain = trim(mysql_real_escape_string(stripslashes($_REQUEST['dispute']))); if($domain == "") { showheader(_("Domain Dispute")); @@ -384,7 +389,7 @@ $bits = explode(":", $line, 2); $line = trim($bits[1]); if(!in_array($line, $addy) && $line != "") - $addy[] = trim(mysql_escape_string(stripslashes($line))); + $addy[] = trim(mysql_real_escape_string(stripslashes($line))); } } else { if(is_array($adds)) @@ -401,7 +406,7 @@ $line = $bit; } if(!in_array($line, $addy) && $line != "") - $addy[] = trim(mysql_escape_string(stripslashes($line))); + $addy[] = trim(mysql_real_escape_string(stripslashes($line))); } } @@ -418,7 +423,7 @@ if($oldid == "5") { - $authaddy = trim(mysql_escape_string(stripslashes($_REQUEST['authaddy']))); + $authaddy = trim(mysql_real_escape_string(stripslashes($_REQUEST['authaddy']))); if(!in_array($authaddy, $_SESSION['_config']['addy']) || $authaddy == "") { @@ -441,16 +446,19 @@ $domainid = intval($_SESSION['_config']['domainid']); $memid = intval($_SESSION['_config']['memid']); $oldmemid = intval($_SESSION['_config']['oldmemid']); - $domain = mysql_escape_string($_SESSION['_config']['domain']); + $domain = mysql_real_escape_string($_SESSION['_config']['domain']); $hash = make_hash(); $query = "insert into `disputedomain` set `domain`='$domain',`memid`='".$_SESSION['profile']['id']."', `oldmemid`='$oldmemid',`created`=NOW(),`hash`='$hash',`id`='$domainid'"; mysql_query($query); + $my_translation = L10n::get_translation(); + L10n::set_recipient_language($oldmemid); $body = sprintf(_("You have been sent this email as the domain '%s' is being disputed. You have the option to accept or reject this request, after 2 days the request will automatically be discarded. Click the following link to accept or reject the dispute:"), $domain)."\n\n"; $body .= "https://".$_SESSION['_config']['normalhostname']."/disputes.php?type=domain&domainid=$domainid&hash=$hash\n\n"; $body .= _("Best regards")."\n"._("CAcert.org Support!"); + L10n::set_recipient_language($my_translation); sendmail($authaddy, "[CAcert.org] "._("Dispute Probe"), $body, "support@cacert.org", "", "", "CAcert Support"); diff --git a/www/images/cacert4.png b/www/images/cacert4.png Binary files differindex e4650a0..9da24c2 100644 --- a/www/images/cacert4.png +++ b/www/images/cacert4.png diff --git a/www/index.php b/www/index.php index c7cc03e..45d9a11 100644 --- a/www/index.php +++ b/www/index.php @@ -17,7 +17,7 @@ */ require_once('../includes/lib/l10n.php'); - +require_once('../includes/notary.inc.php'); $id = 0; if(array_key_exists("id",$_REQUEST)) $id=intval($_REQUEST['id']); $oldid = 0; if(array_key_exists("oldid",$_REQUEST)) $oldid=intval($_REQUEST['oldid']); @@ -53,7 +53,7 @@ require_once('../includes/lib/l10n.php'); $oldid = 0; if(array_key_exists('Q1',$_REQUEST) && $_REQUEST['Q1']) { - $_SESSION['lostpw']['A1'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['A1'])))); + $_SESSION['lostpw']['A1'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['A1'])))); if(stripslashes(strtolower($_SESSION['lostpw']['A1'])) == strtolower($_SESSION['lostpw']['user']['A1'])) $answers++; @@ -61,7 +61,7 @@ require_once('../includes/lib/l10n.php'); } if(array_key_exists('Q2',$_REQUEST) && $_REQUEST['Q2']) { - $_SESSION['lostpw']['A2'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['A2'])))); + $_SESSION['lostpw']['A2'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['A2'])))); if(stripslashes(strtolower($_SESSION['lostpw']['A2'])) == strtolower($_SESSION['lostpw']['user']['A2'])) $answers++; @@ -69,7 +69,7 @@ require_once('../includes/lib/l10n.php'); } if(array_key_exists('Q3',$_REQUEST) && $_REQUEST['Q3']) { - $_SESSION['lostpw']['A3'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['A3'])))); + $_SESSION['lostpw']['A3'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['A3'])))); if(stripslashes(strtolower($_SESSION['lostpw']['A3'])) == strtolower($_SESSION['lostpw']['user']['A3'])) $answers++; @@ -77,7 +77,7 @@ require_once('../includes/lib/l10n.php'); } if(array_key_exists('Q4',$_REQUEST) && $_REQUEST['Q4']) { - $_SESSION['lostpw']['A4'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['A4'])))); + $_SESSION['lostpw']['A4'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['A4'])))); if(stripslashes(strtolower($_SESSION['lostpw']['A4'])) == strtolower($_SESSION['lostpw']['user']['A4'])) $answers++; @@ -85,15 +85,15 @@ require_once('../includes/lib/l10n.php'); } if(array_key_exists('Q5',$_REQUEST) && $_REQUEST['Q5']) { - $_SESSION['lostpw']['A5'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['A5'])))); + $_SESSION['lostpw']['A5'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['A5'])))); if(stripslashes(strtolower($_SESSION['lostpw']['A5'])) == strtolower($_SESSION['lostpw']['user']['A5'])) $answers++; $body .= "System: ".$_SESSION['lostpw']['user']['A5']."\nEntered: ".stripslashes(strip_tags($_SESSION['lostpw']['A5']))."\n"; } - $_SESSION['lostpw']['pw1'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['newpass1'])))); - $_SESSION['lostpw']['pw2'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['newpass2'])))); + $_SESSION['lostpw']['pw1'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['newpass1'])))); + $_SESSION['lostpw']['pw2'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['newpass2'])))); if($answers < $_SESSION['lostpw']['total'] || $answers < 3) { @@ -125,12 +125,12 @@ require_once('../includes/lib/l10n.php'); showfooter(); exit; } - } + } } if($oldid == 5 && $process != "") { - $email = $_SESSION['lostpw']['email'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['email'])))); + $email = $_SESSION['lostpw']['email'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['email'])))); $_SESSION['lostpw']['day'] = intval($_REQUEST['day']); $_SESSION['lostpw']['month'] = intval($_REQUEST['month']); $_SESSION['lostpw']['year'] = intval($_REQUEST['year']); @@ -148,18 +148,19 @@ require_once('../includes/lib/l10n.php'); } } + //client login if($id == 4 && $_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname']) { include_once("../includes/lib/general.php"); $user_id = get_user_id_from_cert($_SERVER['SSL_CLIENT_M_SERIAL'], $_SERVER['SSL_CLIENT_I_DN_CN']); - + if($user_id >= 0) { $_SESSION['profile'] = mysql_fetch_assoc(mysql_query( - "select * from `users` where + "select * from `users` where `id`='$user_id' and `deleted`=0 and `locked`=0")); - + if($_SESSION['profile']['id'] != 0) { $_SESSION['profile']['loggedin'] = 1; @@ -171,6 +172,7 @@ require_once('../includes/lib/l10n.php'); } } + if($id == 4 && array_key_exists('profile',$_SESSION) && array_key_exists('loggedin',array($_SESSION['profile'])) && $_SESSION['profile']['loggedin'] == 1) { header("location: https://".$_SERVER['HTTP_HOST']."/account.php"); @@ -251,8 +253,8 @@ require_once('../includes/lib/l10n.php'); $_SESSION['_config']['errmsg'] = ""; - $email = mysql_escape_string(stripslashes(strip_tags(trim($_REQUEST['email'])))); - $pword = mysql_escape_string(stripslashes(trim($_REQUEST['pword']))); + $email = mysql_real_escape_string(stripslashes(strip_tags(trim($_REQUEST['email'])))); + $pword = mysql_real_escape_string(stripslashes(trim($_REQUEST['pword']))); $query = "select * from `users` where `email`='$email' and (`password`=old_password('$pword') or `password`=sha1('$pword') or `password`=password('$pword')) and `verified`=1 and `deleted`=0 and `locked`=0"; $res = mysql_query($query); @@ -319,7 +321,7 @@ require_once('../includes/lib/l10n.php'); L10n::set_translation($_SESSION['profile']['language']); L10n::init_gettext(); } - $query = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['profile']['id']."' group by `to`"; + $query = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['profile']['id']."' and `deleted`=0 group by `to`"; $res = mysql_query($query); $row = mysql_fetch_assoc($res); $_SESSION['profile']['points'] = $row['total']; @@ -331,12 +333,16 @@ require_once('../includes/lib/l10n.php'); $_SESSION['_config']['errmsg'] .= _("For your own security you must enter 5 lost password questions and answers.")."<br>"; $_SESSION['_config']['oldlocation'] = "account.php?id=13"; } + if (!isset($_SESSION['_config']['oldlocation'])){ + $_SESSION['_config']['oldlocation']=''; + } if (checkpwlight($pword) < 3) $_SESSION['_config']['oldlocation'] = "account.php?id=14&force=1"; - if($_SESSION['_config']['oldlocation'] != "") + if($_SESSION['_config']['oldlocation'] != ""){ header("location: https://".$_SERVER['HTTP_HOST']."/".$_SESSION['_config']['oldlocation']); - else + }else{ header("location: https://".$_SERVER['HTTP_HOST']."/account.php"); + } exit; } @@ -351,6 +357,40 @@ require_once('../includes/lib/l10n.php'); } } +// check for CCA acceptance prior to login +if ($oldid == 52 ) +{ + // Check if the user is already authenticated + if (!array_key_exists('profile',$_SESSION) + || !array_key_exists('loggedin',$_SESSION['profile']) + || $_SESSION['profile']['loggedin'] != 1) + { + header("Location: https://{$_SERVER['HTTP_HOST']}/index.php?id=4"); + exit; + } + + if (array_key_exists('agree',$_REQUEST) && $_REQUEST['agree'] != "") + { + write_user_agreement($_SESSION['profile']['id'], "CCA", "Login acception", "", 1); + $_SESSION['profile']['ccaagreement']=get_user_agreement_status($_SESSION['profile']['id'],'CCA'); + + if (array_key_exists("oldlocation",$_SESSION['_config']) + && $_SESSION['_config']['oldlocation']!="") + { + header("Location: https://{$_SERVER['HTTP_HOST']}/{$_SESSION['_config']['oldlocation']}"); + exit; + } else { + header("Location: https://{$_SERVER['HTTP_HOST']}/account.php"); + exit; + } + } + + // User didn't agree + header("Location: https://{$_SERVER['HTTP_HOST']}/index.php?id=4"); + exit; +} + + if($process && $oldid == 1) { $id = 2; @@ -358,26 +398,26 @@ require_once('../includes/lib/l10n.php'); $_SESSION['_config']['errmsg'] = ""; - $_SESSION['signup']['email'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['email'])))); - $_SESSION['signup']['fname'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['fname'])))); - $_SESSION['signup']['mname'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['mname'])))); - $_SESSION['signup']['lname'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['lname'])))); - $_SESSION['signup']['suffix'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['suffix'])))); + $_SESSION['signup']['email'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['email'])))); + $_SESSION['signup']['fname'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['fname'])))); + $_SESSION['signup']['mname'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['mname'])))); + $_SESSION['signup']['lname'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['lname'])))); + $_SESSION['signup']['suffix'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['suffix'])))); $_SESSION['signup']['day'] = intval($_REQUEST['day']); $_SESSION['signup']['month'] = intval($_REQUEST['month']); $_SESSION['signup']['year'] = intval($_REQUEST['year']); - $_SESSION['signup']['pword1'] = trim(mysql_escape_string(stripslashes($_REQUEST['pword1']))); - $_SESSION['signup']['pword2'] = trim(mysql_escape_string(stripslashes($_REQUEST['pword2']))); - $_SESSION['signup']['Q1'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['Q1'])))); - $_SESSION['signup']['Q2'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['Q2'])))); - $_SESSION['signup']['Q3'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['Q3'])))); - $_SESSION['signup']['Q4'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['Q4'])))); - $_SESSION['signup']['Q5'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['Q5'])))); - $_SESSION['signup']['A1'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['A1'])))); - $_SESSION['signup']['A2'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['A2'])))); - $_SESSION['signup']['A3'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['A3'])))); - $_SESSION['signup']['A4'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['A4'])))); - $_SESSION['signup']['A5'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['A5'])))); + $_SESSION['signup']['pword1'] = trim(mysql_real_escape_string(stripslashes($_REQUEST['pword1']))); + $_SESSION['signup']['pword2'] = trim(mysql_real_escape_string(stripslashes($_REQUEST['pword2']))); + $_SESSION['signup']['Q1'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['Q1'])))); + $_SESSION['signup']['Q2'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['Q2'])))); + $_SESSION['signup']['Q3'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['Q3'])))); + $_SESSION['signup']['Q4'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['Q4'])))); + $_SESSION['signup']['Q5'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['Q5'])))); + $_SESSION['signup']['A1'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['A1'])))); + $_SESSION['signup']['A2'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['A2'])))); + $_SESSION['signup']['A3'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['A3'])))); + $_SESSION['signup']['A4'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['A4'])))); + $_SESSION['signup']['A5'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['A5'])))); $_SESSION['signup']['general'] = intval(array_key_exists('general',$_REQUEST)?$_REQUEST['general']:0); $_SESSION['signup']['country'] = intval(array_key_exists('country',$_REQUEST)?$_REQUEST['country']:0); $_SESSION['signup']['regional'] = intval(array_key_exists('regional',$_REQUEST)?$_REQUEST['regional']:0); @@ -466,7 +506,7 @@ require_once('../includes/lib/l10n.php'); if($score < 3) { $id = 1; - $_SESSION['_config']['errmsg'] = _("The Pass Phrase you submitted failed to contain enough differing characters and/or contained words from your name and/or email address. Only scored $score points out of 6."); + $_SESSION['_config']['errmsg'] = sprintf(_("The Pass Phrase you submitted failed to contain enough differing characters and/or contained words from your name and/or email address. Only scored %s points out of 6."), $score); } if($id == 2) @@ -499,7 +539,7 @@ require_once('../includes/lib/l10n.php'); if($checkemail != "OK") { $id = 1; - if (substr($checkemail, 0, 1) == "4") + if (substr($checkemail, 0, 1) == "4") { $_SESSION['_config']['errmsg'] .= _("The mail server responsible for your domain indicated a temporary failure. This may be due to anti-SPAM measures, such as greylisting. Please try again in a few minutes."); } else { @@ -545,7 +585,6 @@ require_once('../includes/lib/l10n.php'); `regional`='".$_SESSION['signup']['regional']."', `radius`='".$_SESSION['signup']['radius']."'"; mysql_query($query); - include_once("../includes/notary.inc.php"); write_user_agreement($memid, "CCA", "account creation", "", 1); $body = _("Thanks for signing up with CAcert.org, below is the link you need to open to verify your account. Once your account is verified you will be able to start issuing certificates till your hearts' content!")."\n\n"; @@ -566,9 +605,9 @@ require_once('../includes/lib/l10n.php'); $subject = stripslashes($_REQUEST['subject']); $message = stripslashes($_REQUEST['message']); $secrethash = $_REQUEST['secrethash2']; - + //check for spam via honeypot - if(!isset($_REQUEST['robotest']) || !empty($_REQUEST['robotest'])){ + if(!isset($_REQUEST['robotest']) || !empty($_REQUEST['robotest'])){ echo _("Form could not be sent."); showfooter(); exit; @@ -641,7 +680,7 @@ require_once('../includes/lib/l10n.php'); $newUrl = $protocol . '://wiki.cacert.org/FAQ/AboutUs'; header('Location: '.$newUrl, true, 301); // 301 = Permanently Moved } - + if ($id == 19) { $protocol = $_SERVER['HTTPS'] ? 'https' : 'http'; @@ -655,7 +694,8 @@ require_once('../includes/lib/l10n.php'); $newUrl = $protocol . '://wiki.cacert.org/Board'; header('Location: '.$newUrl, true, 301); // 301 = Permanently Moved } - + + showheader(_("Welcome to CAcert.org")); includeit($id); showfooter(); diff --git a/www/policy/AssurancePolicy.html b/www/policy/AssurancePolicy.html new file mode 100644 index 0000000..ef72454 --- /dev/null +++ b/www/policy/AssurancePolicy.html @@ -0,0 +1,750 @@ +<!DOCTYPE html> +<html><head> + <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8"> +<title>Assurance Policy</title> + +<!--meta name="CREATED" content="20080530;0" --> +<!--meta name="CHANGEDBY" content="Teus Hagen" --> +<!--meta name="CHANGED" content="20080709;12381800" --> +<!--meta name="CREATEDBY" content="Ian Grigg" --> +<!--meta name="CHANGEDBY" content="Teus Hagen" --> +<!--meta name="CHANGEDBY" content="Robert Cruikshank" --> +<!--meta name="CHANGEDBY" content="Teus Hagen" --> +<style type="text/css"> + +P { color: #000000 } +TD P { color: #000000 } +H1 { color: #000000 } +H2 { color: #000000 } +DT { color: #000000; font-style: italic; } +DD { color: #000000 } +H3 { color: #000000 } +TH P { color: #000000 } +.r{ text-align: right; } +.l{ text-align: left; } +.c{ text-align : center; } +.vTop{ vertical-align: top; } +.size075{font-size: .75em;} +.size1{font-size: 1.1em;} +.size2{font-size: 1.5em;} +.size3{font-size: 2em;} +.parentC {margin-left:auto; margin-right:auto;} +.padding5 td{padding: 5px;} +.padding2 td{padding: 2px;} +.margin0 {margin: 0px;} + +</style></head> +<body style="direction: ltr; color: rgb(0, 0, 0);" lang="en-GB"> + +<div class="comment"> +<table style="width: 100%;"> + +<tr> +<td> + Name: AP <a style="color: steelblue" href="https://svn.cacert.org/CAcert/Policies/ControlledDocumentList.html">COD13</a><br> + Status: POLICY <a style="color: steelblue" href="https://wiki.cacert.org/PolicyDecisions#p20090105.2">p20090105.2</a><br> +Editor: <a style="color: steelblue" href="https://wiki.cacert.org/TeusHagen">Teus Hagen</a><br> +Creation date: 2008-05-30<br> +Last change by: Iang<br> +Last change date: 2009-01-08<br> + Licence: <a style="color: steelblue" href="https://wiki.cacert.org/Policy#Licence" title="this document is Copyright © CAcert Inc., licensed openly under CC-by-sa with all disputes resolved under DRP. More at wiki.cacert.org/Policy" > CC-by-sa+DRP </a><br> + +</td> +<td class="r vTop"> + <a href="https://www.cacert.org/policy/PolicyOnPolicy.html"><img src="images/cacert-policy.png" alt="AP Status - POLICY" height="31" width="88" style="border-style: none;"></a> + +</td> +</tr> +</table> +</div> + + +<h1>Assurance Policy for CAcert Community Members</h1> + +<h2 id="s0">0. Preamble</h2> +<h3 id="s0.1">0.1. Definition of Terms</h3> +<dl> +<dt>Member</dt> +<dd> A Member is an individual who has agreed to the CAcert +Community Agreement +(<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html" target="_blank">CCA</a>) +and has created successfully +a CAcert login account on the CAcert web site. </dd> +<dt>Assurance</dt> +<dd> Assurance is the process by which a Member of CAcert +Community (Assurer) identifies an individual (<span lang="en-US">Assuree</span>). +</dd> +<dt>Prospective Member</dt> +<dd> An individual who participates in the process of Assurance, +but has not yet created a CAcert login account. </dd> +<dt>Name</dt> +<dd> A Name is the full name of an individual. +</dd> +<dt>Secondary Distinguishing Feature</dt> +<dd> An additional personal data item of the Member +that assists discrimination from Members with similar full names. +(Currently this is the Date of Birth (DoB).) +</dd> +</dl> + +<h3 id="s0.2">0.2. The CAcert Web of Trust</h3> +<p> +In face-to-face meetings, +an Assurer allocates a number of Assurance Points +to the Member being Assured. +CAcert combines the Assurance Points +into a global <i>Web-of-Trust</i> (or "WoT"). +</p> +<p> +CAcert explicitly chooses to meet its various goals by +construction of a Web-of-Trust of all Members. +</p> + +<h3 id="s0.3">0.3. Related Documentation</h3> +<p> +Documentation on Assurance is split between this +Assurance Policy (AP) and the +<a href="https://wiki.cacert.org/AssuranceHandbook2" target="_blank">Assurance +Handbook</a>. The policy is controlled by Configuration Control +Specification +(<a href="https://svn.cacert.org/CAcert/Policies/ConfigurationControlSpecification.html" target="_blank">CCS</a>) +under Policy on Policy +(<a href="https://www.cacert.org/policy/PolicyOnPolicy.html" target="_blank">PoP</a>) +policy document regime. Because Assurance is an active area, much +of the practice is handed over to the Assurance Handbook, which is +not a controlled policy document, and can more easily respond to +experience and circumstances. It is also more readable. +</p> +<p> +See also Organisation Assurance Policy (<a href="https://www.cacert.org/policy/OrganisationAssurancePolicy.html" target="_blank">OAP</a>) +and CAcert Policy Statement (<a href="https://www.cacert.org/policy/CertificationPracticeStatement.html" target="_blank">CPS</a>). +</p> + +<h2 id="s1">1. Assurance Purpose</h2> +<p>The purpose of Assurance is to add confidence +in the Assurance Statement made by the CAcert Community of a Member. </p> +<p>With sufficient assurances, a Member may: (a) issue certificates +with their assured Name included, (b) participate in assuring others, +and (c) other related activities. The strength of these activities is +based on the strength of the assurance. </p> + +<h3 id="s1.1">1.1. The Assurance Statement</h3> +<p> +The Assurance Statement makes the following claims +about a person: +</p> +<ol> +<li> +<p>The person is a bona fide Member. In other words, the +person is a member of the CAcert Community as defined by the CAcert +Community Agreement (<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html" target="_blank">CCA</a>); </p> +</li> +<li> +<p>The Member has a (login) account with CAcert's on-line +registration and service system; </p> +</li> +<li> +<p>The Member can be determined from any CAcert certificate +issued by the Account; </p> +</li> +<li> +<p>The Member is bound into CAcert's Arbitration as defined +by the CAcert Community Agreement; </p> +</li> +<li> +<p>Some personal details of the Member are known to CAcert: +the individual Name(s), primary and other listed individual email +address(es), secondary distinguishing feature (e.g. DoB). </p> +</li> +</ol> +<p>The confidence level of the Assurance Statement is expressed by +the Assurance Points. </p> +<h3 id="s1.2">1.2. Relying Party Statement</h3> +<p>The primary goal of the Assurance Statement is for the express +purpose of certificates to meet the needs of the <em>Relying Party +Statement</em>, which latter is found in the Certification Practice +Statement (<a href="https://www.cacert.org/policy/CertificationPracticeStatement.html" target="_blank">CPS</a>). +</p> +<p>When a certificate is issued, some of the Assurance Statement may +be incorporated, e.g. Name. Other parts may be implied, e.g. +Membership, exact account and status. They all are part of the +<em>Relying Party Statement</em>. In short, this means that other +Members of the Community may rely on the information verified by +Assurance and found in the certificate.</p> +<p>In particular, certificates are sometimes considered to provide +reliable indications of e.g. the Member's Name and email address. The +nature of Assurance, the number of Assurance Points, and other +policies and processes should be understood as limitations on any +reliance. </p> +<h2 id="s2">2. The Member</h2> +<h3 id="s2.1">2.1. The Member's Name </h3> +<p> +At least one individual Name is recorded in the Member's +CAcert login account. The general standard of a Name is: +</p> +<ul> +<li> +<p> +The Name should be recorded as written in a +government-issued photo identity document (ID). +</p> +</li> +<li> +<p> +The Name should be recorded as completely as possible. +That is, including all middle names, any titles and extensions, +without abbreviations, and without transliteration of characters. +</p> +</li> +<li> +<p>The Name is recorded as a string of characters, +encoded in unicode +transformation format.</p> +</li> +</ul> +<h3 id="s2.2">2.2. Multiple Names and variations</h3> +<p> +In order to handle the contradictions in the above general standard, +a Member may record multiple Names or multiple variations of a Name +in her CAcert online Account. +Examples of variations include married names, +variations of initials of first or middle names, +abbreviations of a first name, +different language or country variations, +and transliterations of characters in a name. +</p> + +<h3 id="s2.3">2.3. Status and Capabilities</h3> +<p> +A Name which has reached +the level of 50 Assurance Points is defined as an Assured +Name. An Assured Name can be used in a certificate issued by CAcert. +A Member with at least one Assured Name has reached the Assured +Member status. +Additional capabilities are described in Table 1. +</p> + +<blockquote> +<p class="l size075"><em>Table 1: +Assurance Capability</em></p> +<table class="padding5 margin0" border="1"> +<tbody> +<tr> +<td style="width: 10%;"> +<p class="l"><em>Minimum Assurance Points</em></p> +</td> +<td style="width: 15%;"> +<p class="l"><em>Capability</em></p> +</td> +<td style="width: 15%;"> +<p class="l"><em>Status</em></p> +</td> +<td style="width: 60%;"> +<p class="l"><em>Comment</em></p> +</td> +</tr> +<tr class="vTop"> +<td> +<p class="c">0</p> +</td> +<td> +<p class="l">Request Assurance</p> +</td> +<td> +<p class="l">Prospective Member</p> +</td> +<td> +<p class="l">Individual taking part of an +Assurance, who does not have created a CAcert login account (yet). The +allocation of Assurance Points is awaiting login account creation.</p> +</td> +</tr> +<tr class="vTop"> +<td> +<p class="c">0</p> +</td> +<td> +<p class="l">Request unnamed certificates</p> +</td> +<td> +<p class="l">Member</p> +</td> +<td> +<p class="l">Although the Member's details are +recorded in the account, they are not highly assured.</p> +</td> +</tr> +<tr class="vTop"> +<td> +<p class="c">50</p> +</td> +<td> +<p class="l">Request named certificates</p> +</td> +<td> +<p class="l">Assured Member</p> +</td> +<td> +<p class="l">Statements of Assurance: the Name is +assured to 50 Assurance Points or more</p> +</td> +</tr> +<tr class="vTop"> +<td> +<p class="c">100</p> +</td> +<td> +<p class="l">Become an Assurer</p> +</td> +<td> +<p class="l">Prospective Assurer</p> +</td> +<td> +<p class="l">Assured to 100 Assurance Points (or +more) on at least one Name, and passing the Assurer Challenge.</p> +</td> +</tr> +</tbody> +</table> +</blockquote> + + +<p> +A Member may check the status of another Member, especially +for an assurance process. +Status may be implied from information in a certificate. +The number of Assurance Points for each Member is not published. +</p> + +<p> +The CAcert Policy Statement +(<a href="https://www.cacert.org/policy/CertificationPracticeStatement.html" target="_blank">CPS</a>) +and other policies may list other capabilities that rely on Assurance +Points. +</p> + +<h2 id="s3">3. The Assurer</h2> +<p>An Assurer is a Member with the following: </p> +<ul> +<li> +<p>Is assured to a minimum of 100 Assurance Points; </p> +</li> +<li> +<p>Has passed the CAcert Assurer Challenge. </p> +</li> +</ul> +<p>The Assurer Challenge is administered by the Education Team on +behalf of the Assurance Officer. </p> +<h3 id="s3.1">3.1. The Obligations of the Assurer</h3> +<p>The Assurer is obliged to: </p> +<ul> +<li> +<p>Follow this Assurance Policy; </p> +</li> +<li> +<p>Follow any additional rules of detail laid out by the +CAcert Assurance Officer; </p> +</li> +<li> +<p>Be guided by the CAcert <a href="https://wiki.cacert.org/AssuranceHandbook2" target="_blank">Assurance Handbook</a> in their +judgement; </p> +</li> +<li> +<p>Make a good faith effort at identifying and verifying +Members; </p> +</li> +<li> +<p>Maintain the documentation on each Assurance; </p> +</li> +<li> +<p>Deliver documentation to Arbitration, or as otherwise +directed by the Arbitrator; </p> +</li> +<li> +<p>Keep up-to-date with developments within the CAcert +Community. </p> +</li> +</ul> +<h2 id="s4">4. The Assurance</h2> +<h3 id="s4.1">4.1. The Assurance Process</h3> +<p>The Assurer conducts the process of Assurance with each +Member. </p> +<p>The process consists of: </p> +<ol> +<li> +<p>Voluntary agreement by both Assurer and Member or +Prospective Member to conduct the Assurance; </p> +</li> +<li> +<p>Personal meeting of Assurer and Member or Prospective +Member; </p> +</li> +<li> +<p>Recording of essential details on CAcert Assurance +Programme form; </p> +</li> +<li> +<p>Examination of Identity documents by Assurer and +verification of recorded details (the Name(s) and Secondary +Distinguishing Feature, e.g., DoB); </p> +</li> +<li> +<p>Allocation of Assurance Points by Assurer; </p> +</li> +<li> +<p>Optional: supervision of reciprocal Assurance made by +Assuree (Mutual Assurance); </p> +</li> +<li> +<p>Safekeeping of the CAcert Assurance Programme (<a href="https://www.cacert.org/cap.php" target="_blank">CAP</a>) +forms by Assurer. </p> +</li> +</ol> +<h3 id="s4.2">4.2. Mutual Assurance</h3> +<p>Mutual Assurance follows the principle of reciprocity. This +means +that the Assurance may be two-way, and that each member participating +in the Assurance procedure should be able to show evidence of their +identity to the other. </p> +<p>In the event that an Assurer is assured by a Member who is not +certified as an Assurer, the Assurer supervises the Assurance +procedure and process, and is responsible for the results. </p> +<p>Reciprocity maintains a balance between the (new) member and +the +Assurer, and reduces any sense of power. It is also an important aid +to the assurance training for future Assurers. </p> + +<h3 id="s4.3">4.3. Assurance Points</h3> +<p>The Assurance applies Assurance Points to each Member which +measure the increase of confidence in the Statement (above). +Assurance Points should not be interpreted for any other purpose. +Note that, even though they are sometimes referred to as <em>Web-of-Trust</em> +(Assurance) Points, or <em>Trust</em> Points, the meaning +of the word +'Trust' is not well defined. </p> +<p><em>Assurance Points Allocation</em><br> +An Assurer can allocate a +number of Assurance Points to the Member according to the Assurer's +experience (Experience Point system, see below). The allocation of +the maximum means that the Assurer is 100% confident in the +information presented: </p> +<ul> +<li> +<p>Detail on form, system, documents, person in accordance; </p> +</li> +<li> +<p>Sufficient quality identity documents have been checked; </p> +</li> +<li> +<p>Assurer's familiarity with identity documents; </p> +</li> +<li> +<p>The Assurance Statement is confirmed. </p> +</li> +</ul> +<p> +Any lesser confidence should result in less Assurance Points for a +Name. If the Assurer has no confidence in the information presented, +then <em>zero</em> Assurance Points may be allocated by the Assurer. +For example, this may happen if the identity documents are totally +unfamiliar to the Assurer. The number of Assurance Points from <em>zero</em> +to <em>maximum</em> is guided by the Assurance Handbook +and the judgement of the Assurer. +If there is negative confidence the Assurer should consider +filing a dispute. +</p> +<p>Multiple Names should be allocated Assurance Points +independently within a single Assurance. </p> +<p> +A Member who is not an Assurer may award an Assurer in a +reciprocal process a maximum of 2 Assurance Points, according to +her judgement. The Assurer should strive to have the Member allocate +according to the Member's judgement, and stay on the cautious side; +the Member new to the assurance process +should allocate <em>zero</em> Assurance Points +until she gains some confidence in what is happening. +</p> +<p> +In general, for a Member to reach 50 Assurance Points, the Member must +have participated in at least two assurances, and +at least one Name will have been assured to that level. +</p> +<p> +To reach 100 Assurance +Points, at least one Name of the Assured Member must have been +assured at least three times. +</p> +<p> +The maximum number of Assurance +Points which can be allocated for an Assurance under this policy +and under any act under any +Subsidiary Policy (below) is 50 Assurance Points. +</p> + +<h3 id="s4.4">4.4. Experience Points</h3> +<p>The maximum number of Assurance Points that may be awarded by +an +Assurer is determined by the Experience Points of the Assurer. </p> +<blockquote> +<p class="l size075" ><em>Table 2: +Maximum of Assurance Points </em> +</p> +<table class="padding margin0" border="1" style="width: 15%;"> +<tbody> +<tr> +<td> +<p><em>Assurer's Experience Points</em></p> +</td> +<td> +<p><em>Allocatable Assurance Points</em></p> +</td> +</tr> +<tr> +<td> +<p class="c">0</p> +</td> +<td> +<p class="c">10</p> +</td> +</tr> +<tr> +<td> +<p class="c">10</p> +</td> +<td> +<p class="c">15</p> +</td> +</tr> +<tr> +<td> +<p class="c">20</p> +</td> +<td> +<p class="c">20</p> +</td> +</tr> +<tr> +<td> +<p class="c">30</p> +</td> +<td> +<p class="c">25</p> +</td> +</tr> +<tr> +<td> +<p class="c">40</p> +</td> +<td> +<p class="c">30</p> +</td> +</tr> +<tr> +<td> +<p class="c">>=50</p> +</td> +<td> +<p class="c">35</p> +</td> +</tr> +</tbody> +</table> +</blockquote> +<p>An Assurer is given a maximum of 2 Experience Points for every +completed Assurance. On reaching Assurer status, the Experience +Points start at 0 (zero). </p> +<p>Less Experience Points (1) may be given for mass Assurance +events, +where each Assurance is quicker. </p> +<p>Additional Experience Points may be granted temporarily or +permanently to an Assurer by CAcert Inc.'s Committee (board), on +recommendation from the Assurance Officer. </p> +<p>Experience Points are not to be confused with Assurance +Points. </p> +<h3 id="s4.5">4.5. CAcert Assurance Programme (CAP) form</h3> +<p>The CAcert Assurance Programme (<a href="https://www.cacert.org/cap.php" target="_blank">CAP</a>) +form requests the following details of each Member or Prospective +Member: </p> +<ul> +<li> +<p>Name(s), as recorded in the on-line account; </p> +</li> +<li> +<p>Primary email address, as recorded in the on-line account; +</p> +</li> +<li> +<p>Secondary Distinguishing Feature, as recorded in the +on-line account (normally, date of birth); </p> +</li> +<li> +<p>Statement of agreement with the CAcert Community +Agreement; </p> +</li> +<li> +<p>Permission to the Assurer to conduct the Assurance +(required for privacy reasons); </p> +</li> +<li> +<p>Date and signature of the Assuree. </p> +</li> +</ul> +<p>The CAP form requests the following details of the Assurer: </p> +<ul> +<li> +<p>At least one Name as recorded in the on-line account of +the Assurer; </p> +</li> +<li> +<p>Assurance Points for each Name in the identity +document(s); </p> +</li> +<li> +<p>Statement of Assurance; </p> +</li> +<li> +<p>Optional: If the Assurance is reciprocal, then the +Assurer's email address and Secondary Distinguishing Feature are +required as well; </p> +</li> +<li> +<p>Date, location of Assurance and signature of Assurer. </p> +</li> +</ul> +<p>The CAP forms are to be kept at least for 7 years by the +Assurer. </p> +<h2 id="s5">5. The Assurance Officer</h2> +<p>The Committee (board) of CAcert Inc. appoints an Assurance +Officer +with the following responsibilities: </p> +<ul> +<li> +<p>Reporting to the Committee and advising on all matters to +do with Assurance; </p> +</li> +<li> +<p>Training and testing of Assurers, in association with the +Education Team; </p> +</li> +<li> +<p>Updating this Assurance Policy, under the process +established by Policy on Policy (<a href="https://www.cacert.org/policy/PolicyOnPolicy.html" target="_blank">PoP</a>); </p> +</li> +<li> +<p>Management of all Subsidiary Policies (see below) for +Assurances, under Policy on Policy; </p> +</li> +<li> +<p>Managing and creating rules of detail or procedure where +inappropriate for policies; </p> +</li> +<li> +<p>Incorporating rulings from Arbitration into policies, +procedures or guidelines; </p> +</li> +<li> +<p>Assisting the Arbitrator in any requests; </p> +</li> +<li> +<p>Managing the Assurer Handbook; </p> +</li> +<li> +<p>Maintaining a sufficient strength in the Assurance process +(web-of-trust) to meet the agreed needs of the Community. </p> +</li> +</ul> +<h2 id="s6">6. Subsidiary Policies</h2> +<p>The Assurance Officer manages various exceptions and additional +processes. Each must be covered by an approved Subsidiary Policy +(refer to <a href="https://www.cacert.org/policy/PolicyOnPolicy.html" target="_blank">Policy on Policy</a> => CAcert Official Document COD1). +Subsidiary Policies specify any additional tests of knowledge +required and variations to process and documentation, within the +general standard stated here. </p> +<h3 id="s6.1">6.1. Standard</h3> +<p>Each Subsidiary Policy must augment and improve the general +standards in this Assurance Policy. It is the responsibility of each +Subsidiary Policy to describe how it maintains and improves the +specific and overall goals. It must describe exceptions and potential +areas of risk. </p> + +<h3 id="s6.2">6.2. High Risk Applications</h3> +<p>In addition to the Assurance or Experience Points ratings set +here and in other subsidiary policies, the Assurance Officer or policies can +designate certain applications as high risk. If so, additional +measures may be added to the Assurance process that specifically +address the risks.</p> +<p>Additional measures may include: +</p> +<ul> +<li> +<p>Additional information can be required in process of assurance: </p> +<ul> +<li>unique numbers of identity documents,</li> +<li>photocopy of identity documents,</li> +<li>photo of User,</li> +<li>address of User.</li> +</ul> +<p>Additional Information is to be kept by Assurer, attached to +CAcert Assurance Programme (<a href="https://www.cacert.org/cap.php" target="_blank">CAP</a>) +form. Assurance Points allocation by this assurance is unchanged. +User's CAcert login account should be annotated to record type of +additional information;</p> +</li> +<li> +<p>Arbitration: </p> +<ul> +<li> Member to participate in Arbitration. This confirms +their acceptance of the forum as well as trains in the process and +import, +</li> +<li> Member to file Arbitration to present case. This +allows Arbitrator as final authority; +</li> +</ul> +</li> +<li> +<p>Additional training; </p> +</li> +<li> +<p>Member to be Assurer (at least 100 Assurance Points and +passed Assurer Challenge); </p> +</li> +<li> +<p>Member agrees to additional specific agreement(s); </p> +</li> +<li> +<p>Additional checking/auditing of systems data by CAcert +support administrators. </p> +</li> +</ul> +<p>Applications that might attract additional measures include +code-signing certificates and administration roles. </p> +<h2 id="s7">7. Privacy</h2> +<p>CAcert is a "privacy" organisation, and takes the +privacy of its Members seriously. The process maintains the security +and privacy of both parties. </p> +<p>Information is collected primarily to make claims within the +certificates requested by users and to contact the Members. It is +used secondarily for training, testing, administration and other +internal purposes. </p> +<p>The Member's information can be accessed under these +circumstances: </p> +<ul> +<li> +<p>Under Arbitrator ruling, in a duly filed dispute (<a href="https://www.cacert.org/policy/DisputeResolutionPolicy.html" target="_blank">Dispute Resolution Policy</a> +=> COD7); </p> +</li> +<li> +<p>An Assurer in the process of an Assurance, as permitted on +the CAcert Assurance Programme (<a href="https://www.cacert.org/cap.php" target="_blank">CAP</a>) +form; </p> +</li> +<li> +<p>CAcert support administration and CAcert systems +administration when operating under the authority of Arbitrator or +under CAcert policy. </p> +</li> +</ul> +<p><a href="http://validator.w3.org/check?uri=referer"><img src="images/valid-html50-blue.png" alt="Valid HTML 5" height="31" width="88"></a></p> +</body></html> + diff --git a/www/policy/AssurancePolicy.php b/www/policy/AssurancePolicy.php index 4998de5..025d37b 100644 --- a/www/policy/AssurancePolicy.php +++ b/www/policy/AssurancePolicy.php @@ -1,723 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<html><head> -<title>Assurance Policy</title> - -<meta name="CREATED" content="20080530;0"> -<meta name="CHANGEDBY" content="Teus Hagen"> -<meta name="CHANGED" content="20080709;12381800"> -<meta name="CREATEDBY" content="Ian Grigg"> -<meta name="CHANGEDBY" content="Teus Hagen"> -<meta name="CHANGEDBY" content="Robert Cruikshank"> -<meta name="CHANGEDBY" content="Teus Hagen"> -<style type="text/css"> -<!-- -P { color: #000000 } -TD P { color: #000000 } -H1 { color: #000000 } -H2 { color: #000000 } -DT { color: #000000 } -DD { color: #000000 } -H3 { color: #000000 } -TH P { color: #000000 } ---> -</style></head> -<body style="direction: ltr; color: rgb(0, 0, 0);" lang="en-GB"> -<h1>Assurance Policy for CAcert Community Members</h1> -<p><a href="PolicyOnPolicy.php"><img src="/images/cacert-policy.png" id="graphics1" alt="CAcert Policy Status == POLICY" align="bottom" border="0" height="33" width="90"></a> -<br> -Editor: Teus Hagen<br> -Creation date: 2008-05-30<br> -Last change by: Iang<br> -Last change date: 2009-01-08<br> -Status: POLICY p20090105.2 -</p> - -<h2><a name="0">0.</a> Preamble</h2> -<h3><a name="0.1">0.1.</a> Definition of Terms</h3> -<dl> -<dt><i>Member</i> </dt> -<dd> A Member is an individual who has agreed to the CAcert -Community Agreement -(<a href="http://www.cacert.org/policy/CAcertCommunityAgreement.php" target="_blank">CCA</a>) -and has created successfully -a CAcert login account on the CAcert web site. </dd> -<dt> <i>Assurance</i> </dt> -<dd> Assurance is the process by which a Member of CAcert -Community (Assurer) identifies an individual (<span lang="en-US">Assuree</span>). -</dd> -<dt> <i>Prospective Member</i> </dt> -<dd> An individual who participates in the process of Assurance, -but has not yet created a CAcert login account. </dd> -<dt> <i>Name</i> </dt> -<dd> A Name is the full name of an individual. -</dd> -<dt> <i>Secondary Distinguishing Feature</i> -</dt> -<dd> An additional personal data item of the Member -that assists discrimination from Members with similar full names. -(Currently this is the Date of Birth (DoB).) -</dd> -</dl> - -<h3><a name="0.2">0.2.</a> The CAcert Web of Trust</h3> -<p> -In face-to-face meetings, -an Assurer allocates a number of Assurance Points -to the Member being Assured. -CAcert combines the Assurance Points -into a global <i>Web-of-Trust</i> (or "WoT"). -</p> -<p> -CAcert explicitly chooses to meet its various goals by -construction of a Web-of-Trust of all Members. -</p> - -<h3><a name="0.3">0.3.</a> Related Documentation</h3> -<p> -Documentation on Assurance is split between this -Assurance Policy (AP) and the -<a href="http://wiki.cacert.org/wiki/AssuranceHandbook2" target="_blank">Assurance -Handbook</a>. The policy is controlled by Configuration Control -Specification -(<a href="http://wiki.cacert.org/wiki/PolicyDrafts/ConfigurationControlSpecification" target="_blank">CCS</a>) -under Policy on Policy -(<a href="http://www.cacert.org/policy/PolicyOnPolicy.php" target="_blank">PoP</a>) -policy document regime. Because Assurance is an active area, much -of the practice is handed over to the Assurance Handbook, which is -not a controlled policy document, and can more easily respond to -experience and circumstances. It is also more readable. -</p> -<p> -See also Organisation Assurance Policy (<a href="http://www.cacert.org/policy/OrganisationAssurancePolicy.php" target="_blank">OAP</a>) -and CAcert Policy Statement (<a href="http://www.cacert.org/policy/CertificationPracticeStatement.php" target="_blank">CPS</a>). -</p> - -<h2><a name="1">1.</a> Assurance Purpose</h2> -<p>The purpose of Assurance is to add confidence -in the Assurance Statement made by the CAcert Community of a Member. </p> -<p>With sufficient assurances, a Member may: (a) issue certificates -with their assured Name included, (b) participate in assuring others, -and (c) other related activities. The strength of these activities is -based on the strength of the assurance. </p> - -<h3><a name="1.1">1.1.</a>The Assurance Statement</h3> -<p> -The Assurance Statement makes the following claims -about a person: -</p> -<ol> -<li> -<p>The person is a bona fide Member. In other words, the -person is a member of the CAcert Community as defined by the CAcert -Community Agreement (<a href="http://www.cacert.org/policy/CAcertCommunityAgreement.php" target="_blank">CCA</a>); </p> -</li> -<li> -<p>The Member has a (login) account with CAcert's on-line -registration and service system; </p> -</li> -<li> -<p>The Member can be determined from any CAcert certificate -issued by the Account; </p> -</li> -<li> -<p>The Member is bound into CAcert's Arbitration as defined -by the CAcert Community Agreement; </p> -</li> -<li> -<p>Some personal details of the Member are known to CAcert: -the individual Name(s), primary and other listed individual email -address(es), secondary distinguishing feature (e.g. DoB). </p> -</li> -</ol> -<p>The confidence level of the Assurance Statement is expressed by -the Assurance Points. </p> -<h3><a name="1.2">1.2.</a>Relying Party Statement</h3> -<p>The primary goal of the Assurance Statement is for the express -purpose of certificates to meet the needs of the <i>Relying Party -Statement</i>, which latter is found in the Certification Practice -Statement (<a href="http://www.cacert.org/policy/CertificationPracticeStatement.php" target="_blank">CPS</a>). -</p> -<p>When a certificate is issued, some of the Assurance Statement may -be incorporated, e.g. Name. Other parts may be implied, e.g. -Membership, exact account and status. They all are part of the -<i>Relying Party Statement</i>. In short, this means that other -Members of the Community may rely on the information verified by -Assurance and found in the certificate.</p> -<p>In particular, certificates are sometimes considered to provide -reliable indications of e.g. the Member's Name and email address. The -nature of Assurance, the number of Assurance Points, and other -policies and processes should be understood as limitations on any -reliance. </p> -<h2><a name="2">2.</a> The Member</h2> -<h3><a name="2.1">2.1.</a> The Member's Name </h3> -<p> -At least one individual Name is recorded in the Member's -CAcert login account. The general standard of a Name is: -</p> -<ul> -<li> -<p> -The Name should be recorded as written in a -government-issued photo identity document (ID). -</p> -</li> -<li> -<p> -The Name should be recorded as completely as possible. -That is, including all middle names, any titles and extensions, -without abbreviations, and without transliteration of characters. -</p> -</li> -<li> -<p>The Name is recorded as a string of characters, -encoded in <span lang="en-US">unicode</span> -transformation format.</p> -</li> -</ul> -<h3><a name="2.2">2.2.</a> Multiple Names and variations</h3> -<p> -In order to handle the contradictions in the above general standard, -a Member may record multiple Names or multiple variations of a Name -in her CAcert online Account. -Examples of variations include married names, -variations of initials of first or middle names, -abbreviations of a first name, -different language or country variations, -and transliterations of characters in a name. -</p> - -<h3><a name="2.3">2.3.</a> Status and Capabilities</h3> -<p> -A Name which has reached -the level of 50 Assurance Points is defined as an Assured -Name. An Assured Name can be used in a certificate issued by CAcert. -A Member with at least one Assured Name has reached the Assured -Member status. -Additional capabilities are described in Table 1. -</p> - -<blockquote> -<p align="left"><font size="2"><i>Table 1: -Assurance Capability</i></font></p> -<table border="1" cellpadding="5" cellspacing="0"> -<tbody> -<tr> -<td width="10%"> -<p align="left"><i>Minimum Assurance Points</i></p> -</td> -<td width="15%"> -<p align="left"><i>Capability</i></p> -</td> -<td width="15%"> -<p align="left"><i>Status</i></p> -</td> -<td width="60%"> -<p align="left"><i>Comment</i></p> -</td> -</tr> -<tr valign="top"> -<td> -<p align="center">0</p> -</td> -<td> -<p align="left">Request Assurance</p> -</td> -<td> -<p align="left">Prospective Member</p> -</td> -<td> -<p align="left">Individual taking part of an -Assurance, who does not have created a CAcert login account (yet). The -allocation of Assurance Points is awaiting login account creation.</p> -</td> -</tr> -<tr valign="top"> -<td> -<p align="center">0</p> -</td> -<td> -<p align="left">Request unnamed certificates</p> -</td> -<td> -<p align="left">Member</p> -</td> -<td> -<p align="left">Although the Member's details are -recorded in the account, they are not highly assured.</p> -</td> -</tr> -<tr valign="top"> -<td> -<p align="center">50</p> -</td> -<td> -<p align="left">Request named certificates</p> -</td> -<td> -<p align="left">Assured Member</p> -</td> -<td> -<p align="left">Statements of Assurance: the Name is -assured to 50 Assurance Points or more</p> -</td> -</tr> -<tr valign="top"> -<td> -<p align="center">100</p> -</td> -<td> -<p align="left">Become an Assurer</p> -</td> -<td> -<p align="left">Prospective Assurer</p> -</td> -<td> -<p align="left">Assured to 100 Assurance Points (or -more) on at least one Name, and passing the Assurer Challenge.</p> -</td> -</tr> -</tbody> -</table> -</blockquote> - - -<p> -A Member may check the status of another Member, especially -for an assurance process. -Status may be implied from information in a certificate. -The number of Assurance Points for each Member is not published. -</p> - -<p> -The CAcert Policy Statement -(<a href="http://www.cacert.org/policy/CertificationPracticeStatement.php" target="_blank">CPS</a>) -and other policies may list other capabilities that rely on Assurance -Points. -</p> - -<h2><a name="3">3.</a> The Assurer</h2> -<p>An Assurer is a Member with the following: </p> -<ul> -<li> -<p>Is assured to a minimum of 100 Assurance Points; </p> -</li> -<li> -<p>Has passed the CAcert Assurer Challenge. </p> -</li> -</ul> -<p>The Assurer Challenge is administered by the Education Team on -behalf of the Assurance Officer. </p> -<h3><a name="3.1">3.1.</a> The Obligations of the Assurer</h3> -<p>The Assurer is obliged to: </p> -<ul> -<li> -<p>Follow this Assurance Policy; </p> -</li> -<li> -<p>Follow any additional rules of detail laid out by the -CAcert Assurance Officer; </p> -</li> -<li> -<p>Be guided by the CAcert <a href="http://wiki.cacert.org/wiki/AssuranceHandbook2" target="_blank">Assurance Handbook</a> in their -judgement; </p> -</li> -<li> -<p>Make a good faith effort at identifying and verifying -Members; </p> -</li> -<li> -<p>Maintain the documentation on each Assurance; </p> -</li> -<li> -<p>Deliver documentation to Arbitration, or as otherwise -directed by the Arbitrator; </p> -</li> -<li> -<p>Keep up-to-date with developments within the CAcert -Community. </p> -</li> -</ul> -<h2><a name="4">4.</a> The Assurance</h2> -<h3><a name="4.1">4.1.</a> The Assurance Process</h3> -<p>The Assurer conducts the process of Assurance with each -Member. </p> -<p>The process consists of: </p> -<ol> -<li> -<p>Voluntary agreement by both Assurer and Member or -Prospective Member to conduct the Assurance; </p> -</li> -<li> -<p>Personal meeting of Assurer and Member or Prospective -Member; </p> -</li> -<li> -<p>Recording of essential details on CAcert Assurance -Programme form; </p> -</li> -<li> -<p>Examination of Identity documents by Assurer and -verification of recorded details (the Name(s) and Secondary -Distinguishing Feature, e.g., DoB); </p> -</li> -<li> -<p>Allocation of Assurance Points by Assurer; </p> -</li> -<li> -<p>Optional: supervision of reciprocal Assurance made by -Assuree (Mutual Assurance); </p> -</li> -<li> -<p>Safekeeping of the CAcert Assurance Programme (<a href="http://www.cacert.org/cap.php" target="_blank">CAP</a>) -forms by Assurer. </p> -</li> -</ol> -<h3><a name="4.2">4.2.</a> Mutual Assurance</h3> -<p>Mutual Assurance follows the principle of reciprocity. This -means -that the Assurance may be two-way, and that each member participating -in the Assurance procedure should be able to show evidence of their -identity to the other. </p> -<p>In the event that an Assurer is assured by a Member who is not -certified as an Assurer, the Assurer supervises the Assurance -procedure and process, and is responsible for the results. </p> -<p>Reciprocity maintains a balance between the (new) member and -the -Assurer, and reduces any sense of power. It is also an important aid -to the assurance training for future Assurers. </p> - -<h3><a name="4.3">4.3.</a> Assurance Points</h3> -<p>The Assurance applies Assurance Points to each Member which -measure the increase of confidence in the Statement (above). -Assurance Points should not be interpreted for any other purpose. -Note that, even though they are sometimes referred to as <i>Web-of-Trust</i> -(Assurance) Points, or <i>Trust</i> Points, the meaning -of the word -'Trust' is not well defined. </p> -<p><i>Assurance Points Allocation</i><br> -An Assurer can allocate a -number of Assurance Points to the Member according to the Assurer's -experience (Experience Point system, see below). The allocation of -the maximum means that the Assurer is 100% confident in the -information presented: </p> -<ul> -<li> -<p>Detail on form, system, documents, person in accordance; </p> -</li> -<li> -<p>Sufficient quality identity documents have been checked; </p> -</li> -<li> -<p>Assurer's familiarity with identity documents; </p> -</li> -<li> -<p>The Assurance Statement is confirmed. </p> -</li> -</ul> -<p> -Any lesser confidence should result in less Assurance Points for a -Name. If the Assurer has no confidence in the information presented, -then <i>zero</i> Assurance Points may be allocated by the Assurer. -For example, this may happen if the identity documents are totally -unfamiliar to the Assurer. The number of Assurance Points from <i>zero</i> -to <i>maximum</i> is guided by the Assurance Handbook -and the judgement of the Assurer. -If there is negative confidence the Assurer should consider -filing a dispute. -</p> -<p>Multiple Names should be allocated Assurance Points -independently within a single Assurance. </p> -<p> -A Member who is not an Assurer may award an Assurer in a -reciprocal process a maximum of 2 Assurance Points, according to -her judgement. The Assurer should strive to have the Member allocate -according to the Member's judgement, and stay on the cautious side; -the Member new to the assurance process -should allocate <i>zero</i> Assurance Points -until she gains some confidence in what is happening. -</p> -<p> -In general, for a Member to reach 50 Assurance Points, the Member must -have participated in at least two assurances, and -at least one Name will have been assured to that level. -</p> -<p> -To reach 100 Assurance -Points, at least one Name of the Assured Member must have been -assured at least three times. -</p> -<p> -The maximum number of Assurance -Points which can be allocated for an Assurance under this policy -and under any act under any -Subsidiary Policy (below) is 50 Assurance Points. -</p> - -<h3><a name="4.4">4.4.</a> Experience Points</h3> -<p>The maximum number of Assurance Points that may be awarded by -an -Assurer is determined by the Experience Points of the Assurer. </p> -<blockquote> -<p align="left"><font size="2"><i>Table 2: -Maximum of Assurance Points </i></font> -</p> -<table border="1" cellpadding="2" cellspacing="0" width="15%"> -<tbody> -<tr> -<td> -<p><i>Assurer's Experience Points</i></p> -</td> -<td> -<p><i>Allocatable Assurance Points</i></p> -</td> -</tr> -<tr> -<td> -<p align="center">0</p> -</td> -<td> -<p align="center">10</p> -</td> -</tr> -<tr> -<td> -<p align="center">10</p> -</td> -<td> -<p align="center">15</p> -</td> -</tr> -<tr> -<td> -<p align="center">20</p> -</td> -<td> -<p align="center">20</p> -</td> -</tr> -<tr> -<td> -<p align="center">30</p> -</td> -<td> -<p align="center">25</p> -</td> -</tr> -<tr> -<td> -<p align="center">40</p> -</td> -<td> -<p align="center">30</p> -</td> -</tr> -<tr> -<td> -<p align="center">>=50</p> -</td> -<td> -<p align="center">35</p> -</td> -</tr> -</tbody> -</table> -</blockquote> -<p>An Assurer is given a maximum of 2 Experience Points for every -completed Assurance. On reaching Assurer status, the Experience -Points start at 0 (zero). </p> -<p>Less Experience Points (1) may be given for mass Assurance -events, -where each Assurance is quicker. </p> -<p>Additional Experience Points may be granted temporarily or -permanently to an Assurer by CAcert Inc.'s Committee (board), on -recommendation from the Assurance Officer. </p> -<p>Experience Points are not to be confused with Assurance -Points. </p> -<h3><a name="4.5">4.5.</a> CAcert Assurance Programme (CAP) form</h3> -<p>The CAcert Assurance Programme (<a href="http://www.cacert.org/cap.php" target="_blank">CAP</a>) -form requests the following details of each Member or Prospective -Member: </p> -<ul> -<li> -<p>Name(s), as recorded in the on-line account; </p> -</li> -<li> -<p>Primary email address, as recorded in the on-line account; -</p> -</li> -<li> -<p>Secondary Distinguishing Feature, as recorded in the -on-line account (normally, date of birth); </p> -</li> -<li> -<p>Statement of agreement with the CAcert Community -Agreement; </p> -</li> -<li> -<p>Permission to the Assurer to conduct the Assurance -(required for privacy reasons); </p> -</li> -<li> -<p>Date and signature of the Assuree. </p> -</li> -</ul> -<p>The CAP form requests the following details of the Assurer: </p> -<ul> -<li> -<p>At least one Name as recorded in the on-line account of -the Assurer; </p> -</li> -<li> -<p>Assurance Points for each Name in the identity -document(s); </p> -</li> -<li> -<p>Statement of Assurance; </p> -</li> -<li> -<p>Optional: If the Assurance is reciprocal, then the -Assurer's email address and Secondary Distinguishing Feature are -required as well; </p> -</li> -<li> -<p>Date, location of Assurance and signature of Assurer. </p> -</li> -</ul> -<p>The CAP forms are to be kept at least for 7 years by the -Assurer. </p> -<h2><a name="5">5.</a> The Assurance Officer</h2> -<p>The Committee (board) of CAcert Inc. appoints an Assurance -Officer -with the following responsibilities: </p> -<ul> -<li> -<p>Reporting to the Committee and advising on all matters to -do with Assurance; </p> -</li> -<li> -<p>Training and testing of Assurers, in association with the -Education Team; </p> -</li> -<li> -<p>Updating this Assurance Policy, under the process -established by Policy on Policy (<a href="https://www.cacert.org/policy/PolicyOnPolicy.php" target="_blank">PoP</a>); </p> -</li> -<li> -<p>Management of all Subsidiary Policies (see below) for -Assurances, under Policy on Policy; </p> -</li> -<li> -<p>Managing and creating rules of detail or procedure where -inappropriate for policies; </p> -</li> -<li> -<p>Incorporating rulings from Arbitration into policies, -procedures or guidelines; </p> -</li> -<li> -<p>Assisting the Arbitrator in any requests; </p> -</li> -<li> -<p>Managing the Assurer Handbook; </p> -</li> -<li> -<p>Maintaining a sufficient strength in the Assurance process -(web-of-trust) to meet the agreed needs of the Community. </p> -</li> -</ul> -<h2><a name="6">6.</a> Subsidiary Policies</h2> -<p>The Assurance Officer manages various exceptions and additional -processes. Each must be covered by an approved Subsidiary Policy -(refer to Policy on Policy => CAcert Official Document COD1). -Subsidiary Policies specify any additional tests of knowledge -required and variations to process and documentation, within the -general standard stated here. </p> -<h3><a name="6.1">6.1.</a> Standard</h3> -<p>Each Subsidiary Policy must augment and improve the general -standards in this Assurance Policy. It is the responsibility of each -Subsidiary Policy to describe how it maintains and improves the -specific and overall goals. It must describe exceptions and potential -areas of risk. </p> - -<h3><a name="6.2">6.2.</a> High Risk Applications</h3> -<p>In addition to the Assurance or Experience Points ratings set -here and in other subsidiary policies, the Assurance Officer or policies can -designate certain applications as high risk. If so, additional -measures may be added to the Assurance process that specifically -address the risks.</p> -<p>Additional measures may include: -</p> -<ul> -<li> -<p>Additional information can be required in process of assurance: </p> -<ul> -<li>unique numbers of identity documents,</li> -<li>photocopy of identity documents,</li> -<li>photo of User,</li> -<li>address of User.</li> -</ul> -<p>Additional Information is to be kept by Assurer, attached to -CAcert Assurance Programme (<a href="http://www.cacert.org/cap.php" target="_blank">CAP</a>) -form. Assurance Points allocation by this assurance is unchanged. -User's CAcert login account should be annotated to record type of -additional information;</p> -</li> -<li> -<p>Arbitration: </p> -<ul> -<li> Member to participate in Arbitration. This confirms -their acceptance of the forum as well as trains in the process and -import, -</li> -<li> Member to file Arbitration to present case. This -allows Arbitrator as final authority; -</li> -</ul> -</li> -<li> -<p>Additional training; </p> -</li> -<li> -<p>Member to be Assurer (at least 100 Assurance Points and -passed Assurer Challenge); </p> -</li> -<li> -<p>Member agrees to additional specific agreement(s); </p> -</li> -<li> -<p>Additional checking/auditing of systems data by CAcert -support administrators. </p> -</li> -</ul> -<p>Applications that might attract additional measures include -code-signing certificates and administration roles. </p> -<h2><a name="7">7.</a> Privacy</h2> -<p>CAcert is a "privacy" organisation, and takes the -privacy of its Members seriously. The process maintains the security -and privacy of both parties. </p> -<p>Information is collected primarily to make claims within the -certificates requested by users and to contact the Members. It is -used secondarily for training, testing, administration and other -internal purposes. </p> -<p>The Member's information can be accessed under these -circumstances: </p> -<ul> -<li> -<p>Under Arbitrator ruling, in a duly filed dispute (<a href="http://www.cacert.org/policy/DisputeResolutionPolicy.php" target="_blank">Dispute Resolution Policy</a> -=> COD7); </p> -</li> -<li> -<p>An Assurer in the process of an Assurance, as permitted on -the CAcert Assurance Programme (<a href="http://www.cacert.org/cap.php" target="_blank">CAP</a>) -form; </p> -</li> -<li> -<p>CAcert support administration and CAcert systems -administration when operating under the authority of Arbitrator or -under CAcert policy. </p> -</li> -</ul> -<p><a href="http://validator.w3.org/check?uri=referer"><img src="/images/valid-xhtml11-blue" id="graphics2" alt="Valid XHTML 1.1" align="bottom" border="0" height="33" width="90"></a> -</p> -</body></html> - +<?php +header('HTTP/1.0 301 Moved Permanently'); +header('Location: AssurancePolicy.html'); +exit();
\ No newline at end of file diff --git a/www/policy/CAcertCommunityAgreement.html b/www/policy/CAcertCommunityAgreement.html new file mode 100644 index 0000000..810c043 --- /dev/null +++ b/www/policy/CAcertCommunityAgreement.html @@ -0,0 +1,531 @@ +<!DOCTYPE html> +<html> +<head> + <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8" lang="en"> + <title>CAcert Community Agreement</title> + <style> + .r{ + text-align: right; + } + .vTop{ + vertical-align: top; + } + dt{ + font-style: italic; + } + </style> + +</head> +<body> + +<div class="comment"> +<table style="width: 100%;"> + +<tr> +<td> + Name: CCA <a style="color: steelblue" href="https://svn.cacert.org/CAcert/Policies/ControlledDocumentList.html">COD9</a><br /> + Status: POLICY <a style="color: steelblue" href="https://wiki.cacert.org/PolicyDecisions#p20080109">p20080109</a><br /> +Editor: <a style="color: steelblue" href="https://wiki.cacert.org/Iang">Iang</a><br /> + Licence: <a style="color: steelblue" href="https://wiki.cacert.org/Policy#Licence" title="this document is Copyright © CAcert Inc., licensed openly under CC-by-sa with all disputes resolved under DRP. More at wiki.cacert.org/Policy" > CC-by-sa+DRP </a><br /> + +</td> +<td class="vTop r"> + <a href="https://www.cacert.org/policy/PolicyOnPolicy.html"><img src="images/cacert-policy.png" alt="CCA Status - POLICY" height="31" width="88" style="border-style: none;" /></a> + +</td> +</tr> +</table> +</div> + +<h2> CAcert Community Agreement </h2> + + + +<h3 id="s0"> 0. Introduction </h3> + +<p> +This agreement is between +you, being a registered member ("Member") +within CAcert's community at large ("Community") +and CAcert Incorporated ("CAcert"), +being an operator of services to the Community. +</p> + +<h4 id="s0.1"> 0.1 Terms </h4> +<dl> + <dt>"CAcert"</dt><dd> + means CAcert Inc., + a non-profit Association of Members incorporated in + New South Wales, Australia. + Note that Association Members are distinct from + the Members defined here.</dd> + <dt>"Member"</dt><dd> + means you, a registered participant within CAcert's Community, + with an account on the website and the + facility to request certificates. + Members may be individuals ("natural persons") + or organisations ("legal persons").</dd> + <dt>"Organisation"</dt><dd> + is defined under the Organisation Assurance programme, + and generally includes corporations and other entities + that become Members and become Assured.</dd> + <dt>"Community"</dt><dd> + means all of the Members + that are registered by this agreement + and other parties by other agreements, + all being under CAcert's Arbitration.</dd> + <dt>"Non-Related Person" ("NRP")</dt><dd> + being someone who is not a + Member, is not part of the Community, + and has not registered their agreement. + Such people are offered the NRP-DaL + another agreement allowing the USE of certificates.</dd> + <dt>"Non-Related Persons - Disclaimer and Licence" ("NRP-DaL")</dt><dd> + another agreement that is offered to persons outside the + Community.</dd> + <dt>"Arbitration"</dt><dd> + is the Community's forum for + resolving disputes, or jurisdiction.</dd> + <dt>"Dispute Resolution Policy" ("DRP" => COD7)</dt><dd> + is the policy and + rules for resolving disputes.</dd> + <dt>"USE"</dt><dd> + means the act by your software + to conduct its tasks, incorporating + the certificates according to software procedures.</dd> + <dt>"RELY"</dt><dd> + means your human act in taking on a + risk and liability on the basis of the claim(s) + bound within a certificate.</dd> + <dt>"OFFER"</dt><dd> + means the your act + of making available your certificate to another person. + Generally, you install and configure your software + to act as your agent and facilite this and other tasks. + OFFER does not imply suggestion of reliance.</dd> + <dt>"Issue"</dt><dd> + means creation of a certificate by CAcert. + To create a certificate, + CAcert affixes a digital signature from the root + onto a public key and other information. + This act would generally bind a statement or claim, + such as your name, to your key.</dd> + <dt>"Root"</dt><dd> + means CAcert's top level key, + used for signing certificates for Members. + In this document, the term includes any subroots.</dd> + <dt>"CAcert Official Document" ("COD" => COD3)</dt><dd> + in a standard format for describing the details of + operation and governance essential to a certificate authority. + Changes are managed and controlled. + CODs define more technical terms. + See 4.2 for listing of relevant CODs.</dd> + <dt>"Certification Practice Statement" ("CPS" => COD6)</dt><dd> + is the document that controls details + about operational matters within CAcert.</dd> +</dl> + + +<h3 id="s1"> 1. Agreement and Licence </h3> + +<h4 id="s1.1"> 1.1 Agreement </h4> + +<p> +You and CAcert both agree to the terms and conditions +in this agreement. +Your agreement is given by any of +</p> + +<ul><li> + your signature on a form to request assurance of identity + ("CAP" form), + </li><li> + your request on the website + to join the Community and create an account, + </li><li> + your request for Organisation Assurance, + </li><li> + your request for issuing of certificates, or + </li><li> + if you USE, RELY, or OFFER + any certificate issued to you. +</li></ul> + +<p> +Your agreement +is effective from the date of the first event above +that makes this agreement known to you. +This Agreement +replaces and supercedes prior agreements, +including the NRP-DaL. +</p> + + +<h4 id="s1.2"> 1.2 Licence </h4> + +<p> +As part of the Community, CAcert offers you these rights: +</p> + +<ol><li> + You may USE any certificates issued by CAcert. + </li><li> + You may RELY on any certificate issued by CAcert, + as explained and limited by CPS (COD6). + </li><li> + You may OFFER certificates issued to you by CAcert + to Members for their RELIANCE. + </li><li> + You may OFFER certificates issued to you by CAcert + to NRPs for their USE, within the general principles + of the Community. + </li><li> + This Licence is free of cost, + non-exclusive, and non-transferrable. +</li></ol> + +<h4 id="s1.3"> 1.3 Your Contributions </h4> + + +<p> +You agree to a non-exclusive non-restrictive non-revokable +transfer of Licence to CAcert for your contributions. +That is, if you post an idea or comment on a CAcert forum, +or email it to other Members, +your work can be used freely by the Community for +CAcert purposes, including placing under CAcert's licences +for wider publication. +</p> + +<p> +You retain authorship rights, and the rights to also transfer +non-exclusive rights to other parties. +That is, you can still use your +ideas and contributions outside the Community. +</p> + +<p> +Note that the following exceptions override this clause: +</p> + +<ol><li> + Contributions to controlled documents are subject to + Policy on Policy ("PoP" => COD1) + </li><li> + Source code is subject to an open source licence regime. +</li></ol> + +<h4 id="s1.4"> 1.4 Privacy </h4> + + +<p> +You give rights to CAcert to store, verify and process +and publish your data in accordance with policies in force. +These rights include shipping the data to foreign countries +for system administration, support and processing purposes. +Such shipping will only be done among +CAcert Community administrators and Assurers. +</p> + +<p> +Privacy is further covered in the Privacy Policy ("PP" => COD5). +</p> + +<h3 id="s2"> 2. Your Risks, Liabilities and Obligations </h3> + +<p> +As a Member, you have risks, liabilities +and obligations within this agreement. +</p> + +<h4 id="s2.1"> 2.1 Risks </h4> + +<ol><li> + A certificate may prove unreliable. + </li><li> + Your account, keys or other security tools may be + lost or otherwise compromised. + </li><li> + You may find yourself subject to Arbitration + (DRP => COD7). +</li></ol> + +<h4 id="s2.2"> 2.2 Liabilities </h4> + +<ol><li> + You are liable for any penalties + as awarded against you by the Arbitrator. + </li><li> + Remedies are as defined in the DRP (COD7). + An Arbitrator's ruling may + include monetary amounts, awarded against you. + </li><li> + Your liability is limited to + a total maximum of + <b>1000 Euros</b>. + </li><li> + "Foreign Courts" may assert jurisdiction. + These include your local courts, and are outside our Arbitration. + Foreign Courts will generally refer to the Arbitration + Act of their country, which will generally refer + civil cases to Arbitration. + The Arbitration Act will not apply to criminal cases. +</li></ol> + +<h4 id="s2.3"> 2.3 Obligations </h4> + +<p> + You are obliged +</p> + +<ol><li> + to provide accurate information + as part of Assurance. + You give permission for verification of the information + using CAcert-approved methods. + </li><li> + to make no false representations. + </li><li> + to submit all your disputes to Arbitration + (DRP => COD7). +</li></ol> + +<h4 id="s2.4"> 2.4 Principles </h4> + +<p> +As a Member of CAcert, you are a member of +the Community. + You are further obliged to + work within the spirit of the Principles + of the Community. + These are described in + <a href="https://svn.cacert.org/CAcert/principles.html">Principles of the Community</a>. +</p> + +<h4 id="s2.5"> 2.5 Security </h4> +<p> +CAcert exists to help you to secure yourself. +You are primarily responsible for your own security. +Your security obligations include +</p> + +<ol><li> + to secure yourself and your computing platform (e.g., PC), + </li><li> + to keep your email account in good working order, + </li><li> + to secure your CAcert account + (e.g., credentials such as username, password), + </li><li> + to secure your private keys, + </li><li> + to review certificates for accuracy, + and + </li><li> + when in doubt, notify CAcert, + </li><li> + when in doubt, take other reasonable actions, such as + revoking certificates, + changing account credentials, + and/or generating new keys. +</li></ol> + +<p> +Where, above, 'secure' means to protect to a reasonable +degree, in proportion with your risks and the risks of +others. +</p> + +<h3 id="s3"> 3. Law and Jurisdiction </h3> + +<h4 id="s3.1"> 3.1 Governing Law </h4> + +<p> +This agreement is governed under the law of +New South Wales, Australia, +being the home of the CAcert Inc. Association. +</p> + +<h4 id="s3.2"> 3.2 Arbitration as Forum of Dispute Resolution </h4> + +<p> +You agree, with CAcert and all of the Community, +that all disputes arising out +of or in connection to our use of CAcert services +shall be referred to and finally resolved +by Arbitration under the rules within the +Dispute Resolution Policy of CAcert +(DRP => COD7). +The rules select a single Arbitrator chosen by CAcert +from among senior Members in the Community. +The ruling of the Arbitrator is binding and +final on Members and CAcert alike. +</p> + +<p> +In general, the jurisdiction for resolution of disputes +is within CAcert's own forum of Arbitration, +as defined and controlled by its own rules (DRP => COD7). +</p> + +<p> +We use Arbitration for many purposes beyond the strict +nature of disputes, such as governance and oversight. +A systems administrator may +need authorisation to conduct a non-routine action, +and Arbitration may provide that authorisation. +Thus, you may find yourself party to Arbitration +that is simply support actions, and you may file disputes in +order to initiate support actions. +</p> + +<h4 id="s3.3"> 3.3 Termination </h4> +<p> +You may terminate this agreement by resigning +from CAcert. You may do this at any time by +writing to CAcert's online support forum and +filing dispute to resign. +All services will be terminated, and your +certificates will be revoked. +However, some information will continue to +be held for certificate processing purposes. +</p> + +<p> +The provisions on Arbitration survive any termination +by you by leaving CAcert. +That is, even if you resign from CAcert, +you are still bound by the DRP (COD7), +and the Arbitrator may reinstate any provision of this +agreement or bind you to a ruling. +</p> + +<p> +Only the Arbitrator may terminate this agreement with you. +</p> + +<h4 id="s3.4"> 3.4 Changes of Agreement </h4> + +<p> +CAcert may from time to time vary the terms of this Agreement. +Changes will be done according to the documented CAcert policy +for changing policies, and is subject to scrutiny and feedback +by the Community. +Changes will be notified to you by email to your primary address. +</p> + +<p> +If you do not agree to the changes, you may terminate as above. +Continued use of the service shall be deemed to be agreement +by you. +</p> + +<h4 id="s3.5"> 3.5 Communication </h4> + +<p> +Notifications to CAcert are to be sent by +email to the address +<b>support</b> <i>at</i> CAcert.org. +You should attach a digital signature, +but need not do so in the event of security +or similar urgency. +</p> + +<p> +Notifications to you are sent +by CAcert to the primary email address +registered with your account. +You are responsible for keeping your email +account in good working order and able +to receive emails from CAcert. +</p> + +<p> +Arbitration is generally conducted by email. +</p> + +<h3 id="s4"> 4. Miscellaneous </h3> + +<h4 id="s4.1"> 4.1 Other Parties Within the Community </h4> + +<p> +As well as you and other Members in the Community, +CAcert forms agreements with third party +vendors and others. +Thus, such parties will also be in the Community. +Such agreements are also controlled by the same +policy process as this agreement, and they should +mirror and reinforce these terms. +</p> + + +<h4 id="s4.2"> 4.2 References and Other Binding Documents </h4> + +<p> +This agreement is CAcert Official Document 9 (COD9) +and is a controlled document. +</p> + +<p> +You are also bound by +</p> + +<ol><li> + <a href="https://www.cacert.org/policy/CertificationPracticeStatement.html"> + Certification Practice Statement</a> (CPS => COD6). + </li><li> + <a href="https://www.cacert.org/policy/DisputeResolutionPolicy.html"> + Dispute Resolution Policy</a> (DRP => COD7). + </li><li> + <a href="https://www.cacert.org/policy/PrivacyPolicy.html"> + Privacy Policy</a> (PP => COD5). + </li><li> + <a href="https://svn.cacert.org/CAcert/principles.html"> + Principles of the Community</a>. +</li></ol> + +<p> +Where documents are referred to as <i>=> COD x</i>, +they are controlled documents +under the control of Policy on Policies (COD1). +</p> + +<p> +This agreement and controlled documents above are primary, +and may not be replaced or waived except +by formal policy channels and by Arbitration. +</p> + +<h4 id="s4.3"> 4.3 Informative References </h4> + +<p> +The governing documents are in English. +Documents may be translated for convenience. +Because we cannot control the legal effect of translations, +the English documents are the ruling ones. +</p> + +<p> +You are encouraged to be familiar with the +Assurer Handbook, +which provides a more readable introduction for much of +the information needed. +The Handbook is not however an agreement, and is overruled +by this agreement and others listed above. +</p> + +<h4 id="s4.4"> 4.4 Not Covered in this Agreement </h4> + +<p> +<b>Intellectual Property.</b> +This Licence does not transfer any intellectual +property rights ("IPR") to you. CAcert asserts and +maintains its IPR over its roots, issued certificates, +brands, logos and other assets. +Note that the certificates issued to you +are CAcert's intellectual property +and you do not have rights other than those stated. +</p> +<p><a href="http://validator.w3.org/check?uri=referer"><img src="images/valid-html50-blue.png" alt="Valid HTML 5" height="31" width="88"></a></p> +</body> +</html> diff --git a/www/policy/CAcertCommunityAgreement.php b/www/policy/CAcertCommunityAgreement.php index 3106eb1..065ad2b 100644 --- a/www/policy/CAcertCommunityAgreement.php +++ b/www/policy/CAcertCommunityAgreement.php @@ -1,512 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> - -<html> -<head><title>CAcert Community Agreement</title></head> -<body> - - - - -<h3> <a name="0"> 0. </a> Introduction </h3> - -<p> -This agreement is between -you, being a registered member ("Member") -within CAcert's community at large ("Community") -and CAcert Incorporated ("CAcert"), -being an operator of services to the Community. -</p> - -<h4> <a name="0.1"> 0.1 </a> Terms </h4> -<ol><li> - "CAcert" - means CAcert Inc., - a non-profit Association of Members incorporated in - New South Wales, Australia. - Note that Association Members are distinct from - the Members defined here. - </li><li> - "Member" - means you, a registered participant within CAcert's Community, - with an account on the website and the - facility to request certificates. - Members may be individuals ("natural persons") - or organisations ("legal persons"). - </li><li> - "Organisation" - is defined under the Organisation Assurance programme, - and generally includes corporations and other entities - that become Members and become Assured. - </li><li> - "Community" - means all of the Members - that are registered by this agreement - and other parties by other agreements, - all being under CAcert's Arbitration. - </li><li> - "Non-Related Person" ("NRP"), - being someone who is not a - Member, is not part of the Community, - and has not registered their agreement. - Such people are offered the NRP-DaL - another agreement allowing the USE of certificates. - </li><li> - "Non-Related Persons - Disclaimer and Licence" ("NRP-DaL"), - another agreement that is offered to persons outside the - Community. - </li><li> - "Arbitration" - is the Community's forum for - resolving disputes, or jurisdiction. - </li><li> - "Dispute Resolution Policy" ("DRP" => COD7) - is the policy and - rules for resolving disputes. - </li><li> - "USE" - means the act by your software - to conduct its tasks, incorporating - the certificates according to software procedures. - </li><li> - "RELY" - means your human act in taking on a - risk and liability on the basis of the claim(s) - bound within a certificate. - </li><li> - "OFFER" - means the your act - of making available your certificate to another person. - Generally, you install and configure your software - to act as your agent and facilite this and other tasks. - OFFER does not imply suggestion of reliance. - </li><li> - "Issue" - means creation of a certificate by CAcert. - To create a certificate, - CAcert affixes a digital signature from the root - onto a public key and other information. - This act would generally bind a statement or claim, - such as your name, to your key. - </li><li> - "Root" - means CAcert's top level key, - used for signing certificates for Members. - In this document, the term includes any subroots. - </li><li> - "CAcert Official Document" ("COD" => COD3) - in a standard format for describing the details of - operation and governance essential to a certificate authority. - Changes are managed and controlled. - CODs define more technical terms. - See 4.2 for listing of relevant CODs. - </li><li> - "Certification Practice Statement" ("CPS" => COD6) - is the document that controls details - about operational matters within CAcert. -</li></ol> - - -<h3> <a name="1"> 1. </a> Agreement and Licence </h3> - -<h4> <a name="1.1"> 1.1 </a> Agreement </h4> - -<p> -You and CAcert both agree to the terms and conditions -in this agreement. -Your agreement is given by any of -</p> - -<ul><li> - your signature on a form to request assurance of identity - ("CAP" form), - </li><li> - your request on the website - to join the Community and create an account, - </li><li> - your request for Organisation Assurance, - </li><li> - your request for issuing of certificates, or - </li><li> - if you USE, RELY, or OFFER - any certificate issued to you. -</li></ul> - -<p> -Your agreement -is effective from the date of the first event above -that makes this agreement known to you. -This Agreement -replaces and supercedes prior agreements, -including the NRP-DaL. -</p> - - -<h4> <a name="1.2"> 1.2 </a> Licence </h4> - -<p> -As part of the Community, CAcert offers you these rights: -</p> - -<ol><li> - You may USE any certificates issued by CAcert. - </li><li> - You may RELY on any certificate issued by CAcert, - as explained and limited by CPS (COD6). - </li><li> - You may OFFER certificates issued to you by CAcert - to Members for their RELIANCE. - </li><li> - You may OFFER certificates issued to you by CAcert - to NRPs for their USE, within the general principles - of the Community. - </li><li> - This Licence is free of cost, - non-exclusive, and non-transferrable. -</li></ol> - -<h4> <a name="1.3"> 1.3 </a> Your Contributions </h4> - - -<p> -You agree to a non-exclusive non-restrictive non-revokable -transfer of Licence to CAcert for your contributions. -That is, if you post an idea or comment on a CAcert forum, -or email it to other Members, -your work can be used freely by the Community for -CAcert purposes, including placing under CAcert's licences -for wider publication. -</p> - -<p> -You retain authorship rights, and the rights to also transfer -non-exclusive rights to other parties. -That is, you can still use your -ideas and contributions outside the Community. -</p> - -<p> -Note that the following exceptions override this clause: -</p> - -<ol><li> - Contributions to controlled documents are subject to - Policy on Policy ("PoP" => COD1) - </li><li> - Source code is subject to an open source licence regime. -</li></ol> - -<h4> <a name="1.4"> 1.4 </a> Privacy </h4> - - -<p> -You give rights to CAcert to store, verify and process -and publish your data in accordance with policies in force. -These rights include shipping the data to foreign countries -for system administration, support and processing purposes. -Such shipping will only be done among -CAcert Community administrators and Assurers. -</p> - -<p> -Privacy is further covered in the Privacy Policy ("PP" => COD5). -</p> - -<h3> <a name="2"> 2. </a> Your Risks, Liabilities and Obligations </h3> - -<p> -As a Member, you have risks, liabilities -and obligations within this agreement. -</p> - -<h4> <a name="2.1"> 2.1 </a> Risks </h4> - -<ol><li> - A certificate may prove unreliable. - </li><li> - Your account, keys or other security tools may be - lost or otherwise compromised. - </li><li> - You may find yourself subject to Arbitration - (DRP => COD7). -</li></ol> - -<h4> <a name="2.2"> 2.2 </a> Liabilities </h4> - -<ol><li> - You are liable for any penalties - as awarded against you by the Arbitrator. - </li><li> - Remedies are as defined in the DRP (COD7). - An Arbitrator's ruling may - include monetary amounts, awarded against you. - </li><li> - Your liability is limited to - a total maximum of - <b>1000 Euros</b>. - </li><li> - "Foreign Courts" may assert jurisdiction. - These include your local courts, and are outside our Arbitration. - Foreign Courts will generally refer to the Arbitration - Act of their country, which will generally refer - civil cases to Arbitration. - The Arbitration Act will not apply to criminal cases. -</li></ol> - -<h4> <a name="2.3"> 2.3 </a> Obligations </h4> - -<p> - You are obliged -</p> - -<ol><li> - to provide accurate information - as part of Assurance. - You give permission for verification of the information - using CAcert-approved methods. - </li><li> - to make no false representations. - </li><li> - to submit all your disputes to Arbitration - (DRP => COD7). -</li></ol> - -<h4> <a name="2.4"> 2.4 </a> Principles </h4> - -<p> -As a Member of CAcert, you are a member of -the Community. - You are further obliged to - work within the spirit of the Principles - of the Community. - These are described in - <a href="http://svn.cacert.org/CAcert/principles.html">Principles of the Community</a>. -</p> - -<h4> <a name="2.5"> 2.5 </a> Security </h4> -<p> -CAcert exists to help you to secure yourself. -You are primarily responsible for your own security. -Your security obligations include -</p> - -<ol><li> - to secure yourself and your computing platform (e.g., PC), - </li><li> - to keep your email account in good working order, - </li><li> - to secure your CAcert account - (e.g., credentials such as username, password), - </li><li> - to secure your private keys, - </li><li> - to review certificates for accuracy, - and - </li><li> - when in doubt, notify CAcert, - </li><li> - when in doubt, take other reasonable actions, such as - revoking certificates, - changing account credentials, - and/or generating new keys. -</li></ol> - -<p> -Where, above, 'secure' means to protect to a reasonable -degree, in proportion with your risks and the risks of -others. -</p> - -<h3> <a name="3"> 3. </a> Law and Jurisdiction </h3> - -<h4> <a name="3.1"> 3.1 </a> Governing Law </h4> - -<p> -This agreement is governed under the law of -New South Wales, Australia, -being the home of the CAcert Inc. Association. -</p> - -<h4> <a name="3.2"> 3.2 </a> Arbitration as Forum of Dispute Resolution </h4> - -<p> -You agree, with CAcert and all of the Community, -that all disputes arising out -of or in connection to our use of CAcert services -shall be referred to and finally resolved -by Arbitration under the rules within the -Dispute Resolution Policy of CAcert -(DRP => COD7). -The rules select a single Arbitrator chosen by CAcert -from among senior Members in the Community. -The ruling of the Arbitrator is binding and -final on Members and CAcert alike. -</p> - -<p> -In general, the jurisdiction for resolution of disputes -is within CAcert's own forum of Arbitration, -as defined and controlled by its own rules (DRP => COD7). -</p> - -<p> -We use Arbitration for many purposes beyond the strict -nature of disputes, such as governance and oversight. -A systems administrator may -need authorisation to conduct a non-routine action, -and Arbitration may provide that authorisation. -Thus, you may find yourself party to Arbitration -that is simply support actions, and you may file disputes in -order to initiate support actions. -</p> - -<h4> <a name="3.3"> 3.3 </a> Termination </h4> -<p> -You may terminate this agreement by resigning -from CAcert. You may do this at any time by -writing to CAcert's online support forum and -filing dispute to resign. -All services will be terminated, and your -certificates will be revoked. -However, some information will continue to -be held for certificate processing purposes. -</p> - -<p> -The provisions on Arbitration survive any termination -by you by leaving CAcert. -That is, even if you resign from CAcert, -you are still bound by the DRP (COD7), -and the Arbitrator may reinstate any provision of this -agreement or bind you to a ruling. -</p> - -<p> -Only the Arbitrator may terminate this agreement with you. -</p> - -<h4> <a name="3.4"> 3.4 </a> Changes of Agreement </h4> - -<p> -CAcert may from time to time vary the terms of this Agreement. -Changes will be done according to the documented CAcert policy -for changing policies, and is subject to scrutiny and feedback -by the Community. -Changes will be notified to you by email to your primary address. -</p> - -<p> -If you do not agree to the changes, you may terminate as above. -Continued use of the service shall be deemed to be agreement -by you. -</p> - -<h4> <a name="3.5"> 3.5 </a> Communication </h4> - -<p> -Notifications to CAcert are to be sent by -email to the address -<b>support</b> <i>at</i> CAcert.org. -You should attach a digital signature, -but need not do so in the event of security -or similar urgency. -</p> - -<p> -Notifications to you are sent -by CAcert to the primary email address -registered with your account. -You are responsible for keeping your email -account in good working order and able -to receive emails from CAcert. -</p> - -<p> -Arbitration is generally conducted by email. -</p> - -<h3> <a name="4"> 4. </a> Miscellaneous </h3> - -<h4> <a name="4.1"> 4.1 </a> Other Parties Within the Community </h4> - -<p> -As well as you and other Members in the Community, -CAcert forms agreements with third party -vendors and others. -Thus, such parties will also be in the Community. -Such agreements are also controlled by the same -policy process as this agreement, and they should -mirror and reinforce these terms. -</p> - - -<h4> <a name="4.2"> 4.2 </a> References and Other Binding Documents </h4> - -<p> -This agreement is CAcert Official Document 9 (COD9) -and is a controlled document. -</p> - -<p> -You are also bound by -</p> - -<ol><li> - <a href="http://www.cacert.org/policy/CertificationPracticeStatement.php"> - Certification Practice Statement</a> (CPS => COD6). - </li><li> - <a href="http://www.cacert.org/policy/DisputeResolutionPolicy.php"> - Dispute Resolution Policy</a> (DRP => COD7). - </li><li> - <a href="PrivacyPolicy.html"> - Privacy Policy</a> (PP => COD5). - </li><li> - <a href="http://svn.cacert.org/CAcert/principles.html"> - Principles of the Community</a>. -</li></ol> - -<p> -Where documents are referred to as <i>=> COD x</i>, -they are controlled documents -under the control of Policy on Policies (COD1). -</p> - -<p> -This agreement and controlled documents above are primary, -and may not be replaced or waived except -by formal policy channels and by Arbitration. -</p> - -<h4> <a name="4.3"> 4.3 </a> Informative References </h4> - -<p> -The governing documents are in English. -Documents may be translated for convenience. -Because we cannot control the legal effect of translations, -the English documents are the ruling ones. -</p> - -<p> -You are encouraged to be familiar with the -Assurer Handbook, -which provides a more readable introduction for much of -the information needed. -The Handbook is not however an agreement, and is overruled -by this agreement and others listed above. -</p> - -<h4> <a name="4.4"> 4.4 </a> Not Covered in this Agreement </h4> - -<p> -<b>Intellectual Property.</b> -This Licence does not transfer any intellectual -property rights ("IPR") to you. CAcert asserts and -maintains its IPR over its roots, issued certificates, -brands, logos and other assets. -Note that the certificates issued to you -are CAcert's intellectual property -and you do not have rights other than those stated. -</p> - - -</body> -</html> +<?php +header('HTTP/1.0 301 Moved Permanently'); +header('Location: CAcertCommunityAgreement.html'); +exit();
\ No newline at end of file diff --git a/www/policy/CertificationPracticeStatement.html b/www/policy/CertificationPracticeStatement.html new file mode 100644 index 0000000..7cfbc15 --- /dev/null +++ b/www/policy/CertificationPracticeStatement.html @@ -0,0 +1,4543 @@ +<!DOCTYPE HTML> +<html> +<head> + <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8" lang="en"> + <!--meta name="copyright" content="CAcert Inc http://www.cacert.org/" --> + <title>Certification Practice Statement (CPS)</title> + +<!--[if lt IE 9]> +<script> + var e = ("abbr,article,aside,audio,canvas,datalist,details," + + "figure,footer,header,hgroup,mark,menu,meter,nav,output," + + "progress,section,time,video").split(','); + for (var i = 0; i < e.length; i++) { + document.createElement(e[i]); + } +</script> +<![endif]--> + +<style type="text/css"> + +/* mark HTML5 block elements as such for HTML5 unaware browsers */ +article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block} + +body { + font-family : verdana, helvetica, arial, sans-serif; +} + +pre, code, kbd, tt, samp, .pre { + font-family: Fixedsys,Courier,monospace; + list-style-type: none; +} + +th { + font-weight: normal; +} + +td, th{ + padding: 5px; +} + +dt { + font-weight: bold; +} + +.blockpar { + text-indent : 2em; + margin-top : 0em; + margin-bottom : 0.5em; + text-align : justify; +} + +figcaption { + text-align : center; + color : gray; + margin-top : 0.5em; +} + +.center { + text-align : center; +} + +.q { + color : green; + font-weight: bold; + text-align: center; + font-style:italic; +} + +.error { + color : red; + font-weight: bold; + text-align: center; + font-style:italic; +} + +.change { + color : blue; + font-weight: bold; +} + +.strike { + color : blue; + text-decoration:line-through; +} + +a:hover { + /*background-color : #666666;*/ + color: #333333; +} + +.c { + text-align : center; +} + +.l { + text-align: left; +} + +.r { + text-align : right; +} + +.i { + font-style : italic; +} + +.b { + font-weight:bold; +} + +.parentC { + margin-left:auto; + margin-right:auto; +} + +.clrGreen { + color: green; + border-color: inherit; + } + +.clrRed { + color: red; + border-color: inherit; + } +.bgClrOrange { + background-color: #ffa500; + } + +.bgClrRed { + background-color: red; + } + +.size1{ + font-size: 1.1em; + } + +.size3{ + font-size: 2em; + } + +.u{ + text-decoration:underline; + } + +.vTop{ +vertical-align:top; +} + +.importend { + border: 6px solid #000; + background-color: #fff; + color: #000; /*bordercolor*/ + padding: 5px; + margin: 1em 4em 0em 4em; +} +.importend div { + margin-top: 3em; + margin-bottom: 3em; +} + .importend-header { + border: 1px solid red; + border-width: 1px 2px 2px 1px; + margin-top: 1.6em; + background-color: #fcc; + width: 10%; + font-weight: bold; + text-align: center; + color: #666; +} +</style> + + +</head> +<body> + + +<header> + +<table style="width: 100%;"> +<tr> +<td>Name: CAcert CPS and CP <a style="color: steelblue" href="https://svn.cacert.org/CAcert/Policies/ControlledDocumentList.html">COD6</a><br /> +Status: DRAFT <a href="https://wiki.cacert.org/PolicyDecisions#p20091108">p20091108</a>, DRAFT <a href="https://wiki.cacert.org/PolicyDecisions#p20111113">p20111113</a><br /> +Caveat: this document is already <a href="https://www.cacert.org/policy/CertificationPracticeStatement.html">on the main website in DRAFT</a>. p20111113.<br /> +Creation date: 20060726<br /> +Changes: <span class="change">p20111113, 20130309</span><br /> +Licence: <a style="color: steelblue" href="https://wiki.cacert.org/Policy#Licence" title="this document is Copyright © CAcert Inc., licensed openly under CC-by-sa with all disputes resolved under DRP. More at wiki.cacert.org/Policy" > CC-by-sa+DRP </a> +</td> +<td class="r"> + <a href="https://www.cacert.org/policy/PolicyOnPolicy.html"><img src="images/cacert-draft.png" alt="CPS Status - DRAFT" height="31" width="88" style="border-style: none;" /></a> +</td> +</tr> +</table> + +<br /> + + +<h1>CAcert CPS and CP</h1> + +<!-- $Id: CertificationPracticeStatement.html,v 1.3 2012-07-27 16:00:29 wytze Exp $ --> + + +<nav style="font-size: 12pt;"> + +<ol> + <li> <a href="#p1">INTRODUCTION</a> + <ul> + <li><a href="#p1.1">1.1. Overview</a></li> + <li><a href="#p1.2">1.2. Document name and identification</a></li> + <li><a href="#p1.3">1.3. PKI participants</a> </li> + <li><a href="#p1.4">1.4. Certificate usage</a> </li> + <li><a href="#p1.5">1.5. Policy administration</a> </li> + <li><a href="#p1.6">1.6. Definitions and acronyms</a></li> + </ul> + </li> + <li> <a href="#p2">PUBLICATION AND REPOSITORY RESPONSIBILITIES</a> + <ul> + <li><a href="#p2.1">2.1. Repositories</a></li> + <li><a href="#p2.2">2.2. Publication of certification information</a></li> + <li><a href="#p2.3">2.3. Time or frequency of publication</a></li> + <li><a href="#p2.4">2.4. Access controls on repositories</a></li> + </ul> + </li> + <li> <a href="#p3">IDENTIFICATION AND AUTHENTICATION (I&A)</a> + <ul> + <li><a href="#p3.1">3.1. Naming</a> </li> + <li><a href="#p3.2">3.2. Initial Identity Verification</a> </li> + <li><a href="#p3.3">3.3. I&A for Re-key Requests</a> </li> + <li><a href="#p3.4">3.4. I&A for Revocation Request</a></li> + </ul> + </li> + <li><a href="#p4">CERTIFICATE LIFE-CYCLE OPERATIONAL REQUIREMENTS</a> + <ul> + <li><a href="#p4.1">4.1. Certificate Application</a> </li> + <li><a href="#p4.2">4.2. Certificate application processing</a> </li> + <li><a href="#p4.3">4.3. Certificate issuance</a> </li> + <li><a href="#p4.4">4.4. Certificate acceptance</a> </li> + <li><a href="#p4.5">4.5. Key pair and certificate usage</a> </li> + <li><a href="#p4.6">4.6. Certificate renewal</a> </li> + <li><a href="#p4.7">4.7. Certificate re-key</a> </li> + <li><a href="#p4.8">4.8. Certificate modification</a> </li> + <li><a href="#p4.9">4.9. Certificate revocation and suspension</a> </li> + <li><a href="#p4.10">4.10. Certificate status services</a> </li> + <li><a href="#p4.11">4.11. End of subscription</a></li> + <li><a href="#p4.12">4.12. Key escrow and recovery</a> </li> + </ul> + </li> + <li><a href="#p5">FACILITY, MANAGEMENT, AND OPERATIONAL CONTROLS</a> + <ul> + <li><a href="#p5.1">5.1. Physical controls</a> </li> + <li><a href="#p5.2">5.2. Procedural controls</a> </li> + <li><a href="#p5.3">5.3. Personnel controls</a> </li> + <li><a href="#p5.4">5.4. Audit logging procedures</a> </li> + <li><a href="#p5.5">5.5. Records archival</a> </li> + <li><a href="#p5.6">5.6. Key changeover</a></li> + <li><a href="#p5.7">5.7. Compromise and disaster recovery</a> </li> + <li><a href="#p5.8">5.8. CA or RA termination</a></li> + </ul> + </li> + <li><a href="#p6">TECHNICAL SECURITY CONTROLS</a> + <ul> + <li><a href="#p6.1">6.1. Key pair generation and installation</a> </li> + <li><a href="#p6.2">6.2. Private Key Protection and Cryptographic Module Engineering Controls</a> </li> + <li><a href="#p6.3">6.3. Other aspects of key pair management</a> </li> + <li><a href="#p6.4">6.4. Activation data</a> </li> + <li><a href="#p6.5">6.5. Computer security controls</a> </li> + <li><a href="#p6.6">6.6. Life cycle technical controls</a> </li> + <li><a href="#p6.7">6.7. Network security controls</a></li> + <li><a href="#p6.8">6.8. Time-stamping</a></li> + </ul> + </li> + <li><a href="#p7">CERTIFICATE, CRL, AND OCSP PROFILES</a> + <ul> + <li><a href="#p7.1">7.1. Certificate profile</a> </li> + <li><a href="#p7.2">7.2. CRL profile</a> </li> + <li><a href="#p7.3">7.3. OCSP profile</a> </li> + </ul> + </li> + <li><a href="#p8">COMPLIANCE AUDIT AND OTHER ASSESSMENTS</a> + <ul> + <li><a href="#p8.1">8.1. Frequency or circumstances of assessment</a></li> + <li><a href="#p8.2">8.2. Identity/qualifications of assessor</a></li> + <li><a href="#p8.3">8.3. Assessor's relationship to assessed entity</a></li> + <li><a href="#p8.4">8.4. Topics covered by assessment</a></li> + <li><a href="#p8.5">8.5. Actions taken as a result of deficiency</a></li> + <li><a href="#p8.6">8.6. Communication of results</a></li> + </ul> + </li> + <li><a href="#p9">OTHER BUSINESS AND LEGAL MATTERS</a> + <ul> + <li><a href="#p9.1">9.1. Fees</a> </li> + <li><a href="#p9.2">9.2. Financial responsibility</a> </li> + <li><a href="#p9.3">9.3. Confidentiality of business information</a> </li> + <li><a href="#p9.4">9.4. Privacy of personal information</a> </li> + <li><a href="#p9.5">9.5. Intellectual property rights</a></li> + <li><a href="#p9.6">9.6. Representations and warranties</a> </li> + <li><a href="#p9.7">9.7. Disclaimers of warranties</a></li> + <li><a href="#p9.8">9.8. Limitations of liability</a></li> + <li><a href="#p9.9">9.9. Indemnities</a></li> + <li><a href="#p9.10">9.10. Term and termination</a> </li> + <li><a href="#p9.11">9.11. Individual notices and communications with participants</a></li> + <li><a href="#p9.12">9.12. Amendments</a> </li> + <li><a href="#p9.13">9.13. Dispute resolution provisions</a></li> + <li><a href="#p9.14">9.14. Governing law</a></li> + <li><a href="#p9.15">9.15. Compliance with applicable law</a></li> + <li><a href="#p9.16">9.16. Miscellaneous provisions</a> </li> + </ul> + </li> +</ol> + +</nav> + +</header> + + +<!-- *************************************************************** --> +<section id="p1"> +<h2>1. INTRODUCTION</h2> + +<section id="p1.1"> +<h3>1.1. Overview</h3> + +<p> +This document is the Certification Practice Statement (CPS) of +CAcert, the Community Certification Authority (CA). +It describes rules and procedures used by CAcert for +operating its CA, +and applies to all CAcert PKI Participants, +including Assurers, Members, and CAcert itself. +</p> +</section> + +<section id="p1.2"> +<h3>1.2. Document name and identification</h3> + +<p> +This document is the Certification Practice Statement (CPS) of CAcert. +The CPS also fulfills the role of the Certificate Policy (CP) +for each class of certificate. +</p> + +<ul> + <li> + This document is COD6 under CAcert Official Documents numbering scheme. + </li> + <li> + The document is structured according to + Chokhani, et al, + <a href="http://www.ietf.org/rfc/rfc3647.txt">RFC3647</a>, + <a href="http://tools.ietf.org/html/rfc3647#section-4">chapter 4</a>. + All headings derive from that Chapter. + </li> + <li> + It has been improved and reviewed (or will be reviewed) + to meet or exceed the criteria of the + <cite>Certificate Authority Review Checklist</cite> + from <em>David E. Ross</em> ("DRC") + and Mozilla Foundation's CA policy. + </li> + <li> + OID assigned to this document: 1.3.6.1.4.1.18506.4.4.x (x=approved Version) + (<a href="http://www.iana.org/assignments/enterprise-numbers">iana.org</a>) + + </li> + <li> + © CAcert Inc. 2006-2009. + <!-- note that CCS policies must be controlled by CAcert Inc. --> + </li> + <li> + Issued under the CAcert document licence policy, + as and when made policy. + See <a href="https://wiki.cacert.org/PolicyDrafts/DocumentLicence"> + PolicyDrafts/DocumentLicence</a>. + + </li> + <li> + Earlier notes were written by Christian Barmala + in a document placed under GNU Free Document License + and under FSF copyright. + However this clashed with the control provisions of + Configuration-Control Specification + (COD2) within Audit criteria. + </li> +</ul> + +<p> +The CPS is an authoritive document, +and rules other documents +except where explicitly deferred to. +See also <a href="#p1.5.1">1.5.1 Organisation Administering the Document</a>. +</p> +</section> + +<section id="p1.3"> +<h3>1.3. PKI participants</h3> + +<p> +The CA is legally operated by CAcert Incorporated, +an Association registered in 2002 in +New South Wales, Australia, +on behalf of the wider Community of Members of CAcert. +The Association details are at the +<a href="https://wiki.cacert.org/CAcertInc">CAcert wiki</a>. +</p> + +<p> +CAcert is a Community formed of Members who agree to the +CAcert Community Agreement (<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html">COD9</a>). +The CA is technically operated by the Community, +under the direction of the Board of CAcert Incorporated. +(The Members of the Community are not to be confused +with the <em>Association Members</em>, which latter are +not referred to anywhere in this CPS.) +</p> + +<section id="p1.3.1"> +<h4>1.3.1. Certification authorities</h4> +<p> +CAcert does not issue certificates to external +intermediate CAs under the present CPS. +</p> +</section> + +<section id="p1.3.2"> +<h4>1.3.2. Registration authorities</h4> +<p> +Registration Authorities (RAs) are controlled under Assurance Policy +(<a href="https://www.cacert.org/policy/AssurancePolicy.html">COD13</a>). +</p> +</section> + +<section id="p1.3.3"> +<h4>1.3.3. Subscribers</h4> + +<p> +CAcert issues certificates to Members only. +Such Members then become Subscribers. +</p> +</section> + +<section id="p1.3.4"> +<h4>1.3.4. Relying parties</h4> + +<p> +A relying party is a Member, +having agreed to the +CAcert Community Agreement +(<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html">COD9</a>), +who, in the act of using a CAcert certificate, +makes a decision on the basis of that certificate. +</p> +</section> + +<section id="p1.3.5"> +<h4>1.3.5. Other participants</h4> + +<dl> + +<dt>Member</dt> +<dd>Membership of the Community is as defined in the +<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html">COD9</a>. +Only Members may RELY or may become Subscribers. +Membership is free. +</dd> + +<dt>Arbitrator</dt> +<dd>A senior and experienced Member of the CAcert Community +who resolves disputes between Members, including ones +of certificate reliance, under +Dispute Resolution Policy +(<a href="https://www.cacert.org/policy/DisputeResolutionPolicy.html">COD7</a>). +</dd> + +<dt>Vendor</dt> +<dd>Software suppliers who integrate the root certificates of CAcert +into their software also assume a proxy role of Relying Parties, +and are subject to another licence. +</dd> + +<dt>Non-Related Persons (NRPs)</dt> +<dd>These are users of browsers and similar software who are +unaware of the CAcert certificates they may use, and +are unaware of the ramifications of usage. +Their relationship with CAcert +is described by the +Root Distribution License +(<a href="https://www.cacert.org/policy/RootDistributionLicense.html">COD14</a>). +No other rights nor relationship is implied or offered. +</dd> + +</dl> +</section> + +</section> + +<section id="p1.4"> +<h3>1.4. Certificate usage</h3> + +<p>CAcert serves as issuer of certificates for +individuals, businesses, governments, charities, +associations, churches, schools, +non-governmental organisations or other groups. +CAcert certificates are intended for low-cost +community applications especially where volunteers can +become Assurers and help CAcert to help the Community. +</p> + +<p> +Types of certificates and their appropriate and +corresponding applications are defined in +<a href="#p1.4.1">§1.4.1</a>. +Prohibited applications are defined in <a href="#p1.4.2">§1.4.2</a>. +Specialist uses may be agreed by contract or within +a specific environment, as described in +<a href="#p1.4.4">§1.4.4</a>. +Note also the +unreliable applications in +<a href="#p1.4.3">§1.4.3</a> +and risks, liabilities and obligations in +<a href="#p9">§9</a>. +</p> + +<figure id="t1.4"> +<table border="1" class="parentC"> +<thead> + <tr> + <th colspan="2" class="i">Type</th> + <th colspan="2" class="i">Appropriate Certificate uses</th> + </tr> + <tr> + <th class="b">General</th> + <th class="b">Protocol</th> + <th class="b">Description</th> + <th class="b">Comments</th> + </tr> +</thead> +<tbody> + <tr> + <th scope="rowgroup" rowspan="2">Server</th> + <th scope="row" class="l"> TLS </th> + <td> web server encryption </td> + <td> enables encryption </td> + </tr> + <tr> + <th scope="row" class="l"> embedded </th> + <td> embedded server authentication </td> + <td> mail servers, IM-servers </td> + </tr> +</tbody> +<tbody> + <tr> + <th scope="rowgroup" rowspan="4">Client</th> + <th scope="row" class="l"> S/MIME </th> + <td> email encryption </td> + <td> "digital signatures" employed in S/MIME + are not legal / human signatures, + but instead enable the encryption mode of S/MIME </td> + </tr> + <tr> + <th scope="row" class="l"> TLS </th> + <td> client authentication </td> + <td> the nodes must be secure </td> + </tr> + <tr> + <th scope="row" class="l"> TLS </th> + <td> web based signature applications </td> + <td> the certificate authenticates only. See <a href="#p1.4.3">§1.4.3</a>. </td> + </tr> + <tr> + <th scope="row" class="l"> "Digital Signing" </th> + <td> for human signing over documents </td> + <td> Only within a wider application and rules + such as by separate policy, + as agreed by contract, etc. + See <a href="#p1.4.4">§1.4.4</a>. + </td> + </tr> +</tbody> +<tbody> + <tr> + <th scope="rowgroup">Code</th> + <th scope="row" class="l"> Authenticode, ElfSign, Java </th> + <td> Code Signing </td> + <td> Signatures on packages are evidence of their Membership and indicative of Identity </td> + </tr> +</tbody> +<tbody> + <tr> + <th scope="rowgroup">PGP</th> + <th scope="row" class="l"> OpenPGP </th> + <td> Key Signing </td> + <td> Signatures on Member Keys are evidence of their Membership and indicative of Identity </td> + </tr> +</tbody> +<tbody> + <tr> + <th scope="rowgroup">Special</th> + <th scope="row" class="l"> X.509 </th> + <td> OCSP, Timestamping </td> + <td> Only available to CAcert Systems Administrators, as controlled by Security Policy </td> + </tr> +</tbody> +</table> + +<figcaption>Table 1.4. Types of Certificate</figcaption> +</figure> + + +<section id="p1.4.1"> +<h4>1.4.1. Appropriate certificate uses</h4> + +<p> +General uses. +</p> + +<ul><li> + CAcert server certificates can be used to enable encryption + protection in web servers. + Suitable applications include webmail and chat forums. + </li><li> + CAcert server certificates can be used to enable encryption + in SSL/TLS links in embedded protocols such as mail servers + and IM-servers. + </li><li> + CAcert client certificates can be used to enable encryption + protection in email clients. + (See <a href="#p1.4.3">§1.4.3</a> for caveat on signatures.) + </li><li> + CAcert client certificates can be used to replace password-based + authentication to web servers. + </li><li> + OpenPGP keys with CAcert signatures can be used + to encrypt and sign files and emails, + using software compatible with OpenPGP. + </li><li> + CAcert client certificates can be used in web-based + authentication applications. + </li><li> + CAcert code signing certificates can be used to sign code + for distribution to other people. + </li><li> + Time stamping can be used to attach a time record + to a digital document. +</li></ul> +</section> + + +<section id="p1.4.2"> +<h4>1.4.2. Prohibited certificate uses</h4> +<p> +CAcert certificates are not designed, intended, or authorised for +the following applications: +</p> +<ul><li> + Use or resale as control equipment in hazardous circumstances + or for uses requiring fail-safe performance such as the operation + of nuclear facilities, aircraft navigation or communication systems, + air traffic control systems, or weapons control systems, + where failure could lead directly to death, personal injury, + or severe environmental damage. +</li></ul> +</section> + +<section id="p1.4.3"> +<h4>1.4.3. Unreliable Applications</h4> + +<p> +CAcert certificates are not designed nor intended for use in +the following applications, and may not be reliable enough +for these applications: +</p> + +<dl> + <dt>Signing within Protocols</dt> + <dd> + Digital signatures made by CAcert certificates carry + <span class="u">NO default legal or human meaning</span>. + See <a href="#p9.15.1">§9.15.1</a>. + Especially, protocols such as S/MIME commonly will automatically + apply digital signatures as part of their protocol needs. + The purpose of the cryptographic signature in S/MIME + and similar protocols is limited by default to strictly + protocol security purposes: + to provide some confirmation that a familiar certificate + is in use, to enable encryption, and to ensure the integrity + of the email in transit. + </dd> + + <dt>Non-repudiation applications</dt> + <dd> + Non-repudiation is not to be implied from use of + CAcert certificates. Rather, certificates may + provide support or evidence of actions, but that + evidence is testable in any dispute. + </dd> + + <dt>Ecommerce applications</dt> + <dd> + Financial transactions or payments or valuable e-commerce. + </dd> + + <dt>Identity verification</dt> + <dd> + Use of anonymous (Class 1 or Member SubRoot) certificates + in any application that requires or expects identity. + </dd> +</dl> +</section> + + +<section id="p1.4.4"> +<h4>1.4.4. Limited certificate uses</h4> + +<p> +By contract or within a specific environment +(e.g. internal to a company), +CAcert Members are permitted to use Certificates +for higher security, customised or experimental applications. +Any such usage, however, is limited to such entities +and these entities take on the whole responsible for +any harm or liability caused by such usage. +</p> + +<dl> + <dt>Digital signing applications</dt> + <dd>CAcert client certificates + may be used by Assured Members in + applications that provide or support the human signing of documents + (known here as "digital signing"). + This must be part of a wider framework and set of rules. + Usage and reliance + must be documented either under a separate CAcert digital signing + policy or other external regime agreed by the parties.</dd> +</dl> +</section> + +<section id="p1.4.5"> +<h4>1.4.5. Roots and Names</h4> + +<dl> +<dt>Named Certificates</dt> +<dd> +Assured Members may be issued certificates +with their verified names in the certificate. In this role, CAcert +operates and supports a network of Assurers who verify the +identity of the Members. +All Names are verified, either by Assurance or another defined +method under policy (c.f. Organisations). +</dd> + +<dt>Anonymous Certificates.</dt> +<dd> +Members can be issued certificates that are anonymous, +which is defined as the certificate with no Name included, +or a shared name such as "Community Member". +These may be considered to be somewhere between Named certificates +and self-signed certificates. They have serial numbers in them +which is ultimately traceable via dispute to a Member, but +reliance is undefined. +In this role, CAcert provides the +infrastructure, saving the Members from managing a difficult +and messy process in order to get manufactured certificates. +</dd> + +<dt>Psuedonymous Certificates</dt> +<dd> +Note that CAcert does not currently issue pseudonymous certificates, +being those with a name chosen by the Member and not verifiable +according to documents. +</dd> + +<dt>Advanced Certificates</dt> +<dd> +Members who are as yet unassured are not permitted to create +advanced forms such as wildcard or subjectAltName +certificates. +</dd> + + +<dt>Roots</dt> +<dd> +The CAcert root layout is as below. +These roots are pending Audit, +and will be submitted to vendors via the (Top-level) Root. +<dl> + <dt>(Top-level) Root</dt> + <dd> + Used to sign on-line CAcert SubRoots only. + This Root is kept offline. + </dd> + + <dt>Member SubRoot</dt> + <dd> + For Community Members who are new and unassured (some restrictions exist). + Reliance is undefined. + (Replacement for the Class 1 root, matches "Domain Validation" type.) + </dd> + + <dt>Assured SubRoot</dt> + <dd> + Only available for Assured individual Members, + intended to sign certificates with Names. + Suitable for Reliance under this and other policies. + Approximates the type known as Individual Validation. + </dd> + + <dt>Organisation SubRoot</dt> + <dd> + Only available for Assured Organisation Members. + Suitable for Reliance under this and other policies. + Approximates the type known as Organisational Validation. + </dd> +</dl> +</dl> + + +<figure id="t1.4.5.b"> +<table border="1" class="parentC"> +<thead> + <tr> + <th></th> + <th colspan="5" class="i">Level of Assurance</th> + <th></th> + </tr> + <tr> + <th></th> + <th colspan="2" class="b">Members †</th> + <th colspan="2" class="b">Assured Members</th> + <th colspan="1" class="b">Assurers</th> + <th colspan="1" class="b"></th> + </tr> + <tr> + <th class="i">Class of Root</th> + <th class="b">Anon</th> + <th>Name</th> + <th>Anon</th> + <th class="b">Name</th> + <th>Name+Anon</th> + <th class="i">Remarks</th> + </tr> +</thead> +<tbody> + <tr> + <th scope="row">Top level<br><strong>Root</strong></th> + <td title="pass" class="c clrGreen size3"> •</td> + <td title="pass" class="c clrGreen size3"> •</td> + <td title="pass" class="c clrGreen size3"> •</td> + <td title="pass" class="c clrGreen size3"> •</td> + <td title="pass" class="c clrGreen size3"> •</td> + <td> Signs other CAcert SubRoots only. </td> + </tr> + <tr> + <th scope="row"><strong>Member</strong><br>SubRoot</th> + <td title="pass" class="c clrGreen size3"> ✔</td> + <td title="fail" class="c clrRed size3"> ✘</td> + <td title="pass" class="c clrGreen size3"> ✔</td> + <td title="pass" class="c clrGreen size3"> ✔</td> + <td title="pass" class="c clrGreen size3"> ✔</td> + <td> † For Members meeting basic checks in <a href="#p4.2.2">§4.2.2</a><br>(Reliance is undefined.) </td> + </tr> + <tr> + <th scope="row"><strong>Assured</strong><br>SubRoot</th> + <td title="fail" class="c clrRed size3"> ✘</td> + <td title="fail" class="c clrRed size3"> ✘</td> + <td title="pass" class="c clrGreen size3"> ✔</td> + <td title="pass" class="c clrGreen size3"> ✔</td> + <td title="pass" class="c clrGreen size3"> ✔</td> + <td> Assured Members only.<br>Fully intended for reliance. </td> + </tr> + <tr> + <th scope="row"><strong>Organisation</strong><br>SubRoot</th> + <td title="fail" class="c clrRed size3"> ✘</td> + <td title="fail" class="c clrRed size3"> ✘</td> + <td title="pass" class="c clrGreen size3"> ✔</td> + <td title="pass" class="c clrGreen size3"> ✔</td> + <td title="pass" class="c clrGreen size3"> ✔</td> + <td> Assured Organisation Members only.<br>Fully intended for reliance. </td> + </tr> + <tr> + <th scope="row">Expiry of Certificates</th> + <td colspan="2" class="c">6 months</td> + <td colspan="3" class="c">24 months</td> + <td></td> + </tr> + <tr> + <th scope="row">Types</th> + <td colspan="2" class="c">client, server</td> + <td colspan="2" class="c">wildcard, subjectAltName</td> + <td colspan="1" class="c">code-signing</td> + <td> (Inclusive to the left.) </td> + </tr> +</tbody> +</table> + +<figcaption>Table 1.4.5.b Certificate under Audit Roots</figcaption> +</figure> + +</section> + +</section> + + +<section id="p1.5"> +<h3>1.5. Policy administration</h3> + +<p>See <a href="#p1.2">1.2 Document Name and Identification</a> + for general scope of this document.</p> + +<section id="p1.5.1"> +<h4>1.5.1. Organization administering the document</h4> + +<p> +This document is administered by the policy group of +the CAcert Community under Policy on Policy (<a href="https://www.cacert.org/policy/PolicyOnPolicy.html">COD1</a>). +</p> +</section> + +<section id="p1.5.2"> +<h4>1.5.2. Contact person</h4> +<p> +For questions including about this document: +</p> +<ul> + <li>Join the policy group, by means of the discussion forum at + <a href="https://lists.cacert.org/wws/lists"> + lists.cacert.org</a> . </li> + <li>Send email to < support AT cacert DOT org > </li> + <li>IRC: irc.cacert.org #CAcert (ssl port 7000, non-ssl port 6667)</li> +</ul> +</section> + +<section id="p1.5.3"> +<h4>1.5.3. Person determining CPS suitability for the policy</h4> +<p> +This CPS and all other policy documents are managed by +the policy group, which is a group of Members of the +Community found at policy forum. See discussion forums above. +</p> +</section> + +<section id="p1.5.4"> +<h4>1.5.4. CPS approval procedures</h4> +<p> +CPS is controlled and updated according to the +Policy on Policy +(<a href="https://www.cacert.org/policy/PolicyOnPolicy.html">COD1</a>) +which is part of +Configuration-Control Specification (<a href="https://svn.cacert.org/CAcert/Policies/ConfigurationControlSpecification.html">COD2</a>). +</p> + +<p> +In brief, the policy forum prepares and discusses. +After a last call, the document moves to DRAFT status +for a defined period. +If no challenges have been received in the defined period, +it moves to POLICY status. +The process is modelled after some elements of +the RFC process by the IETF. +</p> +</section> + +<section id="p1.5.5"> +<h4>1.5.5 CPS updates</h4> + +<p> +As per above. +</p> +</section> + +</section> + + +<section id="p1.6"> +<h3>1.6. Definitions and acronyms</h3> + +<dl> + +<dt id="d_cert">Certificate</dt> +<dd> + A certificate is a piece of cryptographic data used + to validate certain statements, especially those of + identity and membership. +</dd> + +<dt id="d_cacert">CAcert</dt> +<dd> + CAcert is a Community certificate authority as defined under + <a href="#p1.2">§1.2 Identification</a>. +</dd> + +<dt id="d_member">Member</dt> +<dd> + Everyone who agrees to the + CAcert Community Agreement + (<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html">COD9</a>). + This generally implies having an account registered + at CAcert and making use of CAcert's data, programs or services. + A Member may be an individual ("natural person") + or an organisation (sometimes, "legal person"). +</dd> + +<dt id="d_community">Community</dt> +<dd> + The group of Members who agree to the + CAcert Community Agreement + (<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html">COD9</a>) + or equivalent agreements. +</dd> + +<dt id="d_unassured">Unassured Member</dt> +<dd> + A Member who has not yet been Assured. +</dd> + +<dt id="d_subscriber">Subscriber</dt> +<dd> + A Member who requests and receives a certificate. +</dd> + +<dt id="d_assured">Assured Member</dt> +<dd> + A Member whose identity has been sufficiently + verified by Assurers or other + approved methods under Assurance Policy. +</dd> + +<dt id="d_assurer">Assurer</dt> +<dd> + An Assured Member who is authorised under Assurance Policy + to verify the identity of other Members. +</dd> + +<dt id="d_name">Name</dt> +<dd> + As defined in the + Assurance Policy + (<a href="https://www.cacert.org/policy/AssurancePolicy.html">COD13</a>), + to describe a name of a Member + that is verified by the Assurance process. +</dd> + +<dt id="d_oadmin">Organisation Administrator</dt> +<dd> + ("O-Admin") + An Assurer who is authorised to act for an Organisation. + The O-Admin is authorised by an organisation + to vouch for the identity of other users of the organisation. +</dd> + +<dt id="d_org_ass">Organisation Assurer</dt> +<dd> + An Assurer who is authorised to conduct assurances on + organisations. +</dd> + +<dt id="d_user">Non-Related Persons</dt> +<dd> + ("NRPs") + are general users of browsers and similar software. + The NRPs are generally unaware of + CAcert or the certificates that they may use, and + are unaware of the ramifications of usage. + They are not permitted to RELY, but may USE, under the + Root Distribution License (<a href="https://www.cacert.org/policy/RootDistributionLicense.html">COD14</a>). +</dd> + +<dt id="d_reliance">Reliance</dt> +<dd> + An industry term referring to + the act of making a decision, including taking a risk, + which decision is in part or in whole + informed or on the basis of the contents of a certificate. +</dd> + +<dt id="d_relparty">Relying Party</dt> +<dd> + An industry term refering to someone who relies + (that is, makes decisions or takes risks) + in part or in whole on a certificate. +</dd> + +<dt>Subscriber Naming</dt> +<dd> + The term used in this CPS to + describe all naming data within a certificate. + Approximately similar terms from Industry such as + "Subject naming" and "Distinguished Name" + are not used here. +</dd> + +<dt id="d_verification">Verification</dt> +<dd> + An industry term referring to + the act of checking and controlling + the accuracy and utility of a single claim. +</dd> + +<dt id="d_validation">Validation</dt> +<dd> + An industry term referring to the process of + inspecting and verifying the information and + subsidiary claims behind a claim. +</dd> + +<dt id="usage">Usage</dt> +<dd> + The event of allowing a certificate to participate in + a protocol, as decided and facilitated by a user's software. + Generally, Usage does not require significant input, if any, + on the part of the user. + This defers all decisions to the user software, + thus elevating the software as user's only and complete + Validation Authority or Agent. +</dd> + +<dt id="drel">CAcert Relying Party</dt> +<dd> + CAcert Members who make decisions based in part or in whole + on a certificate issued by CAcert. + Only CAcert Members are permitted to Rely on CAcert certificates, + subject to the CAcert Community Agreement. +</dd> + +<dt id="ddst">Vendors</dt> +<dd> + Non-members who distribute CAcert's root or intermediate certificates + in any way, including but not limited to delivering these + certificates with their products, e.g. browsers, mailers or servers. + Vendors are covered under a separate licence. +</dd> + +<dt id="d_ccs">Configuration-Control Specification "CCS"</dt> +<dd> + The audit criteria that controls this CPS. + The CCS is documented in COD2, itself a controlled document under CCS. +</dd> + +<dt id="d_cod">CAcert Official Document (COD)</dt> +<dd> + Controlled Documents that are part of the CCS. +</dd> + +</dl> +</section> + +</section> + + +<!-- *************************************************************** --> +<section id="p2"> +<h2>2. PUBLICATION AND REPOSITORY RESPONSIBILITIES</h2> + +<section id="p2.1"> +<h3>2.1. Repositories</h3> + +<p> +CAcert operates no repositories in the sense +of lookup for non-certificate-related information +for the general public. +</p> + +<p> +Under the Assurance Policy (<a href="https://www.cacert.org/policy/AssurancePolicy.html">COD13</a>), +there are means for Members to search, retrieve +and verify certain data about themselves and others. +</p> +</section> + +<section id="p2.2"> +<h3>2.2. Publication of certification information</h3> + +<p> +CAcert publishes: +</p> +<ul> + <li>A repository of CRLs. An OCSP responder is in operation.</li> + <li>The root certificate and intermediate certificates.</li> +</ul> + +<p> +CAcert does not expressly publish information on issued certificates. +However, due to the purpose of certificates, and the essential +public nature of Names and email addresses, all information within +certificates is presumed to be public and published, once +issued and delivered to the Member. +</p> +</section> + +<section id="p2.3"> +<h3>2.3. Time or frequency of publication</h3> + +<p> +Root and Intermediate Certificates and CRLs are +made available on issuance. +</p> +</section> + +<section id="p2.4"> +<h3>2.4. Access controls on repositories</h3> +<p> No stipulation. </p> +</section> + +</section> + + +<!-- *************************************************************** --> +<section id="p3"> +<h2>3. IDENTIFICATION AND AUTHENTICATION</h2> + +<section id="p3.1"> +<h3>3.1. Naming</h3> + +<section id="p3.1.1"> +<h4>3.1.1. Types of names</h4> + +<section id="p3.1.1.1"> +<h5>3.1.1.1. Client Certificates</h5> +<p> +The Subscriber Naming consists of: +</p> +<dl> + <dt><code>subjectAltName=</code></dt> + <dd> + One, or more, of the Subscriber's verified email addresses, + in rfc822Name format. + </dd> + + <dt><code>EmailAddress=</code></dt> + <dd> + One, or more, of the Subscriber's verified email addresses. + This is deprecated under + <a href="http://tools.ietf.org/html/rfc5280#section-4.2.1.6">RFC5280 4.1.2.6</a> + and is to be phased out. Also includes a SHA1 hash of a random number if + the member selects SSO (Single Sign On ID) during submission of CSR. + </dd> + + <dt><code>CN=</code></dt> + <dd> + The common name takes its value from one of: + <ul><li> + For all Members, + the string "<code>CAcert WoT Member</code>" may be used for + anonymous certificates. + </li><li> + For individual Members, + a Name of the Subscriber, + as Assured under AP. + </li><li> + For Organisation Members, + an organisation-chosen name, + as verified under OAP. + </li></ul> + </dd> +</dl> +</section> + +<section id="p3.1.1.2"> +<h5>3.1.1.2. Individual Server Certificates</h5> +<p> +The Subscriber Naming consists of: +</p> +<dl> + <dt><code>CN=</code></dt> + <dd> + The common name is the host name out of a domain + for which the Member is a domain master. + </dd> + <dt><code>subjectAltName=</code></dt> + <dd> + Additional host names for which the Member + is a domain master may be added to permit the + certificate to serve multiple domains on one IP number. + </dd> + <dt>Other</dt> + <dd> + All other fields are optional and must either match + the CN or they must be empty + </dd> +</dl> +</section> + +<section id="p3.1.1.3"> +<h5>3.1.1.3. Certificates for Organisations</h5> +<p> +In addition to the above, the following applies: +</p> +<dl> + <dt><code>OU=</code></dt><dd>organizationalUnitName (set by O-Admin, must be verified by O-Admin).</dd> + <dt><code>O=</code></dt><dd>organizationName is the fixed name of the Organisation.</dd> + <dt><code>L=</code></dt> + <dd>localityName</dd> + <dt><code>ST=</code></dt> + <dd>stateOrProvinceName</dd> + <dt><code>C=</code></dt> + <dd>countryName</dd> + <dt><code>contact=</code></dt> + <dd> + EMail Address of Contact. + <!-- not included in RFC5280 4.1.2.4 list, but list is not restricted --> + </dd> +</dl> + +<p> +Except for the OU and CN, fields are taken from the Member's +account and are as verified by the Organisation Assurance process. +Other Subscriber information that is collected and/or retained +does not go into the certificate. +</p> +</section> + +</section> + +<section id="p3.1.2"> +<h4>3.1.2. Need for names to be meaningful</h4> + +<p> +Each Member's Name (<code>CN=</code> field); +is assured under the Assurance Policy (<a href="https://www.cacert.org/policy/AssurancePolicy.html">COD13</a>) +or subsidiary policies (such as Organisation Assurance Policy). +Refer to those documents for meanings and variations. +</p> + +<p> +Anonymous certificates have the same <code>subject</code> +field common name. +See <a href="#p1.4.5">§1.4.5.</a>. +</p> + +<p> +Email addresses are verified according to +<a href="#p4.2.2">§4.2.2.</a> +</p> +</section> + +<section id="p3.1.3"> +<h4>3.1.3. Anonymity or pseudonymity of subscribers</h4> + +<p> +See <a href="#p1.4.5">§1.4.5</a>. +</p> +</section> + +<section id="p3.1.4"> +<h4>3.1.4. Rules for interpreting various name forms</h4> +<p> +Interpretation of Names is controlled by the Assurance Policy, +is administered by means of the Member's account, +and is subject to change by the Arbitrator. +Changes to the interpretation by means of Arbitration +should be expected as fraud (e.g., phishing) +may move too quickly for policies to fully document rules. +</p> +</section> + +<section id="p3.1.5"> +<h4>3.1.5. Uniqueness of names</h4> + +<p> +Uniqueness of Names within certificates is not guaranteed. +Each certificate has a unique serial number which maps +to a unique account, and thus maps to a unique Member. +See the Assurance Statement within Assurance Policy +(<a href="https://www.cacert.org/policy/AssurancePolicy.html">COD13</a>). +</p> + +<p> +Domain names and email address +can only be registered to one Member. +</p> +</section> + +<section id="p3.1.6"> +<h4>3.1.6. Recognition, authentication, and role of trademarks</h4> + +<p> +Organisation Assurance Policy +(<a href="https://www.cacert.org/policy/OrganisationAssurancePolicy.html">COD11</a>) +controls issues such as trademarks where applicable. +A trademark can be disputed by filing a dispute. +See +<a href="#p9.13">§9.13</a>. +</p> +</section> + +<section id="p3.1.7"> +<h4>3.1.7. International Domain Names</h4> + +<p> +Certificates containing International Domain Names, being those containing a +ACE prefix (<a href="http://www.ietf.org/rfc/rfc3490#section-5">RFC3490 +Section 5</a>), will only be issued to domains satisfying one or more +of the following conditions:</p> +<ul> +<li>The Top Level Domain (TLD) Registrar associated with the domain has a policy +that has taken measures to prevent two homographic domains being registered to +different entities down to an accepted level. +</li> +<li>Domains contain only code points from a single unicode character script, +excluding the "Common" script, with the additionally allowed numberic +characters [0-9], and an ACSII hyphen '-'. +</li> +</ul> + + +<p>Email address containing International Domain Names in the domain portion of +the email address will also be required to satisfy one of the above conditions. +</p> + +<p> +The following is a list of accepted TLD Registrars:</p> + <table> + + <tr> + <td>.ac</td> + <td><a href="http://www.nic.ac/">Registry</a></td> + <td><a href="http://www.nic.ac/pdf/AC-IDN-Policy.pdf">Policy</a></td> + </tr> + <tr> + <td>.ar</td> + + <td><a href="http://www.nic.ar/">Registry</a></td> + <td><a href="http://www.nic.ar/616.html">Policy</a></td> + </tr> + <tr> + <td>.at</td> + <td><a href="http://www.nic.at/">Registry</a></td> + <td><a href="http://www.nic.at/en/service/legal_information/registration_guidelines/">Policy</a> (<a href="http://www.nic.at/en/service/technical_information/idn/charset_converter/">character list</a>)</td> + + </tr> + <tr> + <td>.biz</td> + <td><a href="http://www.neustarregistry.biz/">Registry</a></td> + <td><a href="http://www.neustarregistry.biz/products/idns">Policy</a></td> + </tr> + <tr> + + <td>.br</td> + <td><a href="http://registro.br/">Registry</a></td> + <td><a href="http://registro.br/faq/faq6.html">Policy</a></td> + </tr> + <tr> + <td>.cat</td> + <td><a href="http://www.domini.cat/">Registry</a></td> + + <td><a href="http://www.domini.cat/normativa/en_normativa_registre.html">Policy</a></td> + </tr> + <tr> + <td>.ch</td> + <td><a href="http://www.switch.ch/id/">Registry</a></td> + <td><a href="http://www.switch.ch/id/terms/agb.html#anhang1">Policy</a></td> + </tr> + + <tr> + <td>.cl</td> + <td><a href="http://www.nic.cl/">Registry</a></td> + <td><a href="http://www.nic.cl/CL-IDN-policy.html">Policy</a></td> + </tr> + <tr> + <td>.cn</td> + + <td><a href="http://www.cnnic.net.cn/">Registry</a></td> + <td><a href="http://www.faqs.org/rfcs/rfc3743.html">Policy</a> (JET Guidelines)</td> + </tr> + <tr> + <td>.de</td> + <td><a href="http://www.denic.de/">Registry</a></td> + + <td><a href="http://www.denic.de/en/richtlinien.html">Policy</a></td> + </tr> + <tr> + <td>.dk</td> + <td><a href="http://www.dk-hostmaster.dk/">Registry</a></td> + <td><a href="http://www.dk-hostmaster.dk/index.html?id=151">Policy</a></td> + </tr> + + <tr> + <td>.es</td> + <td><a href="https://www.nic.es/">Registry</a></td> + <td><a href="https://www.nic.es/media/2008-12/1228818323935.pdf">Policy</a></td> + </tr> + <tr> + <td>.fi</td> + + <td><a href="http://www.ficora.fi/">Registry</a></td> + <td><a href="http://www.ficora.fi/en/index/palvelut/fiverkkotunnukset/aakkostenkaytto.html">Policy</a></td> + </tr> + <tr> + <td>.gr</td> + <td><a href="https://grweb.ics.forth.gr/english/index.html">Registry</a></td> + <td><a href="https://grweb.ics.forth.gr/english/ENCharacterTable1.jsp">Policy</a></td> + + </tr> + <tr> + <td>.hu</td> + <td><a href="http://www.domain.hu/domain/">Registry</a></td> + <td><a href="http://www.domain.hu/domain/English/szabalyzat.html">Policy</a> (section 2.1.2)</td> + </tr> + + <tr> + <td>.info</td> + <td><a href="http://www.afilias.info/">Registry</a></td> + <td><a href="http://www.afilias.info/register/idn/">Policy</a></td> + </tr> + <tr> + <td>.io</td> + + <td><a href="http://www.nic.io">Registry</a></td> + <td><a href="http://www.nic.io/IO-IDN-Policy.pdf">Policy</a></td> + </tr> + <tr> + <td>.ir</td> + <td><a href="https://www.nic.ir/">Registry</a></td> + <td><a href="https://www.nic.ir/IDN">Policy</a></td> + + </tr> + <tr> + <td>.is</td> + <td><a href="http://www.isnic.is/">Registry</a></td> + <td><a href="http://www.isnic.is/english/domain/rules.html">Policy</a></td> + </tr> + <tr> + + <td>.jp</td> + <td><a href="http://jprs.co.jp/">Registry</a></td> + <td><a href="http://www.iana.org/assignments/idn/jp-japanese.html">Policy</a></td> + </tr> + <tr> + <td>.kr</td> + <td><a href="http://domain.nic.or.kr/">Registry</a></td> + + <td><a href="http://www.faqs.org/rfcs/rfc3743.html">Policy</a> (JET Guidelines)</td> + </tr> + <tr> + <td>.li</td> + <td><a href="http://www.switch.ch/id/">Registry</a></td> + <td><a href="http://www.switch.ch/id/terms/agb.html#anhang1">Policy</a> (managed by .ch registry)</td> + + </tr> + <tr> + <td>.lt</td> + <td><a href="http://www.domreg.lt/public?pg=&sp=&loc=en">Registry</a></td> + <td><a href="http://www.domreg.lt/public?pg=8A7FB6&sp=idn&loc=en">Policy</a> (<a href="http://www.domreg.lt/static/doc/public/idn_symbols-en.pdf">character list</a>)</td> + + </tr> + <tr> + <td>.museum</td> + <td><a href="http://about.museum/">Registry</a></td> + <td><a href="http://about.museum/idn/idnpolicy.html">Policy</a></td> + </tr> + <tr> + + <td>.no</td> + <td><a href="http://www.norid.no/">Registry</a></td> + <td><a href="http://www.norid.no/domeneregistrering/veiviser.en.html">Policy</a> (section 4)</td> + </tr> + <tr> + <td>.org</td> + + <td><a href="http://www.pir.org/">Registry</a></td> + <td><a href="http://pir.org/PDFs/ORG-Extended-Characters-22-Jan-07.pdf">Policy</a></td> + </tr> + <tr> + <td>.pl</td> + <td><a href="http://www.nask.pl/">Registry</a></td> + <td><a href="http://www.dns.pl/IDN/idn-registration-policy.txt">Policy</a></td> + + </tr> + <tr> + <td>.pr</td> + <td><a href="https://www.nic.pr/">Registry</a></td> + <td><a href="https://www.nic.pr/idn_rules.asp">Policy</a></td> + </tr> + <tr> + + <td>.se</td> + <td><a href="http://www.nic-se.se/">Registry</a></td> + <td><a href="http://www.iis.se/en/domaner/internationaliserad-doman-idn/">Policy</a> (<a href="http://www.iis.se/docs/teckentabell-03.pdf">character list</a>)</td> + </tr> + <tr> + + <td>.sh</td> + <td><a href="http://www.nic.sh">Registry</a></td> + <td><a href="http://www.nic.sh/SH-IDN-Policy.pdf">Policy</a></td> + </tr> + <tr> + <td>.th</td> + <td><a href="http://www.thnic.or.th/">Registry</a></td> + + <td><a href="http://www.iana.org/assignments/idn/th-thai.html">Policy</a></td> + </tr> + <tr> + <td>.tm</td> + <td><a href="http://www.nic.tm">Registry</a></td> + <td><a href="http://www.nic.tm/TM-IDN-Policy.pdf">Policy</a></td> + </tr> + + <tr> + <td>.tw</td> + <td><a href="http://www.twnic.net.tw/">Registry</a></td> + <td><a href="http://www.faqs.org/rfcs/rfc3743.html">Policy</a> (JET Guidelines)</td> + </tr> + <tr> + + <td>.vn</td> + <td><a href="http://www.vnnic.net.vn/">Registry</a></td> + <td><a href="http://www.vnnic.vn/english/5-6-300-2-2-04-20071115.htm">Policy</a> (<a href="http://vietunicode.sourceforge.net/tcvn6909.pdf">character list</a>)</td> + </tr> + </table> + + +<p> +This criteria will apply to the email address and server host name fields for all certificate types. +</p> + +<p> +The CAcert Inc. Board has the authority to decide to add or remove accepted TLD Registrars on this list. +</p> +</section> + +</section> + + +<section id="p3.2"> +<h3>3.2. Initial Identity Verification</h3> + +<p> +Identity verification is controlled by the +Assurance Policy (<a href="https://www.cacert.org/policy/AssurancePolicy.html">COD13</a>). +The reader is refered to the Assurance Policy, +the following is representative and brief only. +</p> + + +<section id="p3.2.1"> +<h4>3.2.1. Method to prove possession of private key</h4> + +<p> +CAcert uses industry-standard techniques to +prove the possession of the private key. +</p> + +<p> +For X.509 server certificates, +the stale digital signature of the CSR is verified. +For X.509 client certificates for "Netscape" browsers, +SPKAC uses a challenge-response protocol +to check the private key dynamically. +For X.509 client certificates for "explorer" browsers, +ActiveX uses a challenge-response protocol +to check the private key dynamically. +</p> +</section> + +<section id="p3.2.2"> +<h4>3.2.2. Authentication of Individual Identity</h4> + +<dl> + +<dt>Agreement</dt> +<dd> +An Internet user becomes a Member by agreeing to the +CAcert Community Agreement +(<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html">COD9</a>) +and registering an account on the online website. +During the registration process Members are asked to +supply information about themselves: + <ul> + <li>A valid working email. + </li> + <li>Full Name and Date of Birth such as is + found on Identity documents. + </li> + <li>Personal Questions used only for Password Retrieval.</li> + </ul> + +<p> +The online account establishes the method of authentication +for all service requests such as certificates. +</p> +</dd> + +<dt>Assurance</dt> +<dd> +Each Member is assured according to Assurance Policy +(<a href="https://www.cacert.org/policy/AssurancePolicy.html">COD13</a>). +</dd> + +<dt>Certificates</dt> +<dd> +Based on the total number of Assurance Points +that a Member (Name) has, the Member +can get different levels of certificates. +See <a href="#p1.4.5">§1.4.5</a>. +See Table 3.2.b. +When Members have 50 or more points, they +become <em>Assured Members</em> and may then request +certificates that state their Assured Name(s). +</dd> + +</dl> + +<figure id="t3.2.b"> +<table border="1" class="parentC"> +<thead> + <tr> + <th class="b">Assurance Points</th> + <th class="b">Level</th> + <th class="b">Service</th> + <th class="b">Comments</th> + </tr> +</thead> +<tbody> + <tr> + <th scope="row">0</th> + <td>Unassured Member</td> + <td>Anonymous</td> + <td>Certificates with no Name, under Class 1 Root. Limited to 6 months expiry.</td> + </tr> + <tr> + <th scope="row">1-49</th> + <td>Unassured Member</td> + <td>Anonymous</td> + <td>Certificates with no Name under Member SubRoot. Limited to 6 months expiry.</td> + </tr> + <tr> + <th scope="row">50-99</th> + <td>Assured Member</td> + <td>Verified</td> + <td>Certificates with Verified Name for S/MIME, web servers, "digital signing." + Expiry after 24 months is available.</td> + </tr> + <tr> + <th scope="row">100++</th> + <td>Assurer</td> + <td>Code-signing</td> + <td>Can create Code-signing certificates </td> + </tr> +</tbody> +</table> + +<figcaption>Table 3.2.b - How Assurance Points are used in Certificates</figcaption> +</figure> + +</section> + + +<section id="p3.2.3"> +<h4>3.2.3. Authentication of organization identity</h4> + +<p> +Verification of organisations is delegated by +the Assurance Policy to the +Organisation Assurance Policy +(<a href="https://www.cacert.org/policy/OrganisationAssurancePolicy.html">COD11</a>). +The reader is refered to the Organisation Assurance Policy, +the following is representative and brief only. +</p> + +<p> +Organisations present special challenges. +The Assurance process for Organisations is +intended to permit the organisational Name to +appear in certificates. +The process relies heavily on the Individual +process described above. +</p> + +<p> +Organisation Assurance achieves the standard +stated in the OAP, briefly presented here: +</p> +<ol style="list-style: lower-alpha;"><li> + the organisation exists, + </li><li> + the organisation name is correct and consistent, + </li><li> + signing rights: requestor can sign on behalf of the organisation, and + </li><li> + the organisation has agreed to the terms of the + CAcert Community Agreement + (<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html">COD9</a>), + and is therefore subject to Arbitration. +</li></ol> +</section> + + +<section id="p3.2.4"> +<h4>3.2.4. Non-verified subscriber information</h4> + +<p> +All information in the certificate is verified, +see Relying Party Statement, <a href="#p4.5.2">§4.5.2</a>. +</p> +</section> + + +<section id="p3.2.5"> +<h4>3.2.5. Validation of authority</h4> + +<p> +The authorisation to obtain a certificate is established as follows: +</p> +<dl> + +<dt>Addresses</dt> +<dd> +The member claims authority over a domain or email address +when adding the address, <a href="#p4.1.2">§4.1.2</a>. +(Control is tested by means described in <a href="#p4.2.2">§4.2.2</a>.) +</dd> + +<dt>Individuals</dt> +<dd> +The authority to participate as a Member is established +by the CAcert Community Agreement +(<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html">COD9</a>). +Assurances are requested by means of the signed CAP form. +</dd> + +<dt>Organisations</dt> +<dd> +The authority for Organisation Assurance is established +in the COAP form, as signed by an authorised representative +of the organisation. +The authority for the +Organisation Administrator +(O-Admin) is also established on the +COAP form. +See Organisation Assurance Policy. +</dd> + +</dl> +</section> + + +<section id="p3.2.6"> +<h4>3.2.6. Criteria for interoperation</h4> + +<p> +CAcert does not currently issue certificates to subordinate CAs +or other PKIs. +Other CAs may become Members, and are then subject to the +same reliance provisions as all Members. +</p> +</section> + +</section> + + +<section id="p3.3"> +<h3>3.3. Re-key Requests</h3> + +<p> +Via the Member's account. +</p> +</section> + +<section id="p3.4"> +<h3>3.4. Revocations Requests</h3> + +<p> +Via the Member's account. +In the event that the Member has lost the password, +or similar, the Member emails the support team who +either work through the lost-password questions +process or file a dispute. +</p> +</section> + +</section> + + +<!-- *************************************************************** --> +<section id="p4"> +<h2>4. CERTIFICATE LIFE-CYCLE OPERATIONAL REQUIREMENTS</h2> + +<p> +The general life-cycle for a new certificate for an Individual Member is:</p> +<ol><li> + Member adds claim to an address (domain/email). + </li><li> + System probes address for control. + </li><li> + Member creates key pair. + </li><li> + Member submits CSR with desired options (Anonymous Certificate, SSO, Root Certificate) . + </li><li> + System validates and accepts CSR based on + known information: claims, assurance, controls, technicalities. + </li><li> + System signs certificate. + </li><li> + System makes signed certificate available to Member. + </li><li> + Member accepts certificate. +</li></ol> + + + +<p> +(Some steps are not applicable, such as anonymous certificates.) +</p> + + +<section id="p4.1"> +<h3>4.1. Certificate Application</h3> + +<section id="p4.1.1"> +<h4>4.1.1. Who can submit a certificate application</h4> + +<p> +Members may submit certificate applications. +On issuance of certificates, Members become Subscribers. +</p> +</section> + +<section id="p4.1.2"> +<h4>4.1.2. Adding Addresses</h4> + +<p> +The Member can claim ownership or authorised control of +a domain or email address on the online system. +This is a necessary step towards issuing a certificate. +There are these controls:</p> +<ul><li> + The claim of ownership or control is legally significant + and may be referred to dispute resolution. + </li><li> + Each unique address can be handled by one account only. + </li><li> + When the Member makes the claim, + the certificate application system automatically initiates the + check of control, as below. +</li></ul> +</section> + + +<section id="p4.1.3"> +<h4>4.1.3. Preparing CSR </h4> + +<p> +Members generate their own key-pairs. +The CAcert Community Agreement +(<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html">COD9</a>) +obliges the Member as responsible for security. +See <a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html#s2.5">CCA 2.5</a>, <a href="#p9.6">§9.6</a>. +</p> + +<p> +The Certificate Signing Request (CSR) is prepared by the +Member for presentation to the automated system. +</p> +</section> + +</section> + + +<section id="p4.2"> +<h3>4.2. Certificate application processing</h3> + +<p> +The CA's certificate application process is completely automated. +Requests, approvals and rejections are handled by the website system. +Each application should be processed in less than a minute. +</p> +<p> +Where certificates are requested for more than one +purpose, the requirements for each purpose must be +fulfilled. +</p> + +<section id="p4.2.1"> +<h4>4.2.1. Authentication </h4> + +<p> + The Member logs in to her account on the CAcert website + and thereby authenticates herself with username + and passphrase or with her CAcert client-side digital certificate. +</p> +</section> + +<section id="p4.2.2"> +<h4>4.2.2. Verifying Control</h4> + +<p> +In principle, at least two controls are placed on each address. +</p> + +<dl> + +<dt id="ping">Email-Ping</dt> +<dd> +Email addresses are verified by means of an +<em><a id="pingtest">Email-Ping test</a></em>: +<ul><li> + The system generates a cookie + (a random, hard-to-guess code) + and formats it as a string. + </li><li> + The system sends the cookie + to the Member in an email. + </li><li> + Once the Member receives the email, + she enters the cookie into the website. + </li><li> + The entry of the code verifies + control of that email account. +</li></ul> +</dd> + +<dt id="email">Email Control</dt> +<dd> +Email addresses for client certificates are verified by passing the +following checks: +<ol> + <li>An Email-ping test + is done on the email address. + </li> + <li>The Member must have signed a CAP form or equivalent, + and been awarded at least one Assurance point. + </li> +</ol> +</dd> + +<dt id="domain">Domain Control</dt> +<dd> +Domains addresses for server certificates are verified by passing two of the +following checks: +<ol> <li> + An Email-ping test + is done on an email address chosen from <em>whois</em> + or interpolated from the domain name. + </li> <li> + The system generates a cookie + which is then placed in DNS + by the Member. + </li> <li> + The system generates a cookie + which is then placed in HTTP headers or a text file on the website + by the Member. + </li> <li> + Statement by at least 2 Assurers about + ownership/control of the domain name. + </li> <li> + The system generates a cookie + which is then placed in whois registry information + by the Member. +</li> </ol> +</dd> + +</dl> + +<p> +Notes.</p> +<ul><li> + Other methods can be added from time to time by CAcert. + </li><li> + Static cookies should remain for the duration of a certificate + for occasional re-testing. + </li><li> + Dynamic tests can be repeated at a later time of CAcert's choosing. + </li><li> + Domain control checks may be extended to apply to email control + in the future. +</li></ul> +</section> + +<section id="p4.2.3"> +<h4>4.2.3. Options Available</h4> + +<p> +The Member has options available: +</p> +<ul> + <li>Each Email address that is verified + is available for Client Certificates. + </li> + <li>Each Domain address that is verified + is available for Server Certificates. + </li> + <li>If the Member is unassured then only the Member SubRoot is available. + </li> + <li>If the Member is Assured then both Assured Member and Member SubRoots + are available. + </li> + <li>If a Name is Assured then it may be + put in a client certificate or an OpenPGP signature. + </li> +</ul> +</section> + +<section id="p4.2.4"> +<h4>4.2.4. Client Certificate Procedures</h4> + +<p> +For an individual client certificate, the following is required.</p> +<ul> + <li>The email address is claimed and added. </li> + <li>The email address is ping-tested. </li> + <li>For the Member Subroot, the Member must have + at least one point of Assurance and have signed a CAP form.</li> + <li>For the Assured Subroot, the Member must have + at least fifty points of Assurance. </li> + <li>To include a Name, the Name must be assured to at least fifty points. </li> + +</ul> +</section> + +<section id="p4.2.5"> +<h4>4.2.5. Server Certificate Procedures</h4> + +<p> +For a server certificate, the following is required:</p> +<ul> + <li>The domain is claimed and added. </li> + <li>The domain is checked twice as above. </li> + <li>For the Member SubRoot, the Member must have + at least one point of Assurance and have signed a CAP form.</li> + <li>For the Assured SubRoot, the Member must have + at least fifty points of Assurance. </li> +</ul> +</section> + +<section id="p4.2.6"> +<h4>4.2.6. Code-signing Certificate Procedures</h4> + +<p> +Code-signing certificates are made available to Assurers only. +They are processed in a similar manner to client certificates. +</p> +</section> + +<section id="p4.2.7"> +<h4>4.2.7. Organisation Domain Verification</h4> + +<p> +Organisation Domains are handled under the Organisation Assurance Policy +and the Organisation Handbook. +</p> +</section> + +</section> + + +<section id="p4.3"> +<h3>4.3. Certificate issuance</h3> + +<section id="p4.3.1"> +<h4>4.3.1. CA actions during certificate issuance</h4> + +<section id="p4.3.1.1"> +<h5>4.3.1.1. Key Sizes</h5> +<p> +Members may request keys of any size permitted by the key algorithm. +Many older hardware devices require small keys. +</p> +</section> + +<section id="p4.3.1.2"> +<h5>4.3.1.2. Algorithms</h5> +<p> +CAcert currently only supports the RSA algorithm for X.509 keys. +X.509 signing uses the SHA-1 message digest algorithm. +OpenPGP Signing uses RSA signing over RSA and DSA keys. +</p> +</section> + +<section id="p4.3.1.3"> +<h5>4.3.1.3. Process for Certificates</h5> +<p> +All details in each certificate are verified +by the website issuance system. +Issuance is based on a 'template' system that selects +profiles for certificate lifetime, size, algorithm. +</p> +<ol><li> + The CSR is verified. + </li><li> + Data is extracted from CSR and verified: + <ul> + <li> Name <a href="#p3.1">§3.1</a>, </li> + <li> Email address <a href="#p4.2.2">§4.2.2</a>, </li> + <li> Domain address <a href="#p4.2.2">§4.2.2</a>. </li> + </ul> + </li><li> + Certificate is generated from template. + </li><li> + Data is copied from CSR. + </li><li> + Certificate is signed. + </li><li> + Certificate is stored as well as mailed. +</li></ol> +</section> + +<section id="p4.3.1.4"> +<h5>4.3.1.4. Process for OpenPGP key signatures</h5> +<p> +All details in each Sub-ID are verified +by the website issuance system. +Issuance is based on the configuration that selects +the profile for signature lifetime, size, +algorithm following the process: +</p> +<ol><li> + The public key is verified. + </li><li> + Data is extracted from the key and verified (Name, Emails). + Only the combinations of data in Table 4.3.1 are permitted. + </li><li> + OpenPGP Key Signature is generated. + </li><li> + Key Signature is applied to the key. + </li><li> + The signed key is stored as well as mailed. +</li></ol> + +<figure id="t4.3.1"> +<table class="parentC"> +<thead> + <tr> + <th></th> + <th>Verified Name</th> + <th>Unverified Name</th> + <th>Empty Name</th> + </tr> +</thead> +<tbody> + <tr> + <th scope="row" class="r">Verified email</th> + <td title="pass" class="c clrGreen size3">✔</td> + <td title="fail" class="c clrRed size3">✘</td> + <td title="pass" class="c clrGreen size3">✔</td> + </tr> + <tr> + <th scope="row" class="r">Unverified email</th> + <td title="fail" class="c clrRed size3">✘</td> + <td title="fail" class="c clrRed size3">✘</td> + <td title="fail" class="c clrRed size3">✘</td> + </tr> + <tr> + <th scope="row" class="r">Empty email</th> + <td title="pass" class="c clrGreen size3">✔</td> + <td title="fail" class="c clrRed size3">✘</td> + <td title="fail" class="c clrRed size3">✘</td> + </tr> +</tbody> +</table> + +<figcaption>Table 4.3.1. Permitted Data in Signed OpenPgp Keys</figcaption> +</figure> +</section> + +</section> + + +<section id="p4.3.2"> +<h4>4.3.2. Notification to subscriber by the CA of issuance of certificate</h4> + +<p> +Once signed, the certificate is +made available via the Member's account, +and emailed to the Member. +It is also archived internally. +</p> +</section> + +</section> + +<section id="p4.4"> +<h3>4.4. Certificate acceptance</h3> + +<section id="p4.4.1"> +<h4>4.4.1. Conduct constituting certificate acceptance</h4> + +<p> +There is no need for the Member to explicitly accept the certificate. +In case the Member does not accept the certificate, +the certificate has to be revoked and made again. +</p> +</section> + +<section id="p4.4.2"> +<h4>4.4.2. Publication of the certificate by the CA</h4> + +<p> +CAcert does not currently publish the issued certificates +in any repository. +In the event that CAcert will run a repository, +the publication of certificates and signatures +there will be at the Member's options. +However note that certificates that are issued +and delivered to the Member are presumed to be +published. See <a href="#p2.2">§2.2</a>. +</p> +</section> + +<section id="p4.4.3"> +<h4>4.4.3. Notification of certificate issuance by the CA to other entities</h4> + +<p> +There are no external entities that are notified about issued certificates. +</p> +</section> + +</section> + +<section id="p4.5"> +<h3>4.5. Key pair and certificate usage</h3> + +<p> +All Members (subscribers and relying parties) +are obliged according to the +CAcert Community Agreement +(<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html">COD9</a>) +See especially <a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html#s2.3">2.3</a> through <a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html#s2.5">2.5</a>. +</p> + +<section id="p4.5.1"> +<h4>4.5.1. Subscriber Usage and Responsibilities</h4> + +<p> +Subscribers should use keys only for their proper purpose, +as indicated by the certificate, or by wider agreement with +others. +</p> +</section> + +<section id="p4.5.2"> +<h4>4.5.2. Relying Party Usage and Responsibilities</h4> + +<p> +Relying parties (Members) may rely on the following. +</p> + +<div class="importend"> + <div class="c"> + <strong class="size1">Relying Party Statement</strong> + <p class="c"> + Certificates are issued to Members only.<br /><br /> + All information in a certificate is verified. + </p> + </div> +</div> + +<p> +The following notes are in addition to the Relying Party Statement, +and can be seen as limitations on it. +</p> + +<section id="p4.5.2.a"> +<h5>4.5.2.a Methods of Verification </h5> +<p> +The term Verification as used in the Relying Party Statement means one of +</p> +<table border="1" class="parentC"> +<thead> + <tr> + <th>Type</th><th>How</th><th>Authority</th><th>remarks</th> + </tr> +</thead> +<tbody> + <tr> + <th scope="row">Assurance</th> + <td>under CAcert Assurance Programme (CAP)</td> + <td>Assurance Policy</td> + <td>only information assured to 50 points under CAP is placed in the certificate </td> + </tr> + <tr> + <th scope="row">Evaluation</th> + <td>under automated domain and email checks </td> + <td>this CPS</td> + <td>see <a href="#p4.2.2">§4.2.2</a></td> + </tr> + <tr> + <th scope="row">Controlled</th> + <td>programs or "profiles" that check the information within the CSR </td> + <td>this CPS</td> + <td>see <a href="#p4.2.2">§7.1</a></td> + </tr> +</tbody> +</table> + +</section> + +<section id="p4.5.2.b"> +<h5>4.5.2.b Who may rely</h5> + +<dl> + +<dt>Members may rely.</dt> +<dd> +Relying parties are Members, +and as such are bound by this CPS and the +CAcert Community Agreement +(<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html">COD9</a>). +The licence and permission to rely is not assignable. +</dd> + +<dt>Suppliers of Software</dt> +<dd> +CAcert roots may be distributed in software, +and those providers may +enter into agreement with CAcert by means of the +Third Party Vendor - Disclaimer and Licence +(wip). +This licence brings the supplier in to the Community +to the extent that +they agree to dispute resolution +within CAcert's forum. +</dd> + +<dt>NRPs may not rely.</dt> +<dd> +If not related to CAcert by means of an agreement +that binds the parties to dispute resolution within CAcert's forum, +a person is a Non-Related-Person (NRP). +An NRP is not permitted to rely and is not a Relying Party. +For more details, see the +Root Distribution License (<a href="https://www.cacert.org/policy/RootDistributionLicense.html">COD14</a>). +</dd> + +</dl> +</section> + +<section id="p4.5.2.c"> +<h5>4.5.2.c The Act of Reliance </h5> + +<dl> + +<dt>Decision making</dt> +<dd> +Reliance means taking a decision that is in part or in whole +based on the information in the certificate. + +A Relying Party may incorporate +the information in the certificate, +and the implied information such as Membership, +into her decision-making. +In making a decision, +a Relying Party should also: +<ul><li> + include her own overall risk equation, + </li><li> + include the general limitations of the Assurance process, + certificates, and wider security considerations, + </li><li> + make additional checks to provide more information, + </li><li> + consider any wider agreement with the other Member, and + </li><li> + use an appropriate protocol or custom of reliance (below). +</li></ul> +</dd> + +<dt>Examining the Certificate</dt> +<dd> +A Relying Party must make her own decision in using +each certificate. She must examine the certificate, +a process called <em>validation</em>. +Certificate-related information includes, +but is not limited to: +<ul><li> + Name, + </li><li> + expiry time of certificate, + </li><li> + current certificate revocation list (CRL), + </li><li> + certificate chain and + the validity check of the certificates in the chain, + </li><li> + issuer of certificate (CAcert), + </li><li> + SubRoot is intended for reliance (Assured, Organisation and Class 3) + </li><li> + purpose of certificate. +</li></ul> +</dd> + +<dt>Keeping Records</dt> +<dd> +Records should be kept, appropriate to the import of the decision. +The certificate should be preserved. +This should include sufficient +evidence to establish who the parties are +(especially, the certificate relied upon), +to establish the transaction in question, +and to establish the wider agreement that +defines the act. +</dd> + +<dt>Wider Protocol</dt> +<dd> +In principle, reliance will be part of a wider protocol +(customary method in reaching and preserving agreement) +that presents and preserves sufficient of the evidence +for dispute resolution under CAcert's forum of Arbitration. +The protocol should be agreed amongst the parties, +and tuned to the needs. +This CPS does not define any such protocol. +In the absence of such a protocol, reliance will be weakened; +a dispute without sufficient evidence may be dismissed by an Arbitrator. +</dd> + +<dt>As Compared to Usage</dt> +<dd> +Reliance goes beyond Usage. The latter is limited to +letting the software act as the total and only Validation +Authority. When relying, the Member also augments +the algorithmic processing of the software with her own +checks of the business, technical and certificate aspect. +</dd> + +</dl> +</section> + +<section id="p4.5.2.d"> +<h5>4.5.2.d Risks and Limitations of Reliance </h5> + +<dl> + +<dt>Roots and Naming</dt> +<dd> +<p>Where the Class 1 root is used, +this Subscriber may be a new Member +including one with zero points. +Where the Name is not provided, +this indicates it is not available. +In these circumstances, +reliance is not defined, +and Relying parties should take more care. +See Table 4.5.2. +</p> + +<figure id="t4.5.2"> +<table border="1" class="parentC"> + <caption class="i">Statements of Reliance for Members</caption> +<thead> + <tr> + <th class="i">Class of Root</th> + <th><strong>Anonymous</strong><br>(all Members)</th> + <th><strong>Named</strong><br>(Assured Members only)</th> + </tr> +</thead> +<tbody> + <tr> + <th scope="row">Class<br><strong>1</strong></th> + <td rowspan="2" class="bgClrRed"> + <strong>Do not rely.</strong><br> + Relying party must use other methods to check. </td> + <td rowspan="2" class="bgClrOrange"> + Do not rely. + Although the named Member has been Assured by CAcert, + reliance is not defined with Class 1 root.<br> + (issued for compatibility only).</td> + </tr> + <tr> + <th scope="row"><strong>Member</strong><br>SubRoot</th> + </tr> + <tr> + <th scope="row">Class<br><strong>3</strong></th > + <td rowspan="2" class="bgClrOrange"> + Do not rely on the Name (being available). + The Member has been Assured by CAcert, + but reliance is undefined.</td> + <td rowspan="2"> + The Member named in the certificate has been Assured by CAcert.</td> + </tr> + <tr> + <th scope="row"><strong>Assured</strong><br>SubRoot</th> + </tr> +</tbody> +</table> + +<figcaption>Table 4.5.2. Statements of Reliance</figcaption> +</figure> +</dd> + +<dt>Software Agent</dt> +<dd> +When relying on a certificate, relying parties should +note that your software is responsible for the way it +shows you the information in a certificate. +If your software agent hides parts of the information, +your sole remedy may be to choose another software agent. +</dd> + +<dt>Malware</dt> +<dd> +When relying on a certificate, relying parties should +note that platforms that are vulnerable to viruses or +trojans or other weaknesses may not process any certificates +properly and may give deceptive or fraudulent results. +It is your responsibility to ensure you are using a platform +that is secured according to the needs of the application. +</dd> + +</dl> +</section> + +<section id="p4.5.2.e"> +<h5>4.5.2.e When something goes wrong </h5> +<p> +In the event that an issue arises out of the Member's reliance, +her sole avenue is <strong>to file dispute under DRP</strong>. +See <a href="#p9.13">§9.13</a>. +<!-- DRC_A§A.4.d --> +For this purpose, the certificate (and other evidence) should be preserved. +</p> +<dl> + +<dt>Which person?</dt> +<dd> +Members may install certificates for other individuals or in servers, +but the Member to whom the certificate is issued +remains the responsible person. +E.g., under Organisation Assurance, an organisation is issued +a certificate for the use by individuals +or servers within that organisation, +but the Organisation is the responsible person. +</dd> + +<dt>Software Agent</dt> +<dd> +If a Member is relying on a CAcert root embedded in +the software as supplied by a vendor, +the risks, liabilities and obligations of the Member +do not automatically transfer to the vendor. +</dd> + +</dl> +</section> + +</section> +</section> + + +<section id="p4.6"> +<h3>4.6. Certificate renewal</h3> + +<p> +A certificate can be renewed at any time. +The procedure of certificate renewal is the same +as for the initial certificate issuance. +</p> +</section> + +<section id="p4.7"> +<h3>4.7. Certificate re-key</h3> + +<p> +Certificate "re-keyings" are not offered nor supported. +A new certificate with a new key has to be requested and issued instead, +and the old one revoked. +</p> +</section> + +<section id="p4.8"> +<h3>4.8. Certificate modification</h3> + +<p> +Certificate "modifications" are not offered nor supported. +A new certificate has to be requested and issued instead. +</p> +</section> + +<section id="p4.9"> +<h3>4.9. Certificate revocation and suspension</h3> + +<section id="p4.9.1"> +<h4>4.9.1. Circumstances for revocation</h4> +<p> +Certificates may be revoked under the following circumstances: +</p> +<ol><li> + As initiated by the Subscriber through her online account. + </li><li> + As initiated in an emergency action by a + support team member. + Such action will immediately be referred to dispute resolution + for ratification. + </li><li> + Under direction from the Arbitrator in a duly ordered ruling + from a filed dispute. +</li></ol> + +<p> +These are the only three circumstances under which a +revocation occurs. +</p> +</section> + +<section id="p4.9.2"> +<h4>4.9.2. Who can request revocation</h4> + +<p> +As above. +</p> +</section> + +<section id="p4.9.3"> +<h4>4.9.3. Procedure for revocation request</h4> +<p> +The Subscriber logs in to her online account through +the website at http://www.cacert.org/ . +</p> + +<p> +In any other event such as lost passwords or fraud, +a dispute should be filed +by email at + < support AT cacert DOT org > +</p> +</section> + +<section id="p4.9.4"> +<h4>4.9.4. Revocation request grace period</h4> + +<p>No stipulation.</p> +</section> + +<section id="p4.9.5"> +<h4>4.9.5. Time within which CA must process the revocation request</h4> + +<p> +The revocation automated in the Web Interface for subscribers, +and is handled generally in less than a minute. +</p> + +<p> +A filed dispute that requests a revocation should be handled +within a five business days, however the Arbitrator has discretion. +</p> +</section> + +<section id="p4.9.6"> +<h4>4.9.6. Revocation checking requirement for relying parties</h4> + +<p> +Each revoked certificate is recorded in the +certificate revocation list (CRL). +Relying Parties must check a certificate against +the most recent CRL issued, in order to validate +the certificate for the intended reliance. +</p> +</section> + +<section id="p4.9.7"> +<h4>4.9.7. CRL issuance frequency (if applicable)</h4> + +<p> +A new CRL is issued after every certificate revocation. +</p> +</section> + +<section id="p4.9.8"> +<h4>4.9.8. Maximum latency for CRLs (if applicable)</h4> + +<p> +The maximum latency between revocation and issuance of the CRL is 1 hour. +</p> +</section> + +<section id="p4.9.9"> +<h4>4.9.9. On-line revocation/status checking availability</h4> + +<p> +OCSP is available at +http://ocsp.cacert.org/ . +</p> +</section> + +<section id="p4.9.10"> +<h4>4.9.10. On-line revocation checking requirements</h4> +<p> +Relying parties must check up-to-date status before relying. +</p> +</section> + +<section id="p4.9.11"> +<h4>4.9.11. Other forms of revocation advertisements available</h4> +<p> +None. +</p> +</section> + +<section id="p4.9.12"> +<h4>4.9.12. Special requirements re key compromise</h4> +<p> +Subscribers are obliged to revoke certificates at the earliest opportunity. +</p> +</section> + +<section id="p4.9.13"> +<h4>4.9.13. Circumstances for suspension</h4> + +<p> +Suspension of certificates is not available. +</p> +</section> + +<section id="p4.9.14"> +<h4>4.9.14. Who can request suspension</h4> +<p> +Not applicable. +</p> +</section> + +<section id="p4.9.15"> +<h4>4.9.15. Procedure for suspension request</h4> +<p> +Not applicable. +</p> +</section> + +<section id="p4.9.16"> +<h4>4.9.16. Limits on suspension period</h4> +<p> +Not applicable. +</p> +</section> + +</section> + + +<section id="p4.10"> +<h3>4.10. Certificate status services</h3> + +<section id="p4.10.1"> +<h4>4.10.1. Operational characteristics</h4> +<p> +OCSP is available +at http://ocsp.cacert.org/ . +</p> +</section> + +<section id="p4.10.2"> +<h4>4.10.2. Service availability</h4> + +<p> +OCSP is made available on an experimental basis. +</p> +</section> + +<section id="p4.10.3"> +<h4>4.10.3. Optional features</h4> + +<p> +No stipulation. +</p> +</section> + +</section> + + +<section id="p4.11"> +<h3>4.11. End of subscription</h3> + +<p> +Certificates include expiry dates. +</p> +</section> + +<section id="p4.12"> +<h3>4.12. Key escrow and recovery</h3> + +<section id="p4.12.1"> +<h4>4.12.1. Key escrow and recovery policy and practices</h4> + +<p> +CAcert does not generate nor escrow subscriber keys. +</p> +</section> + +<section id="p4.12.2"> +<h4>4.12.2. Session key encapsulation and recovery policy and practices</h4> + +<p> +No stipulation. +</p> +</section> + +</section> +</section> + + +<!-- *************************************************************** --> +<section id="p5"> +<h2>5. FACILITY, MANAGEMENT, AND OPERATIONAL CONTROLS</h2> + +<section id="p5.1"> +<h3>5.1. Physical controls</h3> + +<p> +Refer to Security Policy (<a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html">COD8</a>)</p> +<ul><li> + Site location and construction - <a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html#s2.1">SP2.1</a> + </li><li> + Physical access - <a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html#s2.3">SP2.3</a> +</li></ul> + + +<section id="p5.1.3"> +<h4>5.1.3. Power and air conditioning</h4> +<p> +Refer to Security Policy 2.1.2 (<a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html">COD8</a>) +</p> +</section> +<section id="p5.1.4"> +<h4>5.1.4. Water exposures</h4> +<p> +Refer to Security Policy 2.1.4 (<a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html">COD8</a>) +</p> +</section> +<section id="p5.1.5"> +<h4>5.1.5. Fire prevention and protection</h4> +<p> +Refer to Security Policy 2.1.4 (<a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html">COD8</a>) +</p> +</section> +<section id="p5.1.6"> +<h4>5.1.6. Media storage</h4> +<p> +Refer to Security Policy 4.3 (<a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html">COD8</a>) +</p> +</section> +<section id="p5.1.7"> +<h4>5.1.7. Waste disposal</h4> +<p> +No stipulation. +</p> +</section> +<section id="p5.1.8"> +<h4>5.1.8. Off-site backup</h4> +<p> +Refer to Security Policy 4.3 (<a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html#s4.3">COD8</a>) +</p> +</section> + +</section> + + +<section id="p5.2"> +<h3>5.2. Procedural controls</h3> + +<section id="p5.2.1"> +<h4>5.2.1. Trusted roles</h4> + +<dl> + <dt>Technical teams</dt> + <dd> + <ul> + <li>User support personnel</li> + <li>Systems Administrators -- critical and non-critical</li> + <li>Softare Developers</li> + <li>controllers of keys</li> + </ul> + Refer to Security Policy 9.1 (<a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html#s9.1">COD8</a>) + + </dd> + + <dt>Assurance</dt> + <dd> + <ul> + <li>Assurers</li> + <li> Any others authorised under COD13 </li> + </ul> + Refer to Assurance Policy (<a href="https://www.cacert.org/policy/AssurancePolicy.html">COD13</a>) + </dd> + + <dt>Governance</dt> + <dd> + <ul> + <li>Directors (members of the CAcert Inc. committee, or "Board") </li> + <li>Internal Auditor</li> + <li>Arbitrator</li> + </ul> + </dd> +</dl> +</section> + +<section id="p5.2.2"> +<h4>5.2.2. Number of persons required per task</h4> +<p> +CAcert operates to the principles of <em>four eyes</em> and <em>dual control</em>. +All important roles require a minimum of two persons. +The people may be tasked to operate +with an additional person observing (<em>four eyes</em>), +or with two persons controlling (<em>dual control</em>). +</p> +</section> + +<section id="p5.2.3"> +<h4>5.2.3. Identification and authentication for each role</h4> + +<p> +All important roles are generally required to be assured +at least to the level of Assurer, as per AP. +Refer to Assurance Policy (<a href="https://www.cacert.org/policy/AssurancePolicy.html">COD13</a>). +</p> + +<section> +<h5>Technical</h5> +<p> +Refer to Security Policy 9.1 (<a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html#s9.1">COD8</a>). +</p> +</section> + +</section> + +<section id="p5.2.4"> +<h4>5.2.4. Roles requiring separation of duties</h4> + +<p> +Roles strive in general for separation of duties, either along the lines of +<em>four eyes principle</em> or <em>dual control</em>. +</p> +</section> + +</section> + +<section id="p5.3"> +<h3>5.3. Personnel controls</h3> + +<section id="p5.3.1"> +<h4>5.3.1. Qualifications, experience, and clearance requirements</h4> + +<figure id="t5.3.1"> +<table border="1" class="parentC"> +<thead> + <tr> + <th class="b">Role</th><th class="b">Policy</th><th class="b">Comments</th> + </tr> +</thead> +<tbody> + <tr> + <th scope="row" class="l">Assurer</th> + <td><a href="https://www.cacert.org/policy/AssurancePolicy.html"> COD13</a></td> + <td> + Passes Challenge, Assured to 100 points. + </td> + </tr><tr> + <th scope="row" class="l">Organisation Assurer</th> + <td><a href="https://www.cacert.org/policy/OrganisationAssurancePolicy.html">COD11</a></td> + <td> + Trained and tested by two supervising OAs. + </td> + </tr><tr> + <th scope="row" class="l">Technical</th> + <td>SM => <a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html">COD8</a></td> + <td> + Teams responsible for testing. + </td> + </tr><tr> + <th scope="row" class="l">Arbitrator</th> + <td><a href="https://www.cacert.org/policy/DisputeResolutionPolicy.html">COD7</a></td> + <td> + Experienced Assurers. + </td> + </tr> +</tbody> +</table> +<figcaption>Table 5.3.1. Controls on Roles</figcaption> +</figure> + +</section> + +<section id="p5.3.2"> +<h4>5.3.2. Background check procedures</h4> + +<p> +Refer to Security Policy 9.1.3 (<a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html#s9.1.3">COD8</a>). +</p> +</section> + +<section id="p5.3.3"> +<h4>5.3.3. Training requirements</h4> +<p>No stipulation.</p> +</section> + +<section id="p5.3.4"> +<h4>5.3.4. Retraining frequency and requirements</h4> +<p>No stipulation.</p> +</section> + +<section id="p5.3.5"> +<h4>5.3.5. Job rotation frequency and sequence</h4> +<p>No stipulation.</p> +</section> + +<section id="p5.3.6"> +<h4>5.3.6. Sanctions for unauthorized actions</h4> +<p> +Any actions that are questionable +- whether uncertain or grossly negligent - +may be filed as a dispute. +The Arbitrator has wide discretion in +ruling on loss of points, retraining, +or termination of access or status. +Refer to DRP (<a href="https://www.cacert.org/policy/DisputeResolutionPolicy.html">COD7</a>). +</p> +</section> + +<section id="p5.3.7"> +<h4>5.3.7. Independent contractor requirements</h4> +<p>No stipulation.</p> +</section> + +<section id="p5.3.8"> +<h4>5.3.8. Documentation supplied to personnel</h4> +<p>No stipulation.</p> +</section> + +</section> + +<section id="p5.4"> +<h3>5.4. Audit logging procedures</h3> + +<p> +Refer to Security Policy <a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html#s4.2">4.2</a>, <a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html#s5">5</a> (<a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html">COD8</a>). +</p> +</section> + +<section id="p5.5"> +<h3>5.5. Records archival</h3> +<p> +The standard retention period is 7 years. +Once archived, records can only be obtained and verified +by means of a filed dispute. +Following types of records are archived: +</p> + +<figure> +<table border="1" class="parentC"> +<thead> + <tr> + <th class="b">Record</th> + <th class="b">Nature</th> + <th class="b">Exceptions</th> + <th class="b">Documentation</th> + </tr> +</thead> +<tbody> + <tr> + <th scope="row">Member</th> + <td>username, primary and added addresses, security questions, Date of Birth</td> + <td>resigned non-subscribers: 0 years.</td> + <td>Security Policy and Privacy Policy</td> + </tr> + <tr> + <th scope="row">Assurance</th> + <td>CAP forms</td> + <td>"at least 7 years."<br> as per subsidiary policies</td> + <td>Assurance Policy 4.5</td> + </tr> + <tr> + <th scope="row">Organisation Assurance</th> + <td>COAP forms</td> + <td>as per subsidiary policies</td> + <td>Organisation Assurance Policy</td> + </tr> + <tr> + <th scope="row">certificates and revocations</th> + <td> for reliance </td> + <td> 7 years after termination </td> + <td>this CPS</td> + </tr> + <tr> + <th scope="row">critical roles</th> + <td>background check worksheets</td> + <td>under direct Arbitrator control</td> + <td>Security Policy 9.1.3</td> + </tr> +</tbody> +</table> +<figcaption>Table 5.5. Documents and Retention</figcaption> +</figure> +</section> + +<section id="p5.6"> +<h3>5.6. Key changeover</h3> + +<p> +Refer to Security Policy <a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html#s9.2">9.2</a> (<a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html">COD8</a>). +</p> +</section> + +<section id="p5.7"> +<h3>5.7. Compromise and disaster recovery</h3> + +<p> +Refer to Security Policy <a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html#s5">5</a>, <a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html#s6">6</a> (<a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html">COD8</a>). +(Refer to <a href="#p1.4">§1.4</a> for limitations to service.) +</p> +</section> + +<section id="p5.8"> +<h3>5.8. CA or RA termination</h3> + +<section id="p5.8.1"> +<h4>5.8.1 CA termination</h4> + +<p> +In the event of operational termination, the +Roots (including SubRoots) +and all private Member information will be secured. +The Roots will be handed over to a responsible +party for the sole purpose of issuing revocations. +Member information will be securely destroyed. +</p> + +<p> +The CA cannot be transferrred to another organisation. +</p> +</section> + +<section id="p5.8.2"> +<h4>5.8.2 RA termination</h4> + +<p> +When an Assurer desires to voluntarily terminates +her responsibilities, she does this by filing a dispute, +and following the instructions of the Arbitrator. +</p> + +<p> +In the case of involuntary termination, the process is +the same, save for some other party filing the dispute. +</p> +</section> + +</section> +</section> + + +<!-- *************************************************************** --> +<section id="p6"> +<h2>6. TECHNICAL SECURITY CONTROLS</h2> + + +<section id="p6.1"> +<h3>6.1. Key Pair Generation and Installation</h3> + +<section id="p6.1.1"> +<h4>6.1.1. Key Pair Generation</h4> + +<p> +Subscribers generate their own Key Pairs. +</p> +</section> + +<section id="p6.1.2"> +<h4>6.1.2. Subscriber Private key security</h4> + +<p> +There is no technical stipulation on how Subscribers generate +and keep safe their private keys, +however, CCA 2.5 provides for general security obligations. +See <a href="#p9.6">§9.6</a>. +</p> +</section> + +<section id="p6.1.3"> +<h4>6.1.3. Public Key Delivery to Certificate Issuer</h4> + +<p> +Members login to their online account. +Public Keys are delivered by cut-and-pasting +them into the appropriate window. +Public Keys are delivered in signed-CSR form +for X.509 and in self-signed form for OpenPGP. +</p> +</section> + +<section id="p6.1.4"> +<h4>6.1.4. CA Public Key delivery to Relying Parties</h4> + +<p> +The CA root certificates are distributed by these means: +</p> +<ul><li> + Published on the website of CAcert, + in both HTTP and HTTPS. + </li><li> + Included in Third-Party Software such as + Browsers, Email-Clients. + Such suppliers are subject to the Third Party Vendor Agreement. +</li></ul> +</section> + +<section id="p6.1.5"> +<h4>6.1.5. Key sizes</h4> + +<p> +No limitation is placed on Subscriber key sizes. +</p> + +<p> +CAcert X.509 root and intermediate keys are currently 4096 bits. +X.509 roots use RSA and sign with the SHA-1 message digest algorithm. +See <a href="#p4.3.1">§4.3.1</a>. +</p> + +<p> +OpenPGP Signing uses both RSA and DSA (1024 bits). +</p> + +<p> +CAcert adds larger keys and hashes +in line with general cryptographic trends, +and as supported by major software suppliers. +</p> +</section> + +<section id="p6.1.6"> +<h4>6.1.6. Public key parameters generation and quality checking</h4> + +<p> +No stipulation. +</p> +</section> + +<section id="p6.1.7"> +<h4>6.1.7. Key Usage Purposes</h4> + +<p> +CAcert roots are general purpose. +Each root key may sign all of the general purposes +- client, server, code. +</p> + +<p> +The website controls the usage purposes that may be signed. +This is effected by means of the 'template' system. +</p> +</section> + +</section> + + +<section id="p6.2"> +<h3>6.2. Private Key Protection and Cryptographic Module Engineering Controls</h3> + +<section id="p6.2.1"> +<h4>6.2.1. Cryptographic module standards and controls</h4> + +<p> +SubRoot keys are stored on a single machine which acts +as a Cryptographic Module, or <em>signing server</em>. +It operates a single daemon for signing only. +The signing server has these security features: +</p> +<ul><li> + It is connected only by one + dedicated (serial USB) link + to the online account server. + It is not connected to the network, + nor to any internal LAN (ethernet), + nor to a console switch. + </li><li> + The protocol over the dedicated link is a custom, simple + request protocol that only handles certificate signing requests. + </li><li> + The daemon is designed not to reveal the key. + </li><li> + The daemon incorporates a dead-man switch that monitors + the one webserver machine that requests access. + </li><li> + The daemon shuts down if a bad request is detected. + </li><li> + The daemon resides on an encrypted partition. + </li><li> + The signing server can only be (re)started with direct + systems administration access. + </li><li> + Physical Access to the signing server is under dual control. +</li></ul> + +<p> +See <a href="#p5">§5.</a> and the Security Policy 9.3.1. +</p> + +<p> +(Hardware-based, commercial and standards-based cryptographic +modules have been tried and tested, and similar have been tested, +but have been found wanting, e.g., for short key lengths and +power restrictions.) +</p> +</section> + +</section> + + +<section id="p6.3"> +<h3>6.3. Other aspects of key pair management</h3> + +<section id="p6.3.1"> +<h4>6.3.1. Public key archival</h4> + +<p> +Subscriber certificates, including public keys, +are stored in the database backing the online system. +They are not made available in a public- or subscriber-accessible +archive, see <a href="#p2">§2</a>. +They are backed-up by CAcert's normal backup procedure, +but their availability is a subscriber responsibility. +</p> +</section> + +<section id="p6.3.2"> +<h4>6.3.2. Certificate operational periods and key pair usage periods</h4> + +<p> +The operational period of a certificate and its key pair +depends on the Assurance status of the Member, +see <a href="#p1.4.5">§1.4.5</a> and Assurance Policy (<a href="https://www.cacert.org/policy/AssurancePolicy.html">COD13</a>). +</p> + +<p> +The CAcert (top-level) Root certificate +has a 30 year expiry. +SubRoots have 10 years, and are to be rolled over more quickly. +The keysize of the root certificates are chosen +in order to ensure an optimum security to CAcert +Members based on current recommendations from the +<a href="http://www.keylength.com/">cryptographic community</a> +and maximum limits in generally available software. +At time of writing this is 4096 bits. +</p> +</section> + +</section> + + +<section id="p6.4"> +<h3>6.4. Activation data</h3> +<p> No stipulation. </p> +</section> + +<section id="p6.5"> +<h3>6.5. Computer security controls</h3> +<p> +Refer to Security Policy. +</p> +</section> + +<section id="p6.6"> +<h3>6.6. Life cycle technical controls</h3> +<p> +Refer to <a href="https://wiki.cacert.org/SecurityManual#SOFTWARE_DEVELOPMENT">SM7 "Software Development"</a>. +</p> +</section> + +<section id="p6.7"> +<h3>6.7. Network security controls</h3> +<p> +Refer to <a href="https://wiki.cacert.org/SecurityManual#Network">SM3.1 "Logical Security - Network"</a>. +</p> +</section> + +<section id="p6.8"> +<h3>6.8. Time-stamping</h3> +<p> +Each server synchronises with NTP. +No "timestamping" service is currently offered. +</p> +</section> + +</section> + + +<!-- *************************************************************** --> +<section id="p7"> +<h2>7. CERTIFICATE, CRL, AND OCSP PROFILES</h2> + +<p> +CAcert defines all the meanings, semantics and profiles +applicable to issuance of certificates and signatures +in its policies, handbooks and other documents. +Meanings that may be written in external standards or documents +or found in wider conventions are not +incorporated, are not used by CAcert, and must not be implied +by the Member or the Non-related Person. +</p> + +<section id="p7.1"> +<h3>7.1. Certificate profile</h3> + +<section id="p7.1.1"> +<h4>7.1.1. Version number(s)</h4> + +<p> +Issued X.509 certificates are of v3 form. +The form of the PGP signatures depends on several factors, therefore no stipulation. +</p> +</section> + +<section id="p7.1.2"> +<h4>7.1.2. Certificate extensions</h4> + +<p> + Client certificates include the following extensions: +</p> +<ul> + <li>basicConstraints=CA:FALSE (critical)</li> + <li>keyUsage=digitalSignature,keyEncipherment,keyAgreement (critical)</li> + <li>extendedKeyUsage=emailProtection,clientAuth,msEFS,msSGC,nsSGC</li> + <li>authorityInfoAccess = OCSP;URI:http://ocsp.cacert.org</li> + <li>crlDistributionPoints=URI:<crlUri> where <crlUri> is replaced + with the URI where the certificate revocation list relating to the + certificate is found</li> + <li>subjectAltName=(as per <a href="#p3.1.1">§3.1.1.</a>).</li> +</ul> + +<p> + Server certificates include the following extensions: +</p> +<ul> + <li>basicConstraints=CA:FALSE (critical)</li> + <li>keyUsage=digitalSignature,keyEncipherment,keyAgreement (critical)</li> + <li>extendedKeyUsage=clientAuth,serverAuth,nsSGC,msSGC</li> + <li>authorityInfoAccess = OCSP;URI:http://ocsp.cacert.org</li> + <li>crlDistributionPoints=URI:<crlUri> where <crlUri> is replaced + with the URI where the certificate revocation list relating to the + certificate is found</li> + <li>subjectAltName=(as per <a href="#p3.1.1">§3.1.1.</a>).</li> +</ul> + +<p> + Code-Signing certificates include the following extensions: +</p> +<ul> + <li>basicConstraints=CA:FALSE (critical)</li> + <li>keyUsage=digitalSignature,keyEncipherment,keyAgreement (critical)</li> + <li>extendedKeyUsage=emailProtection,clientAuth,codeSigning,msCodeInd,msCodeCom,msEFS,msSGC,nsSGC</li> + <li>authorityInfoAccess = OCSP;URI:http://ocsp.cacert.org</li> + <li>crlDistributionPoints=URI:<crlUri> where <crlUri> is replaced + with the URI where the certificate revocation list relating to the + certificate is found</li> + <li>subjectAltName=(as per <a href="#p3.1.1">§3.1.1.</a>).</li> +</ul> + +<p> +OpenPGP key signatures currently do not include extensions. +In the future, a serial number might be included as an extension. +</p> +</section> + +<section id="p7.1.3"> +<h4>7.1.3. Algorithm object identifiers</h4> +<p> +No stipulation. +</p> +</section> + +<section id="p7.1.4"> +<h4>7.1.4. Name forms</h4> +<p> +Refer to <a href="#p3.1.1">§3.1.1</a>. +</p> +</section> + +<section id="p7.1.5"> +<h4>7.1.5. Name constraints</h4> +<p> +Refer to <a href="#p3.1.1">§3.1.1</a>. +</p> +</section> + +<section id="p7.1.6"> +<h4>7.1.6. Certificate policy object identifier</h4> +<p> +The following OIDs are defined and should be incorporated +into certificates: +</p> +<table border="1"> +<thead> + <tr> + <th> + OID + </th> + <th> + Type/Meaning + </th> + <th> + Comment + </th> + </tr> +</thead> +<tbody> + <tr> + <th scope="row" class="l"> + 1.3.6.1.4.1.18506.4.4 + </th> + <td> + Certification Practice Statement + </td> + <td> + (this present document) + </td> + </tr> +</tbody> +</table> + +<p> +Versions are defined by additional numbers appended such as .1. +</p> +</section> + +<section id="p7.1.7"> +<h4>7.1.7. Usage of Policy Constraints extension</h4> +<p> +No stipulation. +</p> +</section> + +<section id="p7.1.8"> +<h4>7.1.8. Policy qualifiers syntax and semantics</h4> +<p> +No stipulation. +</p> +</section> + +<section id="p7.1.9"> +<h4>7.1.9. Processing semantics for the critical Certificate Policies extension</h4> +<p> +No stipulation. +</p> +</section> + +</section> + + +<section id="p7.2"> +<h3>7.2. CRL profile</h3> + +<section id="p7.2.1"> +<h4>7.2.1. Version number(s)</h4> +<p> +CRLs are created in X.509 v2 format. +</p> +</section> + +<section id="p7.2.2"> +<h4>7.2.2. CRL and CRL entry extensions</h4> + +<p> +No extensions. +</p> +</section> + +</section> + + +<section id="p7.3"> +<h3>7.3. OCSP profile</h3> + +<section id="p7.3.1"> +<h4>7.3.1. Version number(s)</h4> +<p> +The OCSP responder operates in Version 1. +</p> +</section> + +<section id="p7.3.2"> +<h4>7.3.2. OCSP extensions</h4> +<p> +No stipulation. +</p> +</section> + +</section> +</section> + + +<!-- *************************************************************** --> +<section id="p8"> +<h2>8. COMPLIANCE AUDIT AND OTHER ASSESSMENTS</h2> + +<p> +There are two major threads of assessment: +</p> +<dl> + <dt>Systems Audit</dt> + <dd> + Analyses the CA for business and operations security. + This is conducted in two phases: documents for compliance + with criteria, and operations for compliance with documentation. + </dd> + + <dt>Code Audit</dt> + <dd> + Analyses the source code. + This is conducted at two levels: + Security concepts at the web applications level, + and source code security and bugs review. + </dd> +</dl> + +<p> +See the Audit page at +<a href="https://wiki.cacert.org/Audit/"> +wiki.cacert.org/Audit/</a> +for more information. +</p> + +<section id="p8.1"> +<h3>8.1. Frequency or circumstances of assessment</h3> +<p> +The first audits started in late 2005, +and since then, assessments have been an +ongoing task. +Even when completed, they are expected to +be permanent features. +</p> + +<ul><li> + <strong>Systems Audit</strong>. + </li><li> + <strong>Code Audit</strong>. +</li></ul> +</section> + +<section id="p8.2"> +<h3>8.2. Identity/qualifications of assessor</h3> + +<dl> + +<dt>Systems Auditors</dt> +<dd> +CAcert uses business systems auditors with broad experience +across the full range of business, information systems +and security fields. +In selecting a business systems auditor, CAcert looks for +experience that includes but is not limited to +cryptography, PKI, governance, auditing, +compliance and regulatory environments, +business strategy, software engineering, +networks, law (including multijurisdictional issues), +identity systems, fraud, IT management. +</dd> + +<dt>Code Auditors</dt> +<dd> +See Security Policy, sections <a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html#s7">7</a>, <a href="https://svn.cacert.org/CAcert/Policies/SecurityPolicy.html#s9.1">9.1</a>. +</dd> + +</dl> +</section> + +<section id="p8.3"> +<h3>8.3. Assessor's relationship to assessed entity</h3> + +<p> +Specific internal restrictions on audit personnel: +</p> +<ul><li> + Must be Assured by CAcert Assurers + and must be background checked. + </li><li> + Must not have been active in any (other) role in CAcert. + Specifically, must not be an Assurer, a member of the association, + or in any other defined role or office. + </li><li> + Although the Auditor may be expected to undertake various + of the activities (Assurance, Training) + during the process of the audit, any results are frozen + until resignation as auditor is effected. + </li><li> + The Auditor is required to declare to CAcert all + potential conflicts of interest on an ongoing basis. +</li></ul> + +<p> +Specific external restrictions on audit personnel: +</p> +<ul><li> + Should have a verifiable and lengthy history in + user privacy and user security. + </li><li> + Must not have worked for a competitive organisation. + </li><li> + Must not have worked for national security, intelligence, + LEO or similar agencies. +</li></ul> + +<p> +An Auditor may convene an audit team. +The same restrictions apply in general +to all members of the team, but may be varied. +Any deviations must be documented and approved +by the CAcert Inc. Board. +</p> +</section> + +<section id="p8.4"> +<h3>8.4. Topics covered by assessment</h3> + +<p> +Systems Audits are generally conducted to criteria. +CAcert requires that the criteria are open: +</p> +<dl> + <dt>Published</dt> + <dd> + The criteria must be reviewable by all interested parties. + </dd> + + <dt>Understandable</dt> + <dd> + They should be understandable, in that they provide the + sufficient information in a readable form for interested + parties to follow the gist and importance. + (Arcane security criteria may stretch this requirement.) + </dd> + + <dt>Complete</dt> + <dd> + There must be sufficent background information that the + whole story is there. Especially, criteria that refer + to undocumented practices or conventions deliberately + kept secret must be avoided. + </dd> + + <dt>Applicable</dt> + <dd> + The criteria should relate directly + and unambiguously to a need of the identified interested parties + (Members, Relying Parties, Subscribers, Assurers). + </dd> +</dl> + +<p> +See +<a href="http://rossde.com/CA_review/">DRC</a> +for the current criteria. +If Auditor determines that a criteria fails to +follow the meet the above requirements, then the criteria +should be reworked to conform, or should be dropped +(both with explanatory notes). +</p> +</section> + +<section id="p8.5"> +<h3>8.5. Actions taken as a result of deficiency</h3> +<p> +See the current +<a href="https://wiki.cacert.org/Audit/Done">Audit Done list</a> +for work completed, and +<a href="https://wiki.cacert.org/AuditToDo">Audit Todo list</a> +for work in progress. +</p> + +<p> +Auditor may issue directives instructing changes, +where essential to audit success or other extreme +situations. +Directives should be grounded on criteria, +on established minimum or safe practices, +or clearly described logic. +Adequate discussion with Community +(e.g., CAcert Inc. Board and with Policy Group) +should precede any directive. +They should be presented to the same standard +as the criteria, above. +</p> + +<p> +The +<a href="https://wiki.cacert.org/AuditDirectives"> +wiki.cacert.org/AuditDirectives</a> +documents issued directives and actions. +</p> +</section> + +<section id="p8.6"> +<h3>8.6. Communication of results</h3> + +<p> +Current and past Audit information is available at +<a href="https://wiki.cacert.org/Audit/">wiki.CAcert.org/Audit/</a>. +CAcert runs an open disclosure policy and +Audit is no exception. +</p> + +<p> +This CPS and other documents are subject to +the process in Policy on Policy (<a href="https://www.cacert.org/policy/PolicyOnPolicy.html">COD1</a>). +Audits cover the overall processes more +than any one document, and documents may vary +even as Audit reports are delivered. +</p> +</section> + +</section> + + +<!-- *************************************************************** --> +<section id="p9"> +<h2>9. OTHER BUSINESS AND LEGAL MATTERS</h2> + +<section id="p9.1"> +<h3>9.1. Fees</h3> + +<p> +The current fees structure is posted at +<a href="https://wiki.cacert.org/Price">wiki.cacert.org/Price</a>. +Changes to the fees structure will be announced +from time to time on the <a href="https://blog.cacert.org/">blog</a>. +CAcert retains the right to charge fees for services. +All fees are non-refundable. +</p> +</section> + +<section id="p9.2"> +<h3>9.2. Financial responsibility</h3> + +<p> +Financial risks are dealt with primarily by +the Dispute Resolution Policy +(<a href="https://www.cacert.org/policy/DisputeResolutionPolicy.html">COD7</a>). +</p> + +<section id="p9.2.1"> +<h4>9.2.1. Insurance coverage</h4> + +<p> +No stipulation. +</p> +</section> + +<section id="p9.2.2"> +<h4>9.2.2. Other assets</h4> + +<p> +No stipulation. +</p> +</section> + +<section id="p9.2.3"> +<h4>9.2.3. Insurance or warranty coverage for end-entities</h4> + +<p> +No stipulation. +</p> +</section> + +</section> + + +<section id="p9.3"> +<h3>9.3. Confidentiality of business information</h3> + +<section id="p9.3.1"> +<h4>9.3.1. Scope of confidential information</h4> + +<p> +CAcert has a policy of transparency and openness. +The default posture is that information is public +to the extent possible, +unless covered by specific policy provisions +(for example, passwords) +or rulings by Arbitrator. +</p> +</section> + +</section> + + +<section id="p9.4"> +<h3>9.4. Privacy of personal information</h3> + +<p> +Privacy is covered by the +CCA (<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html">COD9</a>) +and the Privacy Policy +(<a href="https://www.cacert.org/policy/PrivacyPolicy.html">COD5</a>). +</p> + +<section id="p9.4.1"> +<h4>9.4.1. Privacy plan</h4> +<p> No stipulation. </p> +</section> + +<section id="p9.4.2"> +<h4>9.4.2. Information treated as private</h4> +<p> +Member's Date of Birth and "Lost Password" questions are treated as fully private. +</p> +</section> + +<section id="p9.4.3"> +<h4>9.4.3. Information not deemed private</h4> +<p> +To the extent that information is put into an issued certificate, +that information is not deemed private, +as it is expected to be published by the Member as part of routine use of +the certificate. +Such information generally includes +Names, domains, email addresses, and certificate serial numbers. +</p> +<p> +Under Assurance Policy +(<a href="https://www.cacert.org/policy/AssurancePolicy.html">COD13</a>) +the Member's status (as Assured, Assurer, etc) is available +to other Members. +</p> +<p> +Information placed in forums outside the online system +(wiki, blogs, policies, etc) is not deemed private, and is +generally deemed to be published as contributions by Members. +See +CCA1.3 (COD9). +</p> +</section> + +<section id="p9.4.4"> +<h4>9.4.4. Responsibility to protect private information</h4> +<p> +CAcert is a privacy organisation +and takes privacy more seriously. +Any privacy issue may be referred to dispute resolution. +</p> +</section> + +<section id="p9.4.5"> +<h4>9.4.5. Notice and consent to use private information</h4> +<p> +Members are permitted to rely on certificates of other Members. +As a direct consequence of the general right to rely, +Members may read and store the certificates +and/or the information within them, where duly presented in +a relationship, and to the extent necessary for +the agreed relationship. +</p> +</section> + +<section id="p9.4.6"> +<h4>9.4.6. Disclosure pursuant to judicial or administrative process</h4> +<p> +Any disclosure pursuant to process from foreign courts +(or similar) +is controlled by the Arbitrator. +</p> +</section> + +<section id="p9.4.7"> +<h4>9.4.7. Other information disclosure circumstances</h4> +<p> +None. +</p> +</section> + +</section> + + +<section id="p9.5"> +<h3>9.5. Intellectual property rights</h3> + +<p> +CAcert is committed to the philosophy of +an open and free Internet, +broadly as encapsulated by open and free source. +However, due to the strict control provisions +imposed by the audit criteria (CCS), +and the general environment and role of CAs, +and the commitment to security of Members, +some deviations are necessary. +</p> + +<section id="p9.5.1"> +<h4>9.5.1. Ownership and Licence</h4> + +<p> +Assets that fall under the control of CCS +must be transferred to CAcert. +See PoP 6.2 +(<a href="https://www.cacert.org/policy/PolicyOnPolicy.html#s6.2">COD1</a>), +CCA 1.3 +(<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html#s1.3">COD9</a>). +That is, CAcert is free to use, modify, +distribute, and otherwise conduct the business +of the CA as CAcert sees fit with the asset. +</p> +</section> + +<section id="p9.5.2"> +<h4>9.5.2. Brand</h4> +<p> +The brand of CAcert +is made up of its logo, name, trademark, service marks, etc. +Use of the brand is strictly limited by the Board, +and permission is required. +See <a href="https://wiki.cacert.org/TopMinutes-20070917"> +m20070917.5</a>. +</p> +</section> + +<section id="p9.5.3"> +<h4>9.5.3. Documents</h4> + +<p> +CAcert owns or requires full control over its documents, +especially those covered by CCS. +See PoP 6.2 +(<a href="https://www.cacert.org/policy/PolicyOnPolicy.html#s6.2">COD1</a>). +Contributors transfer the rights, +see CCA 1.3 +(<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html#s1.3">COD9</a>). +Contributors warrant that they have the right to transfer. +</p> + +<p> +Documents are generally licensed under free and open licence. +See +<a href="https://wiki.cacert.org/PolicyDrafts/DocumentLicence"> +wiki.cacert.org/PolicyDrafts/DocumentLicence</a>. +Except where explicitly negotiated, +CAcert extends back to contributors a +non-exclusive, unrestricted perpetual +licence, permitting them to to re-use +their original work freely. +See PoP 6.4 +(<a href="https://www.cacert.org/policy/PolicyOnPolicy.html#s6.4">COD1</a>), +CCA 1.3 +(<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html#s1.3">COD9</a>). +</p> +</section> + +<section id="p9.5.4"> +<h4>9.5.4. Code</h4> + +<p> +CAcert owns its code or requires full control over code in use +by means of a free and open licence. +See CCS. +</p> + +<p> +CAcert licenses its code under GPL. +CAcert extends back to contributors a +non-exclusive, unrestricted perpetual +licence, permitting them to to re-use +their original work freely. +</p> +</section> + +<section id="p9.5.5"> +<h4>9.5.5. Certificates and Roots</h4> + +<p> +CAcert asserts its intellectual property rights over certificates +issued to Members and over roots. +See CCA 4.4 +(<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html#s4.4">COD9</a>), +CCS (<a href="https://svn.cacert.org/CAcert/Policies/ConfigurationControlSpecification.html">COD2</a>). +The certificates may only be used by Members under +<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html#s4.4">COD9</a>, +and, +by others under the licences offered, +such as +Root Distribution License (<a href="https://www.cacert.org/policy/RootDistributionLicense.html">COD14</a>). +</p> +</section> + +</section> + + +<section id="p9.6"> +<h3>9.6. Representations and warranties</h3> + +<section id="p9.6.1"> +<h4>9.6.1. Members</h4> + +<p> +All Members of the Community agree to the +CAcert Community Agreement +(<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html">COD9</a>), +which is the primary document for +representations and warranties. +Members include Subscribers, Relying Parties, +Registration Agents and the CA itself. +</p> +</section> + +<section id="p9.6.2"> +<h4>9.6.2. RAs</h4> + +<p> +Registration Agents are obliged additionally by Assurance Policy, +especially <a href="https://www.cacert.org/policy/AssurancePolicy.html#s3.1">3.1</a>, <a href="https://www.cacert.org/policy/AssurancePolicy.html#s4.1">4.1</a> +(<a href="https://www.cacert.org/policy/AssurancePolicy.html">COD13</a>). +</p> +</section> + +<section id="p9.6.3"> +<h4>9.6.3. CA</h4> + +<p> +The CA is obliged additionally by the CCS (<a href="https://svn.cacert.org/CAcert/Policies/ConfigurationControlSpecification.html">COD2</a>). +</p> +</section> + +<section id="p9.6.4"> +<h4>9.6.4. Third Party Vendors</h4> + +<p> +Distributors of the roots are offered the +<span class="q">wip</span> +3rd-Party Vendors - Disclaimer and Licence +(3PV-DaL => CODx) +and are offered +<span class="q">wip</span> +the same deal as Members to the extent that they agree +to be Members in the Community. +<span class="q">wip</span> +</p> +</section> + +</section> + +<section id="p9.7"> +<h3>9.7. Disclaimers of Warranties</h3> + +<p> +Persons who have not accepted the above Agreements are offered the +Root Distribution License (<a href="https://www.cacert.org/policy/RootDistributionLicense.html">COD14</a>). + +Any representations and +warranties are strictly limited to nominal usage. +In essence, NRPs may USE but must not RELY. +</p> + +<p> +In today's aggressive fraud environment, +and within the context of CAcert as a community CA, +all parties should understand that CAcert +and its Subscribers, Assurers and other roles +provide service on a Best Efforts basis. +See <a href="#p1.4">§1.4</a>. +CAcert seeks to provide an adequate minimum +level of quality in operations for its Members +without undue risks to NRPs. +See +<a href="https://svn.cacert.org/CAcert/principles.html">Principles</a>. +</p> + +<p> +CAcert on behalf of the Community and itself +makes no Warranty nor Guarantee nor promise +that the service or certificates are adequate +for the needs and circumstances. +</p> +</section> + +<section id="p9.8"> +<h3>9.8. Limitations of liability</h3> + +<section id="p9.8.1"> +<h4>9.8.1 Non-Related Persons </h4> + +<p> +CAcert on behalf of related parties +(RAs, Subscribers, etc) and itself +disclaims all liability to NRPs +in their usage of CA's certificates. +See <a href="https://www.cacert.org/policy/RootDistributionLicense.html">COD4</a>. +</p> +</section> + +<section id="p9.8.2"> +<h4>9.8.2 Liabilities Between Members</h4> + +<p> +Liabilities between Members +are dealt with by internal dispute resolution, +which rules on liability and any limits. +See +<a href="#9.13">§9.13</a>. +</p> +</section> + +</section> + + +<section id="p9.9"> +<h3>9.9. Indemnities</h3> + +<p> +No stipulation. +</p> +</section> + +<section id="p9.10"> +<h3>9.10. Term and termination</h3> + +<section id="p9.10.1"> +<h4>9.10.1. Term</h4> + +<p> +No stipulation. +</p> +</section> + +<section id="p9.10.2"> +<h4>9.10.2. Termination</h4> + +<p> +Members file a dispute to terminate their agreement. +See <a href="#p9.13">§9.13</a> and CCA 3.3 +(<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html#s3.3">COD9</a>). +</p> + +<p> +Documents are varied (including terminated) under <a href="https://www.cacert.org/policy/PolicyOnPolicy.html">COD1</a>. +</p> + +<p> +For termination of the CA, see <a href="#p5.8.1">§5.8.1</a>. +</p> +</section> + +<section id="p9.10.3"> +<h4>9.10.3. Effect of termination and survival</h4> + +<p> +No stipulation. +</p> +</section> + +</section> + + +<section id="p9.11"> +<h3>9.11. Individual notices and communications with participants</h3> + +<p> +All participants are obliged to keep their listed +primary email addresses in good working order. +See CCA 3.5 +(<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html#s3.5">COD9</a>). +</p> +</section> + + +<section id="p9.12"> +<h3>9.12. Amendments</h3> + +<p> +Amendments to the CPS are controlled by <a href="https://www.cacert.org/policy/PolicyOnPolicy.html">COD1</a>. +Any changes in Member's Agreements are notified under CCA 3.4 +(<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html#s3.4">COD9</a>). +</p> +</section> + + +<section id="p9.13"> +<h3>9.13. Dispute resolution provisions</h3> + +<p> +CAcert provides a forum and facility for any Member +or other related party to file a dispute. +</p> + +<ul><li> + The CAcert + Dispute Resolution Policy + (<a href="https://www.cacert.org/policy/DisputeResolutionPolicy.html">COD7</a>) + includes rules for dispute resolution. + </li><li> + Filing is done via email to + < support AT cacert DOT org > +</li></ul> + +<p> +Members agree to file all disputes through CAcert's +forum for dispute resolution. +The rules include specific provisions to assist +non-Members, etc, to file dispute in this forum. +</p> +</section> + + +<section id="p9.14"> +<h3>9.14. Governing law</h3> + +<p> +The governing law is that of New South Wales, Australia. +Disputes are generally heard before the Arbitrator +under this law. +Exceptionally, the Arbitrator may elect to apply the +law of the parties and events, where in common, +but this is unlikely because it may create results +that are at odds with the Community. +</p> +</section> + + +<section id="p9.15"> +<h3>9.15. Compliance with Applicable Law</h3> + +<section id="p9.15.1"> +<h4>9.15.1 Digital Signature Law</h4> +<p> +The Commonwealth and States of Australia have passed +various Electronic Transactions Acts that speak to +digital signatures. In summary, these acts follow +the "technology neutral" model and permit but do not +regulate the use of digital signatures. +</p> + +<p> +This especially means that the signatures created by +certificates issued by CAcert are not in and of themselves +legally binding human signatures, at least according to +the laws of Australia. +See <a href="#p1.4.3">§1.4.3</a>. +However, certificates may play a part in larger signing +applications. See <a href="#p1.4.1">§1.4.1</a> for "digital signing" certificates. +These applications may impose significant +obligations, risks and liabilities on the parties. +</p> +</section> + +<section id="p9.15.2"> +<h4>9.15.2 Privacy Law</h4> + +<p> +See the Privacy Policy +(<a href="https://www.cacert.org/policy/PrivacyPolicy.html">COD5</a>). +</p> +</section> + +<section id="p9.15.3"> +<h4>9.15.3 Legal Process from External Forums</h4> + +<p> +CAcert will provide information about +its Members only under legal subpoena or +equivalent process +from a court of competent jurisdiction. +Any requests made by legal subpoena are +treated as under the Dispute Resolution Policy +See +<a href="#p9.13">§9.13</a> +and +<a href="https://www.cacert.org/policy/DisputeResolutionPolicy.html">COD7</a>. +That is, all requests are treated as disputes, +as only a duly empanelled Arbitrator has the +authorisation and authority to rule on the +such requests. +</p> + +<p> +A subpoena should +include sufficient legal basis to support +an Arbitrator in ruling that information +be released pursuant to the filing, +including the names of claimants in any civil case +and an indication as to whether the claimants are +Members or not +(and are therefore subject to Dispute Resolution Policy). +</p> +</section> + +</section> + + +<section id="p9.16"> +<h3>9.16. Miscellaneous provisions</h3> + +<section id="p9.16.1"> +<h4>9.16.1. Entire agreement</h4> + +<p> +All Members of the Community agree to the +CAcert Community Agreement +(<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html">COD9</a>). +This agreement also incorporates other key +documents, being this CPS, DRP and PP. +See <a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html#s4.2">CCA 4.2</a>. +</p> + +<p> +The Configuration-Control Specification +is the set of policies that rule over the +Community, of which the above documents are part. +See <a href="https://svn.cacert.org/CAcert/Policies/ConfigurationControlSpecification.html">COD2</a>. +Documents that have reached full POLICY status +are located at +<a href="https://www.cacert.org/policy/"> +www.cacert.org/policy/</a>. +Although detailed practices may +be found in other places on the website +and on the wiki, the CCS documents that +have reached DRAFT and POLICY status are +the ruling documents.<br /> +</p> +</section> + +<section id="p9.16.2"> +<h4>9.16.2. Assignment</h4> + +<p> +The rights within CCA (<a href="https://www.cacert.org/policy/CAcertCommunityAgreement.html">COD9</a>) may not be ordinarily assigned. +</p> +</section> + +<section id="p9.16.3"> +<h4>9.16.3. Severability</h4> + +<p> +No stipulation. +</p> +</section> + +<section id="p9.16.4"> +<h4>9.16.4. Enforcement (attorneys' fees and waiver of rights)</h4> + +<p> +The Arbitrator will specify fees and remedies, if any. +</p> +</section> + +<section id="p9.16.5"> +<h4>9.16.5. Force Majeure</h4> + +<p> +No stipulation. +</p> +</section> + +</section> +</section> + + +<footer> +<h2>---This is the end of the Policy---</h2> + +<p><a href="http://validator.w3.org/check?uri=referer"><img src="images/valid-html50-blue.png" alt="Valid HTML 5" height="31" width="88"></a></p> +</footer> +</body> +</html> diff --git a/www/policy/CertificationPracticeStatement.php b/www/policy/CertificationPracticeStatement.php index b18273c..adffa0e 100644 --- a/www/policy/CertificationPracticeStatement.php +++ b/www/policy/CertificationPracticeStatement.php @@ -1,4087 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <meta name="copyright" content="CAcert Inc http://www.cacert.org/"> - <title>Certification Practice Statement (CPS)</title> - -<style type="text/css"> -<!-- -body { - font-family : verdana, helvetica, arial, sans-serif; -} - -pre, code, kbd, tt, samp { - font-family : courier, monospace; -} - -th { - text-align : left; -} - -.blockpar { - text-indent : 2em; - margin-top : 0em; - margin-bottom : 0.5em; - text-align : justify; -} - -.figure { - text-align : center; - color : gray; - margin-top : 0.5em; -} - -.center { - text-align : center; -} - -.q { - color : green; - font-weight: bold; - text-align: center; - font-style:italic; -} - -.error { - color : red; - font-weight: bold; - text-align: center; - font-style:italic; -} - -.change { - color : blue; - font-weight: bold; -} - -a:hover { - color : gray; -} ---> -</style> - - -</head> -<body> - -<h1>CAcert CPS and CP</h1> - -<a href="PolicyOnPolicy.html"><img src="cacert-draft.png" alt="CAcert Policy Status" height="31" width="88" style="border-style: none;" /></a><br /> -Creation date: 20060726<br /> |
