Web interface starts to reflect user rights properly:

[disorder] / server / cgimain.c

diff --git a/server/cgimain.c b/server/cgimain.c
index 61f808f680ff4c2d7378329a3186d54736b7240b..53f7a9bac6189e37df639ed1f78594d3d41916c5 100644 (file)
--- a/server/cgimain.c
+++ b/server/cgimain.c
@@ -33,13 +33,51 @@
 #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 <a href="http://tools.ietf.org/html/rfc3875">RFC 3875</a>.
+ */
+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 *cookie_env, *conf;
@@ -54,12 +92,13 @@ int main(int argc, char **argv) {
   if((conf = getenv("DISORDER_CONFIG"))) configfile = xstrdup(conf);
   if(getenv("DISORDER_DEBUG")) debugging = 1;
   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); 
+  output.sink = sink_stdio("stdout", stdout);
   /* See if there's a cookie */
   cookie_env = getenv("HTTP_COOKIE");
   if(cookie_env) {
@@ -72,11 +111,8 @@ int main(int argc, char **argv) {
        login_cookie = cd.cookies[n].value;
     }
   }
-  /* Log in with the cookie if possible otherwise as guest */
-  if(disorder_connect_cookie(g.client, login_cookie)) {
-    disorder_cgi_error(&output, &s, "connect");
-    return 0;
-  }
+  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;