Skip to content

Fix encoding for Matrix Webhooks #37190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wxiaoguang merged 12 commits into from
Apr 13, 2026
Merged

Fix encoding for Matrix Webhooks #37190

Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7cf8b40
fix encoding
bircni Apr 12, 2026
16801d1
Also restore %3A to : in Matrix room ID URL path
bircni Apr 12, 2026
82855e2
restore
bircni Apr 12, 2026
13c9bf7
Apply suggestion from @wxiaoguang
wxiaoguang Apr 12, 2026
0d67746
fix
wxiaoguang Apr 12, 2026
e873755
add more comment
wxiaoguang Apr 12, 2026
ddb1936
fix comment
wxiaoguang Apr 12, 2026
8322d1f
fix lint
wxiaoguang Apr 12, 2026
9a92748
Merge branch 'main' into fix-matrix
GiteaBot Apr 12, 2026
5febe07
Merge branch 'main' into fix-matrix
GiteaBot Apr 12, 2026
f71e4b9
Merge branch 'main' into fix-matrix
GiteaBot Apr 13, 2026
4effda0
Merge branch 'main' into fix-matrix
GiteaBot Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions routers/web/repo/setting/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,8 +454,13 @@ func matrixHookParams(ctx *context.Context) webhookParams {
form := web.GetForm(ctx).(*forms.NewMatrixHookForm)

return webhookParams{
Type: webhook_module.MATRIX,
URL: fmt.Sprintf("%s/_matrix/client/r0/rooms/%s/send/m.room.message", form.HomeserverURL, url.PathEscape(form.RoomID)),
Type: webhook_module.MATRIX,
// Matrix room IDs are of the form "!localpart:server", where "!" and ":" are
// valid unencoded path segment characters per RFC 3986, but url.PathEscape
// encodes them. Restore them so Matrix homeservers can recognise the room ID.
// See https://spec.matrix.org/latest/appendices/#room-ids
Comment thread
wxiaoguang marked this conversation as resolved.
Outdated
URL: fmt.Sprintf("%s/_matrix/client/r0/rooms/%s/send/m.room.message", form.HomeserverURL,
strings.NewReplacer("%21", "!", "%3A", ":").Replace(url.PathEscape(form.RoomID))),
ContentType: webhook.ContentTypeJSON,
HTTPMethod: http.MethodPut,
WebhookForm: form.WebhookForm,
Expand Down
Loading