fix .netrc authentication #2700

daviian · 2017-10-14T08:18:19Z

Reverted a part of #2184 to allow token usage without the need of 2FA.
But token is required if 2FA is enabled!

codecov-io · 2017-10-14T08:26:15Z

Codecov Report

Merging #2700 into master will not change coverage.
The diff coverage is n/a.

@@          Coverage Diff           @@
##           master   #2700   +/-   ##
======================================
  Coverage    27.1%   27.1%           
======================================
  Files          87      87           
  Lines       17191   17191           
======================================
  Hits         4659    4659           
  Misses      11852   11852           
  Partials      680     680

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 1ec4dc6...15998be. Read the comment docs.

lunny · 2017-10-14T08:54:12Z

@daviian but since harness/harness#2241 merged. This PR will broke it again?

lafriks

Yes I think that would break fixed drone

daviian · 2017-10-14T09:08:36Z

@lunny @lafriks Yes, but this would be the correct behaviour as defined for token authentication by github. IMHO the drone fix was an urgent hot fix and the drone shouldn't be the only target of the netrc capability.

But yes I see that it will be hard to do that change again :/ Sadly...

daviian · 2017-10-14T09:21:51Z

And current drone only works with latest gitea release... and that's not good at all. Every gitea user that uses drone is now forced to upgrade

lafriks · 2017-10-14T09:24:46Z

Drone support only 1.2 anyway as only 1.2 has status api

daviian · 2017-10-14T09:28:33Z

But as you can see in issues users use drone in 1.1.4 and earlier as well.

Signed-off-by: David Schneiderbauer <[email protected]>

daviian · 2017-10-14T10:02:25Z

@lunny @lafriks I changed it to support both options. Username as token as well as password as token.

So no break in drone and backwards compatibility.

Signed-off-by: David Schneiderbauer <[email protected]>

lunny · 2017-10-14T12:17:29Z

@daviian gitea 1.1.4 could use Gogs driver of drone.

lafriks · 2017-10-14T21:19:25Z

@daviian I still think it's not a good idea to do this as .netrc anyway supports both username&password and drone is only that use this and now that it has already changed to use new way, let's than keep just one way not to have problems later.

lunny · 2017-10-15T01:37:57Z

@lafriks but that ask people upgrade their drone to latest. So I will give this LGTM

lafriks · 2017-10-15T01:42:44Z

LGTM

Morlinest · 2017-10-15T01:40:39Z

routers/repo/http.go

+					if err != nil {
+						ctx.Handle(http.StatusInternalServerError, "GetUserByID", err)
+					}
+				} else {


Morlinest · 2017-10-15T01:45:04Z

routers/repo/http.go

+				if isUsernameToken {
+					authUser, err = models.GetUserByID(token.UID)
+					if err != nil {
+						ctx.Handle(http.StatusInternalServerError, "GetUserByID", err)


missing return?

Morlinest · 2017-10-15T14:51:00Z

routers/repo/http.go

+				if isUsernameToken {
+					// Assume username is token
+					authToken = authUsername
+				} else {


// Assume username is token authToken := authUsername if !isUsernameToken { // Assume password is token authToken = authPasswd

Signed-off-by: David Schneiderbauer <[email protected]>

daviian · 2017-10-15T14:59:31Z

Make LG-TM work

lafriks · 2017-10-15T15:18:57Z

Make it work again

lafriks · 2017-10-15T15:36:20Z

@daviian please backport to 1.2 branch

* provide both possible authentication solutions Signed-off-by: David Schneiderbauer <[email protected]>

tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 14, 2017

lafriks requested changes Oct 14, 2017

View reviewed changes

provide both possible authentication solutions

bed668c

Signed-off-by: David Schneiderbauer <[email protected]>

daviian force-pushed the bugfix/netrc-behaviour branch from 391f941 to bed668c Compare October 14, 2017 10:01

fix fmt errors

3bede06

Signed-off-by: David Schneiderbauer <[email protected]>

lafriks approved these changes Oct 14, 2017

View reviewed changes

lafriks added backport/v1.2 issue/regression Indicates a previously functioning feature or behavior that has broken or regressed after a change labels Oct 14, 2017

lafriks added this to the 1.3.0 milestone Oct 14, 2017

tboerger 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 Oct 15, 2017

tboerger 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 Oct 15, 2017

Merge branch 'master' into bugfix/netrc-behaviour

1607b7c

Morlinest suggested changes Oct 15, 2017

View reviewed changes

lafriks and others added 2 commits October 15, 2017 05:00

Add missing return and code cleanup

693ae57

Merge branch 'master' into bugfix/netrc-behaviour

a187b5b

Morlinest suggested changes Oct 15, 2017

View reviewed changes

simplify if construct

d33ad7a

Signed-off-by: David Schneiderbauer <[email protected]>

Morlinest approved these changes Oct 15, 2017

View reviewed changes

Merge branch 'master' into bugfix/netrc-behaviour

15998be

lafriks merged commit 4ccb0fe into go-gitea:master Oct 15, 2017

daviian deleted the bugfix/netrc-behaviour branch October 15, 2017 15:37

daviian added a commit to daviian/gitea that referenced this pull request Oct 15, 2017

fix .netrc authentication (go-gitea#2700)

8a07561

* provide both possible authentication solutions Signed-off-by: David Schneiderbauer <[email protected]>

daviian mentioned this pull request Oct 15, 2017

fix .netrc authentication (#2700) #2708

Merged

lafriks added the backport/done All backports for this PR have been created label Oct 15, 2017

lafriks pushed a commit that referenced this pull request Oct 15, 2017

fix .netrc authentication (#2700) (#2708)

6fae585

* provide both possible authentication solutions Signed-off-by: David Schneiderbauer <[email protected]>

go-gitea locked and limited conversation to collaborators Nov 23, 2020

Uh oh!

fix .netrc authentication #2700

fix .netrc authentication #2700

Uh oh!

Conversation

daviian commented Oct 14, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov-io commented Oct 14, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

lunny commented Oct 14, 2017

Uh oh!

lafriks left a comment

Choose a reason for hiding this comment

Uh oh!

daviian commented Oct 14, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

daviian commented Oct 14, 2017

Uh oh!

lafriks commented Oct 14, 2017

Uh oh!

daviian commented Oct 14, 2017

Uh oh!

daviian commented Oct 14, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lunny commented Oct 14, 2017

Uh oh!

lafriks commented Oct 14, 2017

Uh oh!

lunny commented Oct 15, 2017

Uh oh!

lafriks commented Oct 15, 2017

Uh oh!

Morlinest Oct 15, 2017

Choose a reason for hiding this comment

Uh oh!

Morlinest Oct 15, 2017

Choose a reason for hiding this comment

Uh oh!

Morlinest Oct 15, 2017

Choose a reason for hiding this comment

Uh oh!

daviian commented Oct 15, 2017

Uh oh!

lafriks commented Oct 15, 2017

Uh oh!

lafriks commented Oct 15, 2017

Uh oh!

Uh oh!

daviian commented Oct 14, 2017 •

edited

Loading

codecov-io commented Oct 14, 2017 •

edited

Loading

daviian commented Oct 14, 2017 •

edited

Loading

daviian commented Oct 14, 2017 •

edited

Loading