New variable expansion syntax

.github/actions/spelling/allow.txt

@@ -25,3 +25,8 @@ spnego
 ssh
 ubuntu
 workarounds
+lfill
+ond
+retuns
+rfill
+Uppercases

.github/actions/spelling/expect.txt

@@ -54,6 +54,7 @@ bantime
 barfoo
 bayes
 bcc
+benumber
 bernat
 bindir
 bitfield
@@ -62,8 +63,8 @@ blitiri
 bodystructure
 Boehm
 Bokmal
-Borenstein
 boollist
+Borenstein
 bsd
 bsdauth
 bsearch
@@ -134,6 +135,7 @@ deleteheader
 dentries
 DESTNAME
 destuser
+dextended
 DHd
 Dhesi
 dirnamename
@@ -218,6 +220,7 @@ fgrep
 fieldstr
 fileinto
 findtime
+findutils
 firewalls
 firstsaved
 flatcurve
@@ -265,6 +268,7 @@ hba
 hdr
 hendrik
 hexblob
+hexlify
 hexuc
 hhmm
 highestmodseq
@@ -356,6 +360,7 @@ ldaps
 LDFLAGS
 ldif
 leastconn
+lenumber
 letsencrypt
 LFs
 lgdb
@@ -574,8 +579,8 @@ opie
 opsec
 optboolean
 optname
-OR'ing
 orcpt
+OR'ing
 ORing
 OSFILE
 otherinstance
@@ -779,6 +784,7 @@ sysexits
 syslogd
 syslogging
 sysreport
+systemt
 tabindex
 TABLEGEN
 Taddressverification
@@ -837,6 +843,7 @@ unaccessed
 unaliased
 unauth
 UNDRAFT
+unhexlify
 unhibernate
 unhibernated
 unhibernating

data/settings.js

