feat: Generate crds in Dockerfile

.cargo/audit.toml

@@ -1,2 +1,2 @@
 [advisories]
-ignore = ["RUSTSEC-2024-0344"]
+ignore = ["RUSTSEC-2024-0344", "RUSTSEC-2025-0023"]

.dockerignore

@@ -2,3 +2,4 @@
 !queries
 !src
 !Cargo.*
+!.cargo/config.toml

.gitea/workflows/build.yaml

@@ -7,89 +7,9 @@ on:
     tags:
       - v*.*.*
 
-env:
-  OCI_REPO: git.huizinga.dev/dreaded_x/${{ gitea.event.repository.name}}
-
 jobs:
   build:
-    name: Build container and manifests
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Get Git commit timestamps
-        run: echo "TIMESTAMP=$(git log -1 --pretty=%ct)" >> $GITHUB_ENV
-
-      - name: Login to registry
-        uses: docker/login-action@v3
-        with:
-          registry: git.huizinga.dev
-          username: ${{ gitea.actor }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Install kustomize
-        run: |
-          curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"  | bash
-
-      - name: Setup Flux CLI
-        uses: https://github.com/fluxcd/flux2/action@main
-        with:
-          version: v2.5.0
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.OCI_REPO }}
-          tags: |
-            type=edge
-            type=ref,event=branch
-            type=semver,pattern=v{{version}}
-            type=semver,pattern=v{{major}}.{{minor}}
-            type=semver,pattern=v{{major}}
-
-      - name: Build and export to docker
-        id: build
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          load: true
-          annotations: ${{ steps.meta.outputs.annotations }}
-        env:
-          SOURCE_DATE_EPOCH: ${{ env.TIMESTAMP }}
-
-      - name: Generate CRDs
-        run: |
-          docker run --rm ${{ steps.build.outputs.imageid }} /crdgen > ./manifests/crds.yaml
-
-      - name: Push container
-        uses: docker/build-push-action@v6
-        id: push
-        with:
-          context: .
-          push: true
-          sbom: true
-          provenance: mode=max
-          tags: ${{ steps.meta.outputs.tags }}
-          annotations: ${{ steps.meta.outputs.annotations }}
-        env:
-          SOURCE_DATE_EPOCH: ${{ env.TIMESTAMP }}
-
-      - name: Kustomize manifests
-        run: |
-          ./kustomize build ./manifests | sed "s/\${DIGEST}/${{ steps.push.outputs.digest }}/" > ./manifests.yaml
-
-      - name: Push manifests
-        run: |
-          flux push artifact oci://$OCI_REPO/manifests:latest \
-            --path="./manifests.yaml" \
-            --source="$(git config --get remote.origin.url)" \
-            --revision="$(git rev-parse HEAD)" \
-            $(echo "${{ steps.meta.outputs.labels }}" | sed -e 's/^/-a /')
-
-          flux tag artifact oci://$OCI_REPO/manifests:latest \
-            $(echo "${{ steps.meta.outputs.tags }}" | sed -e 's/^.*:/--tag /')
+    uses: dreaded_x/workflows/.gitea/workflows/docker-kubernetes.yaml@ef78704b98c72e4a6b8340f9bff7b085a7bdd95c
+    secrets: inherit
+    with:
+      webhook_url: ${{ secrets.WEBHOOK_URL }}

.pre-commit-config.yaml

@@ -2,17 +2,19 @@ fail_fast: true
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-yaml
+        args:
+          - --allow-multiple-documents
       - id: check-toml
       - id: check-added-large-files
       - id: check-merge-conflict
 
   - repo: https://github.com/crate-ci/typos
-    rev: v1.21.0
+    rev: typos-dict-v0.13.13
     hooks:
       - id: typos
         args: ["--force-exclude"]
@@ -43,6 +45,17 @@ repos:
         name: audit
         description: Audit packages
         entry: cargo audit
+        args: ["--deny", "warnings"]
+        language: system
+        pass_filenames: false
+        verbose: true
+        always_run: true
+
+      - id: udeps
+        name: unused
+        description: Check for unused crates
+        entry: cargo +nightly udeps
+        args: ["--workspace"]
         language: system
         types: [file]
         files: (\.rs|Cargo.lock)$
@@ -59,6 +72,6 @@ repos:
         pass_filenames: false
 
   - repo: https://github.com/hadolint/hadolint
-    rev: v2.12.0
+    rev: v2.14.0
     hooks:
       - id: hadolint

Cargo.toml

@@ -8,32 +8,38 @@ default-run = "lldap-controller"
 members = ["queries"]
 
 [workspace.dependencies]
-cynic = "3.10.0"
-insta = { version = "1.42.2", features = ["yaml"] }
+cynic = "3.12.0"
+cynic-codegen = "3.12.0"
+insta = { version = "1.45.0", features = ["yaml"] }
 
 [dependencies]
 queries = { path = "./queries" }
-anyhow = "1.0.97"
 lldap_auth = { git = "https://github.com/lldap/lldap" }
+# Purposefully kept at 0.8.x for compatibility with lldap
 rand = { version = "0.8.5" }
-serde_json = "1.0.140"
+serde_json = "1.0.145"
 cynic = { workspace = true, features = ["http-reqwest"] }
-tokio = { version = "1.44.0", features = ["full"] }
-kube = { version = "0.99.0", features = ["derive", "runtime"] }
-k8s-openapi = { version = "0.24.0", features = ["v1_31"] }
-schemars = { version = "0.8.22", features = ["chrono"] }
-serde = { version = "1.0.219", features = ["derive"] }
+tokio = { version = "1.48.0", features = ["full"] }
+kube = { version = "2.0.1", features = ["derive", "runtime"] }
+k8s-openapi = { version = "0.26.1", features = ["v1_34"] }
+schemars = { version = "1.1.0", features = ["chrono04"] }
+serde = { version = "1.0.228", features = ["derive"] }
 serde_yaml = "0.9.34"
 futures = "0.3.31"
-tracing-subscriber = { version = "0.3.19", features = ["json", "env-filter"] }
-tracing = "0.1.41"
-thiserror = "2.0.12"
-chrono = "0.4.40"
+tracing-subscriber = { version = "0.3.22", features = ["json", "env-filter"] }
+tracing = "0.1.44"
+thiserror = "2.0.17"
+chrono = "0.4.42"
 passwords = "3.1.16"
