Changeset 390 for trunk/zoo-project/zoo-kernel

Timestamp:

Jan 14, 2013, 10:43:37 AM (12 years ago)

Author:

djay

Message:

Fix issue about reading session file when client send cookie not relative to the ZOO-Kernel.

File:

• trunk/zoo-project/zoo-kernel/zoo_service_loader.c (modified) (2 diffs)

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

@@ -2105 +2105 @@
     addToMap(_tmpMaps->content,"soap","false");
   if(cgiCookie!=NULL && strlen(cgiCookie)>0){
+    int hasValidCookie=-1;
     char *tcook=strdup(cgiCookie);
     if(strstr(cgiCookie,";")>0){
@@ -2114 +2115 @@
             free(tcook);
           tcook=strdup(token);
+          hasValidCookie=1;
         }
         token=strtok_r(NULL,";",&saveptr);
       }
     }
-    addToMap(_tmpMaps->content,"sessid",strstr(tcook,"=")+1);
-    char session_file_path[1024];
-    map *tmpPath=getMapFromMaps(m,"main","sessPath");
-    if(tmpPath==NULL)
-      tmpPath=getMapFromMaps(m,"main","tmpPath");
-    char *tmp1=strtok(tcook,";");
-    if(tmp1!=NULL)
-      sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(tmp1,"=")+1);
-    else
-      sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(cgiCookie,"=")+1);
-    free(tcook);
-    maps *tmpSess=(maps*)malloc(MAPS_SIZE);
-    struct stat file_status;
-    int istat = stat(session_file_path, &file_status);
-    if(istat==0 && file_status.st_size>0){
-      conf_read(session_file_path,tmpSess);
-      addMapsToMaps(&m,tmpSess);
-      freeMaps(&tmpSess);
-    }else{
-      errorException(m, _("Unable to read your session file."), "InternalError");
-      freeMaps(&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);
+    if(hasValidCookie>0){
+      addToMap(_tmpMaps->content,"sessid",strstr(tcook,"=")+1);
+      char session_file_path[1024];
+      map *tmpPath=getMapFromMaps(m,"main","sessPath");
+      if(tmpPath==NULL)
+        tmpPath=getMapFromMaps(m,"main","tmpPath");
+      char *tmp1=strtok(tcook,";");
+      if(tmp1!=NULL)
+        sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(tmp1,"=")+1);
+      else
+        sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(cgiCookie,"=")+1);
+      free(tcook);
+      maps *tmpSess=(maps*)malloc(MAPS_SIZE);
+      struct stat file_status;
+      int istat = stat(session_file_path, &file_status);
+      if(istat==0 && file_status.st_size>0){
+        conf_read(session_file_path,tmpSess);
+        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);
+    }
   }
   addMapsToMaps(&m,_tmpMaps);