Merge pull request #490 from MultiDirectoryLab/ruff_config

Ruff config linter

Author: Mastermind-U

.github/workflows/checks.yml

@@ -26,27 +26,7 @@ jobs:
       - name: Run linters
         env:
           NEW_TAG: linter
-        run: docker run $NEW_TAG ruff check
-
-  flake8:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: build linters
-        env:
-          TAG: ghcr.io/${{ env.REPO }}_linters:latest
-          NEW_TAG: linter
-        run: docker build --target=runtime -f .docker/lint.Dockerfile . -t $NEW_TAG --cache-to type=gha,mode=max --cache-from $TAG --build-arg BUILDKIT_INLINE_CACHE=1
-      - name: Run linters
-        env:
-          NEW_TAG: linter
-        run: docker run $NEW_TAG flake8
+        run: docker run $NEW_TAG ruff check --output-format=github .
 
   mypy:
     runs-on: ubuntu-latest

.kerberos/config_server.py

@@ -688,9 +688,7 @@ def get_status(request: Request) -> bool:
     """
     kadmind = getattr(request.app.state, "kadmind", None)
 
-    if kadmind is not None:
-        return True
-    return False
+    return kadmind is not None
 
 
 def create_app() -> FastAPI:

app/alembic/versions/6f8fe2548893_fix_read_only.py

@@ -13,8 +13,8 @@
 from models import Attribute, Directory
 
 # revision identifiers, used by Alembic.
-revision = '6f8fe2548893'
-down_revision = 'fafc3d0b11ec'
+revision = "6f8fe2548893"
+down_revision = "fafc3d0b11ec"
 branch_labels = None
 depends_on = None
 
@@ -25,53 +25,52 @@ def upgrade() -> None:
     session = Session(bind=bind)
 
     ro_dir = session.scalar(select(Directory).where(
-        Directory.name == 'readonly domain controllers'))
+        Directory.name == "readonly domain controllers"))
 
     if not ro_dir:
         return
 
     session.execute(delete(Attribute).where(
-        Attribute.name == 'objectSid', Attribute.directory == ro_dir))
+        Attribute.name == "objectSid", Attribute.directory == ro_dir))
     session.execute(
         update(Attribute)
         .where(
-            Attribute.name == 'sAMAccountName',
+            Attribute.name == "sAMAccountName",
             Attribute.directory == ro_dir,
-            Attribute.value == 'domain users',
+            Attribute.value == "domain users",
         )
-        .values({'value': ro_dir.name}),
+        .values({"value": ro_dir.name}),
     )
 
     attr_object_class = session.scalar(
         select(Attribute)
         .where(
-            Attribute.name == 'objectClass',
+            Attribute.name == "objectClass",
             Attribute.directory == ro_dir,
-            Attribute.value == 'group',
+            Attribute.value == "group",
         ),
     )
     if not attr_object_class:
         session.add(Attribute(
-            name='objectClass', value='group', directory=ro_dir))
+            name="objectClass", value="group", directory=ro_dir))
         session.add(Attribute(
             name=ro_dir.rdname,
             value=ro_dir.name,
             directory=ro_dir,
             ),
         )
         session.add(Attribute(
-            name='gidNumber',
+            name="gidNumber",
             value=str(create_integer_hash(ro_dir.name)),
             directory=ro_dir,
             ),
         )
 
-    domain_sid = '-'.join(ro_dir.object_sid.split('-')[:-1])
-    ro_dir.object_sid = domain_sid + '-521'
+    domain_sid = "-".join(ro_dir.object_sid.split("-")[:-1])
+    ro_dir.object_sid = domain_sid + "-521"
 
     session.commit()
 
 
 def downgrade() -> None:
     """Downgrade."""
-    pass

app/alembic/versions/8c2bd40dd809_add_protocols_attr.py

@@ -9,8 +9,8 @@
 from alembic import op
 
 # revision identifiers, used by Alembic.
-revision = '8c2bd40dd809'
-down_revision = '6f8fe2548893'
+revision = "8c2bd40dd809"
+down_revision = "6f8fe2548893"
 branch_labels = None
 depends_on = None
 
@@ -19,11 +19,11 @@ def upgrade() -> None:
     """Upgrade."""
     for protocol_field in ("is_http", "is_ldap", "is_kerberos"):
         op.add_column(
-            'Policies',
+            "Policies",
             sa.Column(
                 protocol_field,
                 sa.Boolean(),
-                server_default=sa.text('true'),
+                server_default=sa.text("true"),
                 nullable=False,
             ),
         )
@@ -32,4 +32,4 @@ def upgrade() -> None:
 def downgrade() -> None:
     """Downgrade."""
     for protocol_field in ("is_http", "is_ldap", "is_kerberos"):
-        op.drop_column('Policies', protocol_field)
+        op.drop_column("Policies", protocol_field)

app/alembic/versions/bf435bbd95ff_add_rdn_attr_name.py

@@ -12,15 +12,15 @@
 from models import Attribute, Directory
 
 # revision identifiers, used by Alembic.
-revision = 'bf435bbd95ff'
-down_revision = '196f0d327c6a'
+revision = "bf435bbd95ff"
+down_revision = "196f0d327c6a"
 branch_labels = None
 depends_on = None
 
 
 def upgrade() -> None:
     """Upgrade."""
-    op.add_column('Directory', sa.Column('rdname', sa.String(length=64)))
+    op.add_column("Directory", sa.Column("rdname", sa.String(length=64)))
 
     bind = op.get_bind()
     session = Session(bind=bind)
@@ -29,13 +29,13 @@ def upgrade() -> None:
 
     for directory in session.query(Directory):
         if directory.is_domain:
-            directory.rdname = ''
+            directory.rdname = ""
             continue
 
-        rdname = directory.path[-1].split('=')[0]
+        rdname = directory.path[-1].split("=")[0]
         directory.rdname = rdname
 
-        if rdname == 'krbprincipalname':
+        if rdname == "krbprincipalname":
             continue  # already exists
 
         attrs.append(Attribute(
@@ -47,7 +47,7 @@ def upgrade() -> None:
     session.add_all(attrs)
     session.commit()
 
-    op.alter_column('Directory', 'rdname', nullable=False)
+    op.alter_column("Directory", "rdname", nullable=False)
 
 
 def downgrade() -> None:
@@ -57,16 +57,16 @@ def downgrade() -> None:
 
     for directory in session.query(Directory):
         if directory.is_domain:
-            directory.rdname = ''
+            directory.rdname = ""
             continue
 
         session.execute(
             sa.delete(Attribute)
             .where(
                 Attribute.name == directory.rdname,
-                Attribute.name != 'krbprincipalname',
+                Attribute.name != "krbprincipalname",
                 Attribute.directory_id == directory.id,
             ),
         )
 
-    op.drop_column('Directory', 'rdname')
+    op.drop_column("Directory", "rdname")

app/alembic/versions/bv546ccd35fa_fix_krbadmin_attrs.py

@@ -12,8 +12,8 @@
 from models import Attribute, Directory
 
 # revision identifiers, used by Alembic.
-revision = 'bv546ccd35fa'
-down_revision = '8c2bd40dd809'
+revision = "bv546ccd35fa"
+down_revision = "8c2bd40dd809"
 branch_labels = None
 depends_on = None
 
@@ -26,7 +26,7 @@ def upgrade() -> None:
     krb_admin_user = session.scalar(
         sa.select(Directory)
         .join(Directory.user)
-        .filter(Directory.name == 'krbadmin'),
+        .filter(Directory.name == "krbadmin"),
     )
 
     if krb_admin_user:
@@ -52,19 +52,19 @@ def upgrade() -> None:
         krb_admin_group = session.scalar(
             sa.select(Directory)
             .join(Directory.group)
-            .filter(Directory.name == 'krbadmin'),
+            .filter(Directory.name == "krbadmin"),
         )
 
         session.execute(
             sa.delete(Attribute)
             .where(
-                Attribute.name == 'gidNumber',
+                Attribute.name == "gidNumber",
                 Attribute.directory_id == krb_admin_group.id,
             ),
         )
         session.add(Attribute(
-            name='gidNumber',
-            value='800',
+            name="gidNumber",
+            value="800",
             directory_id=krb_admin_group.id,
         ))
 
@@ -73,4 +73,3 @@ def upgrade() -> None:
 
 def downgrade() -> None:
     """Downgrade."""
-    pass

app/alembic/versions/dafg3a4b22ab_add_preauth_princ.py

@@ -13,8 +13,8 @@
 from models import Attribute, CatalogueSetting, User
 
 # revision identifiers, used by Alembic.
-revision = 'dafg3a4b22ab'
-down_revision = 'f68a134a3685'
+revision = "dafg3a4b22ab"
+down_revision = "f68a134a3685"
 branch_labels = None
 depends_on = None
 
@@ -25,23 +25,23 @@ def upgrade() -> None:
     session = Session(bind=bind)
 
     for user in session.query(User):
-        if user.sam_accout_name == 'krbadmin':
+        if user.sam_accout_name == "krbadmin":
             continue
 
-        username, domain = user.user_principal_name.split('@')
+        username, domain = user.user_principal_name.split("@")
         principal = f"{username}@{domain.upper()}"
 
         attr_principal = session.scalar(
             sa.select(Attribute)
             .filter(
-                Attribute.name == 'krbprincipalname',
+                Attribute.name == "krbprincipalname",
                 Attribute.value == principal,
             ),
         )
         if attr_principal:
             session.add(Attribute(
-                name='krbticketflags',
-                value='128',
+                name="krbticketflags",
+                value="128",
                 directory_id=attr_principal.directory_id,
             ))
 
@@ -75,4 +75,3 @@ def upgrade() -> None:
 
 def downgrade() -> None:
     """Downgrade."""
-    pass

app/alembic/versions/f68a134a3685_add_bypass.py

@@ -9,35 +9,35 @@
 from alembic import op
 
 # revision identifiers, used by Alembic.
-revision = 'f68a134a3685'
-down_revision = 'bv546ccd35fa'
+revision = "f68a134a3685"
+down_revision = "bv546ccd35fa"
 branch_labels = None
 depends_on = None
 
 
 def upgrade() -> None:
     """Upgrade."""
     op.add_column(
-        'Policies',
+        "Policies",
         sa.Column(
-            'bypass_no_connection',
+            "bypass_no_connection",
             sa.Boolean(),
-            server_default=sa.text('false'),
+            server_default=sa.text("false"),
             nullable=False,
         ),
     )
     op.add_column(
-        'Policies',
+        "Policies",
         sa.Column(
-            'bypass_service_failure',
+            "bypass_service_failure",
             sa.Boolean(),
-            server_default=sa.text('false'),
+            server_default=sa.text("false"),
             nullable=False,
         ),
     )
 
 
 def downgrade() -> None:
     """Downgrade."""
-    op.drop_column('Policies', 'bypass_service_failure')
-    op.drop_column('Policies', 'bypass_no_connection')
+    op.drop_column("Policies", "bypass_service_failure")
+    op.drop_column("Policies", "bypass_no_connection")