* @brief DisOrder CGI
*/
-#include <config.h>
-#include "types.h"
-
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <locale.h>
-#include <string.h>
-#include <stdarg.h>
-
-#include "client.h"
-#include "sink.h"
-#include "hash.h"
-#include "mem.h"
-#include "log.h"
-#include "configuration.h"
-#include "disorder.h"
-#include "api-client.h"
-#include "mime.h"
-#include "printf.h"
-#include "url.h"
-#include "macros.h"
-#include "macros-disorder.h"
-#include "cgi.h"
-#include "actions.h"
-#include "defs.h"
-
-/** @brief Return true if @p a is better than @p b
- *
- * NB. We don't bother checking if the path is right, we merely check for the
- * longest path. This isn't a security hole: if the browser wants to send us
- * bad cookies it's quite capable of sending just the right path anyway. The
- * point of choosing the longest path is to avoid using a cookie set by another
- * CGI script which shares a path prefix with us, which would allow it to
- * maliciously log users out.
- *
- * Such a script could still "maliciously" log someone in, if it had acquired a
- * suitable cookie. But it could just log in directly if it had that, so there
- * is no obvious vulnerability here either.
- */
-static int better_cookie(const struct cookie *a, const struct cookie *b) {
- if(a->path && b->path)
- /* If both have a path then the one with the longest path is best */
- return strlen(a->path) > strlen(b->path);
- else if(a->path)
- /* If only @p a has a path then it is better */
- return 1;
- else
- /* If neither have a path, or if only @p b has a path, then @p b is
- * better */
- return 0;
-}
+#include "disorder-cgi.h"
int main(int argc, char **argv) {
- const char *cookie_env, *conf;
- int n, best_cookie;
- struct cookiedata cd;
+ const char *conf;
if(argc > 0)
progname = argv[0];
/* RFC 3875 s8.2 recommends rejecting PATH_INFO if we don't make use of
* it. */
+ /* TODO we could make disorder/ACTION equivalent to disorder?action=ACTION */
if(getenv("PATH_INFO")) {
/* TODO it might be nice to link back to the right place... */
printf("Content-Type: text/html\n");
printf("<p>Sorry, PATH_INFO not supported.</p>\n");
exit(0);
}
+ /* Parse CGI arguments */
cgi_init();
/* We allow various things to be overridden from the environment. This is
* intended for debugging and is not a documented feature. */
configfile = xstrdup(conf);
if(getenv("DISORDER_DEBUG"))
debugging = 1;
- if(config_read(0))
+ /* Read configuration */
+ if(config_read(0/*!server*/))
exit(EXIT_FAILURE);
/* Figure out our URL. This can still be overridden from the config file if
* necessary but it shouldn't be necessary in ordinary installations. */
if(!config->url)
config->url = infer_url();
- /* 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)) {
- /* Pick the best available cookie from all those offered */
- best_cookie = -1;
- for(n = 0; n < cd.ncookies; ++n) {
- /* Is this the right cookie? */
- if(strcmp(cd.cookies[n].name, "disorder"))
- continue;
- /* Is it better than anything we've seen so far? */
- if(best_cookie < 0
- || better_cookie(&cd.cookies[n], &cd.cookies[best_cookie]))
- best_cookie = n;
- }
- if(best_cookie != -1)
- login_cookie = cd.cookies[best_cookie].value;
- } else
- error(0, "could not parse cookie field '%s'", cookie_env);
- }
+ /* Pick up the cookie, if there is one */
+ dcgi_get_cookie();
/* Register expansions */
mx_register_builtin();
- register_disorder_expansions();
+ dcgi_expansions();
/* Update search path. We look in the config directory first and the data
* directory second, so that the latter overrides the former. */
mx_search_path(pkgconfdir);
fatal(errno, "error writing to stdout");
/* Create the initial connection, trying the cookie if we found a suitable
* one. */
- disorder_cgi_login();
- /* The main program... */
- disorder_cgi_action(NULL);
+ dcgi_login();
+ /* Do whatever the user wanted */
+ dcgi_action(NULL);
/* In practice if a write fails that probably means the web server went away,
* but we log it anyway. */
if(fclose(stdout) < 0)