X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/320598d40fb55001274c097d4a1a09c31b8d0335..938d815790a53407a3113b183319b985135e1d1d:/server/cgimain.c diff --git a/server/cgimain.c b/server/cgimain.c index 467ed59..53f7a9b 100644 --- a/server/cgimain.c +++ b/server/cgimain.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007 Richard Kettlewell * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ */ #include +#include "types.h" #include #include @@ -32,39 +33,86 @@ #include "client.h" #include "sink.h" #include "cgi.h" -#include "dcgi.h" #include "mem.h" #include "log.h" #include "configuration.h" #include "disorder.h" #include "api-client.h" - +#include "mime.h" +#include "printf.h" +#include "dcgi.h" + +/** @brief Infer the base URL for the web interface if it's not set + * + * See RFC 3875. + */ +static void infer_url(void) { + if(!config->url) { + const char *scheme = "http", *server, *script, *e; + int port; + + /* Figure out the server. 'MUST' be set and we don't cope if it + * is not. */ + if(!(server = getenv("SERVER_NAME"))) + fatal(0, "SERVER_NAME is not set"); + server = xstrdup(server); + + /* Figure out the port. 'MUST' be set but we cope if it is not. */ + if((e = getenv("SERVER_PORT"))) + port = atoi(e); + else + port = 80; + + /* Figure out path to ourselves */ + if(!(script = getenv("SCRIPT_NAME"))) + fatal(0, "SCRIPT_NAME is not set"); + if(script[0] != '/') + fatal(0, "SCRIPT_NAME does not start with a '/'"); + script = xstrdup(script); + + if(port == 80) + byte_xasprintf(&config->url, "%s://%s%s", + scheme, server, script); + else + byte_xasprintf(&config->url, "%s://%s:%d%s", + scheme, server, port, script); + } +} + int main(int argc, char **argv) { - const char *user, *conf; + const char *cookie_env, *conf; dcgi_global g; dcgi_state s; cgi_sink output; + int n; + struct cookiedata cd; if(argc > 0) progname = argv[0]; cgi_parse(); if((conf = getenv("DISORDER_CONFIG"))) configfile = xstrdup(conf); if(getenv("DISORDER_DEBUG")) debugging = 1; - if(config_read()) exit(EXIT_FAILURE); + if(config_read(0)) exit(EXIT_FAILURE); + infer_url(); memset(&g, 0, sizeof g); memset(&s, 0, sizeof s); s.g = &g; g.client = disorder_get_client(); output.quote = 1; - output.sink = sink_stdio("stdout", stdout); - if(!(user = getenv("REMOTE_USER"))) fatal(0, "REMOTE_USER is not set"); - if(disorder_connect(g.client)) { - disorder_cgi_error(&output, &s, "connect"); - return 0; - } - if(disorder_become(g.client, user)) { - disorder_cgi_error(&output, &s, "become"); - return 0; + output.sink = sink_stdio("stdout", stdout); + /* See if there's a cookie */ + cookie_env = getenv("HTTP_COOKIE"); + if(cookie_env) { + /* This will be an HTTP header */ + if(!parse_cookie(cookie_env, &cd)) { + for(n = 0; n < cd.ncookies + && strcmp(cd.cookies[n].name, "disorder"); ++n) + ; + if(n < cd.ncookies) + login_cookie = cd.cookies[n].value; + } } + disorder_cgi_login(&s, &output); + /* TODO RFC 3875 s8.2 recommendations e.g. concerning PATH_INFO */ disorder_cgi(&output, &s); if(fclose(stdout) < 0) fatal(errno, "error closing stdout"); return 0;