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.

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

allow U2F with default settings for gitea in subpath #12990

Merged
merged 5 commits into from
Oct 1, 2020

Conversation

techknowlogick
Copy link
Member

@techknowlogick techknowlogick commented Sep 30, 2020

credit to @zeripath for logic

Fix #10231
Likely fixes #5143

@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Sep 30, 2020
@codecov-commenter
Copy link

codecov-commenter commented Sep 30, 2020

Codecov Report

Merging #12990 into master will decrease coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #12990      +/-   ##
==========================================
- Coverage   42.59%   42.58%   -0.01%     
==========================================
  Files         671      671              
  Lines       73625    73625              
==========================================
- Hits        31363    31356       -7     
- Misses      37183    37195      +12     
+ Partials     5079     5074       -5     
Impacted Files Coverage Δ
modules/setting/setting.go 47.61% <100.00%> (ø)
modules/util/timer.go 42.85% <0.00%> (-42.86%) ⬇️
modules/indexer/stats/db.go 43.47% <0.00%> (-17.40%) ⬇️
services/pull/check.go 33.84% <0.00%> (-13.85%) ⬇️
modules/indexer/stats/queue.go 64.70% <0.00%> (-11.77%) ⬇️
modules/git/utils.go 73.77% <0.00%> (-3.28%) ⬇️
modules/git/repo.go 46.19% <0.00%> (-1.53%) ⬇️
models/pull.go 54.54% <0.00%> (-0.63%) ⬇️
models/error.go 35.19% <0.00%> (+0.33%) ⬆️
models/notification.go 66.66% <0.00%> (+0.90%) ⬆️
... and 6 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 c6da033...8ea8f7e. Read the comment docs.

@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 Sep 30, 2020
@techknowlogick
Copy link
Member Author

Blocking this as it needs more testing.

6543 added a commit to 6543-forks/gitea that referenced this pull request Oct 1, 2020
zeripath pushed a commit that referenced this pull request Oct 1, 2020
* Refactor use TrimSuffix instead of TrimRight

* TrimRight right

* has #12990
@zeripath
Copy link
Contributor

zeripath commented Oct 1, 2020

Looking at the settings code it is definitely the case that the AppSubURL does not have a terminal "/" and it is always the case the the AppURL has a terminal slash - therefore the proposed PR is correctly stripping off the AppSubURL

@zeripath zeripath added this to the 1.13.0 milestone Oct 1, 2020
@lunny lunny merged commit 156f54d into go-gitea:master Oct 1, 2020
@techknowlogick techknowlogick deleted the fix-10231 branch October 1, 2020 15:17
techknowlogick added a commit to techknowlogick/gitea that referenced this pull request Oct 1, 2020
* allow U2F with default settings for gitea in subpath

* use trim suffix

Co-authored-by: zeripath <[email protected]>
@techknowlogick techknowlogick added the backport/done All backports for this PR have been created label Oct 1, 2020
techknowlogick added a commit that referenced this pull request Oct 1, 2020
* allow U2F with default settings for gitea in subpath

* use trim suffix

Co-authored-by: zeripath <[email protected]>

Co-authored-by: zeripath <[email protected]>
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot register U2F key FireFox U2F Dongle Not Detected
6 participants