snapshot of https://github.com/mattermost/mattermost.git (master, 2026-09-16; blobs > 131072B omitted)
Some checks failed
Server CI / Postgres (shard 0) (push) Has been skipped
Server CI / Postgres (shard 3) (push) Has been skipped
BuildEnv Docker Image / build-image (push) Failing after 4s
BuildEnv Docker Image / build-image-fips (push) Failing after 4s
Migration Review & Release Notes / Generate migration review & release notes (push) Failing after 3s
Server CI / Build Environment (push) Failing after 3s
Server CI / Postgres (shard 1) (push) Has been skipped
Tools CI / check-style (mattermost-govet) (push) Failing after 4s
Server CI / Postgres (shard 2) (push) Has been skipped
Tools CI / check-style (mmgotool) (push) Failing after 3s
Server CI / Elasticsearch v8 Compatibility (push) Has been skipped
Server CI / OpenSearch v2 Compatibility (push) Has been skipped
Server CI / Postgres FIPS (shard 0) (push) Has been skipped
Tools CI / Test (mattermost-govet) (push) Failing after 3s
Server CI / Postgres FIPS (shard 1) (push) Has been skipped
Server CI / Postgres FIPS (shard 2) (push) Has been skipped
Tools CI / Test (mmgotool) (push) Failing after 3s
Server CI / Postgres FIPS (shard 3) (push) Has been skipped
Server CI / Run mmctl tests (push) Has been skipped
Server CI / Run mmctl tests (FIPS) (push) Has been skipped
Server CI / Merge Postgres Test Results (push) Has been skipped
Server CI / Merge Postgres FIPS Test Results (push) Has been skipped
Server CI / Check backport migrations (push) Has been skipped
Server CI / Check generated files (push) Has been skipped
Server CI / check-style (push) Has been skipped
Server CI / Vet API (push) Has been skipped
Server CI / Build mattermost server app (push) Has been skipped
Server CI / Server CI Complete (push) Failing after 2s
Server CI / Server CI Artifacts (push) Has been skipped
Server CI / Sentry Upload (push) Has been skipped
Server CI / Server CI Report (push) Failing after 5m1s
Server CI Nightly Race / Race Detector (push) Has been skipped
CodeQL / Analyze (go) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Webapp CI Cache Warm / Warm Webapp node_modules Cache (push) Has been cancelled
E2E CI Cache Warm / Warm E2E npm Registry Cache (push) Has been cancelled
API / build (push) Has been cancelled
Web App CI / check-types (push) Has been cancelled
Web App CI / check-lint (push) Has been cancelled
Web App CI / check-i18n (push) Has been cancelled
Web App CI / check-external-links (push) Has been cancelled
Web App CI / test (platform) (push) Has been cancelled
Web App CI / test (mattermost-redux) (push) Has been cancelled
Web App CI / test (channels shard 1/4) (push) Has been cancelled
Web App CI / test (channels shard 2/4) (push) Has been cancelled
Web App CI / test (channels shard 3/4) (push) Has been cancelled
Web App CI / test (channels shard 4/4) (push) Has been cancelled
Web App CI / upload-coverage (push) Has been cancelled
Web App CI / build (push) Has been cancelled
YAML Lint / yamllint (push) Has been cancelled
Push mirrored docker images / cd/Push mirrored docker images (push) Has been cancelled
docs-cd / Build and deploy docs (push) Has been cancelled
Docs CI / build (push) Has been cancelled
E2E Cache Warm: Cypress deps / Warm Cypress deps cache (push) Has been cancelled
Scorecards supply-chain security / Scorecard analysis (push) Has been cancelled
Server CI Weekly / Postgres FIPS (push) Has been skipped
Server CI Weekly / Run mmctl tests (FIPS) (push) Has been skipped
Server CI Weekly / Postgres with binary parameters (push) Has been skipped
Server CI Weekly / Build Environment (push) Failing after 1s
Server CI Cache Warm / Warm Go Module and Build Cache (push) Failing after 2s
Server CI Nightly Race / Build Environment (push) Failing after 1s

This commit is contained in:
upstream-mirror
2026-09-16 00:29:55 +05:00
commit 240db4e2a7
15309 changed files with 2173406 additions and 0 deletions

View File

