11 files changed, 142 insertions, 35 deletions

diff --git a/Makefile b/Makefile
index 6cfa070..6654fe2 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ data.o: data.c xs.h xs_hex.h xs_io.h xs_json.h xs_openssl.h xs_glob.h \
 format.o: format.c xs.h xs_regex.h xs_mime.h xs_html.h xs_json.h \
  xs_time.h snac.h http_codes.h
 html.o: html.c xs.h xs_io.h xs_json.h xs_regex.h xs_set.h xs_openssl.h \
- xs_time.h xs_mime.h xs_match.h xs_html.h snac.h http_codes.h
+ xs_time.h xs_mime.h xs_match.h xs_html.h xs_curl.h snac.h http_codes.h
 http.o: http.c xs.h xs_io.h xs_openssl.h xs_curl.h xs_time.h xs_json.h \
  snac.h http_codes.h
 httpd.o: httpd.c xs.h xs_io.h xs_json.h xs_socket.h xs_unix_socket.h \
diff --git a/Makefile.NetBSD b/Makefile.NetBSD
index 8883949..f4a2f55 100644
--- a/Makefile.NetBSD
+++ b/Makefile.NetBSD
@@ -44,7 +44,7 @@ data.o: data.c xs.h xs_hex.h xs_io.h xs_json.h xs_openssl.h xs_glob.h \
 format.o: format.c xs.h xs_regex.h xs_mime.h xs_html.h xs_json.h \
  xs_time.h snac.h http_codes.h
 html.o: html.c xs.h xs_io.h xs_json.h xs_regex.h xs_set.h xs_openssl.h \
- xs_time.h xs_mime.h xs_match.h xs_html.h snac.h http_codes.h
+ xs_time.h xs_mime.h xs_match.h xs_html.h xs_curl.h snac.h http_codes.h
 http.o: http.c xs.h xs_io.h xs_openssl.h xs_curl.h xs_time.h xs_json.h \
  snac.h http_codes.h
 httpd.o: httpd.c xs.h xs_io.h xs_json.h xs_socket.h xs_unix_socket.h \
diff --git a/TODO.md b/TODO.md
index 80623e4..2e57af8 100644
--- a/TODO.md
+++ b/TODO.md
@@ -348,4 +348,6 @@ Don't show image attachments which URLs are already in the post content (2.62, 2
 
 Add a user option to always collapse first level threads (2.62, 2024-10-28T14:50:42+0100).
 
-Add a 'disable_block_notifications' flag to server settings (2.62, 2024-10-30T16:58:16+0100).
+Add a `disable_block_notifications` flag to server settings (2.62, 2024-10-30T16:58:16+0100).
+
+The `strict_public_timelines` is broken, as it also applies to the private timeline (2.63, 2024-11-07T21:44:52+0100).
diff --git a/activitypub.c b/activitypub.c
index 96c3038..0b2fc6a 100644
--- a/activitypub.c
+++ b/activitypub.c
@@ -202,7 +202,7 @@ xs_list *get_attachments(const xs_dict *msg)
         else
             attach = xs_dup(p);
 
