update

add nix flake
make a restart

lenticular_cloud/migrations/versions/a74320a5d7a1_init.py

@@ -0,0 +1,63 @@
+"""init
+
+Revision ID: a74320a5d7a1
+Revises: 
+Create Date: 2023-10-01 20:15:53.795636
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'a74320a5d7a1'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('group',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('name', sa.String(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), nullable=False),
+    sa.Column('modified_at', sa.DateTime(), nullable=False),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('name')
+    )
+    op.create_table('user',
+    sa.Column('id', sa.Uuid(), nullable=False),
+    sa.Column('username', sa.String(), nullable=False),
+    sa.Column('password_hashed', sa.String(), nullable=False),
+    sa.Column('alternative_email', sa.String(), nullable=True),
+    sa.Column('last_login', sa.DateTime(), nullable=True),
+    sa.Column('enabled', sa.Boolean(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), nullable=False),
+    sa.Column('modified_at', sa.DateTime(), nullable=False),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('username')
+    )
+    op.create_table('app_token',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('service_name', sa.String(), nullable=False),
+    sa.Column('user_id', sa.Uuid(), nullable=False),
+    sa.Column('token', sa.String(), nullable=False),
+    sa.Column('name', sa.String(), nullable=False),
+    sa.Column('last_used', sa.DateTime(), nullable=True),
+    sa.Column('created_at', sa.DateTime(), nullable=False),
+    sa.Column('modified_at', sa.DateTime(), nullable=False),
+    sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('webauthn_credential')
+    op.drop_table('totp')
+    op.drop_table('app_token')
+    op.drop_table('user')
+    op.drop_table('group')
+    # ### end Alembic commands ###

lenticular_cloud/migrations/versions/old/0518a8625b50_remove_ldap_add_rest_to_db.py

@@ -20,18 +20,6 @@ depends_on = None
 
 
 def upgrade():
-    from ldap3_orm import AttrDef, EntryBase as _EntryBase, ObjectDef, EntryType
-    from ldap3_orm import Reader
-    from ldap3 import Connection, Server, ALL
-
-    app = current_app
-    server = Server(app.config['LDAP_URL'], get_info=ALL)
-    ldap_conn = Connection(server, app.config['LDAP_BIND_DN'], app.config['LDAP_BIND_PW'], auto_bind=True) # TODO auto_bind read docu
-    base_dn = app.config['LDAP_BASE_DN']
-    object_def = ObjectDef(["inetOrgPerson"], ldap_conn)
-    user_base_dn = f"ou=users,{base_dn}"
-
-
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table('app_token',
     sa.Column('id', sa.Integer(), nullable=False),
@@ -50,21 +38,36 @@ def upgrade():
     op.add_column('user', sa.Column('password_hashed', sa.String(), server_default="", nullable=False))
     op.add_column('user', sa.Column('enabled', sa.Boolean(), server_default="false", nullable=True))
     # ### end Alembic commands ###
+    try:
+        from ldap3_orm import AttrDef, EntryBase as _EntryBase, ObjectDef, EntryType
+        from ldap3_orm import Reader
+        from ldap3 import Connection, Server, ALL
 
-    op.execute(User.__table__.update().values({'enabled': True}))
-    conn = op.get_bind()
-    users = conn.execute(User.__table__.select())
+        app = current_app
+        server = Server(app.config['LDAP_URL'], get_info=ALL)
+        ldap_conn = Connection(server, app.config['LDAP_BIND_DN'], app.config['LDAP_BIND_PW'], auto_bind=True) # TODO auto_bind read docu
+        base_dn = app.config['LDAP_BASE_DN']
+        object_def = ObjectDef(["inetOrgPerson"], ldap_conn)
+        user_base_dn = f"ou=users,{base_dn}"
 
-    for user in users:
-        print(f"migrating user {user.username}")
-        reader = Reader(ldap_conn, object_def, user_base_dn, f'(uid={user.username})')
-        result = reader.search()
-        if len(result) == 0:
-            print(f"WARNING: could not migrate user {user.username}")
-            continue
-        ldap_object = result[0]
-        password_hashed = ldap_object.userPassword[0].decode().replace('{CRYPT}','')
-        op.execute(User.__table__.update().values({'password_hashed': password_hashed}).where(User.id == user.id))
+
+
+        op.execute(User.__table__.update().values({'enabled': True}))
+        conn = op.get_bind()
+        users = conn.execute(User.__table__.select())
+
+        for user in users:
+            print(f"migrating user {user.username}")
+            reader = Reader(ldap_conn, object_def, user_base_dn, f'(uid={user.username})')
+            result = reader.search()
+            if len(result) == 0:
+                print(f"WARNING: could not migrate user {user.username}")
+                continue
+            ldap_object = result[0]
+            password_hashed = ldap_object.userPassword[0].decode().replace('{CRYPT}','')
+            op.execute(User.__table__.update().values({'password_hashed': password_hashed}).where(User.id == user.id))
+    except ModuleNotFoundError:
+        print("ignore import warning")
 
 
 

lenticular_cloud/migrations/versions/old/0f217e90cd07_fix_app_token.py

@@ -18,10 +18,10 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('app_token', sa.Column('user_id', sa.String(length=36), nullable=False))
-    op.add_column('app_token', sa.Column('last_used', sa.DateTime(), nullable=True))
+    with op.batch_alter_table('app_token') as batch_op:
+        batch_op.add_column(sa.Column('user_id', sa.Uuid, nullable=False))
+        batch_op.add_column(sa.Column('last_used', sa.DateTime(), nullable=True))
     op.create_foreign_key(None, 'app_token', 'user', ['user_id'], ['id'])
-    op.add_column('totp', sa.Column('last_used', sa.DateTime(), nullable=True))
     tmp_table = sa.Table('_alembic_tmp_user', sa.MetaData())
     op.execute(sa.schema.DropTable(tmp_table, if_exists=True))
     with op.batch_alter_table('user') as batch_op:

lenticular_cloud/migrations/versions/old/52a21983d2a8_add_webauthn.py

@@ -20,7 +20,7 @@ def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table('webauthn_credential',
     sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('user_id', sa.String(length=36), nullable=False),
+    sa.Column('user_id', sa.Uuid(), nullable=False),
     sa.Column('user_handle', sa.String(length=64), nullable=False),
     sa.Column('credential_data', sa.LargeBinary(), nullable=False),
     sa.Column('name', sa.String(length=250), nullable=True),