commit 1882c25

Merge pull request 'Major rollback & Put "User Settings" outside of "Operations...."' (#76) from yonle/snac2:master into master

Reviewed-on: https://codeberg.org/grunfink/snac2/pulls/76

 1@@ -1,9 +1,5 @@
 2 # Release Notes
 3 
 4-## 2.39
 5-
 6-User settings have been moved to their own page.
 7-
 8 ## 2.38
 9 
10 More vulnerability fixes (contributed by yonle).

  1@@ -1,4 +1,4 @@
  2-	/* snac - A simple, minimalistic ActivityPub instance */
  3+/* snac - A simple, minimalistic ActivityPub instance */
  4 /* copyright (c) 2022 - 2023 grunfink / MIT license */
  5 
  6 #include "xs.h"
  7@@ -325,8 +325,8 @@ d_char *html_user_header(snac *snac, d_char *s, int local)
  8             s1 = xs_fmt(
  9                 "<a href=\"%s.rss\">%s</a> - "
 10                 "<a href=\"%s/admin\" rel=\"nofollow\">%s</a></nav>\n",
 11-                snac->uid, L("RSS"),
 12-                snac->uid, L("private"));
 13+                snac->actor, L("RSS"),
 14+                snac->actor, L("private"));
 15         else {
 16             xs *n_list = notify_list(snac, 1);
 17             int n_len  = xs_list_len(n_list);
 18@@ -340,14 +340,14 @@ d_char *html_user_header(snac *snac, d_char *s, int local)
 19                 n_str = xs_str_new("");
 20 
 21             s1 = xs_fmt(
 22-                "<a href=\"../%s\">%s</a> - "
 23-                "<a href=\"admin\">%s</a> - "
 24-                "<a href=\"notifications\">%s</a>%s - "
 25-                "<a href=\"people\">%s</a></nav>\n",
 26-                snac->uid, L("public"),
 27-                L("private"),
 28-                L("notifications"), n_str,
 29-                L("people"));
 30+                "<a href=\"%s\">%s</a> - "
 31+                "<a href=\"%s/admin\">%s</a> - "
 32+                "<a href=\"%s/notifications\">%s</a>%s - "
 33+                "<a href=\"%s/people\">%s</a></nav>\n",
 34+                snac->actor, L("public"),
 35+                snac->actor, L("private"),
 36+                snac->actor, L("notifications"), n_str,
 37+                snac->actor, L("people"));
 38         }
 39 
 40         s = xs_str_cat(s, s1);
 41@@ -394,7 +394,7 @@ d_char *html_top_controls(snac *snac, d_char *s)
 42         "<div class=\"snac-note\">\n"
 43         "<details><summary>%s</summary>\n"
 44         "<form autocomplete=\"off\" method=\"post\" "
 45-        "action=\"admin/note\" enctype=\"multipart/form-data\">\n"
 46+        "action=\"%s/admin/note\" enctype=\"multipart/form-data\">\n"
 47         "<textarea class=\"snac-textarea\" name=\"content\" "
 48         "rows=\"8\" wrap=\"virtual\" required=\"required\" placeholder=\"What's on your mind?\"></textarea>\n"
 49         "<input type=\"hidden\" name=\"in_reply_to\" value=\"\">\n"
 50@@ -431,12 +431,12 @@ d_char *html_top_controls(snac *snac, d_char *s)
 51         "<div class=\"snac-top-controls-more\">\n"
 52         "<details><summary>%s</summary>\n"
 53 
 54-        "<form autocomplete=\"off\" method=\"post\" action=\"admin/action\">\n" /** follow **/
 55+        "<form autocomplete=\"off\" method=\"post\" action=\"%s/admin/action\">\n" /** follow **/
 56         "<input type=\"text\" name=\"actor\" required=\"required\" placeholder=\"bob@example.com\">\n"
 57         "<input type=\"submit\" name=\"action\" value=\"%s\"> %s\n"
 58         "</form><p>\n"
 59 
 60-        "<form autocomplete=\"off\" method=\"post\" action=\"admin/action\">\n" /** boost **/
 61+        "<form autocomplete=\"off\" method=\"post\" action=\"%s/admin/action\">\n" /** boost **/
 62         "<input type=\"text\" name=\"id\" required=\"required\" placeholder=\"https://fedi.example.com/bob/....\">\n"
 63         "<input type=\"submit\" name=\"action\" value=\"%s\"> %s\n"
 64         "</form><p>\n"
 65@@ -446,7 +446,7 @@ d_char *html_top_controls(snac *snac, d_char *s)
 66 
 67         "<div class=\"snac-user-setup\">\n" /** user setup **/
 68         "<form autocomplete=\"off\" method=\"post\" "
 69-        "action=\"admin/user-setup\" enctype=\"multipart/form-data\">\n"
 70+        "action=\"%s/admin/user-setup\" enctype=\"multipart/form-data\">\n"
 71         "<p>%s:<br>\n"
 72         "<input type=\"text\" name=\"name\" value=\"%s\" placeholder=\"Your name.\"></p>\n"
 73 
 74@@ -531,6 +531,7 @@ d_char *html_top_controls(snac *snac, d_char *s)
 75 
 76     xs *s1 = xs_fmt(_tmpl,
 77         L("New Post..."),
 78+        snac->actor,
 79         L("Sensitive content"),
 80         L("Sensitive content description"),
 81         L("Only for mentioned people"),
 82@@ -550,10 +551,15 @@ d_char *html_top_controls(snac *snac, d_char *s)
 83         L("Post"),
 84 
 85         L("Operations..."),
 86+
 87+        snac->actor,
 88         L("Follow"), L("(by URL or user@host)"),
 89+
 90+        snac->actor,
 91         L("Boost"), L("(by URL)"),
 92 
 93         L("User Settings..."),
 94+        snac->actor,
 95         L("Display name"),
 96         es1,
 97         L("Avatar"),
 98@@ -657,13 +663,13 @@ xs_str *html_entry_controls(snac *snac, xs_str *os, const xs_dict *msg, const ch
 99 
100     {
101         xs *s1 = xs_fmt(
102-            "<form autocomplete=\"off\" method=\"post\" action=\"admin/action\">\n"
103+            "<form autocomplete=\"off\" method=\"post\" action=\"%s/admin/action\">\n"
104             "<input type=\"hidden\" name=\"id\" value=\"%s\">\n"
105             "<input type=\"hidden\" name=\"actor\" value=\"%s\">\n"
106             "<input type=\"hidden\" name=\"redir\" value=\"%s_entry\">\n"
107             "\n",
108 
109-            id, actor, md5
110+            snac->actor, id, actor, md5
111         );
112 
113         s = xs_str_cat(s, s1);
114@@ -717,7 +723,7 @@ xs_str *html_entry_controls(snac *snac, xs_str *os, const xs_dict *msg, const ch
115         xs *s1 = xs_fmt(
116             "<p><details><summary>%s</summary>\n"
117             "<p><div class=\"snac-note\" id=\"%s_edit\">\n"
118-            "<form autocomplete=\"off\" method=\"post\" action=\"admin/note\" "
119+            "<form autocomplete=\"off\" method=\"post\" action=\"%s/admin/note\" "
120             "enctype=\"multipart/form-data\" id=\"%s_edit_form\">\n"
121             "<textarea class=\"snac-textarea\" name=\"content\" "
122             "rows=\"4\" wrap=\"virtual\" required=\"required\">%s</textarea>\n"
123@@ -740,7 +746,7 @@ xs_str *html_entry_controls(snac *snac, xs_str *os, const xs_dict *msg, const ch
124 
125             L("Edit..."),
126             md5,
127-            md5,
128+            snac->actor, md5,
129             prev_src,
130             id,
131             L("Sensitive content"),
132@@ -768,7 +774,7 @@ xs_str *html_entry_controls(snac *snac, xs_str *os, const xs_dict *msg, const ch
133         xs *s1 = xs_fmt(
134             "<p><details><summary>%s</summary>\n"
135             "<p><div class=\"snac-note\" id=\"%s_reply\">\n"
136-            "<form autocomplete=\"off\" method=\"post\" action=\"admin/note\" "
137+            "<form autocomplete=\"off\" method=\"post\" action=\"%s/admin/note\" "
138             "enctype=\"multipart/form-data\" id=\"%s_reply_form\">\n"
139             "<textarea class=\"snac-textarea\" name=\"content\" "
140             "rows=\"4\" wrap=\"virtual\" required=\"required\">%s</textarea>\n"
141@@ -791,7 +797,7 @@ xs_str *html_entry_controls(snac *snac, xs_str *os, const xs_dict *msg, const ch
142 
143             L("Reply..."),
144             md5,
145-            md5,
146+            snac->actor, md5,
147             ct,
148             id,
149             L("Sensitive content"),
150@@ -1086,10 +1092,10 @@ xs_str *html_entry(snac *snac, xs_str *os, const xs_dict *msg, int local,
151                 /* poll still active */
152                 xs *s1 = xs_fmt("<div class=\"snac-poll-form\">\n"
153                                 "<form autocomplete=\"off\" "
154-                                "method=\"post\" action=\"admin/vote\">\n"
155+                                "method=\"post\" action=\"%s/admin/vote\">\n"
156                                 "<input type=\"hidden\" name=\"actor\" value= \"%s\">\n"
157                                 "<input type=\"hidden\" name=\"irt\" value=\"%s\">\n",
158-                    actor, id);
159+                    snac->actor, actor, id);
160 
161                 while (xs_list_iter(&p, &v)) {
162                     const char *name = xs_dict_get(v, "name");
163@@ -1479,11 +1485,11 @@ d_char *html_people_list(snac *snac, d_char *os, d_char *list, const char *heade
164             s = xs_str_cat(s, "<div class=\"snac-controls\">\n");
165 
166             xs *s1 = xs_fmt(
167-                "<p><form autocomplete=\"off\" method=\"post\" action=\"admin/action\">\n"
168+                "<p><form autocomplete=\"off\" method=\"post\" action=\"%s/admin/action\">\n"
169                 "<input type=\"hidden\" name=\"actor\" value=\"%s\">\n"
170                 "<input type=\"hidden\" name=\"actor-form\" value=\"yes\">\n",
171 
172-                actor_id
173+                snac->actor, actor_id
174             );
175             s = xs_str_cat(s, s1);
176 
177@@ -1507,7 +1513,7 @@ d_char *html_people_list(snac *snac, d_char *os, d_char *list, const char *heade
178             xs *s2 = xs_fmt(
179                 "<p><details><summary>%s</summary>\n"
180                 "<p><div class=\"snac-note\" id=\"%s_%s_dm\">\n"
181-                "<form autocomplete=\"off\" method=\"post\" action=\"admin/note\" "
182+                "<form autocomplete=\"off\" method=\"post\" action=\"%s/admin/note\" "
183                 "enctype=\"multipart/form-data\" id=\"%s_reply_form\">\n"
184                 "<textarea class=\"snac-textarea\" name=\"content\" "
185                 "rows=\"4\" wrap=\"virtual\" required=\"required\"></textarea>\n"
186@@ -1519,7 +1525,7 @@ d_char *html_people_list(snac *snac, d_char *os, d_char *list, const char *heade
187 
188                 L("Direct Message..."),
189                 md5, t,
190-                md5,
191+                snac->actor, md5,
192                 actor_id,
193                 L("Post")
194             );
195@@ -1570,9 +1576,9 @@ xs_str *html_notifications(snac *snac)
196 
197     xs *s1 = xs_fmt(
198         "<form autocomplete=\"off\" "
199-        "method=\"post\" action=\"admin/clear-notifications\" id=\"clear\">\n"
200+        "method=\"post\" action=\"%s/admin/clear-notifications\" id=\"clear\">\n"
201         "<input type=\"submit\" class=\"snac-btn-like\" value=\"%s\">\n"
202-        "</form><p>\n", L("Clear all"));
203+        "</form><p>\n", snac->actor, L("Clear all"));
204     s = xs_str_cat(s, s1);
205 
206     while (xs_list_iter(&p, &v)) {
207@@ -2372,9 +2378,9 @@ int html_post_handler(const xs_dict *req, const char *q_path,
208         char *redir = xs_dict_get(p_vars, "redir");
209 
210         if (xs_is_null(redir))
211-          redir = "";
212+            redir = "snac-posts";
213 
214-        *body   = xs_fmt("../admin#%s", redir);
215+        *body   = xs_fmt("%s/admin#%s", snac.actor, redir);
216         *b_size = strlen(*body);
217     }
218 

1@@ -91,7 +91,7 @@ int server_get_handler(xs_dict *req, char *q_path,
2                     if (user_open(&snac, uid)) {
3                         xs *u = xs_fmt(
4                             "<li><a href=\"%s\">@%s@%s (%s)</a></li>\n",
5-                                uid, uid, host,
6+                                snac.actor, uid, host,
7                                 xs_dict_get(snac.config, "name"));
8 
9                         ul = xs_str_cat(ul, u);

1@@ -1,7 +1,7 @@
2 /* snac - A simple, minimalistic ActivityPub instance */
3 /* copyright (c) 2022 - 2023 grunfink / MIT license */
4 
5-#define VERSION "2.39-dev"
6+#define VERSION "2.38"
7 
8 #define USER_AGENT "snac/" VERSION
9