-        if (xs_type(attach) == XSTYPE_LIST) {
+        if (xs_type(attach) == XSTYPE_LIST && xs_list_len(attach) == 0) {
             /* does the message have an image? */
             const xs_dict *d = xs_dict_get(msg, "image");
             if (xs_type(d) == XSTYPE_DICT) {
diff --git a/data.c b/data.c
index b3788e2..c119360 100644
--- a/data.c
+++ b/data.c
@@ -3650,3 +3650,19 @@ t_announcement *announcement(const double after)
 
     return NULL;
 }
+
+
+xs_str *make_url(const char *href, const char *proxy)
+/* makes an URL, possibly including proxying */
+{
+    xs_str *url = NULL;
+
+    if (proxy && !xs_startswith(href, srv_baseurl)) {
+        xs *p = xs_str_cat(xs_dup(proxy), "/proxy/");
+        url = xs_replace(href, "https:/" "/", p);
+    }
+    else
+        url = xs_dup(href);
+
+    return url;
+}
diff --git a/html.c b/html.c
index 810502e..3721f0e 100644
--- a/html.c
+++ b/html.c
@@ -11,6 +11,7 @@
 #include "xs_mime.h"
 #include "xs_match.h"
 #include "xs_html.h"
+#include "xs_curl.h"
 
 #include "snac.h"
 
@@ -41,7 +42,7 @@ int login(snac *snac, const xs_dict *headers)
 }
 
 
-xs_str *replace_shortnames(xs_str *s, const xs_list *tag, int ems)
+xs_str *replace_shortnames(xs_str *s, const xs_list *tag, int ems, const char *proxy)
 /* replaces all the :shortnames: with the emojis in tag */
 {
     if (!xs_is_null(tag)) {
@@ -69,9 +70,11 @@ xs_str *replace_shortnames(xs_str *s, const xs_list *tag, int ems)
 
                 if (n && i) {
                     const char *u = xs_dict_get(i, "url");
+                    xs *url = make_url(u, proxy);
+
                     xs_html *img = xs_html_sctag("img",
                         xs_html_attr("loading", "lazy"),
-                        xs_html_attr("src", u),
+                        xs_html_attr("src", url),
                         xs_html_attr("style", style));
 
                     xs *s1 = xs_html_render(img);
@@ -85,7 +88,7 @@ xs_str *replace_shortnames(xs_str *s, const xs_list *tag, int ems)
 }
 
 
-xs_str *actor_name(xs_dict *actor)
+xs_str *actor_name(xs_dict *actor, const char *proxy)
 /* gets the actor name */
 {
     const char *v;
@@ -96,12 +99,12 @@ xs_str *actor_name(xs_dict *actor)
         }
     }
 
-    return replace_shortnames(xs_html_encode(v), xs_dict_get(actor, "tag"), 1);
+    return replace_shortnames(xs_html_encode(v), xs_dict_get(actor, "tag"), 1, proxy);
 }
 
 
 xs_html *html_actor_icon(snac *user, xs_dict *actor, const char *date,
-                        const char *udate, const char *url, int priv, int in_people)
+                        const char *udate, const char *url, int priv, int in_people, const char *proxy)
 {
     xs_html *actor_icon = xs_html_tag("p", NULL);
 
@@ -110,7 +113,7 @@ xs_html *html_actor_icon(snac *user, xs_dict *actor, const char *date,
     int fwing = 0;
     int fwer = 0;
 
-    xs *name = actor_name(actor);
+    xs *name = actor_name(actor, proxy);
 
     /* get the avatar */
     if ((v = xs_dict_get(actor, "icon")) != NULL) {
@@ -119,7 +122,7 @@ xs_html *html_actor_icon(snac *user, xs_dict *actor, const char *date,
             v = xs_list_get(v, 0);
 
         if ((v = xs_dict_get(v, "url")) != NULL)
-            avatar = xs_dup(v);
+            avatar = make_url(v, proxy);
     }
 
     if (avatar == NULL)
@@ -244,7 +247,7 @@ xs_html *html_actor_icon(snac *user, xs_dict *actor, const char *date,
 }
 
 
-xs_html *html_msg_icon(snac *user, const char *actor_id, const xs_dict *msg)
+xs_html *html_msg_icon(snac *user, const char *actor_id, const xs_dict *msg, const char *proxy)
 {
     xs *actor = NULL;
     xs_html *actor_icon = NULL;
@@ -264,7 +267,7 @@ xs_html *html_msg_icon(snac *user, const char *actor_id, const xs_dict *msg)
         date  = xs_dict_get(msg, "published");
         udate = xs_dict_get(msg, "updated");
 
-        actor_icon = html_actor_icon(user, actor, date, udate, url, priv, 0);
+        actor_icon = html_actor_icon(user, actor, date, udate, url, priv, 0, proxy);
     }
 
     return actor_icon;
@@ -681,6 +684,11 @@ xs_html *html_user_head(snac *user, const char *desc, const char *url)
 
 static xs_html *html_user_body(snac *user, int read_only)
 {
+    const char *proxy = NULL;
+
+    if (user && !read_only && xs_is_true(xs_dict_get(srv_config, "proxy_media")))
+        proxy = user->actor;
+
     xs_html *body = xs_html_tag("body", NULL);
 
     /* top nav */
@@ -826,7 +834,7 @@ static xs_html *html_user_body(snac *user, int read_only)
         xs *bio1 = not_really_markdown(es1, NULL, &tags);
         xs *bio2 = process_tags(user, bio1, &tags);
 
-        bio2 = replace_shortnames(bio2, tags, 2);
+        bio2 = replace_shortnames(bio2, tags, 2, proxy);
 
         xs_html *top_user_bio = xs_html_tag("div",
             xs_html_attr("class", "p-note snac-top-user-bio"),
@@ -1464,6 +1472,10 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
     const char *v;
     int has_title = 0;
     int collapse_threads = 0;
+    const char *proxy = NULL;
+
+    if (user && !read_only && xs_is_true(xs_dict_get(srv_config, "proxy_media")))
+        proxy = user->actor;
 
     /* do not show non-public messages in the public timeline */
     if ((read_only || !user) && !is_msg_public(msg))
@@ -1495,7 +1507,7 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
                 xs_html_tag("div",
                     xs_html_attr("class", "snac-origin"),
                     xs_html_text(L("follows you"))),
-                html_msg_icon(read_only ? NULL : user, xs_dict_get(msg, "actor"), msg)));
+                html_msg_icon(read_only ? NULL : user, xs_dict_get(msg, "actor"), msg, proxy)));
     }
     else
     if (!xs_match(type, POSTLIKE_OBJECT_TYPE)) {
@@ -1625,7 +1637,7 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
         }
         else
         if (valid_status(object_get_by_md5(p, &actor_r))) {
-            xs *name = actor_name(actor_r);
+            xs *name = actor_name(actor_r, proxy);
 
             if (!xs_is_null(name)) {
                 xs *href = NULL;
@@ -1674,7 +1686,7 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
     }
 
     xs_html_add(post_header,
-        html_msg_icon(read_only ? NULL : user, actor, msg));
+        html_msg_icon(read_only ? NULL : user, actor, msg, proxy));
 
     /** post content **/
 
