Skip to content
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

Jump to bottom

Fix token generation when using INTERNAL_TOKEN_URI #21669

Merged
merged 2 commits into from Nov 3, 2022
Merged

Fix token generation when using INTERNAL_TOKEN_URI #21669

merged 2 commits into from Nov 3, 2022

Conversation

wxiaoguang
Copy link
Contributor

Fix #21666
Caused by #19663

Before: when install, the INTERNAL_TOKEN was always generated and saved. But the internal token may be already there by INTERNAL_TOKEN_URI

After: INTERNAL_TOKEN_URI file must be non-empty. When install, skip internal token generation if the token exists.

@wxiaoguang wxiaoguang added this to the 1.18.0 milestone Nov 3, 2022
This was referenced Nov 3, 2022
Merged
Closed
@wxiaoguang wxiaoguang modified the milestones: 1.18.0, 1.19.0 Nov 3, 2022
@wxiaoguang wxiaoguang added the outdated/backport/v1.18 This PR should be backported to Gitea 1.18 label Nov 3, 2022
@wxiaoguang wxiaoguang mentioned this pull request Nov 3, 2022
Merged
@wxiaoguang wxiaoguang added backport/done All backports for this PR have been created skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Nov 3, 2022
@codecov-commenter

This comment was marked as off-topic.

Sign in to view
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 3, 2022
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Nov 3, 2022
@GiteaBot 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 Nov 3, 2022
zeripath pushed a commit that referenced this pull request Nov 3, 2022
@wxiaoguang
Fix token generation when using INTERNAL_TOKEN_URI (#21669) (#21670)
89d5292 
Backport #21669

Fix #21666
Caused by #19663

Before: when install, the INTERNAL_TOKEN was always generated and saved.
But the internal token may be already there by INTERNAL_TOKEN_URI

After: INTERNAL_TOKEN_URI file must be non-empty. When install, skip
internal token generation if the token exists.
@zeripath zeripath merged commit 4d1e2b8 into go-gitea:main Nov 3, 2022
zjjhot added a commit to zjjhot/gitea that referenced this pull request Nov 4, 2022
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
cc7c2c0 
* giteaofficial/main:
  Remove Gusted as Gitea maintainer  (go-gitea#21676)
  Fix token generation when using INTERNAL_TOKEN_URI (go-gitea#21669)
  Clean up formatting on install page (go-gitea#21668)
  Add Webhook authorization header (go-gitea#20926)
  feat: notify doers of a merge when automerging (go-gitea#21553)
  Remove deprecated DSA host key from Docker Container (go-gitea#21522)
  Alter package_version.metadata_json to LONGTEXT (go-gitea#21667)
  Handle branch name with prefix in GitHub migration (go-gitea#20357)
  [skip ci] Updated translations via Crowdin
  Split migrations folder (go-gitea#21549)
@wxiaoguang wxiaoguang deleted the fix-token branch November 5, 2022 08:48
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@zeripath zeripath zeripath approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. outdated/backport/v1.18 This PR should be backported to Gitea 1.18 skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Milestone
1.19.0
Development

Successfully merging this pull request may close these issues.

Docker installation failing when using INTERNAL_TOKEN_URI
5 participants
@wxiaoguang @codecov-commenter @lunny @zeripath @GiteaBot