X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/83a5f35a2724ee60bfd8c5679b98da7008272254..4c9916043d6aabb8278e0d78f5fa71a59f82889d:/cache.c?ds=sidebyside

diff --git a/cache.c b/cache.c
index 1ff1251..89f7ecd 100644
--- a/cache.c
+++ b/cache.c
@@ -7,9 +7,31 @@
  */
 
 #include "cgit.h"
+#include "cache.h"
 
 const int NOLOCK = -1;
 
+char *cache_safe_filename(const char *unsafe)
+{
+	static char buf[4][PATH_MAX];
+	static int bufidx;
+	char *s;
+	char c;
+
+	bufidx++;
+	bufidx &= 3;
+	s = buf[bufidx];
+
+	while(unsafe && (c = *unsafe++) != 0) {
+		if (c == '/' || c == ' ' || c == '&' || c == '|' ||
+		    c == '>' || c == '<' || c == '.')
+			c = '_';
+		*s++ = c;
+	}
+	*s = '\0';
+	return buf[bufidx];
+}
+
 int cache_exist(struct cacheitem *item)
 {
 	if (stat(item->name, &item->st)) {
@@ -23,20 +45,23 @@ int cache_create_dirs()
 {
 	char *path;
 
-	path = fmt("%s", cgit_cache_root);
+	path = fmt("%s", ctx.cfg.cache_root);
 	if (mkdir(path, S_IRWXU) && errno!=EEXIST)
 		return 0;
 
-	if (!cgit_query_repo)
+	if (!ctx.repo)
 		return 0;
 
-	path = fmt("%s/%s", cgit_cache_root, cgit_query_repo);
+	path = fmt("%s/%s", ctx.cfg.cache_root,
+		   cache_safe_filename(ctx.repo->url));
+
 	if (mkdir(path, S_IRWXU) && errno!=EEXIST)
 		return 0;
 
-	if (cgit_query_page) {
-		path = fmt("%s/%s/%s", cgit_cache_root, cgit_query_repo, 
-			   cgit_query_page);
+	if (ctx.qry.page) {
+		path = fmt("%s/%s/%s", ctx.cfg.cache_root,
+			   cache_safe_filename(ctx.repo->url),
+			   ctx.qry.page);
 		if (mkdir(path, S_IRWXU) && errno!=EEXIST)
 			return 0;
 	}
@@ -50,7 +75,7 @@ int cache_refill_overdue(const char *lockfile)
 	if (stat(lockfile, &st))
 		return 0;
 	else
-		return (time(NULL) - st.st_mtime > cgit_cache_max_create_time);
+		return (time(NULL) - st.st_mtime > ctx.cfg.cache_max_create_time);
 }
 
 int cache_lock(struct cacheitem *item)
@@ -59,7 +84,7 @@ int cache_lock(struct cacheitem *item)
 	char *lockfile = xstrdup(fmt("%s.lock", item->name));
 
  top:
-	if (++i > cgit_max_lock_attempts)
+	if (++i > ctx.cfg.max_lock_attempts)
 		die("cache_lock: unable to lock %s: %s",
 		    item->name, strerror(errno));