summaryrefslogtreecommitdiffabout
path: root/cgit.c
authorLars Hjemli <hjemli@gmail.com>2006-12-11 11:10:12 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2006-12-11 11:10:12 (UTC)
commit318d106300102c19d114a4ea89265b0a4060d9cb (patch) (unidiff)
tree3752575abec74ee0a2b544e36e3cc8f9cdfa1e66 /cgit.c
parenta581ed8d6c15b0734b082fbadf0a907c2b170423 (diff)
downloadcgit-318d106300102c19d114a4ea89265b0a4060d9cb.zip
cgit-318d106300102c19d114a4ea89265b0a4060d9cb.tar.gz
cgit-318d106300102c19d114a4ea89265b0a4060d9cb.tar.bz2
Avoid infinite loops in caching layer
Add a global variable, cgit_max_lock_attemps, to avoid the possibility of infinite loops when failing to acquire a lockfile. This could happen on broken setups or under crazy server load. Incidentally, this also fixes a lurking bug in cache_lock() where an uninitialized returnvalue was used. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'cgit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c
index 7f14016..dc91125 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,129 +1,130 @@
1/* cgit.c: cgi for the git scm 1/* cgit.c: cgi for the git scm
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 char cgit_version[] = CGIT_VERSION; 11const char cgit_version[] = CGIT_VERSION;
12 12
13const char cgit_doctype[] = 13const char cgit_doctype[] =
14"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" 14"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
15" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; 15" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
16 16
17const char cgit_error[] = 17const char cgit_error[] =
18"<div class='error'>%s</div>"; 18"<div class='error'>%s</div>";
19 19
20const char cgit_lib_error[] = 20const char cgit_lib_error[] =
21"<div class='error'>%s: %s</div>"; 21"<div class='error'>%s: %s</div>";
22 22
23int htmlfd = 0; 23int htmlfd = 0;
24 24
25char *cgit_root = "/usr/src/git"; 25char *cgit_root = "/usr/src/git";
26char *cgit_root_title = "Git repository browser"; 26char *cgit_root_title = "Git repository browser";
27char *cgit_css = "/cgit.css"; 27char *cgit_css = "/cgit.css";
28char *cgit_logo = "/git-logo.png"; 28char *cgit_logo = "/git-logo.png";
29char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; 29char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/";
30char *cgit_virtual_root = NULL; 30char *cgit_virtual_root = NULL;
31 31
32char *cgit_cache_root = "/var/cache/cgit"; 32char *cgit_cache_root = "/var/cache/cgit";
33 33
34int cgit_max_lock_attempts = 5;
34int cgit_cache_root_ttl = 5; 35int cgit_cache_root_ttl = 5;
35int cgit_cache_repo_ttl = 5; 36int cgit_cache_repo_ttl = 5;
36int cgit_cache_dynamic_ttl = 5; 37int cgit_cache_dynamic_ttl = 5;
37int cgit_cache_static_ttl = -1; 38int cgit_cache_static_ttl = -1;
38int cgit_cache_max_create_time = 5; 39int cgit_cache_max_create_time = 5;
39 40
40char *cgit_repo_name = NULL; 41char *cgit_repo_name = NULL;
41char *cgit_repo_desc = NULL; 42char *cgit_repo_desc = NULL;
42char *cgit_repo_owner = NULL; 43char *cgit_repo_owner = NULL;
43 44
44int cgit_query_has_symref = 0; 45int cgit_query_has_symref = 0;
45int cgit_query_has_sha1 = 0; 46int cgit_query_has_sha1 = 0;
46 47
47char *cgit_querystring = NULL; 48char *cgit_querystring = NULL;
48char *cgit_query_repo = NULL; 49char *cgit_query_repo = NULL;
49char *cgit_query_page = NULL; 50char *cgit_query_page = NULL;
50char *cgit_query_head = NULL; 51char *cgit_query_head = NULL;
51char *cgit_query_sha1 = NULL; 52char *cgit_query_sha1 = NULL;
52 53
53struct cacheitem cacheitem; 54struct cacheitem cacheitem;
54 55
55int cgit_parse_query(char *txt, configfn fn) 56int cgit_parse_query(char *txt, configfn fn)
56{ 57{
57 char *t, *value = NULL, c; 58 char *t, *value = NULL, c;
58 59
59 if (!txt) 60 if (!txt)
60 return 0; 61 return 0;
61 62
62 t = txt = xstrdup(txt); 63 t = txt = xstrdup(txt);
63 64
64 while((c=*t) != '\0') { 65 while((c=*t) != '\0') {
65 if (c=='=') { 66 if (c=='=') {
66 *t = '\0'; 67 *t = '\0';
67 value = t+1; 68 value = t+1;
68 } else if (c=='&') { 69 } else if (c=='&') {
69 *t = '\0'; 70 *t = '\0';
70 (*fn)(txt, value); 71 (*fn)(txt, value);
71 txt = t+1; 72 txt = t+1;
72 value = NULL; 73 value = NULL;
73 } 74 }
74 t++; 75 t++;
75 } 76 }
76 if (t!=txt) 77 if (t!=txt)
77 (*fn)(txt, value); 78 (*fn)(txt, value);
78 return 0; 79 return 0;
79} 80}
80 81
81void cgit_global_config_cb(const char *name, const char *value) 82void cgit_global_config_cb(const char *name, const char *value)
82{ 83{
83 if (!strcmp(name, "root")) 84 if (!strcmp(name, "root"))
84 cgit_root = xstrdup(value); 85 cgit_root = xstrdup(value);
85 else if (!strcmp(name, "root-title")) 86 else if (!strcmp(name, "root-title"))
86 cgit_root_title = xstrdup(value); 87 cgit_root_title = xstrdup(value);
87 else if (!strcmp(name, "css")) 88 else if (!strcmp(name, "css"))
88 cgit_css = xstrdup(value); 89 cgit_css = xstrdup(value);
89 else if (!strcmp(name, "logo")) 90 else if (!strcmp(name, "logo"))
90 cgit_logo = xstrdup(value); 91 cgit_logo = xstrdup(value);
91 else if (!strcmp(name, "logo-link")) 92 else if (!strcmp(name, "logo-link"))
92 cgit_logo_link = xstrdup(value); 93 cgit_logo_link = xstrdup(value);
93 else if (!strcmp(name, "virtual-root")) 94 else if (!strcmp(name, "virtual-root"))
94 cgit_virtual_root = xstrdup(value); 95 cgit_virtual_root = xstrdup(value);
95} 96}
96 97
97void cgit_repo_config_cb(const char *name, const char *value) 98void cgit_repo_config_cb(const char *name, const char *value)
98{ 99{
99 if (!strcmp(name, "name")) 100 if (!strcmp(name, "name"))
100 cgit_repo_name = xstrdup(value); 101 cgit_repo_name = xstrdup(value);
101 else if (!strcmp(name, "desc")) 102 else if (!strcmp(name, "desc"))
102 cgit_repo_desc = xstrdup(value); 103 cgit_repo_desc = xstrdup(value);
103 else if (!strcmp(name, "owner")) 104 else if (!strcmp(name, "owner"))
104 cgit_repo_owner = xstrdup(value); 105 cgit_repo_owner = xstrdup(value);
105} 106}
106 107
107void cgit_querystring_cb(const char *name, const char *value) 108void cgit_querystring_cb(const char *name, const char *value)
108{ 109{
109 if (!strcmp(name,"r")) 110 if (!strcmp(name,"r"))
110 cgit_query_repo = xstrdup(value); 111 cgit_query_repo = xstrdup(value);
111 else if (!strcmp(name, "p")) 112 else if (!strcmp(name, "p"))
112 cgit_query_page = xstrdup(value); 113 cgit_query_page = xstrdup(value);
113 else if (!strcmp(name, "h")) { 114 else if (!strcmp(name, "h")) {
114 cgit_query_head = xstrdup(value); 115 cgit_query_head = xstrdup(value);
115 cgit_query_has_symref = 1; 116 cgit_query_has_symref = 1;
116 } else if (!strcmp(name, "id")) { 117 } else if (!strcmp(name, "id")) {
117 cgit_query_sha1 = xstrdup(value); 118 cgit_query_sha1 = xstrdup(value);
118 cgit_query_has_sha1 = 1; 119 cgit_query_has_sha1 = 1;
119 } 120 }
120} 121}
121 122
122char *cgit_repourl(const char *reponame) 123char *cgit_repourl(const char *reponame)
123{ 124{
124 if (cgit_virtual_root) { 125 if (cgit_virtual_root) {
125 return fmt("%s/%s/", cgit_virtual_root, reponame); 126 return fmt("%s/%s/", cgit_virtual_root, reponame);
126 } else { 127 } else {
127 return fmt("?r=%s", reponame); 128 return fmt("?r=%s", reponame);
128 } 129 }
129} 130}
@@ -372,137 +373,143 @@ static void cgit_print_log(const char *tip, int ofs, int cnt)
372 rev.verbose_header = 1; 373 rev.verbose_header = 1;
373 rev.show_root_diff = 0; 374 rev.show_root_diff = 0;
374 setup_revisions(2, argv, &rev, NULL); 375 setup_revisions(2, argv, &rev, NULL);
375 prepare_revision_walk(&rev); 376 prepare_revision_walk(&rev);
376 377
377 html("<h2>Log</h2>"); 378 html("<h2>Log</h2>");
378 html("<table class='list'>"); 379 html("<table class='list'>");
379 html("<tr><th>Date</th><th>Message</th><th>Author</th></tr>\n"); 380 html("<tr><th>Date</th><th>Message</th><th>Author</th></tr>\n");
380 while ((commit = get_revision(&rev)) != NULL && n++ < 100) { 381 while ((commit = get_revision(&rev)) != NULL && n++ < 100) {
381 cgit_print_commit_shortlog(commit); 382 cgit_print_commit_shortlog(commit);
382 free(commit->buffer); 383 free(commit->buffer);
383 commit->buffer = NULL; 384 commit->buffer = NULL;
384 free_commit_list(commit->parents); 385 free_commit_list(commit->parents);
385 commit->parents = NULL; 386 commit->parents = NULL;
386 } 387 }
387 html("</table>\n"); 388 html("</table>\n");
388} 389}
389 390
390static void cgit_print_repo_summary() 391static void cgit_print_repo_summary()
391{ 392{
392 html("<h2>"); 393 html("<h2>");
393 html_txt("Repo summary page"); 394 html_txt("Repo summary page");
394 html("</h2>"); 395 html("</h2>");
395 cgit_print_branches(); 396 cgit_print_branches();
396} 397}
397 398
398static void cgit_print_object(char *hex) 399static void cgit_print_object(char *hex)
399{ 400{
400 unsigned char sha1[20]; 401 unsigned char sha1[20];
401 //struct object *object; 402 //struct object *object;
402 char type[20]; 403 char type[20];
403 unsigned char *buf; 404 unsigned char *buf;
404 unsigned long size; 405 unsigned long size;
405 406
406 if (get_sha1_hex(hex, sha1)){ 407 if (get_sha1_hex(hex, sha1)){
407 htmlf(cgit_error, "Bad hex value"); 408 htmlf(cgit_error, "Bad hex value");
408 return; 409 return;
409 } 410 }
410 411
411 if (sha1_object_info(sha1, type, NULL)){ 412 if (sha1_object_info(sha1, type, NULL)){
412 htmlf(cgit_error, "Bad object name"); 413 htmlf(cgit_error, "Bad object name");
413 return; 414 return;
414 } 415 }
415 416
416 buf = read_sha1_file(sha1, type, &size); 417 buf = read_sha1_file(sha1, type, &size);
417 if (!buf) { 418 if (!buf) {
418 htmlf(cgit_error, "Error reading object"); 419 htmlf(cgit_error, "Error reading object");
419 return; 420 return;
420 } 421 }
421 422
422 buf[size] = '\0'; 423 buf[size] = '\0';
423 html("<h2>Object view</h2>"); 424 html("<h2>Object view</h2>");
424 htmlf("sha1=%s<br/>type=%s<br/>size=%i<br/>", hex, type, size); 425 htmlf("sha1=%s<br/>type=%s<br/>size=%i<br/>", hex, type, size);
425 html("<pre>"); 426 html("<pre>");
426 html_txt(buf); 427 html_txt(buf);
427 html("</pre>"); 428 html("</pre>");
428} 429}
429 430
430static void cgit_print_repo_page() 431static void cgit_print_repo_page()
431{ 432{
432 if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || 433 if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) ||
433 cgit_read_config("info/cgit", cgit_repo_config_cb)) { 434 cgit_read_config("info/cgit", cgit_repo_config_cb)) {
434 char *title = fmt("%s - %s", cgit_root_title, "Bad request"); 435 char *title = fmt("%s - %s", cgit_root_title, "Bad request");
435 cgit_print_docstart(title); 436 cgit_print_docstart(title);
436 cgit_print_pageheader(title); 437 cgit_print_pageheader(title);
437 htmlf(cgit_lib_error, "Unable to scan repository", 438 htmlf(cgit_lib_error, "Unable to scan repository",
438 strerror(errno)); 439 strerror(errno));
439 cgit_print_docend(); 440 cgit_print_docend();
440 return; 441 return;
441 } 442 }
442 setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1); 443 setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1);
443 char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc); 444 char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc);
444 cgit_print_docstart(title); 445 cgit_print_docstart(title);
445 cgit_print_pageheader(title); 446 cgit_print_pageheader(title);
446 if (!cgit_query_page) 447 if (!cgit_query_page)
447 cgit_print_repo_summary(); 448 cgit_print_repo_summary();
448 else if (!strcmp(cgit_query_page, "log")) { 449 else if (!strcmp(cgit_query_page, "log")) {
449 cgit_print_log(cgit_query_head, 0, 100); 450 cgit_print_log(cgit_query_head, 0, 100);
450 } else if (!strcmp(cgit_query_page, "view")) { 451 } else if (!strcmp(cgit_query_page, "view")) {
451 cgit_print_object(cgit_query_sha1); 452 cgit_print_object(cgit_query_sha1);
452 } 453 }
453 cgit_print_docend(); 454 cgit_print_docend();
454} 455}
455 456
456static void cgit_fill_cache(struct cacheitem *item) 457static void cgit_fill_cache(struct cacheitem *item)
457{ 458{
458 htmlfd = item->fd; 459 htmlfd = item->fd;
459 item->st.st_mtime = time(NULL); 460 item->st.st_mtime = time(NULL);
460 if (cgit_query_repo) 461 if (cgit_query_repo)
461 cgit_print_repo_page(); 462 cgit_print_repo_page();
462 else 463 else
463 cgit_print_repolist(); 464 cgit_print_repolist();
464} 465}
465 466
466static void cgit_refresh_cache(struct cacheitem *item) 467static void cgit_refresh_cache(struct cacheitem *item)
467{ 468{
469 int i = 0;
470
468 cache_prepare(item); 471 cache_prepare(item);
469 top: 472 top:
473 if (++i > cgit_max_lock_attempts) {
474 die("cgit_refresh_cache: unable to lock %s: %s",
475 item->name, strerror(errno));
476 }
470 if (!cache_exist(item)) { 477 if (!cache_exist(item)) {
471 if (!cache_lock(item)) { 478 if (!cache_lock(item)) {
472 sched_yield(); 479 sleep(1);
473 goto top; 480 goto top;
474 } 481 }
475 if (!cache_exist(item)) 482 if (!cache_exist(item))
476 cgit_fill_cache(item); 483 cgit_fill_cache(item);
477 cache_unlock(item); 484 cache_unlock(item);
478 } else if (cache_expired(item) && cache_lock(item)) { 485 } else if (cache_expired(item) && cache_lock(item)) {
479 if (cache_expired(item)) 486 if (cache_expired(item))
480 cgit_fill_cache(item); 487 cgit_fill_cache(item);
481 cache_unlock(item); 488 cache_unlock(item);
482 } 489 }
483} 490}
484 491
485static void cgit_print_cache(struct cacheitem *item) 492static void cgit_print_cache(struct cacheitem *item)
486{ 493{
487 static char buf[4096]; 494 static char buf[4096];
488 ssize_t i; 495 ssize_t i;
489 496
490 int fd = open(item->name, O_RDONLY); 497 int fd = open(item->name, O_RDONLY);
491 if (fd<0) 498 if (fd<0)
492 die("Unable to open cached file %s", item->name); 499 die("Unable to open cached file %s", item->name);
493 500
494 while((i=read(fd, buf, sizeof(buf))) > 0) 501 while((i=read(fd, buf, sizeof(buf))) > 0)
495 write(STDOUT_FILENO, buf, i); 502 write(STDOUT_FILENO, buf, i);
496 503
497 close(fd); 504 close(fd);
498} 505}
499 506
500int main(int argc, const char **argv) 507int main(int argc, const char **argv)
501{ 508{
502 cgit_read_config("/etc/cgitrc", cgit_global_config_cb); 509 cgit_read_config("/etc/cgitrc", cgit_global_config_cb);
503 cgit_querystring = xstrdup(getenv("QUERY_STRING")); 510 cgit_querystring = xstrdup(getenv("QUERY_STRING"));
504 cgit_parse_query(cgit_querystring, cgit_querystring_cb); 511 cgit_parse_query(cgit_querystring, cgit_querystring_cb);
505 cgit_refresh_cache(&cacheitem); 512 cgit_refresh_cache(&cacheitem);
506 cgit_print_cache(&cacheitem); 513 cgit_print_cache(&cacheitem);
507 return 0; 514 return 0;
508} 515}