Refactor merge conan and container auth preserve actions taskID#36560
Refactor merge conan and container auth preserve actions taskID#36560wxiaoguang merged 3 commits intogo-gitea:mainfrom
Conversation
ChristopherHX
commented
Feb 8, 2026
- Remove duplicated code
- Allow further ActionsUser package permission checks
* Remove duplicated code * Allow further ActionsUser package permission checks
|
RE #36173
Maybe also check if the taskid is still running..., or... |
* giteaofficial/main: Refactor merge conan and container auth preserve actions taskID (go-gitea#36560) Fix assignee sidebar links and empty placeholder after go-gitea#32465 refactor (go-gitea#36559) Fix various version parsing problems (go-gitea#36553) Fix highlight diff result (go-gitea#36539) Refactor Nuget Auth to reuse Basic Auth Token Validation (go-gitea#36558) Update go dependencies (go-gitea#36548) Prevent navigation keys from triggering actions during IME composition (go-gitea#36540) Fix various mermaid bugs (go-gitea#36547) Add `elk` layout support to mermaid (go-gitea#36486) Allow configuring default PR base branch (fixes go-gitea#36412) (go-gitea#36425) [skip ci] Updated translations via Crowdin Color command/error logs in Actions log (go-gitea#36538) Add paging headers (go-gitea#36521) Fix issues filter dropdown showing empty label scope section (go-gitea#36535) [SECURITY] fix: Adjust the toolchain version (go-gitea#36537) Hide `add-matcher` and `remove-matcher` from actions job logs (go-gitea#36520) Improve timeline entries for WIP prefix changes in pull requests (go-gitea#36518)
* origin/main: (34 commits) Fine tune diff highlighting (go-gitea#36592) Add code editor setting dropdowns (go-gitea#36534) Update to go 1.26.0 and golangci-lint 2.9.0 (go-gitea#36588) Improve diff highlighting (go-gitea#36583) Fix markup code block layout (go-gitea#36578) Remove striped tables in UI (go-gitea#36509) Fix vertical alignment of `.commit-sign-badge` children (go-gitea#36570) Fix mirror sync parser and fix mirror messages (go-gitea#36504) Update JS and PY deps (go-gitea#36576) Add viewer controller for mermaid (zoom, drag) (go-gitea#36557) Misc typescript tweaks (go-gitea#36523) Use full-file highlighting for diff sections (go-gitea#36561) fix(diff): reprocess htmx content after loading more files (go-gitea#36568) [skip ci] Updated translations via Crowdin Add wrap to runner label list (go-gitea#36565) fix: add dnf5 command for Fedora in RPM package instructions (go-gitea#36527) Enable pagination on GiteaDownloader.getIssueReactions() (go-gitea#36549) Refactor merge conan and container auth preserve actions taskID (go-gitea#36560) Fix assignee sidebar links and empty placeholder after go-gitea#32465 refactor (go-gitea#36559) Fix various version parsing problems (go-gitea#36553) ...
* origin/main: (152 commits) Fine tune diff highlighting (go-gitea#36592) Add code editor setting dropdowns (go-gitea#36534) Update to go 1.26.0 and golangci-lint 2.9.0 (go-gitea#36588) Improve diff highlighting (go-gitea#36583) Fix markup code block layout (go-gitea#36578) Remove striped tables in UI (go-gitea#36509) Fix vertical alignment of `.commit-sign-badge` children (go-gitea#36570) Fix mirror sync parser and fix mirror messages (go-gitea#36504) Update JS and PY deps (go-gitea#36576) Add viewer controller for mermaid (zoom, drag) (go-gitea#36557) Misc typescript tweaks (go-gitea#36523) Use full-file highlighting for diff sections (go-gitea#36561) fix(diff): reprocess htmx content after loading more files (go-gitea#36568) [skip ci] Updated translations via Crowdin Add wrap to runner label list (go-gitea#36565) fix: add dnf5 command for Fedora in RPM package instructions (go-gitea#36527) Enable pagination on GiteaDownloader.getIssueReactions() (go-gitea#36549) Refactor merge conan and container auth preserve actions taskID (go-gitea#36560) Fix assignee sidebar links and empty placeholder after go-gitea#32465 refactor (go-gitea#36559) Fix various version parsing problems (go-gitea#36553) ...
|
I think this change broke access token auth to the container registry |
|
I currently see no evidence for an authentication problem with container registry, e.g. used an application access token for login, after retrieving token the login worked. I will have a look at this, you mean problems like this? My binary seem to have database locking issues with sqlite instead of authentication issues. |
|
Both push and pull gives 401 for me with latest nightly. I built an image from Feb 8 which brought back the old working behaviour. So something since that date broke it at least. |
|
I also tried to rebuild at current HEAD of nightly No idea how your gitea log looks like, mine has exactly one 401, after the token exchange everything works both pull and push. EDIT |
Could you provide some more clues? For example:
Thank you very much. |
|
The tokens were created by 1.25.3 I think. Haven't tried to issue a new token. |
|
It's a token I use for my CI workflows. |
Do I understand correctly? |
|
Yes, I've created a technical user and issued an access token for it with the required scopes. I started on 1.25.3 and switched to nightly since I needed my fix for Gitlab release migration. It's been working fine until my nodes were replaced today and I got a newer nightly. 😁 And rolling back to a version before Feb 9 works fine again. |
|
I also use the same token to allow Kubernetes to pull images which also failed. |
|
Not sure whether ChristopherHX has some ideas about the problem. Till now I didn't find potential related code change for the problem. To continue debugging, some more clues would be very helpful (at least, to me ....)
|
|
For me would be helpful
Actually I don't think the old token can be a jwt once, since this is always regenerated by the container auth endpoint (In Github ghcr.io this has maximum one hour lifetime if I am not mistaken) that takes the Basic Auth Access token and returns a new jwt token (after this PR with an additional field that has value 0, since this is not an actions token) I also read over and over again this change, but except of the Auth name and the additional jwt field (the token might be longer now). I cannot see why and how exactly this fails on your end EDIT ActionsUserTaskID int64 `json:",omitempty"`Would omit ActionsUserTaskID from the token if zero, then it should be the same as before... |
|
I managed to get some stomach bug yesterday and have been totally floored today. Will try to get you the logs tomorrow. |
|
Finally got around to trying out the nightly again. And authenticating to the registry from the workflow gives this in my docker daemon logs: Creating a new token (by exec:ing into the running Gitea container and running |
|
On main branch, I exactly followed the steps: Unable to reproduce ..... |
|
Very strange. The only thing I did was to replace It worked fine up until February 16th when apparantly my nodes were replaced and I got and updated version of the nightly. Rolling back to "my own" image built from February 9th makes it work again. Something between the 9th and the 16th is making my system behave differently. I'm perfectly fine with that it might be something on my end but I need help to identify what that might be. Any pointers to where I should start? |
|
Something in my mind:
|
|
This is the only relevant thing I found in the Gitea log: |
|
This is Claudes investigation result: Rebuilding without greenteagc now to see if that helps. |
|
This PR also changes the behavior of loadOAuth2From: fix: duplicate startup warnings in admin panel (#36641) LoadCommonSettings -> loadCommonSettingsFrom -> loadOAuth2From |
OK, I can confirm it is caused by #36641. The reason is quite complicated ...... due to various legacy fragile logic of the setting handling. Will propose a fix. |
|
I think this one will fix: Fix incorrect setting loading order #36735 |
|
The new nightly build is ready. Hopefully the problem is fixed. Thank you very much. |
|
Still having problems. This is in the logs now: |
Strange, still I guess you are using a non-persistent config file without I am not sure why it still happens, my guesses are:
|
|
Aaaah, true, ignore me while I make sure I'm actually not using a cached image 😆 |
|
It's working perfectly fine! Thanks a lot for the fix. ❤️ |
…itea#36560) * Remove duplicated code * Allow further ActionsUser package permission checks --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>