Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for LDAP authentication + Aliases #1475

Merged
merged 31 commits into from
Mar 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
5053069
Finish frame for LDAP auth
dangtony98 Feb 23, 2024
639c783
Add docs for LDAP
dangtony98 Feb 23, 2024
97a7b66
Fix merge conflicts
dangtony98 Feb 23, 2024
bfee74f
Add username field to users
dangtony98 Feb 24, 2024
8c31566
Update various SSO / SAML auth methods to support username
dangtony98 Feb 25, 2024
a33c50b
Adjust SCIM and SAML impl to use username / nameID, patch LDAP edge-c…
dangtony98 Feb 26, 2024
1c088b3
Merge remote-tracking branch 'origin' into ldap
dangtony98 Feb 26, 2024
9ba4b93
Add orgId to reuse login1/login2 logic for LDAP 2nd step login
dangtony98 Feb 26, 2024
9106822
Minor LDAP patches, docs for JumpCloud LDAP
dangtony98 Feb 27, 2024
a28431b
Finish preliminary LDAP
dangtony98 Feb 27, 2024
768cc64
Fix merge conflicts
dangtony98 Feb 27, 2024
2d9526a
Fix type/lint issues
dangtony98 Feb 27, 2024
5ca1b1d
Fix type/lint issues
dangtony98 Feb 27, 2024
04d729d
Update seed username
dangtony98 Feb 27, 2024
a04a9a1
Fix frontend lint issues
dangtony98 Feb 27, 2024
3641875
Update LDAP permissioning, styling of org auth section
dangtony98 Feb 27, 2024
f29dd6e
Fix merge conflicts
dangtony98 Mar 5, 2024
327c5e2
Update migration file to latest, remove git markers
dangtony98 Mar 5, 2024
76bd85e
Add user aliases concept and weave LDAP into it
dangtony98 Mar 6, 2024
4d707ee
Fix frontend type issues
dangtony98 Mar 6, 2024
2eca9d8
Check again email traces
dangtony98 Mar 6, 2024
7d495cf
Correct frontend email to username in AppLayout
dangtony98 Mar 6, 2024
35a5c9a
Fix lint issue
dangtony98 Mar 6, 2024
440a58a
Fix merge conflicts
dangtony98 Mar 6, 2024
7594929
Separate ldap boot/parent wrapper logic, move ldap services into dock…
dangtony98 Mar 10, 2024
feb7563
Merge remote-tracking branch 'origin' into ldap
dangtony98 Mar 10, 2024
b641bbf
Update test user username back to email-based
dangtony98 Mar 10, 2024
06f3a6d
Make LDAP config fields not nullable
dangtony98 Mar 10, 2024
163ccd6
Update username migration file
dangtony98 Mar 10, 2024
51a5bf8
Update LDAP migration to latest
dangtony98 Mar 11, 2024
5c8b886
Merge remote-tracking branch 'origin' into ldap
dangtony98 Mar 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ push:
up-dev:
docker compose -f docker-compose.dev.yml up --build

up-dev-ldap:
docker compose -f docker-compose.dev.yml --profile ldap up --build

up-prod:
docker-compose -f docker-compose.prod.yml up --build

Expand Down
162 changes: 162 additions & 0 deletions backend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@
"passport-github": "^1.1.0",
"passport-gitlab2": "^5.0.0",
"passport-google-oauth20": "^2.0.0",
"passport-ldapauth": "^3.0.1",
"pg": "^8.11.3",
"picomatch": "^3.0.1",
"pino": "^8.16.2",
Expand Down
3 changes: 3 additions & 0 deletions backend/src/@types/fastify.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import "fastify";
import { TUsers } from "@app/db/schemas";
import { TAuditLogServiceFactory } from "@app/ee/services/audit-log/audit-log-service";
import { TCreateAuditLogDTO } from "@app/ee/services/audit-log/audit-log-types";
import { TLdapConfigServiceFactory } from "@app/ee/services/ldap-config/ldap-config-service";
import { TLicenseServiceFactory } from "@app/ee/services/license/license-service";
import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service";
import { TSamlConfigServiceFactory } from "@app/ee/services/saml-config/saml-config-service";
Expand Down Expand Up @@ -69,6 +70,7 @@ declare module "fastify" {
};
auditLogInfo: Pick<TCreateAuditLogDTO, "userAgent" | "userAgentType" | "ipAddress" | "actor">;
ssoConfig: Awaited<ReturnType<TSamlConfigServiceFactory["getSaml"]>>;
ldapConfig: Awaited<ReturnType<TLdapConfigServiceFactory["getLdapCfg"]>>;
}