@@ -0,0 +1,119 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
package oauthgitlab
import (
"encoding/json"
"errors"
"io"
"strconv"
"strings"
"github.com/mattermost/mattermost/server/public/model"
"github.com/mattermost/mattermost/server/public/shared/mlog"
"github.com/mattermost/mattermost/server/public/shared/request"
"github.com/mattermost/mattermost/server/v8/einterfaces"
)
type GitLabProvider struct {
}
type GitLabUser struct {
Id int64 `json:"id"`
Username string `json:"username"`
Login string `json:"login"`
Email string `json:"email"`
Name string `json:"name"`
PreferredUsername string `json:"preferred_username"`
}
func init() {
provider := &GitLabProvider{}
einterfaces.RegisterOAuthProvider(model.UserAuthServiceGitlab, provider)
}
func userFromGitLabUser(logger mlog.LoggerIFace, glu *GitLabUser, settings *model.SSOSettings) *model.User {
user := &model.User{}
// set username in order of preference
var username string
if settings != nil && model.SafeDereference(settings.UsePreferredUsername) && glu.PreferredUsername != "" {
// to maintain consistency with other providers, we split the username by @ (if present) and
// take the first part (but only for the preferred username)
username = strings.Split(glu.PreferredUsername, "@")[0]
} else if glu.Username != "" {
username = glu.Username
} else {
username = glu.Login
}
user.Username = model.CleanUsername(logger, username)
splitName := strings.Split(glu.Name, " ")
if len(splitName) == 2 {
user.FirstName = splitName[0]
user.LastName = splitName[1]
} else if len(splitName) >= 2 {
user.FirstName = splitName[0]
user.LastName = strings.Join(splitName[1:], " ")
} else {
user.FirstName = glu.Name
}
user.Email = glu.Email
user.Email = strings.ToLower(user.Email)
userId := glu.getAuthData()
user.AuthData = &userId
user.AuthService = model.UserAuthServiceGitlab
return user
}
func gitLabUserFromJSON(data io.Reader) (*GitLabUser, error) {
decoder := json.NewDecoder(data)
var glu GitLabUser
err := decoder.Decode(&glu)
if err != nil {
return nil, err
}
return &glu, nil
}
func (glu *GitLabUser) IsValid() error {
if glu.Id == 0 {
return errors.New("user id can't be 0")
}
if glu.Email == "" {
return errors.New("user e-mail should not be empty")
}
return nil
}
func (glu *GitLabUser) getAuthData() string {
return strconv.FormatInt(glu.Id, 10)
}
func (gp *GitLabProvider) GetUserFromJSON(rctx request.CTX, data io.Reader, tokenUser *model.User, settings *model.SSOSettings) (*model.User, error) {
glu, err := gitLabUserFromJSON(data)
if err != nil {
return nil, err
}
if err = glu.IsValid(); err != nil {
return nil, err
}
return userFromGitLabUser(rctx.Logger(), glu, settings), nil
}
func (gp *GitLabProvider) GetSSOSettings(_ request.CTX, config *model.Config, service string) (*model.SSOSettings, error) {
return &config.GitLabSettings, nil
}
func (gp *GitLabProvider) GetUserFromIdToken(_ request.CTX, idToken string) (*model.User, error) {
return nil, nil
}
func (gp *GitLabProvider) IsSameUser(_ request.CTX, dbUser, oauthUser *model.User) bool {
return dbUser.AuthData == oauthUser.AuthData
}

View File

