Merge pull request #439 from gnieto/fix/url-escape

fix: urlencode since opaque string
matrix-org · May 20, 2024 · d5b3e4b · d5b3e4b
2 parents 425a5d4 + 45f3e01
commit d5b3e4b
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)