feat(ee): GitLab permission syncing

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## Added
+- [Experimental][Sourcebot EE] Added GitLab permission syncing. [#585](https://github.com/sourcebot-dev/sourcebot/pull/585)
+
 ### Fixed
 - [ask sb] Fixed issue where reasoning tokens would appear in `text` content for openai compatible models. [#582](https://github.com/sourcebot-dev/sourcebot/pull/582)
 - Fixed issue with GitHub app token tracking and refreshing. [#583](https://github.com/sourcebot-dev/sourcebot/pull/583)

docs/docs/configuration/auth/providers.mdx

@@ -52,6 +52,14 @@ Optional environment variables:
 
 [Auth.js GitLab Provider Docs](https://authjs.dev/getting-started/providers/gitlab)
 
+Authentication using GitLab is supported via a [OAuth2.0 app](https://docs.gitlab.com/integration/oauth_provider/#create-an-instance-wide-application) installed on the GitLab instance. Follow the instructions in the [GitLab docs](https://docs.gitlab.com/integration/oauth_provider/) to create an app. The callback URL should be configurd to `<sourcebot_deployment_url>/api/auth/callback/gitlab`, and the following scopes need to be set:
+
+| Scope | Required | Notes |
+|------------|----------|----------------------------------------------------------------------------------------------------|
+| read_user | Yes | Allows Sourcebot to read basic user information required for authentication. |
+| read_api | Conditional | Required **only** when [permission syncing](/docs/features/permission-syncing) is enabled. Enables Sourcebot to list all repositories and projects for the authenticated user. |
+
+
 **Required environment variables:**
 - `AUTH_EE_GITLAB_CLIENT_ID`
 - `AUTH_EE_GITLAB_CLIENT_SECRET`

docs/docs/features/permission-syncing.mdx

@@ -35,7 +35,7 @@ We are actively working on supporting more code hosts. If you'd like to see a sp
 | Platform | Permission syncing |
 |:----------|------------------------------|
 | [GitHub (GHEC & GHEC Server)](/docs/features/permission-syncing#github) | ✅ |
-| GitLab | 🛑 |
+| [GitLab (Self-managed & Cloud)](/docs/features/permission-syncing#gitlab) | ✅ |
 | Bitbucket Cloud | 🛑 |
 | Bitbucket Data Center | 🛑 |
 | Gitea | 🛑 |
@@ -59,6 +59,18 @@ Permission syncing works with **GitHub.com**, **GitHub Enterprise Cloud**, and *
 - A GitHub OAuth provider must be configured to (1) correlate a Sourcebot user with a GitHub user, and (2) to list repositories that the user has access to for [User driven syncing](/docs/features/permission-syncing#how-it-works).
 - OAuth tokens must assume the `repo` scope in order to use the [List repositories for the authenticated user API](https://docs.github.com/en/rest/repos/repos?apiVersion=2022-11-28#list-repositories-for-the-authenticated-user) during [User driven syncing](/docs/features/permission-syncing#how-it-works). Sourcebot **will only** use this token for **reads**.
 
+## GitLab
+
+Prerequisite: [Add GitLab as an OAuth provider](/docs/configuration/auth/providers#gitlab).
+
+Permission syncing works with **GitLab Self-managed** and **GitLab Cloud**. Users with **Guest** role or above with membership to a group or project will have their access synced to Sourcebot. Both direct and indirect membership to a group or project will be synced with Sourcebot. For more details, see the [GitLab docs](https://docs.gitlab.com/user/project/members/#membership-types).
+
+
+**Notes:**
+- A GitLab OAuth provider must be configured to (1) correlate a Sourcebot user with a GitLab user, and (2) to list repositories that the user has access to for [User driven syncing](/docs/features/permission-syncing#how-it-works).
+- OAuth tokens require the `read_api` scope in order to use the [List projects for the authenticated user API](https://docs.gitlab.com/ee/api/projects.html#list-all-projects) during [User driven syncing](/docs/features/permission-syncing#how-it-works).
+
+
 # How it works
 
 Permission syncing works by periodically syncing ACLs from the code host(s) to Sourcebot to build an internal mapping between Users and Repositories. This mapping is hydrated in two directions:

packages/backend/src/constants.ts

@@ -5,6 +5,7 @@ export const SINGLE_TENANT_ORG_ID = 1;
 
 export const PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES = [
  'github',
+ 'gitlab',
 ];
 
 export const REPOS_CACHE_DIR = path.join(env.DATA_CACHE_DIR, 'repos');

packages/backend/src/ee/repoPermissionSyncer.ts

@@ -7,6 +7,7 @@ import { Redis } from 'ioredis';
 import { PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES } from "../constants.js";
 import { env } from "../env.js";
 import { createOctokitFromToken, getRepoCollaborators, GITHUB_CLOUD_HOSTNAME } from "../github.js";
+import { createGitLabFromPersonalAccessToken, getProjectMembers } from "../gitlab.js";
 import { Settings } from "../types.js";
 import { getAuthCredentialsForRepo } from "../utils.js";
 
@@ -16,7 +17,9 @@ type RepoPermissionSyncJob = {
 
 const QUEUE_NAME = 'repoPermissionSyncQueue';
 
-const logger = createLogger('repo-permission-syncer');
+const LOG_TAG = 'repo-permission-syncer';
+const logger = createLogger(LOG_TAG);
+const createJobLogger = (jobId: string) => createLogger(`${LOG_TAG}:job:${jobId}`);
 
 export class RepoPermissionSyncer {
  private queue: Queue<RepoPermissionSyncJob>;
@@ -109,28 +112,31 @@ export class RepoPermissionSyncer {
  }
 
  private async schedulePermissionSync(repos: Repo[]) {
- await this.db.$transaction(async (tx) => {
- const jobs = await tx.repoPermissionSyncJob.createManyAndReturn({
- data: repos.map(repo => ({
- repoId: repo.id,
- })),
- });
-
- await this.queue.addBulk(jobs.map((job) => ({
- name: 'repoPermissionSyncJob',
- data: {
- jobId: job.id,
- },
- opts: {
- removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
- removeOnFail: env.REDIS_REMOVE_ON_FAIL,
- }
- })))
+ // @note: we don't perform this in a transaction because
+ // we want to avoid the situation where a job is created and run
+ // prior to the transaction being committed.
+ const jobs = await this.db.repoPermissionSyncJob.createManyAndReturn({
+ data: repos.map(repo => ({
+ repoId: repo.id,
+ })),
  });
+
+ await this.queue.addBulk(jobs.map((job) => ({
+ name: 'repoPermissionSyncJob',
+ data: {
+ jobId: job.id,
+ },
+ opts: {
+ removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
+ removeOnFail: env.REDIS_REMOVE_ON_FAIL,
+ }
+ })))
  }
 
  private async runJob(job: Job<RepoPermissionSyncJob>) {
  const id = job.data.jobId;
+ const logger = createJobLogger(id);
+
  const { repo } = await this.db.repoPermissionSyncJob.update({
  where: {
  id,
@@ -194,6 +200,33 @@ export class RepoPermissionSyncer {
  },
  });
 
+ return accounts.map(account => account.userId);
+ } else if (repo.external_codeHostType === 'gitlab') {
+ const api = await createGitLabFromPersonalAccessToken({
+ token: credentials.token,
+ url: credentials.hostUrl,
+ });
+
+ const projectId = repo.external_id;
+ if (!projectId) {
+ throw new Error(`Repo ${id} does not have an external_id`);
+ }
+
+ const members = await getProjectMembers(projectId, api);
+ const gitlabUserIds = members.map(member => member.id.toString());
+
+ const accounts = await this.db.account.findMany({
+ where: {
+ provider: 'gitlab',
+ providerAccountId: {
+ in: gitlabUserIds,
+ }
+ },
+ select: {
+ userId: true,
+ },
+ });
+
  return accounts.map(account => account.userId);
  }
 
@@ -221,6 +254,8 @@ export class RepoPermissionSyncer {
  }
 
  private async onJobCompleted(job: Job<RepoPermissionSyncJob>) {
+ const logger = createJobLogger(job.data.jobId);
+
  const { repo } = await this.db.repoPermissionSyncJob.update({
  where: {
  id: job.data.jobId,
@@ -243,6 +278,8 @@ export class RepoPermissionSyncer {
  }
 
  private async onJobFailed(job: Job<RepoPermissionSyncJob> | undefined, err: Error) {
+ const logger = createJobLogger(job?.data.jobId ?? 'unknown');
+
  Sentry.captureException(err, {
  tags: {
  jobId: job?.data.jobId,

packages/backend/src/ee/userPermissionSyncer.ts

@@ -6,10 +6,13 @@ import { Redis } from "ioredis";
 import { PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES } from "../constants.js";
 import { env } from "../env.js";
 import { createOctokitFromToken, getReposForAuthenticatedUser } from "../github.js";
+import { createGitLabFromOAuthToken, getProjectsForAuthenticatedUser } from "../gitlab.js";
 import { hasEntitlement } from "@sourcebot/shared";
 import { Settings } from "../types.js";
 
-const logger = createLogger('user-permission-syncer');
+const LOG_TAG = 'user-permission-syncer';
+const logger = createLogger(LOG_TAG);
+const createJobLogger = (jobId: string) => createLogger(`${LOG_TAG}:job:${jobId}`);
 
 const QUEUE_NAME = 'userPermissionSyncQueue';
 
@@ -110,28 +113,31 @@ export class UserPermissionSyncer {
  }
 
  private async schedulePermissionSync(users: User[]) {
- await this.db.$transaction(async (tx) => {
- const jobs = await tx.userPermissionSyncJob.createManyAndReturn({
- data: users.map(user => ({
- userId: user.id,
- })),
- });
-
- await this.queue.addBulk(jobs.map((job) => ({
- name: 'userPermissionSyncJob',
- data: {
- jobId: job.id,
- },
- opts: {
- removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
- removeOnFail: env.REDIS_REMOVE_ON_FAIL,
- }
- })))
+ // @note: we don't perform this in a transaction because
+ // we want to avoid the situation where a job is created and run
+ // prior to the transaction being committed.
+ const jobs = await this.db.userPermissionSyncJob.createManyAndReturn({
+ data: users.map(user => ({
+ userId: user.id,
+ })),
  });
+
+ await this.queue.addBulk(jobs.map((job) => ({
+ name: 'userPermissionSyncJob',
+ data: {
+ jobId: job.id,
+ },
+ opts: {
+ removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
+ removeOnFail: env.REDIS_REMOVE_ON_FAIL,
+ }
+ })))
  }
 
  private async runJob(job: Job<UserPermissionSyncJob>) {
  const id = job.data.jobId;
+ const logger = createJobLogger(id);
+
  const { user } = await this.db.userPermissionSyncJob.update({
  where: {
  id,
@@ -183,6 +189,37 @@ export class UserPermissionSyncer {
  }
  });
 
+ repos.forEach(repo => aggregatedRepoIds.add(repo.id));
+ } else if (account.provider === 'gitlab') {
+ if (!account.access_token) {
+ throw new Error(`User '${user.email}' does not have a GitLab OAuth access token associated with their GitLab account.`);
+ }
+
+ const api = await createGitLabFromOAuthToken({
+ oauthToken: account.access_token,
+ url: env.AUTH_EE_GITLAB_BASE_URL,
+ });
+
+ // @note: we only care about the private and internal repos since we don't need to build a mapping
+ // for public repos.
+ // @see: packages/web/src/prisma.ts
+ const privateGitLabProjects = await getProjectsForAuthenticatedUser('private', api);
+ const internalGitLabProjects = await getProjectsForAuthenticatedUser('internal', api);
+
+ const gitLabProjectIds = [
+ ...privateGitLabProjects,
+ ...internalGitLabProjects,
+ ].map(project => project.id.toString());
+
+ const repos = await this.db.repo.findMany({
+ where: {
+ external_codeHostType: 'gitlab',
+ external_id: {
+ in: gitLabProjectIds,
+ }
+ }
+ });
+
  repos.forEach(repo => aggregatedRepoIds.add(repo.id));
  }
  }
@@ -212,6 +249,8 @@ export class UserPermissionSyncer {
  }
 
  private async onJobCompleted(job: Job<UserPermissionSyncJob>) {
+ const logger = createJobLogger(job.data.jobId);
+
  const { user } = await this.db.userPermissionSyncJob.update({
  where: {
  id: job.data.jobId,
@@ -234,6 +273,8 @@ export class UserPermissionSyncer {
  }
 
  private async onJobFailed(job: Job<UserPermissionSyncJob> | undefined, err: Error) {
+ const logger = createJobLogger(job?.data.jobId ?? 'unknown');
+
  Sentry.captureException(err, {
  tags: {
  jobId: job?.data.jobId,
@@ -260,7 +301,7 @@ export class UserPermissionSyncer {
 
  logger.error(errorMessage(user.email ?? user.id));
  } else {
- logger.error(errorMessage('unknown user (id not found)'));
+ logger.error(errorMessage('unknown job (id not found)'));
  }
  }
 }

packages/backend/src/env.ts

@@ -56,6 +56,7 @@ export const env = createEnv({
 
  EXPERIMENT_EE_PERMISSION_SYNC_ENABLED: booleanSchema.default('false'),
  AUTH_EE_GITHUB_BASE_URL: z.string().optional(),
+ AUTH_EE_GITLAB_BASE_URL: z.string().default("https://gitlab.com"),
  },
  runtimeEnv: process.env,
  emptyStringAsUndefined: true,

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## Added
+- [Experimental][Sourcebot EE] Added GitLab permission syncing. [#585](https://github.com/sourcebot-dev/sourcebot/pull/585)
+
 ### Fixed
 - [ask sb] Fixed issue where reasoning tokens would appear in `text` content for openai compatible models. [#582](https://github.com/sourcebot-dev/sourcebot/pull/582)
 - Fixed issue with GitHub app token tracking and refreshing. [#583](https://github.com/sourcebot-dev/sourcebot/pull/583)

docs/docs/configuration/auth/providers.mdx

@@ -52,6 +52,14 @@ Optional environment variables:
 
 [Auth.js GitLab Provider Docs](https://authjs.dev/getting-started/providers/gitlab)
 
+Authentication using GitLab is supported via a [OAuth2.0 app](https://docs.gitlab.com/integration/oauth_provider/#create-an-instance-wide-application) installed on the GitLab instance. Follow the instructions in the [GitLab docs](https://docs.gitlab.com/integration/oauth_provider/) to create an app. The callback URL should be configurd to `<sourcebot_deployment_url>/api/auth/callback/gitlab`, and the following scopes need to be set:
+
+| Scope | Required | Notes |
+|------------|----------|----------------------------------------------------------------------------------------------------|
+| read_user | Yes | Allows Sourcebot to read basic user information required for authentication. |
+| read_api | Conditional | Required **only** when [permission syncing](/docs/features/permission-syncing) is enabled. Enables Sourcebot to list all repositories and projects for the authenticated user. |
+
+
 **Required environment variables:**
 - `AUTH_EE_GITLAB_CLIENT_ID`
 - `AUTH_EE_GITLAB_CLIENT_SECRET`

docs/docs/features/permission-syncing.mdx

@@ -35,7 +35,7 @@ We are actively working on supporting more code hosts. If you'd like to see a sp
 | Platform | Permission syncing |
 |:----------|------------------------------|
 | [GitHub (GHEC & GHEC Server)](/docs/features/permission-syncing#github) | ✅ |
-| GitLab | 🛑 |
+| [GitLab (Self-managed & Cloud)](/docs/features/permission-syncing#gitlab) | ✅ |
 | Bitbucket Cloud | 🛑 |
 | Bitbucket Data Center | 🛑 |
 | Gitea | 🛑 |
@@ -59,6 +59,18 @@ Permission syncing works with **GitHub.com**, **GitHub Enterprise Cloud**, and *
 - A GitHub OAuth provider must be configured to (1) correlate a Sourcebot user with a GitHub user, and (2) to list repositories that the user has access to for [User driven syncing](/docs/features/permission-syncing#how-it-works).
 - OAuth tokens must assume the `repo` scope in order to use the [List repositories for the authenticated user API](https://docs.github.com/en/rest/repos/repos?apiVersion=2022-11-28#list-repositories-for-the-authenticated-user) during [User driven syncing](/docs/features/permission-syncing#how-it-works). Sourcebot **will only** use this token for **reads**.
 
+## GitLab
+
+Prerequisite: [Add GitLab as an OAuth provider](/docs/configuration/auth/providers#gitlab).
+
+Permission syncing works with **GitLab Self-managed** and **GitLab Cloud**. Users with **Guest** role or above with membership to a group or project will have their access synced to Sourcebot. Both direct and indirect membership to a group or project will be synced with Sourcebot. For more details, see the [GitLab docs](https://docs.gitlab.com/user/project/members/#membership-types).
+
+
+**Notes:**
+- A GitLab OAuth provider must be configured to (1) correlate a Sourcebot user with a GitLab user, and (2) to list repositories that the user has access to for [User driven syncing](/docs/features/permission-syncing#how-it-works).
+- OAuth tokens require the `read_api` scope in order to use the [List projects for the authenticated user API](https://docs.gitlab.com/ee/api/projects.html#list-all-projects) during [User driven syncing](/docs/features/permission-syncing#how-it-works).
+
+
 # How it works
 
 Permission syncing works by periodically syncing ACLs from the code host(s) to Sourcebot to build an internal mapping between Users and Repositories. This mapping is hydrated in two directions:

packages/backend/src/constants.ts

@@ -5,6 +5,7 @@ export const SINGLE_TENANT_ORG_ID = 1;
 
 export const PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES = [
  'github',
+ 'gitlab',
 ];
 
 export const REPOS_CACHE_DIR = path.join(env.DATA_CACHE_DIR, 'repos');

packages/backend/src/ee/repoPermissionSyncer.ts

@@ -7,6 +7,7 @@ import { Redis } from 'ioredis';
 import { PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES } from "../constants.js";
 import { env } from "../env.js";
 import { createOctokitFromToken, getRepoCollaborators, GITHUB_CLOUD_HOSTNAME } from "../github.js";
+import { createGitLabFromPersonalAccessToken, getProjectMembers } from "../gitlab.js";
 import { Settings } from "../types.js";
 import { getAuthCredentialsForRepo } from "../utils.js";
 
@@ -16,7 +17,9 @@ type RepoPermissionSyncJob = {
 
 const QUEUE_NAME = 'repoPermissionSyncQueue';
 
-const logger = createLogger('repo-permission-syncer');
+const LOG_TAG = 'repo-permission-syncer';
+const logger = createLogger(LOG_TAG);
+const createJobLogger = (jobId: string) => createLogger(`${LOG_TAG}:job:${jobId}`);
 
 export class RepoPermissionSyncer {
  private queue: Queue<RepoPermissionSyncJob>;
@@ -109,28 +112,31 @@ export class RepoPermissionSyncer {
  }
 
  private async schedulePermissionSync(repos: Repo[]) {
- await this.db.$transaction(async (tx) => {
- const jobs = await tx.repoPermissionSyncJob.createManyAndReturn({
- data: repos.map(repo => ({
- repoId: repo.id,
- })),
- });
-
- await this.queue.addBulk(jobs.map((job) => ({
- name: 'repoPermissionSyncJob',
- data: {
- jobId: job.id,
- },
- opts: {
- removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
- removeOnFail: env.REDIS_REMOVE_ON_FAIL,
- }
- })))
+ // @note: we don't perform this in a transaction because
+ // we want to avoid the situation where a job is created and run
+ // prior to the transaction being committed.
+ const jobs = await this.db.repoPermissionSyncJob.createManyAndReturn({
+ data: repos.map(repo => ({
+ repoId: repo.id,
+ })),
  });
+
+ await this.queue.addBulk(jobs.map((job) => ({
+ name: 'repoPermissionSyncJob',
+ data: {
+ jobId: job.id,
+ },
+ opts: {
+ removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
+ removeOnFail: env.REDIS_REMOVE_ON_FAIL,
+ }
+ })))
  }
 
  private async runJob(job: Job<RepoPermissionSyncJob>) {
  const id = job.data.jobId;
+ const logger = createJobLogger(id);
+
  const { repo } = await this.db.repoPermissionSyncJob.update({
  where: {
  id,
@@ -194,6 +200,33 @@ export class RepoPermissionSyncer {
  },
  });
 
+ return accounts.map(account => account.userId);
+ } else if (repo.external_codeHostType === 'gitlab') {
+ const api = await createGitLabFromPersonalAccessToken({
+ token: credentials.token,
+ url: credentials.hostUrl,
+ });
+
+ const projectId = repo.external_id;
+ if (!projectId) {
+ throw new Error(`Repo ${id} does not have an external_id`);
+ }
+
+ const members = await getProjectMembers(projectId, api);
+ const gitlabUserIds = members.map(member => member.id.toString());
+
+ const accounts = await this.db.account.findMany({
+ where: {
+ provider: 'gitlab',
+ providerAccountId: {
+ in: gitlabUserIds,
+ }
+ },
+ select: {
+ userId: true,
+ },
+ });
+
  return accounts.map(account => account.userId);
  }
 
@@ -221,6 +254,8 @@ export class RepoPermissionSyncer {
  }
 
  private async onJobCompleted(job: Job<RepoPermissionSyncJob>) {
+ const logger = createJobLogger(job.data.jobId);
+
  const { repo } = await this.db.repoPermissionSyncJob.update({
  where: {
  id: job.data.jobId,
@@ -243,6 +278,8 @@ export class RepoPermissionSyncer {
  }
 
  private async onJobFailed(job: Job<RepoPermissionSyncJob> | undefined, err: Error) {
+ const logger = createJobLogger(job?.data.jobId ?? 'unknown');
+
  Sentry.captureException(err, {
  tags: {
  jobId: job?.data.jobId,

packages/backend/src/ee/userPermissionSyncer.ts

@@ -6,10 +6,13 @@ import { Redis } from "ioredis";
 import { PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES } from "../constants.js";
 import { env } from "../env.js";
 import { createOctokitFromToken, getReposForAuthenticatedUser } from "../github.js";
+import { createGitLabFromOAuthToken, getProjectsForAuthenticatedUser } from "../gitlab.js";
 import { hasEntitlement } from "@sourcebot/shared";
 import { Settings } from "../types.js";
 
-const logger = createLogger('user-permission-syncer');
+const LOG_TAG = 'user-permission-syncer';
+const logger = createLogger(LOG_TAG);
+const createJobLogger = (jobId: string) => createLogger(`${LOG_TAG}:job:${jobId}`);
 
 const QUEUE_NAME = 'userPermissionSyncQueue';
 
@@ -110,28 +113,31 @@ export class UserPermissionSyncer {
  }
 
  private async schedulePermissionSync(users: User[]) {
- await this.db.$transaction(async (tx) => {
- const jobs = await tx.userPermissionSyncJob.createManyAndReturn({
- data: users.map(user => ({
- userId: user.id,
- })),
- });
-
- await this.queue.addBulk(jobs.map((job) => ({
- name: 'userPermissionSyncJob',
- data: {
- jobId: job.id,
- },
- opts: {
- removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
- removeOnFail: env.REDIS_REMOVE_ON_FAIL,
- }
- })))
+ // @note: we don't perform this in a transaction because
+ // we want to avoid the situation where a job is created and run
+ // prior to the transaction being committed.
+ const jobs = await this.db.userPermissionSyncJob.createManyAndReturn({
+ data: users.map(user => ({
+ userId: user.id,
+ })),
  });
+
+ await this.queue.addBulk(jobs.map((job) => ({
+ name: 'userPermissionSyncJob',
+ data: {
+ jobId: job.id,
+ },
+ opts: {
+ removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
+ removeOnFail: env.REDIS_REMOVE_ON_FAIL,
+ }
+ })))
  }
 
  private async runJob(job: Job<UserPermissionSyncJob>) {
  const id = job.data.jobId;
+ const logger = createJobLogger(id);
+
  const { user } = await this.db.userPermissionSyncJob.update({
  where: {
  id,
@@ -183,6 +189,37 @@ export class UserPermissionSyncer {
  }
  });
 
+ repos.forEach(repo => aggregatedRepoIds.add(repo.id));
+ } else if (account.provider === 'gitlab') {
+ if (!account.access_token) {
+ throw new Error(`User '${user.email}' does not have a GitLab OAuth access token associated with their GitLab account.`);
+ }
+
+ const api = await createGitLabFromOAuthToken({
+ oauthToken: account.access_token,
+ url: env.AUTH_EE_GITLAB_BASE_URL,
+ });
+
+ // @note: we only care about the private and internal repos since we don't need to build a mapping
+ // for public repos.
+ // @see: packages/web/src/prisma.ts
+ const privateGitLabProjects = await getProjectsForAuthenticatedUser('private', api);
+ const internalGitLabProjects = await getProjectsForAuthenticatedUser('internal', api);
+
+ const gitLabProjectIds = [
+ ...privateGitLabProjects,
+ ...internalGitLabProjects,
+ ].map(project => project.id.toString());
+
+ const repos = await this.db.repo.findMany({
+ where: {
+ external_codeHostType: 'gitlab',
+ external_id: {
+ in: gitLabProjectIds,
+ }
+ }
+ });
+
  repos.forEach(repo => aggregatedRepoIds.add(repo.id));
  }
  }
@@ -212,6 +249,8 @@ export class UserPermissionSyncer {
  }
 
  private async onJobCompleted(job: Job<UserPermissionSyncJob>) {
+ const logger = createJobLogger(job.data.jobId);
+
  const { user } = await this.db.userPermissionSyncJob.update({
  where: {
  id: job.data.jobId,
@@ -234,6 +273,8 @@ export class UserPermissionSyncer {
  }
 
  private async onJobFailed(job: Job<UserPermissionSyncJob> | undefined, err: Error) {
+ const logger = createJobLogger(job?.data.jobId ?? 'unknown');
+
  Sentry.captureException(err, {
  tags: {
  jobId: job?.data.jobId,
@@ -260,7 +301,7 @@ export class UserPermissionSyncer {
 
  logger.error(errorMessage(user.email ?? user.id));
  } else {
- logger.error(errorMessage('unknown user (id not found)'));
+ logger.error(errorMessage('unknown job (id not found)'));
  }
  }
 }

packages/backend/src/env.ts

@@ -56,6 +56,7 @@ export const env = createEnv({
 
  EXPERIMENT_EE_PERMISSION_SYNC_ENABLED: booleanSchema.default('false'),
  AUTH_EE_GITHUB_BASE_URL: z.string().optional(),
+ AUTH_EE_GITLAB_BASE_URL: z.string().default("https://gitlab.com"),
  },
  runtimeEnv: process.env,
  emptyStringAsUndefined: true,

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## Added
+- [Experimental][Sourcebot EE] Added GitLab permission syncing. [#585](https://github.com/sourcebot-dev/sourcebot/pull/585)
+
 ### Fixed
 - [ask sb] Fixed issue where reasoning tokens would appear in `text` content for openai compatible models. [#582](https://github.com/sourcebot-dev/sourcebot/pull/582)
 - Fixed issue with GitHub app token tracking and refreshing. [#583](https://github.com/sourcebot-dev/sourcebot/pull/583)

docs/docs/configuration/auth/providers.mdx

@@ -52,6 +52,14 @@ Optional environment variables:
 
 [Auth.js GitLab Provider Docs](https://authjs.dev/getting-started/providers/gitlab)
 
+Authentication using GitLab is supported via a [OAuth2.0 app](https://docs.gitlab.com/integration/oauth_provider/#create-an-instance-wide-application) installed on the GitLab instance. Follow the instructions in the [GitLab docs](https://docs.gitlab.com/integration/oauth_provider/) to create an app. The callback URL should be configurd to `<sourcebot_deployment_url>/api/auth/callback/gitlab`, and the following scopes need to be set:
+
+| Scope | Required | Notes |
+|------------|----------|----------------------------------------------------------------------------------------------------|
+| read_user | Yes | Allows Sourcebot to read basic user information required for authentication. |
+| read_api | Conditional | Required **only** when [permission syncing](/docs/features/permission-syncing) is enabled. Enables Sourcebot to list all repositories and projects for the authenticated user. |
+
+
 **Required environment variables:**
 - `AUTH_EE_GITLAB_CLIENT_ID`
 - `AUTH_EE_GITLAB_CLIENT_SECRET`

docs/docs/features/permission-syncing.mdx

@@ -35,7 +35,7 @@ We are actively working on supporting more code hosts. If you'd like to see a sp
 | Platform | Permission syncing |
 |:----------|------------------------------|
 | [GitHub (GHEC & GHEC Server)](/docs/features/permission-syncing#github) | ✅ |
-| GitLab | 🛑 |
+| [GitLab (Self-managed & Cloud)](/docs/features/permission-syncing#gitlab) | ✅ |
 | Bitbucket Cloud | 🛑 |
 | Bitbucket Data Center | 🛑 |
 | Gitea | 🛑 |
@@ -59,6 +59,18 @@ Permission syncing works with **GitHub.com**, **GitHub Enterprise Cloud**, and *
 - A GitHub OAuth provider must be configured to (1) correlate a Sourcebot user with a GitHub user, and (2) to list repositories that the user has access to for [User driven syncing](/docs/features/permission-syncing#how-it-works).
 - OAuth tokens must assume the `repo` scope in order to use the [List repositories for the authenticated user API](https://docs.github.com/en/rest/repos/repos?apiVersion=2022-11-28#list-repositories-for-the-authenticated-user) during [User driven syncing](/docs/features/permission-syncing#how-it-works). Sourcebot **will only** use this token for **reads**.
 
+## GitLab
+
+Prerequisite: [Add GitLab as an OAuth provider](/docs/configuration/auth/providers#gitlab).
+
+Permission syncing works with **GitLab Self-managed** and **GitLab Cloud**. Users with **Guest** role or above with membership to a group or project will have their access synced to Sourcebot. Both direct and indirect membership to a group or project will be synced with Sourcebot. For more details, see the [GitLab docs](https://docs.gitlab.com/user/project/members/#membership-types).
+
+
+**Notes:**
+- A GitLab OAuth provider must be configured to (1) correlate a Sourcebot user with a GitLab user, and (2) to list repositories that the user has access to for [User driven syncing](/docs/features/permission-syncing#how-it-works).
+- OAuth tokens require the `read_api` scope in order to use the [List projects for the authenticated user API](https://docs.gitlab.com/ee/api/projects.html#list-all-projects) during [User driven syncing](/docs/features/permission-syncing#how-it-works).
+
+
 # How it works
 
 Permission syncing works by periodically syncing ACLs from the code host(s) to Sourcebot to build an internal mapping between Users and Repositories. This mapping is hydrated in two directions:

packages/backend/src/constants.ts

@@ -5,6 +5,7 @@ export const SINGLE_TENANT_ORG_ID = 1;
 
 export const PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES = [
  'github',
+ 'gitlab',
 ];
 
 export const REPOS_CACHE_DIR = path.join(env.DATA_CACHE_DIR, 'repos');

packages/backend/src/ee/repoPermissionSyncer.ts

@@ -7,6 +7,7 @@ import { Redis } from 'ioredis';
 import { PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES } from "../constants.js";
 import { env } from "../env.js";
 import { createOctokitFromToken, getRepoCollaborators, GITHUB_CLOUD_HOSTNAME } from "../github.js";
+import { createGitLabFromPersonalAccessToken, getProjectMembers } from "../gitlab.js";
 import { Settings } from "../types.js";
 import { getAuthCredentialsForRepo } from "../utils.js";
 
@@ -16,7 +17,9 @@ type RepoPermissionSyncJob = {
 
 const QUEUE_NAME = 'repoPermissionSyncQueue';
 
-const logger = createLogger('repo-permission-syncer');
+const LOG_TAG = 'repo-permission-syncer';
+const logger = createLogger(LOG_TAG);
+const createJobLogger = (jobId: string) => createLogger(`${LOG_TAG}:job:${jobId}`);
 
 export class RepoPermissionSyncer {
  private queue: Queue<RepoPermissionSyncJob>;
@@ -109,28 +112,31 @@ export class RepoPermissionSyncer {
  }
 
  private async schedulePermissionSync(repos: Repo[]) {
- await this.db.$transaction(async (tx) => {
- const jobs = await tx.repoPermissionSyncJob.createManyAndReturn({
- data: repos.map(repo => ({
- repoId: repo.id,
- })),
- });
-
- await this.queue.addBulk(jobs.map((job) => ({
- name: 'repoPermissionSyncJob',
- data: {
- jobId: job.id,
- },
- opts: {
- removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
- removeOnFail: env.REDIS_REMOVE_ON_FAIL,
- }
- })))
+ // @note: we don't perform this in a transaction because
+ // we want to avoid the situation where a job is created and run
+ // prior to the transaction being committed.
+ const jobs = await this.db.repoPermissionSyncJob.createManyAndReturn({
+ data: repos.map(repo => ({
+ repoId: repo.id,
+ })),
  });
+
+ await this.queue.addBulk(jobs.map((job) => ({
+ name: 'repoPermissionSyncJob',
+ data: {
+ jobId: job.id,
+ },
+ opts: {
+ removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
+ removeOnFail: env.REDIS_REMOVE_ON_FAIL,
+ }
+ })))
  }
 
  private async runJob(job: Job<RepoPermissionSyncJob>) {
  const id = job.data.jobId;
+ const logger = createJobLogger(id);
+
  const { repo } = await this.db.repoPermissionSyncJob.update({
  where: {
  id,
@@ -194,6 +200,33 @@ export class RepoPermissionSyncer {
  },
  });
 
+ return accounts.map(account => account.userId);
+ } else if (repo.external_codeHostType === 'gitlab') {
+ const api = await createGitLabFromPersonalAccessToken({
+ token: credentials.token,
+ url: credentials.hostUrl,
+ });
+
+ const projectId = repo.external_id;
+ if (!projectId) {
+ throw new Error(`Repo ${id} does not have an external_id`);
+ }
+
+ const members = await getProjectMembers(projectId, api);
+ const gitlabUserIds = members.map(member => member.id.toString());
+
+ const accounts = await this.db.account.findMany({
+ where: {
+ provider: 'gitlab',
+ providerAccountId: {
+ in: gitlabUserIds,
+ }
+ },
+ select: {
+ userId: true,
+ },
+ });
+
  return accounts.map(account => account.userId);
  }
 
@@ -221,6 +254,8 @@ export class RepoPermissionSyncer {
  }
 
  private async onJobCompleted(job: Job<RepoPermissionSyncJob>) {
+ const logger = createJobLogger(job.data.jobId);
+
  const { repo } = await this.db.repoPermissionSyncJob.update({
  where: {
  id: job.data.jobId,
@@ -243,6 +278,8 @@ export class RepoPermissionSyncer {
  }
 
  private async onJobFailed(job: Job<RepoPermissionSyncJob> | undefined, err: Error) {
+ const logger = createJobLogger(job?.data.jobId ?? 'unknown');
+
  Sentry.captureException(err, {
  tags: {
  jobId: job?.data.jobId,

packages/backend/src/ee/userPermissionSyncer.ts

@@ -6,10 +6,13 @@ import { Redis } from "ioredis";
 import { PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES } from "../constants.js";
 import { env } from "../env.js";
 import { createOctokitFromToken, getReposForAuthenticatedUser } from "../github.js";
+import { createGitLabFromOAuthToken, getProjectsForAuthenticatedUser } from "../gitlab.js";
 import { hasEntitlement } from "@sourcebot/shared";
 import { Settings } from "../types.js";
 
-const logger = createLogger('user-permission-syncer');
+const LOG_TAG = 'user-permission-syncer';
+const logger = createLogger(LOG_TAG);
+const createJobLogger = (jobId: string) => createLogger(`${LOG_TAG}:job:${jobId}`);
 
 const QUEUE_NAME = 'userPermissionSyncQueue';
 
@@ -110,28 +113,31 @@ export class UserPermissionSyncer {
  }
 
  private async schedulePermissionSync(users: User[]) {
- await this.db.$transaction(async (tx) => {
- const jobs = await tx.userPermissionSyncJob.createManyAndReturn({
- data: users.map(user => ({
- userId: user.id,
- })),
- });
-
- await this.queue.addBulk(jobs.map((job) => ({
- name: 'userPermissionSyncJob',
- data: {
- jobId: job.id,
- },
- opts: {
- removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
- removeOnFail: env.REDIS_REMOVE_ON_FAIL,
- }
- })))
+ // @note: we don't perform this in a transaction because
+ // we want to avoid the situation where a job is created and run
+ // prior to the transaction being committed.
+ const jobs = await this.db.userPermissionSyncJob.createManyAndReturn({
+ data: users.map(user => ({
+ userId: user.id,
+ })),
  });
+
+ await this.queue.addBulk(jobs.map((job) => ({
+ name: 'userPermissionSyncJob',
+ data: {
+ jobId: job.id,
+ },
+ opts: {
+ removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
+ removeOnFail: env.REDIS_REMOVE_ON_FAIL,
+ }
+ })))
  }
 
  private async runJob(job: Job<UserPermissionSyncJob>) {
  const id = job.data.jobId;
+ const logger = createJobLogger(id);
+
  const { user } = await this.db.userPermissionSyncJob.update({
  where: {
  id,
@@ -183,6 +189,37 @@ export class UserPermissionSyncer {
  }
  });
 
+ repos.forEach(repo => aggregatedRepoIds.add(repo.id));
+ } else if (account.provider === 'gitlab') {
+ if (!account.access_token) {
+ throw new Error(`User '${user.email}' does not have a GitLab OAuth access token associated with their GitLab account.`);
+ }
+
+ const api = await createGitLabFromOAuthToken({
+ oauthToken: account.access_token,
+ url: env.AUTH_EE_GITLAB_BASE_URL,
+ });
+
+ // @note: we only care about the private and internal repos since we don't need to build a mapping
+ // for public repos.
+ // @see: packages/web/src/prisma.ts
+ const privateGitLabProjects = await getProjectsForAuthenticatedUser('private', api);
+ const internalGitLabProjects = await getProjectsForAuthenticatedUser('internal', api);
+
+ const gitLabProjectIds = [
+ ...privateGitLabProjects,
+ ...internalGitLabProjects,
+ ].map(project => project.id.toString());
+
+ const repos = await this.db.repo.findMany({
+ where: {
+ external_codeHostType: 'gitlab',
+ external_id: {
+ in: gitLabProjectIds,
+ }
+ }
+ });
+
  repos.forEach(repo => aggregatedRepoIds.add(repo.id));
  }
  }
@@ -212,6 +249,8 @@ export class UserPermissionSyncer {
  }
 
  private async onJobCompleted(job: Job<UserPermissionSyncJob>) {
+ const logger = createJobLogger(job.data.jobId);
+
  const { user } = await this.db.userPermissionSyncJob.update({
  where: {
  id: job.data.jobId,
@@ -234,6 +273,8 @@ export class UserPermissionSyncer {
  }
 
  private async onJobFailed(job: Job<UserPermissionSyncJob> | undefined, err: Error) {
+ const logger = createJobLogger(job?.data.jobId ?? 'unknown');
+
  Sentry.captureException(err, {
  tags: {
  jobId: job?.data.jobId,
@@ -260,7 +301,7 @@ export class UserPermissionSyncer {
 
  logger.error(errorMessage(user.email ?? user.id));
  } else {
- logger.error(errorMessage('unknown user (id not found)'));
+ logger.error(errorMessage('unknown job (id not found)'));
  }
  }
 }

packages/backend/src/env.ts

@@ -56,6 +56,7 @@ export const env = createEnv({
 
  EXPERIMENT_EE_PERMISSION_SYNC_ENABLED: booleanSchema.default('false'),
  AUTH_EE_GITHUB_BASE_URL: z.string().optional(),
+ AUTH_EE_GITLAB_BASE_URL: z.string().default("https://gitlab.com"),
  },
  runtimeEnv: process.env,
  emptyStringAsUndefined: true,

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## Added
+- [Experimental][Sourcebot EE] Added GitLab permission syncing. [#585](https://github.com/sourcebot-dev/sourcebot/pull/585)
+
 ### Fixed
 - [ask sb] Fixed issue where reasoning tokens would appear in `text` content for openai compatible models. [#582](https://github.com/sourcebot-dev/sourcebot/pull/582)
 - Fixed issue with GitHub app token tracking and refreshing. [#583](https://github.com/sourcebot-dev/sourcebot/pull/583)

docs/docs/configuration/auth/providers.mdx

@@ -52,6 +52,14 @@ Optional environment variables:
 
 [Auth.js GitLab Provider Docs](https://authjs.dev/getting-started/providers/gitlab)
 
+Authentication using GitLab is supported via a [OAuth2.0 app](https://docs.gitlab.com/integration/oauth_provider/#create-an-instance-wide-application) installed on the GitLab instance. Follow the instructions in the [GitLab docs](https://docs.gitlab.com/integration/oauth_provider/) to create an app. The callback URL should be configurd to `<sourcebot_deployment_url>/api/auth/callback/gitlab`, and the following scopes need to be set:
+
+| Scope | Required | Notes |
+|------------|----------|----------------------------------------------------------------------------------------------------|
+| read_user | Yes | Allows Sourcebot to read basic user information required for authentication. |
+| read_api | Conditional | Required **only** when [permission syncing](/docs/features/permission-syncing) is enabled. Enables Sourcebot to list all repositories and projects for the authenticated user. |
+
+
 **Required environment variables:**
 - `AUTH_EE_GITLAB_CLIENT_ID`
 - `AUTH_EE_GITLAB_CLIENT_SECRET`

docs/docs/features/permission-syncing.mdx

@@ -35,7 +35,7 @@ We are actively working on supporting more code hosts. If you'd like to see a sp
 | Platform | Permission syncing |
 |:----------|------------------------------|
 | [GitHub (GHEC & GHEC Server)](/docs/features/permission-syncing#github) | ✅ |
-| GitLab | 🛑 |
+| [GitLab (Self-managed & Cloud)](/docs/features/permission-syncing#gitlab) | ✅ |
 | Bitbucket Cloud | 🛑 |
 | Bitbucket Data Center | 🛑 |
 | Gitea | 🛑 |
@@ -59,6 +59,18 @@ Permission syncing works with **GitHub.com**, **GitHub Enterprise Cloud**, and *
 - A GitHub OAuth provider must be configured to (1) correlate a Sourcebot user with a GitHub user, and (2) to list repositories that the user has access to for [User driven syncing](/docs/features/permission-syncing#how-it-works).
 - OAuth tokens must assume the `repo` scope in order to use the [List repositories for the authenticated user API](https://docs.github.com/en/rest/repos/repos?apiVersion=2022-11-28#list-repositories-for-the-authenticated-user) during [User driven syncing](/docs/features/permission-syncing#how-it-works). Sourcebot **will only** use this token for **reads**.
 
+## GitLab
+
+Prerequisite: [Add GitLab as an OAuth provider](/docs/configuration/auth/providers#gitlab).
+
+Permission syncing works with **GitLab Self-managed** and **GitLab Cloud**. Users with **Guest** role or above with membership to a group or project will have their access synced to Sourcebot. Both direct and indirect membership to a group or project will be synced with Sourcebot. For more details, see the [GitLab docs](https://docs.gitlab.com/user/project/members/#membership-types).
+
+
+**Notes:**
+- A GitLab OAuth provider must be configured to (1) correlate a Sourcebot user with a GitLab user, and (2) to list repositories that the user has access to for [User driven syncing](/docs/features/permission-syncing#how-it-works).
+- OAuth tokens require the `read_api` scope in order to use the [List projects for the authenticated user API](https://docs.gitlab.com/ee/api/projects.html#list-all-projects) during [User driven syncing](/docs/features/permission-syncing#how-it-works).
+
+
 # How it works
 
 Permission syncing works by periodically syncing ACLs from the code host(s) to Sourcebot to build an internal mapping between Users and Repositories. This mapping is hydrated in two directions:

packages/backend/src/constants.ts

@@ -5,6 +5,7 @@ export const SINGLE_TENANT_ORG_ID = 1;
 
 export const PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES = [
  'github',
+ 'gitlab',
 ];
 
 export const REPOS_CACHE_DIR = path.join(env.DATA_CACHE_DIR, 'repos');

packages/backend/src/ee/repoPermissionSyncer.ts

@@ -7,6 +7,7 @@ import { Redis } from 'ioredis';
 import { PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES } from "../constants.js";
 import { env } from "../env.js";
 import { createOctokitFromToken, getRepoCollaborators, GITHUB_CLOUD_HOSTNAME } from "../github.js";
+import { createGitLabFromPersonalAccessToken, getProjectMembers } from "../gitlab.js";
 import { Settings } from "../types.js";
 import { getAuthCredentialsForRepo } from "../utils.js";
 
@@ -16,7 +17,9 @@ type RepoPermissionSyncJob = {
 
 const QUEUE_NAME = 'repoPermissionSyncQueue';
 
-const logger = createLogger('repo-permission-syncer');
+const LOG_TAG = 'repo-permission-syncer';
+const logger = createLogger(LOG_TAG);
+const createJobLogger = (jobId: string) => createLogger(`${LOG_TAG}:job:${jobId}`);
 
 export class RepoPermissionSyncer {
  private queue: Queue<RepoPermissionSyncJob>;
@@ -109,28 +112,31 @@ export class RepoPermissionSyncer {
  }
 
  private async schedulePermissionSync(repos: Repo[]) {
- await this.db.$transaction(async (tx) => {
- const jobs = await tx.repoPermissionSyncJob.createManyAndReturn({
- data: repos.map(repo => ({
- repoId: repo.id,
- })),
- });
-
- await this.queue.addBulk(jobs.map((job) => ({
- name: 'repoPermissionSyncJob',
- data: {
- jobId: job.id,
- },
- opts: {
- removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
- removeOnFail: env.REDIS_REMOVE_ON_FAIL,
- }
- })))
+ // @note: we don't perform this in a transaction because
+ // we want to avoid the situation where a job is created and run
+ // prior to the transaction being committed.
+ const jobs = await this.db.repoPermissionSyncJob.createManyAndReturn({
+ data: repos.map(repo => ({
+ repoId: repo.id,
+ })),
  });
+
+ await this.queue.addBulk(jobs.map((job) => ({
+ name: 'repoPermissionSyncJob',
+ data: {
+ jobId: job.id,
+ },
+ opts: {
+ removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
+ removeOnFail: env.REDIS_REMOVE_ON_FAIL,
+ }
+ })))
  }
 
  private async runJob(job: Job<RepoPermissionSyncJob>) {
  const id = job.data.jobId;
+ const logger = createJobLogger(id);
+
  const { repo } = await this.db.repoPermissionSyncJob.update({
  where: {
  id,
@@ -194,6 +200,33 @@ export class RepoPermissionSyncer {
  },
  });
 
+ return accounts.map(account => account.userId);
+ } else if (repo.external_codeHostType === 'gitlab') {
+ const api = await createGitLabFromPersonalAccessToken({
+ token: credentials.token,
+ url: credentials.hostUrl,
+ });
+
+ const projectId = repo.external_id;
+ if (!projectId) {
+ throw new Error(`Repo ${id} does not have an external_id`);
+ }
+
+ const members = await getProjectMembers(projectId, api);
+ const gitlabUserIds = members.map(member => member.id.toString());
+
+ const accounts = await this.db.account.findMany({
+ where: {
+ provider: 'gitlab',
+ providerAccountId: {
+ in: gitlabUserIds,
+ }
+ },
+ select: {
+ userId: true,
+ },
+ });
+
  return accounts.map(account => account.userId);
  }
 
@@ -221,6 +254,8 @@ export class RepoPermissionSyncer {
  }
 
  private async onJobCompleted(job: Job<RepoPermissionSyncJob>) {
+ const logger = createJobLogger(job.data.jobId);
+
  const { repo } = await this.db.repoPermissionSyncJob.update({
  where: {
  id: job.data.jobId,
@@ -243,6 +278,8 @@ export class RepoPermissionSyncer {
  }
 
  private async onJobFailed(job: Job<RepoPermissionSyncJob> | undefined, err: Error) {
+ const logger = createJobLogger(job?.data.jobId ?? 'unknown');
+
  Sentry.captureException(err, {
  tags: {
  jobId: job?.data.jobId,

packages/backend/src/ee/userPermissionSyncer.ts

@@ -6,10 +6,13 @@ import { Redis } from "ioredis";
 import { PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES } from "../constants.js";
 import { env } from "../env.js";
 import { createOctokitFromToken, getReposForAuthenticatedUser } from "../github.js";
+import { createGitLabFromOAuthToken, getProjectsForAuthenticatedUser } from "../gitlab.js";
 import { hasEntitlement } from "@sourcebot/shared";
 import { Settings } from "../types.js";
 
-const logger = createLogger('user-permission-syncer');
+const LOG_TAG = 'user-permission-syncer';
+const logger = createLogger(LOG_TAG);
+const createJobLogger = (jobId: string) => createLogger(`${LOG_TAG}:job:${jobId}`);
 
 const QUEUE_NAME = 'userPermissionSyncQueue';
 
@@ -110,28 +113,31 @@ export class UserPermissionSyncer {
  }
 
  private async schedulePermissionSync(users: User[]) {
- await this.db.$transaction(async (tx) => {
- const jobs = await tx.userPermissionSyncJob.createManyAndReturn({
- data: users.map(user => ({
- userId: user.id,
- })),
- });
-
- await this.queue.addBulk(jobs.map((job) => ({
- name: 'userPermissionSyncJob',
- data: {
- jobId: job.id,
- },
- opts: {
- removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
- removeOnFail: env.REDIS_REMOVE_ON_FAIL,
- }
- })))
+ // @note: we don't perform this in a transaction because
+ // we want to avoid the situation where a job is created and run
+ // prior to the transaction being committed.
+ const jobs = await this.db.userPermissionSyncJob.createManyAndReturn({
+ data: users.map(user => ({
+ userId: user.id,
+ })),
  });
+
+ await this.queue.addBulk(jobs.map((job) => ({
+ name: 'userPermissionSyncJob',
+ data: {
+ jobId: job.id,
+ },
+ opts: {
+ removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
+ removeOnFail: env.REDIS_REMOVE_ON_FAIL,
+ }
+ })))
  }
 
  private async runJob(job: Job<UserPermissionSyncJob>) {
  const id = job.data.jobId;
+ const logger = createJobLogger(id);
+
  const { user } = await this.db.userPermissionSyncJob.update({
  where: {
  id,
@@ -183,6 +189,37 @@ export class UserPermissionSyncer {
  }
  });
 
+ repos.forEach(repo => aggregatedRepoIds.add(repo.id));
+ } else if (account.provider === 'gitlab') {
+ if (!account.access_token) {
+ throw new Error(`User '${user.email}' does not have a GitLab OAuth access token associated with their GitLab account.`);
+ }
+
+ const api = await createGitLabFromOAuthToken({
+ oauthToken: account.access_token,
+ url: env.AUTH_EE_GITLAB_BASE_URL,
+ });
+
+ // @note: we only care about the private and internal repos since we don't need to build a mapping
+ // for public repos.
+ // @see: packages/web/src/prisma.ts
+ const privateGitLabProjects = await getProjectsForAuthenticatedUser('private', api);
+ const internalGitLabProjects = await getProjectsForAuthenticatedUser('internal', api);
+
+ const gitLabProjectIds = [
+ ...privateGitLabProjects,
+ ...internalGitLabProjects,
+ ].map(project => project.id.toString());
+
+ const repos = await this.db.repo.findMany({
+ where: {
+ external_codeHostType: 'gitlab',
+ external_id: {
+ in: gitLabProjectIds,
+ }
+ }
+ });
+
  repos.forEach(repo => aggregatedRepoIds.add(repo.id));
  }
  }
@@ -212,6 +249,8 @@ export class UserPermissionSyncer {
  }
 
  private async onJobCompleted(job: Job<UserPermissionSyncJob>) {
+ const logger = createJobLogger(job.data.jobId);
+
  const { user } = await this.db.userPermissionSyncJob.update({
  where: {
  id: job.data.jobId,
@@ -234,6 +273,8 @@ export class UserPermissionSyncer {
  }
 
  private async onJobFailed(job: Job<UserPermissionSyncJob> | undefined, err: Error) {
+ const logger = createJobLogger(job?.data.jobId ?? 'unknown');
+
  Sentry.captureException(err, {
  tags: {
  jobId: job?.data.jobId,
@@ -260,7 +301,7 @@ export class UserPermissionSyncer {
 
  logger.error(errorMessage(user.email ?? user.id));
  } else {
- logger.error(errorMessage('unknown user (id not found)'));
+ logger.error(errorMessage('unknown job (id not found)'));
  }
  }
 }

packages/backend/src/env.ts

@@ -56,6 +56,7 @@ export const env = createEnv({
 
  EXPERIMENT_EE_PERMISSION_SYNC_ENABLED: booleanSchema.default('false'),
  AUTH_EE_GITHUB_BASE_URL: z.string().optional(),
+ AUTH_EE_GITLAB_BASE_URL: z.string().default("https://gitlab.com"),
  },
  runtimeEnv: process.env,
  emptyStringAsUndefined: true,

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## Added
+- [Experimental][Sourcebot EE] Added GitLab permission syncing. [#585](https://github.com/sourcebot-dev/sourcebot/pull/585)
+
 ### Fixed
 - [ask sb] Fixed issue where reasoning tokens would appear in `text` content for openai compatible models. [#582](https://github.com/sourcebot-dev/sourcebot/pull/582)
 - Fixed issue with GitHub app token tracking and refreshing. [#583](https://github.com/sourcebot-dev/sourcebot/pull/583)

docs/docs/configuration/auth/providers.mdx

@@ -52,6 +52,14 @@ Optional environment variables:
 
 [Auth.js GitLab Provider Docs](https://authjs.dev/getting-started/providers/gitlab)
 
+Authentication using GitLab is supported via a [OAuth2.0 app](https://docs.gitlab.com/integration/oauth_provider/#create-an-instance-wide-application) installed on the GitLab instance. Follow the instructions in the [GitLab docs](https://docs.gitlab.com/integration/oauth_provider/) to create an app. The callback URL should be configurd to `<sourcebot_deployment_url>/api/auth/callback/gitlab`, and the following scopes need to be set:
+
+| Scope | Required | Notes |
+|------------|----------|----------------------------------------------------------------------------------------------------|
+| read_user | Yes | Allows Sourcebot to read basic user information required for authentication. |
+| read_api | Conditional | Required **only** when [permission syncing](/docs/features/permission-syncing) is enabled. Enables Sourcebot to list all repositories and projects for the authenticated user. |
+
+
 **Required environment variables:**
 - `AUTH_EE_GITLAB_CLIENT_ID`
 - `AUTH_EE_GITLAB_CLIENT_SECRET`

docs/docs/features/permission-syncing.mdx

@@ -35,7 +35,7 @@ We are actively working on supporting more code hosts. If you'd like to see a sp
 | Platform | Permission syncing |
 |:----------|------------------------------|
 | [GitHub (GHEC & GHEC Server)](/docs/features/permission-syncing#github) | ✅ |
-| GitLab | 🛑 |
+| [GitLab (Self-managed & Cloud)](/docs/features/permission-syncing#gitlab) | ✅ |
 | Bitbucket Cloud | 🛑 |
 | Bitbucket Data Center | 🛑 |
 | Gitea | 🛑 |
@@ -59,6 +59,18 @@ Permission syncing works with **GitHub.com**, **GitHub Enterprise Cloud**, and *
 - A GitHub OAuth provider must be configured to (1) correlate a Sourcebot user with a GitHub user, and (2) to list repositories that the user has access to for [User driven syncing](/docs/features/permission-syncing#how-it-works).
 - OAuth tokens must assume the `repo` scope in order to use the [List repositories for the authenticated user API](https://docs.github.com/en/rest/repos/repos?apiVersion=2022-11-28#list-repositories-for-the-authenticated-user) during [User driven syncing](/docs/features/permission-syncing#how-it-works). Sourcebot **will only** use this token for **reads**.
 
+## GitLab
+
+Prerequisite: [Add GitLab as an OAuth provider](/docs/configuration/auth/providers#gitlab).
+
+Permission syncing works with **GitLab Self-managed** and **GitLab Cloud**. Users with **Guest** role or above with membership to a group or project will have their access synced to Sourcebot. Both direct and indirect membership to a group or project will be synced with Sourcebot. For more details, see the [GitLab docs](https://docs.gitlab.com/user/project/members/#membership-types).
+
+
+**Notes:**
+- A GitLab OAuth provider must be configured to (1) correlate a Sourcebot user with a GitLab user, and (2) to list repositories that the user has access to for [User driven syncing](/docs/features/permission-syncing#how-it-works).
+- OAuth tokens require the `read_api` scope in order to use the [List projects for the authenticated user API](https://docs.gitlab.com/ee/api/projects.html#list-all-projects) during [User driven syncing](/docs/features/permission-syncing#how-it-works).
+
+
 # How it works
 
 Permission syncing works by periodically syncing ACLs from the code host(s) to Sourcebot to build an internal mapping between Users and Repositories. This mapping is hydrated in two directions:

packages/backend/src/constants.ts

@@ -5,6 +5,7 @@ export const SINGLE_TENANT_ORG_ID = 1;
 
 export const PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES = [
  'github',
+ 'gitlab',
 ];
 
 export const REPOS_CACHE_DIR = path.join(env.DATA_CACHE_DIR, 'repos');

packages/backend/src/ee/repoPermissionSyncer.ts

@@ -7,6 +7,7 @@ import { Redis } from 'ioredis';
 import { PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES } from "../constants.js";
 import { env } from "../env.js";
 import { createOctokitFromToken, getRepoCollaborators, GITHUB_CLOUD_HOSTNAME } from "../github.js";
+import { createGitLabFromPersonalAccessToken, getProjectMembers } from "../gitlab.js";
 import { Settings } from "../types.js";
 import { getAuthCredentialsForRepo } from "../utils.js";
 
@@ -16,7 +17,9 @@ type RepoPermissionSyncJob = {
 
 const QUEUE_NAME = 'repoPermissionSyncQueue';
 
-const logger = createLogger('repo-permission-syncer');
+const LOG_TAG = 'repo-permission-syncer';
+const logger = createLogger(LOG_TAG);
+const createJobLogger = (jobId: string) => createLogger(`${LOG_TAG}:job:${jobId}`);
 
 export class RepoPermissionSyncer {
  private queue: Queue<RepoPermissionSyncJob>;
@@ -109,28 +112,31 @@ export class RepoPermissionSyncer {
  }
 
  private async schedulePermissionSync(repos: Repo[]) {
- await this.db.$transaction(async (tx) => {
- const jobs = await tx.repoPermissionSyncJob.createManyAndReturn({
- data: repos.map(repo => ({
- repoId: repo.id,
- })),
- });
-
- await this.queue.addBulk(jobs.map((job) => ({
- name: 'repoPermissionSyncJob',
- data: {
- jobId: job.id,
- },
- opts: {
- removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
- removeOnFail: env.REDIS_REMOVE_ON_FAIL,
- }
- })))
+ // @note: we don't perform this in a transaction because
+ // we want to avoid the situation where a job is created and run
+ // prior to the transaction being committed.
+ const jobs = await this.db.repoPermissionSyncJob.createManyAndReturn({
+ data: repos.map(repo => ({
+ repoId: repo.id,
+ })),
  });
+
+ await this.queue.addBulk(jobs.map((job) => ({
+ name: 'repoPermissionSyncJob',
+ data: {
+ jobId: job.id,
+ },
+ opts: {
+ removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
+ removeOnFail: env.REDIS_REMOVE_ON_FAIL,
+ }
+ })))
  }
 
  private async runJob(job: Job<RepoPermissionSyncJob>) {
  const id = job.data.jobId;
+ const logger = createJobLogger(id);
+
  const { repo } = await this.db.repoPermissionSyncJob.update({
  where: {
  id,
@@ -194,6 +200,33 @@ export class RepoPermissionSyncer {
  },
  });
 
+ return accounts.map(account => account.userId);
+ } else if (repo.external_codeHostType === 'gitlab') {
+ const api = await createGitLabFromPersonalAccessToken({
+ token: credentials.token,
+ url: credentials.hostUrl,
+ });
+
+ const projectId = repo.external_id;
+ if (!projectId) {
+ throw new Error(`Repo ${id} does not have an external_id`);
+ }
+
+ const members = await getProjectMembers(projectId, api);
+ const gitlabUserIds = members.map(member => member.id.toString());
+
+ const accounts = await this.db.account.findMany({
+ where: {
+ provider: 'gitlab',
+ providerAccountId: {
+ in: gitlabUserIds,
+ }
+ },
+ select: {
+ userId: true,
+ },
+ });
+
  return accounts.map(account => account.userId);
  }
 
@@ -221,6 +254,8 @@ export class RepoPermissionSyncer {
  }
 
  private async onJobCompleted(job: Job<RepoPermissionSyncJob>) {
+ const logger = createJobLogger(job.data.jobId);
+
  const { repo } = await this.db.repoPermissionSyncJob.update({
  where: {
  id: job.data.jobId,
@@ -243,6 +278,8 @@ export class RepoPermissionSyncer {
  }
 
  private async onJobFailed(job: Job<RepoPermissionSyncJob> | undefined, err: Error) {
+ const logger = createJobLogger(job?.data.jobId ?? 'unknown');
+
  Sentry.captureException(err, {
  tags: {
  jobId: job?.data.jobId,

packages/backend/src/ee/userPermissionSyncer.ts

@@ -6,10 +6,13 @@ import { Redis } from "ioredis";
 import { PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES } from "../constants.js";
 import { env } from "../env.js";
 import { createOctokitFromToken, getReposForAuthenticatedUser } from "../github.js";
+import { createGitLabFromOAuthToken, getProjectsForAuthenticatedUser } from "../gitlab.js";
 import { hasEntitlement } from "@sourcebot/shared";
 import { Settings } from "../types.js";
 
-const logger = createLogger('user-permission-syncer');
+const LOG_TAG = 'user-permission-syncer';
+const logger = createLogger(LOG_TAG);
+const createJobLogger = (jobId: string) => createLogger(`${LOG_TAG}:job:${jobId}`);
 
 const QUEUE_NAME = 'userPermissionSyncQueue';
 
@@ -110,28 +113,31 @@ export class UserPermissionSyncer {
  }
 
  private async schedulePermissionSync(users: User[]) {
- await this.db.$transaction(async (tx) => {
- const jobs = await tx.userPermissionSyncJob.createManyAndReturn({
- data: users.map(user => ({
- userId: user.id,
- })),
- });
-
- await this.queue.addBulk(jobs.map((job) => ({
- name: 'userPermissionSyncJob',
- data: {
- jobId: job.id,
- },
- opts: {
- removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
- removeOnFail: env.REDIS_REMOVE_ON_FAIL,
- }
- })))
+ // @note: we don't perform this in a transaction because
+ // we want to avoid the situation where a job is created and run
+ // prior to the transaction being committed.
+ const jobs = await this.db.userPermissionSyncJob.createManyAndReturn({
+ data: users.map(user => ({
+ userId: user.id,
+ })),
  });
+
+ await this.queue.addBulk(jobs.map((job) => ({
+ name: 'userPermissionSyncJob',
+ data: {
+ jobId: job.id,
+ },
+ opts: {
+ removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
+ removeOnFail: env.REDIS_REMOVE_ON_FAIL,
+ }
+ })))
  }
 
  private async runJob(job: Job<UserPermissionSyncJob>) {
  const id = job.data.jobId;
+ const logger = createJobLogger(id);
+
  const { user } = await this.db.userPermissionSyncJob.update({
  where: {
  id,
@@ -183,6 +189,37 @@ export class UserPermissionSyncer {
  }
  });
 
+ repos.forEach(repo => aggregatedRepoIds.add(repo.id));
+ } else if (account.provider === 'gitlab') {
+ if (!account.access_token) {
+ throw new Error(`User '${user.email}' does not have a GitLab OAuth access token associated with their GitLab account.`);
+ }
+
+ const api = await createGitLabFromOAuthToken({
+ oauthToken: account.access_token,
+ url: env.AUTH_EE_GITLAB_BASE_URL,
+ });
+
+ // @note: we only care about the private and internal repos since we don't need to build a mapping
+ // for public repos.
+ // @see: packages/web/src/prisma.ts
+ const privateGitLabProjects = await getProjectsForAuthenticatedUser('private', api);
+ const internalGitLabProjects = await getProjectsForAuthenticatedUser('internal', api);
+
+ const gitLabProjectIds = [
+ ...privateGitLabProjects,
+ ...internalGitLabProjects,
+ ].map(project => project.id.toString());
+
+ const repos = await this.db.repo.findMany({
+ where: {
+ external_codeHostType: 'gitlab',
+ external_id: {
+ in: gitLabProjectIds,
+ }
+ }
+ });
+
  repos.forEach(repo => aggregatedRepoIds.add(repo.id));
  }
  }
@@ -212,6 +249,8 @@ export class UserPermissionSyncer {
  }
 
  private async onJobCompleted(job: Job<UserPermissionSyncJob>) {
+ const logger = createJobLogger(job.data.jobId);
+
  const { user } = await this.db.userPermissionSyncJob.update({
  where: {
  id: job.data.jobId,
@@ -234,6 +273,8 @@ export class UserPermissionSyncer {
  }
 
  private async onJobFailed(job: Job<UserPermissionSyncJob> | undefined, err: Error) {
+ const logger = createJobLogger(job?.data.jobId ?? 'unknown');
+
  Sentry.captureException(err, {
  tags: {
  jobId: job?.data.jobId,
@@ -260,7 +301,7 @@ export class UserPermissionSyncer {
 
  logger.error(errorMessage(user.email ?? user.id));
  } else {
- logger.error(errorMessage('unknown user (id not found)'));
+ logger.error(errorMessage('unknown job (id not found)'));
  }
  }
 }

packages/backend/src/env.ts

@@ -56,6 +56,7 @@ export const env = createEnv({
 
  EXPERIMENT_EE_PERMISSION_SYNC_ENABLED: booleanSchema.default('false'),
  AUTH_EE_GITHUB_BASE_URL: z.string().optional(),
+ AUTH_EE_GITLAB_BASE_URL: z.string().default("https://gitlab.com"),
  },
  runtimeEnv: process.env,
  emptyStringAsUndefined: true,

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## Added
+- [Experimental][Sourcebot EE] Added GitLab permission syncing. [#585](https://github.com/sourcebot-dev/sourcebot/pull/585)
+
 ### Fixed
 - [ask sb] Fixed issue where reasoning tokens would appear in `text` content for openai compatible models. [#582](https://github.com/sourcebot-dev/sourcebot/pull/582)
 - Fixed issue with GitHub app token tracking and refreshing. [#583](https://github.com/sourcebot-dev/sourcebot/pull/583)

docs/docs/configuration/auth/providers.mdx

@@ -52,6 +52,14 @@ Optional environment variables:
 
 [Auth.js GitLab Provider Docs](https://authjs.dev/getting-started/providers/gitlab)
 
+Authentication using GitLab is supported via a [OAuth2.0 app](https://docs.gitlab.com/integration/oauth_provider/#create-an-instance-wide-application) installed on the GitLab instance. Follow the instructions in the [GitLab docs](https://docs.gitlab.com/integration/oauth_provider/) to create an app. The callback URL should be configurd to `<sourcebot_deployment_url>/api/auth/callback/gitlab`, and the following scopes need to be set:
+
+| Scope | Required | Notes |
+|------------|----------|----------------------------------------------------------------------------------------------------|
+| read_user | Yes | Allows Sourcebot to read basic user information required for authentication. |
+| read_api | Conditional | Required **only** when [permission syncing](/docs/features/permission-syncing) is enabled. Enables Sourcebot to list all repositories and projects for the authenticated user. |
+
+
 **Required environment variables:**
 - `AUTH_EE_GITLAB_CLIENT_ID`
 - `AUTH_EE_GITLAB_CLIENT_SECRET`

docs/docs/features/permission-syncing.mdx

@@ -35,7 +35,7 @@ We are actively working on supporting more code hosts. If you'd like to see a sp
 | Platform | Permission syncing |
 |:----------|------------------------------|
 | [GitHub (GHEC & GHEC Server)](/docs/features/permission-syncing#github) | ✅ |
-| GitLab | 🛑 |
+| [GitLab (Self-managed & Cloud)](/docs/features/permission-syncing#gitlab) | ✅ |
 | Bitbucket Cloud | 🛑 |
 | Bitbucket Data Center | 🛑 |
 | Gitea | 🛑 |
@@ -59,6 +59,18 @@ Permission syncing works with **GitHub.com**, **GitHub Enterprise Cloud**, and *
 - A GitHub OAuth provider must be configured to (1) correlate a Sourcebot user with a GitHub user, and (2) to list repositories that the user has access to for [User driven syncing](/docs/features/permission-syncing#how-it-works).
 - OAuth tokens must assume the `repo` scope in order to use the [List repositories for the authenticated user API](https://docs.github.com/en/rest/repos/repos?apiVersion=2022-11-28#list-repositories-for-the-authenticated-user) during [User driven syncing](/docs/features/permission-syncing#how-it-works). Sourcebot **will only** use this token for **reads**.
 
+## GitLab
+
+Prerequisite: [Add GitLab as an OAuth provider](/docs/configuration/auth/providers#gitlab).
+
+Permission syncing works with **GitLab Self-managed** and **GitLab Cloud**. Users with **Guest** role or above with membership to a group or project will have their access synced to Sourcebot. Both direct and indirect membership to a group or project will be synced with Sourcebot. For more details, see the [GitLab docs](https://docs.gitlab.com/user/project/members/#membership-types).
+
+
+**Notes:**
+- A GitLab OAuth provider must be configured to (1) correlate a Sourcebot user with a GitLab user, and (2) to list repositories that the user has access to for [User driven syncing](/docs/features/permission-syncing#how-it-works).
+- OAuth tokens require the `read_api` scope in order to use the [List projects for the authenticated user API](https://docs.gitlab.com/ee/api/projects.html#list-all-projects) during [User driven syncing](/docs/features/permission-syncing#how-it-works).
+
+
 # How it works
 
 Permission syncing works by periodically syncing ACLs from the code host(s) to Sourcebot to build an internal mapping between Users and Repositories. This mapping is hydrated in two directions:

packages/backend/src/constants.ts

@@ -5,6 +5,7 @@ export const SINGLE_TENANT_ORG_ID = 1;
 
 export const PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES = [
  'github',
+ 'gitlab',
 ];
 
 export const REPOS_CACHE_DIR = path.join(env.DATA_CACHE_DIR, 'repos');

packages/backend/src/ee/repoPermissionSyncer.ts

@@ -7,6 +7,7 @@ import { Redis } from 'ioredis';
 import { PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES } from "../constants.js";
 import { env } from "../env.js";
 import { createOctokitFromToken, getRepoCollaborators, GITHUB_CLOUD_HOSTNAME } from "../github.js";
+import { createGitLabFromPersonalAccessToken, getProjectMembers } from "../gitlab.js";
 import { Settings } from "../types.js";
 import { getAuthCredentialsForRepo } from "../utils.js";
 
@@ -16,7 +17,9 @@ type RepoPermissionSyncJob = {
 
 const QUEUE_NAME = 'repoPermissionSyncQueue';
 
-const logger = createLogger('repo-permission-syncer');
+const LOG_TAG = 'repo-permission-syncer';
+const logger = createLogger(LOG_TAG);
+const createJobLogger = (jobId: string) => createLogger(`${LOG_TAG}:job:${jobId}`);
 
 export class RepoPermissionSyncer {
  private queue: Queue<RepoPermissionSyncJob>;
@@ -109,28 +112,31 @@ export class RepoPermissionSyncer {
  }
 
  private async schedulePermissionSync(repos: Repo[]) {
- await this.db.$transaction(async (tx) => {
- const jobs = await tx.repoPermissionSyncJob.createManyAndReturn({
- data: repos.map(repo => ({
- repoId: repo.id,
- })),
- });
-
- await this.queue.addBulk(jobs.map((job) => ({
- name: 'repoPermissionSyncJob',
- data: {
- jobId: job.id,
- },
- opts: {
- removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
- removeOnFail: env.REDIS_REMOVE_ON_FAIL,
- }
- })))
+ // @note: we don't perform this in a transaction because
+ // we want to avoid the situation where a job is created and run
+ // prior to the transaction being committed.
+ const jobs = await this.db.repoPermissionSyncJob.createManyAndReturn({
+ data: repos.map(repo => ({
+ repoId: repo.id,
+ })),
  });
+
+ await this.queue.addBulk(jobs.map((job) => ({
+ name: 'repoPermissionSyncJob',
+ data: {
+ jobId: job.id,
+ },
+ opts: {
+ removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
+ removeOnFail: env.REDIS_REMOVE_ON_FAIL,
+ }
+ })))
  }
 
  private async runJob(job: Job<RepoPermissionSyncJob>) {
  const id = job.data.jobId;
+ const logger = createJobLogger(id);
+
  const { repo } = await this.db.repoPermissionSyncJob.update({
  where: {
  id,
@@ -194,6 +200,33 @@ export class RepoPermissionSyncer {
  },
  });
 
+ return accounts.map(account => account.userId);
+ } else if (repo.external_codeHostType === 'gitlab') {
+ const api = await createGitLabFromPersonalAccessToken({
+ token: credentials.token,
+ url: credentials.hostUrl,
+ });
+
+ const projectId = repo.external_id;
+ if (!projectId) {
+ throw new Error(`Repo ${id} does not have an external_id`);
+ }
+
+ const members = await getProjectMembers(projectId, api);
+ const gitlabUserIds = members.map(member => member.id.toString());
+
+ const accounts = await this.db.account.findMany({
+ where: {
+ provider: 'gitlab',
+ providerAccountId: {
+ in: gitlabUserIds,
+ }
+ },
+ select: {
+ userId: true,
+ },
+ });
+
  return accounts.map(account => account.userId);
  }
 
@@ -221,6 +254,8 @@ export class RepoPermissionSyncer {
  }
 
  private async onJobCompleted(job: Job<RepoPermissionSyncJob>) {
+ const logger = createJobLogger(job.data.jobId);
+
  const { repo } = await this.db.repoPermissionSyncJob.update({
  where: {
  id: job.data.jobId,
@@ -243,6 +278,8 @@ export class RepoPermissionSyncer {
  }
 
  private async onJobFailed(job: Job<RepoPermissionSyncJob> | undefined, err: Error) {
+ const logger = createJobLogger(job?.data.jobId ?? 'unknown');
+
  Sentry.captureException(err, {
  tags: {
  jobId: job?.data.jobId,

packages/backend/src/ee/userPermissionSyncer.ts

@@ -6,10 +6,13 @@ import { Redis } from "ioredis";
 import { PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES } from "../constants.js";
 import { env } from "../env.js";
 import { createOctokitFromToken, getReposForAuthenticatedUser } from "../github.js";
+import { createGitLabFromOAuthToken, getProjectsForAuthenticatedUser } from "../gitlab.js";
 import { hasEntitlement } from "@sourcebot/shared";
 import { Settings } from "../types.js";
 
-const logger = createLogger('user-permission-syncer');
+const LOG_TAG = 'user-permission-syncer';
+const logger = createLogger(LOG_TAG);
+const createJobLogger = (jobId: string) => createLogger(`${LOG_TAG}:job:${jobId}`);
 
 const QUEUE_NAME = 'userPermissionSyncQueue';
 
@@ -110,28 +113,31 @@ export class UserPermissionSyncer {
  }
 
  private async schedulePermissionSync(users: User[]) {
- await this.db.$transaction(async (tx) => {
- const jobs = await tx.userPermissionSyncJob.createManyAndReturn({
- data: users.map(user => ({
- userId: user.id,
- })),
- });
-
- await this.queue.addBulk(jobs.map((job) => ({
- name: 'userPermissionSyncJob',
- data: {
- jobId: job.id,
- },
- opts: {
- removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
- removeOnFail: env.REDIS_REMOVE_ON_FAIL,
- }
- })))
+ // @note: we don't perform this in a transaction because
+ // we want to avoid the situation where a job is created and run
+ // prior to the transaction being committed.
+ const jobs = await this.db.userPermissionSyncJob.createManyAndReturn({
+ data: users.map(user => ({
+ userId: user.id,
+ })),
  });
+
+ await this.queue.addBulk(jobs.map((job) => ({
+ name: 'userPermissionSyncJob',
+ data: {
+ jobId: job.id,
+ },
+ opts: {
+ removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
+ removeOnFail: env.REDIS_REMOVE_ON_FAIL,
+ }
+ })))
  }
 
  private async runJob(job: Job<UserPermissionSyncJob>) {
  const id = job.data.jobId;
+ const logger = createJobLogger(id);
+
  const { user } = await this.db.userPermissionSyncJob.update({
  where: {
  id,
@@ -183,6 +189,37 @@ export class UserPermissionSyncer {
  }
  });
 
+ repos.forEach(repo => aggregatedRepoIds.add(repo.id));
+ } else if (account.provider === 'gitlab') {
+ if (!account.access_token) {
+ throw new Error(`User '${user.email}' does not have a GitLab OAuth access token associated with their GitLab account.`);
+ }
+
+ const api = await createGitLabFromOAuthToken({
+ oauthToken: account.access_token,
+ url: env.AUTH_EE_GITLAB_BASE_URL,
+ });
+
+ // @note: we only care about the private and internal repos since we don't need to build a mapping
+ // for public repos.
+ // @see: packages/web/src/prisma.ts
+ const privateGitLabProjects = await getProjectsForAuthenticatedUser('private', api);
+ const internalGitLabProjects = await getProjectsForAuthenticatedUser('internal', api);
+
+ const gitLabProjectIds = [
+ ...privateGitLabProjects,
+ ...internalGitLabProjects,
+ ].map(project => project.id.toString());
+
+ const repos = await this.db.repo.findMany({
+ where: {
+ external_codeHostType: 'gitlab',
+ external_id: {
+ in: gitLabProjectIds,
+ }
+ }
+ });
+
  repos.forEach(repo => aggregatedRepoIds.add(repo.id));
  }
  }
@@ -212,6 +249,8 @@ export class UserPermissionSyncer {
  }
 
  private async onJobCompleted(job: Job<UserPermissionSyncJob>) {
+ const logger = createJobLogger(job.data.jobId);
+
  const { user } = await this.db.userPermissionSyncJob.update({
  where: {
  id: job.data.jobId,
@@ -234,6 +273,8 @@ export class UserPermissionSyncer {
  }
 
  private async onJobFailed(job: Job<UserPermissionSyncJob> | undefined, err: Error) {
+ const logger = createJobLogger(job?.data.jobId ?? 'unknown');
+
  Sentry.captureException(err, {
  tags: {
  jobId: job?.data.jobId,
@@ -260,7 +301,7 @@ export class UserPermissionSyncer {
 
  logger.error(errorMessage(user.email ?? user.id));
  } else {
- logger.error(errorMessage('unknown user (id not found)'));
+ logger.error(errorMessage('unknown job (id not found)'));
  }
  }
 }

packages/backend/src/env.ts

@@ -56,6 +56,7 @@ export const env = createEnv({
 
  EXPERIMENT_EE_PERMISSION_SYNC_ENABLED: booleanSchema.default('false'),
  AUTH_EE_GITHUB_BASE_URL: z.string().optional(),
+ AUTH_EE_GITLAB_BASE_URL: z.string().default("https://gitlab.com"),
  },
  runtimeEnv: process.env,
  emptyStringAsUndefined: true,

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## Added
+- [Experimental][Sourcebot EE] Added GitLab permission syncing. [#585](https://github.com/sourcebot-dev/sourcebot/pull/585)
+
 ### Fixed
 - [ask sb] Fixed issue where reasoning tokens would appear in `text` content for openai compatible models. [#582](https://github.com/sourcebot-dev/sourcebot/pull/582)
 - Fixed issue with GitHub app token tracking and refreshing. [#583](https://github.com/sourcebot-dev/sourcebot/pull/583)

docs/docs/configuration/auth/providers.mdx

@@ -52,6 +52,14 @@ Optional environment variables:
 
 [Auth.js GitLab Provider Docs](https://authjs.dev/getting-started/providers/gitlab)
 
+Authentication using GitLab is supported via a [OAuth2.0 app](https://docs.gitlab.com/integration/oauth_provider/#create-an-instance-wide-application) installed on the GitLab instance. Follow the instructions in the [GitLab docs](https://docs.gitlab.com/integration/oauth_provider/) to create an app. The callback URL should be configurd to `<sourcebot_deployment_url>/api/auth/callback/gitlab`, and the following scopes need to be set:
+
+| Scope | Required | Notes |
+|------------|----------|----------------------------------------------------------------------------------------------------|
+| read_user | Yes | Allows Sourcebot to read basic user information required for authentication. |
+| read_api | Conditional | Required **only** when [permission syncing](/docs/features/permission-syncing) is enabled. Enables Sourcebot to list all repositories and projects for the authenticated user. |
+
+
 **Required environment variables:**
 - `AUTH_EE_GITLAB_CLIENT_ID`
 - `AUTH_EE_GITLAB_CLIENT_SECRET`

docs/docs/features/permission-syncing.mdx

@@ -35,7 +35,7 @@ We are actively working on supporting more code hosts. If you'd like to see a sp
 | Platform | Permission syncing |
 |:----------|------------------------------|
 | [GitHub (GHEC & GHEC Server)](/docs/features/permission-syncing#github) | ✅ |
-| GitLab | 🛑 |
+| [GitLab (Self-managed & Cloud)](/docs/features/permission-syncing#gitlab) | ✅ |
 | Bitbucket Cloud | 🛑 |
 | Bitbucket Data Center | 🛑 |
 | Gitea | 🛑 |
@@ -59,6 +59,18 @@ Permission syncing works with **GitHub.com**, **GitHub Enterprise Cloud**, and *
 - A GitHub OAuth provider must be configured to (1) correlate a Sourcebot user with a GitHub user, and (2) to list repositories that the user has access to for [User driven syncing](/docs/features/permission-syncing#how-it-works).
 - OAuth tokens must assume the `repo` scope in order to use the [List repositories for the authenticated user API](https://docs.github.com/en/rest/repos/repos?apiVersion=2022-11-28#list-repositories-for-the-authenticated-user) during [User driven syncing](/docs/features/permission-syncing#how-it-works). Sourcebot **will only** use this token for **reads**.
 
+## GitLab
+
+Prerequisite: [Add GitLab as an OAuth provider](/docs/configuration/auth/providers#gitlab).
+
+Permission syncing works with **GitLab Self-managed** and **GitLab Cloud**. Users with **Guest** role or above with membership to a group or project will have their access synced to Sourcebot. Both direct and indirect membership to a group or project will be synced with Sourcebot. For more details, see the [GitLab docs](https://docs.gitlab.com/user/project/members/#membership-types).
+
+
+**Notes:**
+- A GitLab OAuth provider must be configured to (1) correlate a Sourcebot user with a GitLab user, and (2) to list repositories that the user has access to for [User driven syncing](/docs/features/permission-syncing#how-it-works).
+- OAuth tokens require the `read_api` scope in order to use the [List projects for the authenticated user API](https://docs.gitlab.com/ee/api/projects.html#list-all-projects) during [User driven syncing](/docs/features/permission-syncing#how-it-works).
+
+
 # How it works
 
 Permission syncing works by periodically syncing ACLs from the code host(s) to Sourcebot to build an internal mapping between Users and Repositories. This mapping is hydrated in two directions:

packages/backend/src/constants.ts

@@ -5,6 +5,7 @@ export const SINGLE_TENANT_ORG_ID = 1;
 
 export const PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES = [
  'github',
+ 'gitlab',
 ];
 
 export const REPOS_CACHE_DIR = path.join(env.DATA_CACHE_DIR, 'repos');

packages/backend/src/ee/repoPermissionSyncer.ts

@@ -7,6 +7,7 @@ import { Redis } from 'ioredis';
 import { PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES } from "../constants.js";
 import { env } from "../env.js";
 import { createOctokitFromToken, getRepoCollaborators, GITHUB_CLOUD_HOSTNAME } from "../github.js";
+import { createGitLabFromPersonalAccessToken, getProjectMembers } from "../gitlab.js";
 import { Settings } from "../types.js";
 import { getAuthCredentialsForRepo } from "../utils.js";
 
@@ -16,7 +17,9 @@ type RepoPermissionSyncJob = {
 
 const QUEUE_NAME = 'repoPermissionSyncQueue';
 
-const logger = createLogger('repo-permission-syncer');
+const LOG_TAG = 'repo-permission-syncer';
+const logger = createLogger(LOG_TAG);
+const createJobLogger = (jobId: string) => createLogger(`${LOG_TAG}:job:${jobId}`);
 
 export class RepoPermissionSyncer {
  private queue: Queue<RepoPermissionSyncJob>;
@@ -109,28 +112,31 @@ export class RepoPermissionSyncer {
  }
 
  private async schedulePermissionSync(repos: Repo[]) {
- await this.db.$transaction(async (tx) => {
- const jobs = await tx.repoPermissionSyncJob.createManyAndReturn({
- data: repos.map(repo => ({
- repoId: repo.id,
- })),
- });
-
- await this.queue.addBulk(jobs.map((job) => ({
- name: 'repoPermissionSyncJob',
- data: {
- jobId: job.id,
- },
- opts: {
- removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
- removeOnFail: env.REDIS_REMOVE_ON_FAIL,
- }
- })))
+ // @note: we don't perform this in a transaction because
+ // we want to avoid the situation where a job is created and run
+ // prior to the transaction being committed.
+ const jobs = await this.db.repoPermissionSyncJob.createManyAndReturn({
+ data: repos.map(repo => ({
+ repoId: repo.id,
+ })),
  });
+
+ await this.queue.addBulk(jobs.map((job) => ({
+ name: 'repoPermissionSyncJob',
+ data: {
+ jobId: job.id,
+ },
+ opts: {
+ removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
+ removeOnFail: env.REDIS_REMOVE_ON_FAIL,
+ }
+ })))
  }
 
  private async runJob(job: Job<RepoPermissionSyncJob>) {
  const id = job.data.jobId;
+ const logger = createJobLogger(id);
+
  const { repo } = await this.db.repoPermissionSyncJob.update({
  where: {
  id,
@@ -194,6 +200,33 @@ export class RepoPermissionSyncer {
  },
  });
 
+ return accounts.map(account => account.userId);
+ } else if (repo.external_codeHostType === 'gitlab') {
+ const api = await createGitLabFromPersonalAccessToken({
+ token: credentials.token,
+ url: credentials.hostUrl,
+ });
+
+ const projectId = repo.external_id;
+ if (!projectId) {
+ throw new Error(`Repo ${id} does not have an external_id`);
+ }
+
+ const members = await getProjectMembers(projectId, api);
+ const gitlabUserIds = members.map(member => member.id.toString());
+
+ const accounts = await this.db.account.findMany({
+ where: {
+ provider: 'gitlab',
+ providerAccountId: {
+ in: gitlabUserIds,
+ }
+ },
+ select: {
+ userId: true,
+ },
+ });
+
  return accounts.map(account => account.userId);
  }
 
@@ -221,6 +254,8 @@ export class RepoPermissionSyncer {
  }
 
  private async onJobCompleted(job: Job<RepoPermissionSyncJob>) {
+ const logger = createJobLogger(job.data.jobId);
+
  const { repo } = await this.db.repoPermissionSyncJob.update({
  where: {
  id: job.data.jobId,
@@ -243,6 +278,8 @@ export class RepoPermissionSyncer {
  }
 
  private async onJobFailed(job: Job<RepoPermissionSyncJob> | undefined, err: Error) {
+ const logger = createJobLogger(job?.data.jobId ?? 'unknown');
+
  Sentry.captureException(err, {
  tags: {
  jobId: job?.data.jobId,

packages/backend/src/ee/userPermissionSyncer.ts

@@ -6,10 +6,13 @@ import { Redis } from "ioredis";
 import { PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES } from "../constants.js";
 import { env } from "../env.js";
 import { createOctokitFromToken, getReposForAuthenticatedUser } from "../github.js";
+import { createGitLabFromOAuthToken, getProjectsForAuthenticatedUser } from "../gitlab.js";
 import { hasEntitlement } from "@sourcebot/shared";
 import { Settings } from "../types.js";
 
-const logger = createLogger('user-permission-syncer');
+const LOG_TAG = 'user-permission-syncer';
+const logger = createLogger(LOG_TAG);
+const createJobLogger = (jobId: string) => createLogger(`${LOG_TAG}:job:${jobId}`);
 
 const QUEUE_NAME = 'userPermissionSyncQueue';
 
@@ -110,28 +113,31 @@ export class UserPermissionSyncer {
  }
 
  private async schedulePermissionSync(users: User[]) {
- await this.db.$transaction(async (tx) => {
- const jobs = await tx.userPermissionSyncJob.createManyAndReturn({
- data: users.map(user => ({
- userId: user.id,
- })),
- });
-
- await this.queue.addBulk(jobs.map((job) => ({
- name: 'userPermissionSyncJob',
- data: {
- jobId: job.id,
- },
- opts: {
- removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
- removeOnFail: env.REDIS_REMOVE_ON_FAIL,
- }
- })))
+ // @note: we don't perform this in a transaction because
+ // we want to avoid the situation where a job is created and run
+ // prior to the transaction being committed.
+ const jobs = await this.db.userPermissionSyncJob.createManyAndReturn({
+ data: users.map(user => ({
+ userId: user.id,
+ })),
  });
+
+ await this.queue.addBulk(jobs.map((job) => ({
+ name: 'userPermissionSyncJob',
+ data: {
+ jobId: job.id,
+ },
+ opts: {
+ removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
+ removeOnFail: env.REDIS_REMOVE_ON_FAIL,
+ }
+ })))
  }
 
  private async runJob(job: Job<UserPermissionSyncJob>) {
  const id = job.data.jobId;
+ const logger = createJobLogger(id);
+
  const { user } = await this.db.userPermissionSyncJob.update({
  where: {
  id,
@@ -183,6 +189,37 @@ export class UserPermissionSyncer {
  }
  });
 
+ repos.forEach(repo => aggregatedRepoIds.add(repo.id));
+ } else if (account.provider === 'gitlab') {
+ if (!account.access_token) {
+ throw new Error(`User '${user.email}' does not have a GitLab OAuth access token associated with their GitLab account.`);
+ }
+
+ const api = await createGitLabFromOAuthToken({
+ oauthToken: account.access_token,
+ url: env.AUTH_EE_GITLAB_BASE_URL,
+ });
+
+ // @note: we only care about the private and internal repos since we don't need to build a mapping
+ // for public repos.
+ // @see: packages/web/src/prisma.ts
+ const privateGitLabProjects = await getProjectsForAuthenticatedUser('private', api);
+ const internalGitLabProjects = await getProjectsForAuthenticatedUser('internal', api);
+
+ const gitLabProjectIds = [
+ ...privateGitLabProjects,
+ ...internalGitLabProjects,
+ ].map(project => project.id.toString());
+
+ const repos = await this.db.repo.findMany({
+ where: {
+ external_codeHostType: 'gitlab',
+ external_id: {
+ in: gitLabProjectIds,
+ }
+ }
+ });
+
  repos.forEach(repo => aggregatedRepoIds.add(repo.id));
  }
  }
@@ -212,6 +249,8 @@ export class UserPermissionSyncer {
  }
 
  private async onJobCompleted(job: Job<UserPermissionSyncJob>) {
+ const logger = createJobLogger(job.data.jobId);
+
  const { user } = await this.db.userPermissionSyncJob.update({
  where: {
  id: job.data.jobId,
@@ -234,6 +273,8 @@ export class UserPermissionSyncer {
  }
 
  private async onJobFailed(job: Job<UserPermissionSyncJob> | undefined, err: Error) {
+ const logger = createJobLogger(job?.data.jobId ?? 'unknown');
+
  Sentry.captureException(err, {
  tags: {
  jobId: job?.data.jobId,
@@ -260,7 +301,7 @@ export class UserPermissionSyncer {
 
  logger.error(errorMessage(user.email ?? user.id));
  } else {
- logger.error(errorMessage('unknown user (id not found)'));
+ logger.error(errorMessage('unknown job (id not found)'));
  }
  }
 }

packages/backend/src/env.ts

@@ -56,6 +56,7 @@ export const env = createEnv({
 
  EXPERIMENT_EE_PERMISSION_SYNC_ENABLED: booleanSchema.default('false'),
  AUTH_EE_GITHUB_BASE_URL: z.string().optional(),
+ AUTH_EE_GITLAB_BASE_URL: z.string().default("https://gitlab.com"),
  },
  runtimeEnv: process.env,
  emptyStringAsUndefined: true,

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## Added
+- [Experimental][Sourcebot EE] Added GitLab permission syncing. [#585](https://github.com/sourcebot-dev/sourcebot/pull/585)
+
 ### Fixed
 - [ask sb] Fixed issue where reasoning tokens would appear in `text` content for openai compatible models. [#582](https://github.com/sourcebot-dev/sourcebot/pull/582)
 - Fixed issue with GitHub app token tracking and refreshing. [#583](https://github.com/sourcebot-dev/sourcebot/pull/583)

docs/docs/configuration/auth/providers.mdx

@@ -52,6 +52,14 @@ Optional environment variables:
 
 [Auth.js GitLab Provider Docs](https://authjs.dev/getting-started/providers/gitlab)
 
+Authentication using GitLab is supported via a [OAuth2.0 app](https://docs.gitlab.com/integration/oauth_provider/#create-an-instance-wide-application) installed on the GitLab instance. Follow the instructions in the [GitLab docs](https://docs.gitlab.com/integration/oauth_provider/) to create an app. The callback URL should be configurd to `<sourcebot_deployment_url>/api/auth/callback/gitlab`, and the following scopes need to be set:
+
+| Scope | Required | Notes |
+|------------|----------|----------------------------------------------------------------------------------------------------|
+| read_user | Yes | Allows Sourcebot to read basic user information required for authentication. |
+| read_api | Conditional | Required **only** when [permission syncing](/docs/features/permission-syncing) is enabled. Enables Sourcebot to list all repositories and projects for the authenticated user. |
+
+
 **Required environment variables:**
 - `AUTH_EE_GITLAB_CLIENT_ID`
 - `AUTH_EE_GITLAB_CLIENT_SECRET`

docs/docs/features/permission-syncing.mdx

@@ -35,7 +35,7 @@ We are actively working on supporting more code hosts. If you'd like to see a sp
 | Platform | Permission syncing |
 |:----------|------------------------------|
 | [GitHub (GHEC & GHEC Server)](/docs/features/permission-syncing#github) | ✅ |
-| GitLab | 🛑 |
+| [GitLab (Self-managed & Cloud)](/docs/features/permission-syncing#gitlab) | ✅ |
 | Bitbucket Cloud | 🛑 |
 | Bitbucket Data Center | 🛑 |
 | Gitea | 🛑 |
@@ -59,6 +59,18 @@ Permission syncing works with **GitHub.com**, **GitHub Enterprise Cloud**, and *
 - A GitHub OAuth provider must be configured to (1) correlate a Sourcebot user with a GitHub user, and (2) to list repositories that the user has access to for [User driven syncing](/docs/features/permission-syncing#how-it-works).
 - OAuth tokens must assume the `repo` scope in order to use the [List repositories for the authenticated user API](https://docs.github.com/en/rest/repos/repos?apiVersion=2022-11-28#list-repositories-for-the-authenticated-user) during [User driven syncing](/docs/features/permission-syncing#how-it-works). Sourcebot **will only** use this token for **reads**.
 
+## GitLab
+
+Prerequisite: [Add GitLab as an OAuth provider](/docs/configuration/auth/providers#gitlab).
+
+Permission syncing works with **GitLab Self-managed** and **GitLab Cloud**. Users with **Guest** role or above with membership to a group or project will have their access synced to Sourcebot. Both direct and indirect membership to a group or project will be synced with Sourcebot. For more details, see the [GitLab docs](https://docs.gitlab.com/user/project/members/#membership-types).
+
+
+**Notes:**
+- A GitLab OAuth provider must be configured to (1) correlate a Sourcebot user with a GitLab user, and (2) to list repositories that the user has access to for [User driven syncing](/docs/features/permission-syncing#how-it-works).
+- OAuth tokens require the `read_api` scope in order to use the [List projects for the authenticated user API](https://docs.gitlab.com/ee/api/projects.html#list-all-projects) during [User driven syncing](/docs/features/permission-syncing#how-it-works).
+
+
 # How it works
 
 Permission syncing works by periodically syncing ACLs from the code host(s) to Sourcebot to build an internal mapping between Users and Repositories. This mapping is hydrated in two directions:

packages/backend/src/constants.ts

@@ -5,6 +5,7 @@ export const SINGLE_TENANT_ORG_ID = 1;
 
 export const PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES = [
  'github',
+ 'gitlab',
 ];
 
 export const REPOS_CACHE_DIR = path.join(env.DATA_CACHE_DIR, 'repos');

packages/backend/src/ee/repoPermissionSyncer.ts

@@ -7,6 +7,7 @@ import { Redis } from 'ioredis';
 import { PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES } from "../constants.js";
 import { env } from "../env.js";
 import { createOctokitFromToken, getRepoCollaborators, GITHUB_CLOUD_HOSTNAME } from "../github.js";
+import { createGitLabFromPersonalAccessToken, getProjectMembers } from "../gitlab.js";
 import { Settings } from "../types.js";
 import { getAuthCredentialsForRepo } from "../utils.js";
 
@@ -16,7 +17,9 @@ type RepoPermissionSyncJob = {
 
 const QUEUE_NAME = 'repoPermissionSyncQueue';
 
-const logger = createLogger('repo-permission-syncer');
+const LOG_TAG = 'repo-permission-syncer';
+const logger = createLogger(LOG_TAG);
+const createJobLogger = (jobId: string) => createLogger(`${LOG_TAG}:job:${jobId}`);
 
 export class RepoPermissionSyncer {
  private queue: Queue<RepoPermissionSyncJob>;
@@ -109,28 +112,31 @@ export class RepoPermissionSyncer {
  }
 
  private async schedulePermissionSync(repos: Repo[]) {
- await this.db.$transaction(async (tx) => {
- const jobs = await tx.repoPermissionSyncJob.createManyAndReturn({
- data: repos.map(repo => ({
- repoId: repo.id,
- })),
- });
-
- await this.queue.addBulk(jobs.map((job) => ({
- name: 'repoPermissionSyncJob',
- data: {
- jobId: job.id,
- },
- opts: {
- removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
- removeOnFail: env.REDIS_REMOVE_ON_FAIL,
- }
- })))
+ // @note: we don't perform this in a transaction because
+ // we want to avoid the situation where a job is created and run
+ // prior to the transaction being committed.
+ const jobs = await this.db.repoPermissionSyncJob.createManyAndReturn({
+ data: repos.map(repo => ({
+ repoId: repo.id,
+ })),
  });
+
+ await this.queue.addBulk(jobs.map((job) => ({
+ name: 'repoPermissionSyncJob',
+ data: {
+ jobId: job.id,
+ },
+ opts: {
+ removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
+ removeOnFail: env.REDIS_REMOVE_ON_FAIL,
+ }
+ })))
  }
 
  private async runJob(job: Job<RepoPermissionSyncJob>) {
  const id = job.data.jobId;
+ const logger = createJobLogger(id);
+
  const { repo } = await this.db.repoPermissionSyncJob.update({
  where: {
  id,
@@ -194,6 +200,33 @@ export class RepoPermissionSyncer {
  },
  });
 
+ return accounts.map(account => account.userId);
+ } else if (repo.external_codeHostType === 'gitlab') {
+ const api = await createGitLabFromPersonalAccessToken({
+ token: credentials.token,
+ url: credentials.hostUrl,
+ });
+
+ const projectId = repo.external_id;
+ if (!projectId) {
+ throw new Error(`Repo ${id} does not have an external_id`);
+ }
+
+ const members = await getProjectMembers(projectId, api);
+ const gitlabUserIds = members.map(member => member.id.toString());
+
+ const accounts = await this.db.account.findMany({
+ where: {
+ provider: 'gitlab',
+ providerAccountId: {
+ in: gitlabUserIds,
+ }
+ },
+ select: {
+ userId: true,
+ },
+ });
+
  return accounts.map(account => account.userId);
  }
 
@@ -221,6 +254,8 @@ export class RepoPermissionSyncer {
  }
 
  private async onJobCompleted(job: Job<RepoPermissionSyncJob>) {
+ const logger = createJobLogger(job.data.jobId);
+
  const { repo } = await this.db.repoPermissionSyncJob.update({
  where: {
  id: job.data.jobId,
@@ -243,6 +278,8 @@ export class RepoPermissionSyncer {
  }
 
  private async onJobFailed(job: Job<RepoPermissionSyncJob> | undefined, err: Error) {
+ const logger = createJobLogger(job?.data.jobId ?? 'unknown');
+
  Sentry.captureException(err, {
  tags: {
  jobId: job?.data.jobId,

packages/backend/src/ee/userPermissionSyncer.ts

@@ -6,10 +6,13 @@ import { Redis } from "ioredis";
 import { PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES } from "../constants.js";
 import { env } from "../env.js";
 import { createOctokitFromToken, getReposForAuthenticatedUser } from "../github.js";
+import { createGitLabFromOAuthToken, getProjectsForAuthenticatedUser } from "../gitlab.js";
 import { hasEntitlement } from "@sourcebot/shared";
 import { Settings } from "../types.js";
 
-const logger = createLogger('user-permission-syncer');
+const LOG_TAG = 'user-permission-syncer';
+const logger = createLogger(LOG_TAG);
+const createJobLogger = (jobId: string) => createLogger(`${LOG_TAG}:job:${jobId}`);
 
 const QUEUE_NAME = 'userPermissionSyncQueue';
 
@@ -110,28 +113,31 @@ export class UserPermissionSyncer {
  }
 
  private async schedulePermissionSync(users: User[]) {
- await this.db.$transaction(async (tx) => {
- const jobs = await tx.userPermissionSyncJob.createManyAndReturn({
- data: users.map(user => ({
- userId: user.id,
- })),
- });
-
- await this.queue.addBulk(jobs.map((job) => ({
- name: 'userPermissionSyncJob',
- data: {
- jobId: job.id,
- },
- opts: {
- removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
- removeOnFail: env.REDIS_REMOVE_ON_FAIL,
- }
- })))
+ // @note: we don't perform this in a transaction because
+ // we want to avoid the situation where a job is created and run
+ // prior to the transaction being committed.
+ const jobs = await this.db.userPermissionSyncJob.createManyAndReturn({
+ data: users.map(user => ({
+ userId: user.id,
+ })),
  });
+
+ await this.queue.addBulk(jobs.map((job) => ({
+ name: 'userPermissionSyncJob',
+ data: {
+ jobId: job.id,
+ },
+ opts: {
+ removeOnComplete: env.REDIS_REMOVE_ON_COMPLETE,
+ removeOnFail: env.REDIS_REMOVE_ON_FAIL,
+ }
+ })))
  }
 
  private async runJob(job: Job<UserPermissionSyncJob>) {
  const id = job.data.jobId;
+ const logger = createJobLogger(id);
+
  const { user } = await this.db.userPermissionSyncJob.update({
  where: {
  id,
@@ -183,6 +189,37 @@ export class UserPermissionSyncer {
  }
  });
 
+ repos.forEach(repo => aggregatedRepoIds.add(repo.id));
+ } else if (account.provider === 'gitlab') {
+ if (!account.access_token) {
+ throw new Error(`User '${user.email}' does not have a GitLab OAuth access token associated with their GitLab account.`);
+ }
+
+ const api = await createGitLabFromOAuthToken({
+ oauthToken: account.access_token,
+ url: env.AUTH_EE_GITLAB_BASE_URL,
+ });
+
+ // @note: we only care about the private and internal repos since we don't need to build a mapping
+ // for public repos.
+ // @see: packages/web/src/prisma.ts
+ const privateGitLabProjects = await getProjectsForAuthenticatedUser('private', api);
+ const internalGitLabProjects = await getProjectsForAuthenticatedUser('internal', api);
+
+ const gitLabProjectIds = [
+ ...privateGitLabProjects,
+ ...internalGitLabProjects,
+ ].map(project => project.id.toString());
+
+ const repos = await this.db.repo.findMany({
+ where: {
+ external_codeHostType: 'gitlab',
+ external_id: {
+ in: gitLabProjectIds,
+ }
+ }
+ });
+
  repos.forEach(repo => aggregatedRepoIds.add(repo.id));
  }
  }
@@ -212,6 +249,8 @@ export class UserPermissionSyncer {
  }
 
  private async onJobCompleted(job: Job<UserPermissionSyncJob>) {
+ const logger = createJobLogger(job.data.jobId);
+
  const { user } = await this.db.userPermissionSyncJob.update({
  where: {
  id: job.data.jobId,
@@ -234,6 +273,8 @@ export class UserPermissionSyncer {
  }
 
  private async onJobFailed(job: Job<UserPermissionSyncJob> | undefined, err: Error) {
+ const logger = createJobLogger(job?.data.jobId ?? 'unknown');
+
  Sentry.captureException(err, {
  tags: {
  jobId: job?.data.jobId,
@@ -260,7 +301,7 @@ export class UserPermissionSyncer {
 
  logger.error(errorMessage(user.email ?? user.id));
  } else {
- logger.error(errorMessage('unknown user (id not found)'));
+ logger.error(errorMessage('unknown job (id not found)'));
  }
  }
 }

packages/backend/src/env.ts

@@ -56,6 +56,7 @@ export const env = createEnv({
 
  EXPERIMENT_EE_PERMISSION_SYNC_ENABLED: booleanSchema.default('false'),
  AUTH_EE_GITHUB_BASE_URL: z.string().optional(),
+ AUTH_EE_GITLAB_BASE_URL: z.string().default("https://gitlab.com"),
  },
  runtimeEnv: process.env,
  emptyStringAsUndefined: true,