@@ -4333,7 +4333,7 @@ If \`no\`, there will be no report for the authentication result.`
 	},
 
 	auth_policy_request_attributes: {
-		default: 'login=%{requested_username} pwhash=%{hashed_password} remote=%{rip} device_id=%{client_id} protocol=%{protocol} session_id=%{session} fail_type=%{fail_type}',
+		default: 'login=%{requested_username} pwhash=%{hashed_password} remote=%{remote_ip} device_id=%{client_id} protocol=%{protocol} session_id=%{session} fail_type=%{fail_type}',
 		changed: {
 			settings_auth_policy_request_attributes_changed: `
 Default has changed.`
@@ -7095,8 +7095,8 @@ The details of how this setting works depends on the used protocol:
 :   ID command can be used to override:
 
     * Session ID
-    * Client IP and port (\`%{rip}\`, \`%{rport}\`)
-    * Server IP and port (\`%{lip}\`, \`%{lport}\`)
+    * Client IP and port (\`%{remote_ip}\`, \`%{remote_port}\`)
+    * Server IP and port (\`%{local_ip}\`, \`%{local_port}\`)
 
     \`forward_*\` fields can be sent to auth process's passdb lookup
 
@@ -7107,7 +7107,7 @@ The details of how this setting works depends on the used protocol:
 :   XCLIENT command can be used to override:
 
     * Session ID
-    * Client IP and port (\`%{rip}\`, \`%{rport}\`)
+    * Client IP and port (\`%{remote_ip}\`, \`%{remote_port}\`)
 
     \`forward_*\` fields can be sent to auth process's passdb lookup
 
@@ -7118,7 +7118,7 @@ The details of how this setting works depends on the used protocol:
 :   XCLIENT command can be used to override:
 
     * Session ID
-    * Client IP and port (\`%{rip}\`, \`%{rport}\`)
+    * Client IP and port (\`%{remote_ip}\`, \`%{remote_port}\`)
 
     The trust is always checked against the connecting IP address.
     Except if HAProxy is used, then the original client IP address is used.
@@ -7127,7 +7127,7 @@ The details of how this setting works depends on the used protocol:
 :   XCLIENT command can be used to override:
 
     * Session ID
-    * Client IP and port (\`%{rip}\`, \`%{rport}\`)
+    * Client IP and port (\`%{remote_ip}\`, \`%{remote_port}\`)
     * HELO - Overrides what the client sent earlier in the EHLO command
     * LOGIN - Currently unused
     * PROTO - Currently unused
@@ -7141,7 +7141,7 @@ The details of how this setting works depends on the used protocol:
 :   XCLIENT command can be used to override:
 
     * Session ID
-    * Client IP and port (\`%{rip}\`, \`%{rport}\`)
+    * Client IP and port (\`%{remote_ip}\`, \`%{remote_port}\`)
     * HELO - Overrides what the client sent earlier in the LHLO command
     * LOGIN - Currently unused
     * PROTO - Currently unused
@@ -8700,7 +8700,7 @@ Configures a modifier string for values grouped by the
 \`%{value}\`
 :   The original value.
 
-\`%{domain}\`
+\`%{user | domain}\`
 :   If the value is in \`user@domain\` format, this contains the \`domain\`
     text. Otherwise empty.`
 	},

data/updates.js

@@ -75,6 +75,7 @@ export const updates = {
 	variables_auth_variables_protocol: '2.4.0',
 	variables_login_variables_protocol: '2.4.0',
 	variables_owner_user_added: '2.4.0',
+	var_expand: '2.4.0',
 
 	/* Tags used in doveadm.js */
 

docs/core/admin/migration.md

@@ -213,22 +213,22 @@ Common settings:
 Master password auth:
 
 ```
-imapc_user = %u
+imapc_user = %{user}
 imapc_password = supersecret
 ```
 
 Master user auth:
 
 ```
-imapc_user = %u
+imapc_user = %{user}
 imapc_master_user = master-user
 imapc_password = master-password
 ```
 
 Individual password auth:
 
 ```
-imapc_user = %u
+imapc_user = %{user}
 
 # doveadm -o imapc_password=password backup -Ru user imapc:
 ```
@@ -250,7 +250,7 @@ pop3c_host = hostname
 # Authenticate as masteruser / masteruser-secret, but use a separate login
 # user.
 # If you don't have a master user, remove the pop3c_master_user setting.
-pop3c_user = %u
+pop3c_user = %{user}
 pop3c_master_user = masteruser
 pop3c_password = masteruser-secret
 

docs/core/admin/rawlog.md

@@ -99,7 +99,7 @@ If your userdb can't return a home directory directly, you can add:
 userdb db1 {
   # ...
   fields {
-    home = /home/%u
+    home = /home/%{user}
     # or temporarily even e.g. home = /tmp/temp-home
   }
 }

docs/core/admin/testing.md

@@ -259,7 +259,7 @@ System configuration
 Enable LMTP delivery times in the configuration:
 
 ```[dovecot.conf]
-deliver_log_format = msgid=%m from=<%f> size=%p vsize=%w session=%{session_time}ms delivery=%{delivery_time}ms: %$
+deliver_log_format = msgid=%{msgid} from=<%{from}> size=%{size} vsize=%{vsize} session=%{session_time}ms delivery=%{delivery_time}ms: %{message}
 ```
 
 You can then see log entries like:
@@ -332,7 +332,7 @@ total_user_count = 800
 rampup_time = 0s
 
 user lmtptest {
-  username_format = testuser%n
+  username_format = testuser%{num}
   count = 100%
 
   mail_inbox_delivery_interval = 1s
@@ -390,7 +390,7 @@ total_user_count = 2000000
 rampup_time = 600s
 
 user pop3 {
-  username_format = testuser%7n
+  username_format = testuser%{num | fill('0', 7)}
   username_start_index = 1
   count = 100%
 
@@ -433,7 +433,7 @@ total_user_count = 4000000
 rampup_time = 60s
 
 user imap_poweruser {
-  username_format = testuser%7n
+  username_format = testuser%{num | fill('0', 7)}
   username_start_index = 2000000
   count = 50%