Ticket #646: path-elements-1.4.9.diff

src/mod_secure_download.c

@@ -38 +38 @@
         buffer *uri_prefix;
         
         unsigned short timeout;
+        unsigned short path_elements;
 } plugin_config;
 
 typedef struct {
@@ -100 +101 @@
                 { "secdownload.document-root",     NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },       /* 1 */
                 { "secdownload.uri-prefix",        NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },       /* 2 */
                 { "secdownload.timeout",           NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },        /* 3 */
+                { "secdownload.path-elements",     NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },        /* 4 */
                 { NULL,                            NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
         };
         
@@ -115 +117 @@
                 s->doc_root      = buffer_init();
                 s->uri_prefix    = buffer_init();
                 s->timeout       = 60;
+                s->path_elements = 0;
                 
                 cv[0].destination = s->secret;
                 cv[1].destination = s->doc_root;
                 cv[2].destination = s->uri_prefix;
                 cv[3].destination = &(s->timeout);
+                cv[4].destination = &(s->path_elements);
                 
                 p->config_storage[i] = s;
         
@@ -166 +170 @@
         PATCH(doc_root);
         PATCH(uri_prefix);
         PATCH(timeout);
+        PATCH(path_elements);
         
         /* skip the first, the global context */
         for (i = 1; i < srv->config_context->used; i++) {
@@ -187 +192 @@
                                 PATCH(uri_prefix);
                         } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("secdownload.timeout"))) {
                                 PATCH(timeout);
+                        } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("secdownload.path-elements"))) {
+                                PATCH(path_elements);
                         }
                 }
         }
@@ -200 +207 @@
         plugin_data *p = p_d;
         MD5_CTX Md5Ctx;
         HASH HA1;
-        const char *rel_uri, *ts_str, *md5_str;
+        const char *rel_uri, *rel_uri_end, *ts_str, *md5_str;
         time_t ts = 0;
-        size_t i;
+        size_t i, rel_uri_len, count;
         
         if (con->uri.path->used == 0) return HANDLER_GO_ON;
         
@@ -251 +258 @@
         }
         
         rel_uri = ts_str + 8;
+        rel_uri_end = 0;
+
+        count = p->conf.path_elements;
+        if (count) {
+          rel_uri_end = rel_uri;
+          while (rel_uri_end && *rel_uri_end && count--) {
+            rel_uri_end = strchr(rel_uri_end+1, '/');
+          }
+        }
+        if (rel_uri_end) {
+          log_error_write(srv, __FILE__, __LINE__, "ss", "full local_path: ", rel_uri);
+          log_error_write(srv, __FILE__, __LINE__, "ss", "discarding: ", rel_uri_end);
+          rel_uri_len = rel_uri_end - rel_uri;
+        }
+        else {
+          log_error_write(srv, __FILE__, __LINE__, "ss", "checking will be done with full local_path: ", rel_uri);
+          rel_uri_len = strlen(rel_uri);
+        }
         
         /* checking MD5 
          * 
@@ -258 +283 @@
          */
         
         buffer_copy_string_buffer(p->md5, p->conf.secret);
-        buffer_append_string(p->md5, rel_uri);
+        buffer_append_string_len(p->md5, rel_uri, rel_uri_len);
         buffer_append_string_len(p->md5, ts_str, 8);
         
         MD5_Init(&Md5Ctx);