Changeset 2288 for branches

Timestamp:

12/11/10 07:14:02 (18 months ago)

Author:

petsagouris

Message:

[Branch 1.5] Made crsf class into a single function. We need to see where to attach it now...

Location:

branches/1.5

Files:

• Hotaru.php (modified) (3 diffs)
• libs/extensions/csrf/csrf_class.php (modified) (2 diffs)

branches/1.5/Hotaru.php

@@ -103 +103 @@
                         $this->pageHandling = new PageHandling();   // instantiate PageHandling object
 
-                        $this->csrf('set');                         // set a csrfToken
+                        $this->csrf(FALSE);                         // set a csrfToken
                         $this->db->setHotaru($this);                // pass $h object to EzSQL for error reporting
                 }
@@ -147 +147 @@
                 $lang->writeLanguageCache($this);
                 $this->ob_flush();
-                exit;
         }
 
@@ -1655 +1654 @@
          * @return string $key (if using $type "fetch")
          */
-        public function csrf($type = 'check', $script = '', $life = 60)
+        public function csrf($type = TRUE, $script = '', $life = 60)
         {
                 $csrf = new csrf();

branches/1.5/libs/extensions/csrf/csrf_class.php

@@ -10 +10 @@
  * @todo make work on this class to eliminate the need for instancing it.
  */
-class csrf {
-
-        /**
-         * Action page the script is good for
-         * @var string
-         */
-        public $action = '';
-        /**
-         * Minutes for which key is good
-         * @var integer
-         */
-        public $life = 0;
-        /**
-         * The database table
-         * @var string
-         */
-        private $table = '';
-        /**
-         * Session ID of user
-         * @var string
-         */
-        private $sid;
+class csrf
+{
 
         /**
@@ -41 +21 @@
          * @return boolean
          */
-        public function csrfInit($h, $type = 'check', $action = 'unspecified', $life = 60)
+        public function csrfInit($h, $check = TRUE, $action = FALSE, $life = 60)
         {
-                $this->sid = preg_replace('/[^a-z0-9]+/i', '', session_id());
-                $this->action = ($action ) ? $action : $h->getPagename();
-                $this->table = DB_PREFIX.'tokens';
-                $this->life = $life;
+                $sid = preg_replace('/[^a-z0-9]+/i', '', session_id());
+                $action = ($action) ? $action : $h->getPageName();
+                $result = FALSE;
 
-                if ($type == 'set') {
-                        // set a new token
-                        $h->csrfToken = $this->csrfkey($h);
-                } else {
-                        // check existing token, then clear it
-                        $result = $this->checkcsrf($h);
-                        // set a new token
-                        $h->csrfToken = $this->csrfkey($h);
-                        // return result of check
-                        return $result;
+                if ($check) {
+                        // Remove expired keys
+                        $sql = "DELETE FROM ".TABLE_TOKENS." WHERE token_stamp < ".time();
+                        $h->db->query($sql);
+
+                        // Check existing token, then clear it
+                        
+                        // Try to get csrf token from POST
+                        $key = $h->cage->post->testAlnum('csrf');
+                        // Try to get csrf token from GET
+                        $key = ($key) ? $key : $h->cage->get->testAlnum('csrf');
+
+                        if ($key) {
+                                // Make sure the key is good
+                                if ($key === preg_replace('/[^a-z0-9]+/', '', $key)) {
+                                        
+                                        $sql = "SELECT token_sid FROM ".TABLE_TOKENS." WHERE token_sid = '".$sid."' AND token_key = '".$key."' AND token_action = '".$action."'";
+                                        $results = $h->db->get_results($sql);
+                                        if ($results) {
+                                                foreach ($results as $row) {
+                                                        $valid = $row->token_sid;
+                                                }
+                                        }
+
+                                        if (isset($valid)) {
+                                                //var_dump('nice token');
+                                                $sql = "DELETE FROM ".TABLE_TOKENS." WHERE token_sid = '".$valid."' AND token_key = '".$key."'";
+                                                $h->db->query($sql);
+                                                $result = TRUE;
+                                        }
+                                }
+                        }
                 }
+
+                // set a new token
+                $key = md5(microtime().$sid.rand());
+                $sql = "INSERT INTO ".TABLE_TOKENS." (token_sid, token_key, token_stamp, token_action) VALUES ('".$sid."', '".$key."', ".(time() + (60 * $life)).", '".$action."')";
+                $h->db->query($sql);
+                $h->csrfToken = $key;
+
+                // return result of check
+                return $result;
         }
 
-        /**
-         *
-         * @param <type> $h
-         * @return <type>
-         */
-        public function csrfkey($h)
-        {
-                $key = md5(microtime().$this->sid.rand());
-                $stamp = time() + (60 * $this->life);
-                $sql = "INSERT INTO ".$this->table." (token_sid, token_key, token_stamp, token_action) VALUES (%s, %s, %d, %s)";
-                $h->db->query($h->db->prepare($sql, $this->sid, $key, $stamp, $this->action));
-
-                return $key;
-        }
-
-        private function checkcsrf($h)
-        {
-                $this->cleanOld($h);
-
-                // Try to get csrf token from POST
-                $key = $h->cage->post->testAlnum('csrf');
-
-                // Try to get csrf token from GET
-                if (!$key) {
-                        $key = $h->cage->get->testAlnum('csrf');
-                }
-
-                if (!$key) {
-                        return FALSE;
-                }
-
-                $cleanKey = preg_replace('/[^a-z0-9]+/', '', $key);
-                if (strcmp($key, $cleanKey) != 0) {
-                        return FALSE;
-                }
-
-                $sql = "SELECT token_sid FROM ".$this->table." WHERE token_sid = %s AND token_key = %s AND token_action = %s";
-                $results = $h->db->get_results($h->db->prepare($sql, $this->sid, $cleanKey, $this->action));
-                if ($results) {
-                        foreach ($results as $row) {
-                                $valid = $row->token_sid;
-                        }
-                }
-                if (isset($valid)) {
-                        $sql = "DELETE FROM ".$this->table." WHERE token_sid = %s AND token_key = %s";
-                        $h->db->query($h->db->prepare($sql, $valid, $cleanKey));
-                        return TRUE;
-                }
-        }
-
-        private function cleanOld($h)
-        {
-                // Remove expired keys
-                $exp = time();
-                $sql = "DELETE FROM ".$this->table." WHERE token_stamp < %d";
-                $h->db->query($h->db->prepare($sql, $exp));
-                return TRUE;
-        }
-
-        public function logout($h)
-        {
-                $sql = "DELETE FROM ".$this->table." WHERE token_sid = %s";
-                $h->db->query($h->db->prepare($sql, $this->sid));
-                return TRUE;
-        }
 }
-?>