2022-10-18 03:24:12 +02:00
|
|
|
// Copyright 2022 Woodpecker Authors
|
2018-02-20 00:24:10 +02:00
|
|
|
// Copyright 2018 Drone.IO Inc.
|
2018-03-21 15:02:17 +02:00
|
|
|
//
|
2018-02-20 00:24:10 +02:00
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
2018-03-21 15:02:17 +02:00
|
|
|
//
|
2018-02-20 00:24:10 +02:00
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
2018-03-21 15:02:17 +02:00
|
|
|
//
|
2018-02-20 00:24:10 +02:00
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
2015-07-25 10:49:39 +02:00
|
|
|
package gitlab
|
|
|
|
|
|
|
|
import (
|
2021-09-28 12:56:59 +02:00
|
|
|
"context"
|
2015-07-25 10:49:39 +02:00
|
|
|
"crypto/tls"
|
|
|
|
"fmt"
|
2022-08-26 21:42:41 +02:00
|
|
|
"io"
|
2015-07-25 10:49:39 +02:00
|
|
|
"net/http"
|
2015-07-27 01:52:18 +02:00
|
|
|
"net/url"
|
2022-09-05 17:08:51 +02:00
|
|
|
"strconv"
|
2015-07-25 10:49:39 +02:00
|
|
|
"strings"
|
2022-08-24 15:46:11 +02:00
|
|
|
"time"
|
2015-07-25 10:49:39 +02:00
|
|
|
|
2022-01-03 17:35:46 +02:00
|
|
|
"github.com/rs/zerolog/log"
|
2021-10-12 09:25:13 +02:00
|
|
|
"github.com/xanzy/go-gitlab"
|
2022-08-26 21:42:41 +02:00
|
|
|
"golang.org/x/oauth2"
|
2021-10-12 09:25:13 +02:00
|
|
|
|
2021-08-20 16:32:52 +02:00
|
|
|
"github.com/woodpecker-ci/woodpecker/server"
|
2022-11-05 01:35:06 +02:00
|
|
|
"github.com/woodpecker-ci/woodpecker/server/forge"
|
|
|
|
"github.com/woodpecker-ci/woodpecker/server/forge/common"
|
2022-11-06 13:44:04 +02:00
|
|
|
forge_types "github.com/woodpecker-ci/woodpecker/server/forge/types"
|
2021-09-27 19:51:55 +02:00
|
|
|
"github.com/woodpecker-ci/woodpecker/server/model"
|
2022-01-18 00:46:59 +02:00
|
|
|
"github.com/woodpecker-ci/woodpecker/server/store"
|
|
|
|
"github.com/woodpecker-ci/woodpecker/shared/utils"
|
2015-07-25 10:49:39 +02:00
|
|
|
)
|
|
|
|
|
2021-10-03 14:42:47 +02:00
|
|
|
const (
|
2021-12-28 18:02:49 +02:00
|
|
|
defaultScope = "api"
|
|
|
|
perPage = 100
|
2021-10-03 14:42:47 +02:00
|
|
|
)
|
2016-05-02 01:30:00 +02:00
|
|
|
|
|
|
|
// Opts defines configuration options.
|
|
|
|
type Opts struct {
|
2021-10-03 14:42:47 +02:00
|
|
|
URL string // Gitlab server url.
|
|
|
|
ClientID string // Oauth2 client id.
|
|
|
|
ClientSecret string // Oauth2 client secret.
|
|
|
|
SkipVerify bool // Skip ssl verification.
|
|
|
|
}
|
|
|
|
|
2022-11-05 01:35:06 +02:00
|
|
|
// Gitlab implements "Forge" interface
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
type GitLab struct {
|
2023-05-31 18:30:41 +02:00
|
|
|
url string
|
2021-10-03 14:42:47 +02:00
|
|
|
ClientID string
|
|
|
|
ClientSecret string
|
|
|
|
SkipVerify bool
|
|
|
|
HideArchives bool
|
|
|
|
Search bool
|
2016-05-02 01:30:00 +02:00
|
|
|
}
|
|
|
|
|
2022-11-05 01:35:06 +02:00
|
|
|
// New returns a Forge implementation that integrates with Gitlab, an open
|
2016-05-02 01:30:00 +02:00
|
|
|
// source Git service. See https://gitlab.com
|
2022-11-05 01:35:06 +02:00
|
|
|
func New(opts Opts) (forge.Forge, error) {
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
return &GitLab{
|
2023-05-31 18:30:41 +02:00
|
|
|
url: opts.URL,
|
2021-10-03 14:42:47 +02:00
|
|
|
ClientID: opts.ClientID,
|
|
|
|
ClientSecret: opts.ClientSecret,
|
|
|
|
SkipVerify: opts.SkipVerify,
|
2016-05-02 01:30:00 +02:00
|
|
|
}, nil
|
|
|
|
}
|
2015-07-25 10:49:39 +02:00
|
|
|
|
2022-06-17 20:14:01 +02:00
|
|
|
// Name returns the string name of this driver
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
func (g *GitLab) Name() string {
|
2022-06-17 20:14:01 +02:00
|
|
|
return "gitlab"
|
|
|
|
}
|
|
|
|
|
2023-05-31 18:30:41 +02:00
|
|
|
// URL returns the root url of a configured forge
|
|
|
|
func (g *GitLab) URL() string {
|
|
|
|
return g.url
|
|
|
|
}
|
|
|
|
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
func (g *GitLab) oauth2Config(ctx context.Context) (*oauth2.Config, context.Context) {
|
2022-08-24 15:46:11 +02:00
|
|
|
return &oauth2.Config{
|
2022-08-26 21:42:41 +02:00
|
|
|
ClientID: g.ClientID,
|
|
|
|
ClientSecret: g.ClientSecret,
|
|
|
|
Endpoint: oauth2.Endpoint{
|
2023-05-31 18:30:41 +02:00
|
|
|
AuthURL: fmt.Sprintf("%s/oauth/authorize", g.url),
|
|
|
|
TokenURL: fmt.Sprintf("%s/oauth/token", g.url),
|
2022-08-26 21:42:41 +02:00
|
|
|
},
|
|
|
|
Scopes: []string{defaultScope},
|
|
|
|
RedirectURL: fmt.Sprintf("%s/authorize", server.Config.Server.OAuthHost),
|
|
|
|
},
|
|
|
|
|
|
|
|
context.WithValue(ctx, oauth2.HTTPClient, &http.Client{Transport: &http.Transport{
|
|
|
|
TLSClientConfig: &tls.Config{InsecureSkipVerify: g.SkipVerify},
|
|
|
|
Proxy: http.ProxyFromEnvironment,
|
|
|
|
}})
|
2022-08-24 15:46:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Login authenticates the session and returns the
|
2022-11-05 01:35:06 +02:00
|
|
|
// forge user details.
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
func (g *GitLab) Login(ctx context.Context, res http.ResponseWriter, req *http.Request) (*model.User, error) {
|
2022-08-26 21:42:41 +02:00
|
|
|
config, oauth2Ctx := g.oauth2Config(ctx)
|
2015-09-30 03:21:17 +02:00
|
|
|
|
2016-12-19 07:42:56 +02:00
|
|
|
// get the OAuth errors
|
|
|
|
if err := req.FormValue("error"); err != "" {
|
2022-11-06 13:44:04 +02:00
|
|
|
return nil, &forge_types.AuthError{
|
2016-12-19 18:22:11 +02:00
|
|
|
Err: err,
|
|
|
|
Description: req.FormValue("error_description"),
|
|
|
|
URI: req.FormValue("error_uri"),
|
2016-12-19 07:42:56 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-09-30 03:21:17 +02:00
|
|
|
// get the OAuth code
|
2022-01-05 22:50:23 +02:00
|
|
|
code := req.FormValue("code")
|
2015-09-30 03:21:17 +02:00
|
|
|
if len(code) == 0 {
|
2022-08-26 21:42:41 +02:00
|
|
|
http.Redirect(res, req, config.AuthCodeURL("woodpecker"), http.StatusSeeOther)
|
2016-05-02 01:30:00 +02:00
|
|
|
return nil, nil
|
2015-09-30 03:21:17 +02:00
|
|
|
}
|
|
|
|
|
2022-08-26 21:42:41 +02:00
|
|
|
token, err := config.Exchange(oauth2Ctx, code)
|
2015-07-25 10:49:39 +02:00
|
|
|
if err != nil {
|
2023-02-02 01:08:02 +02:00
|
|
|
return nil, fmt.Errorf("Error exchanging token. %w", err)
|
2015-09-30 03:21:17 +02:00
|
|
|
}
|
|
|
|
|
2023-05-31 18:30:41 +02:00
|
|
|
client, err := newClient(g.url, token.AccessToken, g.SkipVerify)
|
2021-10-03 14:42:47 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
login, _, err := client.Users.CurrentUser(gitlab.WithContext(ctx))
|
2015-09-30 03:21:17 +02:00
|
|
|
if err != nil {
|
2016-05-02 01:30:00 +02:00
|
|
|
return nil, err
|
2015-07-25 10:49:39 +02:00
|
|
|
}
|
2016-02-14 02:38:31 +02:00
|
|
|
|
2021-10-03 14:42:47 +02:00
|
|
|
user := &model.User{
|
2023-05-11 05:19:35 +02:00
|
|
|
Login: login.Username,
|
|
|
|
Email: login.Email,
|
|
|
|
Avatar: login.AvatarURL,
|
|
|
|
ForgeRemoteID: model.ForgeRemoteID(fmt.Sprint(login.ID)),
|
|
|
|
Token: token.AccessToken,
|
|
|
|
Secret: token.RefreshToken,
|
2021-10-03 14:42:47 +02:00
|
|
|
}
|
|
|
|
if !strings.HasPrefix(user.Avatar, "http") {
|
2023-05-31 18:30:41 +02:00
|
|
|
user.Avatar = g.url + "/" + login.AvatarURL
|
2015-08-10 09:15:33 +02:00
|
|
|
}
|
2015-09-30 03:21:17 +02:00
|
|
|
|
2016-05-02 01:30:00 +02:00
|
|
|
return user, nil
|
2015-07-25 10:49:39 +02:00
|
|
|
}
|
|
|
|
|
2022-08-24 15:46:11 +02:00
|
|
|
// Refresh refreshes the Gitlab oauth2 access token. If the token is
|
|
|
|
// refreshed the user is updated and a true value is returned.
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
func (g *GitLab) Refresh(ctx context.Context, user *model.User) (bool, error) {
|
2022-08-26 21:42:41 +02:00
|
|
|
config, oauth2Ctx := g.oauth2Config(ctx)
|
2022-08-24 15:46:11 +02:00
|
|
|
config.RedirectURL = ""
|
|
|
|
|
2022-08-26 21:42:41 +02:00
|
|
|
source := config.TokenSource(oauth2Ctx, &oauth2.Token{
|
|
|
|
AccessToken: user.Token,
|
|
|
|
RefreshToken: user.Secret,
|
|
|
|
Expiry: time.Unix(user.Expiry, 0),
|
|
|
|
})
|
2022-08-24 15:46:11 +02:00
|
|
|
|
2022-08-26 21:42:41 +02:00
|
|
|
token, err := source.Token()
|
|
|
|
if err != nil || len(token.AccessToken) == 0 {
|
2022-08-24 15:46:11 +02:00
|
|
|
return false, err
|
|
|
|
}
|
|
|
|
|
2022-08-26 21:42:41 +02:00
|
|
|
user.Token = token.AccessToken
|
|
|
|
user.Secret = token.RefreshToken
|
|
|
|
user.Expiry = token.Expiry.UTC().Unix()
|
2022-08-24 15:46:11 +02:00
|
|
|
return true, nil
|
|
|
|
}
|
|
|
|
|
2022-11-05 01:35:06 +02:00
|
|
|
// Auth authenticates the session and returns the forge user login for the given token
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
func (g *GitLab) Auth(ctx context.Context, token, _ string) (string, error) {
|
2023-05-31 18:30:41 +02:00
|
|
|
client, err := newClient(g.url, token, g.SkipVerify)
|
2021-10-03 14:42:47 +02:00
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
|
|
|
login, _, err := client.Users.CurrentUser(gitlab.WithContext(ctx))
|
2015-09-30 03:21:17 +02:00
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
return login.Username, nil
|
2015-07-25 10:49:39 +02:00
|
|
|
}
|
|
|
|
|
2022-11-05 01:35:06 +02:00
|
|
|
// Teams fetches a list of team memberships from the forge.
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
func (g *GitLab) Teams(ctx context.Context, user *model.User) ([]*model.Team, error) {
|
2023-05-31 18:30:41 +02:00
|
|
|
client, err := newClient(g.url, user.Token, g.SkipVerify)
|
2016-05-02 01:30:00 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2021-10-03 14:42:47 +02:00
|
|
|
|
|
|
|
teams := make([]*model.Team, 0, perPage)
|
|
|
|
|
|
|
|
for i := 1; true; i++ {
|
|
|
|
batch, _, err := client.Groups.ListGroups(&gitlab.ListGroupsOptions{
|
|
|
|
ListOptions: gitlab.ListOptions{Page: i, PerPage: perPage},
|
|
|
|
AllAvailable: gitlab.Bool(false),
|
2021-10-08 18:35:56 +02:00
|
|
|
MinAccessLevel: gitlab.AccessLevel(gitlab.DeveloperPermissions), // TODO: check what's best here
|
2021-10-03 14:42:47 +02:00
|
|
|
}, gitlab.WithContext(ctx))
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
for i := range batch {
|
|
|
|
teams = append(teams, &model.Team{
|
|
|
|
Login: batch[i].Name,
|
|
|
|
Avatar: batch[i].AvatarURL,
|
|
|
|
},
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(batch) < perPage {
|
|
|
|
break
|
|
|
|
}
|
2016-05-02 01:30:00 +02:00
|
|
|
}
|
2021-10-03 14:42:47 +02:00
|
|
|
|
2016-05-02 01:30:00 +02:00
|
|
|
return teams, nil
|
|
|
|
}
|
|
|
|
|
2022-11-05 01:35:06 +02:00
|
|
|
// getProject fetches the named repository from the forge.
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
func (g *GitLab) getProject(ctx context.Context, client *gitlab.Client, owner, name string) (*gitlab.Project, error) {
|
2021-10-03 14:42:47 +02:00
|
|
|
repo, _, err := client.Projects.GetProject(fmt.Sprintf("%s/%s", owner, name), nil, gitlab.WithContext(ctx))
|
2015-07-30 02:46:22 +02:00
|
|
|
if err != nil {
|
2015-07-28 08:38:15 +02:00
|
|
|
return nil, err
|
|
|
|
}
|
2016-02-01 01:22:44 +02:00
|
|
|
|
2021-10-03 14:42:47 +02:00
|
|
|
return repo, nil
|
|
|
|
}
|
2016-02-01 01:22:44 +02:00
|
|
|
|
2022-11-05 01:35:06 +02:00
|
|
|
// Repo fetches the repository from the forge.
|
2022-11-15 16:01:23 +02:00
|
|
|
func (g *GitLab) Repo(ctx context.Context, user *model.User, remoteID model.ForgeRemoteID, owner, name string) (*model.Repo, error) {
|
2023-05-31 18:30:41 +02:00
|
|
|
client, err := newClient(g.url, user.Token, g.SkipVerify)
|
2021-10-03 14:42:47 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
2015-07-25 10:49:39 +02:00
|
|
|
}
|
|
|
|
|
2022-11-15 16:01:23 +02:00
|
|
|
if remoteID.IsValid() {
|
|
|
|
intID, err := strconv.ParseInt(string(remoteID), 10, 64)
|
2022-09-05 17:08:51 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
_repo, _, err := client.Projects.GetProject(int(intID), nil, gitlab.WithContext(ctx))
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
return g.convertGitLabRepo(_repo)
|
2022-09-05 17:08:51 +02:00
|
|
|
}
|
|
|
|
|
2021-12-01 15:22:06 +02:00
|
|
|
_repo, err := g.getProject(ctx, client, owner, name)
|
2021-10-03 14:42:47 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
2015-07-25 10:49:39 +02:00
|
|
|
}
|
2015-07-27 00:29:51 +02:00
|
|
|
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
return g.convertGitLabRepo(_repo)
|
2015-07-25 10:49:39 +02:00
|
|
|
}
|
|
|
|
|
2022-11-05 01:35:06 +02:00
|
|
|
// Repos fetches a list of repos from the forge.
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
func (g *GitLab) Repos(ctx context.Context, user *model.User) ([]*model.Repo, error) {
|
2023-05-31 18:30:41 +02:00
|
|
|
client, err := newClient(g.url, user.Token, g.SkipVerify)
|
2015-09-30 03:21:17 +02:00
|
|
|
if err != nil {
|
2021-10-03 14:42:47 +02:00
|
|
|
return nil, err
|
2015-07-25 10:49:39 +02:00
|
|
|
}
|
|
|
|
|
2021-10-03 14:42:47 +02:00
|
|
|
repos := make([]*model.Repo, 0, perPage)
|
|
|
|
opts := &gitlab.ListProjectsOptions{
|
|
|
|
ListOptions: gitlab.ListOptions{PerPage: perPage},
|
2021-10-08 18:35:56 +02:00
|
|
|
MinAccessLevel: gitlab.AccessLevel(gitlab.DeveloperPermissions), // TODO: check what's best here
|
2021-10-03 14:42:47 +02:00
|
|
|
}
|
|
|
|
if g.HideArchives {
|
|
|
|
opts.Archived = gitlab.Bool(false)
|
|
|
|
}
|
2017-07-14 21:58:38 +02:00
|
|
|
|
2021-10-03 14:42:47 +02:00
|
|
|
for i := 1; true; i++ {
|
|
|
|
opts.Page = i
|
|
|
|
batch, _, err := client.Projects.ListProjects(opts, gitlab.WithContext(ctx))
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
2016-02-01 00:55:59 +02:00
|
|
|
}
|
2015-09-30 03:21:17 +02:00
|
|
|
|
2021-10-03 14:42:47 +02:00
|
|
|
for i := range batch {
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
repo, err := g.convertGitLabRepo(batch[i])
|
2021-10-03 14:42:47 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2022-01-03 17:35:46 +02:00
|
|
|
|
2021-10-03 14:42:47 +02:00
|
|
|
repos = append(repos, repo)
|
2017-07-14 21:58:38 +02:00
|
|
|
}
|
|
|
|
|
2021-10-03 14:42:47 +02:00
|
|
|
if len(batch) < perPage {
|
|
|
|
break
|
|
|
|
}
|
2015-09-30 03:21:17 +02:00
|
|
|
}
|
2016-02-01 00:55:59 +02:00
|
|
|
|
2015-09-30 03:21:17 +02:00
|
|
|
return repos, err
|
|
|
|
}
|
|
|
|
|
2023-04-30 03:40:13 +02:00
|
|
|
func (g *GitLab) PullRequests(ctx context.Context, u *model.User, r *model.Repo, p *model.ListOptions) ([]*model.PullRequest, error) {
|
2023-06-03 03:03:06 +02:00
|
|
|
token := common.UserToken(ctx, r, u)
|
2023-05-31 18:30:41 +02:00
|
|
|
client, err := newClient(g.url, token, g.SkipVerify)
|
2023-03-19 11:43:57 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
_repo, err := g.getProject(ctx, client, r.Owner, r.Name)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
state := "open"
|
|
|
|
pullRequests, _, err := client.MergeRequests.ListProjectMergeRequests(_repo.ID, &gitlab.ListProjectMergeRequestsOptions{
|
2023-04-30 03:40:13 +02:00
|
|
|
ListOptions: gitlab.ListOptions{Page: p.Page, PerPage: p.PerPage},
|
2023-03-19 11:43:57 +02:00
|
|
|
State: &state,
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
result := make([]*model.PullRequest, len(pullRequests))
|
|
|
|
for i := range pullRequests {
|
|
|
|
result[i] = &model.PullRequest{
|
|
|
|
Index: int64(pullRequests[i].ID),
|
|
|
|
Title: pullRequests[i].Title,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return result, err
|
|
|
|
}
|
|
|
|
|
2022-11-05 01:35:06 +02:00
|
|
|
// File fetches a file from the forge repository and returns in string format.
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
func (g *GitLab) File(ctx context.Context, user *model.User, repo *model.Repo, pipeline *model.Pipeline, fileName string) ([]byte, error) {
|
2023-05-31 18:30:41 +02:00
|
|
|
client, err := newClient(g.url, user.Token, g.SkipVerify)
|
2017-03-18 13:25:53 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2021-12-01 15:22:06 +02:00
|
|
|
_repo, err := g.getProject(ctx, client, repo.Owner, repo.Name)
|
2017-03-18 13:25:53 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2022-10-18 03:24:12 +02:00
|
|
|
file, _, err := client.RepositoryFiles.GetRawFile(_repo.ID, fileName, &gitlab.GetRawFileOptions{Ref: &pipeline.Commit}, gitlab.WithContext(ctx))
|
2021-10-03 14:42:47 +02:00
|
|
|
return file, err
|
2017-03-18 13:25:53 +02:00
|
|
|
}
|
|
|
|
|
2022-11-05 01:35:06 +02:00
|
|
|
// Dir fetches a folder from the forge repository
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
func (g *GitLab) Dir(ctx context.Context, user *model.User, repo *model.Repo, pipeline *model.Pipeline, path string) ([]*forge_types.FileMeta, error) {
|
2023-05-31 18:30:41 +02:00
|
|
|
client, err := newClient(g.url, user.Token, g.SkipVerify)
|
2021-10-03 14:42:47 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2022-11-06 13:44:04 +02:00
|
|
|
files := make([]*forge_types.FileMeta, 0, perPage)
|
2021-12-01 15:22:06 +02:00
|
|
|
_repo, err := g.getProject(ctx, client, repo.Owner, repo.Name)
|
2021-10-03 14:42:47 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
opts := &gitlab.ListTreeOptions{
|
|
|
|
ListOptions: gitlab.ListOptions{PerPage: perPage},
|
|
|
|
Path: &path,
|
2022-10-18 03:24:12 +02:00
|
|
|
Ref: &pipeline.Commit,
|
2021-10-03 14:42:47 +02:00
|
|
|
Recursive: gitlab.Bool(false),
|
|
|
|
}
|
|
|
|
|
|
|
|
for i := 1; true; i++ {
|
|
|
|
opts.Page = 1
|
2021-12-01 15:22:06 +02:00
|
|
|
batch, _, err := client.Repositories.ListTree(_repo.ID, opts, gitlab.WithContext(ctx))
|
2021-10-03 14:42:47 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
for i := range batch {
|
|
|
|
if batch[i].Type != "blob" { // no file
|
|
|
|
continue
|
|
|
|
}
|
2022-10-18 03:24:12 +02:00
|
|
|
data, err := g.File(ctx, user, repo, pipeline, batch[i].Path)
|
2021-10-03 14:42:47 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2022-11-06 13:44:04 +02:00
|
|
|
files = append(files, &forge_types.FileMeta{
|
2021-10-03 14:42:47 +02:00
|
|
|
Name: batch[i].Path,
|
|
|
|
Data: data,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(batch) < perPage {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
2019-06-03 09:16:15 +02:00
|
|
|
|
2021-10-03 14:42:47 +02:00
|
|
|
return files, nil
|
2015-07-25 10:49:39 +02:00
|
|
|
}
|
|
|
|
|
2021-10-03 14:42:47 +02:00
|
|
|
// Status sends the commit status back to gitlab.
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
func (g *GitLab) Status(ctx context.Context, user *model.User, repo *model.Repo, pipeline *model.Pipeline, step *model.Step) error {
|
2023-05-31 18:30:41 +02:00
|
|
|
client, err := newClient(g.url, user.Token, g.SkipVerify)
|
2021-10-03 14:42:47 +02:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2021-12-01 15:22:06 +02:00
|
|
|
_repo, err := g.getProject(ctx, client, repo.Owner, repo.Name)
|
2021-10-03 14:42:47 +02:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2022-10-18 03:24:12 +02:00
|
|
|
_, _, err = client.Commits.SetCommitStatus(_repo.ID, pipeline.Commit, &gitlab.SetCommitStatusOptions{
|
2022-10-28 17:38:53 +02:00
|
|
|
State: getStatus(step.State),
|
|
|
|
Description: gitlab.String(common.GetPipelineStatusDescription(step.State)),
|
|
|
|
TargetURL: gitlab.String(common.GetPipelineStatusLink(repo, pipeline, step)),
|
|
|
|
Context: gitlab.String(common.GetPipelineStatusContext(repo, pipeline, step)),
|
2021-10-03 14:42:47 +02:00
|
|
|
}, gitlab.WithContext(ctx))
|
|
|
|
|
|
|
|
return err
|
|
|
|
}
|
2016-05-02 01:30:00 +02:00
|
|
|
|
|
|
|
// Netrc returns a netrc file capable of authenticating Gitlab requests and
|
|
|
|
// cloning Gitlab repositories. The netrc will use the global machine account
|
|
|
|
// when configured.
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
func (g *GitLab) Netrc(u *model.User, r *model.Repo) (*model.Netrc, error) {
|
2022-01-31 16:38:00 +02:00
|
|
|
login := ""
|
|
|
|
token := ""
|
|
|
|
|
|
|
|
if u != nil {
|
|
|
|
login = "oauth2"
|
|
|
|
token = u.Token
|
2015-09-02 05:42:18 +02:00
|
|
|
}
|
2022-01-31 16:38:00 +02:00
|
|
|
|
2022-02-26 03:54:15 +02:00
|
|
|
host, err := common.ExtractHostFromCloneURL(r.Clone)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2016-05-02 01:30:00 +02:00
|
|
|
return &model.Netrc{
|
2022-01-31 16:38:00 +02:00
|
|
|
Login: login,
|
|
|
|
Password: token,
|
2022-02-26 03:54:15 +02:00
|
|
|
Machine: host,
|
2016-05-02 01:30:00 +02:00
|
|
|
}, nil
|
2015-07-25 10:49:39 +02:00
|
|
|
}
|
|
|
|
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
func (g *GitLab) getTokenAndWebURL(link string) (token, webURL string, err error) {
|
2021-12-19 02:12:09 +02:00
|
|
|
uri, err := url.Parse(link)
|
|
|
|
if err != nil {
|
|
|
|
return "", "", err
|
|
|
|
}
|
|
|
|
token = uri.Query().Get("access_token")
|
|
|
|
webURL = fmt.Sprintf("%s://%s/api/hook", uri.Scheme, uri.Host)
|
|
|
|
return token, webURL, nil
|
|
|
|
}
|
|
|
|
|
2015-07-25 10:49:39 +02:00
|
|
|
// Activate activates a repository by adding a Post-commit hook and
|
|
|
|
// a Public Deploy key, if applicable.
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
func (g *GitLab) Activate(ctx context.Context, user *model.User, repo *model.Repo, link string) error {
|
2023-05-31 18:30:41 +02:00
|
|
|
client, err := newClient(g.url, user.Token, g.SkipVerify)
|
2015-07-30 02:46:22 +02:00
|
|
|
if err != nil {
|
2015-07-28 08:38:15 +02:00
|
|
|
return err
|
|
|
|
}
|
2021-12-19 02:12:09 +02:00
|
|
|
|
|
|
|
_repo, err := g.getProject(ctx, client, repo.Owner, repo.Name)
|
2015-07-25 10:49:39 +02:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2021-12-19 02:12:09 +02:00
|
|
|
token, webURL, err := g.getTokenAndWebURL(link)
|
2021-10-03 14:42:47 +02:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2021-12-19 02:12:09 +02:00
|
|
|
|
|
|
|
if len(token) == 0 {
|
|
|
|
return fmt.Errorf("no token found")
|
|
|
|
}
|
|
|
|
|
|
|
|
_, _, err = client.Projects.AddProjectHook(_repo.ID, &gitlab.AddProjectHookOptions{
|
|
|
|
URL: gitlab.String(webURL),
|
|
|
|
Token: gitlab.String(token),
|
|
|
|
PushEvents: gitlab.Bool(true),
|
|
|
|
TagPushEvents: gitlab.Bool(true),
|
|
|
|
MergeRequestsEvents: gitlab.Bool(true),
|
|
|
|
DeploymentEvents: gitlab.Bool(true),
|
2021-10-03 14:42:47 +02:00
|
|
|
EnableSSLVerification: gitlab.Bool(!g.SkipVerify),
|
|
|
|
}, gitlab.WithContext(ctx))
|
2021-12-19 02:12:09 +02:00
|
|
|
|
2021-10-03 14:42:47 +02:00
|
|
|
return err
|
2015-07-25 10:49:39 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Deactivate removes a repository by removing all the post-commit hooks
|
|
|
|
// which are equal to link and removing the SSH deploy key.
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
func (g *GitLab) Deactivate(ctx context.Context, user *model.User, repo *model.Repo, link string) error {
|
2023-05-31 18:30:41 +02:00
|
|
|
client, err := newClient(g.url, user.Token, g.SkipVerify)
|
2015-07-30 02:46:22 +02:00
|
|
|
if err != nil {
|
2015-07-28 08:38:15 +02:00
|
|
|
return err
|
|
|
|
}
|
2015-07-25 10:49:39 +02:00
|
|
|
|
2021-12-01 15:22:06 +02:00
|
|
|
_repo, err := g.getProject(ctx, client, repo.Owner, repo.Name)
|
2021-10-03 14:42:47 +02:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2021-12-19 02:12:09 +02:00
|
|
|
|
|
|
|
_, webURL, err := g.getTokenAndWebURL(link)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
hookID := -1
|
|
|
|
listProjectHooksOptions := &gitlab.ListProjectHooksOptions{
|
|
|
|
PerPage: 10,
|
|
|
|
Page: 1,
|
|
|
|
}
|
|
|
|
for {
|
|
|
|
hooks, resp, err := client.Projects.ListProjectHooks(_repo.ID, listProjectHooksOptions, gitlab.WithContext(ctx))
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, hook := range hooks {
|
|
|
|
if hook.URL == webURL {
|
|
|
|
hookID = hook.ID
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Exit the loop when we've seen all pages
|
|
|
|
if resp.CurrentPage >= resp.TotalPages {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
|
|
|
|
// Update the page number to get the next page
|
|
|
|
listProjectHooksOptions.Page = resp.NextPage
|
|
|
|
}
|
|
|
|
|
|
|
|
if hookID == -1 {
|
|
|
|
return fmt.Errorf("could not find hook to delete")
|
|
|
|
}
|
|
|
|
|
|
|
|
_, err = client.Projects.DeleteProjectHook(_repo.ID, hookID, gitlab.WithContext(ctx))
|
2021-10-03 14:42:47 +02:00
|
|
|
|
|
|
|
return err
|
2015-07-25 10:49:39 +02:00
|
|
|
}
|
|
|
|
|
2021-10-27 02:47:55 +02:00
|
|
|
// Branches returns the names of all branches for the named repository.
|
2023-04-30 03:40:13 +02:00
|
|
|
func (g *GitLab) Branches(ctx context.Context, user *model.User, repo *model.Repo, p *model.ListOptions) ([]string, error) {
|
2023-06-03 03:03:06 +02:00
|
|
|
token := common.UserToken(ctx, repo, user)
|
2023-05-31 18:30:41 +02:00
|
|
|
client, err := newClient(g.url, token, g.SkipVerify)
|
2021-10-27 02:47:55 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2021-12-01 15:22:06 +02:00
|
|
|
_repo, err := g.getProject(ctx, client, repo.Owner, repo.Name)
|
2021-10-27 02:47:55 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2023-04-30 03:40:13 +02:00
|
|
|
gitlabBranches, _, err := client.Branches.ListBranches(_repo.ID,
|
|
|
|
&gitlab.ListBranchesOptions{ListOptions: gitlab.ListOptions{Page: p.Page, PerPage: p.PerPage}},
|
|
|
|
gitlab.WithContext(ctx))
|
2021-10-27 02:47:55 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
branches := make([]string, 0)
|
|
|
|
for _, branch := range gitlabBranches {
|
|
|
|
branches = append(branches, branch.Name)
|
|
|
|
}
|
|
|
|
return branches, nil
|
|
|
|
}
|
|
|
|
|
2022-11-09 09:12:17 +02:00
|
|
|
// BranchHead returns the sha of the head (latest commit) of the specified branch
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
func (g *GitLab) BranchHead(ctx context.Context, u *model.User, r *model.Repo, branch string) (string, error) {
|
2023-06-03 03:03:06 +02:00
|
|
|
token := common.UserToken(ctx, r, u)
|
2023-05-31 18:30:41 +02:00
|
|
|
client, err := newClient(g.url, token, g.SkipVerify)
|
2022-09-01 00:36:32 +02:00
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
|
|
|
_repo, err := g.getProject(ctx, client, r.Owner, r.Name)
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
|
|
|
b, _, err := client.Branches.GetBranch(_repo.ID, branch, gitlab.WithContext(ctx))
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
|
|
|
return b.Commit.ID, nil
|
|
|
|
}
|
|
|
|
|
2021-10-03 14:42:47 +02:00
|
|
|
// Hook parses the post-commit hook from the Request body
|
2015-07-25 10:49:39 +02:00
|
|
|
// and returns the required data in a standard format.
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
func (g *GitLab) Hook(ctx context.Context, req *http.Request) (*model.Repo, *model.Pipeline, error) {
|
2015-07-26 01:22:16 +02:00
|
|
|
defer req.Body.Close()
|
2022-08-26 21:42:41 +02:00
|
|
|
payload, err := io.ReadAll(req.Body)
|
2015-07-26 01:22:16 +02:00
|
|
|
if err != nil {
|
2015-09-30 03:21:17 +02:00
|
|
|
return nil, nil, err
|
2015-07-26 01:22:16 +02:00
|
|
|
}
|
|
|
|
|
2021-12-12 22:40:36 +02:00
|
|
|
parsed, err := gitlab.ParseWebhook(gitlab.WebhookEventType(req), payload)
|
2021-10-03 14:42:47 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, nil, err
|
2015-12-12 19:09:59 +02:00
|
|
|
}
|
|
|
|
|
2021-10-03 14:42:47 +02:00
|
|
|
switch event := parsed.(type) {
|
|
|
|
case *gitlab.MergeEvent:
|
2022-10-18 03:24:12 +02:00
|
|
|
mergeIID, repo, pipeline, err := convertMergeRequestHook(event, req)
|
2022-01-18 00:46:59 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, nil, err
|
|
|
|
}
|
|
|
|
|
2022-10-18 03:24:12 +02:00
|
|
|
if pipeline, err = g.loadChangedFilesFromMergeRequest(ctx, repo, pipeline, mergeIID); err != nil {
|
2022-01-18 00:46:59 +02:00
|
|
|
return nil, nil, err
|
|
|
|
}
|
|
|
|
|
2022-10-18 03:24:12 +02:00
|
|
|
return repo, pipeline, nil
|
2021-10-03 14:42:47 +02:00
|
|
|
case *gitlab.PushEvent:
|
2022-01-18 00:46:59 +02:00
|
|
|
return convertPushHook(event)
|
2021-10-03 14:42:47 +02:00
|
|
|
case *gitlab.TagEvent:
|
2022-01-18 00:46:59 +02:00
|
|
|
return convertTagHook(event)
|
2015-12-12 19:09:59 +02:00
|
|
|
default:
|
2021-10-03 14:42:47 +02:00
|
|
|
return nil, nil, nil
|
2015-12-12 19:09:59 +02:00
|
|
|
}
|
|
|
|
}
|
2022-01-18 00:46:59 +02:00
|
|
|
|
2022-07-25 03:09:35 +02:00
|
|
|
// OrgMembership returns if user is member of organization and if user
|
|
|
|
// is admin/owner in this organization.
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
func (g *GitLab) OrgMembership(ctx context.Context, u *model.User, owner string) (*model.OrgPerm, error) {
|
2023-05-31 18:30:41 +02:00
|
|
|
client, err := newClient(g.url, u.Token, g.SkipVerify)
|
2022-07-25 03:09:35 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
groups, _, err := client.Groups.ListGroups(&gitlab.ListGroupsOptions{
|
|
|
|
ListOptions: gitlab.ListOptions{
|
|
|
|
Page: 1,
|
|
|
|
PerPage: 100,
|
|
|
|
},
|
|
|
|
Search: gitlab.String(owner),
|
|
|
|
}, gitlab.WithContext(ctx))
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
var gid int
|
|
|
|
for _, group := range groups {
|
|
|
|
if group.Name == owner {
|
|
|
|
gid = group.ID
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if gid == 0 {
|
|
|
|
return &model.OrgPerm{}, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
opts := &gitlab.ListGroupMembersOptions{
|
|
|
|
ListOptions: gitlab.ListOptions{
|
|
|
|
Page: 1,
|
|
|
|
PerPage: 100,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for i := 1; true; i++ {
|
|
|
|
opts.Page = i
|
|
|
|
members, _, err := client.Groups.ListAllGroupMembers(gid, opts, gitlab.WithContext(ctx))
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
for _, member := range members {
|
|
|
|
if member.Username == u.Login {
|
|
|
|
return &model.OrgPerm{Member: true, Admin: member.AccessLevel >= gitlab.OwnerPermissions}, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(members) < opts.PerPage {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return &model.OrgPerm{}, nil
|
|
|
|
}
|
|
|
|
|
Fix spelling: gitlab (#1411)
This is most of the GitLab changes that I dropped from #1405.
As before, I'm happy to adjust things...
<details><summary>Problematic Changes</summary>
Fwiw, this is the part that causes the tests to break (I don't
understand why, but I'm leaving this change out):
```patch
commit 703cbe3ed398bf32535120ead733b80aa145c8db
Author: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue Nov 8 17:09:06 2022 -0500
event?! -- this seems broken
diff --git a/server/forge/gitlab/testdata/hooks.go b/server/forge/gitlab/testdata/hooks.go
index 7d39306..e394afc 100644
--- a/server/forge/gitlab/testdata/hooks.go
+++ b/server/forge/gitlab/testdata/hooks.go
@@ -27,7 +27,7 @@ var (
ServiceHookHeaders = http.Header{
"Content-Type": []string{"application/json"},
"User-Agent": []string{"GitLab/14.3.0"},
- "X-Gitlab-Event": []string{"Service Hook"},
+ "X-GitLab-Event": []string{"Service Hook"},
}
)
diff --git a/shared/token/token.go b/shared/token/token.go
index 3f15537..191e5ee 100644
--- a/shared/token/token.go
+++ b/shared/token/token.go
@@ -64,7 +64,7 @@ func ParseRequest(r *http.Request, fn SecretFunc) (*Token, error) {
return parse(bearer, fn)
}
- token = r.Header.Get("X-Gitlab-Token")
+ token = r.Header.Get("X-GitLab-Token")
if len(token) != 0 {
return parse(token, fn)
}
```
</details>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
2022-11-09 18:16:17 +02:00
|
|
|
func (g *GitLab) loadChangedFilesFromMergeRequest(ctx context.Context, tmpRepo *model.Repo, pipeline *model.Pipeline, mergeIID int) (*model.Pipeline, error) {
|
2022-01-18 00:46:59 +02:00
|
|
|
_store, ok := store.TryFromContext(ctx)
|
|
|
|
if !ok {
|
|
|
|
log.Error().Msg("could not get store from context")
|
2022-10-18 03:24:12 +02:00
|
|
|
return pipeline, nil
|
2022-01-18 00:46:59 +02:00
|
|
|
}
|
|
|
|
|
2022-11-15 16:01:23 +02:00
|
|
|
repo, err := _store.GetRepoNameFallback(tmpRepo.ForgeRemoteID, tmpRepo.FullName)
|
2022-01-18 00:46:59 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
user, err := _store.GetUser(repo.UserID)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2023-05-31 18:30:41 +02:00
|
|
|
client, err := newClient(g.url, user.Token, g.SkipVerify)
|
2022-01-18 00:46:59 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
_repo, err := g.getProject(ctx, client, repo.Owner, repo.Name)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
changes, _, err := client.MergeRequests.GetMergeRequestChanges(_repo.ID, mergeIID, &gitlab.GetMergeRequestChangesOptions{}, gitlab.WithContext(ctx))
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
files := make([]string, 0, len(changes.Changes)*2)
|
|
|
|
for _, file := range changes.Changes {
|
|
|
|
files = append(files, file.NewPath, file.OldPath)
|
|
|
|
}
|
2022-10-18 03:24:12 +02:00
|
|
|
pipeline.ChangedFiles = utils.DedupStrings(files)
|
2022-01-18 00:46:59 +02:00
|
|
|
|
2022-10-18 03:24:12 +02:00
|
|
|
return pipeline, nil
|
2022-01-18 00:46:59 +02:00
|
|
|
}
|