-reqwest = { version = "0.12.14", default-features = false, features = [
+reqwest = { version = "0.12.26", default-features = false, features = [
   "json",
   "rustls-tls",
 ] }
+git-version = "0.3.9"
+color-eyre = "0.6.5"
+dotenvy = "0.15.7"
+leon = "3.0.2"
+async-trait = "0.1.89"
 
 [dev-dependencies]
 insta = { workspace = true }

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.85 AS base
+FROM rust:1.92 AS base
 ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
 RUN cargo install cargo-chef --locked --version 0.1.71 && \
     cargo install cargo-auditable --locked --version 0.6.6
@@ -13,9 +13,13 @@ COPY --from=planner /app/recipe.json recipe.json
 RUN cargo chef cook --release --recipe-path recipe.json
 
 COPY . .
-RUN cargo auditable build --release
+ARG RELEASE_VERSION
+ENV RELEASE_VERSION=${RELEASE_VERSION}
+RUN cargo auditable build --release && /app/target/release/crdgen > /crds.yaml
+
+FROM scratch AS manifests
+COPY --from=builder /crds.yaml /
 
 FROM gcr.io/distroless/cc-debian12:nonroot AS runtime
 COPY --from=builder /app/target/release/lldap-controller /lldap-controller
-COPY --from=builder /app/target/release/crdgen /crdgen
 CMD ["/lldap-controller"]

docker-bake.hcl

@@ -0,0 +1,23 @@
+variable "TAG_BASE" {}
+variable "RELEASE_VERSION" {}
+
+group "default" {
+  targets = ["lldap-controller", "manifests"]
+}
+
+target "docker-metadata-action" {}
+
+target "lldap-controller" {
+  inherits = ["docker-metadata-action"]
+  context = "./"
+  dockerfile = "Dockerfile"
+  tags = [for tag in target.docker-metadata-action.tags : "${TAG_BASE}:${tag}"]
+  target = "runtime"
+}
+
+target "manifests" {
+  context = "./"
+  dockerfile = "Dockerfile"
+  target = "manifests"
+  output = [{ type = "cacheonly" }, "manifests"]
+}

manifests/cluster-role.yaml

@@ -9,6 +9,12 @@ rules:
       - serviceusers
       - serviceusers/status
       - serviceusers/finalizers
+      - groups
+      - grours/status
+      - grours/finalizers
+      - userattributes
+      - userattributes/status
+      - userattributes/finalizers
     verbs:
       - "*"
   - apiGroups:

manifests/deployment.yaml

@@ -31,6 +31,10 @@ spec:
             requests:
               cpu: 50m
               memory: 100Mi
+          volumeMounts:
+            - name: credentials
+              readOnly: true
+              mountPath: "/secrets/credentials"
           env:
             - name: RUST_LOG
               value: info,lldap_controller=debug
@@ -38,8 +42,11 @@ spec:
               value: "http://lldap:17170"
             - name: LLDAP_USERNAME
               value: admin
-            - name: LLDAP_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: lldap-credentials
-                  key: lldap-ldap-user-pass
+            - name: LLDAP_PASSWORD_FILE
+              value: /secrets/credentials/lldap-ldap-user-pass
+            - name: LLDAP_BIND_DN
+              value: uid={username},ou=people,dc=huizinga,dc=dev
+      volumes:
+        - name: credentials
+          secret:
+            secretName: lldap-credentials

queries/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "queries"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 cynic = { workspace = true }
@@ -10,4 +10,4 @@ cynic = { workspace = true }
 insta = { workspace = true }
 
 [build-dependencies]
-cynic-codegen = "3.10.0"
+cynic-codegen = { workspace = true }

queries/src/lib.rs

@@ -110,6 +110,68 @@ pub struct DeleteGroup {
     pub delete_group: Success,
 }
 
+#[derive(cynic::QueryFragment, Debug)]
+#[cynic(graphql_type = "Query")]
+pub struct GetUserAttributes {
+    pub schema: Schema,
+}
+
+#[derive(cynic::QueryFragment, Debug)]
+pub struct Schema {
+    pub user_schema: AttributeList,
+}
+
+#[derive(cynic::QueryFragment, Debug)]
+pub struct AttributeList {
+    pub attributes: Vec<AttributeSchema>,
+}
+
+#[derive(cynic::QueryFragment, Debug)]
+pub struct AttributeSchema {
+    pub name: String,
+    pub is_visible: bool,
+    pub is_list: bool,
+    pub is_editable: bool,
+    pub attribute_type: AttributeType,
+}
+
+#[derive(cynic::Enum, Clone, Copy, Debug, PartialEq, Eq)]
+pub enum AttributeType {
+    String,
+    Integer,
+    JpegPhoto,
+    DateTime,
+}
+
+#[derive(cynic::QueryVariables, Debug)]
+pub struct CreateUserAttributeVariables<'a> {
+    pub editable: bool,
+    pub list: bool,
+    pub name: &'a str,
+    #[cynic(rename = "type")]
+    pub r#type: AttributeType,
+    pub visible: bool,
+}
+
+#[derive(cynic::QueryFragment, Debug)]
+#[cynic(graphql_type = "Mutation", variables = "CreateUserAttributeVariables")]
+pub struct CreateUserAttribute {
+    #[arguments(attributeType: $r#type, isEditable: $editable, isList: $list, isVisible: $visible, name: $name)]
+    pub add_user_attribute: Success,
+}
+
+#[derive(cynic::QueryVariables, Debug)]
+pub struct DeleteUserAttributeVariables<'a> {
+    pub name: &'a str,
+}
+
+#[derive(cynic::QueryFragment, Debug)]
+#[cynic(graphql_type = "Mutation", variables = "DeleteUserAttributeVariables")]
+pub struct DeleteUserAttribute {
+    #[arguments(name: $name)]
+    pub delete_user_attribute: Success,
+}
+
 #[cfg(test)]
 mod tests {
     use cynic::{MutationBuilder, QueryBuilder};
@@ -177,4 +239,31 @@ mod tests {
 
         insta::assert_snapshot!(operation.query);
     }
+
+    #[test]
+    fn get_user_attributes_gql_output() {
+        let operation = GetUserAttributes::build(());
+
+        insta::assert_snapshot!(operation.query);
+    }
+
+    #[test]
+    fn create_user_attribute_gql_output() {
+        let operation = CreateUserAttribute::build(CreateUserAttributeVariables {
+            r#type: AttributeType::String,
+            list: true,
+            editable: true,
+            visible: true,
+            name: "attr",
+        });
+
+        insta::assert_snapshot!(operation.query);
+    }
+
+    #[test]
+    fn delete_user_attribute_gql_output() {
+        let operation = DeleteUserAttribute::build(DeleteUserAttributeVariables { name: "attr" });
+
+        insta::assert_snapshot!(operation.query);
+    }
 }

