Skip to content

Commit

Permalink
gitsources: implement gitea oauth2 auth
Browse files Browse the repository at this point in the history
As from go-gitea/gitea#5378 gitea is an oauth2 provider.
  • Loading branch information
sgotti committed May 9, 2019
1 parent 6ff7edc commit 8c53de1
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 9 deletions.
59 changes: 54 additions & 5 deletions internal/gitsources/gitea/gitea.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package gitea

import (
"context"
"crypto/tls"
"fmt"
"net"
Expand All @@ -26,6 +27,7 @@ import (
"time"

gitsource "github.com/sorintlab/agola/internal/gitsources"
"golang.org/x/oauth2"

"code.gitea.io/sdk/gitea"
"github.com/pkg/errors"
Expand All @@ -38,14 +40,24 @@ const (
ClientNotFound = "404 Not Found"
)

var (
// gitea corrently doesn't have any auth scope
GiteaOauth2Scopes = []string{""}
)

type Opts struct {
URL string
Token string
SkipVerify bool
URL string
Token string
SkipVerify bool
Oauth2ClientID string
Oauth2Secret string
}

type Client struct {
client *gitea.Client
client *gitea.Client
URL string
oauth2ClientID string
oauth2Secret string
}

// fromCommitStatus converts a gitsource commit status to a gitea commit status
Expand Down Expand Up @@ -91,10 +103,47 @@ func New(opts Opts) (*Client, error) {
client.SetHTTPClient(httpClient)

return &Client{
client: client,
client: client,
URL: opts.URL,
oauth2ClientID: opts.Oauth2ClientID,
oauth2Secret: opts.Oauth2Secret,
}, nil
}

func (c *Client) oauth2Config(callbackURL string) *oauth2.Config {
return &oauth2.Config{
ClientID: c.oauth2ClientID,
ClientSecret: c.oauth2Secret,
Scopes: GiteaOauth2Scopes,
Endpoint: oauth2.Endpoint{
AuthURL: fmt.Sprintf("%s/login/oauth/authorize", c.URL),
TokenURL: fmt.Sprintf("%s/login/oauth/access_token", c.URL),
},
RedirectURL: callbackURL,
}
}

func (c *Client) GetOauth2AuthorizationURL(callbackURL, state string) (string, error) {
var config = c.oauth2Config(callbackURL)
return config.AuthCodeURL(state), nil
}

func (c *Client) RequestOauth2Token(callbackURL, code string) (*oauth2.Token, error) {
var config = c.oauth2Config(callbackURL)
token, err := config.Exchange(context.TODO(), code)
if err != nil {
return nil, errors.Wrapf(err, "cannot get oauth2 token")
}
return token, nil
}

func (c *Client) RefreshOauth2Token(refreshToken string) (*oauth2.Token, error) {
var config = c.oauth2Config("")
token := &oauth2.Token{RefreshToken: refreshToken}
ts := config.TokenSource(context.TODO(), token)
return ts.Token()
}

func (c *Client) LoginPassword(username, password, tokenName string) (string, error) {
// try to get agola access token if it already exists
var accessToken string
Expand Down
10 changes: 7 additions & 3 deletions internal/services/gateway/common/gitsource.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ import (

func newGitea(rs *types.RemoteSource, accessToken string) (*gitea.Client, error) {
return gitea.New(gitea.Opts{
URL: rs.APIURL,
SkipVerify: rs.SkipVerify,
Token: accessToken,
URL: rs.APIURL,
SkipVerify: rs.SkipVerify,
Token: accessToken,
Oauth2ClientID: rs.Oauth2ClientID,
Oauth2Secret: rs.Oauth2ClientSecret,
})
}

Expand Down Expand Up @@ -95,6 +97,8 @@ func GetOauth2Source(rs *types.RemoteSource, accessToken string) (gitsource.Oaut
var oauth2Source gitsource.Oauth2Source
var err error
switch rs.Type {
case types.RemoteSourceTypeGitea:
oauth2Source, err = newGitea(rs, accessToken)
case types.RemoteSourceTypeGitlab:
oauth2Source, err = newGitlab(rs, accessToken)
default:
Expand Down
2 changes: 1 addition & 1 deletion internal/services/types/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ type RemoteSource struct {
func SourceSupportedAuthTypes(rsType RemoteSourceType) []RemoteSourceAuthType {
switch rsType {
case RemoteSourceTypeGitea:
return []RemoteSourceAuthType{RemoteSourceAuthTypePassword}
return []RemoteSourceAuthType{RemoteSourceAuthTypeOauth2, RemoteSourceAuthTypePassword}
case RemoteSourceTypeGithub:
fallthrough
case RemoteSourceTypeGitlab:
Expand Down

0 comments on commit 8c53de1

Please sign in to comment.