lib-storage: Added %{userdb:*} expansion to mail settings.

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index d8766da1f9a79a42b221524bfab730341ee7cbbc..5c82f972b2e74ab47c88622655ede3ee1561a059 100644 (file)
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -651,6 +651,8 @@ mail_storage_service_init_post(struct mail_storage_service_ctx *ctx,
        mail_user->auth_user = p_strdup(mail_user->pool, user->auth_user);
        mail_user->session_id =
                p_strdup(mail_user->pool, user->input.session_id);
+       mail_user->userdb_fields = user->input.userdb_fields == NULL ? NULL :
+               p_strarray_dup(mail_user->pool, user->input.userdb_fields);
        
        mail_set = mail_user_set_get_storage_set(mail_user);
 
@@ -713,6 +715,42 @@ void mail_storage_service_io_deactivate(struct mail_storage_service_ctx *ctx)
        i_set_failure_prefix("%s", ctx->default_log_prefix);
 }
 
+static const char *
+mail_storage_service_input_var_userdb(const char *data, void *context)
+{
+       struct mail_storage_service_user *user = context;
+       const char *field_name = data;
+       unsigned int i, field_name_len;
+
+       if (user == NULL || user->input.userdb_fields == NULL)
+               return NULL;
+
+       field_name_len = strlen(field_name);
+       for (i = 0; user->input.userdb_fields[i] != NULL; i++) {
+               if (strncmp(user->input.userdb_fields[i], field_name,
+                           field_name_len) == 0 &&
+                   user->input.userdb_fields[i][field_name_len] == '=')
+                       return user->input.userdb_fields[i] + field_name_len+1;
+       }
+       return NULL;
+}
+
+static void
+mail_storage_service_var_expand(struct mail_storage_service_ctx *ctx,
+                               string_t *str, const char *format,
+                               struct mail_storage_service_user *user,
+                               const struct mail_storage_service_input *input,
+                               const struct mail_storage_service_privileges *priv)
+{
+       static const struct var_expand_func_table func_table[] = {
+               { "userdb", mail_storage_service_input_var_userdb },
+               { NULL, NULL }
+       };
+       var_expand_with_funcs(str, format,
+                  get_var_expand_table(ctx->service, user, input, priv),
+                  func_table, user);
+}
+
 static void
 mail_storage_service_init_log(struct mail_storage_service_ctx *ctx,
                              struct mail_storage_service_user *user,
@@ -723,8 +761,9 @@ mail_storage_service_init_log(struct mail_storage_service_ctx *ctx,
                string_t *str;
 
                str = t_str_new(256);
-               var_expand(str, user->user_set->mail_log_prefix,
-                          get_var_expand_table(ctx->service, user, &user->input, priv));
+               mail_storage_service_var_expand(ctx, str,
+                       user->user_set->mail_log_prefix,
+                       user, &user->input, priv);
                user->log_prefix = p_strdup(user->pool, str_c(str));
        } T_END;
 
@@ -1020,8 +1059,8 @@ mail_storage_service_set_log_prefix(struct mail_storage_service_ctx *ctx,
        string_t *str;
 
        str = t_str_new(256);
-       var_expand(str, user_set->mail_log_prefix,
-                  get_var_expand_table(ctx->service, user, input, priv));
+       mail_storage_service_var_expand(ctx, str, user_set->mail_log_prefix,
+                                       user, input, priv);
        i_set_failure_prefix("%s", str_c(str));
 }
 
@@ -1135,7 +1174,8 @@ mail_storage_service_lookup_real(struct mail_storage_service_ctx *ctx,
        user->service_ctx = ctx;
        user->pool = user_pool;
        user->input = *input;
-       user->input.userdb_fields = NULL;
+       user->input.userdb_fields = userdb_fields == NULL ? NULL :
+               p_strarray_dup(user_pool, userdb_fields);
        user->input.username = p_strdup(user_pool, username);
        user->input.session_id = p_strdup(user_pool, input->session_id);
        if (user->input.session_id == NULL) {

diff --git a/src/lib-storage/mail-user.c b/src/lib-storage/mail-user.c
index d5375ff205af4ffe2bb723a1f14f81e773dce54d..16d3b890ad140c4f79e28455959307ad2255eb62 100644 (file)
--- a/src/lib-storage/mail-user.c
+++ b/src/lib-storage/mail-user.c
@@ -99,7 +99,9 @@ mail_user_expand_plugins_envs(struct mail_user *user)
                        return;
                }
                str_truncate(str, 0);
-               var_expand(str, envs[i+1], mail_user_var_expand_table(user));
+               var_expand_with_funcs(str, envs[i+1],
+                                     mail_user_var_expand_table(user),
+                                     mail_user_var_expand_func_table, user);
                envs[i+1] = p_strdup(user->pool, str_c(str));
        }
 }
