feat: authenticate users and agents requests

2023-03-07 23:10:42 +01:00
159 changed files with 1136 additions and 7643 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,10 +4,8 @@ dist/
 /tools
 /tmp
 /state.json
-/emissary.sqlite*
+/emissary.sqlite
 /.gitea-release
 /agent-key.json
 /apps
-/server-key.json
-/.emissary-token
-/out
+/server-key.json
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@ -2,7 +2,6 @@ project_name: emissary
 before:
  hooks:
    - go mod tidy
-    - go generate ./...
 builds:
  - id: emissary-server
    env:
@ -46,9 +45,6 @@ builds:
      - arm64
      - arm
      - "386"
-    goarm:
-      - "6"
-      - "7"
    main: ./cmd/agent
 archives:
  - id: server
@ -67,7 +63,7 @@ archives:
 checksum:
  name_template: 'checksums.txt'
 snapshot:
-  name_template: "{{ .Version }}"
+  name_template: "{{ incpatch .Version }}-next"
 changelog:
  sort: asc
  filters:
--- a/85
+++ b/85
@ -1,85 +0,0 @@
-@Library('cadoles') _
-
-pipeline {
-    agent {
-        dockerfile {
-            label 'docker'
-            filename 'Dockerfile'
-            dir 'misc/jenkins'
-        }
-    }
-
-    stages {
-        stage('Cancel older jobs') {
-            steps {
-                script {
-                    def buildNumber = env.BUILD_NUMBER as int
-                    if (buildNumber > 1) milestone(buildNumber - 1)
-                    milestone(buildNumber)
-                }
-            }
-        }
-        
-        stage('Run unit tests') {
-            steps {
-                script {
-                    withCredentials([
-                        usernamePassword([
-                            credentialsId: 'forge-jenkins',
-                            usernameVariable: 'GIT_USERNAME',
-                            passwordVariable: 'GIT_PASSWORD'
-                        ])
-                    ]) {
-                        sh '''
-                        git config --global credential.https://forge.cadoles.com.username "$GIT_USERNAME"
-                        git config --global credential.https://forge.cadoles.com.helper '!f() { test "$1" = get && echo "password=$GIT_PASSWORD"; }; f'
-
-                        export GOPRIVATE=forge.cadoles.com/arcad/edge
-                        make test
-                        '''
-                    }
-                }
-            }
-        }
-
-        stage('Release') {
-            when {
-                anyOf {
-                    branch 'master'
-                    branch 'develop'
-                }
-            }
-            steps {
-                script {
-                    withCredentials([
-                        usernamePassword([
-                            credentialsId: 'forge-jenkins',
-                            usernameVariable: 'GITEA_RELEASE_USERNAME',
-                            passwordVariable: 'GITEA_RELEASE_PASSWORD'
-                        ])
-                    ]) {
-                        sh 'make gitea-release'
-                    }
-                    def currentVersion = sh(returnStdout: true, script: 'make full-version').trim()
-                    if (currentVersion.endsWith('-dirty')) {
-                        unstable('Could not trigger emissary-firmware build, dirty version !')
-                    } else {
-                        build(
-                            job: "../emissary-firmware/${env.GIT_BRANCH}",
-                            parameters: [
-                                [$class: 'StringParameterValue', name: 'emissaryRelease', value: currentVersion]
-                            ],
-                            wait: false
-                        )
-                    }
-                }
-            }
-        }
-    }
-
-    post {
-        always {
-            cleanWs()
-        }
-    }
-}
--- a/44
+++ b/44
@ -1,16 +1,14 @@
 LINT_ARGS ?= --timeout 5m
 GORELEASER_VERSION ?= v1.13.1
-GORELEASER_ARGS ?= release --snapshot --rm-dist
+GORELEASER_ARGS ?= release --auto-snapshot --snapshot --rm-dist
 GITCHLOG_ARGS ?=
 SHELL := /bin/bash

 EMISSARY_VERSION ?= 
-GIT_VERSION := $(shell git describe --always)
-DATE_VERSION := $(shell date +%Y.%-m.%-d)
-FULL_VERSION := v$(DATE_VERSION)-$(GIT_VERSION)$(if $(shell git diff --stat),-dirty,)
+GIT_VERSION ?= $(shell git describe --always)

 DOCKER_IMAGE_NAME ?= bornholm/emissary
-DOCKER_IMAGE_TAG ?= $(FULL_VERSION)
+DOCKER_IMAGE_TAG ?= $(GIT_VERSION)$(if $(shell git diff --stat),-dirty,)

 GOTEST_ARGS ?= -short

@ -45,7 +43,7 @@ build-emissary-%: deps ## Build executable
 		-v \
 		-ldflags "\
 			-X 'main.GitRef=$(shell git rev-parse --short HEAD)' \
-			-X 'main.ProjectVersion=$(FULL_VERSION)' \
+			-X 'main.ProjectVersion=$(shell git describe --always)' \
 			-X 'main.BuildDate=$(shell date --utc --rfc-3339=seconds)' \
 		" \
 		-o ./bin/$* \
@ -75,7 +73,7 @@ dump-config: build-emissary

 .PHONY: goreleaser
 goreleaser: deps
