snac2

commit 2f3ed55790f5d929a47c9ec956f6bd61a95003f0
parent 3da32bd327642659b6ea96c29a5a581bdfc52ff9
Author: default <nobody@localhost>
Date:   Sat, 24 Jun 2023 08:29:29 +0200

The WWW-Authenticate real also includes the user.

Diffstat:
M
html.c
 | 
13
++++++++++---
M
httpd.c
 | 
4
+++-

2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/html.c b/html.c
@@ -1565,8 +1565,10 @@ int html_get_handler(const xs_dict *req, const char *q_path,
     }
     else
     if (strcmp(p_path, "admin") == 0) { /** private timeline **/
-        if (!login(&snac, req))
+        if (!login(&snac, req)) {
+            *body  = xs_dup(uid);
             status = 401;
+        }
         else {
             if (cache && history_mtime(&snac, "timeline.html_") > timeline_mtime(&snac)) {
                 snac_debug(&snac, 1, xs_fmt("serving cached timeline"));
@@ -1593,8 +1595,10 @@ int html_get_handler(const xs_dict *req, const char *q_path,
     }
     else
     if (strcmp(p_path, "people") == 0) { /** the list of people **/
-        if (!login(&snac, req))
+        if (!login(&snac, req)) {
+            *body  = xs_dup(uid);
             status = 401;
+        }
         else {
             *body   = html_people(&snac);
             *b_size = strlen(*body);
@@ -1603,8 +1607,10 @@ int html_get_handler(const xs_dict *req, const char *q_path,
     }
     else
     if (strcmp(p_path, "notifications") == 0) { /** the list of notifications **/
-        if (!login(&snac, req))
+        if (!login(&snac, req)) {
+            *body  = xs_dup(uid);
             status = 401;
+        }
         else {
             *body   = html_notifications(&snac);
             *b_size = strlen(*body);
@@ -1758,6 +1764,7 @@ int html_post_handler(const xs_dict *req, const char *q_path,
     /* all posts must be authenticated */
     if (!login(&snac, req)) {
         user_free(&snac);
+        *body  = xs_dup(uid);
         return 401;
     }
 
diff --git a/httpd.c b/httpd.c
@@ -251,7 +251,9 @@ void httpd_connection(FILE *f)
         headers = xs_dict_append(headers, "location", body);
 
     if (status == 401) {
-        xs *www_auth = xs_fmt("Basic realm=\"%s snac login\"", xs_dict_get(srv_config, "host"));
+        xs *www_auth = xs_fmt("Basic realm=\"@%s@%s snac login\"",
+                                body, xs_dict_get(srv_config, "host"));
+
         headers = xs_dict_append(headers, "WWW-Authenticate", www_auth);
     }