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

In basic auth check for tokens before call UserSignIn (#5725) #6083

Merged
merged 1 commit into from
Feb 15, 2019

Conversation

lafriks
Copy link
Member

@lafriks lafriks commented Feb 15, 2019

Backport #5725

* Check first if user/password is a token

* In basic auth check if user/password is a token

* Remove unnecessary else statement

* Changes of fmt
@lafriks lafriks added this to the 1.7.2 milestone Feb 15, 2019
@techknowlogick techknowlogick modified the milestones: 1.7.2, 1.7.3 Feb 15, 2019
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Feb 15, 2019
@lafriks
Copy link
Member Author

lafriks commented Feb 15, 2019

@techknowlogick really need this one to get out asap... drone is unusable with AD server with user locking on unsuccessful auths as on every build it blocks users :(

@techknowlogick
Copy link
Member

@lafriks ok, as we haven’t published blog post yet I think we can get this one in to 1.7.2

@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 15, 2019
@lafriks lafriks modified the milestones: 1.7.3, 1.7.2 Feb 15, 2019
@lafriks lafriks merged commit 1d8e56e into go-gitea:release/v1.7 Feb 15, 2019
@lafriks lafriks deleted the backport/fix/token-auth branch February 15, 2019 08:01
@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
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.

5 participants