-	( set -o allexport && source .env && set +o allexport && VERSION=$(GORELEASER_VERSION) curl -sfL https://goreleaser.com/static/run | GORELEASER_CURRENT_TAG="$(FULL_VERSION)" bash /dev/stdin $(GORELEASER_ARGS) )
+	( set -o allexport && source .env && set +o allexport && VERSION=$(GORELEASER_VERSION) curl -sfL https://goreleaser.com/static/run | bash /dev/stdin $(GORELEASER_ARGS) )

 .PHONY: start-release
 start-release:
@ -124,43 +122,19 @@ gitea-release: tools/gitea-release/bin/gitea-release.sh goreleaser
 	rm -rf .gitea-release/*

 	cp dist/*.tar.gz .gitea-release/
-	cp dist/*.apk .gitea-release/
-	cp dist/*.deb .gitea-release/

 	GITEA_RELEASE_PROJECT="emissary" \
 		GITEA_RELEASE_ORG="arcad" \
 		GITEA_RELEASE_BASE_URL="https://forge.cadoles.com" \
-		GITEA_RELEASE_VERSION="$(FULL_VERSION)" \
-		GITEA_RELEASE_NAME="$(FULL_VERSION)" \
+		GITEA_RELEASE_VERSION="$(GIT_VERSION)" \
+		GITEA_RELEASE_NAME="$(GIT_VERSION)" \
 		GITEA_RELEASE_COMMITISH_TARGET="$(GIT_VERSION)" \
 		GITEA_RELEASE_IS_DRAFT="false" \
 		GITEA_RELEASE_BODY="" \
-		GITEA_RELEASE_ATTACHMENTS="$$(find .gitea-release/* -type f)" \
+		GITEA_RELEASE_ATTACHMENTS="$(shell find .gitea-release/* -type f)" \
 		tools/gitea-release/bin/gitea-release.sh

 tools/gitea-release/bin/gitea-release.sh:
 	mkdir -p tools/gitea-release/bin
 	curl --output tools/gitea-release/bin/gitea-release.sh https://forge.cadoles.com/Cadoles/Jenkins/raw/branch/master/resources/com/cadoles/gitea/gitea-release.sh
-	chmod +x tools/gitea-release/bin/gitea-release.sh
-
-.emissary-token:
-	$(MAKE) run-emissary-server EMISSARY_CMD="--debug --config tmp/server.yml server auth create-token --role writer > .emissary-token"
-
-AGENT_ID ?= 1
-
-load-sample-specs:
-	cat misc/spec-samples/app.emissary.cadoles.com.json | ./bin/server api agent spec update -a $(AGENT_ID) --no-patch --spec-data - --spec-name app.emissary.cadoles.com
-	cat misc/spec-samples/proxy.emissary.cadoles.com.json | ./bin/server api agent spec update -a $(AGENT_ID) --no-patch --spec-data - --spec-name proxy.emissary.cadoles.com
-	cat misc/spec-samples/mdns.emissary.cadoles.com.json | ./bin/server api agent spec update -a $(AGENT_ID) --no-patch --spec-data - --spec-name mdns.emissary.cadoles.com
-
-full-version:
-	@echo $(FULL_VERSION)
-
-update-edge-lib:
-	git pull --rebase
-	GOPROXY=direct GOPRIVATE=forge.cadoles.com/arcad/edge go get -u forge.cadoles.com/arcad/edge
-	go mod tidy
-	$(MAKE) test
-	git add go.mod go.sum
-	git commit -m "feat: update arcad/edge dependency"
-	git push
+	chmod +x tools/gitea-release/bin/gitea-release.sh
--- a/README.md
+++ b/README.md
@ -1,6 +1,4 @@
-<p align="center">
-    <img width="400" src="./misc/resources/logo.svg" />
-</p>
+# Emissary

 Control plane for "edge" (and OpenWRT-based) devices.

@ -16,8 +14,6 @@ Download the pre-compiled binaries from the [releases page](https://forge.cadole

 See [`doc`](./doc/README.md)

-## Licence & mentions
+## Licence

-[AGPL-3.0](https://www.gnu.org/licenses/agpl-3.0.html#license-text)
-
-Logo by [@aardouin](https://forge.cadoles.com/aardouin)
+AGPL-3.0
--- a/cmd/agent/main.go
+++ b/cmd/agent/main.go
@ -5,10 +5,7 @@ import (

 	"forge.cadoles.com/Cadoles/emissary/internal/command"
 	"forge.cadoles.com/Cadoles/emissary/internal/command/agent"
-	"forge.cadoles.com/Cadoles/emissary/internal/command/api"
-
-	_ "forge.cadoles.com/Cadoles/emissary/internal/imports/format"
-	_ "forge.cadoles.com/Cadoles/emissary/internal/imports/spec"
+	"forge.cadoles.com/Cadoles/emissary/internal/command/client"
 )

 // nolint: gochecknoglobals
@ -20,5 +17,5 @@ var (
 )

 func main() {
-	command.Main(BuildDate, ProjectVersion, GitRef, DefaultConfigPath, agent.Root(), api.Root())
+	command.Main(BuildDate, ProjectVersion, GitRef, DefaultConfigPath, agent.Root(), client.Root())
 }
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@ -4,12 +4,11 @@ import (
 	"time"

 	"forge.cadoles.com/Cadoles/emissary/internal/command"
-	"forge.cadoles.com/Cadoles/emissary/internal/command/api"
+	"forge.cadoles.com/Cadoles/emissary/internal/command/client"
 	"forge.cadoles.com/Cadoles/emissary/internal/command/server"

-	_ "forge.cadoles.com/Cadoles/emissary/internal/imports/format"
-	_ "forge.cadoles.com/Cadoles/emissary/internal/imports/spec"
-	_ "forge.cadoles.com/Cadoles/emissary/internal/imports/sql"
+	_ "github.com/jackc/pgx/v5/stdlib"
+	_ "modernc.org/sqlite"
 )

 // nolint: gochecknoglobals
@ -21,5 +20,5 @@ var (
 )

 func main() {
-	command.Main(BuildDate, ProjectVersion, GitRef, DefaultConfigPath, server.Root(), api.Root())
+	command.Main(BuildDate, ProjectVersion, GitRef, DefaultConfigPath, server.Root(), client.Root())
 }
--- a/doc/README.md
+++ b/doc/README.md
@ -1,22 +1,14 @@
 # Documentation

- (FR) - [Introduction](./fr/introduction.md)
-
 ## Tutorials

 - (FR) - [Premiers pas](./tutorials/fr/first-steps.md)
- (FR) - [Déployer un serveur mandataire inverse sur un agent](./tutorials/fr/deploy-reverse-proxy.md)
- (FR) - [Déployer une configuration UCI personnalisée sur un agent](./tutorials/fr/deploy-uci-configuration.md)

 ## References

-### Specifications
+### API

- [Schéma `app.emissary.cadoles.com`](../internal/agent/controller/app/spec/schema.json)
- [Schéma `proxy.emissary.cadoles.com`](../internal/spec/proxy/schema.json)
- [Schéma `mdns.emissary.cadoles.com`](../internal/agent/controller/mdns/spec/schema.json)
- [Schéma `uci.emissary.cadoles.com`](../internal/spec/uci/schema.json)
- [Schéma `sysupgrade.openwrt.emissary.cadoles.com`](../internal/agent/controller/openwrt/spec/sysupgrade/schema.json)
+[See `misc/rest/server.rest`](../misc/rest/server.rest)

 ### Configuration

@ -24,7 +16,3 @@ See:

 - [`misc/packaging/common/config-agent.yml`](../misc/packaging/common/config-agent.yml)
 - [`misc/packaging/common/config-server.yml`](../misc/packaging/common/config-server.yml)
-
-### Other projects
-
- [`emissary-firmware`](https://forge.cadoles.com/arcad/emissary-firmware) - Preconfigured OpenWRT firmwares with an agent
--- a/doc/fr/introduction.md
+++ b/doc/fr/introduction.md
@ -1,30 +0,0 @@
-# Introduction
-
-"Emissary" est un programme entrant dans la catégorie des outils de gestion et déploiement de configuration.
-
-En utilisant un agent déployé sur chaque système cible, il permet aux administrateurs système de centraliser le contrôle et la supervision de la configuration. Grâce à ses fonctionnalités avancées, il est capable de faire converger la configuration d'une machine vers un modèle précis défini par une ou plusieurs spécifications centralisées sur un serveur de pilotage dédié.
-
-Le principal atout d'"Emissary" réside dans sa capacité à activer des "contrôleurs" spécifiques pour chaque aspect de la configuration système. Ces contrôleurs sont des modules intelligents qui agissent comme des agents spécialisés, veillant à ce que les paramètres de configuration soient correctement appliqués et respectent les spécifications définies.
-
-Grâce à cette approche modulaire, "Emissary" peut gérer diverses facettes de la configuration, telles que les paramètres réseau, les règles de sécurité, les options de performance et bien plus encore. Chaque contrôleur est conçu pour répondre à des besoins spécifiques, offrant ainsi une flexibilité et une granularité optimales dans la gestion de la configuration.
-
-Certains contrôleurs permettent également l'exécution de services spécialisés comme des serveurs mandataires inverses ou des applications web autonomes.
-
-L'utilisation d'un serveur de pilotage centralisé permet à "Emissary" de stocker et de mettre à jour les spécifications de configuration de manière cohérente. Les administrateurs peuvent définir des modèles de configuration précis, les affiner au fil du temps et les appliquer en un seul clic sur l'ensemble du parc de machines gérées. Cela garantit une uniformité et une conformité accrues, tout en facilitant la maintenance et les mises à jour à grande échelle.
-
-À l'heure actuelle, Emissary est conçu pour cibler spécifiquement le système d'exploitation OpenWRT. L'activation des "contrôleurs" spécifiques à cet OS permet de converger la configuration de la machine OpenWRT vers un modèle correspondant aux spécifications centralisées sur le serveur de pilotage. Ces spécifications peuvent inclure des paramètres réseau, des configurations de sécurité, des règles de pare-feu, des options de routage, des services système, et bien d'autres éléments spécifiques à OpenWRT. 
-
-## Vue d'ensemble de l'architecture
-
-![](./resources/overview.svg)
-
-
-## Contrôleurs
-
-Voici la liste des contrôleurs implémentés à ce jour:
-
- **Contrôleur UCI** - Permet de modifier les données [UCI](https://openwrt.org/docs/guide-user/base-system/uci) (**U**nified **C**onfiguration **S**ystem) d'un système OpenWRT et ainsi configurer les services systèmes, les règles pare-feu, la configuration des NICs, etc sur celui-ci.
- **Contrôleur SysUpgrade** - Permet de mettre à jour un système OpenWRT via l'outil [`sysupgrade`](https://openwrt.org/docs/guide-user/installation/generic.sysupgrade).
- **Contrôleur Proxy** - Permet de déployer des services de type passerelle mandataire inverse ("reverse proxy") sur la machine cible.
- **Contrôleur mDNS** - Permet d'annoncer des services via mDNS sur les différents réseaux de la machine cible.
- **Contrôleur App** - Permet de déployer des applications web "embarquées" (s'exécutant localement et non dépendantes d'une connectivité internet) sur la machine cible. Voir le projet ["Edge App"](https://forge.cadoles.com/arcad/edge).
--- a/doc/fr/resources/overview.plantuml
+++ b/doc/fr/resources/overview.plantuml
@ -1,59 +0,0 @@
-@startuml
-top to bottom direction
-skinparam linetype ortho
-
-node PilotNode as "Pilot Node" {
-    database DataStore as "Data Store"
-
-    component EmissaryServer as "Emissary Server" {
-
-        component SpecificationRegistry as "Specification Registry" {
-            component UCISpecification as "UCI Spec"
-            component MDNSSpecification as "mDNS Spec"
-            component AppSpecification as "App Spec"
-            component ProxySpecification as "Proxy Spec"
-            component SysUpgradeSpecification as "SysUpgrade Spec"
-        }
-
-        component HTTPHandler as "HTTP Handler"
-
-        HTTPHandler .down.> SpecificationRegistry: validates agents data with
-
-        HTTPHandler .right.> DataStore: saves agent data in
-    }
-}
-
-node OperatorNode as "Operator Node" {
-    component EmissaryClient as "Emissary Client"
-
-    EmissaryClient -left-> HTTPHandler: administrates
-}
-
-node OpenWRTNode as "OpenWRT Node" {
-    component EmissaryAgent as "Emissary Agent" {
-
-        component StateManager as "State Manager"
-
-        StateManager --up-> HTTPHandler: fetches agent ^*specs from
-
-        component UCIController as "UCI Controller"
-
-        UCIController .up.> StateManager: reconciles with
-
-        component SysUpgradeController as "SysUpgrade Controller"
-
-        SysUpgradeController .up.> StateManager: reconciles with
-    
-        component ProxyController as "Proxy Controller"
-
-        ProxyController .up.> StateManager: reconciles with
-
-        component MDNSController as "mDNS Controller"
-
-        MDNSController .up.> StateManager: reconciles with
-
-        component AppController as "App Controller"
-
-        AppController .up.> StateManager: reconciles with
-    }
-}
--- a/doc/fr/resources/overview.svg
+++ b/doc/fr/resources/overview.svg
@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="643px" preserveAspectRatio="none" style="width:1713px;height:643px;background:#FFFFFF;" version="1.1" viewBox="0 0 1713 643" width="1713px" zoomAndPan="magnify"><defs/><g><!--MD5=[d09f24f3d7c03358bd8c02f81fe1cb3f]
-cluster PilotNode--><g id="cluster_PilotNode"><polygon fill="none" points="16,16,26,6,685,6,685,511,675,521,16,521,16,16" style="stroke:#181818;stroke-width:1.0;"/><line style="stroke:#181818;stroke-width:1.0;" x1="675" x2="685" y1="16" y2="6"/><line style="stroke:#181818;stroke-width:1.0;" x1="16" x2="675" y1="16" y2="16"/><line style="stroke:#181818;stroke-width:1.0;" x1="675" x2="675" y1="16" y2="521"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="73" x="310" y="33.9659">Pilot Node</text></g><!--MD5=[9c6b5fd9fe3a3a3c784efc27685ccdf9]
-cluster EmissaryServer--><g id="cluster_EmissaryServer"><rect fill="none" height="440" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="523" x="138" y="57"/><rect fill="none" height="10" style="stroke:#181818;stroke-width:1.0;" width="15" x="641" y="62"/><rect fill="none" height="2" style="stroke:#181818;stroke-width:1.0;" width="4" x="639" y="64"/><rect fill="none" height="2" style="stroke:#181818;stroke-width:1.0;" width="4" x="639" y="68"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="110" x="344.5" y="84.9659">Emissary Server</text></g><!--MD5=[5f6297313bdca82dad0981382bb4d88a]
-cluster SpecificationRegistry--><g id="cluster_SpecificationRegistry"><rect fill="none" height="273" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="459" x="170" y="192"/><rect fill="none" height="10" style="stroke:#181818;stroke-width:1.0;" width="15" x="609" y="197"/><rect fill="none" height="2" style="stroke:#181818;stroke-width:1.0;" width="4" x="607" y="199"/><rect fill="none" height="2" style="stroke:#181818;stroke-width:1.0;" width="4" x="607" y="203"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="149" x="325" y="219.9659">Specification Registry</text></g><!--MD5=[b562d696a455f482404b155c6a8fbfca]
-cluster OperatorNode--><g id="cluster_OperatorNode"><polygon fill="none" points="709,62,719,52,889,52,889,150,879,160,709,160,709,62" style="stroke:#181818;stroke-width:1.0;"/><line style="stroke:#181818;stroke-width:1.0;" x1="879" x2="889" y1="62" y2="52"/><line style="stroke:#181818;stroke-width:1.0;" x1="709" x2="879" y1="62" y2="62"/><line style="stroke:#181818;stroke-width:1.0;" x1="879" x2="879" y1="62" y2="160"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="104" x="743" y="79.9659">Operator Node</text></g><!--MD5=[68861f6d3d90d2f41bc4d4a2796fc73e]
-cluster OpenWRTNode--><g id="cluster_OpenWRTNode"><polygon fill="none" points="709,313,719,303,1696,303,1696,616,1686,626,709,626,709,313" style="stroke:#181818;stroke-width:1.0;"/><line style="stroke:#181818;stroke-width:1.0;" x1="1686" x2="1696" y1="313" y2="303"/><line style="stroke:#181818;stroke-width:1.0;" x1="709" x2="1686" y1="313" y2="313"/><line style="stroke:#181818;stroke-width:1.0;" x1="1686" x2="1686" y1="313" y2="626"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="109" x="1144" y="330.9659">OpenWRT Node</text></g><!--MD5=[6e6320f5227e3e26302b14a131b17aa5]
-cluster EmissaryAgent--><g id="cluster_EmissaryAgent"><rect fill="none" height="248" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="939" x="733" y="354"/><rect fill="none" height="10" style="stroke:#181818;stroke-width:1.0;" width="15" x="1652" y="359"/><rect fill="none" height="2" style="stroke:#181818;stroke-width:1.0;" width="4" x="1650" y="361"/><rect fill="none" height="2" style="stroke:#181818;stroke-width:1.0;" width="4" x="1650" y="365"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="108" x="1148.5" y="381.9659">Emissary Agent</text></g><!--MD5=[45eee4c5a57edb1e2ac175c76a239d17]
-entity DataStore--><g id="elem_DataStore"><path d="M32,105.5 C32,95.5 77,95.5 77,95.5 C77,95.5 122,95.5 122,105.5 L122,133.5679 C122,143.5679 77,143.5679 77,143.5679 C77,143.5679 32,143.5679 32,133.5679 L32,105.5 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/><path d="M32,105.5 C32,115.5 77,115.5 77,115.5 C77,115.5 122,115.5 122,105.5 " fill="none" style="stroke:#181818;stroke-width:0.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="70" x="42" y="134.4659">Data Store</text></g><!--MD5=[7d2b259075cd0e421afb7965bd22532b]
-entity HTTPHandler--><g id="elem_HTTPHandler"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="132" x="335" y="95"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="447" y="100"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="445" y="102"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="445" y="106"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="92" x="350" y="129.9659">HTTP Handler</text></g><!--MD5=[d74c349cfc963885f78088443cb132a3]
-entity UCISpecification--><g id="elem_UCISpecification"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="213" y="238"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="293" y="243"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="291" y="245"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="291" y="249"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="228" y="272.9659">UCI Spec</text></g><!--MD5=[631d6ad5bad1f198f42ccf56fafe0582]
-entity MDNSSpecification--><g id="elem_MDNSSpecification"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="118" x="348" y="238"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="446" y="243"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="444" y="245"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="444" y="249"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="78" x="363" y="272.9659">mDNS Spec</text></g><!--MD5=[f8753067470155b04e2f3a693924c320]
-entity AppSpecification--><g id="elem_AppSpecification"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="103" x="501.5" y="238"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="584.5" y="243"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="582.5" y="245"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="582.5" y="249"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="516.5" y="272.9659">App Spec</text></g><!--MD5=[fd240f711946cd5d0dcadb1ea2ed786c]
-entity ProxySpecification--><g id="elem_ProxySpecification"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="112" x="213" y="392"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="305" y="397"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="303" y="399"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="303" y="403"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="72" x="228" y="426.9659">Proxy Spec</text></g><!--MD5=[74aafaf76d366e174271de99960a7b8d]
-entity SysUpgradeSpecification--><g id="elem_SysUpgradeSpecification"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="157" x="360.5" y="392"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="497.5" y="397"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="495.5" y="399"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="495.5" y="403"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="375.5" y="426.9659">SysUpgrade Spec</text></g><!--MD5=[584b4e495bc4cb9e5d46ff66335fc219]
-entity EmissaryClient--><g id="elem_EmissaryClient"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="143" x="725.5" y="95"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="848.5" y="100"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="846.5" y="102"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="846.5" y="106"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="103" x="740.5" y="129.9659">Emissary Client</text></g><!--MD5=[cbe48146c9698f81ea53c2c6f51c8eda]
-entity StateManager--><g id="elem_StateManager"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="139" x="1048.5" y="392"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="1167.5" y="397"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="1165.5" y="399"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="1165.5" y="403"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="99" x="1063.5" y="426.9659">State Manager</text></g><!--MD5=[27f8877b35bcf78d2c9b0e363caea569]
-entity UCIController--><g id="elem_UCIController"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="135" x="749.5" y="537"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="864.5" y="542"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="862.5" y="544"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="862.5" y="548"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="95" x="764.5" y="571.9659">UCI Controller</text></g><!--MD5=[f5a45e51cb66ff1d3b5626d0df038fee]
-entity SysUpgradeController--><g id="elem_SysUpgradeController"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="192" x="920" y="537"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="1092" y="542"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="1090" y="544"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="1090" y="548"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="152" x="935" y="571.9659">SysUpgrade Controller</text></g><!--MD5=[ed1f476319cb2bbabd1b988180210f61]
-entity ProxyController--><g id="elem_ProxyController"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="147" x="1147.5" y="537"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="1274.5" y="542"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="1272.5" y="544"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="1272.5" y="548"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107" x="1162.5" y="571.9659">Proxy Controller</text></g><!--MD5=[dcaaaabc13b59746f8f74cc6285a228b]
-entity MDNSController--><g id="elem_MDNSController"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="153" x="1329.5" y="537"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="1462.5" y="542"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="1460.5" y="544"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="1460.5" y="548"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="113" x="1344.5" y="571.9659">mDNS Controller</text></g><!--MD5=[f7cab0dbd7f354492deaa54be612571f]
-entity AppController--><g id="elem_AppController"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="138" x="1518" y="537"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="1636" y="542"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="1634" y="544"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="1634" y="548"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="98" x="1533" y="571.9659">App Controller</text></g><!--MD5=[8c3501b26c9c3ea39952224ab3fba557]
-link HTTPHandler to SpecificationRegistry--><g id="link_HTTPHandler_SpecificationRegistry"><path d="M334.7,128 C268.96,128 178,128 178,128 C178,128 178,158.5475 178,190.5263 C178,190.7761 178,191.026 178,191.276 " fill="none" id="HTTPHandler-to-SpecificationRegistry" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="178,191.276,182,182.276,178,186.276,174,182.276,178,191.276" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="156" x="151.03" y="142.897">validates agents data with</text></g><!--MD5=[1442fca2dc2f53bf9ae23d9e844c6c8b]
-link HTTPHandler to DataStore--><g id="link_HTTPHandler_DataStore"><path d="M334.65,112 C334.65,112 128.41,112 128.41,112 " fill="none" id="HTTPHandler-to-DataStore" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="123.41,112,132.41,116,128.41,112,132.41,108,123.41,112" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="115" x="203.28" y="126.897">saves agent data in</text></g><!--MD5=[04b946759b53ef2d0699bda61eed296c]
-reverse link HTTPHandler to EmissaryClient--><g id="link_HTTPHandler_EmissaryClient"><path d="M473.28,112 C473.28,112 725.14,112 725.14,112 " fill="none" id="HTTPHandler-backto-EmissaryClient" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="468.28,112,477.28,116,473.28,112,477.28,108,468.28,112" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="82" x="516.21" y="107.897">administrates</text></g><!--MD5=[0dd7156c6052ea784bc88dfca61e007b]
-reverse link HTTPHandler to StateManager--><g id="link_HTTPHandler_StateManager"><path d="M473.28,128 C473.28,128 665,128 665,128 C665,128 665,409 665,409 C665,409 921.14,409 1048.21,409 " fill="none" id="HTTPHandler-backto-StateManager" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="468.28,128,477.28,132,473.28,128,477.28,124,468.28,128" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="163" x="501" y="360.137">fetches agent ^*specs from</text></g><!--MD5=[beea302d68a5d9dc6027ab4e0b987cea]
-reverse link StateManager to UCIController--><g id="link_StateManager_UCIController"><path d="M1042.15,425 C1042.15,425 876.5,425 876.5,425 C876.5,425 876.5,497.45 876.5,536.78 " fill="none" id="StateManager-backto-UCIController" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="1047.15,425,1038.15,421,1042.15,425,1038.15,429,1047.15,425" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="88" x="814.43" y="420.897">reconciles with</text></g><!--MD5=[8cf138a1950decb1251fc88353171770]
-reverse link StateManager to SysUpgradeController--><g id="link_StateManager_SysUpgradeController"><path d="M1080.25,447.43 C1080.25,447.43 1080.25,536.9 1080.25,536.9 " fill="none" id="StateManager-backto-SysUpgradeController" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="1080.25,442.43,1076.25,451.43,1080.25,447.43,1084.25,451.43,1080.25,442.43" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="88" x="991.25" y="488.057">reconciles with</text></g><!--MD5=[8dba0e44c0268b5c6a2c1c6565c41b8b]
-reverse link StateManager to ProxyController--><g id="link_StateManager_ProxyController"><path d="M1167.5,447.43 C1167.5,447.43 1167.5,536.9 1167.5,536.9 " fill="none" id="StateManager-backto-ProxyController" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="1167.5,442.43,1163.5,451.43,1167.5,447.43,1171.5,451.43,1167.5,442.43" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="88" x="1078.5" y="507.057">reconciles with</text></g><!--MD5=[94df0ade1dc92be8853ce902c4f83dad]
-reverse link StateManager to MDNSController--><g id="link_StateManager_MDNSController"><path d="M1193.72,425 C1193.72,425 1406,425 1406,425 C1406,425 1406,497.45 1406,536.78 " fill="none" id="StateManager-backto-MDNSController" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="1188.72,425,1197.72,429,1193.72,425,1197.72,421,1188.72,425" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="88" x="1266.75" y="420.897">reconciles with</text></g><!--MD5=[e74434bc519cba41fdddc7c857699717]
-reverse link StateManager to AppController--><g id="link_StateManager_AppController"><path d="M1193.96,409 C1193.96,409 1587,409 1587,409 C1587,409 1587,493.45 1587,536.66 " fill="none" id="StateManager-backto-AppController" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="1188.96,409,1197.96,413,1193.96,409,1197.96,405,1188.96,409" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="88" x="1365.31" y="404.897">reconciles with</text></g><!--MD5=[6fc50b732d8962c26a79ff20e99a40e3]
-@startuml
-top to bottom direction
-skinparam linetype ortho
-
-node PilotNode as "Pilot Node" {
-    database DataStore as "Data Store"
-
-    component EmissaryServer as "Emissary Server" {
-
-        component SpecificationRegistry as "Specification Registry" {
-            component UCISpecification as "UCI Spec"
-            component MDNSSpecification as "mDNS Spec"
-            component AppSpecification as "App Spec"
-            component ProxySpecification as "Proxy Spec"
-            component SysUpgradeSpecification as "SysUpgrade Spec"
-        }
-
-        component HTTPHandler as "HTTP Handler"
-
-        HTTPHandler .down.> SpecificationRegistry: validates agents data with
-
-        HTTPHandler .right.> DataStore: saves agent data in
-    }
-}
-
-node OperatorNode as "Operator Node" {
-    component EmissaryClient as "Emissary Client"
-
-    EmissaryClient -left-> HTTPHandler: administrates
-}
-
-node OpenWRTNode as "OpenWRT Node" {
-    component EmissaryAgent as "Emissary Agent" {
-
-        component StateManager as "State Manager"
-
-        StateManager - -up-> HTTPHandler: fetches agent ^*specs from
-
-        component UCIController as "UCI Controller"
-
-        UCIController .up.> StateManager: reconciles with
-
-        component SysUpgradeController as "SysUpgrade Controller"
-
-        SysUpgradeController .up.> StateManager: reconciles with
-    
-        component ProxyController as "Proxy Controller"
-
-        ProxyController .up.> StateManager: reconciles with
-
-        component MDNSController as "mDNS Controller"
-
-        MDNSController .up.> StateManager: reconciles with
-
-        component AppController as "App Controller"
-
-        AppController .up.> StateManager: reconciles with
-    }
-}
-@end
-
-PlantUML version 1.2022.7(Mon Aug 22 19:01:30 CEST 2022)
-(GPL source distribution)
-Java Runtime: OpenJDK Runtime Environment
-JVM: OpenJDK 64-Bit Server VM
-Default Encoding: UTF-8
-Language: fr
-Country: FR
--></g></svg>
--- a/doc/tutorials/fr/deploy-reverse-proxy.md
+++ b/doc/tutorials/fr/deploy-reverse-proxy.md
@ -1,3 +0,0 @@
-# Déployer un serveur mandataire inverse sur un agent
-
-> TODO
--- a/doc/tutorials/fr/deploy-uci-configuration.md
+++ b/doc/tutorials/fr/deploy-uci-configuration.md
@ -1,130 +0,0 @@
-# Déployer une configuration UCI personnalisée sur un agent
-
-Via la spécification [`uci.emissary.cadoles.com`](../../../internal/spec/uci/schema.json) il est possible de configurer un agent avec un système OpenWRT. Dans ce tutoriel nous verrons:
-
- Comment exporter une configuration UCI existante au format attendu par Emissary;
- Comment modifier la spécification d'un agent Emissary pour mettre à jour sa configuration via le serveur de pilotage.
-
-## Étapes
-
-### Identifier l'empreinte de votre agent
-
-1. Sur la machine agent, utiliser la commande intégrée pour récupérer l'empreinte ("thumbprint") identifiant l'agent:
-
-    ```
-    emissary agent show-thumbprint
-    ```
-
-    **Noter la valeur retournée. Elle sera utilisée dans les étapes suivantes.**
-
-### Exporter la configuration UCI de votre agent au format Emissary
-
-1. Se connecter en SSH sur votre agent Emissary:
-
-    ```
-    ssh root@<agent_ip>
-    ```
-
-2. Sur la machine agent, utiliser la commande intégrée pour exporter la configuration UCI de votre agent au format Emissary:
-
-    ```
-    uci export | emissary agent openwrt uci transform > my-agent-config.json
-    ```
-
-    > **Astuce**
-    > 
-    > Par défaut, l'outil [LuCi](https://openwrt.org/fr/doc/howto/luci.essentials) est disponible sur votre agent. Vous pouvez y accéder via l'URL `http://<agent_ip>/`.
-    > 
-    > Vous pouvez utiliser LuCi pour modifier la configuration de l'agent (par exemple, configurer le WiFi, créer des règles réseaux, etc) avant d'exporter la configuration.
-    >
-    > De cette manière, il est possible de répliquer celle ci sur plusieurs agents via Emissary !
-
-3. Transférer le fichier `my-agent-config.json` sur la machine hébergeant votre serveur de pilotage Emissary.
-
-### Transformer la configuration en spécification
-
-#### Prérequis
-
- [`jq`](https://stedolan.github.io/jq/)
- [`sponge`](https://linux.die.net/man/1/sponge) (paquet `moreutils` sur Ubuntu)
-
-#### Étapes
-
-1. Sur la machine hébergeant le serveur de pilotage Emissary, utiliser l'outil `jq` pour créer un objet JSON correspondant au schéma attendu par la spécification [`uci.emissary.cadoles.com`](../../../internal/spec/uci/schema.json):
-
-    ```bash
-    # Créer la structure de base de la spécification UCI
-    cat >> my-uci-spec.json <<EOF
-    {
-        "config": null,
-        "postImportCommands": [
-            { "command": "uci", "args": ["commit"] },
-            { "command": "reload_config", "args": [] }
-        ]
-    }
-    EOF
-
-    # Injecter la configuration récupérée de notre agent dans la spécification
-    cat my-uci-spec.json | jq --slurpfile config my-agent-config.json '.config = $config[0]' | sponge my-uci-spec.json
-    ```
-
-    Notre spécification est prête à être assignée à notre agent !
-
-
-### Assigner la spécification à l'agent
-
-1. Sur la machine hébergeant le serveur de pilotage Emissary, retrouver l'identifiant associé à l'agent:
-
-    ```bash
-    # Déclarer une variable contenant l'empreinte de l'agent précédemment trouvée
-    AGENT_THUMBPRINT="<empreinte agent>"
-
-    # Récupérer l'identifiant de l'agent
-    AGENT_ID=$(emissary api agent query -f json | jq -r --arg thumbprint "$AGENT_THUMBPRINT" '.[] | select(.thumbprint == $thumbprint) | .id')
-    ```
-
-2. Assigner la spécification à l'agent UCI:
-
-    ```bash
-    cat my-uci-spec.json | emissary api agent spec update -a ${AGENT_ID} --no-patch --spec-data - --spec-name uci.emissary.cadoles.com
-    ```
-
-    **Bravo, vous avez déployé des spécifications UCI sur votre agent !**
-
-### Exemple: modifier le `hostname` de votre agent
-
-En intervenant directement sur notre spécification, il est possible de modifier la configuration et appliquer ces changements à notre agent.
-
-1. Sur la machine hébergeant le serveur de pilotage, faire:
-
-    ```bash
-    # On créait une variable avec le nouveau hostname de notre agent
-    MY_NEW_AGENT_HOSTNAME="MyEmissaryAgent"
-
-    # On utilise jq afin de modifier la valeur de configuration dans notre spécification UCI
-    cat my-uci-spec.json | jq --arg hostname "$MY_NEW_AGENT_HOSTNAME" '( .config.packages[] | select(.name == "system") | .configs[].options[] | select(.name == "hostname").value ) |= $hostname' | sponge my-uci-spec.json
-    ```
-
-    > **Astuce**
-    >
-    > En utilisant la commande `grep -C 10 hostname  my-uci-spec.json`, on peut voir que la valeur de configuration `hostname` a bien été mise à jour dans notre spécification.
-
-2. Mettre à jour la configuration de l'agent:
-
-    ```bash
-    cat my-uci-spec.json | emissary api agent spec update -a ${AGENT_ID} --no-patch --spec-data - --spec-name uci.emissary.cadoles.com
-    ```
-
-3. Sur l'agent, après quelques secondes (par défaut, la fréquence de mise à jour est de 1 fois par minute) l'agent devrait avoir son `hostname` mis à jour:
-
-    ```
-    uci show system.@system[].hostname
-    ```
-
-    Un message de ce type devrait s'afficher:
-
-    ```
-    system.cfg01e48a.hostname='MyEmissaryAgent'
-    ```
-
-    La modification devrait être également visible dans le prompt du shell de l'agent.
--- a/doc/tutorials/fr/first-steps.md
+++ b/doc/tutorials/fr/first-steps.md
@ -1,158 +1 @@
-# Premiers pas
-
-## Prérequis
-
- Pour le serveur, une machine [Ubuntu 22.04](https://ubuntu.com/download/server)
- Pour l'agent, un [RaspberryPi version 3](https://openwrt.org/toh/raspberry_pi_foundation/raspberry_pi)
-
-## Étapes
-
-### Préparer votre RaspberryPi
-
-1. Sur la page des ["versions"](https://forge.cadoles.com/arcad/emissary-firmware/releases) des firmwares du projet Emissary, télécharger la dernière version disponibles correspondant à votre système cible, dans le cas présent `openwrt-<openwrt_version>-emissary-<emissary_firmware_version>-bcm27xx-bcm2710-rpi-3-ext4-factory.img.gz`
-
-2. Brancher votre carte SD dans le lecteur, flasher celle ci avec le firmware:
-
-    ```bash
-    # Chemin vers le fichier de firmware précédemment téléchargé
-    FIRMWARE_FILE="openwrt-<openwrt_version>-emissary-<emissary_firmware_version>-bcm27xx-bcm2710-rpi-3-ext4-factory.img.gz"
-
-    SDCARD_DEVICE=/dev/sdX  # Chemin vers le "device" correspondant à votre carte SD
-
-    # Décompresser le firmware
-    gzip -d "${FIRMWARE_FILE}"
-
-    # Flash la carte SD
-    sudo dd if="${FIRMWARE_FILE%.gz}" of="${SDCARD_DEVICE}" bs=2M conv=fsync
-
-    # Attendre la fin des écritures
-    sudo sync
-    ```
-
-3. Placer votre carte SD dans votre RaspberryPi, le connecter à votre réseau en Ethernet puis l'allumer.
-
-4. Scanner votre réseau pour trouver l'adresse IP de votre Raspberry Pi. Par exemple, avec l'outil `nmap`:
-
-    ```bash
-    sudo nmap -sP 192.168.0.*   # À modifier par le préfixe correspondant à votre réseau local
-    ```
-    
-    Une entrée équivalente à la suivante devrait être affichée:
-
-    ```bash
-    Starting Nmap 7.93 ( https://nmap.org ) at 2023-05-25 19:29 CEST
-    Nmap scan report for 192.168.0.24
-    Host is up (0.0034s latency).
-    MAC Address: B8:27:EB:E5:7B:55 (Raspberry Pi Foundation)
-    [...]
-    ```
-
-5. Se connecter en SSH sur votre RaspberryPi et définir un mot de passe pour le compte administrateur:
-
-    ```bash
-    ssh root@<ip>
-
-    passwd
-    ```
-
-### Installer le serveur Emissary
-
-1. Sur la machine Ubuntu 22.04, télécharger les paquets Emissary sur la page ["Versions"](https://forge.cadoles.com/arcad/emissary/releases) du projet. Dans le cas présent, choisir le paquet Debian `emissary-server_<emissary_version>_linux_<arch>.deb` où `<arch>` correspond à l'architecture CPU de votre machine.
-
-2. Installer le paquet télécharger via `dpkg`:
-
-    ```
-    sudo dpkg -i emissary-server_<emissary_version>_linux_<arch>.deb
-    ```
-
-3. Appliquer les migrations sur la base de données:
-
-    ```shell
-    sudo emissary --workdir /usr/share/emissary --config /etc/emissary/server.yml server database migrate
-    ```
-
-4. Redémarrer le service:
-
-    ```shell
-    sudo systemctl restart emissary-server
-    ```
-
-5. Créer un jeton d'administration:
-
-    ```shell
-    sudo emissary --workdir /usr/share/emissary --config /etc/emissary/server.yml server auth create-token --role writer --subject $(whoami) > .emissary-token
-    ```
-
-6. Vérifier l'authentification sur l'API:
-
-    ```shell
-    emissary api agent query
-    ```
-
-    Une réponse équivalente à la suivante devrait s'afficher:
-
-    ```shell
-    +----+-------+------------+--------+-------------+-----------+
-    | ID | LABEL | THUMBPRINT | STATUS | CONTACTEDAT | UPDATEDAT |
-    +----+-------+------------+--------+-------------+-----------+
-    +----+-------+------------+--------+-------------+-----------+
-    ```
-
-### Appairer l'agent avec votre serveur
-
-1. Sur le RaspberryPi, exécuter la commande suivante:
-
-    ```shell
-    uci set emissary.agent.server_url='http://<server_ip>:3000'
-    uci commit emissary
-    reload_config
-    ```
-
-2. Via la commande `logread`, vérifier que l'agent arrive à se connecter avec le serveur:
-
-    ```shell
-    logread -f
-    ```
-
-    Un message de ce type devrait s'afficher:
-
-    ```
-    Thu May 25 18:48:51 2023 daemon.info emissary[2202]: 2023-05-25 18:48:51.611 [INFO]	<./internal/agent/controller/persistence/controller.go:58>	(*Controller).Reconcile	no changes detected, doing nothing	{"controller": "persistence-controller"}
-    Thu May 25 18:48:51 2023 daemon.info emissary[2202]: 2023-05-25 18:48:51.675 [ERROR]	<./internal/agent/controller/spec/controller.go:43>(*Controller).reconcileAgent	unexpected agent status	{"controller": "spec-controller", "agentID": 1, "status": 0}
-    Thu May 25 18:48:51 2023 daemon.info emissary[2202]: 2023-05-25 18:48:51.676 [INFO]	<./internal/agent/controller/openwrt/uci_controller.go:32>	(*UCIController).Reconcile	could not find uci spec, doing nothing	{"controller": "uci-controller"}
-    Thu May 25 18:48:51 2023 daemon.info emissary[2202]: 2023-05-25 18:48:51.677 [INFO]	<./internal/agent/controller/app/controller.go:43>	(*Controller).Reconcile	could not find app spec	{"controller": "app-controller"}
-    Thu May 25 18:48:51 2023 daemon.info emissary[2202]: 2023-05-25 18:48:51.678 [INFO]	<./internal/agent/controller/proxy/controller.go:35>(*Controller).Reconcile	could not find proxy spec	{"controller": "proxy-controller"}
-    Thu May 25 18:48:51 2023 daemon.info emissary[2202]: 2023-05-25 18:48:51.680 [INFO]	<./internal/agent/controller/mdns/controller.go:38>(*Controller).Reconcile	could not find mdns spec	{"controller": "mdns-controller"}
-    Thu May 25 18:48:51 2023 daemon.info emissary[2202]: 2023-05-25 18:48:51.680 [INFO]	<./internal/agent/controller/openwrt/sysupgrade_controller.go:36>	(*SysUpgradeController).Reconcile	could not find sysupgrade spec, doing nothing	{"controller": "sysupgrade-controller"}
-    ```
-
-3. Sur le serveur, vérifier que l'agent a pu s'enregistrer:
-
-    ```shell
-    emissary api agent query
-    ```
-
-    Un message de ce type devrait s'afficher:
-
-    ```
-    +----+-------+-----------------------------------+--------+-----------------------------------+-----------------------------------+
-    | ID | LABEL | THUMBPRINT                        | STATUS | CONTACTEDAT                       | UPDATEDAT                         |
-    +----+-------+-----------------------------------+--------+-----------------------------------+-----------------------------------+
-    | 1  |       | 21CnUATcboKCaheb2uczWCuoxTZtnp... | 0      | 2023-05-25 18:49:51.652680196 ... | "2023-05-25T18:49:51.589225817... |
-    +----+-------+-----------------------------------+--------+-----------------------------------+-----------------------------------+
-    ```
-
-    Noter l'identifiant associé à l'agent.
-
-4. Mettre à jour le statut de l'agent afin qu'il soit en capacité à récupérer ses spécifications:
-
-    ```
-    emissary api agent update --agent-id <agent_id> --status 1
-    ```
-
-**Bravo, vous avez appairé votre premier agent et son serveur Emissary !**
-
-## Aller plus loin
-
- [Déployer une configuration UCI personnalisée sur un agent](./deploy-uci-configuration.md)
- [Déployer un serveur mandataire inverse sur votre agent](./deploy-reverse-proxy.md)
+# Premiers pas
--- a/go.mod
+++ b/go.mod
@ -3,72 +3,59 @@ module forge.cadoles.com/Cadoles/emissary
 go 1.19

 require (
-	forge.cadoles.com/arcad/edge v0.0.0-20230426135323-17808d14c978
-	github.com/Masterminds/sprig/v3 v3.2.3
+	forge.cadoles.com/arcad/edge v0.0.0-20230303153719-6399196fe5c9
 	github.com/alecthomas/participle/v2 v2.0.0-beta.5
 	github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883
-	github.com/antonmedv/expr v1.12.7
-	github.com/brutella/dnssd v1.2.6
 	github.com/btcsuite/btcd/btcutil v1.1.3
 	github.com/davecgh/go-spew v1.1.1
 	github.com/denisbrodbeck/machineid v1.0.1
-	github.com/dop251/goja v0.0.0-20230304130813-e2f543bf4b4c
 	github.com/evanphx/json-patch/v5 v5.6.0
 	github.com/go-chi/chi v4.1.2+incompatible
 	github.com/go-chi/cors v1.2.1
 	github.com/golang-migrate/migrate/v4 v4.15.2
 	github.com/jackc/pgx/v5 v5.3.1
 	github.com/jedib0t/go-pretty/v6 v6.4.4
-	github.com/lestrrat-go/jwx/v2 v2.0.9
-	github.com/lithammer/shortuuid/v4 v4.0.0
-	github.com/mitchellh/hashstructure/v2 v2.0.2
+	github.com/lestrrat-go/jwx/v2 v2.0.8
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/pkg/errors v0.9.1
 	github.com/qri-io/jsonschema v0.2.1
+	github.com/santhosh-tekuri/jsonschema/v5 v5.1.1
 	github.com/urfave/cli/v2 v2.24.4
-	gitlab.com/wpetit/goweb v0.0.0-20230419082146-a94d9ed7202b
+	gitlab.com/wpetit/goweb v0.0.0-20230227162855-a1f09bafccb3
 	gopkg.in/yaml.v3 v3.0.1
 	modernc.org/sqlite v1.21.0
 )

 require (
-	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/Masterminds/semver/v3 v3.2.0 // indirect
 	github.com/barnybug/go-cast v0.0.0-20201201064555-a87ccbc26692 // indirect
-	github.com/dop251/goja_nodejs v0.0.0-20230320130059-dcf93ba651dd // indirect
+	github.com/dop251/goja v0.0.0-20230226152633-7c93113e17ac // indirect
+	github.com/dop251/goja_nodejs v0.0.0-20230226152057-060fa99b809f // indirect
 	github.com/gabriel-vasile/mimetype v1.4.1 // indirect
 	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/google/pprof v0.0.0-20230309165930-d61513b1440d // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/hashicorp/mdns v1.0.5 // indirect
-	github.com/huandu/xstrings v1.3.3 // indirect
 	github.com/igm/sockjs-go/v3 v3.0.2 // indirect
-	github.com/imdario/mergo v0.3.12 // indirect
-	github.com/miekg/dns v1.1.53 // indirect
-	github.com/mitchellh/copystructure v1.0.0 // indirect
-	github.com/mitchellh/reflectwalk v1.0.0 // indirect
+	github.com/miekg/dns v1.1.51 // indirect
 	github.com/oklog/ulid/v2 v2.1.0 // indirect
 	github.com/orcaman/concurrent-map v1.0.0 // indirect
-	github.com/shopspring/decimal v1.2.0 // indirect
-	github.com/spf13/cast v1.3.1 // indirect
-	golang.org/x/net v0.9.0 // indirect
+	golang.org/x/net v0.7.0 // indirect
 	google.golang.org/genproto v0.0.0-20220728213248-dd149ef739b9 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

 require (
-	cdr.dev/slog v1.4.2 // indirect
+	cdr.dev/slog v1.4.1 // indirect
 	github.com/alecthomas/chroma v0.10.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
 	github.com/dlclark/regexp2 v1.8.1 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/fatih/color v1.15.0 // indirect
+	github.com/fatih/color v1.14.1 // indirect
 	github.com/go-chi/chi/v5 v5.0.8
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/goccy/go-json v0.9.11 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
@ -82,7 +69,7 @@ require (
 	github.com/lestrrat-go/httpcc v1.0.1 // indirect
 	github.com/lestrrat-go/httprc v1.0.4 // indirect
 	github.com/lestrrat-go/iter v1.0.2 // indirect
-	github.com/lestrrat-go/option v1.0.1 // indirect
+	github.com/lestrrat-go/option v1.0.0 // indirect
 	github.com/lib/pq v1.10.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.17 // indirect
@ -96,13 +83,13 @@ require (
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
-	golang.org/x/crypto v0.7.0 // indirect
-	golang.org/x/mod v0.10.0 // indirect
+	golang.org/x/crypto v0.6.0 // indirect
+	golang.org/x/mod v0.8.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.7.0 // indirect
-	golang.org/x/term v0.7.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
-	golang.org/x/tools v0.8.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
+	golang.org/x/term v0.5.0 // indirect
+	golang.org/x/text v0.7.0 // indirect
+	golang.org/x/tools v0.6.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/go-playground/validator.v9 v9.31.0 // indirect
@ -116,5 +103,3 @@ require (
 	modernc.org/strutil v1.1.3 // indirect
 	modernc.org/token v1.1.0 // indirect
 )
-
-// replace forge.cadoles.com/arcad/edge => ../edge
--- a/go.sum
+++ b/go.sum
@ -1,8 +1,8 @@
 bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8=
 bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512/go.mod h1:FbcW6z/2VytnFDhZfumh8Ss8zxHE6qpMP5sHTRe0EaM=
 cdr.dev/slog v1.4.0/go.mod h1:C5OL99WyuOK8YHZdYY57dAPN1jK2WJlCdq2VP6xeQns=
-cdr.dev/slog v1.4.2 h1:fIfiqASYQFJBZiASwL825atyzeA96NsqSxx2aL61P8I=
-cdr.dev/slog v1.4.2/go.mod h1:0EkH+GkFNxizNR+GAXUEdUHanxUH5t9zqPILmPM/Vn8=
+cdr.dev/slog v1.4.1 h1:Q8+X63m8/WB4geelMTDO8t4CTwVh1f7+5Cxi7kS/SZg=
+cdr.dev/slog v1.4.1/go.mod h1:O76C6gZJxa5HK1SXMrjd48V2kJxYZKFRTcFfn/V9OhA=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
@ -54,8 +54,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-forge.cadoles.com/arcad/edge v0.0.0-20230426135323-17808d14c978 h1:fekSRSb8gYcVx8C0B9K6B7+KiFHVixIwvPUkxcnRFp4=
-forge.cadoles.com/arcad/edge v0.0.0-20230426135323-17808d14c978/go.mod h1:uv3wBa+UbcEUb7IiJCj1T96Xo3cmx1BwNxbBYRZhln8=
+forge.cadoles.com/arcad/edge v0.0.0-20230303153719-6399196fe5c9 h1:dleaaf/rV2GWtGvrPunRakjrKVDfXoANxAy8/1ctMVs=
+forge.cadoles.com/arcad/edge v0.0.0-20230303153719-6399196fe5c9/go.mod h1:pl9EMtSLSVr4wbDgQBDjr4aizwtmwasE686dm5arYPw=
 gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg=
 github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k=
@ -84,12 +84,6 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
 github.com/ClickHouse/clickhouse-go v1.4.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
 github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
 github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0=
-github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
-github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
-github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g=
-github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
-github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA=
-github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
@ -129,11 +123,13 @@ github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38 h1:smF2tmSOzy2Mm
 github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI=
 github.com/alecthomas/assert/v2 v2.0.3 h1:WKqJODfOiQG0nEJKFKzDIG3E29CN2/4zR9XGJzKIkbg=
 github.com/alecthomas/chroma v0.7.0/go.mod h1:1U/PfCsTALWWYHDnsIQkxEBM0+6LLe0v8+RSVMOwxeY=
+github.com/alecthomas/chroma v0.9.1/go.mod h1:eMuEnpA18XbG/WhOWtCzJHS7WqEtDAI+HxdwoW0nVSk=
 github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek=
 github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s=
 github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0=
 github.com/alecthomas/kong v0.1.17-0.20190424132513-439c674f7ae0/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI=
 github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI=
+github.com/alecthomas/kong v0.2.4/go.mod h1:kQOmtJgV+Lb4aj+I2LEn40cbtawdWJ9Y8QLq+lElKxE=
 github.com/alecthomas/kong-hcl v0.1.8-0.20190615233001-b21fea9723c8/go.mod h1:MRgZdU3vrFd05IQ89AxUZ0aYdF39BYoNFa324SodPCA=
 github.com/alecthomas/participle/v2 v2.0.0-beta.5 h1:y6dsSYVb1G5eK6mgmy+BgI3Mw35a3WghArZ/Hbebrjo=
 github.com/alecthomas/participle/v2 v2.0.0-beta.5/go.mod h1:RC764t6n4L8D8ITAJv0qdokritYSNR3wV5cVwmIEaMM=
@ -149,8 +145,6 @@ github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/antonmedv/expr v1.12.7 h1:jfV/l/+dHWAadLwAtESXNxXdfbK9bE4+FNMHYCMntwk=
-github.com/antonmedv/expr v1.12.7/go.mod h1:FPC8iWArxls7axbVLsW+kpg1mz29A1b2M6jt+hZfDkU=
 github.com/apache/arrow/go/arrow v0.0.0-20210818145353-234c94e4ce64/go.mod h1:2qMFB56yOP3KzkB3PbYZ4AlUFg3a88F67TIx5lB/WwY=
 github.com/apache/arrow/go/arrow v0.0.0-20211013220434-5962184e7a30/go.mod h1:Q7yQnSMnLvcXlZ8RV+jwz/6y1rQTqbX6C82SndT52Zs=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
@ -203,8 +197,6 @@ github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnweb
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
-github.com/brutella/dnssd v1.2.6 h1:/0P13JkHLRzeLQkWRPEn4hJCr4T3NfknIFw3aNPIC34=
-github.com/brutella/dnssd v1.2.6/go.mod h1:JoW2sJUrmVIef25G6lrLj7HS6Xdwh6q8WUIvMkkBYXs=
 github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
@ -244,11 +236,8 @@ github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOo
 github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M=
 github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/readline v1.5.0/go.mod h1:x22KAscuvRqlLoK9CsoYsmxoXZMMFVyOl86cAH8qUic=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/chzyer/test v0.0.0-20210722231415-061457976a23/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod h1:MA5e5Lr8slmEg9bt0VpxxWqJlO4iwu3FBdHUzV7wQVg=
 github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLIdUjrmSXlK9pkrsDlLHbO8jiB8X8JnOc=
 github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs=
@ -454,12 +443,12 @@ github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZ
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
 github.com/dop251/goja v0.0.0-20211022113120-dc8c55024d06/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk=
 github.com/dop251/goja v0.0.0-20221118162653-d4bf6fde1b86/go.mod h1:yRkwfj0CBpOGre+TwBsqPV0IH0Pk73e4PXJOeNDboGs=
-github.com/dop251/goja v0.0.0-20230304130813-e2f543bf4b4c h1:/utv6nmTctV6OVgfk5+O6lEMEWL+6KJy4h9NZ5fnkQQ=
-github.com/dop251/goja v0.0.0-20230304130813-e2f543bf4b4c/go.mod h1:QMWlm50DNe14hD7t24KEqZuUdC9sOTy8W6XbCU1mlw4=
+github.com/dop251/goja v0.0.0-20230226152633-7c93113e17ac h1:NGu46Adk2oPN3tinGFItahy4W9l+9uhEf03ZxbwmdVE=
+github.com/dop251/goja v0.0.0-20230226152633-7c93113e17ac/go.mod h1:yRkwfj0CBpOGre+TwBsqPV0IH0Pk73e4PXJOeNDboGs=
 github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y=
 github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d/go.mod h1:DngW8aVqWbuLRMHItjPUyqdj+HWPvnQe8V8y1nDpIbM=
-github.com/dop251/goja_nodejs v0.0.0-20230320130059-dcf93ba651dd h1:8FguYHL/davT0sAfVoi84iRI4MCVTVFtlnmZqIoAXDQ=
-github.com/dop251/goja_nodejs v0.0.0-20230320130059-dcf93ba651dd/go.mod h1:0tlktQL7yHfYEtjcRGi/eiOkbDR5XF7gyFFvbC5//E0=
+github.com/dop251/goja_nodejs v0.0.0-20230226152057-060fa99b809f h1:mmnNidRg3cMfcgyeNtIBSDZgjf/85lA/2pplccwSxYg=
+github.com/dop251/goja_nodejs v0.0.0-20230226152057-060fa99b809f/go.mod h1:0tlktQL7yHfYEtjcRGi/eiOkbDR5XF7gyFFvbC5//E0=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
@ -484,9 +473,9 @@ github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQL
 github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww=
 github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
-github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
+github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
+github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
+github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
@ -587,8 +576,8 @@ github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWe
 github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
 github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
 github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
-github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
-github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk=
+github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/gocql/gocql v0.0.0-20210515062232-b7ef815b4556/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY=
 github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
@ -698,9 +687,7 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20230207041349-798e818bf904/go.mod h1:uglQLonpP8qtYCYyzA+8c/9qtqgA3qsXGYqCPKARAFg=
-github.com/google/pprof v0.0.0-20230309165930-d61513b1440d h1:um9/pc7tKMINFfP1eE7Wv6PRGXlcCSJkVajF7KJw3uQ=
-github.com/google/pprof v0.0.0-20230309165930-d61513b1440d/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk=
+github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@ -771,19 +758,15 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/huandu/xstrings v1.3.3 h1:/Gcsuc1x8JVbJ9/rlye4xZnVAbEkGauT8lbebqcQws4=
-github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
 github.com/igm/sockjs-go/v3 v3.0.2 h1:2m0k53w0DBiGozeQUIEPR6snZFmpFpYvVsGnfLPNXbE=
 github.com/igm/sockjs-go/v3 v3.0.2/go.mod h1:UqchsOjeagIBFHvd+RZpLaVRbCwGilEC08EDHsD1jYE=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
-github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/intel/goresctrl v0.2.0/go.mod h1:+CZdzouYFn5EsxgqAQTEzMfwKwuc0fVdMrT9FCCAVRQ=
@ -917,11 +900,10 @@ github.com/lestrrat-go/httprc v1.0.4 h1:bAZymwoZQb+Oq8MEbyipag7iSq6YIga8Wj6GOiJG
 github.com/lestrrat-go/httprc v1.0.4/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo=
 github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzltI=
 github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4=
-github.com/lestrrat-go/jwx/v2 v2.0.9 h1:TRX4Q630UXxPVLvP5vGaqVJO7S+0PE6msRZUsFSBoC8=
-github.com/lestrrat-go/jwx/v2 v2.0.9/go.mod h1:K68euYaR95FnL0hIQB8VvzL70vB7pSifbJUydCTPmgM=
+github.com/lestrrat-go/jwx/v2 v2.0.8 h1:jCFT8oc0hEDVjgUgsBy1F9cbjsjAVZSXNi7JaU9HR/Q=
+github.com/lestrrat-go/jwx/v2 v2.0.8/go.mod h1:zLxnyv9rTlEvOUHbc48FAfIL8iYu2hHvIRaTFGc8mT0=
+github.com/lestrrat-go/option v1.0.0 h1:WqAWL8kh8VcSoD6xjSH34/1m8yxluXQbDeKNfvFeEO4=
 github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
-github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU=
-github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@ -931,8 +913,6 @@ github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
 github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo=
-github.com/lithammer/shortuuid/v4 v4.0.0 h1:QRbbVkfgNippHOS8PXDkti4NaWeyYfcBTHtw7k08o4c=
-github.com/lithammer/shortuuid/v4 v4.0.0/go.mod h1:Zs8puNcrvf2rV9rTH51ZLLcj7ZXqQI3lv67aw4KiB1Y=
 github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
@ -950,7 +930,7 @@ github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcncea
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E=
@ -962,7 +942,6 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
 github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
@ -982,20 +961,15 @@ github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88J
 github.com/miekg/dns v0.0.0-20161006100029-fc4e1e2843d8/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
-github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
-github.com/miekg/dns v1.1.53 h1:ZBkuHr5dxHtB1caEOlZTLPo7D3L3TWckgUUs/RHfDxw=
-github.com/miekg/dns v1.1.53/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
+github.com/miekg/dns v1.1.51 h1:0+Xg7vObnhrz/4ZCZcZh7zPXlmU0aveS2HDBd0m0qSo=
+github.com/miekg/dns v1.1.51/go.mod h1:2Z9d3CP1LQWihRZUf29mQ19yDThaI4DAYzte2CaQW5c=
 github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
 github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
-github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
-github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
-github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4=
-github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v0.0.0-20180220230111-00c29f56e238/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
@ -1003,8 +977,6 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
-github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
-github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
 github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
 github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
@ -1187,6 +1159,8 @@ github.com/rwtodd/Go.Sed v0.0.0-20210816025313-55464686f9ef/go.mod h1:8AEUvGVi2u
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=
 github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=
+github.com/santhosh-tekuri/jsonschema/v5 v5.1.1 h1:lEOLY2vyGIqKWUI9nzsOJRV3mb3WC9dXYORsLEUcoeY=
+github.com/santhosh-tekuri/jsonschema/v5 v5.1.1/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H/cDPdvJ/SZJQLWWXWGrZ0=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
 github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U=
@ -1198,7 +1172,6 @@ github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
 github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
-github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
@ -1223,8 +1196,6 @@ github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTd
 github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
-github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
@ -1312,8 +1283,8 @@ github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPS
 github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE=
-gitlab.com/wpetit/goweb v0.0.0-20230419082146-a94d9ed7202b h1:nkvOl8TCj/mErADnwFFynjxBtC+hHsrESw6rw56JGmg=
-gitlab.com/wpetit/goweb v0.0.0-20230419082146-a94d9ed7202b/go.mod h1:3sus4zjoUv1GB7eDLL60QaPkUnXJCWBpjvbe0jWifeY=
+gitlab.com/wpetit/goweb v0.0.0-20230227162855-a1f09bafccb3 h1:ddXRTeqEr7LcHQEtkd6gogZOh9tI1Y6Gappr0a1oa2I=
+gitlab.com/wpetit/goweb v0.0.0-20230227162855-a1f09bafccb3/go.mod h1:3sus4zjoUv1GB7eDLL60QaPkUnXJCWBpjvbe0jWifeY=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
@ -1366,7 +1337,6 @@ go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
-go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
@ -1400,9 +1370,9 @@ golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWP
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
-golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
-golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
+golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
+golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@ -1451,9 +1421,9 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
-golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20161013035702-8b4af36cd21a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@ -1518,9 +1488,9 @@ golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220111093109-d55c255bac03/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
@ -1529,10 +1499,8 @@ golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
-golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
+golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/oauth2 v0.0.0-20180227000427-d7d64896b5ff/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@ -1623,6 +1591,7 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@ -1688,17 +1657,14 @@ golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220317061510-51cd9980dadf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
-golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@ -1706,10 +1672,8 @@ golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuX
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
+golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ=
-golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@ -1719,13 +1683,10 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@ -1813,11 +1774,10 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
+golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y=
-golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
--- a/internal/agent/agent.go
+++ b/internal/agent/agent.go
@ -6,8 +6,8 @@ import (

 	"forge.cadoles.com/Cadoles/emissary/internal/agent/metadata"
 	"forge.cadoles.com/Cadoles/emissary/internal/auth/agent"
+	"forge.cadoles.com/Cadoles/emissary/internal/client"
 	"forge.cadoles.com/Cadoles/emissary/internal/jwk"
-	"forge.cadoles.com/Cadoles/emissary/pkg/client"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/api"
 	"gitlab.com/wpetit/goweb/logger"
@ -30,6 +30,7 @@ func (a *Agent) Run(ctx context.Context) error {
 	ticker := time.NewTicker(a.interval)
 	defer ticker.Stop()

+	logger.Info(ctx, "generating token")
 	token, err := agent.GenerateToken(a.privateKey, a.thumbprint)
 	if err != nil {
 		return errors.WithStack(err)
@ -39,30 +40,28 @@ func (a *Agent) Run(ctx context.Context) error {

 	ctx = withClient(ctx, client)

-	tick := func() {
-		logger.Debug(ctx, "registering agent")
-
-		if err := a.registerAgent(ctx, client, state); err != nil {
-			logger.Error(ctx, "could not register agent", logger.E(errors.WithStack(err)))
-		}
-
-		logger.Debug(ctx, "state before reconciliation", logger.F("state", state))
-
-		if err := a.Reconcile(ctx, state); err != nil {
-			logger.Error(ctx, "could not reconcile node with state", logger.E(errors.WithStack(err)))
-
-			return
-		}
-
-		logger.Debug(ctx, "state after reconciliation", logger.F("state", state))
-	}
-
-	tick()
-
 	for {
 		select {
 		case <-ticker.C:
-			tick()
+
+			logger.Debug(ctx, "registering agent")
+
+			if err := a.registerAgent(ctx, client, state); err != nil {
+				logger.Error(ctx, "could not register agent", logger.E(errors.WithStack(err)))
+
+				continue
+			}
+
+			logger.Debug(ctx, "state before reconciliation", logger.F("state", state))
+
+			if err := a.Reconcile(ctx, state); err != nil {
+				logger.Error(ctx, "could not reconcile node with state", logger.E(errors.WithStack(err)))
+
+				continue
+			}
+
+			logger.Debug(ctx, "state after reconciliation", logger.F("state", state))
+
 		case <-ctx.Done():
 			return errors.WithStack(ctx.Err())
 		}
@ -79,7 +78,7 @@ func (a *Agent) Reconcile(ctx context.Context, state *State) error {
 		)

 		if err := ctrl.Reconcile(ctrlCtx, state); err != nil {
-			logger.Error(ctx, "could not reconcile", logger.E(errors.WithStack(err)))
+			return errors.WithStack(err)
 		}
 	}

--- a/internal/agent/context.go
+++ b/internal/agent/context.go
@ -3,7 +3,7 @@ package agent
 import (
 	"context"

-	"forge.cadoles.com/Cadoles/emissary/pkg/client"
+	"forge.cadoles.com/Cadoles/emissary/internal/client"
 	"github.com/pkg/errors"
 )

--- a/internal/agent/controller/app/app_handler.go
+++ b/internal/agent/controller/app/app_handler.go
@ -1,290 +0,0 @@
-package app
-
-import (
-	"bytes"
-	"context"
-	"net"
-	"path/filepath"
-	"text/template"
-
-	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/app/spec"
-	"forge.cadoles.com/Cadoles/emissary/internal/jwk"
-	"forge.cadoles.com/arcad/edge/pkg/app"
-	"forge.cadoles.com/arcad/edge/pkg/bus"
-	"forge.cadoles.com/arcad/edge/pkg/bus/memory"
-	edgeHTTP "forge.cadoles.com/arcad/edge/pkg/http"
-	"forge.cadoles.com/arcad/edge/pkg/module"
-	appModule "forge.cadoles.com/arcad/edge/pkg/module/app"
-	"forge.cadoles.com/arcad/edge/pkg/module/blob"
-	"forge.cadoles.com/arcad/edge/pkg/module/cast"
-	fetchModule "forge.cadoles.com/arcad/edge/pkg/module/fetch"
-	netModule "forge.cadoles.com/arcad/edge/pkg/module/net"
-	shareModule "forge.cadoles.com/arcad/edge/pkg/module/share"
-	shareSqlite "forge.cadoles.com/arcad/edge/pkg/module/share/sqlite"
-	"forge.cadoles.com/arcad/edge/pkg/storage"
-	"forge.cadoles.com/arcad/edge/pkg/storage/sqlite"
-	"github.com/Masterminds/sprig/v3"
-	"github.com/go-chi/chi/v5"
-	"github.com/lestrrat-go/jwx/v2/jwa"
-	"github.com/pkg/errors"
-	"gitlab.com/wpetit/goweb/logger"
-)
-
-type Dependencies struct {
-	Bus             bus.Bus
-	DocumentStore   storage.DocumentStore
-	BlobStore       storage.BlobStore
-	KeySet          jwk.Set
-	AppRepository   appModule.Repository
-	AppID           app.ID
-	ShareRepository shareModule.Repository
-}
-
-const defaultSQLiteParams = "?_pragma=foreign_keys(1)&_pragma=busy_timeout=60000"
-
-func (c *Controller) getHandlerOptions(ctx context.Context, appKey string, specs *spec.Spec) ([]edgeHTTP.HandlerOptionFunc, error) {
-	dataDir, err := c.ensureAppDataDir(ctx, appKey)
-	if err != nil {
-		return nil, errors.Wrap(err, "could not retrieve app data dir")
-	}
-
-	dbFile := filepath.Join(dataDir, appKey+".sqlite")
-	db, err := sqlite.Open(dbFile + defaultSQLiteParams)
-	if err != nil {
-		return nil, errors.Wrapf(err, "could not open database file '%s'", dbFile)
-	}
-
-	shareDBFile := filepath.Join(dataDir, "shared.sqlite")
-	shareDB, err := sqlite.Open(shareDBFile + defaultSQLiteParams)
-	if err != nil {
-		return nil, errors.Wrapf(err, "could not open database file '%s'", shareDBFile)
-	}
-
-	keySet, err := getAuthKeySet(specs.Config)
-	if err != nil {
-		return nil, errors.Wrap(err, "could not retrieve auth key set")
-	}
-
-	mounts := make([]func(r chi.Router), 0)
-
-	authMount, err := getAuthMount(specs.Config.Auth, keySet)
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-
-	if authMount != nil {
-		mounts = append(mounts, authMount)
-	}
-
-	mounts = append(mounts, appModule.Mount(c.appRepository))
-
-	deps := Dependencies{
-		Bus:             memory.NewBus(),
-		DocumentStore:   sqlite.NewDocumentStoreWithDB(db),
-		BlobStore:       sqlite.NewBlobStoreWithDB(db),
-		KeySet:          keySet,
-		AppRepository:   c.appRepository,
-		AppID:           app.ID(appKey),
-		ShareRepository: shareSqlite.NewRepositoryWithDB(shareDB),
-	}
-
-	modules := c.getAppModules(deps)
-
-	options := []edgeHTTP.HandlerOptionFunc{
-		edgeHTTP.WithBus(deps.Bus),
-		edgeHTTP.WithServerModules(modules...),
-		edgeHTTP.WithHTTPMounts(mounts...),
-	}
-
-	return options, nil
-}
-
-func getAuthKeySet(config *spec.Config) (jwk.Set, error) {
-	keySet := jwk.NewSet()
-	if config == nil {
-		return nil, nil
-	}
-
-	auth := config.Auth
-
-	if auth == nil {
-		return nil, nil
-	}
-
-	switch {
-	case auth.Local != nil:
-		var (
-			key jwk.Key
-			err error
-		)
-
-		switch typedKey := auth.Local.Key.(type) {
-		case string:
-			key, err = jwk.FromRaw([]byte(typedKey))
-			if err != nil {
-				return nil, errors.Wrap(err, "could not parse local auth key")
-			}
-
-			if err := key.Set(jwk.AlgorithmKey, jwa.HS256); err != nil {
-				return nil, errors.WithStack(err)
-			}
-
-		default:
-			return nil, errors.Errorf("unexpected key type '%T'", auth.Local.Key)
-		}
-
-		if err := keySet.AddKey(key); err != nil {
-			return nil, errors.WithStack(err)
-		}
-	}
-
-	return keySet, nil
-}
-
-func createResolveAppURL(specs *spec.Spec) (ResolveAppURLFunc, error) {
-	rawIfaceMappings := make(map[string]string, 0)
-	if specs.Config != nil && specs.Config.AppURLResolving != nil && specs.Config.AppURLResolving.IfaceMappings != nil {
-		rawIfaceMappings = specs.Config.AppURLResolving.IfaceMappings
-	}
-
-	ifaceMappings := make(map[string]*template.Template, len(rawIfaceMappings))
-	for iface, rawTemplate := range rawIfaceMappings {
-		tmpl, err := template.New("").Funcs(sprig.TxtFuncMap()).Parse(rawTemplate)
-		if err != nil {
-			return nil, errors.Wrapf(err, "could not parse iface '%s' template", iface)
-		}
-
-		ifaceMappings[iface] = tmpl
-	}
-
-	defaultRawTemplate := `http://{{ .DeviceIP }}:{{ .AppPort }}`
-	if specs.Config != nil && specs.Config.AppURLResolving != nil && specs.Config.AppURLResolving.DefaultURLTemplate != "" {
-		defaultRawTemplate = specs.Config.AppURLResolving.DefaultURLTemplate
-	}
-
-	defaultTemplate, err := template.New("").Funcs(sprig.TxtFuncMap()).Parse(defaultRawTemplate)
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-
-	return func(ctx context.Context, manifest *app.Manifest, from string) (string, error) {
-		var (
-			urlTemplate *template.Template
-			deviceIP    net.IP
-		)
-
-		fromIP := net.ParseIP(from)
-
-		if fromIP != nil {
-		LOOP:
-			for ifaceName, ifaceTmpl := range ifaceMappings {
-				iface, err := net.InterfaceByName(ifaceName)
-				if err != nil {
-					logger.Error(
-						ctx, "could not find interface",
-						logger.E(errors.WithStack(err)), logger.F("iface", ifaceName),
-					)
-
-					continue
-				}
-
-				addresses, err := iface.Addrs()
-				if err != nil {
-					logger.Error(
-						ctx, "could not list interface addresses",
-						logger.E(errors.WithStack(err)),
-						logger.F("iface", iface.Name),
-					)
-
-					continue
-				}
-
-				for _, addr := range addresses {
-					ifaIP, network, err := net.ParseCIDR(addr.String())
-					if err != nil {
-						logger.Error(
-							ctx, "could not parse interface ip",
-							logger.E(errors.WithStack(err)),
-							logger.F("iface", iface.Name),
-						)
-
-						continue
-					}
-
-					if !network.Contains(fromIP) {
-						continue
-					}
-
-					deviceIP = ifaIP
-					urlTemplate = ifaceTmpl
-
-					break LOOP
-				}
-			}
-		}
-
-		if urlTemplate == nil {
-			urlTemplate = defaultTemplate
-		}
-
-		if deviceIP == nil {
-			deviceIP = net.ParseIP("127.0.0.1")
-		}
-
-		var appEntry *spec.AppEntry
-		for appID, entry := range specs.Apps {
-			if manifest.ID != app.ID(appID) {
-				continue
-			}
-
-			appEntry = &entry
-			break
-		}
-
-		if appEntry == nil {
-			return "", errors.Errorf("could not find app '%s' in specs", manifest.ID)
-		}
-
-		_, port, err := net.SplitHostPort(appEntry.Address)
-		if err != nil {
-			return "", errors.WithStack(err)
-		}
-
-		data := struct {
-			Manifest *app.Manifest
-			Specs    *spec.Spec
-			DeviceIP string
-			AppPort  string
-		}{
-			Manifest: manifest,
-			Specs:    specs,
-			DeviceIP: deviceIP.String(),
-			AppPort:  port,
-		}
-
-		var buf bytes.Buffer
-
-		if err := urlTemplate.Execute(&buf, data); err != nil {
-			return "", errors.WithStack(err)
-		}
-
-		return buf.String(), nil
-	}, nil
-}
-
-func (c *Controller) getAppModules(deps Dependencies) []app.ServerModuleFactory {
-	return []app.ServerModuleFactory{
-		module.ContextModuleFactory(),
-		module.ConsoleModuleFactory(),
-		cast.CastModuleFactory(),
-		module.LifecycleModuleFactory(),
-		netModule.ModuleFactory(deps.Bus),
-		module.RPCModuleFactory(deps.Bus),
-		module.StoreModuleFactory(deps.DocumentStore),
-		blob.ModuleFactory(deps.Bus, deps.BlobStore),
-		authModuleFactory(deps.KeySet),
-		appModule.ModuleFactory(deps.AppRepository),
-		fetchModule.ModuleFactory(deps.Bus),
-		shareModule.ModuleFactory(deps.AppID, deps.ShareRepository),
-	}
-}
--- a/internal/agent/controller/app/app_handler_test.go
+++ b/internal/agent/controller/app/app_handler_test.go
@ -1,73 +0,0 @@
-package app
-
-import (
-	"context"
-	"testing"
-
-	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/app/spec"
-	"forge.cadoles.com/arcad/edge/pkg/app"
-	"github.com/pkg/errors"
-)
-
-func TestCreateResolveAppURL(t *testing.T) {
-	specs := &spec.Spec{
-		Apps: map[string]spec.AppEntry{
-			"app.arcad.test": {
-				Address: ":8080",
-			},
-			"app.arcad.foo": {
-				Address: ":8081",
-			},
-			"app.arcad.bar": {
-				Address: ":8082",
-			},
-		},
-		Config: &spec.Config{
-			AppURLResolving: &spec.AppURLResolving{
-				IfaceMappings: map[string]string{
-					"lo":              "http://{{ .DeviceIP }}:{{ .AppPort }}",
-					"does-not-exists": "http://{{ .DeviceIP }}:{{ .AppPort }}",
-				},
-				DefaultURLTemplate: `http://{{ last ( splitList "." ( toString .Manifest.ID ) ) }}.arcad.local`,
-			},
-		},
-	}
-
-	resolveAppURL, err := createResolveAppURL(specs)
-	if err != nil {
-		t.Fatalf("%+v", errors.WithStack(err))
-	}
-
-	manifest := &app.Manifest{
-		ID: "app.arcad.test",
-	}
-
-	ctx := context.Background()
-
-	url, err := resolveAppURL(ctx, manifest, "127.0.0.2")
-	if err != nil {
-		t.Fatalf("%+v", errors.WithStack(err))
-	}
-
-	if e, g := "http://127.0.0.1:8080", url; e != g {
-		t.Errorf("url: expected '%s', got '%s", e, g)
-	}
-
-	url, err = resolveAppURL(ctx, manifest, "")
-	if err != nil {
-		t.Fatalf("%+v", errors.WithStack(err))
-	}
-
-	if e, g := "http://test.arcad.local", url; e != g {
-		t.Errorf("url: expected '%s', got '%s", e, g)
-	}
-
-	url, err = resolveAppURL(ctx, manifest, "192.168.0.100")
-	if err != nil {
-		t.Fatalf("%+v", errors.WithStack(err))
-	}
-
-	if e, g := "http://test.arcad.local", url; e != g {
-		t.Errorf("url: expected '%s', got '%s", e, g)
-	}
-}
--- a/internal/agent/controller/app/app_repository.go
+++ b/internal/agent/controller/app/app_repository.go
@ -1,137 +0,0 @@
-package app
-
-import (
-	"context"
-	"sort"
-	"sync"
-
-	"forge.cadoles.com/arcad/edge/pkg/app"
-	"forge.cadoles.com/arcad/edge/pkg/bundle"
-	appModule "forge.cadoles.com/arcad/edge/pkg/module/app"
-	"github.com/pkg/errors"
-	"gitlab.com/wpetit/goweb/logger"
-)
-
-type ResolveAppURLFunc func(context.Context, *app.Manifest, string) (string, error)
-
-type AppRepository struct {
-	resolveAppURL ResolveAppURLFunc
-	bundles       []string
-	mutex         sync.RWMutex
-}
-
-// Get implements app.Repository
-func (r *AppRepository) Get(ctx context.Context, id app.ID) (*app.Manifest, error) {
-	r.mutex.RLock()
-	defer r.mutex.RUnlock()
-
-	manifest, err := r.findManifest(ctx, id)
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-
-	return manifest, nil
-}
-
-// GetURL implements app.Repository
-func (r *AppRepository) GetURL(ctx context.Context, id app.ID, from string) (string, error) {
-	r.mutex.RLock()
-	defer r.mutex.RUnlock()
-
-	manifest, err := r.findManifest(ctx, id)
-	if err != nil {
-		return "", errors.WithStack(err)
-	}
-
-	url, err := r.resolveAppURL(ctx, manifest, from)
-	if err != nil {
-		return "", errors.WithStack(err)
-	}
-
-	return url, nil
-}
-
-// List implements app.Repository
-func (r *AppRepository) List(ctx context.Context) ([]*app.Manifest, error) {
-	r.mutex.RLock()
-	defer r.mutex.RUnlock()
-
-	manifests := make([]*app.Manifest, 0)
-
-	for _, path := range r.bundles {
-		bundleCtx := logger.With(ctx, logger.F("path", path))
-
-		bundle, err := bundle.FromPath(path)
-		if err != nil {
-			logger.Error(bundleCtx, "could not load bundle", logger.E(errors.WithStack(err)))
-
-			continue
-		}
-
-		manifest, err := app.LoadManifest(bundle)
-		if err != nil {
-			logger.Error(bundleCtx, "could not load manifest", logger.E(errors.WithStack(err)))
-
-			continue
-		}
-
-		manifests = append(manifests, manifest)
-	}
-
-	sort.Sort(ByID(manifests))
-
-	return manifests, nil
-}
-
-func (r *AppRepository) Update(resolveAppURL ResolveAppURLFunc, bundles []string) {
-	r.mutex.Lock()
-	defer r.mutex.Unlock()
-
-	r.resolveAppURL = resolveAppURL
-	r.bundles = bundles
-}
-
-func (r *AppRepository) findManifest(ctx context.Context, id app.ID) (*app.Manifest, error) {
-	for _, path := range r.bundles {
-		bundleCtx := logger.With(ctx, logger.F("path", path))
-
-		bundle, err := bundle.FromPath(path)
-		if err != nil {
-			logger.Error(bundleCtx, "could not load bundle", logger.E(errors.WithStack(err)))
-
-			continue
-		}
-
-		manifest, err := app.LoadManifest(bundle)
-		if err != nil {
-			logger.Error(bundleCtx, "could not load manifest", logger.E(errors.WithStack(err)))
-
-			continue
-		}
-
-		if manifest.ID != id {
-			continue
-		}
-
-		return manifest, nil
-	}
-
-	return nil, errors.WithStack(appModule.ErrNotFound)
-}
-
-func NewAppRepository() *AppRepository {
-	return &AppRepository{
-		resolveAppURL: func(ctx context.Context, m *app.Manifest, from string) (string, error) {
-			return "", errors.New("unavailable")
-		},
-		bundles: []string{},
-	}
-}
-
-var _ appModule.Repository = &AppRepository{}
-
-type ByID []*app.Manifest
-
-func (a ByID) Len() int           { return len(a) }
-func (a ByID) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a ByID) Less(i, j int) bool { return a[i].ID > a[j].ID }
--- a/internal/agent/controller/app/auth_module.go
+++ b/internal/agent/controller/app/auth_module.go
@ -1,93 +0,0 @@
-package app
-
-import (
-	"time"
-
-	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/app/spec"
-	"forge.cadoles.com/Cadoles/emissary/internal/jwk"
-	"forge.cadoles.com/arcad/edge/pkg/app"
-	"forge.cadoles.com/arcad/edge/pkg/module"
-	"forge.cadoles.com/arcad/edge/pkg/module/auth"
-	authModule "forge.cadoles.com/arcad/edge/pkg/module/auth"
-	authHTTP "forge.cadoles.com/arcad/edge/pkg/module/auth/http"
-	"github.com/dop251/goja"
-	"github.com/lestrrat-go/jwx/v2/jwa"
-	"github.com/pkg/errors"
-)
-
-const (
-	RoleVisitor    string = "visitor"
-	RoleUser       string = "user"
-	RoleSuperuser  string = "superuser"
-	RoleAdmin      string = "admin"
-	RoleSuperadmin string = "superadmin"
-)
-
-func authModuleFactory(keySet jwk.Set) app.ServerModuleFactory {
-	return module.Extends(
-		authModule.ModuleFactory(
-			authModule.WithJWT(func() (jwk.Set, error) {
-				return keySet, nil
-			}),
-		),
-		func(o *goja.Object) {
-			if err := o.Set("ROLE_VISITOR", RoleVisitor); err != nil {
-				panic(errors.New("could not set 'ROLE_VISITOR' property"))
-			}
-
-			if err := o.Set("ROLE_USER", RoleUser); err != nil {
-				panic(errors.New("could not set 'ROLE_USER' property"))
-			}
-
-			if err := o.Set("ROLE_SUPERUSER", RoleSuperuser); err != nil {
-				panic(errors.New("could not set 'ROLE_SUPERUSER' property"))
-			}
-
-			if err := o.Set("ROLE_ADMIN", RoleAdmin); err != nil {
-				panic(errors.New("could not set 'ROLE_ADMIN' property"))
-			}
-
-			if err := o.Set("ROLE_SUPERADMIN", RoleSuperadmin); err != nil {
-				panic(errors.New("could not set 'ROLE_SUPERADMIN' property"))
-			}
-		},
-	)
-}
-
-func getAuthMount(auth *spec.Auth, keySet jwk.Set) (auth.MountFunc, error) {
-	switch {
-	case auth.Local != nil:
-		var rawKey any = auth.Local.Key
-		if strKey, ok := rawKey.(string); ok {
-			rawKey = []byte(strKey)
-		}
-
-		key, err := jwk.FromRaw(rawKey)
-		if err != nil {
-			return nil, errors.WithStack(err)
-		}
-
-		cookieDuration := defaultCookieDuration
-		if auth.Local.CookieDuration != "" {
-			cookieDuration, err = time.ParseDuration(auth.Local.CookieDuration)
-			if err != nil {
-				return nil, errors.WithStack(err)
-			}
-		}
-
-		return authModule.Mount(
-			authHTTP.NewLocalHandler(
-				jwa.HS256, key,
-				authHTTP.WithRoutePrefix("/auth"),
-				authHTTP.WithAccounts(auth.Local.Accounts...),
-				authHTTP.WithCookieOptions(getCookieDomain, cookieDuration),
-			),
-			authModule.WithJWT(func() (jwk.Set, error) {
-				return keySet, nil
-			}),
-		), nil
-
-	default:
-		return nil, nil
-	}
-}
--- a/internal/agent/controller/app/controller.go
+++ b/internal/agent/controller/app/controller.go
@ -8,25 +8,19 @@ import (
 	"path/filepath"

 	"forge.cadoles.com/Cadoles/emissary/internal/agent"
-	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/app/spec"
-	"forge.cadoles.com/arcad/edge/pkg/app"
+	"forge.cadoles.com/Cadoles/emissary/internal/spec/app"
 	"forge.cadoles.com/arcad/edge/pkg/bundle"
-	"github.com/mitchellh/hashstructure/v2"
+	"forge.cadoles.com/arcad/edge/pkg/storage/sqlite"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/logger"
 )

-type serverEntry struct {
-	AppDefHash uint64
-	Server     *Server
-}
-
 type Controller struct {
-	client        *http.Client
-	downloadDir   string
-	dataDir       string
-	servers       map[string]*serverEntry
-	appRepository *AppRepository
+	currentSpecRevision int
+	client              *http.Client
+	downloadDir         string
+	dataDir             string
+	servers             map[string]*Server
 }

 // Name implements node.Controller.
@ -36,13 +30,13 @@ func (c *Controller) Name() string {

 // Reconcile implements node.Controller.
 func (c *Controller) Reconcile(ctx context.Context, state *agent.State) error {
-	appSpec := spec.NewSpec()
+	appSpec := app.NewSpec()

-	if err := state.GetSpec(spec.Name, appSpec); err != nil {
+	if err := state.GetSpec(app.NameApp, appSpec); err != nil {
 		if errors.Is(err, agent.ErrSpecNotFound) {
-			logger.Info(ctx, "could not find app spec")
+			logger.Info(ctx, "could not find app spec, stopping all remaining apps")

-			c.stopAllApps(ctx, appSpec)
+			c.stopAllApps(ctx)

 			return nil
 		}
@ -52,20 +46,22 @@ func (c *Controller) Reconcile(ctx context.Context, state *agent.State) error {

 	logger.Info(ctx, "retrieved spec", logger.F("spec", appSpec.SpecName()), logger.F("revision", appSpec.SpecRevision()))

+	if c.currentSpecRevision == appSpec.SpecRevision() {
+		logger.Info(ctx, "spec revision did not change, doing nothing")
+
+		return nil
+	}
+
 	c.updateApps(ctx, appSpec)

 	return nil
 }

-func (c *Controller) stopAllApps(ctx context.Context, spec *spec.Spec) {
-	if len(c.servers) > 0 {
-		logger.Info(ctx, "stopping all apps")
-	}
-
-	for appID, entry := range c.servers {
+func (c *Controller) stopAllApps(ctx context.Context) {
+	for appID, server := range c.servers {
 		logger.Info(ctx, "stopping app", logger.F("appID", appID))

-		if err := entry.Server.Stop(); err != nil {
+		if err := server.Stop(); err != nil {
 			logger.Error(
 				ctx, "error while stopping app",
 				logger.F("appID", appID),
@ -77,169 +73,108 @@ func (c *Controller) stopAllApps(ctx context.Context, spec *spec.Spec) {
 	}
 }

-func (c *Controller) updateApps(ctx context.Context, specs *spec.Spec) {
+func (c *Controller) updateApps(ctx context.Context, spec *app.Spec) {
+	hadError := false
+
 	// Stop and remove obsolete apps
-	for appKey, server := range c.servers {
-		if _, exists := specs.Apps[appKey]; exists {
+	for appID, server := range c.servers {
+		if _, exists := spec.Apps[appID]; exists {
 			continue
 		}

-		logger.Info(ctx, "stopping app", logger.F("appKey", appKey))
+		logger.Info(ctx, "stopping app", logger.F("appID", appID))

-		if err := server.Server.Stop(); err != nil {
+		if err := server.Stop(); err != nil {
 			logger.Error(
 				ctx, "error while stopping app",
-				logger.F("appKey", appKey),
+				logger.F("gatewayID", appID),
 				logger.E(errors.WithStack(err)),
 			)

-			delete(c.servers, appKey)
+			delete(c.servers, appID)
+
+			hadError = true
 		}
 	}

-	if err := c.updateAppRepository(ctx, specs); err != nil {
-		logger.Error(
-			ctx, "could not update app repository",
-			logger.E(errors.WithStack(err)),
-		)
+	// (Re)start apps
+	for appID, appSpec := range spec.Apps {
+		appCtx := logger.With(ctx, logger.F("appID", appID))

-		return
-	}
-
-	// (Re)start apps if necessary
-	for appKey := range specs.Apps {
-		appCtx := logger.With(ctx, logger.F("appKey", appKey))
-
-		if err := c.updateApp(ctx, specs, appKey); err != nil {
+		if err := c.updateApp(ctx, appID, appSpec); err != nil {
 			logger.Error(appCtx, "could not update app", logger.E(errors.WithStack(err)))
+
+			hadError = true
+
 			continue
 		}
 	}
+
+	if !hadError {
+		c.currentSpecRevision = spec.SpecRevision()
+		logger.Info(ctx, "updating current spec revision", logger.F("revision", c.currentSpecRevision))
+	}
 }

-func (c *Controller) updateAppRepository(ctx context.Context, specs *spec.Spec) error {
-	bundles := make([]string, 0, len(specs.Apps))
-	for appKey, app := range specs.Apps {
-		path := c.getAppBundlePath(appKey, app.Format)
-		bundles = append(bundles, path)
-	}
-
-	resolveAppURL, err := createResolveAppURL(specs)
-	if err != nil {
-		return errors.WithStack(err)
-	}
-
-	c.appRepository.Update(resolveAppURL, bundles)
-
-	return nil
-}
-
-func (c *Controller) updateApp(ctx context.Context, specs *spec.Spec, appKey string) (err error) {
-	appEntry := specs.Apps[appKey]
-
-	appDef := struct {
-		App    spec.AppEntry
-		Config *spec.Config
-	}{
-		App:    appEntry,
-		Config: specs.Config,
-	}
-
-	newAppDefHash, err := hashstructure.Hash(appDef, hashstructure.FormatV2, nil)
-	if err != nil {
-		return errors.WithStack(err)
-	}
-
-	bundle, sha256sum, err := c.ensureAppBundle(ctx, appKey, appEntry)
+func (c *Controller) updateApp(ctx context.Context, appID string, appSpec app.AppEntry) error {
+	bundle, sha256sum, err := c.ensureAppBundle(ctx, appID, appSpec)
 	if err != nil {
 		return errors.Wrap(err, "could not download app bundle")
 	}

-	server, exists := c.servers[appKey]
+	dataDir, err := c.ensureAppDataDir(ctx, appID)
+	if err != nil {
+		return errors.Wrap(err, "could not retrieve app data dir")
+	}
+
+	server, exists := c.servers[appID]
 	if !exists {
 		logger.Info(ctx, "app currently not running")
-	} else if sha256sum != appEntry.SHA256Sum {
+	} else if sha256sum != appSpec.SHA256Sum {
 		logger.Info(
 			ctx, "bundle hash mismatch, stopping app",
 			logger.F("currentHash", sha256sum),
-			logger.F("specHash", appEntry.SHA256Sum),
+			logger.F("specHash", appSpec.SHA256Sum),
 		)

-		if err := server.Server.Stop(); err != nil {
+		if err := server.Stop(); err != nil {
 			return errors.Wrap(err, "could not stop app")
 		}

 		server = nil
 	}

-	newServerEntry := func() (*serverEntry, error) {
-		options, err := c.getHandlerOptions(ctx, appKey, specs)
-		if err != nil {
-			return nil, errors.Wrap(err, "could not create handler options")
-		}
-
-		server = &serverEntry{
-			Server:     NewServer(bundle, specs.Config, options...),
-			AppDefHash: 0,
-		}
-
-		return server, nil
-	}
-
 	if server == nil {
-		serverEntry, err := newServerEntry()
+		dbFile := filepath.Join(dataDir, appID+".sqlite")
+		db, err := sqlite.Open(dbFile)
 		if err != nil {
-			return errors.WithStack(err)
+			return errors.Wrapf(err, "could not opend database file '%s'", dbFile)
 		}

-		c.servers[appKey] = serverEntry
+		server = NewServer(bundle, db)
+		c.servers[appID] = server
 	}

-	defChanged := newAppDefHash != server.AppDefHash
-	if server.Server.Running() && !defChanged {
-		return nil
-	}
+	logger.Info(
+		ctx, "starting app",
+		logger.F("address", appSpec.Address),
+	)

-	if defChanged && server.AppDefHash != 0 {
-		logger.Info(
-			ctx, "restarting app",
-			logger.F("address", appEntry.Address),
-		)
-
-		if err := server.Server.Stop(); err != nil {
-			return errors.WithStack(err)
-		}
-
-		serverEntry, err := newServerEntry()
-		if err != nil {
-			return errors.WithStack(err)
-		}
-
-		c.servers[appKey] = serverEntry
-	} else {
-		logger.Info(
-			ctx, "starting app",
-			logger.F("address", appEntry.Address),
-		)
-	}
-
-	if err := server.Server.Start(ctx, appEntry.Address); err != nil {
-		delete(c.servers, appKey)
+	if err := server.Start(ctx, appSpec.Address); err != nil {
+		delete(c.servers, appID)

 		return errors.Wrap(err, "could not start app")
 	}

-	server.AppDefHash = newAppDefHash
-
 	return nil
 }

-func (c *Controller) ensureAppBundle(ctx context.Context, appID string, spec spec.AppEntry) (bundle.Bundle, string, error) {
+func (c *Controller) ensureAppBundle(ctx context.Context, appID string, spec app.AppEntry) (bundle.Bundle, string, error) {
 	if err := os.MkdirAll(c.downloadDir, os.ModePerm); err != nil {
 		return nil, "", errors.WithStack(err)
 	}

-	bundlePath := c.getAppBundlePath(appID, spec.Format)
+	bundlePath := filepath.Join(c.downloadDir, appID+"."+spec.Format)

 	_, err := os.Stat(bundlePath)
 	if err != nil && !errors.Is(err, os.ErrNotExist) {
@ -277,21 +212,7 @@ func (c *Controller) ensureAppBundle(ctx context.Context, appID string, spec spe
 		return nil, "", errors.WithStack(err)
 	}

-	manifest, err := app.LoadManifest(bdle)
-	if err != nil {
-		return nil, "", errors.WithStack(err)
-	}
-
-	valid, err := validateManifest(manifest)
-	if err != nil {
-		return nil, "", errors.WithStack(err)
-	}
-
-	if !valid {
-		return nil, "", errors.New("bundle's manifest is invalid")
-	}
-
-	return bdle, spec.SHA256Sum, nil
+	return bdle, "", nil
 }

 func (c *Controller) downloadFile(url string, sha256sum string, dest string) error {
@ -347,10 +268,6 @@ func (c *Controller) ensureAppDataDir(ctx context.Context, appID string) (string
 	return dataDir, nil
 }

-func (c *Controller) getAppBundlePath(appKey string, format string) string {
-	return filepath.Join(c.downloadDir, appKey+"."+format)
-}
-
 func NewController(funcs ...OptionFunc) *Controller {
 	opts := defaultOptions()
 	for _, fn := range funcs {
@ -358,11 +275,11 @@ func NewController(funcs ...OptionFunc) *Controller {
 	}

 	return &Controller{
-		client:        opts.Client,
-		downloadDir:   opts.DownloadDir,
-		dataDir:       opts.DataDir,
-		servers:       make(map[string]*serverEntry),
-		appRepository: NewAppRepository(),
+		client:              opts.Client,
+		downloadDir:         opts.DownloadDir,
+		dataDir:             opts.DataDir,
+		currentSpecRevision: -1,
+		servers:             make(map[string]*Server),
 	}
 }

--- a/internal/agent/controller/app/manifest.go
+++ b/internal/agent/controller/app/manifest.go
@ -1,19 +0,0 @@
-package app
-
-import (
-	"forge.cadoles.com/arcad/edge/pkg/app"
-	"forge.cadoles.com/arcad/edge/pkg/app/metadata"
-	"github.com/pkg/errors"
-)
-
-func validateManifest(manifest *app.Manifest) (bool, error) {
-	valid, err := manifest.Validate(
-		metadata.WithMinimumRoleValidator(RoleVisitor, RoleUser, RoleSuperuser, RoleAdmin, RoleSuperadmin),
-		metadata.WithNamedPathsValidator(metadata.NamedPathAdmin, metadata.NamedPathIcon),
-	)
-	if err != nil {
-		return false, errors.WithStack(err)
-	}
-
-	return valid, nil
-}
--- a/internal/agent/controller/app/server.go
+++ b/internal/agent/controller/app/server.go
@ -2,66 +2,54 @@ package app

 import (
 	"context"
-	"net"
+	"database/sql"
 	"net/http"
-	"strings"
-	"sync"
-	"time"

-	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/app/spec"
-	appSpec "forge.cadoles.com/Cadoles/emissary/internal/agent/controller/app/spec"
-	"forge.cadoles.com/Cadoles/emissary/internal/proxy/wildcard"
+	"forge.cadoles.com/arcad/edge/pkg/app"
+	"forge.cadoles.com/arcad/edge/pkg/bus"
+	"forge.cadoles.com/arcad/edge/pkg/bus/memory"
 	edgeHTTP "forge.cadoles.com/arcad/edge/pkg/http"
-	"gitlab.com/wpetit/goweb/logger"
+	"forge.cadoles.com/arcad/edge/pkg/module"
+	"forge.cadoles.com/arcad/edge/pkg/module/cast"
+	"forge.cadoles.com/arcad/edge/pkg/module/net"
+	"forge.cadoles.com/arcad/edge/pkg/storage"
+	"forge.cadoles.com/arcad/edge/pkg/storage/sqlite"

 	"forge.cadoles.com/arcad/edge/pkg/bundle"
 	"github.com/go-chi/chi/middleware"
 	"github.com/go-chi/chi/v5"
 	"github.com/pkg/errors"
-
-	_ "forge.cadoles.com/Cadoles/emissary/internal/imports/passwd"
 )

-const defaultCookieDuration time.Duration = 24 * time.Hour
-
 type Server struct {
-	bundle         bundle.Bundle
-	handlerOptions []edgeHTTP.HandlerOptionFunc
-	server         *http.Server
-	serverMutex    sync.RWMutex
-	config         *appSpec.Config
+	bundle bundle.Bundle
+	db     *sql.DB
+	server *http.Server
 }

-func (s *Server) Start(ctx context.Context, addr string) (err error) {
-	if s.Running() {
+func (s *Server) Start(ctx context.Context, addr string) error {
+	if s.server != nil {
 		if err := s.Stop(); err != nil {
 			return errors.WithStack(err)
 		}
 	}

-	s.serverMutex.Lock()
-	defer s.serverMutex.Unlock()
-
 	router := chi.NewRouter()

-	router.Use(middleware.RealIP)
 	router.Use(middleware.Logger)
-	router.Use(middleware.Compress(5))

-	handler := edgeHTTP.NewHandler(s.handlerOptions...)
+	bus := memory.NewBus()
+	ds := sqlite.NewDocumentStoreWithDB(s.db)
+	bs := sqlite.NewBlobStoreWithDB(s.db)
+
+	handler := edgeHTTP.NewHandler(
+		edgeHTTP.WithBus(bus),
+		edgeHTTP.WithServerModules(s.getAppModules(bus, ds, bs)...),
+	)
 	if err := handler.Load(s.bundle); err != nil {
 		return errors.Wrap(err, "could not load app bundle")
 	}

-	if s.config != nil {
-		if s.config.UnexpectedHostRedirect != nil {
-			router.Use(unexpectedHostRedirect(
-				s.config.UnexpectedHostRedirect.HostTarget,
-				s.config.UnexpectedHostRedirect.AcceptedHostPatterns...,
-			))
-		}
-	}
-
 	router.Handle("/*", handler)

 	server := &http.Server{
@ -70,18 +58,6 @@ func (s *Server) Start(ctx context.Context, addr string) (err error) {
 	}

 	go func() {
-		defer func() {
-			if recovered := recover(); recovered != nil {
-				if err, ok := recovered.(error); ok {
-					logger.Error(ctx, err.Error(), logger.E(errors.WithStack(err)))
-
-					return
-				}
-
-				panic(recovered)
-			}
-		}()
-
 		defer func() {
 			if err := s.Stop(); err != nil {
 				panic(errors.WithStack(err))
@ -98,92 +74,52 @@ func (s *Server) Start(ctx context.Context, addr string) (err error) {
 	return nil
 }

-func (s *Server) Running() bool {
-	s.serverMutex.RLock()
-	defer s.serverMutex.RUnlock()
-
-	return s.server != nil
-}
-
 func (s *Server) Stop() error {
-	if !s.Running() {
-		return nil
-	}
-
-	s.serverMutex.Lock()
-	defer s.serverMutex.Unlock()
-
 	if s.server == nil {
 		return nil
 	}

-	if err := s.server.Close(); err != nil {
+	defer func() {
 		s.server = nil
+	}()

-		return errors.WithStack(err)
+	if err := s.server.Close(); err != nil {
+		panic(errors.WithStack(err))
 	}

-	s.server = nil
-
 	return nil
 }

-func NewServer(bundle bundle.Bundle, config *spec.Config, handlerOptions ...edgeHTTP.HandlerOptionFunc) *Server {
+func (s *Server) getAppModules(bus bus.Bus, ds storage.DocumentStore, bs storage.BlobStore) []app.ServerModuleFactory {
+	return []app.ServerModuleFactory{
+		module.ContextModuleFactory(),
+		module.ConsoleModuleFactory(),
+		cast.CastModuleFactory(),
+		module.LifecycleModuleFactory(),
+		net.ModuleFactory(bus),
+		module.RPCModuleFactory(bus),
+		module.StoreModuleFactory(ds),
+		module.BlobModuleFactory(bus, bs),
+		// module.Extends(
+		// 	auth.ModuleFactory(
+		// 		auth.WithJWT(dummyKeyFunc),
+		// 	),
+		// 	func(o *goja.Object) {
+		// 		if err := o.Set("CLAIM_ROLE", "role"); err != nil {
+		// 			panic(errors.New("could not set 'CLAIM_ROLE' property"))
+		// 		}
+
+		// 		if err := o.Set("CLAIM_PREFERRED_USERNAME", "preferred_username"); err != nil {
+		// 			panic(errors.New("could not set 'CLAIM_PREFERRED_USERNAME' property"))
+		// 		}
+		// 	},
+		// ),
+	}
+}
+
+func NewServer(bundle bundle.Bundle, db *sql.DB) *Server {
 	return &Server{
-		bundle:         bundle,
-		config:         config,
-		handlerOptions: handlerOptions,
-	}
-}
-
-func getCookieDomain(r *http.Request) (string, error) {
-	host, _, err := net.SplitHostPort(r.Host)
-	if err != nil {
-		host = r.Host
-	}
-
-	// If host is an IP address
-	if ip := net.ParseIP(host); ip != nil {
-		return "", nil
-	}
-
-	// If host is an domain, return top level domain
-	domainParts := strings.Split(host, ".")
-	if len(domainParts) >= 2 {
-		topLevelDomain := strings.Join(domainParts[len(domainParts)-2:], ".")
-		return topLevelDomain, nil
-	}
-
-	// By default, return host
-	return host, nil
-}
-
-func unexpectedHostRedirect(hostTarget string, acceptedHostPatterns ...string) func(http.Handler) http.Handler {
-	return func(h http.Handler) http.Handler {
-		fn := func(w http.ResponseWriter, r *http.Request) {
-			host, port, err := net.SplitHostPort(r.Host)
-			if err != nil {
-				host = r.Host
-			}
-
-			matched := wildcard.MatchAny(host, acceptedHostPatterns...)
-
-			if !matched {
-				url := r.URL
-
-				url.Host = hostTarget
-				if port != "" {
-					url.Host += ":" + port
-				}
-
-				http.Redirect(w, r, url.String(), http.StatusTemporaryRedirect)
-
-				return
-			}
-
-			h.ServeHTTP(w, r)
-		}
-
-		return http.HandlerFunc(fn)
+		bundle: bundle,
+		db:     db,
 	}
 }
--- a/internal/agent/controller/app/spec/schema.json
+++ b/internal/agent/controller/app/spec/schema.json
@ -1,135 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://app.edge.emissary.cadoles.com/spec.json",
-    "title": "AppSpec",
-    "description": "Emissary 'App' specification",
-    "type": "object",
-    "properties": {
-        "apps": {
-            "type": "object",
-            "patternProperties": {
-                ".*": {
-                    "type": "object",
-                    "properties": {
-                        "url": {
-                            "type": "string"
-                        },
-                        "sha256sum": {
-                            "type": "string"
-                        },
-                        "address": {
-                            "type": "string"
-                        },
-                        "format": {
-                            "type": "string",
-                            "enum": [
-                                "zip",
-                                "tar.gz"
-                            ]
-                        }
-                    },
-                    "required": [
-                        "url",
-                        "sha256sum",
-                        "address",
-                        "format"
-                    ],
-                    "additionalProperties": false
-                }
-            }
-        },
-        "config": {
-            "type": "object",
-            "properties": {
-                "appUrlResolving": {
-                    "type": "object",
-                    "properties": {
-                        "ifaceMappings": {
-                            "type": "object",
-                            "patternProperties": {
-                                ".*": {
-                                    "type": "string"
-                                }
-                            }
-                        },
-                        "defaultUrlTemplate": {
-                            "type": "string"
-                        }
-                    },
-                    "required": ["defaultUrlTemplate"],
-                    "additionalProperties": false
-                },
-                "unexpectedHostRedirect": {
-                    "type": "object",
-                    "properties": {
-                        "acceptedHostPatterns": {
-                            "type": "array",
-                            "items": {
-                                "type": "string"
-                            }
-                        },
-                        "hostTarget": {
-                            "type": "string"
-                        }
-                    },
-                    "required": ["acceptedHostPatterns", "hostTarget"],
-                    "additionalProperties": false
-                },
-                "auth": {
-                    "type": "object",
-                    "properties": {
-                        "local": {
-                            "type": "object",
-                            "properties": {
-                                "key": {
-                                    "type": ["object", "string"]
-                                },
-                                "accounts": {
-                                    "type": "array",
-                                    "items": {
-                                        "type": "object",
-                                        "properties": {
-                                            "username": {
-                                                "type": "string"
-                                            },
-                                            "password": {
-                                                "type": "string"
-                                            },
-                                            "algo": {
-                                                "type": "string"
-                                            },
-                                            "claims": {
-                                                "type": "object"
-                                            }
-                                        },
-                                        "required": [
-                                            "username",
-                                            "password",
-                                            "algo"
-                                        ]
-                                    }
-                                },
-                                "cookieDomain": {
-                                    "type": "string"
-                                },
-                                "cookieDuration": {
-                                    "type": "string"
-                                }
-                            },
-                            "required": [
-                                "key"
-                            ],
-                            "additionalProperties": false
-                        }
-                    },
-                    "additionalProperties": false
-                }
-            },
-            "additionalProperties": false
-        }
-    },
-    "required": [
-        "apps"
-    ],
-    "additionalProperties": false
-}
--- a/internal/agent/controller/app/spec/spec.go
+++ b/internal/agent/controller/app/spec/spec.go
@ -1,71 +0,0 @@
-package spec
-
-import (
-	"forge.cadoles.com/Cadoles/emissary/internal/spec"
-	edgeAuth "forge.cadoles.com/arcad/edge/pkg/module/auth/http"
-)
-
-const Name spec.Name = "app.emissary.cadoles.com"
-
-type Spec struct {
-	Revision int                 `json:"revision"`
-	Apps     map[string]AppEntry `json:"apps"`
-	Config   *Config             `json:"config"`
-}
-
-type AppEntry struct {
-	URL       string `json:"url"`
-	SHA256Sum string `json:"sha256sum"`
-	Address   string `json:"address"`
-	Format    string `json:"format"`
-}
-
-type Auth struct {
-	Local *LocalAuth `json:"local,omitempty"`
-}
-
-type LocalAuth struct {
-	Key            any                     `json:"key"`
-	Accounts       []edgeAuth.LocalAccount `json:"accounts"`
-	CookieDomain   string                  `json:"cookieDomain"`
-	CookieDuration string                  `json:"cookieDuration"`
-}
-
-type Config struct {
-	Auth                   *Auth                   `json:"auth"`
-	UnexpectedHostRedirect *UnexpectedHostRedirect `json:"unexpectedHostRedirect"`
-	AppURLResolving        *AppURLResolving        `json:"appUrlResolving"`
-}
-
-type UnexpectedHostRedirect struct {
-	AcceptedHostPatterns []string `json:"acceptedHostPatterns"`
-	HostTarget           string   `json:"hostTarget"`
-}
-
-type AppURLResolving struct {
-	IfaceMappings      map[string]string `json:"ifaceMappings"`
-	DefaultURLTemplate string            `json:"defaultUrlTemplate"`
-}
-
-func (s *Spec) SpecName() spec.Name {
-	return Name
-}
-
-func (s *Spec) SpecRevision() int {
-	return s.Revision
-}
-
-func (s *Spec) SpecData() map[string]any {
-	return map[string]any{
-		"apps":   s.Apps,
-		"config": s.Config,
-	}
-}
-
-func NewSpec() *Spec {
-	return &Spec{
-		Revision: -1,
-	}
-}
-
-var _ spec.Spec = &Spec{}
--- a/internal/agent/controller/app/spec/testdata/spec-ok.json
+++ b/internal/agent/controller/app/spec/testdata/spec-ok.json
@ -1,54 +0,0 @@
-{
-  "name": "app.emissary.cadoles.com",
-  "data": {
-    "apps": {
-      "edge.sdk.client.test": {
-        "url": "http://example.com/edge.sdk.client.test_0.0.0.zip",
-        "sha256sum": "58019192dacdae17755707719707db007e26dac856102280583fbd18427dd352",
-        "address": ":8081",
-        "format": "zip"
-      }
-    },
-    "config": {
-      "auth": {
-        "local": {
-          "key": {
-            "d": "YOre0WZefGfUGFvDg42oL5Oad5Zsb1N_hqPyLVM5ajpTZzcHpB3wT6In9tFO_VshB6lxVtPA9ckPkpMTFY7ygt1Yomc1HkoOKRtmIaqdr4VgNQifU-4yiLiJkSbdYSeMV-KkkN8mGR1keJpJeS34W1X0W6CkU2nw7F5VueBCJfWJA0funRfuWdI68MTUgT9kRZFp-SfvptvRL6jVYHV_5hqxzHCvgEdBSF6QKwx4M6P6QBMt7ft6uMLmFx9abKFw2V51hX3PkxiSepVB3w5CYg4HtS3AHX6bILL4m0R2pdTIkap7i3tkH_xAOuKWt8D6JhadI8X1rEAwXmCS5KrRgQ",
-            "dp": "U0HfvBC6hk-SCpuotGIv3vbHCVt1aF3SHK0y32EYCOe8e_9G6YCEILfcvEJ5fiOCc2kvx6TasHQu4qj1uWRKenZlK1sJ6KDybGCkZL1D3jYnbeLZYBuWBL__YbZiST3ewbxzj_EDMWiZ8sUltahza_1weSgg8auSzTHS2LJBHIE",
-            "dq": "hVom4ScDxgqhCsQNVpZlN7M3v0tgWjl_gTOHjOyzKCHQJeC0QmJJaMKkQZPWJ8jjLqy7VwVpqC2nZU7QDuX1Cq5eJDQcXi9XtaAfIBico9WcYDre6mDyhL588YHpekyRke8HnZ810iesr0G3gU1h0QvZVVuW-pXTJOXhZTt6nFc",
-            "e": "AQAB",
-            "kty": "RSA",
-            "n": "vPnpkE3-HfNgJSru_K40LstkjiG2Bq_Tt-m0d_yUBBSbirFxF3qH4EXi7WrtZdeDahg2iV2BvpbVVj9GlmGo9OLol6jc7AP2yvZrkbABiiJhCbuPdkYbNpx6B7Itl8RT_bUSYAMZhmux5lpsn4weQ01fzjICi1rA-bIJpOfotdOjP4_lol-LxGZOGJQv9kndP8bgmssJb3Y_2s4gPtkmXySLrhpr5So-_6dVksyuBD9aLcnsMLDbywusjEMCdhqzQbvOjryomnmEXwyz_Ewb5HFK2PfgFtoHkdjqDz-mrEs3tw5g4TdYhCftzJxgbyNAEq4aEiOQrAncYyrXlotP_w",
-            "p": "8TNMF0WUe7CEeNVUTsuEcBAAXRguNtpvVifIjlwzFRGOYVGIpKuHsqQPKlZL07I9gPr9LifQnyQus3oEmTOrVs6LB9sfbukbg43ZRKoGVM40JYF5Xjs7R3mEZhgU0WaYOVe3iLtBGMfXNWFwlbfQP-zEb-dPCBX1jWT3LdgNBcE",
-            "q": "yJJLNc9w6O4y2icME8k99FugV9E7ObwUxF3v5JN3y1cmAT0h2njyE3iAGqaDZwcY1_jGCisjwoqX6i5E8xqhxX3Gcy3J7SmUAf8fhY8wU3zv9DK7skg2IdvanDb8Y1OM6GchbYZAOVPEg2IvVio8zI-Ih3DDwDk8Df0ufzoHRb8",
-            "qi": "zOE-4R3cjPesm3MX-4PdwmsaF9QZLUVRUvvHJ08pKs6kAXP18hzjctAoOjhQDxlTYqNYNePfKzKwost3OJoPgRIc9w9qwUCK1gNOS4Z_xozCIaXgMddNFhkoAfZ4JaKjNCiinzjGfqG99Lf-yzmmREuuhRv7SdS3ST4VQjiJQew"
-          },
-          "accounts": [
-            {
-              "username": "foo",
-              "algo": "plain",
-              "password": "bar",
-              "claims": {
-                "arcad_role": "user",
-                "arcad_tenant": "dev.cli",
-                "preferred_username": "Foo",
-                "sub": "foo"
-              }
-            }
-          ]
-        }
-      },
-      "unexpectedHostRedirect": {
-        "acceptedHostPatterns": ["arcad.local", "*.arcad.local", "arcad-*.local", "*.*.*.*"],
-        "hostTarget": "arcad.local"
-      },
-      "appUrlResolving": {
-        "ifaceMappings": {
-          "eth0": "http://{{ .DeviceIP }}:{{ .AppHost }}"
-        },
-        "defaultUrlTemplate": "http://{{ last ( splitList \".\" ( toString .Manifest.ID ) ) }}.arcad.local"
-      }
-    }
-  },
-  "revision": 0
-}
--- a/internal/agent/controller/app/spec/validator_test.go
+++ b/internal/agent/controller/app/spec/validator_test.go
@ -1,65 +0,0 @@
-package spec
-
-import (
-	"context"
-	"encoding/json"
-	"io/ioutil"
-	"testing"
-
-	"forge.cadoles.com/Cadoles/emissary/internal/spec"
-	"github.com/pkg/errors"
-)
-
-type validatorTestCase struct {
-	Name       string
-	Source     string
-	ShouldFail bool
-}
-
-var validatorTestCases = []validatorTestCase{
-	{
-		Name:       "SpecOK",
-		Source:     "testdata/spec-ok.json",
-		ShouldFail: false,
-	},
-}
-
-func TestValidator(t *testing.T) {
-	t.Parallel()
-
-	validator := spec.NewValidator()
-	if err := validator.Register(Name, schema); err != nil {
-		t.Fatalf("+%v", errors.WithStack(err))
-	}
-
-	for _, tc := range validatorTestCases {
-		func(tc validatorTestCase) {
-			t.Run(tc.Name, func(t *testing.T) {
-				t.Parallel()
-
-				rawSpec, err := ioutil.ReadFile(tc.Source)
-				if err != nil {
-					t.Fatalf("+%v", errors.WithStack(err))
-				}
-
-				var spec spec.RawSpec
-
-				if err := json.Unmarshal(rawSpec, &spec); err != nil {
-					t.Fatalf("+%v", errors.WithStack(err))
-				}
-
-				ctx := context.Background()
-
-				err = validator.Validate(ctx, &spec)
-
-				if !tc.ShouldFail && err != nil {
-					t.Errorf("+%v", errors.WithStack(err))
-				}
-
-				if tc.ShouldFail && err == nil {
-					t.Error("validation should have failed")
-				}
-			})
-		}(tc)
-	}
-}
--- a/internal/agent/controller/gateway/controller.go
+++ b/internal/agent/controller/gateway/controller.go
@ -0,0 +1,124 @@
+package gateway
+
+import (
+	"context"
+
+	"forge.cadoles.com/Cadoles/emissary/internal/agent"
+	"forge.cadoles.com/Cadoles/emissary/internal/spec/gateway"
+	"github.com/pkg/errors"
+	"gitlab.com/wpetit/goweb/logger"
+)
+
+type Controller struct {
+	proxies             map[gateway.ID]*ReverseProxy
+	currentSpecRevision int
+}
+
+// Name implements node.Controller.
+func (c *Controller) Name() string {
+	return "gateway-controller"
+}
+
+// Reconcile implements node.Controller.
+func (c *Controller) Reconcile(ctx context.Context, state *agent.State) error {
+	gatewaySpec := gateway.NewSpec()
+
+	if err := state.GetSpec(gateway.NameGateway, gatewaySpec); err != nil {
+		if errors.Is(err, agent.ErrSpecNotFound) {
+			logger.Info(ctx, "could not find gateway spec, stopping all remaining proxies")
+
+			c.stopAllProxies(ctx)
+
+			return nil
+		}
+
+		return errors.WithStack(err)
+	}
+
+	logger.Info(ctx, "retrieved spec", logger.F("spec", gatewaySpec.SpecName()), logger.F("revision", gatewaySpec.SpecRevision()))
+
+	if c.currentSpecRevision == gatewaySpec.SpecRevision() {
+		logger.Info(ctx, "spec revision did not change, doing nothing")
+
+		return nil
+	}
+
+	c.updateProxies(ctx, gatewaySpec)
+
+	c.currentSpecRevision = gatewaySpec.SpecRevision()
+	logger.Info(ctx, "updating current spec revision", logger.F("revision", c.currentSpecRevision))
+
+	return nil
+}
+
+func (c *Controller) stopAllProxies(ctx context.Context) {
+	for gatewayID, proxy := range c.proxies {
+		logger.Info(ctx, "stopping proxy", logger.F("gatewayID", gatewayID))
+
+		if err := proxy.Stop(); err != nil {
+			logger.Error(
+				ctx, "error while stopping proxy",
+				logger.F("gatewayID", gatewayID),
+				logger.E(errors.WithStack(err)),
+			)
+
+			delete(c.proxies, gatewayID)
+		}
+	}
+}
+
+func (c *Controller) updateProxies(ctx context.Context, spec *gateway.Spec) {
+	// Stop and remove obsolete gateways
+	for gatewayID, proxy := range c.proxies {
+		if _, exists := spec.Gateways[gatewayID]; exists {
+			continue
+		}
+
+		logger.Info(ctx, "stopping proxy", logger.F("gatewayID", gatewayID))
+
+		if err := proxy.Stop(); err != nil {
+			logger.Error(
+				ctx, "error while stopping proxy",
+				logger.F("gatewayID", gatewayID),
+				logger.E(errors.WithStack(err)),
+			)
+
+			delete(c.proxies, gatewayID)
+		}
+	}
+
+	// (Re)start gateways
+	for gatewayID, gatewaySpec := range spec.Gateways {
+		proxy, exists := c.proxies[gatewayID]
+		if !exists {
+			proxy = NewReverseProxy()
+			c.proxies[gatewayID] = proxy
+		}
+
+		logger.Info(
+			ctx, "starting proxy",
+			logger.F("gatewayID", gatewayID),
+			logger.F("addr", gatewaySpec.Address),
+			logger.F("target", gatewaySpec.Target),
+		)
+
+		if err := proxy.Start(ctx, gatewaySpec.Address, gatewaySpec.Target); err != nil {
+			logger.Error(
+				ctx, "error while starting proxy",
+				logger.F("gatewayID", gatewayID),
+				logger.E(errors.WithStack(err)),
+			)
+
+			delete(c.proxies, gatewayID)
+		}
+	}
+}
+
+func NewController() *Controller {
+	return &Controller{
+		proxies:             make(map[gateway.ID]*ReverseProxy),
+		currentSpecRevision: -1,
+	}
+}
+
+var _ agent.Controller = &Controller{}
--- a/internal/agent/controller/gateway/reverse_proxy.go
+++ b/internal/agent/controller/gateway/reverse_proxy.go
@ -1,22 +1,28 @@
-package proxy
+package gateway

 import (
 	"context"
 	"net/http"
-	"sync"
+	"net/http/httputil"
+	"net/url"

-	"forge.cadoles.com/Cadoles/emissary/internal/proxy"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/logger"
 )

 type ReverseProxy struct {
 	addr   string
+	target string
 	server *http.Server
-	mutex  sync.RWMutex
 }

-func (p *ReverseProxy) Start(ctx context.Context, addr string, funcs ...proxy.OptionFunc) error {
+func (p *ReverseProxy) Start(ctx context.Context, addr, target string) error {
+	alreadyRunning := p.server != nil && target == p.target && addr == p.target
+
+	if alreadyRunning {
+		return nil
+	}
+
 	if p.server != nil {
 		if err := p.Stop(); err != nil {
 			return errors.WithStack(err)
@ -27,40 +33,33 @@ func (p *ReverseProxy) Start(ctx context.Context, addr string, funcs ...proxy.Op
 		Addr: addr,
 	}

-	proxy := proxy.New(funcs...)
+	url, err := url.Parse(target)
+	if err != nil {
+		return errors.WithStack(err)
+	}
+
+	proxy := httputil.NewSingleHostReverseProxy(url)
+
 	server.Handler = proxy

-	p.mutex.Lock()
 	p.server = server
 	p.addr = addr
-	p.mutex.Unlock()
+	p.target = target

 	go func() {
-		defer func() {
-			if err := p.Stop(); err != nil {
-				logger.Error(ctx, "error while stopping gateway", logger.E(errors.WithStack(err)))
-			}
-		}()
-
 		if err := server.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
 			logger.Error(ctx, "error while listening", logger.E(errors.WithStack(err)))
 		}
+
+		if err := p.Stop(); err != nil {
+			logger.Error(ctx, "error while stopping gateway", logger.E(errors.WithStack(err)))
+		}
 	}()

 	return nil
 }

-func (p *ReverseProxy) Running() bool {
-	p.mutex.RLock()
-	defer p.mutex.RUnlock()
-
-	return p.server != nil
-}
-
 func (p *ReverseProxy) Stop() error {
-	p.mutex.Lock()
-	defer p.mutex.Unlock()
-
 	if p.server == nil {
 		return nil
 	}
--- a/internal/agent/controller/mdns/controller.go
+++ b/internal/agent/controller/mdns/controller.go
@ -1,181 +0,0 @@
-package mdns
-
-import (
-	"context"
-	"net"
-	"sync"
-
-	"forge.cadoles.com/Cadoles/emissary/internal/agent"
-	mdns "forge.cadoles.com/Cadoles/emissary/internal/agent/controller/mdns/spec"
-	"github.com/brutella/dnssd"
-	"github.com/mitchellh/hashstructure/v2"
-	"github.com/pkg/errors"
-	"gitlab.com/wpetit/goweb/logger"
-)
-
-const (
-	DefaultDomain = "local"
-)
-
-type Controller struct {
-	serviceDefHash uint64
-	cancel         context.CancelFunc
-	responder      dnssd.Responder
-	mutex          sync.RWMutex
-}
-
-// Name implements node.Controller.
-func (c *Controller) Name() string {
-	return "mdns-controller"
-}
-
-// Reconcile implements node.Controller.
-func (c *Controller) Reconcile(ctx context.Context, state *agent.State) error {
-	mdnsSpec := mdns.NewSpec()
-
-	if err := state.GetSpec(mdns.Name, mdnsSpec); err != nil {
-		if errors.Is(err, agent.ErrSpecNotFound) {
-			logger.Info(ctx, "could not find mdns spec")
-
-			c.stopResponder(ctx)
-
-			return nil
-		}
-
-		return errors.WithStack(err)
-	}
-
-	logger.Info(ctx, "retrieved spec", logger.F("spec", mdnsSpec.SpecName()), logger.F("revision", mdnsSpec.SpecRevision()))
-
-	if err := c.updateResponder(ctx, mdnsSpec); err != nil {
-		return errors.Wrap(err, "could not update responder")
-	}
-
-	return nil
-}
-
-func (c *Controller) stopResponder(ctx context.Context) {
-	c.mutex.Lock()
-	defer c.mutex.Unlock()
-
-	if c.responder == nil {
-		return
-	}
-
-	c.cancel()
-	c.responder = nil
-	c.cancel = nil
-}
-
-func (c *Controller) updateResponder(ctx context.Context, spec *mdns.Spec) error {
-	serviceDef := struct {
-		Services map[string]mdns.Service
-	}{
-		Services: spec.Services,
-	}
-
-	newServerDefHash, err := hashstructure.Hash(serviceDef, hashstructure.FormatV2, nil)
-	if err != nil {
-		return errors.WithStack(err)
-	}
-
-	c.mutex.RLock()
-	if newServerDefHash == c.serviceDefHash && c.responder != nil {
-		c.mutex.RUnlock()
-		return nil
-	}
-	c.mutex.RUnlock()
-
-	c.stopResponder(ctx)
-
-	defaultIfaces, err := c.getDefaultIfaces()
-	if err != nil {
-		return errors.WithStack(err)
-	}
-
-	services := make([]dnssd.Service, 0, len(spec.Services))
-
-	for name, service := range spec.Services {
-		domain := service.Domain
-		if domain == "" {
-			domain = DefaultDomain
-		}
-
-		ifaces := service.Ifaces
-		if len(ifaces) == 0 {
-			ifaces = defaultIfaces
-		}
-
-		config := dnssd.Config{
-			Name:   name,
-			Type:   service.Type,
-			Domain: domain,
-			Host:   service.Host,
-			Ifaces: ifaces,
-			Port:   service.Port,
-		}
-
-		service, err := dnssd.NewService(config)
-		if err != nil {
-			logger.Error(ctx, "could not create mdns service", logger.E(errors.WithStack(err)))
-
-			continue
-		}
-
-		services = append(services, service)
-	}
-
-	responder, err := dnssd.NewResponder()
-	if err != nil {
-		return errors.WithStack(err)
-	}
-
-	for _, service := range services {
-		if _, err := responder.Add(service); err != nil {
-			logger.Error(ctx, "could not add mdns service", logger.E(errors.WithStack(err)))
-
-			continue
-		}
-	}
-
-	ctx, cancel := context.WithCancel(context.Background())
-
-	c.responder = responder
-	c.cancel = cancel
-	c.serviceDefHash = newServerDefHash
-
-	go func() {
-		defer c.stopResponder(ctx)
-
-		if err := responder.Respond(ctx); err != nil && !errors.Is(err, context.Canceled) {
-			logger.Error(ctx, "could not respond to mdns queries", logger.E(errors.WithStack(err)))
-		}
-	}()
-
-	return nil
-}
-
-func (c *Controller) getDefaultIfaces() ([]string, error) {
-	ifaces, err := net.Interfaces()
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-
-	ifaceNames := make([]string, len(ifaces))
-
-	for idx, ifa := range ifaces {
-		ifaceNames[idx] = ifa.Name
-	}
-
-	return ifaceNames, nil
-}
-
-func NewController() *Controller {
-	return &Controller{
-		cancel:         nil,
-		responder:      nil,
-		serviceDefHash: 0,
-	}
-}
-
-var _ agent.Controller = &Controller{}
--- a/internal/agent/controller/mdns/spec/init.go
+++ b/internal/agent/controller/mdns/spec/init.go
@ -1,17 +0,0 @@
-package spec
-
-import (
-	_ "embed"
-
-	"forge.cadoles.com/Cadoles/emissary/internal/spec"
-	"github.com/pkg/errors"
-)
-
-//go:embed schema.json
-var schema []byte
-
-func init() {
-	if err := spec.Register(Name, schema); err != nil {
-		panic(errors.WithStack(err))
-	}
-}
--- a/internal/agent/controller/mdns/spec/schema.json
+++ b/internal/agent/controller/mdns/spec/schema.json
@ -1,47 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://mdns.edge.emissary.cadoles.com/spec.json",
-    "title": "MDNSSpec",
-    "description": "Emissary 'MDNS' specification",
-    "type": "object",
-    "properties": {
-        "services": {
-            "type": "object",
-            "patternProperties": {
-                ".*": {
-                    "type": "object",
-                    "properties": {
-                        "type": {
-                            "type": "string"
-                        },
-                        "domain": {
-                            "type": "string"
-                        },
-                        "host": {
-                            "type": "string"
-                        },
-                        "ifaces": {
-                            "type": "array",
-                            "items": {
-                                "type": "string"
-                            }
-                        },
-                        "port": {
-                            "type": "number"
-                        }
-                    },
-                    "required": [
-                        "type",
-                        "host",
-                        "port"
-                    ],
-                    "additionalProperties": false
-                }
-            }
-        }
-    },
-    "required": [
-        "services"
-    ],
-    "additionalProperties": false
-}
--- a/internal/agent/controller/mdns/spec/spec.go
+++ b/internal/agent/controller/mdns/spec/spec.go
@ -1,42 +0,0 @@
-package spec
-
-import (
-	"forge.cadoles.com/Cadoles/emissary/internal/spec"
-)
-
-const Name spec.Name = "mdns.emissary.cadoles.com"
-
-type Spec struct {
-	Revision int                `json:"revision"`
-	Services map[string]Service `json:"services"`
-}
-
-type Service struct {
-	Type   string   `json:"type"`
-	Domain string   `json:"domain"`
-	Host   string   `json:"host"`
-	Ifaces []string `json:"ifaces"`
-	Port   int      `json:"port"`
-}
-
-func (s *Spec) SpecName() spec.Name {
-	return Name
-}
-
-func (s *Spec) SpecRevision() int {
-	return s.Revision
-}
-
-func (s *Spec) SpecData() map[string]any {
-	return map[string]any{
-		"services": s.Services,
-	}
-}
-
-func NewSpec() *Spec {
-	return &Spec{
-		Revision: -1,
-	}
-}
-
-var _ spec.Spec = &Spec{}
--- a/internal/agent/controller/mdns/spec/testdata/spec-ok.json
+++ b/internal/agent/controller/mdns/spec/testdata/spec-ok.json
@ -1,15 +0,0 @@
-{
-  "name": "mdns.emissary.cadoles.com",
-  "data": {
-    "services": {
-      "My Website": {
-        "type": "_http._tcp",
-        "domain": "local",
-        "host": "mywebsite",
-        "ifaces": ["lo", "eth0"],
-        "port": 80
-      }
-    }
-  },
-  "revision": 0
-}
--- a/internal/agent/controller/openwrt/hash.go
+++ b/internal/agent/controller/openwrt/hash.go
@ -1,31 +0,0 @@
-package openwrt
-
-import (
-	"crypto/sha256"
-	"encoding/hex"
-	"io"
-	"os"
-
-	"github.com/pkg/errors"
-)
-
-func hash(path string) (string, error) {
-	file, err := os.Open(path)
-	if err != nil {
-		return "", errors.WithStack(err)
-	}
-
-	hasher := sha256.New()
-
-	defer func() {
-		if err := file.Close(); err != nil {
-			panic(errors.WithStack(err))
-		}
-	}()
-
-	if _, err := io.Copy(hasher, file); err != nil {
-		return "", errors.WithStack(err)
-	}
-
-	return hex.EncodeToString(hasher.Sum(nil)), nil
-}
--- a/internal/agent/controller/openwrt/spec/sysupgrade/schema.json
+++ b/internal/agent/controller/openwrt/spec/sysupgrade/schema.json
@ -1,20 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://sysupgrade.openwrt.emissary.cadoles.com/spec.json",
-    "title": "SysUpgradeSpec",
-    "description": "Emissary 'SysUpgrade' specification",
-    "type": "object",
-    "properties": {
-        "url": {
-            "type": "string"
-        },
-        "sha256sum": {
-            "type": "string"
-        },
-        "version": {
-            "type": "string"
-        }
-    },
-    "required": ["url", "sha256sum", "version"],
-    "additionalProperties": false
-}
--- a/internal/agent/controller/openwrt/spec/sysupgrade/testdata/spec-ok.json
+++ b/internal/agent/controller/openwrt/spec/sysupgrade/testdata/spec-ok.json
@ -1,9 +0,0 @@
-{
-  "name": "sysupgrade.openwrt.emissary.cadoles.com",
-  "data": {
-    "url": "http://example.com/firmware.img",
-    "sha256sum": "58019192dacdae17755707719707db007e26dac856102280583fbd18427dd352",
-    "version": "0.0.0"
-  },
-  "revision": 0
-}
--- a/internal/agent/controller/openwrt/spec/sysupgrade/validator_test.go
+++ b/internal/agent/controller/openwrt/spec/sysupgrade/validator_test.go
@ -1,65 +0,0 @@
-package sysupgrade
-
-import (
-	"context"
-	"encoding/json"
-	"io/ioutil"
-	"testing"
-
-	"forge.cadoles.com/Cadoles/emissary/internal/spec"
-	"github.com/pkg/errors"
-)
-
-type validatorTestCase struct {
-	Name       string
-	Source     string
-	ShouldFail bool
-}
-
-var validatorTestCases = []validatorTestCase{
-	{
-		Name:       "SpecOK",
-		Source:     "testdata/spec-ok.json",
-		ShouldFail: false,
-	},
-}
-
-func TestValidator(t *testing.T) {
-	t.Parallel()
-
-	validator := spec.NewValidator()
-	if err := validator.Register(Name, schema); err != nil {
-		t.Fatalf("+%v", errors.WithStack(err))
-	}
-
-	for _, tc := range validatorTestCases {
-		func(tc validatorTestCase) {
-			t.Run(tc.Name, func(t *testing.T) {
-				t.Parallel()
-
-				rawSpec, err := ioutil.ReadFile(tc.Source)
-				if err != nil {
-					t.Fatalf("+%v", errors.WithStack(err))
-				}
-
-				var spec spec.RawSpec
-
-				if err := json.Unmarshal(rawSpec, &spec); err != nil {
-					t.Fatalf("+%v", errors.WithStack(err))
-				}
-
-				ctx := context.Background()
-
-				err = validator.Validate(ctx, &spec)
-
-				if !tc.ShouldFail && err != nil {
-					t.Errorf("+%v", errors.WithStack(err))
-				}
-
-				if tc.ShouldFail && err == nil {
-					t.Error("validation should have failed")
-				}
-			})
-		}(tc)
-	}
-}
--- a/internal/agent/controller/openwrt/sysupgrade_controller.go
+++ b/internal/agent/controller/openwrt/sysupgrade_controller.go
@ -1,177 +0,0 @@
-package openwrt
-
-import (
-	"context"
-	"io"
-	"net/http"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-
-	"forge.cadoles.com/Cadoles/emissary/internal/agent"
-	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/openwrt/spec/sysupgrade"
-	"github.com/pkg/errors"
-	"gitlab.com/wpetit/goweb/logger"
-)
-
-type SysUpgradeController struct {
-	client          *http.Client
-	command         string
-	args            []string
-	firmwareVersion FirmwareVersion
-}
-
-// Name implements agent.Controller
-func (*SysUpgradeController) Name() string {
-	return "sysupgrade-controller"
-}
-
-// Reconcile implements agent.Controller
-func (c *SysUpgradeController) Reconcile(ctx context.Context, state *agent.State) error {
-	sysSpec := sysupgrade.NewSpec()
-
-	if err := state.GetSpec(sysupgrade.Name, sysSpec); err != nil {
-		if errors.Is(err, agent.ErrSpecNotFound) {
-			logger.Info(ctx, "could not find sysupgrade spec, doing nothing")
-
-			return nil
-		}
-
-		return errors.WithStack(err)
-	}
-
-	firmwareVersion, err := c.firmwareVersion.FirmwareVersion(ctx)
-	if err != nil {
-		return errors.WithStack(err)
-	}
-
-	ctx = logger.With(ctx,
-		logger.F("currentFirmwareVersion", firmwareVersion),
-		logger.F("newFirmwareVersion", sysSpec.Version),
-	)
-
-	if firmwareVersion == sysSpec.Version {
-		logger.Info(ctx, "firmware version did not change, doing nothing")
-
-		return nil
-	}
-
-	downloadDir, err := os.MkdirTemp(os.TempDir(), "emissary_sysupgrade_*")
-	if err != nil {
-		return errors.WithStack(err)
-	}
-
-	defer func() {
-		if err := os.RemoveAll(downloadDir); err != nil {
-			logger.Error(
-				ctx, "could not remove download direction",
-				logger.E(errors.WithStack(err)),
-				logger.F("downloadDir", downloadDir),
-			)
-		}
-	}()
-
-	firmwareFile := filepath.Join(downloadDir, "firmware.bin")
-
-	logger.Info(
-		ctx, "downloading firmware",
-		logger.F("url", sysSpec.URL), logger.F("sha256sum", sysSpec.SHA256Sum),
-	)
-
-	if err := c.downloadFile(ctx, sysSpec.URL, sysSpec.SHA256Sum, firmwareFile); err != nil {
-		return errors.WithStack(err)
-	}
-
-	logger.Info(ctx, "upgrading firmware")
-
-	if err := c.upgradeFirmware(ctx, firmwareFile); err != nil {
-		return errors.WithStack(err)
-	}
-
-	return nil
-}
-
-func (c *SysUpgradeController) downloadFile(ctx context.Context, url string, sha256sum string, dest string) error {
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
-	if err != nil {
-		return errors.WithStack(err)
-	}
-
-	res, err := c.client.Do(req)
-	if err != nil {
-		return errors.WithStack(err)
-	}
-
-	defer func() {
-		if err := res.Body.Close(); err != nil && !errors.Is(err, os.ErrClosed) {
-			panic(errors.WithStack(err))
-		}
-	}()
-
-	tmp, err := os.CreateTemp(filepath.Dir(dest), "download_")
-	if err != nil {
-		return errors.WithStack(err)
-	}
-
-	defer func() {
-		if err := os.Remove(tmp.Name()); err != nil && !os.IsNotExist(err) {
-			panic(errors.WithStack(err))
-		}
-	}()
-
-	if _, err := io.Copy(tmp, res.Body); err != nil {
-		return errors.WithStack(err)
-	}
-
-	tmpFileHash, err := hash(tmp.Name())
-	if err != nil {
-		return errors.WithStack(err)
-	}
-
-	if tmpFileHash != sha256sum {
-		return errors.Errorf("sha256 sum mismatch: expected '%s', got '%s'", sha256sum, tmpFileHash)
-	}
-
-	if err := os.Rename(tmp.Name(), dest); err != nil {
-		return errors.WithStack(err)
-	}
-
-	return nil
-}
-
-func (c *SysUpgradeController) upgradeFirmware(ctx context.Context, firmwareFile string) error {
-	templatizedArgs := make([]string, len(c.args))
-	for i, a := range c.args {
-		templatizedArgs[i] = strings.Replace(a, FirmwareFileTemplate, firmwareFile, 1)
-	}
-
-	command := exec.CommandContext(ctx, c.command, templatizedArgs...)
-
-	command.Stdout = os.Stdout
-	command.Stderr = os.Stderr
-
-	logger.Debug(ctx, "executing command", logger.F("command", c.command), logger.F("args", templatizedArgs))
-
-	if err := command.Run(); err != nil {
-		return errors.WithStack(err)
-	}
-
-	return nil
-}
-
-func NewSysUpgradeController(funcs ...SysUpgradeOptionFunc) *SysUpgradeController {
-	opts := defaultSysUpgradeOptions()
-	for _, fn := range funcs {
-		fn(opts)
-	}
-
-	return &SysUpgradeController{
-		command:         opts.Command,
-		args:            opts.Args,
-		client:          opts.Client,
-		firmwareVersion: opts.FirmwareVersion,
-	}
-}
-
-var _ agent.Controller = &SysUpgradeController{}
--- a/internal/agent/controller/openwrt/sysupgrade_firmware_version.go
+++ b/internal/agent/controller/openwrt/sysupgrade_firmware_version.go
@ -1,46 +0,0 @@
-package openwrt
-
-import (
-	"bytes"
-	"context"
-	"os"
-	"os/exec"
-	"strings"
-
-	"github.com/pkg/errors"
-	"gitlab.com/wpetit/goweb/logger"
-)
-
-type ShellFirmwareVersion struct {
-	command string
-	args    []string
-}
-
-// FirmwareVersion implements FirmwareVersion
-func (fv *ShellFirmwareVersion) FirmwareVersion(ctx context.Context) (string, error) {
-	command := exec.CommandContext(ctx, fv.command, fv.args...)
-
-	var buf bytes.Buffer
-
-	command.Stdout = &buf
-	command.Stderr = os.Stderr
-
-	logger.Debug(ctx, "executing command", logger.F("command", fv.command), logger.F("args", fv.args))
-
-	if err := command.Run(); err != nil {
-		return "", errors.WithStack(err)
-	}
-
-	version := strings.TrimSpace(buf.String())
-
-	return version, nil
-}
-
-func NewShellFirmwareVersion(command string, args ...string) *ShellFirmwareVersion {
-	return &ShellFirmwareVersion{
-		command: command,
-		args:    args,
-	}
-}
-
-var _ FirmwareVersion = &ShellFirmwareVersion{}
--- a/internal/agent/controller/openwrt/sysupgrade_options.go
+++ b/internal/agent/controller/openwrt/sysupgrade_options.go
@ -1,58 +0,0 @@
-package openwrt
-
-import (
-	"context"
-	"net/http"
-	"time"
-)
-
-const FirmwareFileTemplate = "%FIRMWARE%"
-
-type FirmwareVersion interface {
-	FirmwareVersion(context.Context) (string, error)
-}
-
-type SysUpgradeOptions struct {
-	Command         string
-	Args            []string
-	FirmwareVersion FirmwareVersion
-	Client          *http.Client
-}
-
-func defaultSysUpgradeOptions() *SysUpgradeOptions {
-	return &SysUpgradeOptions{
-		Command: `echo`,
-		Args:    []string{`[DUMMY UPGRADE]`, FirmwareFileTemplate},
-		Client: &http.Client{
-			Timeout: 30 * time.Second,
-		},
-		FirmwareVersion: NewShellFirmwareVersion(`echo`, "0.0.0-dummy"),
-	}
-}
-
-type SysUpgradeOptionFunc func(*SysUpgradeOptions)
-
-func WithSysUpgradeCommand(command string, args ...string) SysUpgradeOptionFunc {
-	return func(opts *SysUpgradeOptions) {
-		opts.Command = command
-		opts.Args = args
-	}
-}
-
-func WithSysUpgradeFirmwareVersion(firmwareVersion FirmwareVersion) SysUpgradeOptionFunc {
-	return func(opts *SysUpgradeOptions) {
-		opts.FirmwareVersion = firmwareVersion
-	}
-}
-
-func WithSysUpgradeShellFirmwareVersion(command string, args ...string) SysUpgradeOptionFunc {
-	return func(opts *SysUpgradeOptions) {
-		opts.FirmwareVersion = NewShellFirmwareVersion(command, args...)
-	}
-}
-
-func WithSysUpgradeClient(client *http.Client) SysUpgradeOptionFunc {
-	return func(opts *SysUpgradeOptions) {
-		opts.Client = client
-	}
-}
--- a/internal/agent/controller/proxy/controller.go
+++ b/internal/agent/controller/proxy/controller.go
@ -1,180 +0,0 @@
-package proxy
-
-import (
-	"context"
-	"net/url"
-
-	"forge.cadoles.com/Cadoles/emissary/internal/agent"
-	"forge.cadoles.com/Cadoles/emissary/internal/proxy"
-	spec "forge.cadoles.com/Cadoles/emissary/internal/spec/proxy"
-	"github.com/mitchellh/hashstructure/v2"
-	"github.com/pkg/errors"
-	"gitlab.com/wpetit/goweb/logger"
-)
-
-type proxyEntry struct {
-	SpecHash uint64
-	Proxy    *ReverseProxy
-}
-
-type Controller struct {
-	proxies map[spec.ID]*proxyEntry
-}
-
-// Name implements node.Controller.
-func (c *Controller) Name() string {
-	return "proxy-controller"
-}
-
-// Reconcile implements node.Controller.
-func (c *Controller) Reconcile(ctx context.Context, state *agent.State) error {
-	proxySpec := spec.NewSpec()
-
-	if err := state.GetSpec(spec.NameProxy, proxySpec); err != nil {
-		if errors.Is(err, agent.ErrSpecNotFound) {
-			logger.Info(ctx, "could not find proxy spec")
-
-			c.stopAllProxies(ctx)
-
-			return nil
-		}
-
-		return errors.WithStack(err)
-	}
-
-	logger.Info(ctx, "retrieved spec", logger.F("spec", proxySpec.SpecName()), logger.F("revision", proxySpec.SpecRevision()))
-
-	c.updateProxies(ctx, proxySpec)
-
-	return nil
-}
-
-func (c *Controller) stopAllProxies(ctx context.Context) {
-	if len(c.proxies) > 0 {
-		logger.Info(ctx, "stopping all proxies")
-	}
-
-	for proxyID, entry := range c.proxies {
-		logger.Info(ctx, "stopping proxy", logger.F("proxyID", proxyID))
-
-		if err := entry.Proxy.Stop(); err != nil {
-			logger.Error(
-				ctx, "error while stopping proxy",
-				logger.F("proxyID", proxyID),
-				logger.E(errors.WithStack(err)),
-			)
-
-			delete(c.proxies, proxyID)
-		}
-	}
-}
-
-func (c *Controller) updateProxies(ctx context.Context, spec *spec.Spec) {
-	// Stop and remove obsolete proxys
-	for proxyID, entry := range c.proxies {
-		if _, exists := spec.Proxies[proxyID]; exists {
-			continue
-		}
-
-		logger.Info(ctx, "stopping proxy", logger.F("proxyID", proxyID))
-
-		if err := entry.Proxy.Stop(); err != nil {
-			logger.Error(
-				ctx, "error while stopping proxy",
-				logger.F("proxyID", proxyID),
-				logger.E(errors.WithStack(err)),
-			)
-
-			delete(c.proxies, proxyID)
-		}
-	}
-
-	// (Re)start proxys
-	for proxyID, proxySpec := range spec.Proxies {
-		proxyCtx := logger.With(ctx, logger.F("proxyID", proxyID))
-
-		if err := c.updateProxy(ctx, proxyID, proxySpec); err != nil {
-			logger.Error(proxyCtx, "could not update proxy", logger.E(errors.WithStack(err)))
-			continue
-		}
-	}
-}
-
-func (c *Controller) updateProxy(ctx context.Context, proxyID spec.ID, proxySpec spec.ProxyEntry) (err error) {
-	newProxySpecHash, err := hashstructure.Hash(proxySpec, hashstructure.FormatV2, nil)
-	if err != nil {
-		return errors.WithStack(err)
-	}
-
-	var entry *proxyEntry
-
-	entry, exists := c.proxies[proxyID]
-	if !exists {
-		logger.Info(ctx, "proxy currently not running")
-	}
-
-	if entry == nil {
-		entry = &proxyEntry{
-			Proxy:    NewReverseProxy(),
-			SpecHash: 0,
-		}
-
-		c.proxies[proxyID] = entry
-	}
-
-	specChanged := newProxySpecHash != entry.SpecHash
-
-	if entry.Proxy.Running() && !specChanged {
-		return nil
-	}
-
-	if specChanged && entry.SpecHash != 0 {
-		logger.Info(
-			ctx, "restarting proxy",
-			logger.F("address", proxySpec.Address),
-		)
-	} else {
-		logger.Info(
-			ctx, "starting proxy",
-			logger.F("address", proxySpec.Address),
-		)
-	}
-
-	options := make([]proxy.OptionFunc, 0)
-	allowedHosts := make([]string, len(proxySpec.Mappings))
-	mappings := make(map[string]*url.URL, len(proxySpec.Mappings))
-
-	for _, m := range proxySpec.Mappings {
-		target, err := url.Parse(m.Target)
-		if err != nil {
-			return errors.WithStack(err)
-		}
-
-		mappings[m.HostPattern] = target
-		allowedHosts = append(allowedHosts, m.HostPattern)
-	}
-
-	options = append(
-		options,
-		proxy.WithAllowedHosts(allowedHosts...),
-		proxy.WithRewriteHosts(mappings),
-	)
-
-	if err := entry.Proxy.Start(ctx, proxySpec.Address, options...); err != nil {
-		delete(c.proxies, proxyID)
-
-		return errors.Wrap(err, "could not start app")
-	}
-
-	entry.SpecHash = newProxySpecHash
-
-	return nil
-}
-
-func NewController() *Controller {
-	return &Controller{
-		proxies: make(map[spec.ID]*proxyEntry),
-	}
-}
-
-var _ agent.Controller = &Controller{}
--- a/internal/agent/controller/spec/controller.go
+++ b/internal/agent/controller/spec/controller.go
@ -4,8 +4,8 @@ import (
 	"context"

 	"forge.cadoles.com/Cadoles/emissary/internal/agent"
+	"forge.cadoles.com/Cadoles/emissary/internal/client"
 	"forge.cadoles.com/Cadoles/emissary/internal/datastore"
-	"forge.cadoles.com/Cadoles/emissary/pkg/client"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/logger"
 )
@ -21,15 +21,22 @@ func (c *Controller) Name() string {
 func (c *Controller) Reconcile(ctx context.Context, state *agent.State) error {
 	cl := agent.Client(ctx)

-	agent, err := cl.GetAgent(
+	agents, _, err := cl.QueryAgents(
 		ctx,
-		state.AgentID(),
+		client.WithQueryAgentsLimit(1),
+		client.WithQueryAgentsID(state.AgentID()),
 	)
 	if err != nil {
 		return errors.WithStack(err)
 	}

-	if err := c.reconcileAgent(ctx, cl, state, agent); err != nil {
+	if len(agents) == 0 {
+		logger.Error(ctx, "could not find remote matching agent")
+
+		return nil
+	}
+
+	if err := c.reconcileAgent(ctx, cl, state, agents[0]); err != nil {
 		return errors.WithStack(err)
 	}

--- a/internal/agent/options.go
+++ b/internal/agent/options.go
@ -4,7 +4,7 @@ import (
 	"time"

 	"forge.cadoles.com/Cadoles/emissary/internal/agent/metadata"
-	"forge.cadoles.com/Cadoles/emissary/pkg/client"
+	"forge.cadoles.com/Cadoles/emissary/internal/client"
 )

 type Options struct {
--- a/internal/auth/agent/authenticator.go
+++ b/internal/auth/agent/authenticator.go
@ -4,24 +4,23 @@ import (
 	"context"
 	"net/http"
 	"strings"
-	"time"

 	"forge.cadoles.com/Cadoles/emissary/internal/auth"
 	"forge.cadoles.com/Cadoles/emissary/internal/datastore"
 	"github.com/lestrrat-go/jwx/v2/jws"
 	"github.com/lestrrat-go/jwx/v2/jwt"
 	"github.com/pkg/errors"
+	"gitlab.com/wpetit/goweb/logger"
 )

-const DefaultAcceptableSkew = 5 * time.Minute
-
 type Authenticator struct {
-	repo           datastore.AgentRepository
-	acceptableSkew time.Duration
+	repo datastore.AgentRepository
 }

 // Authenticate implements auth.Authenticator.
 func (a *Authenticator) Authenticate(ctx context.Context, r *http.Request) (auth.User, error) {
+	ctx = logger.With(r.Context(), logger.F("remoteAddr", r.RemoteAddr))
+
 	authorization := r.Header.Get("Authorization")
 	if authorization == "" {
 		return nil, errors.WithStack(auth.ErrUnauthenticated)
@ -72,19 +71,11 @@ func (a *Authenticator) Authenticate(ctx context.Context, r *http.Request) (auth
 		[]byte(rawToken),
 		jwt.WithKeySet(agent.KeySet.Set, jws.WithRequireKid(false)),
 		jwt.WithValidate(true),
-		jwt.WithAcceptableSkew(a.acceptableSkew),
 	)
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}

-	contactedAt := time.Now()
-
-	agent, err = a.repo.Update(ctx, agent.ID, datastore.WithAgentUpdateContactedAt(contactedAt))
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-
 	user := &User{
 		agent: agent,
 	}
@ -92,10 +83,9 @@ func (a *Authenticator) Authenticate(ctx context.Context, r *http.Request) (auth
 	return user, nil
 }

-func NewAuthenticator(repo datastore.AgentRepository, acceptableSkew time.Duration) *Authenticator {
+func NewAuthenticator(repo datastore.AgentRepository) *Authenticator {
 	return &Authenticator{
-		repo:           repo,
-		acceptableSkew: acceptableSkew,
+		repo: repo,
 	}
 }

--- a/internal/auth/agent/jwt.go
+++ b/internal/auth/agent/jwt.go
@ -18,7 +18,7 @@ func GenerateToken(key jwk.Key, thumbprint string) (string, error) {
 		return "", errors.WithStack(err)
 	}

-	now := time.Now().UTC()
+	now := time.Now()

 	if err := token.Set(jwt.NotBeforeKey, now); err != nil {
 		return "", errors.WithStack(err)
--- a/internal/auth/agent/user.go
+++ b/internal/auth/agent/user.go
@ -13,7 +13,7 @@ type User struct {

 // Subject implements auth.User
 func (u *User) Subject() string {
-	return fmt.Sprintf("agent-%d", u.agent.ID)
+	return fmt.Sprintf("agent#%d", u.agent.ID)
 }

 func (u *User) Agent() *datastore.Agent {
--- a/internal/auth/middleware.go
+++ b/internal/auth/middleware.go
@ -20,8 +20,8 @@ const (
 	contextKeyUser contextKey = "user"
 )

-func CtxUser(ctx context.Context) (User, error) {
-	user, ok := ctx.Value(contextKeyUser).(User)
+func CtxUser(ctx context.Context) (*User, error) {
+	user, ok := ctx.Value(contextKeyUser).(*User)
 	if !ok {
 		return nil, errors.Errorf("unexpected user type: expected '%T', got '%T'", new(User), ctx.Value(contextKeyUser))
 	}
@ -29,7 +29,10 @@ func CtxUser(ctx context.Context) (User, error) {
 	return user, nil
 }

-var ErrUnauthenticated = errors.New("unauthenticated")
+var (
+	ErrUnauthenticated = errors.New("unauthenticated")
+	ErrForbidden       = errors.New("forbidden")
+)

 type User interface {
 	Subject() string
@ -52,7 +55,7 @@ func Middleware(authenticators ...Authenticator) func(http.Handler) http.Handler
 			for _, auth := range authenticators {
 				user, err = auth.Authenticate(ctx, r)
 				if err != nil {
-					logger.Debug(ctx, "could not authenticate request", logger.E(errors.WithStack(err)))
+					logger.Warn(ctx, "could not authenticate request", logger.E(errors.WithStack(err)))

 					continue
 				}
@ -68,7 +71,6 @@ func Middleware(authenticators ...Authenticator) func(http.Handler) http.Handler
 				return
 			}

-			ctx = logger.With(ctx, logger.F("user", user.Subject()))
 			ctx = context.WithValue(ctx, contextKeyUser, user)

 			h.ServeHTTP(w, r.WithContext(ctx))
--- a/internal/auth/thirdparty/authenticator.go
+++ b/internal/auth/thirdparty/authenticator.go
@ -1,75 +0,0 @@
-package thirdparty
-
-import (
-	"context"
-	"net/http"
-	"strings"
-	"time"
-
-	"forge.cadoles.com/Cadoles/emissary/internal/auth"
-	"forge.cadoles.com/Cadoles/emissary/internal/jwk"
-	"github.com/lestrrat-go/jwx/v2/jwt"
-	"github.com/pkg/errors"
-)
-
-const DefaultAcceptableSkew = 5 * time.Minute
-
-type (
-	GetKeySet    func(context.Context) (jwk.Set, error)
-	GetTokenRole func(context.Context, jwt.Token) (string, error)
-)
-
-type Authenticator struct {
-	getKeySet      GetKeySet
-	getTokenRole   GetTokenRole
-	acceptableSkew time.Duration
-}
-
-// Authenticate implements auth.Authenticator.
-func (a *Authenticator) Authenticate(ctx context.Context, r *http.Request) (auth.User, error) {
-	authorization := r.Header.Get("Authorization")
-	if authorization == "" {
-		return nil, errors.WithStack(auth.ErrUnauthenticated)
-	}
-
-	rawToken := strings.TrimPrefix(authorization, "Bearer ")
-	if rawToken == "" {
-		return nil, errors.WithStack(auth.ErrUnauthenticated)
-	}
-
-	keys, err := a.getKeySet(ctx)
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-
-	token, err := parseToken(ctx, keys, rawToken, a.acceptableSkew)
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-
-	rawRole, err := a.getTokenRole(ctx, token)
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-
-	if !isValidRole(rawRole) {
-		return nil, errors.Errorf("invalid role '%s'", rawRole)
-	}
-
-	user := &User{
-		subject: token.Subject(),
-		role:    Role(rawRole),
-	}
-
-	return user, nil
-}
-
-func NewAuthenticator(getKeySet GetKeySet, getTokenRole GetTokenRole, acceptableSkew time.Duration) *Authenticator {
-	return &Authenticator{
-		getTokenRole:   getTokenRole,
-		getKeySet:      getKeySet,
-		acceptableSkew: acceptableSkew,
-	}
-}
-
-var _ auth.Authenticator = &Authenticator{}
--- a/internal/auth/user/authenticator.go
+++ b/internal/auth/user/authenticator.go
@ -0,0 +1,67 @@
+package user
+
+import (
+	"context"
+	"net/http"
+	"strings"
+
+	"forge.cadoles.com/Cadoles/emissary/internal/auth"
+	"forge.cadoles.com/Cadoles/emissary/internal/jwk"
+	"github.com/pkg/errors"
+	"gitlab.com/wpetit/goweb/logger"
+)
+
+type Authenticator struct {
+	keys   jwk.Set
+	issuer string
+}
+
+// Authenticate implements auth.Authenticator.
+func (a *Authenticator) Authenticate(ctx context.Context, r *http.Request) (auth.User, error) {
+	ctx = logger.With(r.Context(), logger.F("remoteAddr", r.RemoteAddr))
+
+	authorization := r.Header.Get("Authorization")
+	if authorization == "" {
+		return nil, errors.WithStack(auth.ErrUnauthenticated)
+	}
+
+	rawToken := strings.TrimPrefix(authorization, "Bearer ")
+	if rawToken == "" {
+		return nil, errors.WithStack(auth.ErrUnauthenticated)
+	}
+
+	token, err := parseToken(ctx, a.keys, a.issuer, rawToken)
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+
+	rawRole, exists := token.Get(keyRole)
+	if !exists {
+		return nil, errors.New("could not find 'thumbprint' claim")
+	}
+
+	role, ok := rawRole.(string)
+	if !ok {
+		return nil, errors.Errorf("unexpected '%s' claim value: '%v'", keyRole, rawRole)
+	}
+
+	if !isValidRole(role) {
+		return nil, errors.Errorf("invalid role '%s'", role)
+	}
+
+	user := &User{
+		subject: token.Subject(),
+		role:    Role(role),
+	}
+
+	return user, nil
+}
+
+func NewAuthenticator(keys jwk.Set, issuer string) *Authenticator {
+	return &Authenticator{
+		keys:   keys,
+		issuer: issuer,
+	}
+}
+
+var _ auth.Authenticator = &Authenticator{}
--- a/internal/auth/thirdparty/jwt.go
+++ b/internal/auth/thirdparty/jwt.go
@ -1,4 +1,4 @@
-package thirdparty
+package user

 import (
 	"context"
@ -11,13 +11,14 @@ import (
 	"github.com/pkg/errors"
 )

-func parseToken(ctx context.Context, keys jwk.Set, rawToken string, acceptableSkew time.Duration) (jwt.Token, error) {
+const keyRole = "role"
+
+func parseToken(ctx context.Context, keys jwk.Set, issuer string, rawToken string) (jwt.Token, error) {
 	token, err := jwt.Parse(
 		[]byte(rawToken),
 		jwt.WithKeySet(keys, jws.WithRequireKid(false)),
+		jwt.WithIssuer(issuer),
 		jwt.WithValidate(true),
-		jwt.WithAcceptableSkew(acceptableSkew),
-		jwt.WithContext(ctx),
 	)
 	if err != nil {
 		return nil, errors.WithStack(err)
@ -26,20 +27,14 @@ func parseToken(ctx context.Context, keys jwk.Set, rawToken string, acceptableSk
 	return token, nil
 }

-const DefaultRoleKey string = "role"
-
-func GenerateToken(ctx context.Context, key jwk.Key, subject string, role Role) (string, error) {
+func GenerateToken(ctx context.Context, key jwk.Key, role Role) (string, error) {
 	token := jwt.New()

-	if err := token.Set(jwt.SubjectKey, subject); err != nil {
+	if err := token.Set(keyRole, role); err != nil {
 		return "", errors.WithStack(err)
 	}

-	if err := token.Set(DefaultRoleKey, role); err != nil {
-		return "", errors.WithStack(err)
-	}
-
-	now := time.Now().UTC()
+	now := time.Now()

 	if err := token.Set(jwt.NotBeforeKey, now); err != nil {
 		return "", errors.WithStack(err)
--- a/internal/auth/thirdparty/user.go
+++ b/internal/auth/thirdparty/user.go
@ -1,4 +1,4 @@
-package thirdparty
+package user

 import "forge.cadoles.com/Cadoles/emissary/internal/auth"

--- a/internal/client/client.go
+++ b/internal/client/client.go
--- a/internal/client/get_agent.go
+++ b/internal/client/get_agent.go
@ -4,12 +4,13 @@ import (
 	"context"
 	"fmt"

+	"forge.cadoles.com/Cadoles/emissary/internal/datastore"
 	"github.com/pkg/errors"
 )

-func (c *Client) GetAgent(ctx context.Context, agentID AgentID, funcs ...OptionFunc) (*Agent, error) {
+func (c *Client) GetAgent(ctx context.Context, agentID datastore.AgentID, funcs ...OptionFunc) (*datastore.Agent, error) {
 	response := withResponse[struct {
-		Agent *Agent `json:"agent"`
+		Agent *datastore.Agent `json:"agent"`
 	}]()

 	path := fmt.Sprintf("/api/v1/agents/%d", agentID)
--- a/internal/client/get_agent_specs.go
+++ b/internal/client/get_agent_specs.go
@ -4,11 +4,12 @@ import (
 	"context"
 	"fmt"

+	"forge.cadoles.com/Cadoles/emissary/internal/datastore"
 	"forge.cadoles.com/Cadoles/emissary/internal/spec"
 	"github.com/pkg/errors"
 )

-func (c *Client) GetAgentSpecs(ctx context.Context, agentID AgentID, funcs ...OptionFunc) ([]Spec, error) {
+func (c *Client) GetAgentSpecs(ctx context.Context, agentID datastore.AgentID, funcs ...OptionFunc) ([]spec.Spec, error) {
 	response := withResponse[struct {
 		Specs []*spec.RawSpec `json:"specs"`
 	}]()
--- a/internal/client/options.go
+++ b/internal/client/options.go
--- a/internal/client/query_agents.go
+++ b/internal/client/query_agents.go
@ -16,8 +16,8 @@ type QueryAgentsOptions struct {
 	Limit       *int
 	Offset      *int
 	Thumbprints []string
-	IDs         []AgentID
-	Statuses    []AgentStatus
+	IDs         []datastore.AgentID
+	Statuses    []datastore.AgentStatus
 }

 func WithQueryAgentsOptions(funcs ...OptionFunc) QueryAgentsOptionFunc {
@ -56,7 +56,7 @@ func WithQueryAgentsStatus(statuses ...datastore.AgentStatus) QueryAgentsOptionF
 	}
 }

-func (c *Client) QueryAgents(ctx context.Context, funcs ...QueryAgentsOptionFunc) ([]*Agent, int, error) {
+func (c *Client) QueryAgents(ctx context.Context, funcs ...QueryAgentsOptionFunc) ([]*datastore.Agent, int, error) {
 	options := &QueryAgentsOptions{}
 	for _, fn := range funcs {
 		fn(options)
--- a/internal/client/register_agent.go
+++ b/internal/client/register_agent.go
@ -9,8 +9,8 @@ import (
 	"github.com/pkg/errors"
 )

-func (c *Client) RegisterAgent(ctx context.Context, key Key, thumbprint string, meta []MetadataTuple, funcs ...OptionFunc) (*Agent, error) {
-	keySet, err := jwk.RS256PublicKeySet(key)
+func (c *Client) RegisterAgent(ctx context.Context, key jwk.Key, thumbprint string, meta []metadata.Tuple, funcs ...OptionFunc) (*datastore.Agent, error) {
+	keySet, err := jwk.PublicKeySet(key)
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
--- a/internal/client/update_agent.go
+++ b/internal/client/update_agent.go
@ -10,7 +10,6 @@ import (

 type UpdateAgentOptions struct {
 	Status  *int
-	Label   *string
 	Options []OptionFunc
 }

@ -22,12 +21,6 @@ func WithAgentStatus(status int) UpdateAgentOptionFunc {
 	}
 }

-func WithAgentLabel(label string) UpdateAgentOptionFunc {
-	return func(opts *UpdateAgentOptions) {
-		opts.Label = &label
-	}
-}
-
 func WithUpdateAgentsOptions(funcs ...OptionFunc) UpdateAgentOptionFunc {
 	return func(opts *UpdateAgentOptions) {
 		opts.Options = funcs
@ -46,10 +39,6 @@ func (c *Client) UpdateAgent(ctx context.Context, agentID datastore.AgentID, fun
 		payload["status"] = *opts.Status
 	}

-	if opts.Label != nil {
-		payload["label"] = *opts.Label
-	}
-
 	response := withResponse[struct {
 		Agent *datastore.Agent `json:"agent"`
 	}]()
--- a/internal/client/update_agent_spec.go
+++ b/internal/client/update_agent_spec.go
@ -10,7 +10,7 @@ import (
 	"github.com/pkg/errors"
 )

-func (c *Client) UpdateAgentSpec(ctx context.Context, agentID AgentID, spc Spec, funcs ...OptionFunc) (Spec, error) {
+func (c *Client) UpdateAgentSpec(ctx context.Context, agentID datastore.AgentID, spc spec.Spec, funcs ...OptionFunc) (*datastore.Spec, error) {
 	payload := struct {
 		Name     spec.Name         `json:"name"`
 		Revision int               `json:"revision"`
--- a/internal/command/agent/openwrt/uci/transform.go
+++ b/internal/command/agent/openwrt/uci/transform.go
@ -10,6 +10,7 @@ import (
 	"forge.cadoles.com/Cadoles/emissary/internal/command/common"
 	"forge.cadoles.com/Cadoles/emissary/internal/openwrt/uci"
 	"github.com/pkg/errors"
+	_ "github.com/santhosh-tekuri/jsonschema/v5/httploader"
 	"github.com/urfave/cli/v2"
 )

--- a/internal/command/agent/root.go
+++ b/internal/command/agent/root.go
@ -14,7 +14,6 @@ func Root() *cli.Command {
 			openwrt.Root(),
 			config.Root(),
 			RunCommand(),
-			ShowThumbprintCommand(),
 		},
 	}
 }
--- a/internal/command/agent/run.go
+++ b/internal/command/agent/run.go
@ -5,10 +5,9 @@ import (

 	"forge.cadoles.com/Cadoles/emissary/internal/agent"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/app"
-	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/mdns"
+	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/gateway"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/openwrt"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/persistence"
-	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/proxy"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/spec"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent/metadata"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent/metadata/collector/buildinfo"
@ -18,6 +17,7 @@ import (
 	"forge.cadoles.com/Cadoles/emissary/internal/jwk"
 	"forge.cadoles.com/Cadoles/emissary/internal/machineid"
 	"github.com/pkg/errors"
+	_ "github.com/santhosh-tekuri/jsonschema/v5/httploader"
 	"github.com/urfave/cli/v2"
 	"gitlab.com/wpetit/goweb/logger"
 )
@ -50,6 +50,10 @@ func RunCommand() *cli.Command {
 				controllers = append(controllers, spec.NewController())
 			}

+			if ctrlConf.Gateway.Enabled {
+				controllers = append(controllers, gateway.NewController())
+			}
+
 			if ctrlConf.UCI.Enabled {
 				controllers = append(controllers, openwrt.NewUCIController(
 					string(ctrlConf.UCI.BinPath),
@ -63,37 +67,6 @@ func RunCommand() *cli.Command {
 				))
 			}

-			if ctrlConf.Proxy.Enabled {
-				controllers = append(controllers, proxy.NewController())
-			}
-
-			if ctrlConf.MDNS.Enabled {
-				controllers = append(controllers, mdns.NewController())
-			}
-
-			if ctrlConf.SysUpgrade.Enabled {
-				sysUpgradeArgs := make([]string, 0)
-				if len(ctrlConf.SysUpgrade.SysUpgradeCommand) > 1 {
-					sysUpgradeArgs = ctrlConf.SysUpgrade.SysUpgradeCommand[1:]
-				}
-
-				firmwareVersionArgs := make([]string, 0)
-				if len(ctrlConf.SysUpgrade.FirmwareVersionCommand) > 1 {
-					firmwareVersionArgs = ctrlConf.SysUpgrade.FirmwareVersionCommand[1:]
-				}
-
-				controllers = append(controllers, openwrt.NewSysUpgradeController(
-					openwrt.WithSysUpgradeCommand(
-						ctrlConf.SysUpgrade.SysUpgradeCommand[0],
-						sysUpgradeArgs...,
-					),
-					openwrt.WithSysUpgradeShellFirmwareVersion(
-						ctrlConf.SysUpgrade.FirmwareVersionCommand[0],
-						firmwareVersionArgs...,
-					),
-				))
-			}
-
 			key, err := jwk.LoadOrGenerate(string(conf.Agent.PrivateKeyPath), jwk.DefaultKeySize)
 			if err != nil {
 				return errors.WithStack(err)
--- a/internal/command/agent/show_thumbprint.go
+++ b/internal/command/agent/show_thumbprint.go
@ -1,30 +0,0 @@
-package agent
-
-import (
-	"fmt"
-
-	"forge.cadoles.com/Cadoles/emissary/internal/command/common"
-	"forge.cadoles.com/Cadoles/emissary/internal/machineid"
-	"github.com/pkg/errors"
-	"github.com/urfave/cli/v2"
-)
-
-func ShowThumbprintCommand() *cli.Command {
-	flags := common.Flags()
-
-	return &cli.Command{
-		Name:  "show-thumbprint",
-		Usage: "Show the current agent thumbprint",
-		Flags: flags,
-		Action: func(ctx *cli.Context) error {
-			thumbprint, err := machineid.Get()
-			if err != nil {
-				return errors.WithStack(err)
-			}
-
-			fmt.Println(thumbprint)
-
-			return nil
-		},
-	}
-}
--- a/internal/command/api/agent/delete.go
+++ b/internal/command/api/agent/delete.go
@ -1,56 +0,0 @@
-package agent
-
-import (
-	"os"
-
-	agentFlag "forge.cadoles.com/Cadoles/emissary/internal/command/api/agent/flag"
-	"forge.cadoles.com/Cadoles/emissary/internal/command/api/apierr"
-	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/api/flag"
-	"forge.cadoles.com/Cadoles/emissary/internal/datastore"
-	"forge.cadoles.com/Cadoles/emissary/internal/format"
-	"forge.cadoles.com/Cadoles/emissary/pkg/client"
-	"github.com/pkg/errors"
-	"github.com/urfave/cli/v2"
-)
-
-func DeleteCommand() *cli.Command {
-	return &cli.Command{
-		Name:  "delete",
-		Usage: "Delete agent",
-		Flags: agentFlag.WithAgentFlags(),
-		Action: func(ctx *cli.Context) error {
-			baseFlags := clientFlag.GetBaseFlags(ctx)
-
-			token, err := clientFlag.GetToken(baseFlags)
-			if err != nil {
-				return errors.WithStack(apierr.Wrap(err))
-			}
-
-			agentID, err := agentFlag.AssertAgentID(ctx)
-			if err != nil {
-				return errors.WithStack(err)
-			}
-
-			client := client.New(baseFlags.ServerURL, client.WithToken(token))
-
-			agentID, err = client.DeleteAgent(ctx.Context, agentID)
-			if err != nil {
-				return errors.WithStack(apierr.Wrap(err))
-			}
-
-			hints := format.Hints{
-				OutputMode: baseFlags.OutputMode,
-			}
-
-			if err := format.Write(baseFlags.Format, os.Stdout, hints, struct {
-				ID datastore.AgentID `json:"id"`
-			}{
-				ID: agentID,
-			}); err != nil {
-				return errors.WithStack(err)
-			}
-
-			return nil
-		},
-	}
-}
--- a/internal/command/api/agent/query.go
+++ b/internal/command/api/agent/query.go
@ -1,89 +0,0 @@
-package agent
-
-import (
-	"os"
-
-	"forge.cadoles.com/Cadoles/emissary/internal/command/api/apierr"
-	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/api/flag"
-	"forge.cadoles.com/Cadoles/emissary/internal/datastore"
-	"forge.cadoles.com/Cadoles/emissary/internal/format"
-	"forge.cadoles.com/Cadoles/emissary/pkg/client"
-	"github.com/pkg/errors"
-	"github.com/urfave/cli/v2"
-)
-
-func QueryCommand() *cli.Command {
-	return &cli.Command{
-		Name:  "query",
-		Usage: "Query agents",
-		Flags: clientFlag.ComposeFlags(
-			&cli.StringSliceFlag{
-				Name:  "thumbprints",
-				Usage: "use `THUMBPRINTS` as query filter",
-				Value: nil,
-			},
-			&cli.Int64SliceFlag{
-				Name:  "statuses",
-				Usage: "use `STATUSES` as query filter",
-			},
-			&cli.Int64SliceFlag{
-				Name:  "ids",
-				Usage: "use `IDS` as query filter",
-			},
-		),
-		Action: func(ctx *cli.Context) error {
-			baseFlags := clientFlag.GetBaseFlags(ctx)
-
-			token, err := clientFlag.GetToken(baseFlags)
-			if err != nil {
-				return errors.WithStack(apierr.Wrap(err))
-			}
-
-			options := make([]client.QueryAgentsOptionFunc, 0)
-
-			thumbprints := ctx.StringSlice("thumbprints")
-			if thumbprints != nil {
-				options = append(options, client.WithQueryAgentsThumbprints(thumbprints...))
-			}
-
-			rawIDs := ctx.Int64Slice("ids")
-			if rawIDs != nil {
-				agentIDs := func(ids []int64) []datastore.AgentID {
-					agentIDs := make([]datastore.AgentID, len(ids))
-					for i, id := range ids {
-						agentIDs[i] = datastore.AgentID(id)
-					}
-					return agentIDs
-				}(rawIDs)
-				options = append(options, client.WithQueryAgentsID(agentIDs...))
-			}
-
-			rawStatuses := ctx.Int64Slice("statuses")
-			if rawStatuses != nil {
-				statuses := func(rawStatuses []int64) []datastore.AgentStatus {
-					statuses := make([]datastore.AgentStatus, len(rawStatuses))
-					for i, status := range rawStatuses {
-						statuses[i] = datastore.AgentStatus(status)
-					}
-					return statuses
-				}(rawStatuses)
-				options = append(options, client.WithQueryAgentsStatus(statuses...))
-			}
-
-			client := client.New(baseFlags.ServerURL, client.WithToken(token))
-
-			agents, _, err := client.QueryAgents(ctx.Context, options...)
-			if err != nil {
-				return errors.WithStack(apierr.Wrap(err))
-			}
-
-			hints := agentHints(baseFlags.OutputMode)
-
-			if err := format.Write(baseFlags.Format, os.Stdout, hints, clientFlag.AsAnySlice(agents)...); err != nil {
-				return errors.WithStack(err)
-			}
-
-			return nil
-		},
-	}
-}
--- a/internal/command/api/agent/spec/delete.go
+++ b/internal/command/api/agent/spec/delete.go
@ -1,67 +0,0 @@
-package spec
-
-import (
-	"os"
-
-	agentFlag "forge.cadoles.com/Cadoles/emissary/internal/command/api/agent/flag"
-	"forge.cadoles.com/Cadoles/emissary/internal/command/api/apierr"
-	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/api/flag"
-	"forge.cadoles.com/Cadoles/emissary/internal/format"
-	"forge.cadoles.com/Cadoles/emissary/internal/spec"
-	"forge.cadoles.com/Cadoles/emissary/pkg/client"
-	"github.com/pkg/errors"
-	"github.com/urfave/cli/v2"
-)
-
-func DeleteCommand() *cli.Command {
-	return &cli.Command{
-		Name:  "delete",
-		Usage: "Delete spec",
-
-		Flags: agentFlag.WithAgentFlags(
-			&cli.StringFlag{
-				Name:  "spec-name",
-				Usage: "use `NAME` as specification's name",
-			},
-		),
-		Action: func(ctx *cli.Context) error {
-			baseFlags := clientFlag.GetBaseFlags(ctx)
-
-			token, err := clientFlag.GetToken(baseFlags)
-			if err != nil {
-				return errors.WithStack(apierr.Wrap(err))
-			}
-
-			agentID, err := agentFlag.AssertAgentID(ctx)
-			if err != nil {
-				return errors.WithStack(err)
-			}
-
-			specName, err := assertSpecName(ctx)
-			if err != nil {
-				return errors.WithStack(err)
-			}
-
-			client := client.New(baseFlags.ServerURL, client.WithToken(token))
-
-			specName, err = client.DeleteAgentSpec(ctx.Context, agentID, specName)
-			if err != nil {
-				return errors.WithStack(apierr.Wrap(err))
-			}
-
-			hints := format.Hints{
-				OutputMode: baseFlags.OutputMode,
-			}
-
-			if err := format.Write(baseFlags.Format, os.Stdout, hints, struct {
-				Name spec.Name `json:"name"`
-			}{
-				Name: specName,
-			}); err != nil {
-				return errors.WithStack(err)
-			}
-
-			return nil
-		},
-	}
-}
--- a/internal/command/api/root.go
+++ b/internal/command/api/root.go
@ -1,16 +0,0 @@
-package api
-
-import (
-	"forge.cadoles.com/Cadoles/emissary/internal/command/api/agent"
-	"github.com/urfave/cli/v2"
-)
-
-func Root() *cli.Command {
-	return &cli.Command{
-		Name:  "api",
-		Usage: "API related commands",
-		Subcommands: []*cli.Command{
-			agent.Root(),
-		},
-	}
-}
--- a/internal/command/client/agent/count.go
+++ b/internal/command/client/agent/count.go
@ -3,10 +3,10 @@ package agent
 import (
 	"os"

-	"forge.cadoles.com/Cadoles/emissary/internal/command/api/apierr"
-	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/api/flag"
+	"forge.cadoles.com/Cadoles/emissary/internal/client"
+	"forge.cadoles.com/Cadoles/emissary/internal/command/client/apierr"
+	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/flag"
 	"forge.cadoles.com/Cadoles/emissary/internal/format"
-	"forge.cadoles.com/Cadoles/emissary/pkg/client"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
 )
@ -18,13 +18,7 @@ func CountCommand() *cli.Command {
 		Flags: clientFlag.ComposeFlags(),
 		Action: func(ctx *cli.Context) error {
 			baseFlags := clientFlag.GetBaseFlags(ctx)
-
-			token, err := clientFlag.GetToken(baseFlags)
-			if err != nil {
-				return errors.WithStack(apierr.Wrap(err))
-			}
-
-			client := client.New(baseFlags.ServerURL, client.WithToken(token))
+			client := client.New(baseFlags.ServerURL)

 			_, total, err := client.QueryAgents(ctx.Context)
 			if err != nil {
--- a/internal/command/client/agent/flag/flag.go
+++ b/internal/command/client/agent/flag/flag.go
@ -3,7 +3,7 @@ package flag
 import (
 	"errors"

-	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/api/flag"
+	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/flag"
 	"forge.cadoles.com/Cadoles/emissary/internal/datastore"
 	"github.com/urfave/cli/v2"
 )
--- a/internal/command/client/agent/get.go
+++ b/internal/command/client/agent/get.go
@ -3,11 +3,11 @@ package agent
 import (
 	"os"

-	agentFlag "forge.cadoles.com/Cadoles/emissary/internal/command/api/agent/flag"
-	"forge.cadoles.com/Cadoles/emissary/internal/command/api/apierr"
-	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/api/flag"
+	"forge.cadoles.com/Cadoles/emissary/internal/client"
+	agentFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/agent/flag"
+	"forge.cadoles.com/Cadoles/emissary/internal/command/client/apierr"
+	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/flag"
 	"forge.cadoles.com/Cadoles/emissary/internal/format"
-	"forge.cadoles.com/Cadoles/emissary/pkg/client"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
 )
@ -20,17 +20,12 @@ func GetCommand() *cli.Command {
 		Action: func(ctx *cli.Context) error {
 			baseFlags := clientFlag.GetBaseFlags(ctx)

-			token, err := clientFlag.GetToken(baseFlags)
-			if err != nil {
-				return errors.WithStack(apierr.Wrap(err))
-			}
-
 			agentID, err := agentFlag.AssertAgentID(ctx)
 			if err != nil {
 				return errors.WithStack(err)
 			}

-			client := client.New(baseFlags.ServerURL, client.WithToken(token))
+			client := client.New(baseFlags.ServerURL)

 			agent, err := client.GetAgent(ctx.Context, agentID)
 			if err != nil {
--- a/internal/command/client/agent/query.go
+++ b/internal/command/client/agent/query.go
@ -0,0 +1,37 @@
+package agent
+
+import (
+	"os"
+
+	"forge.cadoles.com/Cadoles/emissary/internal/client"
+	"forge.cadoles.com/Cadoles/emissary/internal/command/client/apierr"
+	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/flag"
+	"forge.cadoles.com/Cadoles/emissary/internal/format"
+	"github.com/pkg/errors"
+	"github.com/urfave/cli/v2"
+)
+
+func QueryCommand() *cli.Command {
+	return &cli.Command{
+		Name:  "query",
+		Usage: "Query agents",
+		Flags: clientFlag.ComposeFlags(),
+		Action: func(ctx *cli.Context) error {
+			baseFlags := clientFlag.GetBaseFlags(ctx)
+			client := client.New(baseFlags.ServerURL)
+
+			agents, _, err := client.QueryAgents(ctx.Context)
+			if err != nil {
+				return errors.WithStack(apierr.Wrap(err))
+			}
+
+			hints := agentHints(baseFlags.OutputMode)
+
+			if err := format.Write(baseFlags.Format, os.Stdout, hints, clientFlag.AsAnySlice(agents)...); err != nil {
+				return errors.WithStack(err)
+			}
+
+			return nil
+		},
+	}
+}
--- a/internal/command/client/agent/root.go
+++ b/internal/command/client/agent/root.go
@ -1,7 +1,7 @@
 package agent

 import (
-	"forge.cadoles.com/Cadoles/emissary/internal/command/api/agent/spec"
+	"forge.cadoles.com/Cadoles/emissary/internal/command/client/agent/spec"
 	"github.com/urfave/cli/v2"
 )

@ -14,7 +14,6 @@ func Root() *cli.Command {
 			CountCommand(),
 			UpdateCommand(),
 			GetCommand(),
-			DeleteCommand(),
 			spec.Root(),
 		},
 	}
--- a/internal/command/client/agent/spec/get.go
+++ b/internal/command/client/agent/spec/get.go
@ -3,11 +3,11 @@ package spec
 import (
 	"os"

-	agentFlag "forge.cadoles.com/Cadoles/emissary/internal/command/api/agent/flag"
-	"forge.cadoles.com/Cadoles/emissary/internal/command/api/apierr"
-	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/api/flag"
+	"forge.cadoles.com/Cadoles/emissary/internal/client"
+	agentFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/agent/flag"
+	"forge.cadoles.com/Cadoles/emissary/internal/command/client/apierr"
+	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/flag"
 	"forge.cadoles.com/Cadoles/emissary/internal/format"
-	"forge.cadoles.com/Cadoles/emissary/pkg/client"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
 )
@ -24,12 +24,7 @@ func GetCommand() *cli.Command {
 				return errors.WithStack(err)
 			}

-			token, err := clientFlag.GetToken(baseFlags)
-			if err != nil {
-				return errors.WithStack(apierr.Wrap(err))
-			}
-
-			client := client.New(baseFlags.ServerURL, client.WithToken(token))
+			client := client.New(baseFlags.ServerURL)

 			specs, err := client.GetAgentSpecs(ctx.Context, agentID)
 			if err != nil {
--- a/internal/command/client/agent/spec/root.go
+++ b/internal/command/client/agent/spec/root.go
@ -11,7 +11,6 @@ func Root() *cli.Command {
 		Subcommands: []*cli.Command{
 			GetCommand(),
 			UpdateCommand(),
-			DeleteCommand(),
 		},
 	}
 }
--- a/internal/command/client/agent/spec/update.go
+++ b/internal/command/client/agent/spec/update.go
@ -4,15 +4,20 @@ import (
 	"encoding/json"
 	"os"

-	agentFlag "forge.cadoles.com/Cadoles/emissary/internal/command/api/agent/flag"
-	"forge.cadoles.com/Cadoles/emissary/internal/command/api/apierr"
-	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/api/flag"
+	"forge.cadoles.com/Cadoles/emissary/internal/client"
+	agentFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/agent/flag"
+	"forge.cadoles.com/Cadoles/emissary/internal/command/client/apierr"
+	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/flag"
 	"forge.cadoles.com/Cadoles/emissary/internal/format"
 	"forge.cadoles.com/Cadoles/emissary/internal/spec"
-	"forge.cadoles.com/Cadoles/emissary/pkg/client"
 	jsonpatch "github.com/evanphx/json-patch/v5"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
+
+	// Import specs
+	_ "forge.cadoles.com/Cadoles/emissary/internal/spec/app"
+	_ "forge.cadoles.com/Cadoles/emissary/internal/spec/gateway"
+	_ "forge.cadoles.com/Cadoles/emissary/internal/spec/uci"
 )

 func UpdateCommand() *cli.Command {
@ -22,11 +27,11 @@ func UpdateCommand() *cli.Command {
 		Flags: agentFlag.WithAgentFlags(
 			&cli.StringFlag{
 				Name:  "spec-name",
-				Usage: "use `NAME` as specification's name",
+				Usage: "use `NAME` as spec name",
 			},
 			&cli.StringFlag{
 				Name:  "spec-data",
-				Usage: "use `DATA` as specification's data, '-' to read from STDIN",
+				Usage: "use `DATA` as spec data, '-' to read from STDIN",
 			},
 			&cli.BoolFlag{
 				Name:  "no-patch",
@ -56,12 +61,7 @@ func UpdateCommand() *cli.Command {

 			noPatch := ctx.Bool("no-patch")

-			token, err := clientFlag.GetToken(baseFlags)
-			if err != nil {
-				return errors.WithStack(apierr.Wrap(err))
-			}
-
-			client := client.New(baseFlags.ServerURL, client.WithToken(token))
+			client := client.New(baseFlags.ServerURL)

 			specs, err := client.GetAgentSpecs(ctx.Context, agentID)
 			if err != nil {
--- a/internal/command/client/agent/update.go
+++ b/internal/command/client/agent/update.go
@ -3,11 +3,11 @@ package agent
 import (
 	"os"

-	agentFlag "forge.cadoles.com/Cadoles/emissary/internal/command/api/agent/flag"
-	"forge.cadoles.com/Cadoles/emissary/internal/command/api/apierr"
-	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/api/flag"
+	"forge.cadoles.com/Cadoles/emissary/internal/client"
+	agentFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/agent/flag"
+	"forge.cadoles.com/Cadoles/emissary/internal/command/client/apierr"
+	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/flag"
 	"forge.cadoles.com/Cadoles/emissary/internal/format"
-	"forge.cadoles.com/Cadoles/emissary/pkg/client"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
 )
@ -22,20 +22,10 @@ func UpdateCommand() *cli.Command {
 				Usage: "Set `STATUS` to selected agent",
 				Value: -1,
 			},
-			&cli.StringFlag{
-				Name:  "label",
-				Usage: "Set `LABEL` to selected agent",
-				Value: "",
-			},
 		),
 		Action: func(ctx *cli.Context) error {
 			baseFlags := clientFlag.GetBaseFlags(ctx)

-			token, err := clientFlag.GetToken(baseFlags)
-			if err != nil {
-				return errors.WithStack(apierr.Wrap(err))
-			}
-
 			agentID, err := agentFlag.AssertAgentID(ctx)
 			if err != nil {
 				return errors.WithStack(err)
@ -48,12 +38,7 @@ func UpdateCommand() *cli.Command {
 				options = append(options, client.WithAgentStatus(status))
 			}

-			label := ctx.String("label")
-			if label != "" {
-				options = append(options, client.WithAgentLabel(label))
-			}
-
-			client := client.New(baseFlags.ServerURL, client.WithToken(token))
+			client := client.New(baseFlags.ServerURL)

 			agent, err := client.UpdateAgent(ctx.Context, agentID, options...)
 			if err != nil {
--- a/internal/command/client/agent/util.go
+++ b/internal/command/client/agent/util.go
@ -7,10 +7,9 @@ func agentHints(outputMode format.OutputMode) format.Hints {
 		OutputMode: outputMode,
 		Props: []format.Prop{
 			format.NewProp("ID", "ID"),
-			format.NewProp("Label", "Label"),
 			format.NewProp("Thumbprint", "Thumbprint"),
 			format.NewProp("Status", "Status"),
-			format.NewProp("ContactedAt", "ContactedAt"),
+			format.NewProp("CreatedAt", "CreatedAt"),
 			format.NewProp("UpdatedAt", "UpdatedAt"),
 		},
 	}
--- a/internal/command/client/apierr/wrap.go
+++ b/internal/command/client/apierr/wrap.go
--- a/internal/command/client/flag/flag.go
+++ b/internal/command/client/flag/flag.go
@ -2,13 +2,9 @@ package flag

 import (
 	"fmt"
-	"io/ioutil"
-	"os"
-	"strings"

 	"forge.cadoles.com/Cadoles/emissary/internal/format"
 	"forge.cadoles.com/Cadoles/emissary/internal/format/table"
-	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
 )

@ -32,17 +28,6 @@ func ComposeFlags(flags ...cli.Flag) []cli.Flag {
 			Usage:   fmt.Sprintf("use `MODE` as output mode (available: %s)", []format.OutputMode{format.OutputModeCompact, format.OutputModeWide}),
 			Value:   string(format.OutputModeCompact),
 		},
-		&cli.StringFlag{
-			Name:    "token",
-			Aliases: []string{"t"},
-			Usage:   "use `TOKEN` as authentication token",
-		},
-		&cli.StringFlag{
-			Name:      "token-file",
-			Usage:     "use `TOKEN_FILE` as file containing the authentication token",
-			Value:     ".emissary-token",
-			TakesFile: true,
-		},
 	}

 	flags = append(flags, baseFlags...)
@ -54,43 +39,16 @@ type BaseFlags struct {
 	ServerURL  string
 	Format     format.Format
 	OutputMode format.OutputMode
-	Token      string
-	TokenFile  string
 }

 func GetBaseFlags(ctx *cli.Context) *BaseFlags {
 	serverURL := ctx.String("server")
 	rawFormat := ctx.String("format")
 	rawOutputMode := ctx.String("output-mode")
-	tokenFile := ctx.String("token-file")
-	token := ctx.String("token")

 	return &BaseFlags{
 		ServerURL:  serverURL,
 		Format:     format.Format(rawFormat),
 		OutputMode: format.OutputMode(rawOutputMode),
-		Token:      token,
-		TokenFile:  tokenFile,
 	}
 }
-
-func GetToken(flags *BaseFlags) (string, error) {
-	if flags.Token != "" {
-		return flags.Token, nil
-	}
-
-	if flags.TokenFile == "" {
-		return "", nil
-	}
-
-	rawToken, err := ioutil.ReadFile(flags.TokenFile)
-	if err != nil && !errors.Is(err, os.ErrNotExist) {
-		return "", errors.WithStack(err)
-	}
-
-	if rawToken == nil {
-		return "", nil
-	}
-
-	return strings.TrimSpace(string(rawToken)), nil
-}
--- a/internal/command/client/flag/util.go
+++ b/internal/command/client/flag/util.go
--- a/internal/command/client/root.go
+++ b/internal/command/client/root.go
@ -0,0 +1,20 @@
+package client
+
+import (
+	"forge.cadoles.com/Cadoles/emissary/internal/command/client/agent"
+	"github.com/urfave/cli/v2"
+
+	// Output format
+	_ "forge.cadoles.com/Cadoles/emissary/internal/format/json"
+	_ "forge.cadoles.com/Cadoles/emissary/internal/format/table"
+)
+
+func Root() *cli.Command {
+	return &cli.Command{
+		Name:  "client",
+		Usage: "Client related commands",
+		Subcommands: []*cli.Command{
+			agent.Root(),
+		},
+	}
+}
--- a/internal/command/config/dump.go
+++ b/internal/command/config/dump.go
@ -6,6 +6,7 @@ import (
 	"forge.cadoles.com/Cadoles/emissary/internal/command/common"
 	"forge.cadoles.com/Cadoles/emissary/internal/config"
 	"github.com/pkg/errors"
+	_ "github.com/santhosh-tekuri/jsonschema/v5/httploader"
 	"github.com/urfave/cli/v2"
 	"gitlab.com/wpetit/goweb/logger"
 )
--- a/internal/command/main.go
+++ b/internal/command/main.go
@ -9,6 +9,10 @@ import (

 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
+
+	// Spec validation
+	_ "forge.cadoles.com/Cadoles/emissary/internal/spec/gateway"
+	_ "forge.cadoles.com/Cadoles/emissary/internal/spec/uci"
 )

 func Main(buildDate, projectVersion, gitRef, defaultConfigPath string, commands ...*cli.Command) {
--- a/internal/command/server/auth/create_token.go
+++ b/internal/command/server/auth/create_token.go
@ -1,59 +0,0 @@
-package auth
-
-import (
-	"fmt"
-
-	"forge.cadoles.com/Cadoles/emissary/internal/auth/thirdparty"
-	"forge.cadoles.com/Cadoles/emissary/internal/command/common"
-	"forge.cadoles.com/Cadoles/emissary/internal/jwk"
-	"github.com/lithammer/shortuuid/v4"
-	"github.com/pkg/errors"
-	"github.com/urfave/cli/v2"
-)
-
-func CreateTokenCommand() *cli.Command {
-	return &cli.Command{
-		Name:  "create-token",
-		Usage: "Create a new authentication token",
-		Flags: []cli.Flag{
-			&cli.StringFlag{
-				Name:  "role",
-				Usage: fmt.Sprintf("associate `ROLE` to the token (available: %v)", []thirdparty.Role{thirdparty.RoleReader, thirdparty.RoleWriter}),
-				Value: string(thirdparty.RoleReader),
-			},
-			&cli.StringFlag{
-				Name:  "subject",
-				Usage: "associate `SUBJECT` to the token",
-				Value: fmt.Sprintf("user-%s", shortuuid.New()),
-			},
-		},
-		Action: func(ctx *cli.Context) error {
-			conf, err := common.LoadConfig(ctx)
-			if err != nil {
-				return errors.Wrap(err, "Could not load configuration")
-			}
-
-			subject := ctx.String("subject")
-			role := ctx.String("role")
-
-			localAuth := conf.Server.Auth.Local
-			if localAuth == nil {
-				return errors.New("local auth is disabled")
-			}
-
-			key, err := jwk.LoadOrGenerate(string(localAuth.PrivateKeyPath), jwk.DefaultKeySize)
-			if err != nil {
-				return errors.WithStack(err)
-			}
-
-			token, err := thirdparty.GenerateToken(ctx.Context, key, subject, thirdparty.Role(role))
-			if err != nil {
-				return errors.WithStack(err)
-			}
-
-			fmt.Println(token)
-
-			return nil
-		},
-	}
-}
--- a/internal/command/server/auth/root.go
+++ b/internal/command/server/auth/root.go
@ -6,10 +6,8 @@ import (

 func Root() *cli.Command {
 	return &cli.Command{
-		Name:  "auth",
-		Usage: "Authentication related commands",
-		Subcommands: []*cli.Command{
-			CreateTokenCommand(),
-		},
+		Name:        "auth",
+		Usage:       "Authentication related commands",
+		Subcommands: []*cli.Command{},
 	}
 }
--- a/internal/command/server/run.go
+++ b/internal/command/server/run.go
@ -7,6 +7,7 @@ import (
 	"forge.cadoles.com/Cadoles/emissary/internal/command/common"
 	"forge.cadoles.com/Cadoles/emissary/internal/server"
 	"github.com/pkg/errors"
+	_ "github.com/santhosh-tekuri/jsonschema/v5/httploader"
 	"github.com/urfave/cli/v2"
 	"gitlab.com/wpetit/goweb/logger"
 )
--- a/internal/config/agent.go
+++ b/internal/config/agent.go
@ -1,7 +1,5 @@
 package config

-import "forge.cadoles.com/Cadoles/emissary/internal/agent/controller/openwrt"
-
 type AgentConfig struct {
 	ServerURL              InterpolatedString     `yaml:"serverUrl"`
 	PrivateKeyPath         InterpolatedString     `yaml:"privateKeyPath"`
@ -19,11 +17,9 @@ type ShellCollectorConfig struct {
 type ControllersConfig struct {
 	Persistence PersistenceControllerConfig `yaml:"persistence"`
 	Spec        SpecControllerConfig        `yaml:"spec"`
-	Proxy       ProxyControllerConfig       `yaml:"proxy"`
+	Gateway     GatewayControllerConfig     `yaml:"gateway"`
 	UCI         UCIControllerConfig         `yaml:"uci"`
 	App         AppControllerConfig         `yaml:"app"`
-	SysUpgrade  SysUpgradeControllerConfig  `yaml:"sysupgrade"`
-	MDNS        MDNSControllerConfig        `yaml:"mdns"`
 }

 type PersistenceControllerConfig struct {
@ -34,7 +30,7 @@ type PersistenceControllerConfig struct {
 type SpecControllerConfig struct {
 	Enabled InterpolatedBool `yaml:"enabled"`
 }
-type ProxyControllerConfig struct {
+type GatewayControllerConfig struct {
 	Enabled InterpolatedBool `yaml:"enabled"`
 }

@ -50,16 +46,6 @@ type AppControllerConfig struct {
 	DownloadDir InterpolatedString `yaml:"downloadDir"`
 }

-type SysUpgradeControllerConfig struct {
-	Enabled                InterpolatedBool        `yaml:"enabled"`
-	SysUpgradeCommand      InterpolatedStringSlice `yaml:"sysupgradeCommand"`
-	FirmwareVersionCommand InterpolatedStringSlice `yaml:"firmwareVersionCommand"`
-}
-
-type MDNSControllerConfig struct {
-	Enabled InterpolatedBool `yaml:"enabled"`
-}
-
 func NewDefaultAgentConfig() AgentConfig {
 	return AgentConfig{
 		ServerURL:              "http://127.0.0.1:3000",
@ -73,7 +59,7 @@ func NewDefaultAgentConfig() AgentConfig {
 				Enabled:   true,
 				StateFile: "state.json",
 			},
-			Proxy: ProxyControllerConfig{
+			Gateway: GatewayControllerConfig{
 				Enabled: true,
 			},
 			UCI: UCIControllerConfig{
@ -86,14 +72,6 @@ func NewDefaultAgentConfig() AgentConfig {
 				DataDir:     "apps/data",
 				DownloadDir: "apps/bundles",
 			},
-			SysUpgrade: SysUpgradeControllerConfig{
-				Enabled:                true,
-				SysUpgradeCommand:      InterpolatedStringSlice{"sysupgrade", "--force", "-u", "-v", openwrt.FirmwareFileTemplate},
-				FirmwareVersionCommand: InterpolatedStringSlice{"sh", "-c", `source /etc/openwrt_release && echo "$DISTRIB_ID-$DISTRIB_RELEASE-$DISTRIB_REVISION"`},
-			},
-			MDNS: MDNSControllerConfig{
-				Enabled: true,
-			},
 		},
 		Collectors: []ShellCollectorConfig{
 			{
--- a/internal/config/database.go
+++ b/internal/config/database.go
@ -15,6 +15,6 @@ type DatabaseConfig struct {
 func NewDefaultDatabaseConfig() DatabaseConfig {
 	return DatabaseConfig{
 		Driver: "sqlite",
-		DSN:    "sqlite://emissary.sqlite?_pragma=foreign_keys(1)&_pragma=busy_timeout=60000",
+		DSN:    "sqlite://emissary.sqlite",
 	}
 }
--- a/internal/config/environment.go
+++ b/internal/config/environment.go
@ -4,7 +4,6 @@ import (
 	"os"
 	"regexp"
 	"strconv"
-	"time"

 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v3"
@ -124,37 +123,3 @@ func (iss *InterpolatedStringSlice) UnmarshalYAML(value *yaml.Node) error {

 	return nil
 }
-
-type InterpolatedDuration time.Duration
-
-func (id *InterpolatedDuration) UnmarshalYAML(value *yaml.Node) error {
-	var str string
-
-	if err := value.Decode(&str); err != nil {
-		return errors.Wrapf(err, "could not decode value '%v' (line '%d') into string", value.Value, value.Line)
-	}
-
-	if match := reVar.FindStringSubmatch(str); len(match) > 0 {
-		str = os.Getenv(match[1])
-	}
-
-	duration, err := time.ParseDuration(str)
-	if err != nil {
-		return errors.Wrapf(err, "could not parse duration '%v',  line '%d'", str, value.Line)
-	}
-
-	*id = InterpolatedDuration(duration)
-
-	return nil
-}
-
-func (id *InterpolatedDuration) MarshalYAML() (interface{}, error) {
-	duration := time.Duration(*id)
-
-	return duration.String(), nil
-}
-
-func NewInterpolatedDuration(d time.Duration) *InterpolatedDuration {
-	id := InterpolatedDuration(d)
-	return &id
-}
--- a/internal/config/server.go
+++ b/internal/config/server.go
@ -1,50 +1,19 @@
 package config

-import (
-	"fmt"
-
-	"forge.cadoles.com/Cadoles/emissary/internal/auth/thirdparty"
-)
-
 type ServerConfig struct {
-	HTTP     HTTPConfig     `yaml:"http"`
-	Database DatabaseConfig `yaml:"database"`
-	CORS     CORSConfig     `yaml:"cors"`
-	Auth     AuthConfig     `yaml:"auth"`
+	PrivateKeyPath InterpolatedString `yaml:"privateKeyPath"`
+	Issuer         InterpolatedString `yaml:"issuer"`
+	HTTP           HTTPConfig         `yaml:"http"`
+	Database       DatabaseConfig     `yaml:"database"`
+	CORS           CORSConfig         `yaml:"cors"`
 }

 func NewDefaultServerConfig() ServerConfig {
 	return ServerConfig{
-		HTTP:     NewDefaultHTTPConfig(),
-		Database: NewDefaultDatabaseConfig(),
-		CORS:     NewDefaultCORSConfig(),
-		Auth:     NewDefaultAuthConfig(),
+		PrivateKeyPath: "server-key.json",
+		Issuer:         "http://127.0.0.1:3000",
+		HTTP:           NewDefaultHTTPConfig(),
+		Database:       NewDefaultDatabaseConfig(),
+		CORS:           NewDefaultCORSConfig(),
 	}
 }
-
-type AuthConfig struct {
-	Local               *LocalAuthConfig  `yaml:"local"`
-	Remote              *RemoteAuthConfig `yaml:"remote"`
-	RoleExtractionRules []string          `yaml:"roleExtractionRules"`
-}
-
-func NewDefaultAuthConfig() AuthConfig {
-	return AuthConfig{
-		Local: &LocalAuthConfig{
-			PrivateKeyPath: "server-key.json",
-		},
-		Remote: nil,
-		RoleExtractionRules: []string{
-			fmt.Sprintf("jwt.%s != nil ? str(jwt.%s) : ''", thirdparty.DefaultRoleKey, thirdparty.DefaultRoleKey),
-		},
-	}
-}
-
-type LocalAuthConfig struct {
-	PrivateKeyPath InterpolatedString `yaml:"privateKeyPath"`
-}
-
-type RemoteAuthConfig struct {
-	JsonWebKeySetURL InterpolatedString    `yaml:"jwksUrl"`
-	RefreshInterval  *InterpolatedDuration `yaml:"refreshInterval"`
-}
--- a/internal/datastore/agent.go
+++ b/internal/datastore/agent.go
@ -20,15 +20,13 @@ const (
 )

 type Agent struct {
-	ID          AgentID             `json:"id"`
-	Label       string              `json:"label"`
-	Thumbprint  string              `json:"thumbprint"`
-	KeySet      *SerializableKeySet `json:"keyset,omitempty"`
-	Metadata    map[string]any      `json:"metadata,omitempty"`
-	Status      AgentStatus         `json:"status"`
-	CreatedAt   time.Time           `json:"createdAt"`
-	UpdatedAt   time.Time           `json:"updatedAt"`
-	ContactedAt *time.Time          `json:"contactedAt,omitempty"`
+	ID         AgentID             `json:"id"`
+	Thumbprint string              `json:"thumbprint"`
+	KeySet     *SerializableKeySet `json:"keyset,omitempty"`
+	Metadata   map[string]any      `json:"metadata,omitempty"`
+	Status     AgentStatus         `json:"status"`
+	CreatedAt  time.Time           `json:"createdAt"`
+	UpdatedAt  time.Time           `json:"updatedAt"`
 }

 type SerializableKeySet struct {
--- a/internal/datastore/agent_repository.go
+++ b/internal/datastore/agent_repository.go
@ -2,7 +2,6 @@ package datastore

 import (
 	"context"
-	"time"

 	"github.com/lestrrat-go/jwx/v2/jwk"
 )
@ -69,12 +68,10 @@ func WithAgentQueryThumbprints(thumbprints ...string) AgentQueryOptionFunc {
 type AgentUpdateOptionFunc func(*AgentUpdateOptions)

 type AgentUpdateOptions struct {
-	Label       *string
-	Status      *AgentStatus
-	ContactedAt *time.Time
-	Metadata    *map[string]any
-	KeySet      *jwk.Set
-	Thumbprint  *string
+	Status     *AgentStatus
+	Metadata   *map[string]any
+	KeySet     *jwk.Set
+	Thumbprint *string
 }

 func WithAgentUpdateStatus(status AgentStatus) AgentUpdateOptionFunc {
@ -100,15 +97,3 @@ func WithAgentUpdateThumbprint(thumbprint string) AgentUpdateOptionFunc {
 		opts.Thumbprint = &thumbprint
 	}
 }
-
-func WithAgentUpdateLabel(label string) AgentUpdateOptionFunc {
-	return func(opts *AgentUpdateOptions) {
-		opts.Label = &label
-	}
-}
-
-func WithAgentUpdateContactedAt(contactedAt time.Time) AgentUpdateOptionFunc {
-	return func(opts *AgentUpdateOptions) {
-		opts.ContactedAt = &contactedAt
-	}
-}
--- a/internal/datastore/sqlite/agent_repository.go
+++ b/internal/datastore/sqlite/agent_repository.go
@ -20,24 +20,9 @@ type AgentRepository struct {

 // DeleteSpec implements datastore.AgentRepository.
 func (r *AgentRepository) DeleteSpec(ctx context.Context, agentID datastore.AgentID, name string) error {
-	err := r.withTx(ctx, func(tx *sql.Tx) error {
-		exists, err := r.agentExists(ctx, tx, agentID)
-		if err != nil {
-			return errors.WithStack(err)
-		}
+	query := `DELETE FROM specs WHERE agent_id = $1 AND name = $2`

-		if !exists {
-			return errors.WithStack(datastore.ErrNotFound)
-		}
-
-		query := `DELETE FROM specs WHERE agent_id = $1 AND name = $2`
-
-		if _, err = tx.ExecContext(ctx, query, agentID, name); err != nil {
-			return errors.WithStack(err)
-		}
-
-		return nil
-	})
+	_, err := r.db.ExecContext(ctx, query, agentID, name)
 	if err != nil {
 		return errors.WithStack(err)
 	}
@ -49,57 +34,33 @@ func (r *AgentRepository) DeleteSpec(ctx context.Context, agentID datastore.Agen
 func (r *AgentRepository) GetSpecs(ctx context.Context, agentID datastore.AgentID) ([]*datastore.Spec, error) {
 	specs := make([]*datastore.Spec, 0)

-	err := r.withTx(ctx, func(tx *sql.Tx) error {
-		exists, err := r.agentExists(ctx, tx, agentID)
-		if err != nil {
-			return errors.WithStack(err)
-		}
-
-		if !exists {
-			return errors.WithStack(datastore.ErrNotFound)
-		}
-
-		query := `
+	query := `
 		SELECT id, name, revision, data, created_at, updated_at
 		FROM specs
 		WHERE agent_id = $1
-		`
+	`

-		rows, err := tx.QueryContext(ctx, query, agentID)
-		if err != nil {
-			return errors.WithStack(err)
-		}
-
-		defer func() {
-			if err := rows.Close(); err != nil {
-				logger.Error(ctx, "could not close rows", logger.E(errors.WithStack(err)))
-			}
-		}()
-
-		for rows.Next() {
-			spec := &datastore.Spec{}
-
-			data := JSONMap{}
-
-			if err := rows.Scan(&spec.ID, &spec.Name, &spec.Revision, &data, &spec.CreatedAt, &spec.UpdatedAt); err != nil {
-				return errors.WithStack(err)
-			}
-
-			spec.Data = data
-
-			specs = append(specs, spec)
-		}
-
-		if err := rows.Err(); err != nil {
-			return errors.WithStack(err)
-		}
-
-		return nil
-	})
+	rows, err := r.db.QueryContext(ctx, query, agentID)
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}

+	defer rows.Close()
+
+	for rows.Next() {
+		spec := &datastore.Spec{}
+
+		data := JSONMap{}
+
+		if err := rows.Scan(&spec.ID, &spec.Name, &spec.Revision, &data, &spec.CreatedAt, &spec.UpdatedAt); err != nil {
+			return nil, errors.WithStack(err)
+		}
+
+		spec.Data = data
+
+		specs = append(specs, spec)
+	}
+
 	return specs, nil
 }

@ -108,15 +69,6 @@ func (r *AgentRepository) UpdateSpec(ctx context.Context, agentID datastore.Agen
 	spec := &datastore.Spec{}

 	err := r.withTx(ctx, func(tx *sql.Tx) error {
-		exists, err := r.agentExists(ctx, tx, agentID)
-		if err != nil {
-			return errors.WithStack(err)
-		}
-
-		if !exists {
-			return errors.WithStack(datastore.ErrNotFound)
-		}
-
 		now := time.Now().UTC()

 		query := `
@ -136,7 +88,7 @@ func (r *AgentRepository) UpdateSpec(ctx context.Context, agentID datastore.Agen

 		data := JSONMap{}

-		err = row.Scan(&spec.ID, &spec.Name, &spec.Revision, &data, &spec.CreatedAt, &spec.UpdatedAt)
+		err := row.Scan(&spec.ID, &spec.Name, &spec.Revision, &data, &spec.CreatedAt, &spec.UpdatedAt)
 		if err != nil {
 			if errors.Is(err, sql.ErrNoRows) {
 				return errors.WithStack(datastore.ErrUnexpectedRevision)
@ -167,7 +119,7 @@ func (r *AgentRepository) Query(ctx context.Context, opts ...datastore.AgentQuer
 	count := 0

 	err := r.withTx(ctx, func(tx *sql.Tx) error {
-		query := `SELECT id, label, thumbprint, status, contacted_at, created_at, updated_at FROM agents`
+		query := `SELECT id, thumbprint, status, created_at, updated_at FROM agents`

 		limit := 10
 		if options.Limit != nil {
@ -224,34 +176,22 @@ func (r *AgentRepository) Query(ctx context.Context, opts ...datastore.AgentQuer
 			return errors.WithStack(err)
 		}

-		defer func() {
-			if err := rows.Close(); err != nil {
-				logger.Error(ctx, "could not close rows", logger.E(errors.WithStack(err)))
-			}
-		}()
+		defer rows.Close()

 		for rows.Next() {
 			agent := &datastore.Agent{}

 			metadata := JSONMap{}
-			contactedAt := sql.NullTime{}

-			if err := rows.Scan(&agent.ID, &agent.Label, &agent.Thumbprint, &agent.Status, &contactedAt, &agent.CreatedAt, &agent.UpdatedAt); err != nil {
+			if err := rows.Scan(&agent.ID, &agent.Thumbprint, &agent.Status, &agent.CreatedAt, &agent.UpdatedAt); err != nil {
 				return errors.WithStack(err)
 			}

 			agent.Metadata = metadata
-			if contactedAt.Valid {
-				agent.ContactedAt = &contactedAt.Time
-			}

 			agents = append(agents, agent)
 		}

-		if err := rows.Err(); err != nil {
-			return errors.WithStack(err)
-		}
-
 		row := tx.QueryRowContext(ctx, `SELECT count(id) FROM agents `+filters, args...)
 		if err := row.Scan(&count); err != nil {
 			return errors.WithStack(err)
@ -329,21 +269,9 @@ func (r *AgentRepository) Create(ctx context.Context, thumbprint string, keySet

 // Delete implements datastore.AgentRepository
 func (r *AgentRepository) Delete(ctx context.Context, id datastore.AgentID) error {
-	err := r.withTx(ctx, func(tx *sql.Tx) error {
-		query := `DELETE FROM agents WHERE id = $1`
-		_, err := r.db.ExecContext(ctx, query, id)
-		if err != nil {
-			return errors.WithStack(err)
-		}
+	query := `DELETE FROM agents WHERE id = $1`

-		query = `DELETE FROM specs WHERE agent_id = $1`
-		_, err = r.db.ExecContext(ctx, query, id)
-		if err != nil {
-			return errors.WithStack(err)
-		}
-
-		return nil
-	})
+	_, err := r.db.ExecContext(ctx, query, id)
 	if err != nil {
 		return errors.WithStack(err)
 	}
@ -359,7 +287,7 @@ func (r *AgentRepository) Get(ctx context.Context, id datastore.AgentID) (*datas

 	err := r.withTx(ctx, func(tx *sql.Tx) error {
 		query := `
-		SELECT "id", "label", "thumbprint", "keyset", "metadata", "status", "contacted_at", "created_at", "updated_at"
+		SELECT "id", "thumbprint", "keyset", "metadata", "status", "created_at", "updated_at"
 		FROM agents
 		WHERE id = $1
 		`
@ -367,10 +295,9 @@ func (r *AgentRepository) Get(ctx context.Context, id datastore.AgentID) (*datas
 		row := r.db.QueryRowContext(ctx, query, id)

 		metadata := JSONMap{}
-		contactedAt := sql.NullTime{}
 		var rawKeySet []byte

-		if err := row.Scan(&agent.ID, &agent.Label, &agent.Thumbprint, &rawKeySet, &metadata, &agent.Status, &contactedAt, &agent.CreatedAt, &agent.UpdatedAt); err != nil {
+		if err := row.Scan(&agent.ID, &agent.Thumbprint, &rawKeySet, &metadata, &agent.Status, &agent.CreatedAt, &agent.UpdatedAt); err != nil {
 			if errors.Is(err, sql.ErrNoRows) {
 				return datastore.ErrNotFound
 			}
@ -379,9 +306,6 @@ func (r *AgentRepository) Get(ctx context.Context, id datastore.AgentID) (*datas
 		}

 		agent.Metadata = metadata
-		if contactedAt.Valid {
-			agent.ContactedAt = &contactedAt.Time
-		}

 		keySet := jwk.NewSet()
 		if err := json.Unmarshal(rawKeySet, &keySet); err != nil {
@ -410,11 +334,15 @@ func (r *AgentRepository) Update(ctx context.Context, id datastore.AgentID, opts

 	err := r.withTx(ctx, func(tx *sql.Tx) error {
 		query := `
-			UPDATE agents SET id = $1
+			UPDATE agents SET updated_at = $2
 		`

-		args := []any{id}
-		index := 2
+		now := time.Now().UTC()
+
+		args := []any{
+			id, now,
+		}
+		index := 3

 		if options.Status != nil {
 			query += fmt.Sprintf(`, status = $%d`, index)
@ -439,51 +367,23 @@ func (r *AgentRepository) Update(ctx context.Context, id datastore.AgentID, opts
 			index++
 		}

-		if options.Label != nil {
-			query += fmt.Sprintf(`, label = $%d`, index)
-			args = append(args, *options.Label)
-			index++
-		}
-
-		if options.ContactedAt != nil {
-			query += fmt.Sprintf(`, contacted_at = $%d`, index)
-			utc := options.ContactedAt.UTC()
-			args = append(args, utc)
-			index++
-		}
-
 		if options.Metadata != nil {
 			query += fmt.Sprintf(`, metadata = $%d`, index)
 			args = append(args, JSONMap(*options.Metadata))
 			index++
 		}

-		updated := options.Metadata != nil ||
-			options.Status != nil ||
-			options.Label != nil ||
-			options.KeySet != nil ||
-			options.Thumbprint != nil
-		if updated {
-			now := time.Now().UTC()
-			query += fmt.Sprintf(`, updated_at = $%d`, index)
-			args = append(args, now)
-			index++
-		}
-
 		query += `
 			WHERE id = $1 
-			RETURNING "id", "label", "thumbprint", "keyset", "metadata", "status", "contacted_at", "created_at", "updated_at"
+			RETURNING "id", "thumbprint", "keyset", "metadata", "status", "created_at", "updated_at"
 		`

-		logger.Debug(ctx, "executing query", logger.F("query", query), logger.F("args", args))
-
 		row := tx.QueryRowContext(ctx, query, args...)

 		metadata := JSONMap{}
-		contactedAt := sql.NullTime{}
 		var rawKeySet []byte

-		if err := row.Scan(&agent.ID, &agent.Label, &agent.Thumbprint, &rawKeySet, &metadata, &agent.Status, &contactedAt, &agent.CreatedAt, &agent.UpdatedAt); err != nil {
+		if err := row.Scan(&agent.ID, &agent.Thumbprint, &rawKeySet, &metadata, &agent.Status, &agent.CreatedAt, &agent.UpdatedAt); err != nil {
 			if errors.Is(err, sql.ErrNoRows) {
 				return datastore.ErrNotFound
 			}
@ -492,9 +392,6 @@ func (r *AgentRepository) Update(ctx context.Context, id datastore.AgentID, opts
 		}

 		agent.Metadata = metadata
-		if contactedAt.Valid {
-			agent.ContactedAt = &contactedAt.Time
-		}

 		keySet := jwk.NewSet()
 		if err := json.Unmarshal(rawKeySet, &keySet); err != nil {
@ -512,28 +409,8 @@ func (r *AgentRepository) Update(ctx context.Context, id datastore.AgentID, opts
 	return agent, nil
 }

-func (r *AgentRepository) agentExists(ctx context.Context, tx *sql.Tx, agentID datastore.AgentID) (bool, error) {
-	row := tx.QueryRowContext(ctx, `SELECT count(id) FROM agents WHERE id = $1`, agentID)
-
-	var count int
-
-	if err := row.Scan(&count); err != nil {
-		if errors.Is(err, sql.ErrNoRows) {
-			return false, errors.WithStack(datastore.ErrNotFound)
-		}
-
-		return false, errors.WithStack(err)
-	}
-
-	if count == 0 {
-		return false, errors.WithStack(datastore.ErrNotFound)
-	}
-
-	return true, nil
-}
-
 func (r *AgentRepository) withTx(ctx context.Context, fn func(*sql.Tx) error) error {
-	tx, err := r.db.BeginTx(ctx, nil)
+	tx, err := r.db.Begin()
 	if err != nil {
 		return errors.WithStack(err)
 	}
--- a/internal/datastore/sqlite/agent_repository_test.go
+++ b/internal/datastore/sqlite/agent_repository_test.go
@ -1,46 +0,0 @@
-package sqlite
-
-import (
-	"database/sql"
-	"fmt"
-	"os"
-	"testing"
-	"time"
-
-	"forge.cadoles.com/Cadoles/emissary/internal/datastore/testsuite"
-	"forge.cadoles.com/Cadoles/emissary/internal/migrate"
-	"github.com/pkg/errors"
-	"gitlab.com/wpetit/goweb/logger"
-
-	_ "modernc.org/sqlite"
-)
-
-func TestSQLiteAgentRepository(t *testing.T) {
-	logger.SetLevel(logger.LevelDebug)
-
-	file := "testdata/agent_repository_test.sqlite"
-
-	if err := os.Remove(file); err != nil && !errors.Is(err, os.ErrNotExist) {
-		t.Fatalf("%+v", errors.WithStack(err))
-	}
-
-	dsn := fmt.Sprintf("%s?_pragma=foreign_keys(1)&_pragma=busy_timeout=%d", file, (60 * time.Second).Milliseconds())
-
-	migr, err := migrate.New("../../../migrations", "sqlite", "sqlite://"+dsn)
-	if err != nil {
-		t.Fatalf("%+v", errors.WithStack(err))
-	}
-
-	if err := migr.Up(); err != nil {
-		t.Fatalf("%+v", errors.WithStack(err))
-	}
-
-	db, err := sql.Open("sqlite", dsn)
-	if err != nil {
-		t.Fatalf("%+v", errors.WithStack(err))
-	}
-
-	repo := NewAgentRepository(db)
-
-	testsuite.TestAgentRepository(t, repo)
-}
--- a/internal/datastore/sqlite/testdata/.gitignore
+++ b/internal/datastore/sqlite/testdata/.gitignore
@ -1 +0,0 @@
-*.sqlite*
--- a/internal/datastore/testsuite/agent_repository.go
+++ b/internal/datastore/testsuite/agent_repository.go
@ -1,14 +0,0 @@
-package testsuite
-
-import (
-	"testing"
-
-	"forge.cadoles.com/Cadoles/emissary/internal/datastore"
-)
-
-func TestAgentRepository(t *testing.T, repo datastore.AgentRepository) {
-	t.Run("Cases", func(t *testing.T) {
-		t.Parallel()
-		runAgentRepositoryTests(t, repo)
-	})
-}
--- a/internal/datastore/testsuite/agent_repository_cases.go
+++ b/internal/datastore/testsuite/agent_repository_cases.go
@ -1,129 +0,0 @@
-package testsuite
-
-import (
-	"context"
-	"testing"
-
-	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/mdns/spec"
-	"forge.cadoles.com/Cadoles/emissary/internal/datastore"
-	"forge.cadoles.com/Cadoles/emissary/internal/jwk"
-	"github.com/pkg/errors"
-)
-
-type agentRepositoryTestCase struct {
-	Name string
-	Skip bool
-	Run  func(ctx context.Context, repo datastore.AgentRepository) error
-}
-
-var agentRepositoryTestCases = []agentRepositoryTestCase{
-	{
-		Name: "Create a new agent",
-		Run: func(ctx context.Context, repo datastore.AgentRepository) error {
-			thumbprint := "foo"
-			keySet := jwk.NewSet()
-			var metadata map[string]any
-
-			agent, err := repo.Create(ctx, thumbprint, keySet, metadata)
-			if err != nil {
-				return errors.WithStack(err)
-			}
-
-			if agent.CreatedAt.IsZero() {
-				return errors.Errorf("agent.CreatedAt should not be zero time")
-			}
-
-			if agent.UpdatedAt.IsZero() {
-				return errors.Errorf("agent.UpdatedAt should not be zero time")
-			}
-
-			if e, g := datastore.AgentStatusPending, agent.Status; e != g {
-				return errors.Errorf("agent.Status: expected '%v', got '%v'", e, g)
-			}
-
-			return nil
-		},
-	},
-	{
-		Name: "Try to update spec for an unexistant agent",
-		Run: func(ctx context.Context, repo datastore.AgentRepository) error {
-			var unexistantAgentID datastore.AgentID = 9999
-			var specData map[string]any
-
-			agent, err := repo.UpdateSpec(ctx, unexistantAgentID, string(spec.Name), 0, specData)
-			if err == nil {
-				return errors.New("error should not be nil")
-			}
-
-			if !errors.Is(err, datastore.ErrNotFound) {
-				return errors.Errorf("error should be datastore.ErrNotFound, got '%+v'", err)
-			}
-
-			if agent != nil {
-				return errors.New("agent should be nil")
-			}
-
-			return nil
-		},
-	},
-	{
-		Name: "Try to delete spec of an unexistant agent",
-		Run: func(ctx context.Context, repo datastore.AgentRepository) error {
-			var unexistantAgentID datastore.AgentID = 9999
-
-			err := repo.DeleteSpec(ctx, unexistantAgentID, string(spec.Name))
-			if err == nil {
-				return errors.New("error should not be nil")
-			}
-
-			if !errors.Is(err, datastore.ErrNotFound) {
-				return errors.Errorf("error should be datastore.ErrNotFound, got '%+v'", err)
-			}
-
-			return nil
-		},
-	},
-	{
-		Name: "Try to get specs of an unexistant agent",
-		Run: func(ctx context.Context, repo datastore.AgentRepository) error {
-			var unexistantAgentID datastore.AgentID = 9999
-
-			specs, err := repo.GetSpecs(ctx, unexistantAgentID)
-			if err == nil {
-				return errors.New("error should not be nil")
-			}
-
-			if !errors.Is(err, datastore.ErrNotFound) {
-				return errors.Errorf("error should be datastore.ErrNotFound, got '%+v'", err)
-			}
-
-			if specs != nil {
-				return errors.Errorf("specs should be nil, got '%+v'", err)
-			}
-
-			return nil
-		},
-	},
-}
-
-func runAgentRepositoryTests(t *testing.T, repo datastore.AgentRepository) {
-	for _, tc := range agentRepositoryTestCases {
-		func(tc agentRepositoryTestCase) {
-			t.Run(tc.Name, func(t *testing.T) {
-				t.Parallel()
-
-				if tc.Skip {
-					t.SkipNow()
-
-					return
-				}
-
-				ctx := context.Background()
-
-				if err := tc.Run(ctx, repo); err != nil {
-					t.Errorf("%+v", errors.WithStack(err))
-				}
-			})
-		}(tc)
-	}
-}
--- a/Show More
+++ b/Show More