Changeset 605 for trunk/zoo-project/zoo-kernel/service_internal_php.c

Timestamp:

Mar 9, 2015, 4:46:24 PM (9 years ago)

Author:

knut

Message:

Altered the path of stored response files from [tmpPath]/[serviceProvider]_[cpid].xml to [tmpPath]/[serviceName]_[cpid].xml. Added support for a new parameter, libPath, in the [main] block of main.cfg. The libPath parameter is interpreted as the absolute path of the directory containing library files. If the libPath parameter is set, it will override the metapath parameter such that library files are loaded from [libPath]/[serviceProvider] instead of [CWD]/[metapath]/[serviceProvider]. Added the option to disable the metapath parameter (for security reasons) at compile time: If the Zoo kernel is compiled with the preprocessor directive IGNORE_METAPATH, the metapath will be set to the empty string. Note however, that the libPath and IGNORE_METAPATH options so far only work for C and PHP; the functions for loading libraries written in other languages should be modified correspondingly before the documentation is updated. See also ticket no. 112 (http://www.zoo-project.org/trac/ticket/112). Fixed some spelling errors and modified the language in some of the messages returned by the Zoo kernel.

File:

• trunk/zoo-project/zoo-kernel/service_internal_php.c (modified) (1 diff)

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

@@ -186 +186 @@
   char ntmp[1024];
   getcwd(ntmp,1024);
-  map* tmp=getMap(request,"metapath");
-
+    
+  map* libp = getMapFromMaps(m, "main", "libPath"); // KLa  
   int res=SERVICE_FAILED;
 
-  tmp=getMap(s->content,"serviceProvider");
+  map* tmp=getMap(s->content,"serviceProvider");
+  if (tmp == NULL || tmp->value == NULL) {
+          return errorException(m, "Missing serviceProvider (library file)", "NoApplicableCode", NULL);
+  }
+  
   map* cwd=getMapFromMaps(m,"lenv","cwd");
-  map* mp=getMap(request,"metapath");
+#ifdef IGNORE_METAPATH
+  map* mp = createMap("metapath", "");
+#else  
+  map* mp = getMap(request, "metapath");
+#endif
   char *scriptName;
-  if(mp!=NULL && strlen(mp->value)>0){
-    scriptName=(char*)malloc((strlen(cwd->value)+strlen(mp->value)+strlen(tmp->value)+3)*sizeof(char));
-    sprintf(scriptName,"%s/%s/%s",cwd->value,mp->value,tmp->value);
-  }else{
-    scriptName=(char*)malloc((strlen(cwd->value)+strlen(tmp->value)+2)*sizeof(char));
-    sprintf(scriptName,"%s/%s",cwd->value,tmp->value);
-  }
+  
+  if (libp != NULL && libp->value != NULL) {
+        scriptName = (char*) malloc((strlen(libp->value) + strlen(tmp->value) + 2)*sizeof(char));
+    sprintf (scriptName, "%s/%s", libp->value, tmp->value);     
+  }
+  else {        
+    if(mp!=NULL && strlen(mp->value)>0){
+      scriptName=(char*)malloc((strlen(cwd->value)+strlen(mp->value)+strlen(tmp->value)+3)*sizeof(char));
+      sprintf(scriptName,"%s/%s/%s",cwd->value,mp->value,tmp->value);
+    }else{
+      scriptName=(char*)malloc((strlen(cwd->value)+strlen(tmp->value)+2)*sizeof(char));
+      sprintf(scriptName,"%s/%s",cwd->value,tmp->value);
+    }
+  } 
   zend_file_handle iscript;
   iscript.type=ZEND_HANDLE_FD;