From 03ae910b3fb4782394560d8c9271b06068708375 Mon Sep 17 00:00:00 2001 From: cclohmar Date: Sat, 11 Jul 2026 21:39:45 +0100 Subject: [PATCH] refactor: groups simplified to users + admins only --- CHANGELOG.md | 9 +++++ VERSION | 2 +- config/authelia/configuration.yml | 59 +----------------------------- config/authelia/users_database.yml | 7 ---- config/nextworkspace/apps.yaml | 14 +++---- main.go | 13 ++----- 6 files changed, 21 insertions(+), 83 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2424940..41619a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## 0.1.0.0037 — 2026-07-11 + +### Changed +- Simplified groups model: per-app groups (`drive`, `office`, `chat`, etc.) replaced with `users` + `admins` only +- `config/authelia/configuration.yml` — access_control rules reduced from 12 rules to 4 +- `config/authelia/users_database.yml` — master user groups simplified to `admins`, `users` +- `config/nextworkspace/apps.yaml` — all user-facing apps use `groups: ["users"]` +- Admin panel user creation form — 9 checkboxes replaced with 2 (User + Admin) + ## 0.1.0.0036 — 2026-07-11 ### Fixed diff --git a/VERSION b/VERSION index 2fd50ec..1e65865 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.0.0036 +0.1.0.0037 diff --git a/config/authelia/configuration.yml b/config/authelia/configuration.yml index 94a6bc7..2e6b26b 100644 --- a/config/authelia/configuration.yml +++ b/config/authelia/configuration.yml @@ -33,64 +33,7 @@ access_control: - "group:admins" policy: one_factor - # App paths — group-restricted - - domain: "app.{DOMAIN}" - resources: - - "^/drive(/.*)?$" - subject: - - "group:admins" - - "group:drive" - policy: one_factor - - - domain: "app.{DOMAIN}" - resources: - - "^/office(/.*)?$" - subject: - - "group:admins" - - "group:office" - policy: one_factor - - - domain: "app.{DOMAIN}" - resources: - - "^/enterprise(/.*)?$" - subject: - - "group:admins" - - "group:erp" - policy: one_factor - - - domain: "app.{DOMAIN}" - resources: - - "^/chat(/.*)?$" - subject: - - "group:admins" - - "group:chat" - policy: one_factor - - - domain: "app.{DOMAIN}" - resources: - - "^/meet(/.*)?$" - subject: - - "group:admins" - - "group:meet" - policy: one_factor - - - domain: "app.{DOMAIN}" - resources: - - "^/connect(/.*)?$" - subject: - - "group:admins" - - "group:mail" - policy: one_factor - - - domain: "app.{DOMAIN}" - resources: - - "^/aida(/.*)?$" - subject: - - "group:admins" - - "group:ai" - policy: one_factor - - # Home/launcher — any authenticated user + # Everything else — any authenticated user - domain: "app.{DOMAIN}" policy: one_factor diff --git a/config/authelia/users_database.yml b/config/authelia/users_database.yml index 9f91205..42b8ad4 100644 --- a/config/authelia/users_database.yml +++ b/config/authelia/users_database.yml @@ -7,10 +7,3 @@ users: groups: - admins - users - - drive - - office - - erp - - chat - - meet - - mail - - ai diff --git a/config/nextworkspace/apps.yaml b/config/nextworkspace/apps.yaml index 1eed6e7..c66e8bc 100644 --- a/config/nextworkspace/apps.yaml +++ b/config/nextworkspace/apps.yaml @@ -9,43 +9,43 @@ apps: path: "/drive" upstream: "http://127.0.0.1:9100" icon: "cloud" - groups: ["drive", "admins"] + groups: ["users"] - name: "Euro Office" subtitle: "Collaborative Suite" path: "/office" upstream: "http://127.0.0.1:9200" icon: "office" - groups: ["office", "admins"] + groups: ["users"] - name: "ERPNext" subtitle: "Enterprise ERP" path: "/enterprise" upstream: "http://127.0.0.1:9300" icon: "erp" - groups: ["erp", "admins"] + groups: ["users"] - name: "Matrix Chat" subtitle: "Team Communication" path: "/chat" upstream: "http://127.0.0.1:9400" icon: "chat" - groups: ["chat", "admins"] + groups: ["users"] - name: "Jitsi" subtitle: "Video Conferencing" path: "/meet" upstream: "http://127.0.0.1:9500" icon: "meet" - groups: ["meet", "admins"] + groups: ["users"] - name: "Webmail" subtitle: "Email Client" path: "/connect" upstream: "http://127.0.0.1:9600" icon: "mail" - groups: ["mail", "admins"] + groups: ["users"] - name: "AI Chat" subtitle: "Open WebUI" path: "/aida" upstream: "http://127.0.0.1:9700" icon: "ai" - groups: ["ai", "admins"] + groups: ["users"] - name: "Portainer" subtitle: "Container Management" path: "/admin" diff --git a/main.go b/main.go index fb095d5..0f1c920 100644 --- a/main.go +++ b/main.go @@ -1445,16 +1445,9 @@ const adminHTML = `
-
- - - - - - - - - +
+ +