queries/src/snapshots/queries__tests__create_user_attribute_gql_output.snap

@@ -0,0 +1,9 @@
+---
+source: queries/src/lib.rs
+expression: operation.query
+---
+mutation CreateUserAttribute($editable: Boolean!, $list: Boolean!, $name: String!, $type: AttributeType!, $visible: Boolean!) {
+  addUserAttribute(attributeType: $type, isEditable: $editable, isList: $list, isVisible: $visible, name: $name) {
+    ok
+  }
+}

queries/src/snapshots/queries__tests__delete_user_attribute_gql_output.snap

@@ -0,0 +1,9 @@
+---
+source: queries/src/lib.rs
+expression: operation.query
+---
+mutation DeleteUserAttribute($name: String!) {
+  deleteUserAttribute(name: $name) {
+    ok
+  }
+}

queries/src/snapshots/queries__tests__get_user_attributes_gql_output.snap

@@ -0,0 +1,17 @@
+---
+source: queries/src/lib.rs
+expression: operation.query
+---
+query GetUserAttributes {
+  schema {
+    userSchema {
+      attributes {
+        name
+        isVisible
+        isList
+        isEditable
+        attributeType
+      }
+    }
+  }
+}

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.85"
+channel = "1.92"
 profile = "default"
 components = ["rust-analyzer"]

src/bin/crdgen.rs

@@ -1,9 +1,11 @@
 use kube::CustomResourceExt;
 
 fn main() {
-    print!(
-        "{}---\n{}",
+    let resources = [
         serde_yaml::to_string(&lldap_controller::resources::ServiceUser::crd()).unwrap(),
-        serde_yaml::to_string(&lldap_controller::resources::Group::crd()).unwrap()
-    )
+        serde_yaml::to_string(&lldap_controller::resources::Group::crd()).unwrap(),
+        serde_yaml::to_string(&lldap_controller::resources::UserAttribute::crd()).unwrap(),
+    ]
+    .join("---\n");
+    print!("{resources}")
 }

src/context.rs

@@ -4,15 +4,22 @@ use kube::{Resource, ResourceExt};
 
 use crate::lldap::LldapConfig;
 