interface FastifyInstance {
Expand Down Expand Up @@ -107,6 +109,7 @@ declare module "fastify" {
snapshot: TSecretSnapshotServiceFactory;
saml: TSamlConfigServiceFactory;
scim: TScimServiceFactory;
ldap: TLdapConfigServiceFactory;
auditLog: TAuditLogServiceFactory;
secretScanning: TSecretScanningServiceFactory;
license: TLicenseServiceFactory;
Expand Down
8 changes: 8 additions & 0 deletions backend/src/@types/knex.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ import {
TIntegrations,
TIntegrationsInsert,
TIntegrationsUpdate,
TLdapConfigs,
TLdapConfigsInsert,
TLdapConfigsUpdate,
TOrganizations,
TOrganizationsInsert,
TOrganizationsUpdate,
Expand Down Expand Up @@ -161,6 +164,9 @@ import {
TUserActions,
TUserActionsInsert,
TUserActionsUpdate,
TUserAliases,
TUserAliasesInsert,
TUserAliasesUpdate,
TUserEncryptionKeys,
TUserEncryptionKeysInsert,
TUserEncryptionKeysUpdate,
Expand All @@ -175,6 +181,7 @@ import {
declare module "knex/types/tables" {
interface Tables {
[TableName.Users]: Knex.CompositeTableType<TUsers, TUsersInsert, TUsersUpdate>;
[TableName.UserAliases]: Knex.CompositeTableType<TUserAliases, TUserAliasesInsert, TUserAliasesUpdate>;
[TableName.UserEncryptionKey]: Knex.CompositeTableType<
TUserEncryptionKeys,
TUserEncryptionKeysInsert,
Expand Down Expand Up @@ -318,6 +325,7 @@ declare module "knex/types/tables" {
TSecretSnapshotFoldersUpdate
>;
[TableName.SamlConfig]: Knex.CompositeTableType<TSamlConfigs, TSamlConfigsInsert, TSamlConfigsUpdate>;
[TableName.LdapConfig]: Knex.CompositeTableType<TLdapConfigs, TLdapConfigsInsert, TLdapConfigsUpdate>;
[TableName.OrgBot]: Knex.CompositeTableType<TOrgBots, TOrgBotsInsert, TOrgBotsUpdate>;
[TableName.AuditLog]: Knex.CompositeTableType<TAuditLogs, TAuditLogsInsert, TAuditLogsUpdate>;
[TableName.GitAppInstallSession]: Knex.CompositeTableType<
Expand Down
68 changes: 68 additions & 0 deletions backend/src/db/migrations/20240311210135_ldap-config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import { Knex } from "knex";

import { TableName } from "../schemas";
import { createOnUpdateTrigger, dropOnUpdateTrigger } from "../utils";

export async function up(knex: Knex): Promise<void> {
if (!(await knex.schema.hasTable(TableName.LdapConfig))) {
await knex.schema.createTable(TableName.LdapConfig, (t) => {
t.uuid("id", { primaryKey: true }).defaultTo(knex.fn.uuid());
t.uuid("orgId").notNullable().unique();
t.foreign("orgId").references("id").inTable(TableName.Organization).onDelete("CASCADE");
t.boolean("isActive").notNullable();
t.string("url").notNullable();
t.string("encryptedBindDN").notNullable();
t.string("bindDNIV").notNullable();
t.string("bindDNTag").notNullable();
t.string("encryptedBindPass").notNullable();
t.string("bindPassIV").notNullable();
t.string("bindPassTag").notNullable();
t.string("searchBase").notNullable();
t.text("encryptedCACert").notNullable();
t.string("caCertIV").notNullable();
t.string("caCertTag").notNullable();
t.timestamps(true, true, true);
});
}

await createOnUpdateTrigger(knex, TableName.LdapConfig);

if (!(await knex.schema.hasTable(TableName.UserAliases))) {
await knex.schema.createTable(TableName.UserAliases, (t) => {
t.uuid("id", { primaryKey: true }).defaultTo(knex.fn.uuid());
t.uuid("userId").notNullable();
t.foreign("userId").references("id").inTable(TableName.Users).onDelete("CASCADE");
t.string("username").notNullable();
t.string("aliasType").notNullable();
t.string("externalId").notNullable();
t.specificType("emails", "text[]");
t.uuid("orgId").nullable();
t.foreign("orgId").references("id").inTable(TableName.Organization).onDelete("CASCADE");
t.timestamps(true, true, true);
});
}

await createOnUpdateTrigger(knex, TableName.UserAliases);

await knex.schema.alterTable(TableName.Users, (t) => {
t.string("username").unique();
t.string("email").nullable().alter();
t.dropUnique(["email"]);
});

await knex(TableName.Users).update("username", knex.ref("email"));

await knex.schema.alterTable(TableName.Users, (t) => {
t.string("username").notNullable().alter();
});
}

export async function down(knex: Knex): Promise<void> {
await knex.schema.dropTableIfExists(TableName.LdapConfig);
await knex.schema.dropTableIfExists(TableName.UserAliases);
await knex.schema.alterTable(TableName.Users, (t) => {
t.dropColumn("username");
// t.string("email").notNullable().alter();
});
await dropOnUpdateTrigger(knex, TableName.LdapConfig);
}
Loading
Loading