lifecycle: fix install_id migration not running (#7116)

* lifecycle: fix install_id migration not running Signed-off-by: Jens Langhammer <jens@goauthentik.io> * fix ldap test? Signed-off-by: Jens Langhammer <jens@goauthentik.io> * idk if this works Signed-off-by: Jens Langhammer <jens@goauthentik.io> --------- Signed-off-by: Jens Langhammer <jens@goauthentik.io>
goauthentik · Oct 9, 2023 · a22bc5a · a22bc5a
1 parent 94fd22b
commit a22bc5a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/internal/outpost/ldap/search/direct/schema.go b/internal/outpost/ldap/search/direct/schema.go
@@ -59,7 +59,7 @@ func (ds *DirectSearcher) SearchSubschema(req *search.Request) (ldap.ServerSearc
 							"( 2.5.21.2 NAME 'dITContentRules' SYNTAX '1.3.6.1.4.1.1466.115.121.1.15' NO-USER-MODIFICATION )",
 							"( 2.5.21.5 NAME 'attributeTypes' SYNTAX '1.3.6.1.4.1.1466.115.121.1.15' NO-USER-MODIFICATION )",
 							"( 2.5.21.6 NAME 'objectClasses' SYNTAX '1.3.6.1.4.1.1466.115.121.1.15' NO-USER-MODIFICATION )",
-							"( 0.9.2342.19200300.100.1.1 NAME 'uid' SYNTAX '1.3.6.1.4.1.1466.115.121.1.15' )",
+							"( 0.9.2342.19200300.100.1.1 NAME 'uid' SYNTAX '1.3.6.1.4.1.1466.115.121.1.15' SINGLE-VALUE )",
 							"( 0.9.2342.19200300.100.1.3 NAME 'mail' SYNTAX '1.3.6.1.4.1.1466.115.121.1.15' SINGLE-VALUE )",
 							"( 0.9.2342.19200300.100.1.41 NAME 'mobile' SYNTAX '1.3.6.1.4.1.1466.115.121.1.15' SINGLE-VALUE )",
 							"( 1.2.840.113556.1.2.13 NAME 'displayName' SYNTAX '1.3.6.1.4.1.1466.115.121.1.15' SINGLE-VALUE )",

diff --git a/lifecycle/system_migrations/install_id.py b/lifecycle/system_migrations/install_id.py
@@ -4,9 +4,11 @@
 from authentik.lib.config import CONFIG
 from lifecycle.migrate import BaseMigration
 
-SQL_STATEMENT = """CREATE TABLE IF NOT EXISTS authentik_install_id (
+SQL_STATEMENT = """BEGIN TRANSACTION;
+CREATE TABLE IF NOT EXISTS authentik_install_id (
     id TEXT NOT NULL
-);"""
+);
+COMMIT;"""
 
 
 class Migration(BaseMigration):
@@ -17,8 +19,8 @@ def needs_migration(self) -> bool:
         return not bool(self.cur.rowcount)
 
     def upgrade(self, migrate=False):
+        self.cur.execute(SQL_STATEMENT)
         with self.con.transaction():
-            self.cur.execute(SQL_STATEMENT)
             if migrate:
                 # If we already have migrations in the database, assume we're upgrading an existing install
                 # and set the install id to the secret key

diff --git a/tests/e2e/test_provider_ldap.py b/tests/e2e/test_provider_ldap.py
@@ -231,6 +231,7 @@ def test_ldap_bind_search(self):
         for obj in response:
             del obj["raw_attributes"]
             del obj["raw_dn"]
+            obj["attributes"] = dict(obj["attributes"])
         o_user = outpost.user
         expected = [
             {
@@ -244,11 +245,13 @@ def test_ldap_bind_search(self):
                     "sn": o_user.name,
                     "mail": "",
                     "objectClass": [
-                        "user",
+                        "top",
+                        "person",
                         "organizationalPerson",
                         "inetOrgPerson",
-                        "goauthentik.io/ldap/user",
+                        "user",
                         "posixAccount",
+                        "goauthentik.io/ldap/user",
                     ],
                     "uidNumber": 2000 + o_user.pk,
                     "gidNumber": 2000 + o_user.pk,
@@ -270,11 +273,13 @@ def test_ldap_bind_search(self):
                     "sn": embedded_account.name,
                     "mail": "",
                     "objectClass": [
-                        "user",
+                        "top",
+                        "person",
                         "organizationalPerson",
                         "inetOrgPerson",
-                        "goauthentik.io/ldap/user",
+                        "user",
                         "posixAccount",
+                        "goauthentik.io/ldap/user",
                     ],
                     "uidNumber": 2000 + embedded_account.pk,
                     "gidNumber": 2000 + embedded_account.pk,
@@ -296,11 +301,13 @@ def test_ldap_bind_search(self):
                     "sn": self.user.name,
                     "mail": self.user.email,
                     "objectClass": [
-                        "user",
+                        "top",
+                        "person",
                         "organizationalPerson",
                         "inetOrgPerson",
-                        "goauthentik.io/ldap/user",
+                        "user",
                         "posixAccount",
+                        "goauthentik.io/ldap/user",
                     ],
                     "uidNumber": 2000 + self.user.pk,
                     "gidNumber": 2000 + self.user.pk,