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

ensure timeout error is shown on u2f timeout #14417

Merged
merged 4 commits into from
Jan 22, 2021
Merged

ensure timeout error is shown on u2f timeout #14417

merged 4 commits into from
Jan 22, 2021

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented Jan 21, 2021 •
edited
Loading

U2F timeout error is not currently shown due to miss match the '-' and '_' in the class names on u2f_error.tmpl

@zeripath
ensure timeout error is shown on u2f timeout
1113c28 
Signed-off-by: Andrew Thornton <art27@cantab.net>
@6543 6543 added the type/bug label Jan 21, 2021
6543
6543 reviewed Jan 21, 2021
View reviewed changes
web_src/js/index.js
@@ -2243,7 +2243,7 @@ function u2fError(errorType) {
2: $('#u2f-error-2'),
3: $('#u2f-error-3'),
4: $('#u2f-error-4'),
5: $('.u2f-error-5')
5: $('.u2f_error_5')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this inconsistency really right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes look at line 29 in u2f_error.tmpl

Copy link
Member

@techknowlogick techknowlogick Jan 21, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wouldn't it be better to change L29 of the template to u2f-error-5 instead to retain consistency?

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 21, 2021
@zeripath
Copy link
Contributor Author

I would argue we should rename these classes and the locale keys to match:

interface ErrorCode {
const short OK = 0;
const short OTHER_ERROR = 1;
const short BAD_REQUEST = 2;
const short CONFIGURATION_UNSUPPORTED = 3;
const short DEVICE_INELIGIBLE = 4;
const short TIMEOUT = 5;
};

from https://fidoalliance.org/specs/fido-u2f-v1.0-nfc-bt-amendment-20150514/fido-u2f-javascript-api.html

But that would not be backportable.

@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 Jan 21, 2021
@techknowlogick
Copy link
Member

mmm... yes, that would be much better. although as you said, not backportable. Lets save the refactor for another PR then. I'll create an issue for the refactor and tag it as "good-first-issue" in case someone is looking for a PR to ease their way into contributing to Gitea.

techknowlogick
techknowlogick approved these changes Jan 21, 2021
View reviewed changes
Copy link
Member

@techknowlogick techknowlogick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approving per my latest comment.

@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 Jan 21, 2021
@6543
Copy link
Member

6543 commented Jan 22, 2021

🚀

@6543 6543 merged commit 20f980d into go-gitea:master Jan 22, 2021
@zeripath zeripath deleted the u2f-timeout-show-error branch January 22, 2021 17:27
zeripath added a commit to zeripath/gitea that referenced this pull request Jan 22, 2021
@zeripath
ensure timeout error is shown on u2f timeout (go-gitea#14417)
2c1f775 
Backport go-gitea#14417

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath mentioned this pull request Jan 22, 2021
Merged
6543 added a commit that referenced this pull request Jan 23, 2021
@zeripath @lunny @6543
ensure timeout error is shown on u2f timeout (#14417) (#14431)
841efac 
Backport #14417

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

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: 6543 <6543@obermui.de>
@6543 6543 added the backport/done All backports for this PR have been created label Jan 26, 2021
@go-gitea go-gitea locked and limited conversation to collaborators Mar 11, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@techknowlogick techknowlogick techknowlogick approved these changes

@6543 6543 6543 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. type/bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@zeripath @techknowlogick @6543 @GiteaBot