Avoid a crash if there is no index configured

[cascardo/atompub.git] / frontend / cgi / cgi.c

diff --git a/frontend/cgi/cgi.c b/frontend/cgi/cgi.c
index 238ac39..7b8ac55 100644 (file)
--- a/frontend/cgi/cgi.c
+++ b/frontend/cgi/cgi.c
@@ -33,35 +33,43 @@ cgi_serve_request (AtomCtx *ctx)
     return;
   if (path == NULL)
     {
-      path = atom_config_get_str (ctx, "cgi", "index");
+      if ((path = atom_config_get_str (ctx, "cgi", "index")) == NULL)
+        {
+          /* We do not want to disclose our configuration is empty.
+           * The requester cannot distinguish an empty configuration
+           * from a non-existent index.
+           */
+          fprintf (stdout, "Status: 404 Not Found\n\n");
+        }
     }
   if (!strcmp (method, "GET"))
     {
-      IRI *iri = iri_new ();
-      Atom *atom;
-      GError *error;
-      iri_set_path (iri, path);
-      atom = atom_retrieve_resource (ctx, iri);
-      iri_delete (iri);
+      AtomID *id;
+      AtomResource *atom;
+      AtomError *error;
+      id = atom_id_new (path);
+      atom = atom_retrieve_resource (ctx, id);
+      atom_id_delete (id);
       if (atom)
        {
+         char * str;
+         size_t len;
          char *header = "Content-type: application/atom+xml\n\n";
          write (1, header, strlen (header));
-         write (1, atom_string (atom), atom_len (atom));
-         atom_delete (atom);
+         atom_resource_string (atom, &str, &len);
+         write (1, str, len);
+         g_free (str);
+         atom_resource_delete (atom);
        }
       else if ((error = atom_error_get (ctx)) != NULL)
        {
-         if (error->domain == G_FILE_ERROR &&
-             (error->code == G_FILE_ERROR_EXIST ||
-              error->code == G_FILE_ERROR_ACCES ||
-              error->code == G_FILE_ERROR_PERM))
-           fprintf (stdout, "Status: 403 %s\n\n", error->message);
-         else if (error->domain == G_FILE_ERROR &&
-                  error->code == G_FILE_ERROR_NOENT)
-           fprintf (stdout, "Status: 404 %s\n\n", error->message);
-         else
-           fprintf (stdout, "Status: 500 %s\n\n", error->message);
+         int code = atom_error_code (error);
+         char *message = atom_error_message (error);
+         fprintf (stdout, "Status: %d %s\n\n%s\n", code, message, message);
+       }
+      else
+        {
+         fprintf (stdout, "Status: 500 Server error\n\nServer error\n");
        }
     }
   else