@@ -1763,7 +1775,7 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
         c = xs_str_cat(c, "<p>");
 
         /* replace the :shortnames: */
-        c = replace_shortnames(c, xs_dict_get(msg, "tag"), 2);
+        c = replace_shortnames(c, xs_dict_get(msg, "tag"), 2, proxy);
 
         /* Peertube videos content is in markdown */
         const char *mtype = xs_dict_get(msg, "mediaType");
@@ -1954,13 +1966,15 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
         const xs_dict *a;
         while (xs_list_next(attach, &a, &c)) {
             const char *type = xs_dict_get(a, "type");
-            const char *href = xs_dict_get(a, "href");
+            const char *o_href = xs_dict_get(a, "href");
             const char *name = xs_dict_get(a, "name");
 
             /* if this image is already in the post content, skip */
-            if (content && xs_str_in(content, href) != -1)
+            if (content && xs_str_in(content, o_href) != -1)
                 continue;
 
+            xs *href = make_url(o_href, proxy);
+
             if (xs_startswith(type, "image/") || strcmp(type, "Image") == 0) {
                 xs_html_add(content_attachments,
                     xs_html_tag("a",
@@ -2007,7 +2021,7 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
                 xs_html_add(content_attachments,
                     xs_html_tag("p",
                         xs_html_tag("a",
-                            xs_html_attr("href", href),
+                            xs_html_attr("href", o_href),
                             xs_html_text(href))));
 
                 /* do not generate an Alt... */
@@ -2017,10 +2031,10 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
                 xs_html_add(content_attachments,
                     xs_html_tag("p",
                         xs_html_tag("a",
-                            xs_html_attr("href", href),
+                            xs_html_attr("href", o_href),
                             xs_html_text(L("Attachment")),
                             xs_html_text(": "),
-                            xs_html_text(href))));
+                            xs_html_text(o_href))));
 
                 /* do not generate an Alt... */
                 name = NULL;
@@ -2168,7 +2182,7 @@ xs_str *html_timeline(snac *user, const xs_list *list, int read_only,
     xs_list *p = (xs_list *)list;
     const char *v;
     double t = ftime();
-    int hide_children = xs_is_true(xs_dict_get(srv_config, "strict_public_timelines"));
+    int hide_children = xs_is_true(xs_dict_get(srv_config, "strict_public_timelines")) && read_only;
 
     xs *desc = NULL;
     xs *alternate = NULL;
@@ -2411,7 +2425,7 @@ xs_str *html_timeline(snac *user, const xs_list *list, int read_only,
 }
 
 
-xs_html *html_people_list(snac *snac, xs_list *list, char *header, char *t)
+xs_html *html_people_list(snac *snac, xs_list *list, char *header, char *t, const char *proxy)
 {
     xs_html *snac_posts;
     xs_html *people = xs_html_tag("div",
@@ -2437,7 +2451,8 @@ xs_html *html_people_list(snac *snac, xs_list *list, char *header, char *t)
                     xs_html_attr("name", md5)),
                 xs_html_tag("div",
                     xs_html_attr("class", "snac-post-header"),
-                    html_actor_icon(snac, actor, xs_dict_get(actor, "published"), NULL, NULL, 0, 1)));
+                    html_actor_icon(snac, actor, xs_dict_get(actor, "published"),
+                                    NULL, NULL, 0, 1, proxy)));
 
             /* content (user bio) */
             const char *c = xs_dict_get(actor, "summary");