@@ -115,8 +117,9 @@ int mail_user_init(struct mail_user *user, const char **error_r)
                                       'h', "home", &key, &value);
 
        /* expand mail_home setting before calling mail_user_get_home() */
-       settings_var_expand(user->set_info, user->set,
-                           user->pool, mail_user_var_expand_table(user));
+       settings_var_expand_with_funcs(user->set_info, user->set,
+                                      user->pool, mail_user_var_expand_table(user),
+                                      mail_user_var_expand_func_table, user);
 
        if (need_home_dir && mail_user_get_home(user, &home) <= 0) {
                user->error = p_strdup_printf(user->pool,
@@ -258,6 +261,26 @@ mail_user_var_expand_table(struct mail_user *user)
        return user->var_expand_table;
 }
 
+static const char *
+mail_user_var_expand_func_userdb(const char *data, void *context)
+{
+       struct mail_user *user = context;
+       const char *field_name = data;
+       unsigned int i, field_name_len;
+
+       if (user->userdb_fields == NULL)
+               return NULL;
+
+       field_name_len = strlen(field_name);
+       for (i = 0; user->userdb_fields[i] != NULL; i++) {
+               if (strncmp(user->userdb_fields[i], field_name,
+                           field_name_len) == 0 &&
+                   user->userdb_fields[i][field_name_len] == '=')
+                       return user->userdb_fields[i] + field_name_len+1;
+       }
+       return NULL;
+}
+
 void mail_user_set_home(struct mail_user *user, const char *home)
 {
        user->_home = p_strdup(user->pool, home);
@@ -534,3 +557,10 @@ void mail_user_stats_fill(struct mail_user *user, struct stats *stats)
 {
        user->v.stats_fill(user, stats);
 }
+
+static const struct var_expand_func_table mail_user_var_expand_func_table_arr[] = {
+       { "userdb", mail_user_var_expand_func_userdb },
+       { NULL, NULL }
+};
+const struct var_expand_func_table *mail_user_var_expand_func_table =
+       mail_user_var_expand_func_table_arr;

diff --git a/src/lib-storage/mail-user.h b/src/lib-storage/mail-user.h
index d223321bfc65637338f7f0ced1cf1161d49436d4..1e659fc79fa406f5958ba5a6633c3e972d70b40f 100644 (file)
--- a/src/lib-storage/mail-user.h
+++ b/src/lib-storage/mail-user.h
@@ -34,6 +34,7 @@ struct mail_user {
        const char *session_id;
        struct ip_addr *local_ip, *remote_ip;
        const char *auth_token, *auth_user;
+       const char *const *userdb_fields;
 
        const struct var_expand_table *var_expand_table;
        /* If non-NULL, fail the user initialization with this error.
@@ -92,6 +93,7 @@ union mail_user_module_context {
 };
 extern struct mail_user_module_register mail_user_module_register;
 extern struct auth_master_connection *mail_user_auth_master_conn;
+extern const struct var_expand_func_table *mail_user_var_expand_func_table;
 
 struct mail_user *mail_user_alloc(const char *username,
                                  const struct setting_parser_info *set_info,