trafficserver git commit: TS-2325: remap.config .include should support directories

[jp...@apache.org]

Repository: trafficserver
Updated Branches:
  refs/heads/master bf7dca70e -> 3bcdd5022


TS-2325: remap.config .include should support directories


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3bcdd502
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3bcdd502
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3bcdd502

Branch: refs/heads/master
Commit: 3bcdd50225c581bd2e34fdef07f33e04dadd3240
Parents: bf7dca7
Author: Masakazu Kitajo <m4...@gmail.com>
Authored: Mon Jun 8 21:50:38 2015 -0700
Committer: James Peach <jp...@apache.org>
Committed: Mon Jun 8 22:11:55 2015 -0700

----------------------------------------------------------------------
 CHANGES                         |  3 ++
 proxy/http/remap/RemapConfig.cc | 99 ++++++++++++++++++++++++++++--------
 2 files changed, 81 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3bcdd502/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 1522019..1e07599 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 6.0.0
 
+  *) [TS-2325] Support .include directories in remap.config.
+   Author: Masakazu Kitajo <m4...@gmail.com>
+
   *) [TS-3662] Caching range requests plugin.
 
   *) [TS-3368] Mark traffic_line as deprecated.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3bcdd502/proxy/http/remap/RemapConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/http/remap/RemapConfig.cc b/proxy/http/remap/RemapConfig.cc
index 3cacde1..55079e9 100644
--- a/proxy/http/remap/RemapConfig.cc
+++ b/proxy/http/remap/RemapConfig.cc
@@ -28,6 +28,7 @@
 #include "HTTP.h"
 #include "libts.h"
 #include "ink_cap.h"
+#include "ink_file.h"
 
 #define modulePrefix "[ReverseProxy]"
 
@@ -235,6 +236,51 @@ parse_deactivate_directive(const char *directive, BUILD_TABLE_INFO *bti, char *e
   return NULL;
 }
 
+static void
+free_directory_list(int n_entries, struct dirent **entrylist)
+{
+  for (int i = 0; i < n_entries; ++i) {
+    free(entrylist[i]);
+  }
+
+  free(entrylist);
+}
+
+static const char *
+parse_remap_fragment(const char *path, BUILD_TABLE_INFO *bti, char *errbuf, size_t errbufsize)
+{
+  // We need to create a new bti so that we don't clobber any state in the parent parse, but we want
+  // to keep the ACL rules from the parent because ACLs must be global across the full set of config
+  // files.
+  BUILD_TABLE_INFO nbti;
+  bool success;
+
+  if (access(path, R_OK) == -1) {
+    snprintf(errbuf, errbufsize, "%s: %s", path, strerror(errno));
+    return (const char *)errbuf;
+  }
+
+  nbti.rules_list = bti->rules_list;
+  nbti.rewrite = bti->rewrite;
+
+  // XXX at this point, we need to register the included file(s) with the management subsystem
+  // so that we can correctly reload them when they change. Otherwise, the operator will have to
+  // touch remap.config before reloading the configuration.
+
+  Debug("url_rewrite", "[%s] including remap configuration from %s", __func__, (const char *)path);
+  success = remap_parse_config_bti(path, &nbti);
+
+  // The sub-parse might have updated the rules list, so push it up to the parent parse.
+  bti->rules_list = nbti.rules_list;
+
+  if (!success) {
+    snprintf(errbuf, errbufsize, "failed to parse included file %s", path);
+    return (const char *)errbuf;
+  }
+
+  return NULL;
+}
+
 static const char *
 parse_include_directive(const char *directive, BUILD_TABLE_INFO *bti, char *errbuf, size_t errbufsize)
 {
@@ -245,38 +291,49 @@ parse_include_directive(const char *directive, BUILD_TABLE_INFO *bti, char *errb
   }
 
   for (unsigned i = 1; i < (unsigned)bti->paramc; ++i) {
-    // We need to create a new bti so that we don't clobber any state in the parent parse, but we want
-    // to keep the ACL rules from the parent because ACLs must be global across the full set of config
-    // files.
-    BUILD_TABLE_INFO nbti;
     ats_scoped_str path;
-    bool success;
+    const char *errmsg = NULL;
 
     // The included path is relative to SYSCONFDIR, just like remap.config is.
     path = RecConfigReadConfigPath(NULL, bti->paramv[i]);
 
-    // XXX including directories is not supported (yet!).
     if (ink_file_is_directory(path)) {
-      snprintf(errbuf, errbufsize, "included path %s is a directory", bti->paramv[i]);
-      return (const char *)errbuf;
-    }
+      struct dirent **entrylist;
+      int n_entries;
+
+      n_entries = scandir(path, &entrylist, NULL, alphasort);
+      if (n_entries == -1) {
+        snprintf(errbuf, errbufsize, "failed to open %s: %s", path.get(), strerror(errno));
+        return (const char *)errbuf;
+      }
+
+      for (int j = 0; j < n_entries; ++j) {
+        ats_scoped_str subpath;
 
-    nbti.rules_list = bti->rules_list;
-    nbti.rewrite = bti->rewrite;
+        if (isdot(entrylist[j]->d_name) || isdotdot(entrylist[j]->d_name)) {
+          continue;
+        }
+
+        subpath = Layout::relative_to(path, entrylist[j]->d_name);
+
+        if (ink_file_is_directory(subpath)) {
+          continue;
+        }
 
-    // XXX at this point, we need to register the included file(s) with the management subsystem
-    // so that we can correctly reload them when they change. Otherwise, the operator will have to
-    // touch remap.config before reloading the configuration.
+        errmsg = parse_remap_fragment(subpath, bti, errbuf, errbufsize);
+        if (errmsg != NULL) {
+          break;
+        }
+      }
 
-    Debug("url_rewrite", "[%s] including remap configuration from %s", __func__, (const char *)path);
-    success = remap_parse_config_bti(path, &nbti);
+      free_directory_list(n_entries, entrylist);
 
-    // The sub-parse might have updated the rules list, so push it up to the parent parse.
-    bti->rules_list = nbti.rules_list;
+    } else {
+      errmsg = parse_remap_fragment(path, bti, errbuf, errbufsize);
+    }
 
-    if (!success) {
-      snprintf(errbuf, errbufsize, "failed to parse included file %s", bti->paramv[i]);
-      return (const char *)errbuf;
+    if (errmsg) {
+      return errmsg;
     }
   }