3 files changed, 18 insertions, 1 deletions
diff --git a/cache.c b/cache.c
index 1ff1251..8df7c26 100644
--- a/cache.c
+++ b/cache.c
@@ -1,44 +1,60 @@
 /* cache.c: cache management
 *
 * Copyright (C) 2006 Lars Hjemli
 *
 * Licensed under GNU General Public License v2
 *   (see COPYING for full license text)
 */
 #include "cgit.h"
 const int NOLOCK = -1;
+char *cache_safe_filename(const char *unsafe)
+{
+        static char buf[PATH_MAX];
+        char *s = buf;
+        char c;
+        while(unsafe && (c = *unsafe++) != 0) {
+                if (c == '/' || c == ' ' || c == '&' || c == '|' || 
+                    c == '>' || c == '<' || c == '.')
+                        c = '_';
+                *s++ = c;
+        }
+        *s = '\0';
+        return buf;
+}
 int cache_exist(struct cacheitem *item)
 {
        if (stat(item->name, &item->st)) {
                item->st.st_mtime = 0;
                return 0;
        }
        return 1;
 }
 int cache_create_dirs()
 {
        char *path;
        path = fmt("%s", cgit_cache_root);
        if (mkdir(path, S_IRWXU) && errno!=EEXIST)
                return 0;
        if (!cgit_query_repo)
                return 0;
        path = fmt("%s/%s", cgit_cache_root, cgit_query_repo);
        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 (mkdir(path, S_IRWXU) && errno!=EEXIST)
                        return 0;
        }
        return 1;
 }
diff --git a/cgit.c b/cgit.c
index d975570..a3a04d9 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,57 +1,57 @@
 /* cgit.c: cgi for the git scm
 *
 * Copyright (C) 2006 Lars Hjemli
 *
 * Licensed under GNU General Public License v2
 *   (see COPYING for full license text)
 */
 #include "cgit.h"
 const char cgit_version[] = CGIT_VERSION;
 static void cgit_prepare_cache(struct cacheitem *item)
 {
        if (!cgit_query_repo) {
                item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
                item->ttl = cgit_cache_root_ttl;
        } else if (!cgit_query_page) {
                item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, 
                           cgit_query_repo));
                item->ttl = cgit_cache_repo_ttl;
        } else {
                item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, 
                           cgit_query_repo, cgit_query_page, 
-                           cgit_querystring));
+                           cache_safe_filename(cgit_querystring)));
                if (cgit_query_has_symref)
                        item->ttl = cgit_cache_dynamic_ttl;
                else if (cgit_query_has_sha1)
                        item->ttl = cgit_cache_static_ttl;
                else
                        item->ttl = cgit_cache_repo_ttl;
        }
 }
 static void cgit_print_repo_page(struct cacheitem *item)
 {
        if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || 
            cgit_read_config("info/cgit", cgit_repo_config_cb)) {
                char *title = fmt("%s - %s", cgit_root_title, "Bad request");
                cgit_print_docstart(title, item);
                cgit_print_pageheader(title, 0);
                cgit_print_error(fmt("Unable to scan repository: %s",
                                     strerror(errno)));
                cgit_print_docend();
                return;
        }
        setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1);
        char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc);
        int show_search = 0;
        if (cgit_query_page && !strcmp(cgit_query_page, "log"))
                show_search = 1;
        cgit_print_docstart(title, item);
        cgit_print_pageheader(title, show_search);
        if (!cgit_query_page) {
                cgit_print_summary();
        } else if (!strcmp(cgit_query_page, "log")) {
                cgit_print_log(cgit_query_head, cgit_query_ofs, 100, cgit_query_search);
diff --git a/cgit.h b/cgit.h
index f915c86..3601e49 100644
--- a/cgit.h
+++ b/cgit.h
@@ -58,57 +58,58 @@ extern char *cgit_query_page;
 extern char *cgit_query_search;
 extern char *cgit_query_head;
 extern char *cgit_query_sha1;
 extern char *cgit_query_sha2;
 extern int   cgit_query_ofs;
 extern int htmlfd;
 extern void cgit_global_config_cb(const char *name, const char *value);
 extern void cgit_repo_config_cb(const char *name, const char *value);
 extern void cgit_querystring_cb(const char *name, const char *value);
 extern int hextoint(char c);
 extern void *cgit_free_commitinfo(struct commitinfo *info);
 extern char *fmt(const char *format,...);
 extern void html(const char *txt);
 extern void htmlf(const char *format,...);
 extern void html_txt(char *txt);
 extern void html_ntxt(int len, char *txt);
 extern void html_attr(char *txt);
 extern void html_hidden(char *name, char *value);
 extern void html_link_open(char *url, char *title, char *class);
 extern void html_link_close(void);
 extern void html_filemode(unsigned short mode);
 extern int cgit_read_config(const char *filename, configfn fn);
 extern int cgit_parse_query(char *txt, configfn fn);
 extern struct commitinfo *cgit_parse_commit(struct commit *commit);
+extern char *cache_safe_filename(const char *unsafe);
 extern int cache_lock(struct cacheitem *item);
 extern int cache_unlock(struct cacheitem *item);
 extern int cache_cancel_lock(struct cacheitem *item);
 extern int cache_exist(struct cacheitem *item);
 extern int cache_expired(struct cacheitem *item);
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_pageurl(const char *reponame, const char *pagename, 
                          const char *query);
 extern void cgit_print_error(char *msg);
 extern void cgit_print_date(unsigned long secs);
 extern void cgit_print_docstart(char *title, struct cacheitem *item);
 extern void cgit_print_docend();
 extern void cgit_print_pageheader(char *title, int show_search);
 extern void cgit_print_repolist(struct cacheitem *item);
 extern void cgit_print_summary();
 extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep);
 extern void cgit_print_view(const char *hex);
 extern void cgit_print_tree(const char *hex);
 extern void cgit_print_commit(const char *hex);
 extern void cgit_print_diff(const char *old_hex, const char *new_hex);
 #endif /* CGIT_H */