Changeset 20856

Timestamp:

2009-10-29T10:41:38+13:00 (14 years ago)

Author:

mdewsnip

Message:

Rewritten get_cookie() functions to prevent strange infinite loops and crashes in some circumstances, and to get rid of some *nasty* code (here+9, anyone?). By Jeffrey Ke at DL Consulting Ltd.

File:

• gsdl/trunk/runtime-src/src/recpt/receptionist.cpp (modified) (1 diff)

gsdl/trunk/runtime-src/src/recpt/receptionist.cpp

@@ -670 +670 @@
 }
 
-// returns true if cookie already existed, false
-// if it was generated
-bool receptionist::get_cookie (text_t &cookie, text_tmap &fcgienv) {
-
+
+// Returns true if cookie already existed, false if it was generated
+bool receptionist::get_cookie (text_t &cookie, text_tmap &fcgienv)
+{
+  // See if we can get the GSDL_UID cookie
   text_t cookiestring = gsdl_getenv ("HTTP_COOKIE", fcgienv);
-  if (!cookiestring.empty())
+  if (!cookiestring.empty()) // This should really be handled by the findword function...
   {
-    text_t::const_iterator end = cookiestring.end();  
-    text_t::const_iterator here = findchar ((text_t::const_iterator)cookiestring.begin(), end, 'G');
-
-    while (here+9 < end) { 
-    
-      if (substr(here, here+8) == "GSDL_UID") {
-    cookie = substr (here+9, findchar (here+9, end, ';')); 
-    return true;
-      }
-      ++here;
-      here = findchar (here, end, 'G');
-    }
-  }
-
+    // Check if the cookie contains GSDL_UID
+    text_t gsdl_uid = "GSDL_UID=";
+    text_t::const_iterator gsdl_uid_start = findword(cookiestring.begin(), cookiestring.end(), gsdl_uid);
+    if (gsdl_uid_start != cookiestring.end())
+    {
+      // Yes, so extract its value
+      cookie = substr(gsdl_uid_start + gsdl_uid.size(), findchar(gsdl_uid_start + gsdl_uid.size(), cookiestring.end(), ';'));
+      return true;
+    }
+  }
+
+  // Generate a new key "[host]-[epoch time]", e.g. test.com-1256764496
   cookie.clear();
   text_t host = gsdl_getenv("REMOTE_ADDR", fcgienv);
   time_t ttime = time(NULL);
-  if (!host.empty()) {
+  if (!host.empty())
+  {
     cookie += host;
     cookie.push_back ('-');
   }
   cookie += text_t(ttime);
-  
+
   return false;
 }
 
-// as above but just tests if cookie exists
-bool receptionist::get_cookie (text_tmap &fcgienv) {
-
-  text_t c = gsdl_getenv("HTTP_COOKIE", fcgienv);
-  if (!c.empty()) {
-    text_t cookiestring = c;
-    
-    text_t::const_iterator end = cookiestring.end();  
-    text_t::const_iterator here = findchar ((text_t::const_iterator)cookiestring.begin(), end, 'G');
-
-    while (here+9 < end) { 
-      if (substr(here, here+8) == "GSDL_UID") return true;
-      ++here;
-      here = findchar (here, end, 'G');
-    }
-  }
-  return false;
-}
+
+// Same as above but just tests if cookie exists
+bool receptionist::get_cookie (text_tmap &fcgienv)
+{
+  text_t cookie_jar = "";
+  return get_cookie(cookie_jar, fcgienv);
+}
+
 
 bool receptionist::log_cgi_args (cgiargsclass &args, ostream &logout, text_tmap &fcgienv) {