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

Ignore the migrate if u2f_registration is not exist #18760

Merged
merged 1 commit into from
Feb 14, 2022
Merged

Ignore the migrate if u2f_registration is not exist #18760

merged 1 commit into from
Feb 14, 2022

Conversation

lunny
Copy link
Member

@lunny lunny commented Feb 14, 2022

Fix #18759

@lunny lunny added type/bug skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. backport/v1.16 labels Feb 14, 2022
@lunny lunny mentioned this pull request Feb 14, 2022
Merged
@codecov-commenter
Copy link

Codecov Report

Merging #18760 (217e096) into main (4d93984) will decrease coverage by 0.06%.
The diff coverage is 42.73%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main   #18760      +/-   ##
==========================================
- Coverage   46.64%   46.58%   -0.07%     
==========================================
  Files         846      852       +6     
  Lines      121331   122451    +1120     
==========================================
+ Hits        56595    57043     +448     
- Misses      57859    58521     +662     
- Partials     6877     6887      +10
Impacted Files Coverage Δ
cmd/admin_auth_ldap.go 79.59% <ø> (ø)
modules/git/pipeline/lfs_nogogit.go 0.00% <0.00%> (ø)
modules/git/pipeline/namerev.go 0.00% <0.00%> (ø)
modules/queue/manager.go 39.59% <0.00%> (-0.83%) ⬇️
modules/queue/queue_bytefifo.go 51.27% <0.00%> (+1.82%) ⬆️
routers/api/v1/repo/migrate.go 50.71% <0.00%> (ø)
routers/api/v1/repo/patch.go 0.00% <0.00%> (ø)
routers/private/hook_verification.go 0.00% <0.00%> (ø)
routers/web/repo/cherry_pick.go 0.00% <0.00%> (ø)
routers/web/repo/patch.go 0.00% <0.00%> (ø)
... and 61 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 27af864...217e096. Read the comment docs.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 14, 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 Feb 14, 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 Feb 14, 2022
@zeripath zeripath merged commit 581a563 into go-gitea:main Feb 14, 2022
@zeripath
Copy link
Contributor

Please send backports

@lunny lunny deleted the lunny/fix_bug branch February 14, 2022 09:23
zeripath pushed a commit to zeripath/gitea that referenced this pull request Feb 14, 2022
@lunny @zeripath
Ignore the migrate if u2f_registration is not exist (go-gitea#18760)
b95bab5
@zeripath zeripath added the backport/done All backports for this PR have been created label Feb 14, 2022
zeripath added a commit that referenced this pull request Feb 14, 2022
@zeripath @lunny
Increase the size of the webauthn_credential credential_id field (#18739
3a78ac4 
) (#18756)

* Increase the size of the webauthn_credential credential_id field (#18739)

Backport #18739

Unfortunately credentialIDs in u2f are 255 bytes long which with base32 encoding
becomes 408 bytes. The default size of a xorm string field is only a VARCHAR(255)

This problem is not apparent on SQLite because strings get mapped to TEXT there.

Fix #18727

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Ignore the migrate if u2f_registration is not exist (#18760)

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Feb 15, 2022
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
9b30dbb 
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Prevent dangling GetAttribute calls (go-gitea#18754)
  Add example to render html files (go-gitea#18736)
  Fix a broken link in `commits_list_small.tmpl` (go-gitea#18763)
  Fix broken cancel button link on patch page (go-gitea#18718)
  Ignore the migrate if u2f_registration is not exist (go-gitea#18760)
  [skip ci] Updated translations via Crowdin
  Increase the size of the webauthn_credential credential_id field (go-gitea#18739)
  Fix isempty detection of git repository (go-gitea#18746)
Caellion added a commit to Caellion/gitea that referenced this pull request Feb 16, 2022
@Caellion
Merge branch 'main' of https://github.com/go-gitea/gitea
8adf230 
* 'main' of https://github.com/go-gitea/gitea: (87 commits)
  Fix template bug of LFS lock (go-gitea#18784)
  Various Mermaid improvements (go-gitea#18776)
  [skip ci] Updated translations via Crowdin
  Fix display time of milestones (go-gitea#18753)
  [skip ci] Updated translations via Crowdin
  Prevent dangling GetAttribute calls (go-gitea#18754)
  Add example to render html files (go-gitea#18736)
  Fix a broken link in `commits_list_small.tmpl` (go-gitea#18763)
  Fix broken cancel button link on patch page (go-gitea#18718)
  Ignore the migrate if u2f_registration is not exist (go-gitea#18760)
  [skip ci] Updated translations via Crowdin
  Increase the size of the webauthn_credential credential_id field 
(go-gitea#18739)
  Fix isempty detection of git repository (go-gitea#18746)
  [skip ci] Updated translations via Crowdin
  Send mail to issue/pr assignee/reviewer also when OnMention is set 
(go-gitea#18707)
  Reduce CI go module downloads, add make targets (go-gitea#18708)
  Add number in queue status to monitor page (go-gitea#18712)
  Fix source code line highlighting (go-gitea#18729)
  Fix forked repositories missed tags (go-gitea#18719)
  [skip ci] Updated translations via Crowdin
  ...
Chianina pushed a commit to Chianina/gitea that referenced this pull request Mar 28, 2022
@lunny
Ignore the migrate if u2f_registration is not exist (go-gitea#18760)
f6a50ca
@go-gitea go-gitea locked and limited conversation to collaborators Apr 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@adelowo adelowo adelowo 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. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Migration[209]: Increase WebAuthentication CredentialID size to 410
5 participants
@lunny @codecov-commenter @zeripath @adelowo @GiteaBot