CI stack for Authentik with ldap

Author: jc21

Jenkinsfile

@@ -188,6 +188,11 @@ pipeline {
 					sh 'docker logs $(docker-compose ps --all -q pdns) > debug/postgres/docker_pdns.log 2>&1'
 					sh 'docker logs $(docker-compose ps --all -q pdns-db) > debug/postgres/docker_pdns-db.log 2>&1'
 					sh 'docker logs $(docker-compose ps --all -q dnsrouter) > debug/postgres/docker_dnsrouter.log 2>&1'
+					sh 'docker logs $(docker-compose ps --all -q db-postgres) > debug/postgres/docker_db.log 2>&1'
+					sh 'docker logs $(docker-compose ps --all -q authentik) > debug/postgres/docker_authentik.log 2>&1'
+					sh 'docker logs $(docker-compose ps --all -q authentik-redis) > debug/postgres/docker_authentik-redis.log 2>&1'
+					sh 'docker logs $(docker-compose ps --all -q authentik-ldap) > debug/postgres/docker_authentik-ldap.log 2>&1'
+
 					junit 'test/results/junit/*'
 					sh 'docker-compose down --remove-orphans --volumes -t 30 || true'
 				}
@@ -248,16 +253,16 @@ pipeline {
 			printResult()
 		}
 		failure {
+			archiveArtifacts(artifacts: 'debug/**/*', allowEmptyArchive: true)
 			dir(path: 'test') {
 				archiveArtifacts allowEmptyArchive: true, artifacts: 'results/**/*', excludes: '**/*.xml'
 			}
-			archiveArtifacts(artifacts: 'debug/*', allowEmptyArchive: true)
 		}
 		unstable {
+			archiveArtifacts(artifacts: 'debug/**/*', allowEmptyArchive: true)
 			dir(path: 'test') {
 				archiveArtifacts allowEmptyArchive: true, artifacts: 'results/**/*', excludes: '**/*.xml'
 			}
-			archiveArtifacts(artifacts: 'debug/*', allowEmptyArchive: true)
 		}
 	}
 }

backend/.testcoverage.yml

@@ -18,4 +18,4 @@ threshold:
   # package: 30
   # (optional; default 0)
   # The minimum total coverage project should have
-  total: 34
+  total: 33

backend/embed/api_docs/components/UserAuthObject.json

@@ -24,7 +24,7 @@
 		},
 		"type": {
 			"type": "string",
-			"pattern": "^password$"
+			"pattern": "^(local|ldap|oidc)$"
 		}
 	}
 }

backend/embed/api_docs/components/UserObject.json

@@ -53,7 +53,7 @@
 				},
 				"type": {
 					"type": "string",
-					"pattern": "^password$"
+					"pattern": "^(local|ldap|oidc)$"
 				}
 			}
 		},

backend/embed/migrations/mysql/20201013035839_initial_data.sql

@@ -125,14 +125,12 @@ INSERT INTO `user` (
 	`created_at`,
 	`updated_at`,
 	`name`,
-	`nickname`,
 	`email`,
 	`is_system`
 ) VALUES (
 	ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000),
 	ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000),
 	"System",
-	"System",
 	"system@localhost",
 	TRUE
 );

backend/embed/migrations/postgres/20201013035839_initial_data.sql

@@ -125,14 +125,12 @@ INSERT INTO "user" (
 	"created_at",
 	"updated_at",
 	"name",
-	"nickname",
 	"email",
 	"is_system"
 ) VALUES (
 	EXTRACT(EPOCH FROM TIMESTAMP '2011-05-17 10:40:28.876944') * 1000,
 	EXTRACT(EPOCH FROM TIMESTAMP '2011-05-17 10:40:28.876944') * 1000,
 	'System',
-	'System',
 	'system@localhost',
 	TRUE
 );

backend/embed/migrations/sqlite/20201013035839_initial_data.sql

@@ -124,14 +124,12 @@ INSERT INTO `user` (
 	created_at,
 	updated_at,
 	name,
-	nickname,
 	email,
 	is_system
 ) VALUES (
 	unixepoch() * 1000,
 	unixepoch() * 1000,
 	"System",
-	"System",
 	"system@localhost",
 	1
 );

backend/internal/entity/auth/entity_test.go

@@ -97,13 +97,14 @@ func (s *testsuite) TestSave() {
 	defer goleak.VerifyNone(s.T(), goleak.IgnoreAnyFunction("database/sql.(*DB).connectionOpener"))
 
 	s.mock.ExpectBegin()
-	s.mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "auth" ("created_at","updated_at","is_deleted","user_id","type","secret") VALUES ($1,$2,$3,$4,$5,$6) RETURNING "id"`)).
+	s.mock.ExpectQuery(regexp.QuoteMeta(`INSERT INTO "auth" ("created_at","updated_at","is_deleted","user_id","type","identity","secret") VALUES ($1,$2,$3,$4,$5,$6,$7) RETURNING "id"`)).
 		WithArgs(
 			sqlmock.AnyArg(),
 			sqlmock.AnyArg(),
 			0,
 			100,
 			TypeLocal,
+			"",
 			"abc123",
 		).
 		WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow("11"))

backend/internal/entity/auth/model.go

@@ -39,7 +39,6 @@ func (m *Model) LoadByID(id int) error {
 // Save will save this model to the DB
 func (m *Model) Save() error {
 	db := database.GetDB()
-	// todo: touch? not sure that save does this or not?
 	result := db.Save(m)
 	return result.Error
 }

backend/internal/entity/user/entity_test.go

@@ -84,7 +84,6 @@ func (s *testsuite) SetupTest() {
 	).AddRow(
 		11,
 		"Jane Doe",
-		"Jane",
 		"[email protected]",
 		true,
 		false,
@@ -183,7 +182,6 @@ func (s *testsuite) TestSave() {
 			sqlmock.AnyArg(),
 			0,
 			"John Doe",
-			"Jonny",
 			"[email protected]",
 			false,
 			false,