Updated directory expressions

resources/config/directory/internal.toml

@@ -9,9 +9,11 @@ disable = true
 
 [directory."internal".options]
 catch-all = true
-#catch-all = { map = "(.+)@(.+)$", to = "info@${2}" }
+#catch-all = [ { if = "matches('(.+)@(.+)$', address)", then = "'info@' + $2" },
+#              { else = false } ]
 subaddressing = true
-#subaddressing = { map = "^([^.]+)\.([^.]+)@(.+)$", to = "${2}@${3}" }
+#subaddressing = [ { if = "matches('^([^.]+)\.([^.]+)@(.+)$', address)", then = "$2 + '@' + $3" }, 
+#                  { else = false } ]
 
 [directory."internal".cache]
 entries = 500

resources/config/directory/ldap.toml

@@ -27,9 +27,11 @@ ttl = {positive = '1h', negative = '10m'}
 
 [directory."ldap".options]
 catch-all = true
-#catch-all = { map = "(.+)@(.+)$", to = "info@${2}" }
+#catch-all = [ { if = "matches('(.+)@(.+)$', address)", then = "'info@' + $2" },
+#              { else = false } ]
 subaddressing = true
-#subaddressing = { map = "^([^.]+)\.([^.]+)@(.+)$", to = "${2}@${3}" }
+#subaddressing = [ { if = "matches('^([^.]+)\.([^.]+)@(.+)$', address)", then = "$2 + '@' + $3" }, 
+#                  { else = false } ]
 
 [directory."ldap".pool]
 max-connections = 10

resources/config/directory/memory.toml

@@ -8,9 +8,11 @@ disable = true
 
 [directory."memory".options]
 catch-all = true
-#catch-all = { map = "(.+)@(.+)$", to = "info@${2}" }
+#catch-all = [ { if = "matches('(.+)@(.+)$', address)", then = "'info@' + $2" },
+#              { else = false } ]
 subaddressing = true
-#subaddressing = { map = "^([^.]+)\.([^.]+)@(.+)$", to = "${2}@${3}" }
+#subaddressing = [ { if = "matches('^([^.]+)\.([^.]+)@(.+)$', address)", then = "$2 + '@' + $3" }, 
+#                  { else = false } ]
 
 [[directory."memory".principals]]
 name = "admin"

resources/config/directory/sql.toml

@@ -9,9 +9,11 @@ disable = true
 
 [directory."sql".options]
 catch-all = true
-#catch-all = { map = "(.+)@(.+)$", to = "info@${2}" }
+#catch-all = [ { if = "matches('(.+)@(.+)$', address)", then = "'info@' + $2" },
+#              { else = false } ]
 subaddressing = true
-#subaddressing = { map = "^([^.]+)\.([^.]+)@(.+)$", to = "${2}@${3}" }
+#subaddressing = [ { if = "matches('^([^.]+)\.([^.]+)@(.+)$', address)", then = "$2 + '@' + $3" }, 
+#                  { else = false } ]
 
 [directory."sql".cache]
 entries = 500