author | Lars Hjemli <hjemli@gmail.com> | 2009-01-11 20:23:04 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-11 20:23:04 (UTC) |
commit | eb14609dc46461728a065c0a243b338fc32fd762 (patch) (unidiff) | |
tree | f00563342db8859f46ac8141fdaa5d4e17eb940e /cgit.c | |
parent | 720b6ece90900df9f836a45d8e7f1cd56f62400a (diff) | |
download | cgit-eb14609dc46461728a065c0a243b338fc32fd762.zip cgit-eb14609dc46461728a065c0a243b338fc32fd762.tar.gz cgit-eb14609dc46461728a065c0a243b338fc32fd762.tar.bz2 |
Avoid SEGFAULT on invalid requests
When an unknown page is requested, either on the querystring or via
PATH_INFO, we end up with a null-referencing cgit_cmd. This null-
pointer is then used as argument to the hc() function (which decides
what tab to render as 'active'), but this function failed to check if a
valid cmd was specified and a SEGFAULT would occur. This patch fixes the
issue by introducing a 'fallback-cmd' which specifies what tab to render
as 'active' when no valid cmd is requested.
While at it, we now also keep track of the active repository even if an
invalid cmd was requested since we want to show the error message about
the invalid request in the correct context.
Noticed-by: Robin Redeker <elmex@ta-sa.org>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -100,373 +100,372 @@ void config_cb(const char *name, const char *value) | |||
100 | ctx.repo->path = trim_end(value, '/'); | 100 | ctx.repo->path = trim_end(value, '/'); |
101 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) | 101 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
102 | ctx.repo->clone_url = xstrdup(value); | 102 | ctx.repo->clone_url = xstrdup(value); |
103 | else if (ctx.repo && !strcmp(name, "repo.desc")) | 103 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
104 | ctx.repo->desc = xstrdup(value); | 104 | ctx.repo->desc = xstrdup(value); |
105 | else if (ctx.repo && !strcmp(name, "repo.owner")) | 105 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
106 | ctx.repo->owner = xstrdup(value); | 106 | ctx.repo->owner = xstrdup(value); |
107 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) | 107 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
108 | ctx.repo->defbranch = xstrdup(value); | 108 | ctx.repo->defbranch = xstrdup(value); |
109 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) | 109 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
110 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | 110 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
111 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) | 111 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
112 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 112 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
113 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) | 113 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
114 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 114 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
115 | else if (ctx.repo && !strcmp(name, "repo.module-link")) | 115 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
116 | ctx.repo->module_link= xstrdup(value); | 116 | ctx.repo->module_link= xstrdup(value); |
117 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { | 117 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
118 | if (*value == '/') | 118 | if (*value == '/') |
119 | ctx.repo->readme = xstrdup(value); | 119 | ctx.repo->readme = xstrdup(value); |
120 | else | 120 | else |
121 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); | 121 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
122 | } else if (!strcmp(name, "include")) | 122 | } else if (!strcmp(name, "include")) |
123 | parse_configfile(value, config_cb); | 123 | parse_configfile(value, config_cb); |
124 | } | 124 | } |
125 | 125 | ||
126 | static void querystring_cb(const char *name, const char *value) | 126 | static void querystring_cb(const char *name, const char *value) |
127 | { | 127 | { |
128 | if (!strcmp(name,"r")) { | 128 | if (!strcmp(name,"r")) { |
129 | ctx.qry.repo = xstrdup(value); | 129 | ctx.qry.repo = xstrdup(value); |
130 | ctx.repo = cgit_get_repoinfo(value); | 130 | ctx.repo = cgit_get_repoinfo(value); |
131 | } else if (!strcmp(name, "p")) { | 131 | } else if (!strcmp(name, "p")) { |
132 | ctx.qry.page = xstrdup(value); | 132 | ctx.qry.page = xstrdup(value); |
133 | } else if (!strcmp(name, "url")) { | 133 | } else if (!strcmp(name, "url")) { |
134 | ctx.qry.url = xstrdup(value); | 134 | ctx.qry.url = xstrdup(value); |
135 | cgit_parse_url(value); | 135 | cgit_parse_url(value); |
136 | } else if (!strcmp(name, "qt")) { | 136 | } else if (!strcmp(name, "qt")) { |
137 | ctx.qry.grep = xstrdup(value); | 137 | ctx.qry.grep = xstrdup(value); |
138 | } else if (!strcmp(name, "q")) { | 138 | } else if (!strcmp(name, "q")) { |
139 | ctx.qry.search = xstrdup(value); | 139 | ctx.qry.search = xstrdup(value); |
140 | } else if (!strcmp(name, "h")) { | 140 | } else if (!strcmp(name, "h")) { |
141 | ctx.qry.head = xstrdup(value); | 141 | ctx.qry.head = xstrdup(value); |
142 | ctx.qry.has_symref = 1; | 142 | ctx.qry.has_symref = 1; |
143 | } else if (!strcmp(name, "id")) { | 143 | } else if (!strcmp(name, "id")) { |
144 | ctx.qry.sha1 = xstrdup(value); | 144 | ctx.qry.sha1 = xstrdup(value); |
145 | ctx.qry.has_sha1 = 1; | 145 | ctx.qry.has_sha1 = 1; |
146 | } else if (!strcmp(name, "id2")) { | 146 | } else if (!strcmp(name, "id2")) { |
147 | ctx.qry.sha2 = xstrdup(value); | 147 | ctx.qry.sha2 = xstrdup(value); |
148 | ctx.qry.has_sha1 = 1; | 148 | ctx.qry.has_sha1 = 1; |
149 | } else if (!strcmp(name, "ofs")) { | 149 | } else if (!strcmp(name, "ofs")) { |
150 | ctx.qry.ofs = atoi(value); | 150 | ctx.qry.ofs = atoi(value); |
151 | } else if (!strcmp(name, "path")) { | 151 | } else if (!strcmp(name, "path")) { |
152 | ctx.qry.path = trim_end(value, '/'); | 152 | ctx.qry.path = trim_end(value, '/'); |
153 | } else if (!strcmp(name, "name")) { | 153 | } else if (!strcmp(name, "name")) { |
154 | ctx.qry.name = xstrdup(value); | 154 | ctx.qry.name = xstrdup(value); |
155 | } else if (!strcmp(name, "mimetype")) { | 155 | } else if (!strcmp(name, "mimetype")) { |
156 | ctx.qry.mimetype = xstrdup(value); | 156 | ctx.qry.mimetype = xstrdup(value); |
157 | } | 157 | } |
158 | } | 158 | } |
159 | 159 | ||
160 | static void prepare_context(struct cgit_context *ctx) | 160 | static void prepare_context(struct cgit_context *ctx) |
161 | { | 161 | { |
162 | memset(ctx, 0, sizeof(ctx)); | 162 | memset(ctx, 0, sizeof(ctx)); |
163 | ctx->cfg.agefile = "info/web/last-modified"; | 163 | ctx->cfg.agefile = "info/web/last-modified"; |
164 | ctx->cfg.nocache = 0; | 164 | ctx->cfg.nocache = 0; |
165 | ctx->cfg.cache_size = 0; | 165 | ctx->cfg.cache_size = 0; |
166 | ctx->cfg.cache_dynamic_ttl = 5; | 166 | ctx->cfg.cache_dynamic_ttl = 5; |
167 | ctx->cfg.cache_max_create_time = 5; | 167 | ctx->cfg.cache_max_create_time = 5; |
168 | ctx->cfg.cache_repo_ttl = 5; | 168 | ctx->cfg.cache_repo_ttl = 5; |
169 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 169 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
170 | ctx->cfg.cache_root_ttl = 5; | 170 | ctx->cfg.cache_root_ttl = 5; |
171 | ctx->cfg.cache_static_ttl = -1; | 171 | ctx->cfg.cache_static_ttl = -1; |
172 | ctx->cfg.css = "/cgit.css"; | 172 | ctx->cfg.css = "/cgit.css"; |
173 | ctx->cfg.logo = "/git-logo.png"; | 173 | ctx->cfg.logo = "/git-logo.png"; |
174 | ctx->cfg.local_time = 0; | 174 | ctx->cfg.local_time = 0; |
175 | ctx->cfg.max_repo_count = 50; | 175 | ctx->cfg.max_repo_count = 50; |
176 | ctx->cfg.max_commit_count = 50; | 176 | ctx->cfg.max_commit_count = 50; |
177 | ctx->cfg.max_lock_attempts = 5; | 177 | ctx->cfg.max_lock_attempts = 5; |
178 | ctx->cfg.max_msg_len = 80; | 178 | ctx->cfg.max_msg_len = 80; |
179 | ctx->cfg.max_repodesc_len = 80; | 179 | ctx->cfg.max_repodesc_len = 80; |
180 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 180 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
181 | ctx->cfg.renamelimit = -1; | 181 | ctx->cfg.renamelimit = -1; |
182 | ctx->cfg.robots = "index, nofollow"; | 182 | ctx->cfg.robots = "index, nofollow"; |
183 | ctx->cfg.root_title = "Git repository browser"; | 183 | ctx->cfg.root_title = "Git repository browser"; |
184 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 184 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
185 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 185 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
186 | ctx->cfg.summary_branches = 10; | 186 | ctx->cfg.summary_branches = 10; |
187 | ctx->cfg.summary_log = 10; | 187 | ctx->cfg.summary_log = 10; |
188 | ctx->cfg.summary_tags = 10; | 188 | ctx->cfg.summary_tags = 10; |
189 | ctx->page.mimetype = "text/html"; | 189 | ctx->page.mimetype = "text/html"; |
190 | ctx->page.charset = PAGE_ENCODING; | 190 | ctx->page.charset = PAGE_ENCODING; |
191 | ctx->page.filename = NULL; | 191 | ctx->page.filename = NULL; |
192 | ctx->page.size = 0; | 192 | ctx->page.size = 0; |
193 | ctx->page.modified = time(NULL); | 193 | ctx->page.modified = time(NULL); |
194 | ctx->page.expires = ctx->page.modified; | 194 | ctx->page.expires = ctx->page.modified; |
195 | } | 195 | } |
196 | 196 | ||
197 | struct refmatch { | 197 | struct refmatch { |
198 | char *req_ref; | 198 | char *req_ref; |
199 | char *first_ref; | 199 | char *first_ref; |
200 | int match; | 200 | int match; |
201 | }; | 201 | }; |
202 | 202 | ||
203 | int find_current_ref(const char *refname, const unsigned char *sha1, | 203 | int find_current_ref(const char *refname, const unsigned char *sha1, |
204 | int flags, void *cb_data) | 204 | int flags, void *cb_data) |
205 | { | 205 | { |
206 | struct refmatch *info; | 206 | struct refmatch *info; |
207 | 207 | ||
208 | info = (struct refmatch *)cb_data; | 208 | info = (struct refmatch *)cb_data; |
209 | if (!strcmp(refname, info->req_ref)) | 209 | if (!strcmp(refname, info->req_ref)) |
210 | info->match = 1; | 210 | info->match = 1; |
211 | if (!info->first_ref) | 211 | if (!info->first_ref) |
212 | info->first_ref = xstrdup(refname); | 212 | info->first_ref = xstrdup(refname); |
213 | return info->match; | 213 | return info->match; |
214 | } | 214 | } |
215 | 215 | ||
216 | char *find_default_branch(struct cgit_repo *repo) | 216 | char *find_default_branch(struct cgit_repo *repo) |
217 | { | 217 | { |
218 | struct refmatch info; | 218 | struct refmatch info; |
219 | char *ref; | 219 | char *ref; |
220 | 220 | ||
221 | info.req_ref = repo->defbranch; | 221 | info.req_ref = repo->defbranch; |
222 | info.first_ref = NULL; | 222 | info.first_ref = NULL; |
223 | info.match = 0; | 223 | info.match = 0; |
224 | for_each_branch_ref(find_current_ref, &info); | 224 | for_each_branch_ref(find_current_ref, &info); |
225 | if (info.match) | 225 | if (info.match) |
226 | ref = info.req_ref; | 226 | ref = info.req_ref; |
227 | else | 227 | else |
228 | ref = info.first_ref; | 228 | ref = info.first_ref; |
229 | if (ref) | 229 | if (ref) |
230 | ref = xstrdup(ref); | 230 | ref = xstrdup(ref); |
231 | return ref; | 231 | return ref; |
232 | } | 232 | } |
233 | 233 | ||
234 | static int prepare_repo_cmd(struct cgit_context *ctx) | 234 | static int prepare_repo_cmd(struct cgit_context *ctx) |
235 | { | 235 | { |
236 | char *tmp; | 236 | char *tmp; |
237 | unsigned char sha1[20]; | 237 | unsigned char sha1[20]; |
238 | int nongit = 0; | 238 | int nongit = 0; |
239 | 239 | ||
240 | setenv("GIT_DIR", ctx->repo->path, 1); | 240 | setenv("GIT_DIR", ctx->repo->path, 1); |
241 | setup_git_directory_gently(&nongit); | 241 | setup_git_directory_gently(&nongit); |
242 | if (nongit) { | 242 | if (nongit) { |
243 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, | 243 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, |
244 | "config error"); | 244 | "config error"); |
245 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); | 245 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); |
246 | ctx->repo = NULL; | 246 | ctx->repo = NULL; |
247 | cgit_print_http_headers(ctx); | 247 | cgit_print_http_headers(ctx); |
248 | cgit_print_docstart(ctx); | 248 | cgit_print_docstart(ctx); |
249 | cgit_print_pageheader(ctx); | 249 | cgit_print_pageheader(ctx); |
250 | cgit_print_error(tmp); | 250 | cgit_print_error(tmp); |
251 | cgit_print_docend(); | 251 | cgit_print_docend(); |
252 | return 1; | 252 | return 1; |
253 | } | 253 | } |
254 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); | 254 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); |
255 | 255 | ||
256 | if (!ctx->qry.head) { | 256 | if (!ctx->qry.head) { |
257 | ctx->qry.nohead = 1; | 257 | ctx->qry.nohead = 1; |
258 | ctx->qry.head = find_default_branch(ctx->repo); | 258 | ctx->qry.head = find_default_branch(ctx->repo); |
259 | ctx->repo->defbranch = ctx->qry.head; | 259 | ctx->repo->defbranch = ctx->qry.head; |
260 | } | 260 | } |
261 | 261 | ||
262 | if (!ctx->qry.head) { | 262 | if (!ctx->qry.head) { |
263 | cgit_print_http_headers(ctx); | 263 | cgit_print_http_headers(ctx); |
264 | cgit_print_docstart(ctx); | 264 | cgit_print_docstart(ctx); |
265 | cgit_print_pageheader(ctx); | 265 | cgit_print_pageheader(ctx); |
266 | cgit_print_error("Repository seems to be empty"); | 266 | cgit_print_error("Repository seems to be empty"); |
267 | cgit_print_docend(); | 267 | cgit_print_docend(); |
268 | return 1; | 268 | return 1; |
269 | } | 269 | } |
270 | 270 | ||
271 | if (get_sha1(ctx->qry.head, sha1)) { | 271 | if (get_sha1(ctx->qry.head, sha1)) { |
272 | tmp = xstrdup(ctx->qry.head); | 272 | tmp = xstrdup(ctx->qry.head); |
273 | ctx->qry.head = ctx->repo->defbranch; | 273 | ctx->qry.head = ctx->repo->defbranch; |
274 | cgit_print_http_headers(ctx); | 274 | cgit_print_http_headers(ctx); |
275 | cgit_print_docstart(ctx); | 275 | cgit_print_docstart(ctx); |
276 | cgit_print_pageheader(ctx); | 276 | cgit_print_pageheader(ctx); |
277 | cgit_print_error(fmt("Invalid branch: %s", tmp)); | 277 | cgit_print_error(fmt("Invalid branch: %s", tmp)); |
278 | cgit_print_docend(); | 278 | cgit_print_docend(); |
279 | return 1; | 279 | return 1; |
280 | } | 280 | } |
281 | return 0; | 281 | return 0; |
282 | } | 282 | } |
283 | 283 | ||
284 | static void process_request(void *cbdata) | 284 | static void process_request(void *cbdata) |
285 | { | 285 | { |
286 | struct cgit_context *ctx = cbdata; | 286 | struct cgit_context *ctx = cbdata; |
287 | struct cgit_cmd *cmd; | 287 | struct cgit_cmd *cmd; |
288 | 288 | ||
289 | cmd = cgit_get_cmd(ctx); | 289 | cmd = cgit_get_cmd(ctx); |
290 | if (!cmd) { | 290 | if (!cmd) { |
291 | ctx->page.title = "cgit error"; | 291 | ctx->page.title = "cgit error"; |
292 | ctx->repo = NULL; | ||
293 | cgit_print_http_headers(ctx); | 292 | cgit_print_http_headers(ctx); |
294 | cgit_print_docstart(ctx); | 293 | cgit_print_docstart(ctx); |
295 | cgit_print_pageheader(ctx); | 294 | cgit_print_pageheader(ctx); |
296 | cgit_print_error("Invalid request"); | 295 | cgit_print_error("Invalid request"); |
297 | cgit_print_docend(); | 296 | cgit_print_docend(); |
298 | return; | 297 | return; |
299 | } | 298 | } |
300 | 299 | ||
301 | if (cmd->want_repo && !ctx->repo) { | 300 | if (cmd->want_repo && !ctx->repo) { |
302 | cgit_print_http_headers(ctx); | 301 | cgit_print_http_headers(ctx); |
303 | cgit_print_docstart(ctx); | 302 | cgit_print_docstart(ctx); |
304 | cgit_print_pageheader(ctx); | 303 | cgit_print_pageheader(ctx); |
305 | cgit_print_error(fmt("No repository selected")); | 304 | cgit_print_error(fmt("No repository selected")); |
306 | cgit_print_docend(); | 305 | cgit_print_docend(); |
307 | return; | 306 | return; |
308 | } | 307 | } |
309 | 308 | ||
310 | if (ctx->repo && prepare_repo_cmd(ctx)) | 309 | if (ctx->repo && prepare_repo_cmd(ctx)) |
311 | return; | 310 | return; |
312 | 311 | ||
313 | if (cmd->want_layout) { | 312 | if (cmd->want_layout) { |
314 | cgit_print_http_headers(ctx); | 313 | cgit_print_http_headers(ctx); |
315 | cgit_print_docstart(ctx); | 314 | cgit_print_docstart(ctx); |
316 | cgit_print_pageheader(ctx); | 315 | cgit_print_pageheader(ctx); |
317 | } | 316 | } |
318 | 317 | ||
319 | cmd->fn(ctx); | 318 | cmd->fn(ctx); |
320 | 319 | ||
321 | if (cmd->want_layout) | 320 | if (cmd->want_layout) |
322 | cgit_print_docend(); | 321 | cgit_print_docend(); |
323 | } | 322 | } |
324 | 323 | ||
325 | int cmp_repos(const void *a, const void *b) | 324 | int cmp_repos(const void *a, const void *b) |
326 | { | 325 | { |
327 | const struct cgit_repo *ra = a, *rb = b; | 326 | const struct cgit_repo *ra = a, *rb = b; |
328 | return strcmp(ra->url, rb->url); | 327 | return strcmp(ra->url, rb->url); |
329 | } | 328 | } |
330 | 329 | ||
331 | void print_repo(struct cgit_repo *repo) | 330 | void print_repo(struct cgit_repo *repo) |
332 | { | 331 | { |
333 | printf("repo.url=%s\n", repo->url); | 332 | printf("repo.url=%s\n", repo->url); |
334 | printf("repo.name=%s\n", repo->name); | 333 | printf("repo.name=%s\n", repo->name); |
335 | printf("repo.path=%s\n", repo->path); | 334 | printf("repo.path=%s\n", repo->path); |
336 | if (repo->owner) | 335 | if (repo->owner) |
337 | printf("repo.owner=%s\n", repo->owner); | 336 | printf("repo.owner=%s\n", repo->owner); |
338 | if (repo->desc) | 337 | if (repo->desc) |
339 | printf("repo.desc=%s\n", repo->desc); | 338 | printf("repo.desc=%s\n", repo->desc); |
340 | if (repo->readme) | 339 | if (repo->readme) |
341 | printf("repo.readme=%s\n", repo->readme); | 340 | printf("repo.readme=%s\n", repo->readme); |
342 | printf("\n"); | 341 | printf("\n"); |
343 | } | 342 | } |
344 | 343 | ||
345 | void print_repolist(struct cgit_repolist *list) | 344 | void print_repolist(struct cgit_repolist *list) |
346 | { | 345 | { |
347 | int i; | 346 | int i; |
348 | 347 | ||
349 | for(i = 0; i < list->count; i++) | 348 | for(i = 0; i < list->count; i++) |
350 | print_repo(&list->repos[i]); | 349 | print_repo(&list->repos[i]); |
351 | } | 350 | } |
352 | 351 | ||
353 | 352 | ||
354 | static void cgit_parse_args(int argc, const char **argv) | 353 | static void cgit_parse_args(int argc, const char **argv) |
355 | { | 354 | { |
356 | int i; | 355 | int i; |
357 | int scan = 0; | 356 | int scan = 0; |
358 | 357 | ||
359 | for (i = 1; i < argc; i++) { | 358 | for (i = 1; i < argc; i++) { |
360 | if (!strncmp(argv[i], "--cache=", 8)) { | 359 | if (!strncmp(argv[i], "--cache=", 8)) { |
361 | ctx.cfg.cache_root = xstrdup(argv[i]+8); | 360 | ctx.cfg.cache_root = xstrdup(argv[i]+8); |
362 | } | 361 | } |
363 | if (!strcmp(argv[i], "--nocache")) { | 362 | if (!strcmp(argv[i], "--nocache")) { |
364 | ctx.cfg.nocache = 1; | 363 | ctx.cfg.nocache = 1; |
365 | } | 364 | } |
366 | if (!strncmp(argv[i], "--query=", 8)) { | 365 | if (!strncmp(argv[i], "--query=", 8)) { |
367 | ctx.qry.raw = xstrdup(argv[i]+8); | 366 | ctx.qry.raw = xstrdup(argv[i]+8); |
368 | } | 367 | } |
369 | if (!strncmp(argv[i], "--repo=", 7)) { | 368 | if (!strncmp(argv[i], "--repo=", 7)) { |
370 | ctx.qry.repo = xstrdup(argv[i]+7); | 369 | ctx.qry.repo = xstrdup(argv[i]+7); |
371 | } | 370 | } |
372 | if (!strncmp(argv[i], "--page=", 7)) { | 371 | if (!strncmp(argv[i], "--page=", 7)) { |
373 | ctx.qry.page = xstrdup(argv[i]+7); | 372 | ctx.qry.page = xstrdup(argv[i]+7); |
374 | } | 373 | } |
375 | if (!strncmp(argv[i], "--head=", 7)) { | 374 | if (!strncmp(argv[i], "--head=", 7)) { |
376 | ctx.qry.head = xstrdup(argv[i]+7); | 375 | ctx.qry.head = xstrdup(argv[i]+7); |
377 | ctx.qry.has_symref = 1; | 376 | ctx.qry.has_symref = 1; |
378 | } | 377 | } |
379 | if (!strncmp(argv[i], "--sha1=", 7)) { | 378 | if (!strncmp(argv[i], "--sha1=", 7)) { |
380 | ctx.qry.sha1 = xstrdup(argv[i]+7); | 379 | ctx.qry.sha1 = xstrdup(argv[i]+7); |
381 | ctx.qry.has_sha1 = 1; | 380 | ctx.qry.has_sha1 = 1; |
382 | } | 381 | } |
383 | if (!strncmp(argv[i], "--ofs=", 6)) { | 382 | if (!strncmp(argv[i], "--ofs=", 6)) { |
384 | ctx.qry.ofs = atoi(argv[i]+6); | 383 | ctx.qry.ofs = atoi(argv[i]+6); |
385 | } | 384 | } |
386 | if (!strncmp(argv[i], "--scan-tree=", 12)) { | 385 | if (!strncmp(argv[i], "--scan-tree=", 12)) { |
387 | scan++; | 386 | scan++; |
388 | scan_tree(argv[i] + 12); | 387 | scan_tree(argv[i] + 12); |
389 | } | 388 | } |
390 | } | 389 | } |
391 | if (scan) { | 390 | if (scan) { |
392 | qsort(cgit_repolist.repos, cgit_repolist.count, | 391 | qsort(cgit_repolist.repos, cgit_repolist.count, |
393 | sizeof(struct cgit_repo), cmp_repos); | 392 | sizeof(struct cgit_repo), cmp_repos); |
394 | print_repolist(&cgit_repolist); | 393 | print_repolist(&cgit_repolist); |
395 | exit(0); | 394 | exit(0); |
396 | } | 395 | } |
397 | } | 396 | } |
398 | 397 | ||
399 | static int calc_ttl() | 398 | static int calc_ttl() |
400 | { | 399 | { |
401 | if (!ctx.repo) | 400 | if (!ctx.repo) |
402 | return ctx.cfg.cache_root_ttl; | 401 | return ctx.cfg.cache_root_ttl; |
403 | 402 | ||
404 | if (!ctx.qry.page) | 403 | if (!ctx.qry.page) |
405 | return ctx.cfg.cache_repo_ttl; | 404 | return ctx.cfg.cache_repo_ttl; |
406 | 405 | ||
407 | if (ctx.qry.has_symref) | 406 | if (ctx.qry.has_symref) |
408 | return ctx.cfg.cache_dynamic_ttl; | 407 | return ctx.cfg.cache_dynamic_ttl; |
409 | 408 | ||
410 | if (ctx.qry.has_sha1) | 409 | if (ctx.qry.has_sha1) |
411 | return ctx.cfg.cache_static_ttl; | 410 | return ctx.cfg.cache_static_ttl; |
412 | 411 | ||
413 | return ctx.cfg.cache_repo_ttl; | 412 | return ctx.cfg.cache_repo_ttl; |
414 | } | 413 | } |
415 | 414 | ||
416 | int main(int argc, const char **argv) | 415 | int main(int argc, const char **argv) |
417 | { | 416 | { |
418 | const char *cgit_config_env = getenv("CGIT_CONFIG"); | 417 | const char *cgit_config_env = getenv("CGIT_CONFIG"); |
419 | const char *path; | 418 | const char *path; |
420 | char *qry; | 419 | char *qry; |
421 | int err, ttl; | 420 | int err, ttl; |
422 | 421 | ||
423 | prepare_context(&ctx); | 422 | prepare_context(&ctx); |
424 | cgit_repolist.length = 0; | 423 | cgit_repolist.length = 0; |
425 | cgit_repolist.count = 0; | 424 | cgit_repolist.count = 0; |
426 | cgit_repolist.repos = NULL; | 425 | cgit_repolist.repos = NULL; |
427 | 426 | ||
428 | if (getenv("SCRIPT_NAME")) | 427 | if (getenv("SCRIPT_NAME")) |
429 | ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); | 428 | ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); |
430 | if (getenv("QUERY_STRING")) | 429 | if (getenv("QUERY_STRING")) |
431 | ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); | 430 | ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); |
432 | cgit_parse_args(argc, argv); | 431 | cgit_parse_args(argc, argv); |
433 | parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, | 432 | parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, |
434 | config_cb); | 433 | config_cb); |
435 | ctx.repo = NULL; | 434 | ctx.repo = NULL; |
436 | http_parse_querystring(ctx.qry.raw, querystring_cb); | 435 | http_parse_querystring(ctx.qry.raw, querystring_cb); |
437 | 436 | ||
438 | /* If virtual-root isn't specified in cgitrc and no url | 437 | /* If virtual-root isn't specified in cgitrc and no url |
439 | * parameter is specified on the querystring, lets pretend | 438 | * parameter is specified on the querystring, lets pretend |
440 | * that virtualroot equals SCRIPT_NAME and use PATH_INFO as | 439 | * that virtualroot equals SCRIPT_NAME and use PATH_INFO as |
441 | * url. This allows cgit to work with virtual urls without | 440 | * url. This allows cgit to work with virtual urls without |
442 | * the need for rewriterules in the webserver (as long as | 441 | * the need for rewriterules in the webserver (as long as |
443 | * PATH_INFO is included in the cache lookup key). | 442 | * PATH_INFO is included in the cache lookup key). |
444 | */ | 443 | */ |
445 | if (!ctx.cfg.virtual_root && !ctx.qry.url) { | 444 | if (!ctx.cfg.virtual_root && !ctx.qry.url) { |
446 | ctx.cfg.virtual_root = ctx.cfg.script_name; | 445 | ctx.cfg.virtual_root = ctx.cfg.script_name; |
447 | path = getenv("PATH_INFO"); | 446 | path = getenv("PATH_INFO"); |
448 | if (path) { | 447 | if (path) { |
449 | if (path[0] == '/') | 448 | if (path[0] == '/') |
450 | path++; | 449 | path++; |
451 | ctx.qry.url = xstrdup(path); | 450 | ctx.qry.url = xstrdup(path); |
452 | if (ctx.qry.raw) { | 451 | if (ctx.qry.raw) { |
453 | qry = ctx.qry.raw; | 452 | qry = ctx.qry.raw; |
454 | ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); | 453 | ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); |
455 | free(qry); | 454 | free(qry); |
456 | } else | 455 | } else |
457 | ctx.qry.raw = ctx.qry.url; | 456 | ctx.qry.raw = ctx.qry.url; |
458 | cgit_parse_url(ctx.qry.url); | 457 | cgit_parse_url(ctx.qry.url); |
459 | } | 458 | } |
460 | } | 459 | } |
461 | 460 | ||
462 | ttl = calc_ttl(); | 461 | ttl = calc_ttl(); |
463 | ctx.page.expires += ttl*60; | 462 | ctx.page.expires += ttl*60; |
464 | if (ctx.cfg.nocache) | 463 | if (ctx.cfg.nocache) |
465 | ctx.cfg.cache_size = 0; | 464 | ctx.cfg.cache_size = 0; |
466 | err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, | 465 | err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, |
467 | ctx.qry.raw, ttl, process_request, &ctx); | 466 | ctx.qry.raw, ttl, process_request, &ctx); |
468 | if (err) | 467 | if (err) |
469 | cgit_print_error(fmt("Error processing page: %s (%d)", | 468 | cgit_print_error(fmt("Error processing page: %s (%d)", |
470 | strerror(err), err)); | 469 | strerror(err), err)); |
471 | return err; | 470 | return err; |
472 | } | 471 | } |