From 59f595e17e7aa00f9580f26c5eb3a34561581a8b Mon Sep 17 00:00:00 2001
From: Pierre-Louis GONON <pierre-louis.gonon@dalibo.com>
Date: Wed, 22 Jul 2026 10:41:11 +0200
Subject: [PATCH] Fix subsearches error in yaml

Since the configuration file is normalised before
decoding, joins are already replaced by subsearches.
---
 internal/config/yaml_test.go | 20 ++++++++++++++++++--
 internal/ldap/search.go      |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/internal/config/yaml_test.go b/internal/config/yaml_test.go
index fa79ca36..278235fe 100644
--- a/internal/config/yaml_test.go
+++ b/internal/config/yaml_test.go
@@ -43,12 +43,28 @@ func TestStrictYaml(t *testing.T) {
 	  databases_query: [nominal]
 	ldap:
 	  password: "secret"
+	rules:
+	- description: "Readonly"
+	  ldapsearch:
+	    base: "ou=groups,o=test"
+	    scope: one
+	    filter: "(&(objectClass=groupOfNames)(cn=admin)(member=*))"
+	    joins:
+	      member:
+	        scope: base
+	        filter: "(|(objectClass=inetOrgPerson)(objectClass=person))"
+	  roles:
+	    - name: "{member.uid}"
 	`)
 	var value map[string]any
-	yaml.Unmarshal([]byte(rawYaml), &value) //nolint:errcheck
+	err := yaml.Unmarshal([]byte(rawYaml), &value)
+	r.Nil(err)
+
+	value, err = config.NormalizeConfigRoot(value)
+	r.Nil(err)
 
 	c := config.New()
-	err := c.DecodeYaml(value)
+	err = c.DecodeYaml(value)
 	r.EqualError(err, "invalid configuration file\n'ldap' has invalid keys: password\n'postgres' has invalid keys: uri")
 	errs := errorlist.Unwrap(err)
 	r.Len(errs, 3)
diff --git a/internal/ldap/search.go b/internal/ldap/search.go
index 33be2937..6fba0835 100644
--- a/internal/ldap/search.go
+++ b/internal/ldap/search.go
@@ -10,7 +10,7 @@ type Search struct {
 	Scope       Scope
 	Filter      string
 	Attributes  []string
-	Subsearches map[string]Subsearch `mapstructure:"joins"`
+	Subsearches map[string]Subsearch
 }
 
 func (s Search) SubsearchAttribute() string {