Source code taken from cacert-20110910.tar.bz2
authorMichael Tänzer <neo@nhng.de>
Sat, 10 Sep 2011 14:04:08 +0000 (16:04 +0200)
committerMichael Tänzer <neo@nhng.de>
Sat, 10 Sep 2011 14:04:08 +0000 (16:04 +0200)
includes/lib/general.php [new file with mode: 0644]
includes/loggedin.php
includes/wot.inc.php
www/index.php

diff --git a/includes/lib/general.php b/includes/lib/general.php
new file mode 100644 (file)
index 0000000..25d2561
--- /dev/null
@@ -0,0 +1,50 @@
+<? /*
+    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
+*/
+
+/**
+ * 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
+ *     usually $_SERVER['SSL_CLIENT_I_DN_CN']
+ * @return int
+ *     the user id, -1 in case of error
+ */
+function get_user_id_from_cert($serial, $issuer_cn)
+{
+       $query = "select `memid` from `emailcerts` where
+                       `serial`='".mysql_escape_string($serial)."' and
+                       `rootcert`= (select `id` from `root_certs` where
+                               `Cert_Text`='".mysql_escape_string($issuer_cn)."') and
+                       `revoked`=0 and disablelogin=0 and
+                       UNIX_TIMESTAMP(`expire`) - UNIX_TIMESTAMP() > 0";
+       $res = mysql_query($query);
+       if(mysql_num_rows($res) > 0)
+       {
+               $row = mysql_fetch_assoc($res);
+               return intval($row['memid']);
+       }
+       
+       return -1;
+}
+
+?>
index 640bc6c..bf6b455 100644 (file)
@@ -16,6 +16,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+       include_once("../includes/lib/general.php");
 
        if($_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname'] && $_SESSION['profile']['id'] > 0 && $_SESSION['profile']['loggedin'] != 0)
        {
   
        if($_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname'] && ($_SESSION['profile']['id'] == 0 || $_SESSION['profile']['loggedin'] == 0))
        {
-               $query = "select * from `emailcerts` where `serial`='${_SERVER['SSL_CLIENT_M_SERIAL']}' and `revoked`=0 and disablelogin=0 and
-                               UNIX_TIMESTAMP(`expire`) - UNIX_TIMESTAMP() > 0";
-               $res = mysql_query($query);
+               $user_id = get_user_id_from_cert($_SERVER['SSL_CLIENT_M_SERIAL'],
+                               $_SERVER['SSL_CLIENT_I_DN_CN']);
 
-               if(mysql_num_rows($res) > 0)
+               if($user_id >= 0)
                {
-                       $row = mysql_fetch_assoc($res);
-
                        $_SESSION['profile']['loggedin'] = 0;
                        $_SESSION['profile'] = "";
                        foreach($_SESSION as $key)
@@ -61,7 +59,8 @@
                                        session_unregister($key);
                        }
 
-                       $_SESSION['profile'] = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".$row['memid']."'"));
+                       $_SESSION['profile'] = mysql_fetch_assoc(mysql_query(
+                                       "select * from `users` where `id`='".$user_id."'"));
                        if($_SESSION['profile']['locked'] == 0)
                                $_SESSION['profile']['loggedin'] = 1;
                        else
index ce35ed6..05ce449 100644 (file)
@@ -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
-*/
+*/ 
 
        function query_init ($query)
        {
@@ -35,7 +35,7 @@
        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)."'");
+                       WHERE `method` = 'Face to Face Meeting' AND `from`='".intval($userid)."' ");
                $row = query_getnextrow($res);
 
                return intval($row['list']);
@@ -44,7 +44,7 @@
        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)."'");
+                       WHERE `method` = 'Face to Face Meeting' AND `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)."'");
+               $res = query_init ("SELECT count(*) AS `list` FROM `notary` 
+                       WHERE `method` = 'Face to Face Meeting' 
+                       GROUP BY `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)."'");
+                       WHERE `method` = 'Face to Face Meeting'
+                       GROUP BY `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");
+               $res = query_init ("select * from `notary` where `from`='".intval($userid)."' and `from` != `to` order by `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 ");
+               $res = query_init ("select * from `notary` where `to`='".intval($userid)."' and `from` != `to` 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 `notary`.`from`='".intval($userid)."' group by points,awarded,method");
+               $res = query_init ("select count(*) as number,points,awarded,method from notary where `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");
+               $res = query_init ("select count(*) as number,points,awarded,method from notary where `to`='".intval($userid)."' group by points,awarded,method");
                return $res;
        }
 
                        $awarded = 100;
                }
                else
-                       $experience = 0;
+                       $experience = 0;        
 
                switch ($row['method'])
                {
 <?
        }
 
-       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 ******************
 
                $res = get_given_assurances(intval($userid));
                while($row = mysql_fetch_assoc($res))
                {
-                       $fromuser = get_user (intval($row['to']));
+                       $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);
                {
                        $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']));
+                       $name = show_user_link ($fromuser['fname']." ".$fromuser['lname'],intval($row['from']));
                        output_assurances_row (intval($row['id']),$row['date'],$name,$awarded,$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience);
                }
        }
                else
                        {
                        $sum_points_countable = $sum_points;
-                       $remark_points = "&nbsp";
+                       $remark_points = "&nbsp;";
                        }
                if ($sum_experience > $max_experience)
                        {
                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");
+                               $remark_experience = _("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");
                $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>";
+                       if ($sum_points_countable < $max_points)
+                       {
+                               $issue_points_txt = "<strong style='color: red'>";
+                               $issue_points_txt .= sprintf(_("You need %s assurance points and the passed CATS-Test to be an Assurer"), intval($max_points));
+                               $issue_points_txt .= "</strong>";
+                       }
+               }
                else
                {
                        $experience_total = $sum_experience_countable+$sum_experience_other_countable;
index 7330877..a4c50fc 100644 (file)
 
        if($id == 4 && $_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname'])
        {
-               $query = "select * from `emailcerts` where `serial`='$_SERVER[SSL_CLIENT_M_SERIAL]' and `revoked`=0 and disablelogin=0 and
-                               UNIX_TIMESTAMP(`expire`) - UNIX_TIMESTAMP() > 0";
-               $res = mysql_query($query);
-               if(mysql_num_rows($res) > 0)
+               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)
                {
-                       $row = mysql_fetch_assoc($res);
-                       $_SESSION['profile'] = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='$row[memid]' and `deleted`=0 and `locked`=0"));
+                       $_SESSION['profile'] = mysql_fetch_assoc(mysql_query(
+                               "select * from `users` where 
+                               `id`='$user_id' and `deleted`=0 and `locked`=0"));
+                       
                        if($_SESSION['profile']['id'] != 0)
                        {
                                $_SESSION['profile']['loggedin'] = 1;