fix: urlencode since opaque string

Since/next batch is an opaque string and might need to be urlencoded before being sent to the server. Signed-off-by: Guillem Nieto <[email protected]>
matrix-org · May 20, 2024 · 45f3e01 · 45f3e01
1 parent 425a5d4
commit 45f3e01
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/sync2/client.go b/sync2/client.go
@@ -152,7 +152,7 @@ func (v *HTTPClient) createSyncURL(since string, isFirst, toDeviceOnly bool) str
 		qps += "timeout=30000"
 	}
 	if since != "" {
-		qps += "&since=" + since
+		qps += "&since=" + url.QueryEscape(since)
 	}
 
 	// Set presence to offline, this potentially reduces CPU load on upstream homeservers

diff --git a/sync2/client_test.go b/sync2/client_test.go
@@ -65,6 +65,12 @@ func TestSyncURL(t *testing.T) {
 			toDeviceOnly: true,
 			wantURL:      wantBaseURL + `?timeout=0&since=112233&set_presence=offline&filter=` + url.QueryEscape(`{"presence":{"not_types":["*"]},"room":{"rooms":[],"timeline":{"limit":50}}}`),
 		},
+		{
+			since:        "112233#145",
+			isFirst:      true,
+			toDeviceOnly: true,
+			wantURL:      wantBaseURL + `?timeout=0&since=112233%23145&set_presence=offline&filter=` + url.QueryEscape(`{"presence":{"not_types":["*"]},"room":{"rooms":[],"timeline":{"limit":50}}}`),
+		},
 	}
 	for i, tc := range testCases {
 		gotURL := client.createSyncURL(tc.since, tc.isFirst, tc.toDeviceOnly)