Changeset 433 for trunk

Timestamp:

Jul 5, 2013, 9:40:07 AM (11 years ago)

Author:

djay

Message:

Fixed in trunk (r433): correct behavior when cookie are set by external applications #79.

Location:

trunk/zoo-project

Files:

• HISTORY.txt (modified) (1 diff)
• zoo-kernel/zoo_service_loader.c (modified) (3 diffs)

trunk/zoo-project/HISTORY.txt

@@ +1 @@
+Version 1.3.0-rc2
+  * Fix POST Request issue (ticket #34)
+  * Fix COOKIE gesture (ticket #79)
+
 Version 1.3.0-rc1
 

trunk/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -2120 +2120 @@
     int hasValidCookie=-1;
     char *tcook=strdup(cgiCookie);
+    char *tmp=NULL;
+    int hasVal=-1;
+    map* testing=getMapFromMaps(m,"main","cookiePrefix");
+    if(testing==NULL){
+      tmp=strdup("ID=");
+    }else{
+      tmp=(char*)malloc((strlen(testing->value)+2)*sizeof(char));
+      sprintf(tmp,"%s=",testing->value);
+      hasVal=1;
+    }
     if(strstr(cgiCookie,";")!=NULL){
       char *token,*saveptr;
       token=strtok_r(cgiCookie,";",&saveptr);
       while(token!=NULL){
-        if(strcasestr(token,"ID=")!=NULL){
+        if(strcasestr(token,tmp)!=NULL){
           if(tcook!=NULL)
             free(tcook);
@@ -2133 +2143 @@
       }
     }else{
-      if(strstr(cgiCookie,"=")!=NULL && strcasestr(cgiCookie,"ID=")!=NULL){
+      if(strstr(cgiCookie,"=")!=NULL && strcasestr(cgiCookie,tmp)!=NULL){
         tcook=strdup(cgiCookie);
         hasValidCookie=1;
+      }
+      if(tmp!=NULL){
+        free(tmp);
       }
     }
@@ -2157 +2170 @@
         addMapsToMaps(&m,tmpSess);
         freeMaps(&tmpSess);
-      }else{
-        errorException(m, _("Unable to read your session file."), "InternalError");
         free(tmpSess);
-        freeService(&s1);
-        free(s1);
-        freeMaps(&m);
-        free(m);
-        freeMaps(&request_input_real_format);
-        free(request_input_real_format);
-        freeMaps(&request_output_real_format);
-        free(request_output_real_format);
-        free(REQUEST);
-        free(SERVICE_URL);
-        return 1;
       }
-      free(tmpSess);
     }
   }