diff options
| -rwxr-xr-x | CommModule/client.pl | 4 | ||||
| -rw-r--r-- | includes/about_menu.php | 2 | ||||
| -rw-r--r-- | includes/account_stuff.php | 2 | ||||
| -rw-r--r-- | includes/general.php | 19 | ||||
| -rw-r--r-- | includes/general_stuff.php | 2 | ||||
| -rw-r--r-- | includes/mysql.php.sample | 4 | ||||
| -rw-r--r-- | includes/wot.inc.php | 509 | ||||
| -rw-r--r-- | pages/account/14.php | 10 | ||||
| -rw-r--r--[-rwxr-xr-x] | pages/account/39.php | 78 | ||||
| -rw-r--r-- | pages/index/1.php | 4 | ||||
| -rw-r--r-- | pages/index/10.php | 78 | ||||
| -rw-r--r-- | pages/index/19.php | 94 | ||||
| -rw-r--r-- | pages/index/6.php | 4 | ||||
| -rw-r--r-- | pages/wot/10.php | 23 | ||||
| -rw-r--r-- | pages/wot/15.php | 29 | ||||
| -rwxr-xr-x | scripts/DumpWeakCerts.pl | 46 | ||||
| -rwxr-xr-x | scripts/mass-revoke.php | 89 | ||||
| -rw-r--r-- | www/index.php | 9 | ||||
| -rw-r--r-- | www/policy/CAcertCommunityAgreement.php | 2 | ||||
| -rw-r--r-- | www/policy/CertificationPracticeStatement.php | 6 | ||||
| -rw-r--r-- | www/policy/PrivacyPolicy.html | 114 | ||||
| -rw-r--r-- | www/policy/index.php | 5 | ||||
| -rw-r--r-- | www/wot.php | 12 |
23 files changed, 873 insertions, 272 deletions
diff --git a/CommModule/client.pl b/CommModule/client.pl index 690d947..323ee27 100755 --- a/CommModule/client.pl +++ b/CommModule/client.pl @@ -670,13 +670,13 @@ sub sendmail($$$$$$$) SysLog "SMTP: ".<$smtp>; print $smtp "HELO hlin.cacert.org\r\n"; SysLog "SMTP: ".<$smtp>; - print $smtp "MAIL FROM: <returns\@cacert.org>\r\n"; + print $smtp "MAIL FROM:<returns\@cacert.org>\r\n"; SysLog "MAIL FROM: ".<$smtp>; @bits = split(",", $to); foreach my $user (@bits) { - print $smtp "RCPT TO: <".trim($user).">\r\n"; + print $smtp "RCPT TO:<".trim($user).">\r\n"; SysLog "RCPT TO: ".<$smtp>; } print $smtp "DATA\r\n"; diff --git a/includes/about_menu.php b/includes/about_menu.php index 2f3080d..f34a274 100644 --- a/includes/about_menu.php +++ b/includes/about_menu.php @@ -4,7 +4,7 @@ <li><a href="http://blog.cacert.org/"><?=_("CAcert News")?></a></li> <li><a href="http://wiki.CAcert.org/"><?=_("Wiki Documentation")?></a></li> <li><a href="/policy/"><?=_("Policies")?></a></li> - <li><a href="/index.php?id=19"><?=_("Point System")?></a></li> + <li><a href="//wiki.cacert.org/FAQ/Privileges"><?=_("Point System")?></a></li> <li><a href="http://bugs.CAcert.org/"><?=_("Bug Database")?></a></li> <? // <li><a href="/index.php?id=47">< = _ ("PR Materials" ) > </a></li> ?> <? // <li><a href="/logos.php">< ? = _ ( " CAcert Logos " ) ? > </a></li> ?> diff --git a/includes/account_stuff.php b/includes/account_stuff.php index 7c8980c..b6fdd7a 100644 --- a/includes/account_stuff.php +++ b/includes/account_stuff.php @@ -278,7 +278,7 @@ function hideall() { </div> </div> <div id="siteInfo"><a href="account.php?id=37"><?=_("About Us")?></a> | <a href="account.php?id=38"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> | - <a href="account.php?id=39"><?=_("Privacy Policy")?></a> | <a href="account.php?id=40"><?=_("Contact Us")?></a> + <a href="/policy/PrivacyPolicy.html"><?=_("Privacy Policy")?></a> | <a href="account.php?id=40"><?=_("Contact Us")?></a> | ©2002-<?=date("Y")?> <?=_("by CAcert")?></div> </div> </body> diff --git a/includes/general.php b/includes/general.php index 5789875..cb17e63 100644 --- a/includes/general.php +++ b/includes/general.php @@ -248,8 +248,7 @@ } } - function checkpw($pwd, $email, $fname, $mname, $lname, $suffix) - { + function checkpwlight($pwd) { $points = 0; if(strlen($pwd) > 15) @@ -279,7 +278,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--; @@ -673,12 +684,12 @@ $line = fgets($fp, 4096); if(substr($line, 0, 3) != "250") continue; - fputs($fp, "MAIL FROM: <returns@cacert.org>\r\n"); + fputs($fp, "MAIL FROM:<returns@cacert.org>\r\n"); $line = fgets($fp, 4096); if(substr($line, 0, 3) != "250") continue; - fputs($fp, "RCPT TO: <$email>\r\n"); + fputs($fp, "RCPT TO:<$email>\r\n"); $line = trim(fgets($fp, 4096)); fputs($fp, "QUIT\r\n"); fclose($fp); diff --git a/includes/general_stuff.php b/includes/general_stuff.php index 6747c84..088c39e 100644 --- a/includes/general_stuff.php +++ b/includes/general_stuff.php @@ -132,7 +132,7 @@ if(!function_exists("showfooter")) <? include("sponsorinfo.php") ?> <div id="siteInfo"> <a href="/index.php?id=12"><?=_("About Us")?></a> | <a href="/index.php?id=13"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> | - <a href="/index.php?id=10"><?=_("Privacy Policy")?></a> | + <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> diff --git a/includes/mysql.php.sample b/includes/mysql.php.sample index 1f477e4..ff5cfc3 100644 --- a/includes/mysql.php.sample +++ b/includes/mysql.php.sample @@ -55,11 +55,11 @@ $InputBuffer = fgets($smtp, 1024); fputs($smtp, "HELO www.cacert.org\r\n"); $InputBuffer = fgets($smtp, 1024); - fputs($smtp, "MAIL FROM: <returns@cacert.org>\r\n"); + fputs($smtp, "MAIL FROM:<returns@cacert.org>\r\n"); $InputBuffer = fgets($smtp, 1024); $bits = explode(",", $to); foreach($bits as $user) - fputs($smtp, "RCPT TO: <".trim($user).">\r\n"); + fputs($smtp, "RCPT TO:<".trim($user).">\r\n"); $InputBuffer = fgets($smtp, 1024); fputs($smtp, "DATA\r\n"); $InputBuffer = fgets($smtp, 1024); diff --git a/includes/wot.inc.php b/includes/wot.inc.php new file mode 100644 index 0000000..ce35ed6 --- /dev/null +++ b/includes/wot.inc.php @@ -0,0 +1,509 @@ +<? /* + 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 +*/ + + function query_init ($query) + { + return mysql_query($query); + } + + function query_getnextrow ($res) + { + $row1 = mysql_fetch_assoc($res); + return $row1; + } + + function query_get_number_of_rows ($resultset) + { + return intval(mysql_num_rows($resultset)); + } + + function get_number_of_assurances ($userid) + { + $res = query_init ("SELECT count(*) AS `list` FROM `notary` + WHERE `notary`.`from` != `notary`.`to` AND `notary`.`from`='".intval($userid)."'"); + $row = query_getnextrow($res); + + return intval($row['list']); + } + + function get_number_of_assurees ($userid) + { + $res = query_init ("SELECT count(*) AS `list` FROM `notary` + WHERE `notary`.`from` != `notary`.`to` AND `notary`.`to`='".intval($userid)."'"); + $row = query_getnextrow($res); + + return intval($row['list']); + } + + function get_top_assurer_position ($no_of_assurances) + { + $res = query_init ("SELECT count(*) AS `list` FROM `notary` + GROUP BY `notary`.`from` HAVING count(*) > '".intval($no_of_assurances)."'"); + return intval(query_get_number_of_rows($res)+1); + } + + function get_top_assuree_position ($no_of_assurees) + { + $res = query_init ("SELECT count(*) AS `list` FROM `notary` + GROUP BY `notary`.`to` HAVING count(*) > '".intval($no_of_assurees)."'"); + return intval(query_get_number_of_rows($res)+1); + } + + function get_given_assurances ($userid) + { + $res = query_init ("select * from `notary` where `notary`.`from`='".intval($userid)."' and `notary`.`from` != `to` order by `notary`.`id` asc"); + return $res; + } + + function get_received_assurances ($userid) + { + $res = query_init ("select * from `notary` where `notary`.`to`='".intval($userid)."' and `notary`.`from` != `notary`.`to` order by `notary`.`id` asc "); + return $res; + } + + function get_given_assurances_summary ($userid) + { + $res = query_init ("select count(*) as number,points,awarded,method from notary where `notary`.`from`='".intval($userid)."' 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 `notary`.`to`='".intval($userid)."' group by points,awarded,method"); + return $res; + } + + function get_user ($userid) + { + $res = query_init ("select * from `users` where `id`='".intval($userid)."'"); + return mysql_fetch_assoc($res); + } + + function get_cats_state ($userid) + { + + $res = query_init ("select * from `cats_passed` inner join `cats_variant` on `cats_passed`.`variant_id` = `cats_variant`.`id` and `cats_variant`.`type_id` = 1 + WHERE `cats_passed`.`user_id` = '".intval($userid)."'"); + return mysql_num_rows($res); + } + + function calc_experience ($row,&$points,&$experience,&$sum_experience) + { + $points += $row['awarded']; + $experience = " "; + if ($row['method'] == "Face to Face Meeting") + { + $sum_experience = $sum_experience +2; + $experience = "2"; + } + return $row['awarded']; + } + + function calc_assurances ($row,&$points,&$experience,&$sumexperience,&$awarded) + { + $awarded = calc_points($row); + + if ($awarded > 100) + { + $experience = $awarded - 100; // needs to be fixed in the future (limit 50 pts and/or no experience if pts > 100) + $awarded = 100; + } + else + $experience = 0; + + switch ($row['method']) + { + case 'Thawte Points Transfer': + case 'CT Magazine - Germany': + case 'Temporary Increase': // Current usage of 'Temporary Increase' may break audit aspects, needs to be reimplemented + $awarded=sprintf("<strong style='color: red'>%s</strong>",_("Revoked")); + $experience=0; + break; + default: + $points += $awarded; + } + $sumexperience = $sumexperience + $experience; + } + + + function show_user_link ($name,$userid) + { + $name = trim($name); + if($name == "") + $name = _("Deleted before Verification"); + else + $name = "<a href='wot.php?id=9&userid=".intval($userid)."'>$name</a>"; + return $name; + } + + function get_assurer_ranking($userid,&$num_of_assurances,&$rank_of_assurer) + { + $num_of_assurances = get_number_of_assurances (intval($userid)); + $rank_of_assurer = get_top_assurer_position($num_of_assurances); + } + + function get_assuree_ranking($userid,&$num_of_assurees,&$rank_of_assuree) + { + $num_of_assurees = get_number_of_assurees (intval($userid)); + $rank_of_assuree = get_top_assuree_position($num_of_assurees); + } + + +// ************* html table definitions ****************** + + function output_ranking($userid) + { + get_assurer_ranking($userid,$num_of_assurances,$rank_of_assurer); + get_assuree_ranking($userid,$num_of_assurees,$rank_of_assuree); + +?> +<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> +</table> +<br/> +<? + } + + function output_assurances_header($title) + { +?> +<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="7" class="title"><?=$title?></td> + </tr> + <tr> + <td class="DataTD"><strong><?=_("ID")?></strong></td> + <td class="DataTD"><strong><?=_("Date")?></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> + </tr> +<? + } + + function output_assurances_footer($points_txt,$points,$experience_txt,$sumexperience) + { +?> + <tr> + <td class="DataTD" colspan="3"><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> + </tr> +</table> +<br/> +<? + } + + function output_assurances_row($assuranceid,$date,$name,$points,$location,$method,$experience) + { +?> + <tr> + <td class="DataTD"><?=$assuranceid?></td> + <td class="DataTD"><?=$date?></td> + <td class="DataTD"><?=$name?></td> + <td class="DataTD"><?=$points?></td> + <td class="DataTD"><?=$location?></td> + <td class="DataTD"><?=$method?></td> + <td class="DataTD"><?=$experience?></td> + </tr> +<? + } + + function output_summary_header() + { +?> +<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> +<? + } + + function output_summary_footer() + { +?> +</table> +<br/> +<? + } + + 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> +<? + } + + function output_cats_needed() + { +?> + <tr> + <td class="DataTD" colspan=4><strong style='color: red'><?=_("You have to pass the CAcert Assurer Challenge (CATS-Test) to be an Assurer")?></strong></td> + </tr> +<? + } + + +// ************* output given assurances ****************** + + function output_given_assurances_content($userid,&$points,&$sum_experience) + { + $points = 0; + $sumexperience = 0; + $res = get_given_assurances(intval($userid)); + while($row = mysql_fetch_assoc($res)) + { + $fromuser = get_user (intval($row['to'])); + calc_experience ($row,$points,$experience,$sum_experience); + $name = show_user_link ($fromuser['fname']." ".$fromuser['lname'],intval($row['to'])); + output_assurances_row (intval($row['id']),$row['date'],$name,intval($row['awarded']),$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience); + } + } + +// ************* output received assurances ****************** + + function output_received_assurances_content($userid,&$points,&$sum_experience) + { + $points = 0; + $sumexperience = 0; + $res = get_received_assurances(intval($userid)); + while($row = mysql_fetch_assoc($res)) + { + $fromuser = get_user (intval($row['from'])); + calc_assurances ($row,$points,$experience,$sum_experience,$awarded); + $name = show_user_link ($fromuser['fname']." ".$fromuser['lname'],intval($row['to'])); + output_assurances_row (intval($row['id']),$row['date'],$name,$awarded,$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience); + } + } + +// ************* output summary table ****************** + + function check_date_limit ($userid,$age) + { + $dob = date("Y-m-d", mktime(0,0,0,date("m"),date("d"),date("Y")-$age)); + $res = query_init ("select id from `users` where `id`='".$userid."' and `dob` < '$dob'"); + return intval(query_get_number_of_rows($res)); + } + + function calc_points($row) + { + if (intval($row['points']) < intval($row['awarded'])) + $points = intval($row['awarded']); // if 'sum of added points' > 100, awarded shows correct value + else + $points = intval($row['points']); // on very old assurances, awarded is '0' instead of correct value + switch ($row['method']) + { + case 'Thawte Points Transfer': // revoke all Thawte-points (as per arbitration) + case 'CT Magazine - Germany': // revoke c't (only one test-entry) + case 'Temporary Increase': // revoke 'temporary increase' (Current usage breaks audit aspects, needs to be reimplemented) + $points = 0; + break; + case 'Administrative Increase': // ignore AI with 2 points or less (historical for experiance points, now other calculation) + if ($points <= 2) // maybe limit to 35/50 pts in the future? + $points = 0; + break; + case 'unknown': // to be revoked in the future? limit to max 50 pts? + case 'Trusted 3rd Parties': // to be revoked in the future? limit to max 35 pts? + case '': // to be revoked in the future? limit to max 50 pts? + case 'Face to Face Meeting': // normal assurances, limit to 35/50 pts in the future? + break; + default: // should never happen ... ;-) + $points = 0; + } + if ($points < 0) // ignore negative points (bug needs to be fixed) + $points = 0; + return $points; + } + + function max_points($userid) + { + return output_summary_content ($userid,0); + } + + function output_summary_content($userid,$display_output) + { + $sum_points = 0; + $sum_experience = 0; + $sum_experience_other = 0; + $max_points = 100; + $max_experience = 50; + + $experience_limit_reached_txt = _("Limit reached"); + + if (check_date_limit($userid,18) != 1) + { + $max_experience = 10; + $experience_limit_reached_txt = _("Limit given by PoJAM reached"); + } + if (check_date_limit($userid,14) != 1) + { + $max_experience = 0; + $experience_limit_reached_txt = _("Limit given by PoJAM reached"); + } + + $res = get_received_assurances_summary($userid); + while($row = mysql_fetch_assoc($res)) + { + $points = calc_points ($row); + + if ($points > $max_points) // limit to 100 points, above is experience (needs to be fixed) + { + $sum_experience_other = $sum_experience_other+($points-$max_points)*intval($row['number']); + $points = $max_points; + } + $sum_points += $points*intval($row['number']); + } + + $res = get_given_assurances_summary($userid); + while($row = mysql_fetch_assoc($res)) + { + switch ($row['method']) + { + case 'Face to Face Meeting': // count Face to Face only + $sum_experience += 2*intval($row['number']); + break; + } + + } + + if ($sum_points > $max_points) + { + $sum_points_countable = $max_points; + $remark_points = _("Limit reached"); + } + else + { + $sum_points_countable = $sum_points; + $remark_points = " "; + } + if ($sum_experience > $max_experience) + { + $sum_experience_countable = $max_experience; + $remark_experience = $experience_limit_reached_txt; + } + else + { + $sum_experience_countable = $sum_experience; + $remark_experience = " "; + } + + if ($sum_experience_countable + $sum_experience_other > $max_experience) + { + $sum_experience_other_countable = $max_experience-$sum_experience_countable; + $remark_experience_other = $experience_limit_reached_txt; + } + else + { + $sum_experience_other_countable = $sum_experience_other; + $remark_experience_other = " "; + } + + if ($sum_points_countable < $max_points) + { + if ($sum_experience_countable != 0) + $remark_experience = $points_on_hold_txt;_("Points on hold due to less assurance points"); + $sum_experience_countable = 0; + if ($sum_experience_other_countable != 0) + $remark_experience_other = _("Points on hold due to less assurance points"); + $sum_experience_other_countable = 0; + } + + $issue_points = 0; + $cats_test_passed = get_cats_state ($userid); + if ($cats_test_passed == 0) + $issue_points_txt = "<strong style='color: red'>"._("You have to pass the CAcert Assurer Challenge (CATS-Test) to be an Assurer")."</strong>"; + else + { + $experience_total = $sum_experience_countable+$sum_experience_other_countable; + $issue_points_txt = ""; + if ($sum_points_countable == $max_points) + $issue_points = 10; + if ($experience_total >= 10) + $issue_points = 15; + if ($experience_total >= 20) + $issue_points = 20; + if ($experience_total >= 30) + $issue_points = 25; + if ($experience_total >= 40) + $issue_points = 30; + if ($experience_total >= 50) + $issue_points = 35; + if ($issue_points != 0) + $issue_points_txt = sprintf(_("You may issue up to %s points"),$issue_points); + } + if ($display_output) + { + output_summary_row (_("Assurance Points you received"),$sum_points,$sum_points_countable,$remark_points); + output_summary_row (_("Total Experience Points by Assurance"),$sum_experience,$sum_experience_countable,$remark_experience); + output_summary_row (_("Total Experience Points (other ways)"),$sum_experience_other,$sum_experience_other_countable,$remark_experience_other); + output_summary_row (_("Total Points")," ",$sum_points_countable + $sum_experience_countable + $sum_experience_other_countable,$issue_points_txt); + } + return $issue_points; + } + + function output_given_assurances($userid) + { + output_assurances_header(_("Assurance Points You Issued")); + output_given_assurances_content($userid,$points,$sum_experience); + output_assurances_footer(_("Total Points Issued"),$points,_("Total Experience Points"),$sum_experience); + } + + function output_received_assurances($userid) + { + output_assurances_header(_("Your Assurance Points")); + output_received_assurances_content($userid,$points,$sum_experience); + output_assurances_footer(_("Total Assurance Points"),$points,_("Total Experience Points"),$sum_experience); + } + + function output_summary($userid) + { + output_summary_header(); + output_summary_content($userid,1); + output_summary_footer(); + } + + function output_end_of_page() + { +?> + <p>[ <a href='javascript:history.go(-1)'><?=_("Go Back")?></a> ]</p> +<? + } +?> diff --git a/pages/account/14.php b/pages/account/14.php index 342ab46..29aeb21 100644 --- a/pages/account/14.php +++ b/pages/account/14.php @@ -15,6 +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 (intval($_REQUEST['force']) === 1) +{ +?> + +<p style="border:dotted 1px #900;padding:0.3em;bold;color:#ffffff;background-color:#ff0000;"><strong><center> +<?=_("For your own security you should change your pass phrase immediately!"); ?></center></strong> +</p> +<?}?> + <form method="post" action="account.php"> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="400"> <tr> diff --git a/pages/account/39.php b/pages/account/39.php index f89187d..9e09bb8 100755..100644 --- a/pages/account/39.php +++ b/pages/account/39.php @@ -15,76 +15,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> -<h3><?=_("Privacy Policy")?></h3> - -<p> -<?=_("This policy discloses what information we gather about you when you visit any of our Web site, and when you issue or use our certificates. It describes how we use that information and how you can control it.")?> -</p> - -<h4>1. <?=_("Website information")?></h4> -<p> -<?=_("We collect two kinds of information about website users: 1) data that users volunteer by signing up to our website or when you send us an email via our contact form; and 2) aggregated tracking data we collect when users interact with our site.")?> -</p> - -<h4>2. <?=_("Personal information")?></h4> -<p> -<?=_("When you post to the contact form, you must provide your name and email address. When you sign up to the website, you must provide your name, email address, date of birth and some lost pass phrase question and answers.")?> -</p> -<p> -<?=_("We only share your information with any other organisation when so instructed by a CAcert arbitrator.")?> -</p> - -<h4>3. <?=_("Aggregated tracking information")?></h4> -<p> -<?=_("We analyse visitors' use of our sites by tracking information such as page views, traffic flow, search terms, and click through. We use this information to improve our sites. We also share this anonymous traffic and demographic information in aggregate form with advertisers and other business partners. We do not share any information with advertisers that can identify an individual user.")?> -</p> - -<h4>4. <?=_("Cookies")?></h4> -<p> -<?=_("Some of our advertisers use a third-party ad server to display ads. These ads may contain cookies. The ad server receives these cookies, and we don't have access to them.")?> -</p> -<p> -<?=_("We don't use cookies to store personal information, we do use sessions, and if cookies are enabled, the session will be stored in a cookie, and we do not look for cookies, apart from the session id. However if cookies are disabled then no information will be stored on or looked for on your computer.")?> -</p> - -<h4>5. <?=_("Notification of changes")?></h4> -<p> -<?=_("If we change our Privacy Policy, we will post those changes on www.CAcert.org. If we decide to use personally identifiable information in a manner different from that stated at the time it was collected, we will notify users via email. Users will be able to opt out of any new use of their personal information.")?> -</p> - -<h4>6. <?=_("How to update, correct, or delete your information")?></h4> -<p> -<?=_("You are able to update, add and remove your information at any time via our web interface, log into the 'My Account' and then click on the 'My Details' section, and then click the relevant link")?> -</p> - -<h4>7. <?=_("Privacy of certificates")?></h4> -<p> -<?=_("CAcert does not automatically publish the certificates through a directory service or the website to other people than the user who requested the certificate. In the future, the user might be able to opt-in for publication of the certificates through a directory server by CAcert.")?> -</p> - -<h4>8. <?=_("Privacy of user data")?></h4> -<p> -<?=_("CAcert Assurers can see the name, birthday and the number of points by looking up the correct email address. No other person related data is published by CAcert.")?> -</p> - -<h4>9. <?=_("Exceptions")?></h4> -<p> -<?=_("A CAcert arbitrator may override this policy in a dispute.")?> -<?=_("To obtain access to confidential data, a dispute has to be filed.")?> -</p> - -<h4>10. <?=_("Legal mandates")?></h4> -<p> -<?=_("CAcert adopts the Australian privacy regulations.")?> -<?=_("Please see <a href='http://www.privacy.gov.au/'>http://www.privacy.gov.au/</a> for further details.")?> -<?=_("Governmental warrants and civil supoenas will be processed through the dispute resolution system, which ensures that valid authority is given to whoever complies with the supoena or the warrant.")?> -</p> - - -<p><?=_("If you need to contact us in writing, address your mail to:")?></p> -<p> -CAcert Inc.<br> -P.O. Box 4107<br> -Denistone East NSW 2112<br> -Australia +<p style="background-color: #FF8080; font-size: 150%"> +<? +printf(_('This page has been moved to the %spolicy directory%s. Please update '. + 'your bookmarks and report any broken links.'), + '<a href="/policy/PrivacyPolicy.html">', '</a>'); +?> </p> diff --git a/pages/index/1.php b/pages/index/1.php index d9ce8a8..f4343e7 100644 --- a/pages/index/1.php +++ b/pages/index/1.php @@ -18,9 +18,7 @@ <p><?=_("By joining CAcert and becoming a Member, you agree to the CAcert Community Agreement. Please take a moment now to read that and agree to it; this will be required to complete the process of joining.")?></p> <p><?=_("Warning! This site requires cookies to be enabled to ensure your privacy and security. This site uses session cookies to store temporary values to prevent people from copying and pasting the session ID to someone else exposing their account, personal details and identity theft as a result.")?></p> <p style="border:dotted 1px #900;padding:0.3em;background-color:#ffe;"> -<b><?=_("In light of the number of people having issues with making up a password we have the following suggestions:")?></b><br><br> -<?=_("To get a password that will work, we suggest the following example")?>: Fr3d Sm|7h<br><br> -<?=_("This wouldn't match your name or email at all, it contains at least 1 lower case letter, 1 upper case letter, a number, white space and a misc symbol. You get additional security for being over 15 characters and a second additional point for having it over 30. The system starts reducing security if you include any section of your name, or password or email address or if it matches a word from the english dictionary...")?><br><br> +<?=_("A proper password wouldn't match your name or email at all, it contains at least 1 lower case letter, 1 upper case letter, a number, white space and a misc symbol. You get additional security for being over 15 characters and a second additional point for having it over 30. The system starts reducing security if you include any section of your name, or password or email address or if it matches a word from the english dictionary...")?><br><br> <b><?=_("Note: White spaces at the beginning and end of a password will be removed.")?></b> </p> diff --git a/pages/index/10.php b/pages/index/10.php index f89187d..9e09bb8 100644 --- a/pages/index/10.php +++ b/pages/index/10.php @@ -15,76 +15,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> -<h3><?=_("Privacy Policy")?></h3> - -<p> -<?=_("This policy discloses what information we gather about you when you visit any of our Web site, and when you issue or use our certificates. It describes how we use that information and how you can control it.")?> -</p> - -<h4>1. <?=_("Website information")?></h4> -<p> -<?=_("We collect two kinds of information about website users: 1) data that users volunteer by signing up to our website or when you send us an email via our contact form; and 2) aggregated tracking data we collect when users interact with our site.")?> -</p> - -<h4>2. <?=_("Personal information")?></h4> -<p> -<?=_("When you post to the contact form, you must provide your name and email address. When you sign up to the website, you must provide your name, email address, date of birth and some lost pass phrase question and answers.")?> -</p> -<p> -<?=_("We only share your information with any other organisation when so instructed by a CAcert arbitrator.")?> -</p> - -<h4>3. <?=_("Aggregated tracking information")?></h4> -<p> -<?=_("We analyse visitors' use of our sites by tracking information such as page views, traffic flow, search terms, and click through. We use this information to improve our sites. We also share this anonymous traffic and demographic information in aggregate form with advertisers and other business partners. We do not share any information with advertisers that can identify an individual user.")?> -</p> - -<h4>4. <?=_("Cookies")?></h4> -<p> -<?=_("Some of our advertisers use a third-party ad server to display ads. These ads may contain cookies. The ad server receives these cookies, and we don't have access to them.")?> -</p> -<p> -<?=_("We don't use cookies to store personal information, we do use sessions, and if cookies are enabled, the session will be stored in a cookie, and we do not look for cookies, apart from the session id. However if cookies are disabled then no information will be stored on or looked for on your computer.")?> -</p> - -<h4>5. <?=_("Notification of changes")?></h4> -<p> -<?=_("If we change our Privacy Policy, we will post those changes on www.CAcert.org. If we decide to use personally identifiable information in a manner different from that stated at the time it was collected, we will notify users via email. Users will be able to opt out of any new use of their personal information.")?> -</p> - -<h4>6. <?=_("How to update, correct, or delete your information")?></h4> -<p> -<?=_("You are able to update, add and remove your information at any time via our web interface, log into the 'My Account' and then click on the 'My Details' section, and then click the relevant link")?> -</p> - -<h4>7. <?=_("Privacy of certificates")?></h4> -<p> -<?=_("CAcert does not automatically publish the certificates through a directory service or the website to other people than the user who requested the certificate. In the future, the user might be able to opt-in for publication of the certificates through a directory server by CAcert.")?> -</p> - -<h4>8. <?=_("Privacy of user data")?></h4> -<p> -<?=_("CAcert Assurers can see the name, birthday and the number of points by looking up the correct email address. No other person related data is published by CAcert.")?> -</p> - -<h4>9. <?=_("Exceptions")?></h4> -<p> -<?=_("A CAcert arbitrator may override this policy in a dispute.")?> -<?=_("To obtain access to confidential data, a dispute has to be filed.")?> -</p> - -<h4>10. <?=_("Legal mandates")?></h4> -<p> -<?=_("CAcert adopts the Australian privacy regulations.")?> -<?=_("Please see <a href='http://www.privacy.gov.au/'>http://www.privacy.gov.au/</a> for further details.")?> -<?=_("Governmental warrants and civil supoenas will be processed through the dispute resolution system, which ensures that valid authority is given to whoever complies with the supoena or the warrant.")?> -</p> - - -<p><?=_("If you need to contact us in writing, address your mail to:")?></p> -<p> -CAcert Inc.<br> -P.O. Box 4107<br> -Denistone East NSW 2112<br> -Australia +<p style="background-color: #FF8080; font-size: 150%"> +<? +printf(_('This page has been moved to the %spolicy directory%s. Please update '. + 'your bookmarks and report any broken links.'), + '<a href="/policy/PrivacyPolicy.html">', '</a>'); +?> </p> diff --git a/pages/index/19.php b/pages/index/19.php index c58eb68..b44960d 100644 --- a/pages/index/19.php +++ b/pages/index/19.php @@ -15,90 +15,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> -<span style="background-color: #FF8080; font-size: 150%"> -Note that the <strong>TTP</strong> programme is effectively <strong>Frozen</strong><br> -Until a subsidiary policy under AP is written, it is against AP rules.<br> -</span> - <br> -<h3><?=_("Information")?></h3> -<table border="0" align="center" cellspacing="0" cellpadding="0"> - <tr> - <td class="title" colspan="2"><?=_("What can CAcert provide to you, to increase your privacy and security for free?")?></td> - </tr> - <tr> - <td class="DataTD"> - <h4><?=_("Client certificates (un-assured)")?></h4> - </td> - <td class="DataTD"> - <u><?=_("Benefits")?>:</u> <?=_("You can send digitally signed/encrypted emails; others can send encrypted emails to you.")?><br /><br /> - <u><?=_("Limitations")?>:</u> <?=_("Certificates expire in 6 months. Only the email address itself can be entered into the certificate (not your full name)")?>.<br /><br /> - <u><?=_("Verification needed")?>:</u> <?=_("You must confirm it is your email address by responding to a 'ping' email sent to it.")?><br /><br /> - </td> - </tr> - <tr> - <td class="DataTD"> - <h4><?=_("Assured client certificates")?></h4> - </td> - <td class="DataTD"> - <u><?=_("Benefits")?>:</u> <?=_("Same as above plus you can include your full name in the certificates.")?><br /><br /> - <u><?=_("Limitations")?>:</u> <?=_("Certificates expire in 24 months.")?><br /><br /> - <u><?=_("Verification needed")?>:</u> <?=_("Same as above, plus you must get a minimum of 50 assurance points by meeting with one or more assurers from the CAcert Web of Trust, who verify your identity using your government issued photo identity documents.")?><br /><br /> - </td> - </tr> - <tr> - <td class="DataTD"> - <h4><?=_("Code signing certificates")?></h4> - </td> - <td class="DataTD"> - <u><?=_("Benefits")?>:</u> <?=_("Digitally sign code, web applets, installers, etc. including your name and location in the certificates.")?><br><br> - <u><?=_("Limitations")?>:</u> <?=sprintf(_("Certificates expire in 12 months. Certificates %s must%s include your full name."),"<u>","</u>")?><br /><br /> - <u><?=_("Verification needed")?>:</u> <?=_("Same as above plus get 100 assurance points by meeting with multiple assurers from the CAcert Web of Trust, who verify your identity using your government issued photo identity documents.")?><br><br> - </td> - </tr> - <tr> - <td class="DataTD"> - <h4><?=_("Server certificates (un-assured)")?></h4> - </td> - <td class="DataTD"> - <u><?=_("Benefits")?>:</u> <?=_("Enable encrypted data transfer for users accessing your web, email, or other SSL enabled service on your server; wildcard certificates are allowed.")?><br><br> - <u><?=_("Limitations")?>:</u> <?=_("Certificates expire in 6 months; only the domain name itself can be entered into the certificates (not your full name, company name, location, etc.).")?><br><br> - <u><?=_("Verification needed")?>:</u> <?=_("You must confirm that you are the owner (or authorized administrator) of the domain by responding to a 'ping' email sent to either the email address listed in the whois record, or one of the RFC-mandatory addresses (hostmaster/postmaster/etc).")?><br><br> - </td> - </tr> - <tr> - <td class="DataTD"> - <h4><?=_("Assured server certificates")?></h4> - </td> - <td class="DataTD"> - <u><?=_("Benefits")?>:</u> <?=_("Same as above.")?><br><br> - <u><?=_("Limitations")?>:</u> <?=_("Same as above, except certificates expire in 24 months.")?><br><br> - <u><?=_("Verification needed")?>:</u> <?=_("Same as above, plus get 50 assurance points by meeting with assurer(s) from the CAcert Web of Trust, who verify your identity using your government issued photo identity documents.")?><br><br> - </td> - </tr> - <tr> - <td class="DataTD"> - <h4><?=_("Become an assurer in CAcert Web of Trust")?></h4> - </td> - <td class="DataTD"> - <u><?=_("Benefits")?>:</u> <?=_("The ability to assure other new CAcert users; contribute to the strengthening and broadening of the CAcert Web of Trust.")?><br><br> - <u><?=_("Limitations")?>:</u> <?=_("The number of assurance point you have will limit the maximum assurance points you can issue for people you assure.")?><br><br> - <u><?=_("Verification needed")?>:</u> <?=_("You will need to be issued 100 points by meeting with existing assurers from the CAcert Web of Trust, who verify your identity using your government issued photo identity documents; OR if it is too difficult to meet up with existing assurers in your area, meet with two Trusted Third Party assurers (notary public, justice of the peace, lawyer, bank manager, accountant) to do the verifying.")?><br><br> - </td> - </tr> - <tr> - <td class="DataTD"> - <h4><?=_("Become a member of the CAcert Association")?></h4> - </td> - <td class="DataTD"> - <u><?=_("Benefits")?>:</u> <?=_("You get a vote in how CAcert (a non-profit association incorporated in Australia) is run; be eligible for positions on the CAcert board.")?><br><br> - <u><?=_("Limitations")?>:</u> <?=_("None, the sky is the limit for CAcert.")?><br><br> - <u><?=_("Verification needed")?>:</u> <?=_("None; $10 USD per year membership fee.")?><br><br> - </td> - </tr> - <tr> - <td class="DataTD" colspan="2"> - (*) <?=_("Please note a general limitation is that, unlike long-time players like Verisign, CAcert's root certificate is not included by default in mainstream browsers, email clients, etc. This means people to whom you send encrypted email, or users who visit your SSL-enabled web server, will first have to import CAcert's root certificate, or they will have to agree to pop-up security warnings (which may look a little scary to non-techy users).")?> - </td> - </tr> -</table> -<br> +<p style="background-color: #FF8080; font-size: 150%"> +<? +printf(_("This page has been moved to the %swiki%s. Please update your ". + "bookmarks and report any broken links."), + '<a href="//wiki.cacert.org/FAQ/Privileges">', '</a>'); +?> +</p>
\ No newline at end of file diff --git a/pages/index/6.php b/pages/index/6.php index 8eefa44..fe57d81 100644 --- a/pages/index/6.php +++ b/pages/index/6.php @@ -16,9 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> <p style="border:dotted 1px #900;padding:0.3em;background-color:#ffe;"> -<b><?=_("In light of the number of people having issues with making up a password we have the following suggestions:")?></b><br><br> -<?=_("To get a password that will work, we suggest the following example")?>: Fr3d Sm|7h<br><br> -<?=_("This wouldn't match your name or email at all, it contains at least 1 lower case letter, 1 upper case letter, a number, white space and a misc symbol. You get additional security for being over 15 characters and a second additional point for having it over 30. The system starts reducing security if you include any section of your name, or password or email address or if it matches a word from the english dictionary...")?> +<?=_("A proper password wouldn't match your name or email at all, it contains at least 1 lower case letter, 1 upper case letter, a number, white space and a misc symbol. You get additional security for being over 15 characters and a second additional point for having it over 30. The system starts reducing security if you include any section of your name, or password or email address or if it matches a word from the english dictionary...")?> </p> <form method="post" action="index.php" autocomplete="off"> diff --git a/pages/wot/10.php b/pages/wot/10.php index 51ed019..bc76a86 100644 --- a/pages/wot/10.php +++ b/pages/wot/10.php @@ -16,6 +16,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> <? + $thawte = false; + ?> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> <tr> @@ -43,6 +45,11 @@ <td class="DataTD"><?=sprintf(_("You have made %s assurances which ranks you as the #%s top assurer."), intval($rc), intval($rank))?></td> </tr> </table> +<center> +<br> +<?=sprintf(_("The calculation of points will be changed in the near future. Please check the %s new calculation %s"), "<a href='/wot.php?id=15'>", "</a>")?> +<br> +</center> <br> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> <tr> @@ -71,13 +78,27 @@ <td class="DataTD"><?=$row['location']?></td> <td class="DataTD"><?=_(sprintf("%s", $row['method']))?></td> </tr> -<? } ?> +<? + $thawte = ($row['method'] == "Thawte Points Transfer") || $thawte; +} ?> <tr> <td class="DataTD" colspan="3"><b><?=_("Total Points")?>:</b></td> <td class="DataTD"><?=intval($_SESSION['profile']['points'])?></td> <td class="DataTD" colspan="2"> </td> </tr> </table> +<? +if ($thawte) +{ +?> +<br> +<center> +<strong style='color: red'> +<?=_("Your Thawte-Points will be revoked in the near future. Please check new calculation!");?> +<br> +</strong> +</center> +<?}?> <br> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> <tr> diff --git a/pages/wot/15.php b/pages/wot/15.php new file mode 100644 index 0000000..8579588 --- /dev/null +++ b/pages/wot/15.php @@ -0,0 +1,29 @@ +<? /* + 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 +*/ + + include_once($_SESSION['_config']['filepath']."/includes/wot.inc.php"); + + $userid = intval($_SESSION['profile']['id']); + + output_ranking($userid); + output_summary($userid); + output_given_assurances($userid); + output_received_assurances($userid); + + output_end_of_page(); +?> diff --git a/scripts/DumpWeakCerts.pl b/scripts/DumpWeakCerts.pl index 85648fe..580390e 100755 --- a/scripts/DumpWeakCerts.pl +++ b/scripts/DumpWeakCerts.pl @@ -1,6 +1,7 @@ #!/usr/bin/perl # Script to dump weak RSA certs (Exponent 3 or Modulus size < 1024) according to https://bugs.cacert.org/view.php?id=918 # and https://wiki.cacert.org/Arbitrations/a20110312.1 +# Extended to be used for https://bugs.cacert.org/view.php?id=954 use strict; use warnings; @@ -26,12 +27,15 @@ my $cert_CN; my $cert_expire; my $cert_filename; my $cert_serial; +my $cert_recid; my $user_email; my $user_firstname; my $reason; +my $grace_time_days = 0; # 14 used for bug#918 + my @row; sub IsWeak($) { @@ -40,6 +44,16 @@ sub IsWeak($) { my $ModulusSize = 0; my $Exponent = 0; my $result = 0; + + +# Code for Testing only! Hardcoding some filenames to fail the tests. +# +# if ($CertFileName eq '../crt/server/301/server-301988.crt' || +# $CertFileName eq '../crt/client/258/client-258856.crt' || +# $CertFileName eq '../crt/orgserver/2/orgserver-2635.crt' || +# $CertFileName eq '../crt/orgclient/0/orgclient-808.crt') { +# return "Test"; +# } # Do key size and exponent checking for RSA keys open(CERTTEXT, '-|', "openssl x509 -in $CertFileName -noout -text") || die "Cannot start openssl"; @@ -76,9 +90,9 @@ sub IsWeak($) { # Select only certificates expiring in more than two weeks, since two weeks will probably be needed as turnaround time # Get all domain certificates $sth_certs = $dbh->prepare( - "SELECT `dc`.`domid`, `dc`.`CN`, `dc`.`expire`, `dc`.`crt_name`, `dc`.`serial` ". + "SELECT `dc`.`domid`, `dc`.`CN`, `dc`.`expire`, `dc`.`crt_name`, `dc`.`serial`, `dc`.`id` ". " FROM `domaincerts` AS `dc` ". - " WHERE `dc`.`revoked`=0 AND `dc`.`expire` > DATE_ADD(NOW(), INTERVAL 14 DAY)"); + " WHERE `dc`.`revoked`=0 AND `dc`.`expire` > DATE_ADD(NOW(), INTERVAL $grace_time_days DAY)"); $sth_certs->execute(); $sth_userdata = $dbh->prepare( @@ -86,13 +100,13 @@ $sth_userdata = $dbh->prepare( " FROM `domains` AS `d`, `users` AS `u` ". " WHERE `d`.`memid`=`u`.`id` AND `d`.`id`=?"); -while(($cert_domid, $cert_CN, $cert_expire, $cert_filename, $cert_serial) = $sth_certs->fetchrow_array) { +while(($cert_domid, $cert_CN, $cert_expire, $cert_filename, $cert_serial, $cert_recid) = $sth_certs->fetchrow_array) { if (-f $cert_filename) { $reason = IsWeak($cert_filename); if ($reason) { $sth_userdata->execute($cert_domid); ($user_email, $user_firstname) = $sth_userdata->fetchrow_array(); - print join("\t", ('DomainCert', $user_email, $user_firstname, $cert_expire, $cert_CN, $reason, $cert_serial)). "\n"; + print join("\t", ('DomainCert', $user_email, $user_firstname, $cert_expire, $cert_CN, $reason, $cert_serial, $cert_recid)). "\n"; $sth_userdata->finish(); } } @@ -101,9 +115,9 @@ $sth_certs->finish(); # Get all email certificates $sth_certs = $dbh->prepare( - "SELECT `ec`.`memid`, `ec`.`CN`, `ec`.`expire`, `ec`.`crt_name`, `ec`.`serial` ". + "SELECT `ec`.`memid`, `ec`.`CN`, `ec`.`expire`, `ec`.`crt_name`, `ec`.`serial`, `ec`.`id` ". " FROM `emailcerts` AS `ec` ". - " WHERE `ec`.`revoked`=0 AND `ec`.`expire` > DATE_ADD(NOW(), INTERVAL 14 DAY)"); + " WHERE `ec`.`revoked`=0 AND `ec`.`expire` > DATE_ADD(NOW(), INTERVAL $grace_time_days DAY)"); $sth_certs->execute(); $sth_userdata = $dbh->prepare( @@ -111,13 +125,13 @@ $sth_userdata = $dbh->prepare( " FROM `users` AS `u` ". " WHERE `u`.`id`=?"); -while(($cert_userid, $cert_CN, $cert_expire, $cert_filename, $cert_serial) = $sth_certs->fetchrow_array) { +while(($cert_userid, $cert_CN, $cert_expire, $cert_filename, $cert_serial, $cert_recid) = $sth_certs->fetchrow_array) { if (-f $cert_filename) { $reason = IsWeak($cert_filename); if ($reason) { $sth_userdata->execute($cert_userid); ($user_email, $user_firstname) = $sth_userdata->fetchrow_array(); - print join("\t", ('EmailCert', $user_email, $user_firstname, $cert_expire, $cert_CN, $reason, $cert_serial)). "\n"; + print join("\t", ('EmailCert', $user_email, $user_firstname, $cert_expire, $cert_CN, $reason, $cert_serial, $cert_recid)). "\n"; $sth_userdata->finish(); } } @@ -126,9 +140,9 @@ $sth_certs->finish(); # Get all Org Server certificates, notify all admins of the Org! $sth_certs = $dbh->prepare( - "SELECT `dc`.`orgid`, `dc`.`CN`, `dc`.`expire`, `dc`.`crt_name`, `dc`.`serial` ". + "SELECT `dc`.`orgid`, `dc`.`CN`, `dc`.`expire`, `dc`.`crt_name`, `dc`.`serial`, `dc`.`id` ". " FROM `orgdomaincerts` AS `dc` ". - " WHERE `dc`.`revoked`=0 AND `dc`.`expire` > DATE_ADD(NOW(), INTERVAL 14 DAY)"); + " WHERE `dc`.`revoked`=0 AND `dc`.`expire` > DATE_ADD(NOW(), INTERVAL $grace_time_days DAY)"); $sth_certs->execute(); $sth_userdata = $dbh->prepare( @@ -136,13 +150,13 @@ $sth_userdata = $dbh->prepare( " FROM `users` AS `u`, `org` ". " WHERE `u`.`id`=`org`.`memid` and `org`.`orgid`=?"); -while(($cert_orgid, $cert_CN, $cert_expire, $cert_filename, $cert_serial) = $sth_certs->fetchrow_array) { +while(($cert_orgid, $cert_CN, $cert_expire, $cert_filename, $cert_serial, $cert_recid) = $sth_certs->fetchrow_array) { if (-f $cert_filename) { $reason = IsWeak($cert_filename); if ($reason) { $sth_userdata->execute($cert_orgid); while(($user_email, $user_firstname) = $sth_userdata->fetchrow_array()) { - print join("\t", ('OrgServerCert', $user_email, $user_firstname, $cert_expire, $cert_CN, $reason, $cert_serial)). "\n"; + print join("\t", ('OrgServerCert', $user_email, $user_firstname, $cert_expire, $cert_CN, $reason, $cert_serial, $cert_recid)). "\n"; } $sth_userdata->finish(); } @@ -152,9 +166,9 @@ $sth_certs->finish(); # Get all Org Email certificates, notify all admins of the Org! $sth_certs = $dbh->prepare( - "SELECT `ec`.`orgid`, `ec`.`CN`, `ec`.`expire`, `ec`.`crt_name`, `ec`.`serial` ". + "SELECT `ec`.`orgid`, `ec`.`CN`, `ec`.`expire`, `ec`.`crt_name`, `ec`.`serial`, `ec`.`id` ". " FROM `orgemailcerts` AS `ec` ". - " WHERE `ec`.`revoked`=0 AND `ec`.`expire` > DATE_ADD(NOW(), INTERVAL 14 DAY)"); + " WHERE `ec`.`revoked`=0 AND `ec`.`expire` > DATE_ADD(NOW(), INTERVAL $grace_time_days DAY)"); $sth_certs->execute(); $sth_userdata = $dbh->prepare( @@ -162,13 +176,13 @@ $sth_userdata = $dbh->prepare( " FROM `users` AS `u`, `org` ". " WHERE `u`.`id`=`org`.`memid` and `org`.`orgid`=?"); -while(($cert_orgid, $cert_CN, $cert_expire, $cert_filename, $cert_serial) = $sth_certs->fetchrow_array) { +while(($cert_orgid, $cert_CN, $cert_expire, $cert_filename, $cert_serial, $cert_recid) = $sth_certs->fetchrow_array) { if (-f $cert_filename) { $reason = IsWeak($cert_filename); if ($reason) { $sth_userdata->execute($cert_orgid); while(($user_email, $user_firstname) = $sth_userdata->fetchrow_array()) { - print join("\t", ('OrgEmailCert', $user_email, $user_firstname, $cert_expire, $cert_CN, $reason, $cert_serial)). "\n"; + print join("\t", ('OrgEmailCert', $user_email, $user_firstname, $cert_expire, $cert_CN, $reason, $cert_serial, $cert_recid)). "\n"; } $sth_userdata->finish(); } diff --git a/scripts/mass-revoke.php b/scripts/mass-revoke.php new file mode 100755 index 0000000..18c036b --- /dev/null +++ b/scripts/mass-revoke.php @@ -0,0 +1,89 @@ +#!/usr/bin/php -q +<? /* + 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. +*/ + +# Companion script to DumpWeakCerts.pl, takes output and revokes weak certs +# Only first and last column ($cert_type and $cert_recid) are used, the others +# are ignored + +include_once("../includes/mysql.php"); +# Main + +$num_domain = 0; +$num_client = 0; +$num_orgdomain = 0; +$num_orgclient = 0; + +$num_failures = 0; + +$in = fopen("php://stdin", "r"); + +# The restriction on revoked timestamp os only "to be sure" for non-Org certs, +# but Org certs (email and serer) may be included multiple times in the output +# of DumpWeakCerts.pl (once for each OrgAdmin). +while($in_string = rtrim(fgets($in))) { + list($cert_type, $cert_email, $owner_name, $cert_expire, $cert_CN, $reason, + $cert_serial, $cert_recid) = explode("\t", $in_string); + + if ($cert_type == "DomainCert") { + $query = "UPDATE `domaincerts` SET `revoked`='1970-01-01 10:00:01' + where `id`='$cert_recid' AND `revoked`<'1970-01-01 10:00:01'"; + + if (!mysql_query($query)) { + $num_failures++; + } + $num_domain+=mysql_affected_rows(); + + } else if ($cert_type == "EmailCert") { + $query = "UPDATE `emailcerts` SET `revoked`='1970-01-01 10:00:01' + where `id`='$cert_recid' AND `revoked`<'1970-01-01 10:00:01'"; + + if (!mysql_query($query)) { + $num_failures++; + } + $num_client+=mysql_affected_rows(); + + } else if ($cert_type == "OrgServerCert") { + $query = "UPDATE `orgdomaincerts` SET `revoked`='1970-01-01 10:00:01' + where `id`='$cert_recid' AND `revoked`<'1970-01-01 10:00:01'"; + + if (!mysql_query($query)) { + $num_failures++; + } + $num_orgdomain+=mysql_affected_rows(); + + } else if ($cert_type == "OrgEmailCert") { + $query = "UPDATE `orgemailcerts` SET `revoked`='1970-01-01 10:00:01' + where `id`='$cert_recid' AND `revoked`<'1970-01-01 10:00:01'"; + + if (!mysql_query($query)) { + $num_failures++; + } + $num_orgclient+=mysql_affected_rows(); + } +} + +fclose($in); + +echo "Certificates revoked: ". + "$num_domain server certs, ". + "$num_client client certs, ". + "$num_orgdomain Org server certs, ". + "$num_orgclient Org client certs.\n"; +echo "Update failures: $num_failures\n"; +?> diff --git a/www/index.php b/www/index.php index fb215c6..7330877 100644 --- a/www/index.php +++ b/www/index.php @@ -332,6 +332,8 @@ $_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 (checkpwlight($pword) < 3) + $_SESSION['_config']['oldlocation'] = "account.php?id=14&force=1"; if($_SESSION['_config']['oldlocation'] != "") header("location: https://".$_SERVER['HTTP_HOST']."/".$_SESSION['_config']['oldlocation']); else @@ -627,6 +629,13 @@ if(!array_key_exists('signup',$_SESSION) || $_SESSION['signup']['year'] < 1900) $_SESSION['signup']['year'] = "19XX"; + + if ($id == 19) + { + $protocol = $_SERVER['HTTPS'] ? 'https' : 'http'; + $newUrl = $protocol . '://wiki.cacert.org/FAQ/Privileges'; + header('Location: '.$newUrl, true, 301); // 301 = Permanently Moved + } showheader(_("Welcome to CAcert.org")); includeit($id); diff --git a/www/policy/CAcertCommunityAgreement.php b/www/policy/CAcertCommunityAgreement.php index cf9b4e6..3106eb1 100644 --- a/www/policy/CAcertCommunityAgreement.php +++ b/www/policy/CAcertCommunityAgreement.php @@ -457,7 +457,7 @@ You are also bound by <a href="http://www.cacert.org/policy/DisputeResolutionPolicy.php"> Dispute Resolution Policy</a> (DRP => COD7). </li><li> - <a href="http://www.cacert.org/index.php?id=10"> + <a href="PrivacyPolicy.html"> Privacy Policy</a> (PP => COD5). </li><li> <a href="http://svn.cacert.org/CAcert/principles.html"> diff --git a/www/policy/CertificationPracticeStatement.php b/www/policy/CertificationPracticeStatement.php index 9d16805..e17056b 100644 --- a/www/policy/CertificationPracticeStatement.php +++ b/www/policy/CertificationPracticeStatement.php @@ -69,7 +69,7 @@ a:hover { <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 /> Status: DRAFT p20091108<br /> -<!-- $Id: CertificationPracticeStatement.php,v 1.1 2009-11-21 22:34:00 philipp Exp $ --> +<!-- $Id: CertificationPracticeStatement.php,v 1.2 2011-07-27 10:41:01 wytze Exp $ --> <font size="-1"> @@ -3623,7 +3623,7 @@ or rulings by Arbitrator. Privacy is covered by the CCA (COD9) and the Privacy Policy -(<a href="http://www.cacert.org/index.php?id=10">COD5</a>). +(<a href="PrivacyPolicy.html">COD5</a>). </p> <h4><a name="p9.4.1" id="p9.4.1">9.4.1. Privacy plan</a></h4> @@ -3999,7 +3999,7 @@ obligations, risks and liabilities on the parties. <p> See the Privacy Policy -(<a href="http://www.cacert.org/index.php?id=10">COD5</a>). +(<a href="PrivacyPolicy.html">COD5</a>). </p> <h3><a name="p9.15.3" id="p9.15.3">9.15.3 Legal Process from External Forums</a></h3> diff --git a/www/policy/PrivacyPolicy.html b/www/policy/PrivacyPolicy.html new file mode 100644 index 0000000..6670e92 --- /dev/null +++ b/www/policy/PrivacyPolicy.html @@ -0,0 +1,114 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> + +<html> +<head><title>Privacy Policy</title></head> +<body> + +<table width="100%"> + +<tr> +<td> PP </td> +<td> </td> +<td width="20%"> </td> +</tr> + +<tr> +<td> POLICY <a href="http://wiki.cacert.org/wiki/PolicyDecisions">m20060629</a> </td> +<td> </td> +<td> + 20060629 +</td> +</tr> + +<tr> +<td> COD5 </td> +<td> </td> +<td> </td> +</tr> + + +<tr> +<td> </td> +<td > <b>Privacy Policy</b> </td> +<td> </td> +</tr> + +</table> + +<h2> 0. Preliminaries </h2> +<p> + This policy discloses what information we gather about you when you visit any of our Web site, and when you issue or use our certificates. It describes how we use that information and how you can control it. +</p> + + + +<h2>1. Website information</h2> +<p> +We collect two kinds of information about website users: 1) data that users volunteer by signing up to our website or when you send us an email via our contact form; and 2) aggregated tracking data we collect when users interact with our site. +</p> + +<h2>2. Personal information</h2> +<p> +When you post to the contact form, you must provide your name and email address. When you sign up to the website, you must provide your name, email address, date of birth and some lost pass phrase question and answers. +</p> +<p> +We only share your information with any other organisation when so instructed by a CAcert arbitrator. +</p> + +<h2>3. Aggregated tracking information</h2> +<p> +We analyse visitors' use of our sites by tracking information such as page views, traffic flow, search terms, and click through. We use this information to improve our sites. We also share this anonymous traffic and demographic information in aggregate form with advertisers and other business partners. We do not share any information with advertisers that can identify an individual user. +</p> + +<h2>4. Cookies</h2> +<p> +Some of our advertisers use a third-party ad server to display ads. These ads may contain cookies. The ad server receives these cookies, and we don't have access to them. +</p> +<p> +We don't use cookies to store personal information, we do use sessions, and if cookies are enabled, the session will be stored in a cookie, and we do not look for cookies, apart from the session id. However if cookies are disabled then no information will be stored on or looked for on your computer. +</p> + +<h2>5. Notification of changes</h2> +<p> +If we change our Privacy Policy, we will post those changes on www.CAcert.org. If we decide to use personally identifiable information in a manner different from that stated at the time it was collected, we will notify users via email. Users will be able to opt out of any new use of their personal information. +</p> + +<h2>6. How to update, correct, or delete your information</h2> +<p> +You are able to update, add and remove your information at any time via our web interface, log into the 'My Account' and then click on the 'My Details' section, and then click the relevant link +</p> + +<h2>7. Privacy of certificates</h2> +<p> +CAcert does not automatically publish the certificates through a directory service or the website to other people than the user who requested the certificate. In the future, the user might be able to opt-in for publication of the certificates through a directory server by CAcert. +</p> + +<h2>8. Privacy of user data</h2> +<p> +CAcert Assurers can see the name, birthday and the number of points by looking up the correct email address. No other person related data is published by CAcert. +</p> + +<h2>9. Exceptions</h2> +<p> +A CAcert arbitrator may override this policy in a dispute. +To obtain access to confidential data, a dispute has to be filed. +</p> + +<h2>10. Legal mandates</h2> +<p> +CAcert adopts the Australian privacy regulations. +Please see <a href='http://www.privacy.gov.au/'>http://www.privacy.gov.au/</a> for further details. +Governmental warrants and civil supoenas will be processed through the dispute resolution system, which ensures that valid authority is given to whoever complies with the supoena or the warrant. +</p> + + +<p>If you need to contact us in writing, address your mail to:</p> +<p> +CAcert Inc.<br> +P.O. Box 4107<br> +Denistone East NSW 2112<br> +Australia +</p> + +</body> +</html> diff --git a/www/policy/index.php b/www/policy/index.php index d3bfb06..7101c1f 100644 --- a/www/policy/index.php +++ b/www/policy/index.php @@ -23,6 +23,11 @@ showheader(_("CAcert - Policies")); <ul> <?php +foreach (glob("*.html") as $filename) +{ + echo "<li><a href='$filename'>$filename</a></li>\n"; +} + foreach (glob("*.php") as $filename) { if($filename != "index.php" && $filename != "NRPDisclaimerAndLicence.php") diff --git a/www/wot.php b/www/wot.php index 2bd4622..7fa572f 100644 --- a/www/wot.php +++ b/www/wot.php @@ -206,9 +206,15 @@ if($oldid == 6) { $max = maxpoints(); - $awarded = $newpoints = intval($_POST['points']); - if($newpoints > $max) - $newpoints = $max; + + if (intval($_POST['points']) > $max) { + $awarded = $newpoints = $max; + } elseif (intval($_POST['points']) < 0) { + $awarded = $newpoints = 0; + } else { + $awarded = $newpoints = intval($_POST['points']); + } + $query = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['_config']['notarise']['id']."' group by `to`"; $res = mysql_query($query); $drow = mysql_fetch_assoc($res); |