@@ -0,0 +1,320 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
package oauthgitlab
import (
"bytes"
"encoding/json"
"strconv"
"strings"
"testing"
"github.com/mattermost/mattermost/server/public/model"
"github.com/mattermost/mattermost/server/public/shared/mlog"
"github.com/mattermost/mattermost/server/public/shared/request"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestGitLabUserFromJSON(t *testing.T) {
rctx := request.TestContext(t)
glu := GitLabUser{
Id: 12345,
Username: "testuser",
Login: "testlogin",
Email: "test@example.com",
Name: "Test User",
}
provider := &GitLabProvider{}
t.Run("valid gitlab user", func(t *testing.T) {
b, err := json.Marshal(glu)
require.NoError(t, err)
userJSON, err := provider.GetUserFromJSON(rctx, bytes.NewReader(b), nil, nil)
require.NoError(t, err)
// We get AuthData via GetUserFromJSON which calls userFromGitLabUser which calls getAuthData
require.Equal(t, strconv.FormatInt(glu.Id, 10), *userJSON.AuthData)
// Check GetAuthDataFromJSON indirectly by ensuring GetUserFromJSON worked,
// as GetAuthDataFromJSON is not directly exported or used elsewhere in a testable way without duplicating logic.
// It relies on gitLabUserFromJSON and glu.IsValid, which are tested separately.
})
t.Run("empty body should fail validation", func(t *testing.T) {
// GetUserFromJSON should return an error because IsValid fails on the empty user
_, err := provider.GetUserFromJSON(rctx, strings.NewReader("{}"), nil, nil)
require.Error(t, err)
assert.Contains(t, err.Error(), "user id can't be 0")
})
t.Run("invalid json", func(t *testing.T) {
_, err := provider.GetUserFromJSON(rctx, strings.NewReader("invalid json"), nil, nil)
require.Error(t, err)
})
}
func TestGitLabUserIsValid(t *testing.T) {
testCases := []struct {
description string
user GitLabUser
isValid bool
expectedErr string
}{
{"valid user", GitLabUser{Id: 1, Email: "test@example.com"}, true, ""},
{"zero id", GitLabUser{Id: 0, Email: "test@example.com"}, false, "user id can't be 0"},
{"empty email", GitLabUser{Id: 1, Email: ""}, false, "user e-mail should not be empty"},
}
for _, tc := range testCases {
t.Run(tc.description, func(t *testing.T) {
err := tc.user.IsValid()
if tc.isValid {
require.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.expectedErr, err.Error())
}
})
}
}
func TestGitLabUserGetAuthData(t *testing.T) {
glu := GitLabUser{Id: 98765}
assert.Equal(t, "98765", glu.getAuthData())
}
func TestUserFromGitLabUser(t *testing.T) {
logger := mlog.CreateConsoleTestLogger(t)
testCases := []struct {
description string
gitlabUser GitLabUser
usePreferredUsername bool
expectedUsername string
expectedFirstName string
expectedLastName string
expectedEmail string
expectedAuthData string
}{
{
description: "Username from PreferredUsername when UsePreferredUsername=true",
gitlabUser: GitLabUser{
Id: 1,
Username: "gitlab.user",
Login: "gitlab.login",
Email: "test@example.com",
Name: "First Last",
PreferredUsername: "preferred.user",
},
usePreferredUsername: true,
expectedUsername: "preferred.user",
expectedFirstName: "First",
expectedLastName: "Last",
expectedEmail: "test@example.com",
expectedAuthData: "1",
},
{
description: "Username from Username when UsePreferredUsername=false even if PreferredUsername exists",
gitlabUser: GitLabUser{
Id: 2,
Username: "gitlab.user",
Login: "gitlab.login",
Email: "test2@example.com",
Name: "First Last",
PreferredUsername: "preferred.user",
},
usePreferredUsername: false,
expectedUsername: "gitlab.user",
expectedFirstName: "First",
expectedLastName: "Last",
expectedEmail: "test2@example.com",
expectedAuthData: "2",
},
{
description: "Username from Username when PreferredUsername is empty and UsePreferredUsername=true",
gitlabUser: GitLabUser{
Id: 3,
Username: "gitlab.user.only",
Login: "gitlab.login",
Email: "test3@example.com",
Name: "Another User",
PreferredUsername: "",
},
usePreferredUsername: true,
expectedUsername: "gitlab.user.only",
expectedFirstName: "Another",
expectedLastName: "User",
expectedEmail: "test3@example.com",
expectedAuthData: "3",
},
{
description: "Username from PreferredUsername when Username is empty and UsePreferredUsername=true",
gitlabUser: GitLabUser{
Id: 5,
Username: "",
Login: "gitlab.login.only",
Email: "test5@example.com",
Name: "Login User",
PreferredUsername: "preferred.user.again",
},
usePreferredUsername: true,
expectedUsername: "preferred.user.again",
expectedFirstName: "Login",
expectedLastName: "User",
expectedEmail: "test5@example.com",
expectedAuthData: "5",
},
{
description: "Username from Login when Username is empty and UsePreferredUsername=false, even if PreferredUsername exists",
gitlabUser: GitLabUser{
Id: 6,
Username: "",
Login: "gitlab.login.only.again",
Email: "test6@example.com",
Name: "Login User",
PreferredUsername: "preferred.user.ignored",
},
usePreferredUsername: false,
expectedUsername: "gitlab.login.only.again",
expectedFirstName: "Login",
expectedLastName: "User",
expectedEmail: "test6@example.com",
expectedAuthData: "6",
},
{
description: "Username from Login when Username and PreferredUsername are empty and UsePreferredUsername=true",
gitlabUser: GitLabUser{
Id: 7,
Username: "",
Login: "the.login",
Email: "test7@example.com",
Name: "Just Login",
PreferredUsername: "",
},
usePreferredUsername: true,
expectedUsername: "the.login",
expectedFirstName: "Just",
expectedLastName: "Login",
expectedEmail: "test7@example.com",
expectedAuthData: "7",
},
{
description: "Name splitting: single name",
gitlabUser: GitLabUser{
Id: 9,
Username: "testuser9",
Email: "test9@example.com",
Name: "Mononym",
},
usePreferredUsername: false,
expectedUsername: "testuser9",
expectedFirstName: "Mononym",
expectedLastName: "",
expectedEmail: "test9@example.com",
expectedAuthData: "9",
},
{
description: "Name splitting: multiple last names",
gitlabUser: GitLabUser{
Id: 10,
Username: "testuser10",
Email: "test10@example.com",
Name: "First Middle Van Der Lastname",
},
usePreferredUsername: false,
expectedUsername: "testuser10",
expectedFirstName: "First",
expectedLastName: "Middle Van Der Lastname",
expectedEmail: "test10@example.com",
expectedAuthData: "10",
},
{
description: "Email lowercasing",
gitlabUser: GitLabUser{
Id: 11,
Username: "testuser11",
Email: "TEST11@EXAMPLE.COM",
Name: "Test User",
},
usePreferredUsername: false,
expectedUsername: "testuser11",
expectedFirstName: "Test",
expectedLastName: "User",
expectedEmail: "test11@example.com",
expectedAuthData: "11",
},
{
description: "Username needing cleaning when UsePreferredUsername=true",
gitlabUser: GitLabUser{
Id: 12,
Username: "gitlab.user",
Login: "gitlab.login",
Email: "test12@example.com",
Name: "Needs Clean",
PreferredUsername: "preferred@@user!!",
},
usePreferredUsername: true,
expectedUsername: "preferred", // Cleaned
expectedFirstName: "Needs",
expectedLastName: "Clean",
expectedEmail: "test12@example.com",
expectedAuthData: "12",
},
{
description: "Username needing cleaning when UsePreferredUsername=false",
gitlabUser: GitLabUser{
Id: 13,
Username: "gitlab@@user!!",
Login: "gitlab.login",
Email: "test13@example.com",
Name: "Needs Clean",
PreferredUsername: "preferred.user",
},
usePreferredUsername: false,
expectedUsername: "gitlab--user", // Cleaned
expectedFirstName: "Needs",
expectedLastName: "Clean",
expectedEmail: "test13@example.com",
expectedAuthData: "13",
},
{
description: "Login needing cleaning when UsePreferredUsername=false and Username is empty",
gitlabUser: GitLabUser{
Id: 14,
Username: "",
Login: "gitlab@@login!!",
Email: "test14@example.com",
Name: "Needs Clean",
PreferredUsername: "preferred.user",
},
usePreferredUsername: false,
expectedUsername: "gitlab--login", // Cleaned
expectedFirstName: "Needs",
expectedLastName: "Clean",
expectedEmail: "test14@example.com",
expectedAuthData: "14",
},
}
for _, tc := range testCases {
t.Run(tc.description, func(t *testing.T) {
settings := &model.SSOSettings{
UsePreferredUsername: new(tc.usePreferredUsername),
}
user := userFromGitLabUser(logger, &tc.gitlabUser, settings)
require.NotNil(t, user)
assert.Equal(t, tc.expectedUsername, user.Username)
assert.Equal(t, tc.expectedFirstName, user.FirstName)
assert.Equal(t, tc.expectedLastName, user.LastName)
assert.Equal(t, tc.expectedEmail, user.Email)
require.NotNil(t, user.AuthData)
assert.Equal(t, tc.expectedAuthData, *user.AuthData)
assert.Equal(t, model.UserAuthServiceGitlab, user.AuthService)
})
}
}