[PR #4810] [MERGED] Fix redirect with non-ascii branch names (#4764) #17505

Closed
opened 2025-11-02 13:44:20 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/go-gitea/gitea/pull/4810
Author: @SagePtr
Created: 8/28/2018
Status: Merged
Merged: 9/7/2018
Merged by: @techknowlogick

Base: masterHead: issue4764


📝 Commits (6)

  • 42235cc Fix redirect with non-ascii branch names (#4764)
  • b04cc2b Add integration tests for non-ascii branch redirect
  • 93154d2 Fix mysql test and coverage test
  • 440e3fa Merge branch 'master' into issue4764
  • bb5b40b Merge branch 'master' into issue4764
  • 3e915a3 Merge branch 'master' into issue4764

📊 Changes

49 files changed (+786 additions, -8 deletions)

View changed files

📝 integrations/api_repo_test.go (+3 -3)
integrations/gitea-repositories-meta/user2/utf8.git/HEAD (+1 -0)
integrations/gitea-repositories-meta/user2/utf8.git/config (+4 -0)
integrations/gitea-repositories-meta/user2/utf8.git/description (+1 -0)
integrations/gitea-repositories-meta/user2/utf8.git/hooks/applypatch-msg.sample (+15 -0)
integrations/gitea-repositories-meta/user2/utf8.git/hooks/commit-msg.sample (+24 -0)
integrations/gitea-repositories-meta/user2/utf8.git/hooks/post-receive (+7 -0)
integrations/gitea-repositories-meta/user2/utf8.git/hooks/post-receive.d/gitea (+2 -0)
integrations/gitea-repositories-meta/user2/utf8.git/hooks/post-update.sample (+8 -0)
integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-applypatch.sample (+14 -0)
integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-commit.sample (+49 -0)
integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-push.sample (+53 -0)
integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-rebase.sample (+169 -0)
integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-receive (+7 -0)
integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-receive.d/gitea (+2 -0)
integrations/gitea-repositories-meta/user2/utf8.git/hooks/prepare-commit-msg.sample (+36 -0)
integrations/gitea-repositories-meta/user2/utf8.git/hooks/update (+7 -0)
integrations/gitea-repositories-meta/user2/utf8.git/hooks/update.d/gitea (+2 -0)
integrations/gitea-repositories-meta/user2/utf8.git/hooks/update.sample (+128 -0)
integrations/gitea-repositories-meta/user2/utf8.git/info/exclude (+6 -0)

...and 29 more files

📄 Description

Fixes #4764

ctx.Req.URL.String() contains URL-encoded version of URL, but ctx.Params("*") contains non URL-encoded params, so strings.TrimSuffix was unable to match them when they contained non-ascii characters.

Now ctx.Req.URL.Path is checked, which is the same but not URL-encoded (resulting URL gets encoded by Macaron anyway, i tested this with raw HTTP-queries)


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/go-gitea/gitea/pull/4810 **Author:** [@SagePtr](https://github.com/SagePtr) **Created:** 8/28/2018 **Status:** ✅ Merged **Merged:** 9/7/2018 **Merged by:** [@techknowlogick](https://github.com/techknowlogick) **Base:** `master` ← **Head:** `issue4764` --- ### 📝 Commits (6) - [`42235cc`](https://github.com/go-gitea/gitea/commit/42235cc32544def3eec1a5428f9dbb76c11cd76c) Fix redirect with non-ascii branch names (#4764) - [`b04cc2b`](https://github.com/go-gitea/gitea/commit/b04cc2be1c46812f1e3beb7e87b65ac4977a523f) Add integration tests for non-ascii branch redirect - [`93154d2`](https://github.com/go-gitea/gitea/commit/93154d2bd59ae983d691540f465f190c93248779) Fix mysql test and coverage test - [`440e3fa`](https://github.com/go-gitea/gitea/commit/440e3fa10438ee8671627f005c0ebea53e64d959) Merge branch 'master' into issue4764 - [`bb5b40b`](https://github.com/go-gitea/gitea/commit/bb5b40bb38e9d9f176f2d39af61a9b9028dcc2e6) Merge branch 'master' into issue4764 - [`3e915a3`](https://github.com/go-gitea/gitea/commit/3e915a3594b8fce785ff60c1e8e31fc869bd17a7) Merge branch 'master' into issue4764 ### 📊 Changes **49 files changed** (+786 additions, -8 deletions) <details> <summary>View changed files</summary> 📝 `integrations/api_repo_test.go` (+3 -3) ➕ `integrations/gitea-repositories-meta/user2/utf8.git/HEAD` (+1 -0) ➕ `integrations/gitea-repositories-meta/user2/utf8.git/config` (+4 -0) ➕ `integrations/gitea-repositories-meta/user2/utf8.git/description` (+1 -0) ➕ `integrations/gitea-repositories-meta/user2/utf8.git/hooks/applypatch-msg.sample` (+15 -0) ➕ `integrations/gitea-repositories-meta/user2/utf8.git/hooks/commit-msg.sample` (+24 -0) ➕ `integrations/gitea-repositories-meta/user2/utf8.git/hooks/post-receive` (+7 -0) ➕ `integrations/gitea-repositories-meta/user2/utf8.git/hooks/post-receive.d/gitea` (+2 -0) ➕ `integrations/gitea-repositories-meta/user2/utf8.git/hooks/post-update.sample` (+8 -0) ➕ `integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-applypatch.sample` (+14 -0) ➕ `integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-commit.sample` (+49 -0) ➕ `integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-push.sample` (+53 -0) ➕ `integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-rebase.sample` (+169 -0) ➕ `integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-receive` (+7 -0) ➕ `integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-receive.d/gitea` (+2 -0) ➕ `integrations/gitea-repositories-meta/user2/utf8.git/hooks/prepare-commit-msg.sample` (+36 -0) ➕ `integrations/gitea-repositories-meta/user2/utf8.git/hooks/update` (+7 -0) ➕ `integrations/gitea-repositories-meta/user2/utf8.git/hooks/update.d/gitea` (+2 -0) ➕ `integrations/gitea-repositories-meta/user2/utf8.git/hooks/update.sample` (+128 -0) ➕ `integrations/gitea-repositories-meta/user2/utf8.git/info/exclude` (+6 -0) _...and 29 more files_ </details> ### 📄 Description Fixes #4764 ctx.Req.URL.String() contains URL-encoded version of URL, but ctx.Params("*") contains non URL-encoded params, so strings.TrimSuffix was unable to match them when they contained non-ascii characters. Now ctx.Req.URL.Path is checked, which is the same but not URL-encoded (resulting URL gets encoded by Macaron anyway, i tested this with raw HTTP-queries) --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2025-11-02 13:44:20 -06:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/gitea#17505