fix: Allow direct commits for unprotected files with push restrictions by bircni · Pull Request #37657 · go-gitea/gitea

bircni · 2026-05-11T16:01:21Z

Fixes an issue where users could not commit changes on a file which is unprotected.

Fixes #37655

lunny · 2026-05-11T17:20:43Z

Could you add a test?

… is restricted

bircni · 2026-05-11T17:42:45Z

Could you add a test?

Done. Also found a bug in my fix, it checked ctx.Repo.TreePath, which is empty for _new// URLs

wxiaoguang

Sorry but it shouldn't have 2 unclear tree path here.

See below ctx.Repo.TreePath

bircni · 2026-05-11T17:51:06Z

Sorry but it shouldn't have 2 unclear tree path here.

See below ctx.Repo.TreePath

fixed, only for the "_new" url it is a bit bad :/

wxiaoguang · 2026-05-11T17:54:10Z

I think you need to clarify the logic.

"_new" does support "tree path" part
other forms like "edit", the form's tree path can be different from the ctx request's.

bircni · 2026-05-11T18:31:54Z

@wxiaoguang
reworked it:

added an _edit rename test which made me stumble over more problems
POST handler refines CanCommitToBranch after the call using the form's destination, pulled it into a small helper so the call site stays readable

wxiaoguang · 2026-05-11T18:36:54Z

It only introduced more complex logic but didn't really fix the problem.

Think about these cases:

/_new
/_new/protected
/_new/protected -> change filename to unprotected
/_new/unprotected
/_new/unprotected -> change filename to protected
/_edit/protected
/_edit/protected -> change filename to unprotected
/_edit/unprotected
/_edit/unprotected -> change filename to protected

I don't see there can be a simple and clear "quick-fix"

wxiaoguang · 2026-05-11T18:45:37Z

A deeper question: is the IsUnprotectedFile used correctly? Especially for file renaming:

protected => unprotected
unprotected => protected

…ated tests

bircni · 2026-05-12T19:35:20Z

Reworked it.
PrepareCommitFormOptions now only handles the branch-level decision + caching the protected branch rule and does not touch tree paths anymore.
The unprotected file logic was moved into RefineCanCommitToBranchByPaths(opts, treePaths...), which is now called with the actual paths being modified.
For _edit I now pass both source and destination paths, so renames between protected/unprotected paths are checked correctly against the full set. This now behaves the same as CheckUnprotectedFiles in the pre-receive hook.

Also added matrix tests for the cases you listed.

wxiaoguang · 2026-05-13T05:44:41Z

I think you made the change too complicated than it should be.

The overall logic should be like this:

tree paths: when creating/editing a file, there can be 2 tree paths:
- ctx.TreePath: the old path
- form.TreePath: the new path
- patch: there is no tree path, changed file are provided by the patch diff
the "protection" check logic:
- when opening a creating/editing page: show the protection warning by old path (ctx.TreePath)
- when submitting a creating/editing page form: no need to do extra work for the new path (form.TreePath), the errors are responded from the git hooks, the same to "apply patch", git hooks should handle the protection.