@@ -2540,6 +2555,11 @@ xs_html *html_people_list(snac *snac, xs_list *list, char *header, char *t)
 
 xs_str *html_people(snac *user)
 {
+    const char *proxy = NULL;
+
+    if (xs_is_true(xs_dict_get(srv_config, "proxy_media")))
+        proxy = user->actor;
+
     xs *wing = following_list(user);
     xs *wers = follower_list(user);
 
@@ -2548,8 +2568,8 @@ xs_str *html_people(snac *user)
         xs_html_add(html_user_body(user, 0),
             xs_html_tag("div",
                 xs_html_attr("class", "snac-posts"),
-                html_people_list(user, wing, L("People you follow"), "i"),
-                html_people_list(user, wers, L("People that follow you"), "e")),
+                html_people_list(user, wing, L("People you follow"), "i", proxy),
+                html_people_list(user, wers, L("People that follow you"), "e", proxy)),
             html_footer()));
 
     return xs_html_render_s(html, "<!DOCTYPE html>\n");
@@ -2558,6 +2578,11 @@ xs_str *html_people(snac *user)
 
 xs_str *html_notifications(snac *user, int skip, int show)
 {
+    const char *proxy = NULL;
+
+    if (xs_is_true(xs_dict_get(srv_config, "proxy_media")))
+        proxy = user->actor;
+
     xs *n_list = notify_list(user, skip, show);
     xs *n_time = notify_check_time(user, 0);
 
@@ -2616,7 +2641,7 @@ xs_str *html_notifications(snac *user, int skip, int show)
         if (!valid_status(actor_get(actor_id, &actor)))
             continue;
 
-        xs *a_name = actor_name(actor);
+        xs *a_name = actor_name(actor, proxy);
         const char *label = type;
 
         if (strcmp(type, "Create") == 0)
@@ -2658,7 +2683,7 @@ xs_str *html_notifications(snac *user, int skip, int show)
             xs_html_add(entry,
                 xs_html_tag("div",
                     xs_html_attr("class", "snac-post"),
-                    html_actor_icon(user, actor, NULL, NULL, NULL, 0, 0)));
+                    html_actor_icon(user, actor, NULL, NULL, NULL, 0, 0, proxy)));
         }
         else
         if (strcmp(type, "Move") == 0) {
@@ -2672,7 +2697,7 @@ xs_str *html_notifications(snac *user, int skip, int show)
                     xs_html_add(entry,
                         xs_html_tag("div",
                             xs_html_attr("class", "snac-post"),
-                            html_actor_icon(user, old_actor, NULL, NULL, NULL, 0, 0)));
+                            html_actor_icon(user, old_actor, NULL, NULL, NULL, 0, 0, proxy)));
                 }
             }
         }
