summaryrefslogtreecommitdiffabout
path: root/cache.c
authorLars Hjemli <hjemli@gmail.com>2006-12-11 08:57:58 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2006-12-11 08:57:58 (UTC)
commitf5069d88dff7a7ed2f4665904b03e906cca75a7c (patch) (unidiff)
tree4c9bfa3aaf931af4a345ffb9563b19825c38b628 /cache.c
parent76827d8679d1d2bd46e8cddf7da2ce4178e1d676 (diff)
downloadcgit-f5069d88dff7a7ed2f4665904b03e906cca75a7c.zip
cgit-f5069d88dff7a7ed2f4665904b03e906cca75a7c.tar.gz
cgit-f5069d88dff7a7ed2f4665904b03e906cca75a7c.tar.bz2
Fix cache algorithm loophole
This closes the door for unneccessary calls to cgit_fill_cache(). Noticed by Linus. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'cache.c') (more/less context) (ignore whitespace changes)
-rw-r--r--cache.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/cache.c b/cache.c
index b034c48..0ffa502 100644
--- a/cache.c
+++ b/cache.c
@@ -1,94 +1,98 @@
1/* cache.c: cache management 1/* cache.c: cache management
2 * 2 *
3 * Copyright (C) 2006 Lars Hjemli 3 * Copyright (C) 2006 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10 10
11const int NOLOCK = -1; 11const int NOLOCK = -1;
12 12
13int cache_lookup(struct cacheitem *item) 13void cache_prepare(struct cacheitem *item)
14{ 14{
15 if (!cgit_query_repo) { 15 if (!cgit_query_repo) {
16 item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); 16 item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
17 item->ttl = cgit_cache_root_ttl; 17 item->ttl = cgit_cache_root_ttl;
18 } else if (!cgit_query_page) { 18 } else if (!cgit_query_page) {
19 item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, 19 item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root,
20 cgit_query_repo)); 20 cgit_query_repo));
21 item->ttl = cgit_cache_repo_ttl; 21 item->ttl = cgit_cache_repo_ttl;
22 } else { 22 } else {
23 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, 23 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
24 cgit_query_repo, cgit_query_page, 24 cgit_query_repo, cgit_query_page,
25 cgit_querystring)); 25 cgit_querystring));
26 if (cgit_query_has_symref) 26 if (cgit_query_has_symref)
27 item->ttl = cgit_cache_dynamic_ttl; 27 item->ttl = cgit_cache_dynamic_ttl;
28 else if (cgit_query_has_sha1) 28 else if (cgit_query_has_sha1)
29 item->ttl = cgit_cache_static_ttl; 29 item->ttl = cgit_cache_static_ttl;
30 else 30 else
31 item->ttl = cgit_cache_repo_ttl; 31 item->ttl = cgit_cache_repo_ttl;
32 } 32 }
33}
34
35int cache_exist(struct cacheitem *item)
36{
33 if (stat(item->name, &item->st)) { 37 if (stat(item->name, &item->st)) {
34 item->st.st_mtime = 0; 38 item->st.st_mtime = 0;
35 return 0; 39 return 0;
36 } 40 }
37 return 1; 41 return 1;
38} 42}
39 43
40int cache_create_dirs() 44int cache_create_dirs()
41{ 45{
42 char *path; 46 char *path;
43 47
44 if (!cgit_query_repo) 48 if (!cgit_query_repo)
45 return 0; 49 return 0;
46 50
47 path = fmt("%s/%s", cgit_cache_root, cgit_query_repo); 51 path = fmt("%s/%s", cgit_cache_root, cgit_query_repo);
48 if (mkdir(path, S_IRWXU) && errno!=EEXIST) 52 if (mkdir(path, S_IRWXU) && errno!=EEXIST)
49 return 0; 53 return 0;
50 54
51 if (cgit_query_page) { 55 if (cgit_query_page) {
52 path = fmt("%s/%s/%s", cgit_cache_root, cgit_query_repo, 56 path = fmt("%s/%s/%s", cgit_cache_root, cgit_query_repo,
53 cgit_query_page); 57 cgit_query_page);
54 if (mkdir(path, S_IRWXU) && errno!=EEXIST) 58 if (mkdir(path, S_IRWXU) && errno!=EEXIST)
55 return 0; 59 return 0;
56 } 60 }
57 return 1; 61 return 1;
58} 62}
59 63
60int cache_lock(struct cacheitem *item) 64int cache_lock(struct cacheitem *item)
61{ 65{
62 int ret; 66 int ret;
63 char *lockfile = fmt("%s.lock", item->name); 67 char *lockfile = fmt("%s.lock", item->name);
64 68
65 top: 69 top:
66 item->fd = open(lockfile, O_WRONLY | O_CREAT | O_EXCL, S_IRUSR|S_IWUSR); 70 item->fd = open(lockfile, O_WRONLY | O_CREAT | O_EXCL, S_IRUSR|S_IWUSR);
67 if (item->fd == NOLOCK && errno == ENOENT && cache_create_dirs()) 71 if (item->fd == NOLOCK && errno == ENOENT && cache_create_dirs())
68 goto top; 72 goto top;
69 if (item->fd == NOLOCK && errno == EEXIST) { 73 if (item->fd == NOLOCK && errno == EEXIST) {
70 struct stat st; 74 struct stat st;
71 time_t t; 75 time_t t;
72 if (stat(lockfile, &st)) 76 if (stat(lockfile, &st))
73 return ret; 77 return ret;
74 t = time(NULL); 78 t = time(NULL);
75 if (t-st.st_mtime > cgit_cache_max_create_time && 79 if (t-st.st_mtime > cgit_cache_max_create_time &&
76 !unlink(lockfile)) 80 !unlink(lockfile))
77 goto top; 81 goto top;
78 return 0; 82 return 0;
79 } 83 }
80 return (item->fd > 0); 84 return (item->fd > 0);
81} 85}
82 86
83int cache_unlock(struct cacheitem *item) 87int cache_unlock(struct cacheitem *item)
84{ 88{
85 close(item->fd); 89 close(item->fd);
86 return (rename(fmt("%s.lock", item->name), item->name) == 0); 90 return (rename(fmt("%s.lock", item->name), item->name) == 0);
87} 91}
88 92
89int cache_expired(struct cacheitem *item) 93int cache_expired(struct cacheitem *item)
90{ 94{
91 if (item->ttl < 0) 95 if (item->ttl < 0)
92 return 0; 96 return 0;
93 return item->st.st_mtime + item->ttl * 60 < time(NULL); 97 return item->st.st_mtime + item->ttl * 60 < time(NULL);
94} 98}