Apply the unprotected-file override inside PrepareCommitFormOptions keyed on ctx.Repo.TreePath, so the editor page renders the right default and the existing POST guard reuses the same decision. The pre-receive hook still enforces every path the commit actually touches, so the controller does not need to inspect form.TreePath or duplicate the per-file check on submit. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* origin/main: fix: Allow direct commits for unprotected files with push restrictions (go-gitea#37657) chore: Conventional adjustments (go-gitea#37677) chore(db): introduce db.Session and db.EngineMigration interfaces (go-gitea#37746) fix(migrations): preserve unique constraints in v334 sync (go-gitea#37743) feat(web): also display PR counts in repo list (go-gitea#37739)

* origin/main: (39 commits) fix: Add missed token scope checking (go-gitea#37735) chore: Use giteabot instead of backporter (go-gitea#37422) fix: Allow direct commits for unprotected files with push restrictions (go-gitea#37657) chore: Conventional adjustments (go-gitea#37677) chore(db): introduce db.Session and db.EngineMigration interfaces (go-gitea#37746) fix(migrations): preserve unique constraints in v334 sync (go-gitea#37743) feat(web): also display PR counts in repo list (go-gitea#37739) feat: execute post run cleanup when workflow is cancelled (go-gitea#37275) fix(actions): wrong assumption that run id always >= job id (go-gitea#37737) fix(icon): use repo-forked icon to display forks count (go-gitea#37731) fix(oauth): strengthen PKCE validation and refresh token replay protection (go-gitea#37706) fix(web): enforce token scopes on raw, media, and attachment downloads (go-gitea#37698) feat: Add bypass allowlist for branch protection (go-gitea#36514) refactor(glob): use strings.Builder for regexp compilation (go-gitea#37730) feat(oauth): Support AWS Cognito OAuth2 provider (go-gitea#37607) feat: Add default PR branch update style setting (go-gitea#37410) refactor: move `workflowpattern` into `modules/actions` (go-gitea#37717) ci: add `zizmor` to `lint-actions` (go-gitea#37720) chore(doctor): remove four obsolete doctor check implementations (go-gitea#37728) chore(renovate): enable dockerfile manager (go-gitea#37719) ... # Conflicts: # modules/globallock/locker_test.go

@bircni

#37657) (#37756) Backport #37657 by @bircni Fixes an issue where users could not commit changes on a file which is unprotected. Fixes #37655 Co-authored-by: Nicolas <bircni@icloud.com> Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>

This PR contains the following updates: | Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) | |---|---|---|---| | [code.gitea.io/gitea](https://github.com/go-gitea/gitea) | `v1.26.1` → `v1.26.2` | ![age](https://developer.mend.io/api/mc/badges/age/go/code.gitea.io%2fgitea/v1.26.2?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/go/code.gitea.io%2fgitea/v1.26.1/v1.26.2?slim=true) | --- ### Release Notes <details> <summary>go-gitea/gitea (code.gitea.io/gitea)</summary> ### [`v1.26.2`](https://github.com/go-gitea/gitea/releases/tag/v1.26.2) [Compare Source](go-gitea/gitea@v1.26.1...v1.26.2) - SECURITY - fix(permissions): Fix reading permission ([#37769](go-gitea/gitea#37769)) - fix(actions): make artifact signature payloads unambiguous ([#37707](go-gitea/gitea#37707)) - fix: Unify public-only token filtering in API queries and repo access checks ([#37118](go-gitea/gitea#37118)) - fix: Add missed token scope checking ([#37735](go-gitea/gitea#37735)) - fix(oauth): bind token exchanges to the original client request ([#37704](go-gitea/gitea#37704)) - fix(oauth): strengthen PKCE validation and refresh token replay protection ([#37706](go-gitea/gitea#37706)) - fix(web): enforce token scopes on raw, media, and attachment downloads ([#37698](go-gitea/gitea#37698)) - fix(security): enforce wiki git writes and LFS token access at request time ([#37695](go-gitea/gitea#37695)) - feat(api): encrypt AWS creds ([#37679](go-gitea/gitea#37679)) - fix(deps): update dependency mermaid to v11.15.0 \[security], add e2e test - fix(packages): Add label for private and internal package and fix composor package source permission check ([#37610](go-gitea/gitea#37610)) - fix(git): Fix smart http request scope bug ([#37583](go-gitea/gitea#37583)) - Fix basic auth bug ([#37503](go-gitea/gitea#37503)) - Fix allow maintainer edit permission check ([#37479](go-gitea/gitea#37479)) ([#37484](go-gitea/gitea#37484)) - Fix URL sanitization to handle schemeless credentials ([#37440](go-gitea/gitea#37440)) ([#37471](go-gitea/gitea#37471)) - Fix attachment Content-Security-Policy ([#37455](go-gitea/gitea#37455)) ([#37464](go-gitea/gitea#37464)) - chore(deps): bump go-git/go-git/v5 to 5.19.0 ([#37608](go-gitea/gitea#37608)) - BUGFIXES - fix(pull): handle empty pull request files view to allow reviews ([#37783](go-gitea/gitea#37783)) - fix(markup): make RenderString never fail ([#37779](go-gitea/gitea#37779)) - fix: add natural sort to sortTreeViewNodes ([#37772](go-gitea/gitea#37772)) - fix: package creation unique conflict ([#37774](go-gitea/gitea#37774)) - fix!: add DEFAULT\_TITLE\_SOURCE setting for pull request title default behavior ([#37465](go-gitea/gitea#37465)) - fix: Allow direct commits for unprotected files with push restrictions ([#37657](go-gitea/gitea#37657)) - fix(actions): wrong assumption that run id always >= job id ([#37737](go-gitea/gitea#37737)) - fix(auth): set User-Agent on avatar fetch and sync avatar on link-account register ([#37564](go-gitea/gitea#37564)) ([#37588](go-gitea/gitea#37588)) - fix(actions): deadlock between PrepareRunAndInsert and UpdateTaskByState ([#37692](go-gitea/gitea#37692)) - fix(repo): /generate must sync the branch table for the new repo ([#37693](go-gitea/gitea#37693)) - build: Fix snap build (1.26) - fix(actions): run TransferLogs on UpdateLog{Rows:\[], NoMore:true} ([#37631](go-gitea/gitea#37631)) - fix show correct mergebase - fix: make clone URL respect public URL detection setting ([#37615](go-gitea/gitea#37615)) - fix: "run as root" check ([#37622](go-gitea/gitea#37622)) - chore(deps): update dependency go to v1.26.3 ([#37601](go-gitea/gitea#37601)) - Compare dropdown fails when selecting branch with no common merge-base ([#37470](go-gitea/gitea#37470)) - fix: treat email addresses case-insensitively ([#37600](go-gitea/gitea#37600)) - fix(actions): fix blank lines after ::endgroup:: ([#37597](go-gitea/gitea#37597)) - fix(actions): report individual step status in workflow job API response ([#37592](go-gitea/gitea#37592)) - fix: Invalid UTF-8 commit messages in JSON API responses ([#37542](go-gitea/gitea#37542)) - fix: use consistent GetUser family functions ([#37553](go-gitea/gitea#37553)) - fix(api): return 409 message instead of empty JSON for wrong commit id ([#37572](go-gitea/gitea#37572)) - fix(actions): prevent panic when workflow contains null jobs ([#37570](go-gitea/gitea#37570)) - Make ServeSetHeaders default to download attachment if filename exists ([#37552](go-gitea/gitea#37552)) ([#37555](go-gitea/gitea#37555)) - Fix(actions): validate workflow param to prevent 500 error ([#37546](go-gitea/gitea#37546)) ([#37554](go-gitea/gitea#37554)) - Don't unblock run-level-concurrency-blocked runs in the resolver ([#37461](go-gitea/gitea#37461)) ([#37538](go-gitea/gitea#37538)) - Fix(packages): use file names for generic web downloads ([#37514](go-gitea/gitea#37514)) ([#37520](go-gitea/gitea#37520)) - Fix merge autodetect can't close other PRs but only the last one when multiple PRs are pushed at once ([#37512](go-gitea/gitea#37512)) ([#37516](go-gitea/gitea#37516)) - Fix update branch protection order ([#37508](go-gitea/gitea#37508)) ([#37513](go-gitea/gitea#37513)) - Fix mCaptcha broken after Vite migration ([#37492](go-gitea/gitea#37492)) ([#37509](go-gitea/gitea#37509)) - Fix review submission from single-commit PR view ([#37475](go-gitea/gitea#37475)) ([#37485](go-gitea/gitea#37485)) - Fix scheduled action panic with null event payload ([#37459](go-gitea/gitea#37459)) ([#37466](go-gitea/gitea#37466)) - Make GetPossibleUserByID can handle deleted user ([#37430](go-gitea/gitea#37430)) ([#37431](go-gitea/gitea#37431)) - Remove excessive quote from terraform instructions ([#37424](go-gitea/gitea#37424)) ([#37426](go-gitea/gitea#37426)) - Fix color regressions, add `priority` color ([#37417](go-gitea/gitea#37417)) ([#37421](go-gitea/gitea#37421)) - MISC - Add CurrentURL template variable back ([#37444](go-gitea/gitea#37444)) ([#37449](go-gitea/gitea#37449)) Instances on **[Gitea Cloud](https://cloud.gitea.com)** will be automatically upgraded to this version during the specified maintenance window. </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Reviewed-on: https://git.erwanleboucher.dev/eleboucher/apoci/pulls/47

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 11, 2026

bircni changed the title ~~Allow direct commits for unprotected files with push restrictions~~ fix: Allow direct commits for unprotected files with push restrictions May 11, 2026

bircni added 2 commits May 11, 2026 19:42

fix: allow direct commits for unprotected files when branch-wide push…

ad2d38a

… is restricted

fixes + test

a43d1f3

bircni force-pushed the fix-37655 branch from 46fe16f to a43d1f3 Compare May 11, 2026 17:42

wxiaoguang requested changes May 11, 2026

View reviewed changes

GiteaBot added lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 11, 2026

bircni added type/bug labels May 11, 2026

use correct Treepath

1de27be

enhance

aadf645

bircni added 2 commits May 12, 2026 21:33

fix: refine commit permissions for protected branches and enhance rel…

1c0a172

…ated tests

Merge branch 'main' into fix-37655

5f6c883

wxiaoguang reviewed May 13, 2026

View reviewed changes

Comment thread routers/web/repo/editor_apply_patch.go Outdated

bircni marked this pull request as draft May 13, 2026 05:44

bircni and others added 2 commits May 16, 2026 08:49

Merge branch 'main' into fix-37655

0aa153a

bircni requested a review from wxiaoguang May 16, 2026 06:49

wxiaoguang approved these changes May 16, 2026

View reviewed changes

GiteaBot removed the lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged label May 16, 2026

GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label May 16, 2026

wxiaoguang marked this pull request as ready for review May 16, 2026 07:45

Merge branch 'main' into fix-37655

3f48cbc

bircni requested a review from silverwind May 16, 2026 13:54

bircni added the backport/v1.26 This PR should be backported to Gitea 1.26 label May 16, 2026

Merge branch 'main' into fix-37655

8664d6e

bircni requested a review from lunny May 17, 2026 08:37

bircni mentioned this pull request May 17, 2026

Release: Publish Gitea 1.26.2 #37578

Open

25 tasks

lunny approved these changes May 17, 2026

View reviewed changes

GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 17, 2026

lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 17, 2026

Merge branch 'main' into fix-37655

1521e87

silverwind merged commit 9648716 into go-gitea:main May 17, 2026
21 checks passed

GiteaBot mentioned this pull request May 18, 2026

fix: Allow direct commits for unprotected files with push restrictions (#37657) #37756

Merged

GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels May 18, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: Allow direct commits for unprotected files with push restrictions#37657

fix: Allow direct commits for unprotected files with push restrictions#37657
silverwind merged 11 commits into
go-gitea:mainfrom
bircni:fix-37655

bircni commented May 11, 2026

Uh oh!

lunny commented May 11, 2026

Uh oh!

bircni commented May 11, 2026

Uh oh!

wxiaoguang left a comment

Uh oh!

bircni commented May 11, 2026

Uh oh!

wxiaoguang commented May 11, 2026

Uh oh!

bircni commented May 11, 2026

Uh oh!

wxiaoguang commented May 11, 2026

Uh oh!

wxiaoguang commented May 11, 2026

Uh oh!

bircni commented May 12, 2026

Uh oh!

Uh oh!

wxiaoguang commented May 13, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

bircni commented May 11, 2026

Uh oh!

lunny commented May 11, 2026

Uh oh!

bircni commented May 11, 2026

Uh oh!

wxiaoguang left a comment

Choose a reason for hiding this comment

Uh oh!

bircni commented May 11, 2026

Uh oh!

wxiaoguang commented May 11, 2026

Uh oh!

bircni commented May 11, 2026

Uh oh!

wxiaoguang commented May 11, 2026

Uh oh!

wxiaoguang commented May 11, 2026

Uh oh!

bircni commented May 12, 2026

Uh oh!

Uh oh!

wxiaoguang commented May 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

wxiaoguang commented May 13, 2026 •

edited

Loading