github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-09-26 17:11:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Urgent fix for changed auth behavior on Gitea

Browse Source 
Within the PR https://github.com/go-gitea/gitea/pull/2184 on Gitea the
project dropped the standard behavior to use x-auth-basic personal
access token. So we should use a proper username and the token from now
on to support Gitea >= 1.2.0. Since this driver anyway only supports
Gitea >= 1.2.0 this won't be a breaking change on Drone side, the only
breaking change is on side of Gitea!
This commit is contained in:
Thomas Boerger
2017-10-12 14:33:25 +02:00
parent b727a3ce55
commit 517c003af2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
remote/gitea/gitea.go
View File

@@ -271,8 +271,8 @@ func (c *client) Netrc(u *model.User, r *model.Repo) (*model.Netrc, error) {
}, nil }, nil
} }
return &model.Netrc{ return &model.Netrc{
Login: u.Token, Login: u.Login,
Password: "x-oauth-basic", Password: u.Token,
Machine: c.Machine, Machine: c.Machine,
}, nil }, nil
} }

4
remote/gitea/gitea_test.go
View File

@@ -55,8 +55,8 @@ func Test_gitea(t *testing.T) {
}) })
netrc, _ := remote.Netrc(fakeUser, nil) netrc, _ := remote.Netrc(fakeUser, nil)
g.Assert(netrc.Machine).Equal("gitea.com") g.Assert(netrc.Machine).Equal("gitea.com")
g.Assert(netrc.Login).Equal(fakeUser.Token) g.Assert(netrc.Login).Equal(fakeUser.Login)
g.Assert(netrc.Password).Equal("x-oauth-basic") g.Assert(netrc.Password).Equal(fakeUser.Token)
}) })
g.It("Should return a netrc with the machine account", func() { g.It("Should return a netrc with the machine account", func() {
remote, _ := New(Opts{ remote, _ := New(Opts{