@@ -2753,7 +2778,8 @@ xs_str *html_notifications(snac *user, int skip, int show)
 
 
 int html_get_handler(const xs_dict *req, const char *q_path,
-                     char **body, int *b_size, char **ctype, xs_str **etag)
+                     char **body, int *b_size, char **ctype,
+                     xs_str **etag, xs_str **last_modified)
 {
     const char *accept = xs_dict_get(req, "accept");
     int status = HTTP_STATUS_NOT_FOUND;
@@ -2762,6 +2788,7 @@ int html_get_handler(const xs_dict *req, const char *q_path,
     const char *p_path;
     int cache = 1;
     int save = 1;
+    const char *proxy = NULL;
     const char *v;
 
     xs *l = xs_split_n(q_path, "/", 2);
@@ -2788,6 +2815,9 @@ int html_get_handler(const xs_dict *req, const char *q_path,
         return HTTP_STATUS_NOT_FOUND;
     }
 
+    if (xs_is_true(xs_dict_get(srv_config, "proxy_media")))
+        proxy = snac.actor;
+
     /* return the RSS if requested by Accept header */
     if (accept != NULL) {
         if (xs_str_in(accept, "text/xml") != -1 ||
@@ -3164,6 +3194,55 @@ int html_get_handler(const xs_dict *req, const char *q_path,
         snac_debug(&snac, 1, xs_fmt("serving RSS"));
     }
     else
+    if (xs_startswith(p_path, "proxy/") && proxy) { /** remote media by proxy **/
+        if (!login(&snac, req)) {
+            *body  = xs_dup(uid);
+            status = HTTP_STATUS_UNAUTHORIZED;
+        }
+        else {
+            /* pick the raw path (including optional ? arguments) */
+            const char *raw_path = xs_dict_get(req, "raw_path");
+
+            /* skip to where the proxy/ string starts */
+            raw_path += xs_str_in(raw_path, "proxy/");
+
+            xs *url = xs_replace(raw_path, "proxy/", "https:/" "/");
+            xs *hdrs = xs_dict_new();
+
+            hdrs = xs_dict_append(hdrs, "user-agent", USER_AGENT);
+
+            const char *ims = xs_dict_get(req, "if-modified-since");
+            const char *inm = xs_dict_get(req, "if-none-match");
+
+            if (ims) hdrs = xs_dict_append(hdrs, "if-modified-since", ims);
+            if (inm) hdrs = xs_dict_append(hdrs, "if-none-match", inm);
+
+            xs *rsp = xs_http_request("GET", url, hdrs,
+                        NULL, 0, &status, body, b_size, 0);
+
+            if (valid_status(status)) {
+                const char *ct = xs_dict_get(rsp, "content-type");
+                const char *lm = xs_dict_get(rsp, "last-modified");
+                const char *et = xs_dict_get(rsp, "etag");
+
+                if (lm) *last_modified = xs_dup(lm);
+                if (et) *etag = xs_dup(et);
+
+                /* find the content-type in the static mime types,
+                   and return that value instead of ct, which will
+                   be destroyed when out of scope */
+                for (int n = 0; xs_mime_types[n]; n += 2) {
+                    if (strcmp(ct, xs_mime_types[n + 1]) == 0) {
+                        *ctype = (char *)xs_mime_types[n + 1];
+                        break;
+                    }
+                }
+            }
+
+            snac_debug(&snac, 1, xs_fmt("Proxy for %s %d", url, status));
+        }
+    }
+    else
         status = HTTP_STATUS_NOT_FOUND;
 
     user_free(&snac);
diff --git a/httpd.c b/httpd.c
index 2fe9d6b..1613e1f 100644
--- a/httpd.c
+++ b/httpd.c
@@ -278,6 +278,7 @@ void httpd_connection(FILE *f)
     xs *q_path   = NULL;
     xs *payload  = NULL;
     xs *etag     = NULL;
+    xs *last_modified = NULL;
     int p_size   = 0;
     const char *p;
     int fcgi_id;
@@ -329,7 +330,7 @@ void httpd_connection(FILE *f)
 #endif /* NO_MASTODON_API */
 
         if (status == 0)
-            status = html_get_handler(req, q_path, &body, &b_size, &ctype, &etag);
+            status = html_get_handler(req, q_path, &body, &b_size, &ctype, &etag, &last_modified);
     }
     else
     if (strcmp(method, "POST") == 0) {
@@ -423,6 +424,8 @@ void httpd_connection(FILE *f)
 
     if (!xs_is_null(etag))
         headers = xs_dict_append(headers, "etag", etag);
+    if (!xs_is_null(last_modified))
+        headers = xs_dict_append(headers, "last-modified", last_modified);
 
     /* if there are any additional headers, add them */
     const xs_dict *more_headers = xs_dict_get(srv_config, "http_headers");
diff --git a/snac.h b/snac.h
index 27c3d68..aa53838 100644
--- a/snac.h
+++ b/snac.h
@@ -349,7 +349,9 @@ xs_str *html_timeline(snac *user, const xs_list *list, int read_only,
                       const char *title, const char *page, int utl, const char *error);
 
 int html_get_handler(const xs_dict *req, const char *q_path,
-                     char **body, int *b_size, char **ctype, xs_str **etag);
+                     char **body, int *b_size, char **ctype,
+                     xs_str **etag, xs_str **last_modified);
+
 int html_post_handler(const xs_dict *req, const char *q_path,
                       char *payload, int p_size,
                       char **body, int *b_size, char **ctype);
@@ -407,3 +409,5 @@ typedef struct {
     char   *text;
 } t_announcement;
 t_announcement *announcement(double after);
+
+xs_str *make_url(const char *href, const char *proxy);
diff --git a/xs_fcgi.h b/xs_fcgi.h
index 6d3b030..c79121f 100644
--- a/xs_fcgi.h
+++ b/xs_fcgi.h
@@ -179,6 +179,8 @@ xs_dict *xs_fcgi_request(FILE *f, xs_str **payload, int *p_size, int *fcgi_id)
                         req = xs_dict_append(req, "method", v);
                     else
                     if (strcmp(k, "REQUEST_URI") == 0) {
+                        req = xs_dict_append(req, "raw_path", v);
+
                         xs *pnv = xs_split_n(v, "?", 1);
 
                         /* store the path */
diff --git a/xs_httpd.h b/xs_httpd.h
index 02b8ac2..860ae05 100644
--- a/xs_httpd.h
+++ b/xs_httpd.h
@@ -32,6 +32,7 @@ xs_dict *xs_httpd_request(FILE *f, xs_str **payload, int *p_size)
     xs_dict *req = xs_dict_new();
 
     req = xs_dict_append(req, "method", xs_list_get(l2, 0));
+    req = xs_dict_append(req, "raw_path", xs_list_get(l2, 1));
     req = xs_dict_append(req, "proto",  xs_list_get(l2, 2));
 
     {
diff --git a/xs_url.h b/xs_url.h
index 1738634..bc4e87c 100644
--- a/xs_url.h
+++ b/xs_url.h
@@ -196,7 +196,7 @@ xs_dict *xs_multipart_form_data(const char *payload, int p_size, const char *hea
         if (fn != NULL) {
             /* p_var value is a list */
             /* if filename has no extension and content-type is image, attach extension to the filename */
-            if (strchr(fn, '.') == NULL && xs_startswith(ct, "image/")) {
+            if (strchr(fn, '.') == NULL && ct && xs_startswith(ct, "image/")) {
                 char *ext = strchr(ct, '/');
                 ext++;
                 fn = xs_str_cat(xs_str_new(""), fn, ".", ext);