Merge pull request #261 from geographika/set-environ-variables

Allow environment variables to be set in config file

Author: jbo-ads

lib/configuration_xml.c

@@ -60,6 +60,16 @@ void parseMetadata(mapcache_context *ctx, ezxml_t node, apr_table_t *metadata)
   }
 }
 
+void parseEnvironment(mapcache_context* ctx, ezxml_t node)
+{
+    ezxml_t cur_node;
+    for (cur_node = node->child; cur_node; cur_node = cur_node->ordered) {
+        if (!cur_node->child) {
+            putenv(apr_psprintf(ctx->pool, "%s=%s", cur_node->name, cur_node->txt));
+        }
+    }
+}
+
 void parseDimensions(mapcache_context *ctx, ezxml_t node, mapcache_tileset *tileset)
 {
   ezxml_t dimension_node;
@@ -1267,6 +1277,11 @@ void mapcache_configuration_parse_xml(mapcache_context *ctx, const char *filenam
     if(GC_HAS_ERROR(ctx)) goto cleanup;
   }
 
+  for (node = ezxml_child(doc, "environment"); node; node = node->next) {
+      parseEnvironment(ctx, node);
+      if (GC_HAS_ERROR(ctx)) goto cleanup;
+  }
+
   for(node = ezxml_child(doc,"source"); node; node = node->next) {
     parseSource(ctx, node, config);
     if(GC_HAS_ERROR(ctx)) goto cleanup;

lib/http.c

@@ -104,10 +104,16 @@ void mapcache_http_do_request(mapcache_context *ctx, mapcache_http *req, mapcach
   CURL *curl_handle;
   char error_msg[CURL_ERROR_SIZE];
   int ret;
+  const char* ca_bundle = NULL;
   struct curl_slist *curl_headers=NULL;
   struct _header_struct h;
   curl_handle = curl_easy_init();
 
+  ca_bundle = getenv("CURL_CA_BUNDLE");
+
+  if (ca_bundle) {
+    curl_easy_setopt(curl_handle, CURLOPT_CAINFO, ca_bundle);
+  }
 
   /* specify URL to get */
   curl_easy_setopt(curl_handle, CURLOPT_URL, req->url);
@@ -135,7 +141,6 @@ void mapcache_http_do_request(mapcache_context *ctx, mapcache_http *req, mapcach
   curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1);
 
 
-
   if(req->headers) {
     const apr_array_header_t *array = apr_table_elts(req->headers);
     apr_table_entry_t *elts = (apr_table_entry_t *) array->elts;

mapcache.xml.sample

@@ -15,6 +15,17 @@
       -->
    </metadata>
 
+  <environment>
+    
+    <!--
+    
+           environment variables can be set and overridden here
+           this is useful on Windows servers to set a path
+           to a certificates file when connecting to sources using HTTPS
+
+    <CURL_CA_BUNDLE>C:/MapServer/bin/curl-ca-bundle.crt</CURL_CA_BUNDLE>
+    -->
+  </environment>
    <!--
         a grid represents the layout of tiles: srs, extent, resolutions, and tile size
    -->
@@ -30,7 +41,7 @@
       <!--
            Set to "true" if no new tiles should be created when not in
            the configured cache. If a requested tile is not present in
-           a read-only cache, it wil be returned as "nodata", i.e. fully
+           a read-only cache, it will be returned as "nodata", i.e. fully
            transparent in a vertical assembly case, or as a 404 in a
            single-tile case.
            Note that the read-only status of a tileset is overridden to
@@ -84,7 +95,7 @@
 
    <!--
          there are three preconfigured grids you can use in <tileset>s without having to
-         explicitely define them here:
+         explicitly define them here:
          <grid name="WGS84">
             <metadata>
                <title>GoogleCRS84Quad</title>
@@ -364,7 +375,7 @@
           Similar to symlink_blank, except completely skip writing a file
           if a blank, fully transparent tile is detected.
           Note: This setting should only be used when using the seeder.  If used
-          on demand, mapcache will will query the WMS source on each subsequent 
+          on demand, mapcache will query the WMS source on each subsequent 
           tile request.
       -->
       <detect_blank/>
@@ -388,7 +399,7 @@
          * note that this type of cache does not support blank-tile detection and symlinking.
       
          * warning: it is up to you to make sure that the template you chose creates a unique
-           filename for your given tilesets. e.g. do not ommit the {grid} parameter if your
+           filename for your given tilesets. e.g. do not omit the {grid} parameter if your
            tilesets reference multiple grids. Failure to do so will result in filename
            collisions ! 
 
@@ -399,7 +410,7 @@
           Similar to symlink_blank, except completely skip writing a file
           if a blank, fully transparent tile is detected.
           Note: This setting should only be used when using the seeder.  If used
-          on demand, mapcache will will query the WMS source on each subsequent 
+          on demand, mapcache will query the WMS source on each subsequent 
           tile request.
       -->
       <detect_blank/>
@@ -437,10 +448,10 @@
       <dbfile>/tmp/mysqlitetiles.db</dbfile>
 
       <!-- pragma
-           special sqlite pargmas sent to db at connection time. The following
+           special sqlite pragmas sent to db at connection time. The following
            would execute:
            PRAGMA key=value;
-           usefull for changing default values e.g. on large databases.
+           useful for changing default values e.g. on large databases.
 
       -->
       <pragma name="key">value</pragma>
@@ -588,7 +599,7 @@
 
            png compression: best or fast
            note that "best" compression is cpu intensive for little gain over the default
-           default compression is obtained by leving out this tag.
+           default compression is obtained by leaving out this tag.
       -->
       <compression>fast</compression>
 
@@ -692,7 +703,7 @@
          <connection_timeout>30</connection_timeout>
 
          <!-- timeout in seconds before bailing out from a request. This is the total time needed
-              to fullfill the request, and includes the time needed to transfer the response through
+              to fulfill the request, and includes the time needed to transfer the response through
               the network. Defaults to 600 seconds, set to a higher value if e.g. WMS requests for
               large metatiles take longer than 10 minutes to render -->
          <timeout>300</timeout>
@@ -809,7 +820,7 @@
 
       <!-- format
          (optional) format to use when storing a tile. this should be a format with high
-         compression, eg. png with compression "best", as the compression operation is only
+         compression, e.g. png with compression "best", as the compression operation is only
          done once at creation time.
          if left out, no recompression is applied to the image, mod-mapcache will store the
          exact image received from the <source>
@@ -879,8 +890,8 @@
             mapserver mapfiles. the name of the mapfiles need not be known to mod-mapcache, and can therefore be 
             created even after mod-mapcache has been started.
             when a user passes a MAPFILE=/path/to/mapfile, the string "/path/to/mapfile" is validated against
-            the supplied (PCRE) regular expression. The one in this example allows a name composed of aphanumeric characters
-            spearated by slashes (/) and finishing with ".map" ( [a-zA-Z0-9\./]*\.map$ ) , but will faill if there
+            the supplied (PCRE) regular expression. The one in this example allows a name composed of alphanumeric characters
+            separated by slashes (/) and finishing with ".map" ( [a-zA-Z0-9\./]*\.map$ ) , but will fail if there
             are two consecutive dots (..) in the path, to prevent filesystem traversal  ( (?!.*\.\.) ).
          -->
 	 <dimension type="regex" name="MAPFILE" default="/path/to/mapfile.map">