+#[derive(Clone)]
 pub struct Context {
     pub client: kube::Client,
     pub lldap_config: LldapConfig,
     pub controller_name: String,
     pub recorder: Recorder,
+    pub bind_dn_template: String,
 }
 
 impl Context {
-    pub fn new(controller_name: &str, client: kube::Client, lldap_config: LldapConfig) -> Self {
+    pub fn new(
+        controller_name: &str,
+        client: kube::Client,
+        lldap_config: LldapConfig,
+        bind_dn_template: impl Into<String>,
+    ) -> Self {
         let reporter: Reporter = controller_name.into();
         let recorder = Recorder::new(client.clone(), reporter);
 
@@ -21,6 +28,7 @@ impl Context {
             lldap_config,
             controller_name: controller_name.into(),
             recorder,
+            bind_dn_template: bind_dn_template.into(),
         }
     }
 }
@@ -33,23 +41,31 @@ pub trait ControllerEvents {
     where
         T: Resource<DynamicType = ()> + Sync;
 
-    async fn user_created<T>(&self, obj: &T, username: &str) -> Result<(), Self::Error>
+    async fn user_created<T>(&self, obj: &T) -> Result<(), Self::Error>
     where
         T: Resource<DynamicType = ()> + Sync;
 
-    async fn group_created<T>(&self, obj: &T, name: &str) -> Result<(), Self::Error>
+    async fn group_created<T>(&self, obj: &T) -> Result<(), Self::Error>
     where
         T: Resource<DynamicType = ()> + Sync;
 
-    async fn user_deleted<T>(&self, obj: &T, username: &str) -> Result<(), Self::Error>
+    async fn user_deleted<T>(&self, obj: &T) -> Result<(), Self::Error>
     where
         T: Resource<DynamicType = ()> + Sync;
 
-    async fn group_deleted<T>(&self, obj: &T, name: &str) -> Result<(), Self::Error>
+    async fn group_deleted<T>(&self, obj: &T) -> Result<(), Self::Error>
     where
         T: Resource<DynamicType = ()> + Sync;
 
-    async fn user_not_found<T>(&self, obj: &T, username: &str) -> Result<(), Self::Error>
+    async fn user_attribute_created<T>(&self, obj: &T) -> Result<(), Self::Error>
+    where
+        T: Resource<DynamicType = ()> + Sync;
+
+    async fn user_attribute_desync<T>(&self, obj: &T, fields: &[String]) -> Result<(), Self::Error>
+    where
+        T: Resource<DynamicType = ()> + Sync;
+
+    async fn user_attribute_deleted<T>(&self, obj: &T) -> Result<(), Self::Error>
     where
         T: Resource<DynamicType = ()> + Sync;
 }
@@ -74,16 +90,16 @@ impl ControllerEvents for Recorder {
         .await
     }
 
-    async fn user_created<T>(&self, obj: &T, username: &str) -> Result<(), Self::Error>
+    async fn user_created<T>(&self, obj: &T) -> Result<(), Self::Error>
     where
         T: Resource<DynamicType = ()> + Sync,
     {
         self.publish(
             &Event {
                 type_: EventType::Normal,
-                reason: "UserCreated".into(),
-                note: Some(format!("Created user '{username}'")),
-                action: "UserCreated".into(),
+                reason: "Created".into(),
+                note: Some("Created user".into()),
+                action: "Created".into(),
                 secondary: None,
             },
             &obj.object_ref(&()),
@@ -91,16 +107,16 @@ impl ControllerEvents for Recorder {
         .await
     }
 
-    async fn group_created<T>(&self, obj: &T, name: &str) -> Result<(), Self::Error>
+    async fn group_created<T>(&self, obj: &T) -> Result<(), Self::Error>
     where
         T: Resource<DynamicType = ()> + Sync,
     {
         self.publish(
             &Event {
                 type_: EventType::Normal,
-                reason: "GroupCreated".into(),
-                note: Some(format!("Created group '{name}'")),
-                action: "GroupCreated".into(),
+                reason: "Created".into(),
+                note: Some("Created group".into()),
+                action: "Created".into(),
                 secondary: None,
             },
             &obj.object_ref(&()),
@@ -108,16 +124,16 @@ impl ControllerEvents for Recorder {
         .await
     }
 
-    async fn user_deleted<T>(&self, obj: &T, username: &str) -> Result<(), Self::Error>
+    async fn user_deleted<T>(&self, obj: &T) -> Result<(), Self::Error>
     where
         T: Resource<DynamicType = ()> + Sync,
     {
         self.publish(
             &Event {
                 type_: EventType::Normal,
-                reason: "UserDeleted".into(),
-                note: Some(format!("Deleted user '{username}'")),
-                action: "UserDeleted".into(),
+                reason: "Deleted".into(),
+                note: Some("Deleted user".into()),
+                action: "Deleted".into(),
                 secondary: None,
             },
             &obj.object_ref(&()),
@@ -125,16 +141,16 @@ impl ControllerEvents for Recorder {
         .await
     }
 
-    async fn group_deleted<T>(&self, obj: &T, name: &str) -> Result<(), Self::Error>
+    async fn group_deleted<T>(&self, obj: &T) -> Result<(), Self::Error>
     where
         T: Resource<DynamicType = ()> + Sync,
     {
         self.publish(
             &Event {
                 type_: EventType::Normal,
-                reason: "GroupDeleted".into(),
-                note: Some(format!("Deleted group '{name}'")),
-                action: "GroupDeleted".into(),
+                reason: "Deleted".into(),
+                note: Some("Deleted group".into()),
+                action: "Deleted".into(),
                 secondary: None,
             },
             &obj.object_ref(&()),
@@ -142,16 +158,52 @@ impl ControllerEvents for Recorder {
         .await
     }
 
-    async fn user_not_found<T>(&self, obj: &T, username: &str) -> Result<(), Self::Error>
+    async fn user_attribute_created<T>(&self, obj: &T) -> Result<(), Self::Error>
     where
         T: Resource<DynamicType = ()> + Sync,
     {
         self.publish(
             &Event {
                 type_: EventType::Warning,
-                reason: "UserNotFound".into(),
-                note: Some(format!("User '{username}' not found")),
-                action: "UserNotFound".into(),
+                reason: "Created".into(),
+                note: Some("Created user attribute".into()),
+                action: "Created".into(),
+                secondary: None,
+            },
+            &obj.object_ref(&()),
+        )
+        .await
+    }
+
+    async fn user_attribute_desync<T>(&self, obj: &T, fields: &[String]) -> Result<(), Self::Error>
+    where
+        T: Resource<DynamicType = ()> + Sync,
+    {
+        self.publish(
+            &Event {
+                type_: EventType::Warning,
+                reason: "Desync".into(),
+                note: Some(format!(
+                    "User attribute fields '{fields:?}' are out of sync"
+                )),
+                action: "Desync".into(),
+                secondary: None,
+            },
+            &obj.object_ref(&()),
+        )
+        .await
+    }
+
+    async fn user_attribute_deleted<T>(&self, obj: &T) -> Result<(), Self::Error>
+    where
+        T: Resource<DynamicType = ()> + Sync,
+    {
+        self.publish(
+            &Event {
+                type_: EventType::Warning,
+                reason: "Deleted".into(),
+                note: Some("Deleted user attribute'".into()),
+                action: "Deleted".into(),
                 secondary: None,
             },
             &obj.object_ref(&()),

src/lib.rs

@@ -1,3 +1,6 @@
 pub mod context;
 pub mod lldap;
 pub mod resources;
+mod version;
+
+pub use version::VERSION;

src/lldap.rs

@@ -1,6 +1,5 @@
 use std::time::Duration;
 
-use anyhow::Context;
 use cynic::http::{CynicReqwestError, ReqwestExt};
 use cynic::{GraphQlError, GraphQlResponse, MutationBuilder, QueryBuilder};
 use lldap_auth::login::{ClientSimpleLoginRequest, ServerLoginResponse};
@@ -8,14 +7,17 @@ use lldap_auth::opaque::AuthenticationError;
 use lldap_auth::registration::ServerRegistrationStartResponse;
 use lldap_auth::{opaque, registration};
 use queries::{
-    AddUserToGroup, AddUserToGroupVariables, CreateGroup, CreateGroupVariables, CreateUser,
-    CreateUserVariables, DeleteGroup, DeleteGroupVariables, DeleteUser, DeleteUserVariables,
-    GetGroups, GetUser, GetUserVariables, Group, RemoveUserFromGroup, RemoveUserFromGroupVariables,
-    User,
+    AddUserToGroup, AddUserToGroupVariables, AttributeSchema, CreateGroup, CreateGroupVariables,
+    CreateUser, CreateUserAttribute, CreateUserAttributeVariables, CreateUserVariables,
+    DeleteGroup, DeleteGroupVariables, DeleteUser, DeleteUserAttribute,
+    DeleteUserAttributeVariables, DeleteUserVariables, GetGroups, GetUser, GetUserAttributes,
+    GetUserVariables, Group, RemoveUserFromGroup, RemoveUserFromGroupVariables, User,
 };
 use reqwest::header::{AUTHORIZATION, HeaderMap, HeaderValue};
 use tracing::{debug, trace};
 
+use crate::resources::AttributeType;
+
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
     #[error("Cynic error: {0}")]
@@ -26,15 +28,19 @@ pub enum Error {
     Authentication(#[from] AuthenticationError),
     #[error("GraphQL error: {0}")]
     GraphQl(#[from] GraphQlError),
+    #[error("Missing environment variable: {0}")]
+    MissingEnvironmentVariable(&'static str),
+    #[error("Could not read password file: {0}")]
+    CouldNotReadPasswordFile(#[from] std::io::Error),
 }
 
 pub type Result<T, E = Error> = std::result::Result<T, E>;
 
 fn check_graphql_errors<T>(response: GraphQlResponse<T>) -> Result<T> {
-    if let Some(errors) = &response.errors {
-        if !errors.is_empty() {
-            Err(errors.first().expect("Should not be empty").clone())?;
-        }
+    if let Some(errors) = &response.errors
+        && !errors.is_empty()
+    {
+        Err(errors.first().expect("Should not be empty").clone())?;
     }
 
     Ok(response
@@ -42,6 +48,7 @@ fn check_graphql_errors<T>(response: GraphQlResponse<T>) -> Result<T> {
         .expect("Data should be valid if there are no error"))
 }
 
+#[derive(Clone)]
 pub struct LldapConfig {
     username: String,
     password: String,
@@ -49,14 +56,26 @@ pub struct LldapConfig {
 }
 
 impl LldapConfig {
-    pub fn try_from_env() -> anyhow::Result<Self> {
+    pub fn try_from_env() -> Result<Self> {
+        let password = std::env::var("LLDAP_PASSWORD_FILE").map_or_else(
+            |_| {
+                std::env::var("LLDAP_PASSWORD").map_err(|_| {
+                    Error::MissingEnvironmentVariable("LLDAP_PASSWORD or LLDAP_PASSWORD_FILE")
+                })
+            },
+            |path| {
+                std::fs::read_to_string(path)
+                    .map(|v| v.trim().into())
+                    .map_err(|err| err.into())
+            },
+        )?;
+
         Ok(Self {
             username: std::env::var("LLDAP_USERNAME")
-                .context("Variable 'LLDAP_USERNAME' is not set or invalid")?,
-            password: std::env::var("LLDAP_PASSWORD")
-                .context("Variable 'LLDAP_PASSWORD' is not set or invalid")?,
+                .map_err(|_| Error::MissingEnvironmentVariable("LLDAP_USERNAME"))?,
+            password,
             url: std::env::var("LLDAP_URL")
-                .context("Variable 'LLDAP_URL' is not set or invalid")?,
+                .map_err(|_| Error::MissingEnvironmentVariable("LLDAP_URL"))?,
         })
     }
 
@@ -284,4 +303,60 @@ impl LldapClient {
 
         Ok(())
     }
+
+    pub async fn get_user_attributes(&self) -> Result<Vec<AttributeSchema>> {
+        let operation = GetUserAttributes::build(());
+
+        let response = self
+            .client
+            .post(format!("{}/api/graphql", self.url))
+            .run_graphql(operation)
+            .await?;
+
+        Ok(check_graphql_errors(response)?
+            .schema
+            .user_schema
+            .attributes)
+    }
+
+    pub async fn create_user_attribute(
+        &self,
+        name: &str,
+        r#type: AttributeType,
+        list: bool,
+        visible: bool,
+        editable: bool,
+    ) -> Result<()> {
+        let operation = CreateUserAttribute::build(CreateUserAttributeVariables {
+            name,
+            r#type: r#type.into(),
+            list,
+            visible,
+            editable,
+        });
+
+        let response = self
+            .client
+            .post(format!("{}/api/graphql", self.url))
+            .run_graphql(operation)
+            .await?;
+
+        check_graphql_errors(response)?;
+
+        Ok(())
+    }
+
+    pub async fn delete_user_attribute(&self, name: &str) -> Result<()> {
+        let operation = DeleteUserAttribute::build(DeleteUserAttributeVariables { name });
+
+        let response = self
+            .client
+            .post(format!("{}/api/graphql", self.url))
+            .run_graphql(operation)
+            .await?;
+
+        check_graphql_errors(response)?;
+
+        Ok(())
+    }
 }

src/main.rs

@@ -1,34 +1,61 @@
 use std::sync::Arc;
 use std::time::Duration;
 
+use color_eyre::eyre::Context as _;
+use dotenvy::dotenv;
 use futures::StreamExt;
 use k8s_openapi::api::core::v1::Secret;
-use kube::runtime::Controller;
-use kube::runtime::controller::Action;
-use kube::{Api, Client as KubeClient};
+use kube::runtime::controller::{self, Action};
+use kube::runtime::reflector::ObjectRef;
+use kube::runtime::{Controller, watcher};
+use kube::{Api, Client as KubeClient, Resource};
+use lldap_controller::VERSION;
 use lldap_controller::context::Context;
 use lldap_controller::lldap::LldapConfig;
-use lldap_controller::resources::{self, ServiceUser, reconcile};
+use lldap_controller::resources::{
+    self, Error, Group, ServiceUser, UserAttribute, reconcile, reconcile_namespaced,
+};
 use tracing::{debug, info, warn};
 use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::util::SubscriberInitExt;
 use tracing_subscriber::{EnvFilter, Registry};
 
-fn error_policy(_obj: Arc<ServiceUser>, err: &resources::Error, _ctx: Arc<Context>) -> Action {
+fn error_policy<T>(_obj: Arc<T>, err: &resources::Error, _ctx: Arc<Context>) -> Action {
     warn!("error: {}", err);
     Action::requeue(Duration::from_secs(5))
 }
 
+async fn log_status<T>(
+    res: Result<(ObjectRef<T>, Action), controller::Error<Error, watcher::Error>>,
+) where
+    T: Resource,
+{
+    match res {
+        Ok(obj) => debug!("reconciled {:?}", obj.0.name),
+        Err(err) => warn!("reconcile failed: {}", err),
+    }
+}
+
 #[tokio::main]
-async fn main() -> anyhow::Result<()> {
-    let logger = tracing_subscriber::fmt::layer().json();
+async fn main() -> color_eyre::Result<()> {
+    color_eyre::install()?;
+    dotenv().ok();
+
     let env_filter = EnvFilter::try_from_default_env()
         .or_else(|_| EnvFilter::try_new("info"))
         .expect("Fallback should be valid");
 
-    Registry::default().with(logger).with(env_filter).init();
+    if std::env::var("CARGO").is_ok() {
+        let logger = tracing_subscriber::fmt::layer().compact();
+        Registry::default().with(logger).with(env_filter).init();
+    } else {
+        let logger = tracing_subscriber::fmt::layer().json();
+        Registry::default().with(logger).with(env_filter).init();
+    }
 
-    info!("Starting controller");
+    info!(version = VERSION, "Starting");
+
+    let bind_dn_template = std::env::var("LLDAP_BIND_DN").wrap_err("LLDAP_BIND_DN is not set")?;
 
     let client = KubeClient::try_default().await?;
 
@@ -36,22 +63,35 @@ async fn main() -> anyhow::Result<()> {
         "lldap.huizinga.dev",
         client.clone(),
         LldapConfig::try_from_env()?,
+        bind_dn_template,
     );
 
-    let service_users = Api::<ServiceUser>::all(client.clone());
     let secrets = Api::<Secret>::all(client.clone());
 
-    Controller::new(service_users.clone(), Default::default())
+    let service_users = Api::<ServiceUser>::all(client.clone());
+    let service_user_controller = Controller::new(service_users, Default::default())
         .owns(secrets, Default::default())
+        .shutdown_on_signal()
+        .run(reconcile_namespaced, error_policy, Arc::new(data.clone()))
+        .for_each(log_status);
+
+    let groups = Api::<Group>::all(client.clone());
+    let group_controller = Controller::new(groups, Default::default())
+        .shutdown_on_signal()
+        .run(reconcile, error_policy, Arc::new(data.clone()))
+        .for_each(log_status);
+
+    let user_attributes = Api::<UserAttribute>::all(client.clone());
+    let user_attribute_controller = Controller::new(user_attributes, Default::default())
         .shutdown_on_signal()
         .run(reconcile, error_policy, Arc::new(data))
-        .for_each(|res| async move {
-            match res {
-                Ok(obj) => debug!("reconciled {:?}", obj.0.name),
-                Err(err) => warn!("reconcile failed: {}", err),
-            }
-        })
-        .await;
+        .for_each(log_status);
+
+    tokio::join!(
+        service_user_controller,
+        group_controller,
+        user_attribute_controller
+    );
 
     Ok(())
 }

src/resources/group.rs

@@ -1,6 +1,7 @@
 use std::sync::Arc;
 use std::time::Duration;
 
+use async_trait::async_trait;
 use kube::CustomResource;
 use kube::runtime::controller::Action;
 use schemars::JsonSchema;
@@ -19,6 +20,7 @@ use crate::context::{Context, ControllerEvents};
 #[serde(rename_all = "camelCase")]
 pub struct GroupSpec {}
 
+#[async_trait]
 impl Reconcile for Group {
     async fn reconcile(self: Arc<Self>, ctx: Arc<Context>) -> Result<Action> {
         let name = self
@@ -39,7 +41,7 @@ impl Reconcile for Group {
 
             lldap_client.create_group(&name).await?;
 
-            ctx.recorder.group_created(self.as_ref(), &name).await?;
+            ctx.recorder.group_created(self.as_ref()).await?;
         } else {
             trace!("Group already exists");
         }
@@ -66,7 +68,7 @@ impl Reconcile for Group {
 
             lldap_client.delete_group(group.id).await?;
 
-            ctx.recorder.group_deleted(self.as_ref(), &name).await?;
+            ctx.recorder.group_deleted(self.as_ref()).await?;
         } else {
             trace!(name, "Group does not exist")
         }

src/resources/mod.rs

@@ -1,9 +1,12 @@
 mod group;
 mod service_user;
+mod user_attribute;
 
 use core::fmt;
 use std::sync::Arc;
 
+use async_trait::async_trait;
+use k8s_openapi::{ClusterResourceScope, NamespaceResourceScope};
 use kube::runtime::controller::Action;
 use kube::runtime::finalizer;
 use kube::{Api, Resource, ResourceExt};
@@ -13,6 +16,7 @@ use tracing::{debug, instrument};
 
 pub use self::group::Group;
 pub use self::service_user::ServiceUser;
+pub use self::user_attribute::{Type as AttributeType, UserAttribute};
 use crate::context::Context;
 use crate::lldap;
 
@@ -28,6 +32,8 @@ pub enum Error {
     Finalizer(#[source] Box<finalizer::Error<Self>>),
     #[error("MissingObjectKey: {0}")]
     MissingObjectKey(&'static str),
+    #[error("UserAttributeDesync: {0:?}")]
+    UserAttributeDesync(Vec<String>),
 }
 
 impl From<finalizer::Error<Self>> for Error {
@@ -38,29 +44,60 @@ impl From<finalizer::Error<Self>> for Error {
 
 type Result<T, E = Error> = std::result::Result<T, E>;
 
-trait Reconcile {
+#[async_trait]
+pub trait Reconcile {
     async fn reconcile(self: Arc<Self>, ctx: Arc<Context>) -> Result<Action>;
 
     async fn cleanup(self: Arc<Self>, ctx: Arc<Context>) -> Result<Action>;
 }
 
 #[instrument(skip(obj, ctx))]
-pub async fn reconcile<T>(obj: Arc<T>, ctx: Arc<Context>) -> Result<Action>
+pub async fn reconcile_namespaced<T>(obj: Arc<T>, ctx: Arc<Context>) -> Result<Action>
 where
-    T: Resource + ResourceExt + Clone + Serialize + DeserializeOwned + fmt::Debug + Reconcile,
+    T: Resource<Scope = NamespaceResourceScope>
+        + ResourceExt
+        + Clone
+        + Serialize
+        + DeserializeOwned
+        + fmt::Debug
+        + Reconcile,
     <T as Resource>::DynamicType: Default,
 {
     debug!(name = obj.name_any(), "Reconcile");
 
-    let service_users = Api::<T>::all(ctx.client.clone());
+    let namespace = obj.namespace().expect("resource should be namespaced");
+    let api = Api::<T>::namespaced(ctx.client.clone(), &namespace);
 
-    Ok(
-        finalizer(&service_users, &ctx.controller_name, obj, |event| async {
-            match event {
-                finalizer::Event::Apply(obj) => obj.reconcile(ctx.clone()).await,
-                finalizer::Event::Cleanup(obj) => obj.cleanup(ctx.clone()).await,
-            }
-        })
-        .await?,
-    )
+    Ok(finalizer(&api, &ctx.controller_name, obj, |event| async {
+        match event {
+            finalizer::Event::Apply(obj) => obj.reconcile(ctx.clone()).await,
+            finalizer::Event::Cleanup(obj) => obj.cleanup(ctx.clone()).await,
+        }
+    })
+    .await?)
+}
+
+#[instrument(skip(obj, ctx))]
+pub async fn reconcile<T>(obj: Arc<T>, ctx: Arc<Context>) -> Result<Action>
+where
+    T: Resource<Scope = ClusterResourceScope>
+        + ResourceExt
+        + Clone
+        + Serialize
+        + DeserializeOwned
+        + fmt::Debug
+        + Reconcile,
+    <T as Resource>::DynamicType: Default,
+{
+    debug!(name = obj.name_any(), "Reconcile");
+
+    let api = Api::<T>::all(ctx.client.clone());
+
+    Ok(finalizer(&api, &ctx.controller_name, obj, |event| async {
+        match event {
+            finalizer::Event::Apply(obj) => obj.reconcile(ctx.clone()).await,
+            finalizer::Event::Cleanup(obj) => obj.cleanup(ctx.clone()).await,
+        }
+    })
+    .await?)
 }

src/resources/service_user.rs

@@ -3,12 +3,14 @@ use std::str::from_utf8;
 use std::sync::Arc;
 use std::time::Duration;
 
+use async_trait::async_trait;
 use chrono::{DateTime, Utc};
 use k8s_openapi::api::core::v1::Secret;
 use k8s_openapi::apimachinery::pkg::apis::meta::v1::OwnerReference;
 use kube::api::{ObjectMeta, Patch, PatchParams, PostParams};
 use kube::runtime::controller::Action;
 use kube::{Api, CustomResource, Resource};
+use leon::{Template, vals};
 use passwords::PasswordGenerator;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -75,6 +77,7 @@ fn format_username(name: &str, namespace: &str) -> String {
     format!("{name}.{namespace}")
 }
 
+#[async_trait]
 impl Reconcile for ServiceUser {
     async fn reconcile(self: Arc<Self>, ctx: Arc<Context>) -> Result<Action> {
         let name = self
@@ -113,6 +116,31 @@ impl Reconcile for ServiceUser {
                 debug!(name, secret_name, "Generating new secret");
 
                 new_secret(&username, oref)
+            })
+            .and_modify(|secret| {
+                let bind_dn_template = match Template::parse(&ctx.bind_dn_template) {
+                    Ok(template) => template,
+                    Err(err) => {
+                        warn!("Invalid bind_dn template: {err}");
+                        return;
+                    }
+                };
+
+                let bind_dn = match bind_dn_template.render(&&vals(|key| match key {
+                    "username" => Some(username.clone().into()),
+                    _ => None,
+                })) {
+                    Ok(bind_dn) => bind_dn,
+                    Err(err) => {
+                        warn!("Failed to render bind_dn template: {err}");
+                        return;
+                    }
+                };
+
+                secret
+                    .string_data
+                    .get_or_insert_default()
+                    .insert("bind_dn".into(), bind_dn);
             });
 
         trace!(name, "Committing secret");
@@ -144,7 +172,7 @@ impl Reconcile for ServiceUser {
                 debug!(name, username, "Creating new user");
 
                 let user = lldap_client.create_user(&username).await?;
-                ctx.recorder.user_created(self.as_ref(), &username).await?;
+                ctx.recorder.user_created(self.as_ref()).await?;
 
                 Ok(user)
             }
@@ -208,14 +236,11 @@ impl Reconcile for ServiceUser {
             Err(lldap::Error::GraphQl(err))
                 if err.message == format!("Entity not found: `No such user: '{username}'`") =>
             {
-                ctx.recorder
-                    .user_not_found(self.as_ref(), &username)
-                    .await?;
                 warn!(name, username, "User not found");
                 Ok(())
             }
             Ok(_) => {
-                ctx.recorder.user_deleted(self.as_ref(), &username).await?;
+                ctx.recorder.user_deleted(self.as_ref()).await?;
                 Ok(())
             }
             Err(err) => Err(err),

src/resources/user_attribute.rs

@@ -0,0 +1,191 @@
+use std::time::Duration;
+
+use async_trait::async_trait;
+use kube::api::{Patch, PatchParams};
+use kube::runtime::controller::Action;
+use kube::{Api, CustomResource, KubeSchema};
+use queries::AttributeType;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use serde_json::json;
+use tracing::{debug, trace, warn};
+
+use super::Reconcile;
+use crate::context::ControllerEvents;
+use crate::lldap;
+use crate::resources::Error;
+
+#[derive(Deserialize, Serialize, Clone, Copy, Debug, JsonSchema)]
+pub enum Type {
+    String,
+    Integer,
+    Jpeg,
+    DateTime,
+}
+
+impl From<Type> for AttributeType {
+    fn from(t: Type) -> Self {
+        match t {
+            Type::String => Self::String,
+            Type::Integer => Self::Integer,
+            Type::Jpeg => Self::JpegPhoto,
+            Type::DateTime => Self::DateTime,
+        }
+    }
+}
+
+#[derive(CustomResource, Deserialize, Serialize, Clone, Debug, KubeSchema)]
+#[kube(
+    kind = "UserAttribute",
+    group = "lldap.huizinga.dev",
+    version = "v1",
+    status = "UserAttributesStatus"
+)]
+#[kube(
+    shortname = "lua",
+    doc = "Custom resource for managing custom User Attributes inside of LLDAP",
+    printcolumn = r#"{"name":"Type", "type":"string", "description":"Type of attribute", "jsonPath":".spec.type"}"#,
+    printcolumn = r#"{"name":"List", "type":"boolean", "description":"Can the attribute contain multiple values", "jsonPath":".spec.list"}"#,
+    printcolumn = r#"{"name":"Visible", "type":"boolean", "description":"Can users see the value", "jsonPath":".spec.userVisible"}"#,
+    printcolumn = r#"{"name":"Editable", "type":"boolean", "description":"Can users edit the value", "jsonPath":".spec.userEditable"}"#,
+    printcolumn = r#"{"name":"Synced", "type":"boolean", "jsonPath":".status.synced"}"#,
+    printcolumn = r#"{"name":"Age", "type":"date", "jsonPath":".metadata.creationTimestamp"}"#
+)]
+#[kube(
+    validation = Rule::new("self.spec == oldSelf.spec").message("User attributes are immutable"),
+    validation = Rule::new("!self.spec.userEditable || self.spec.userVisible && self.spec.userEditable").message("Editable attribute must also be visible")
+)]
+#[serde(rename_all = "camelCase")]
+pub struct UserAttributeSpec {
+    r#type: Type,
+    #[serde(default)]
+    list: bool,
+    #[serde(default)]
+    user_visible: bool,
+    #[serde(default)]
+    user_editable: bool,
+}
+#[derive(Deserialize, Serialize, Clone, Default, Debug, JsonSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct UserAttributesStatus {
+    pub synced: bool,
+}
+
+#[async_trait]
+impl Reconcile for UserAttribute {
+    async fn reconcile(
+        self: std::sync::Arc<Self>,
+        ctx: std::sync::Arc<crate::context::Context>,
+    ) -> super::Result<kube::runtime::controller::Action> {
+        let name = self
+            .metadata
+            .name
+            .clone()
+            .ok_or(Error::MissingObjectKey(".metadata.name"))?;
+
+        debug!(name, "Apply");
+
+        trace!(name, "Get existing attributes");
+        let lldap_client = ctx.lldap_config.build_client().await?;
+        let user_attributes = lldap_client.get_user_attributes().await?;
+        trace!("{user_attributes:?}");
+
+        let client = &ctx.client;
+        let api = Api::<UserAttribute>::all(client.clone());
+        if let Some(attribute) = user_attributes
+            .iter()
+            .find(|attribute| attribute.name == name)
+        {
+            trace!("User attribute already exists: {attribute:?}");
+            let mut desynced: Vec<String> = Vec::new();
+            if attribute.attribute_type != self.spec.r#type.into() {
+                desynced.push("type".into());
+            }
+
+            if attribute.is_list != self.spec.list {
+                desynced.push("list".into());
+            }
+
+            if attribute.is_visible != self.spec.user_visible {
+                desynced.push("userVisible".into());
+            }
+
+            if attribute.is_editable != self.spec.user_editable {
+                desynced.push("userEditable".into());
+            }
+
+            if !desynced.is_empty() {
+                set_status(&api, &name, false).await?;
+                ctx.recorder
+                    .user_attribute_desync(self.as_ref(), &desynced)
+                    .await?;
+
+                return Err(Error::UserAttributeDesync(desynced));
+            }
+
+            trace!("User attribute matches with spec");
+        } else {
+            trace!("User attribute does not exist yet");
+
+            lldap_client
+                .create_user_attribute(
+                    &name,
+                    self.spec.r#type,
+                    self.spec.list,
+                    self.spec.user_visible,
+                    self.spec.user_editable,
+                )
+                .await?;
+            ctx.recorder.user_attribute_created(self.as_ref()).await?;
+        }
+
+        set_status(&api, &name, true).await?;
+
+        Ok(Action::requeue(Duration::from_secs(3600)))
+    }
+
+    async fn cleanup(
+        self: std::sync::Arc<Self>,
+        ctx: std::sync::Arc<crate::context::Context>,
+    ) -> super::Result<kube::runtime::controller::Action> {
+        let name = self
+            .metadata
+            .name
+            .clone()
+            .ok_or(Error::MissingObjectKey(".metadata.name"))?;
+
+        debug!(name, "Cleanup");
+
+        let lldap_client = ctx.lldap_config.build_client().await?;
+
+        trace!(name, "Deleting user attribute");
+        match lldap_client.delete_user_attribute(&name).await {
+            Err(lldap::Error::GraphQl(err))
+                if err.message == format!("Attribute {name} is not defined in the schema") =>
+            {
+                warn!(name, "User attribute not found");
+                Ok(())
+            }
+            Ok(_) => {
+                ctx.recorder.user_attribute_deleted(self.as_ref()).await?;
+                Ok(())
+            }
+            Err(err) => Err(err),
+        }?;
+
+        Ok(Action::await_change())
+    }
+}
+
+async fn set_status(
+    api: &Api<UserAttribute>,
+    name: &str,
+    synced: bool,
+) -> Result<UserAttribute, kube::Error> {
+    trace!(name, "Updating status");
+    let status = json!({
+        "status": UserAttributesStatus { synced }
+    });
+    api.patch_status(name, &PatchParams::default(), &Patch::Merge(&status))
+        .await
+}

src/version.rs

@@ -0,0 +1,11 @@
+pub const VERSION: &str = get_version();
+
+const fn get_version() -> &'static str {
+    if let Some(version) = std::option_env!("RELEASE_VERSION")
+        && !version.is_empty()
+    {
+        version
+    } else {
+        git_version::git_version!(fallback = "unknown")
+    }
+}

yaml/group.yaml

@@ -0,0 +1,5 @@
+apiVersion: lldap.huizinga.dev/v1
+kind: Group
+metadata:
+  name: test-group
+spec: {}

yaml/service-user.yaml

@@ -1,6 +1,5 @@
 apiVersion: lldap.huizinga.dev/v1
 kind: ServiceUser
 metadata:
-  name: authelia
-spec:
-  passwordManager: false
+  name: test-user
+spec: {}

yaml/user_attribute.yaml

@@ -0,0 +1,9 @@
+apiVersion: lldap.huizinga.dev/v1
+kind: UserAttribute
+metadata:
+  name: test-attribute
+spec:
+  type: String
+  list: true
+  userVisible: true
+  userEditable: true