annotate src/login-common/client-common.c @ 6940:414c9d631a81 HEAD

Replaced t_push/t_pop calls with T_FRAME*() macros.
author Timo Sirainen <tss@iki.fi>
date Wed, 05 Dec 2007 17:47:44 +0200
parents 65c69a53a7be
children 7ed926ed7aa4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6429
65c69a53a7be Replaced my Copyright notices. The year range always ends with 2007 now.
Timo Sirainen <tss@iki.fi>
parents: 4861
diff changeset
1 /* Copyright (c) 2002-2007 Dovecot authors, see the included COPYING file */
2737
134ad6e8cd42 forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
2
134ad6e8cd42 forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
3 #include "common.h"
3384
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
4 #include "hostpid.h"
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
5 #include "str.h"
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
6 #include "str-sanitize.h"
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
7 #include "var-expand.h"
4570
cbbe2377f591 If SSL/TLS handshake didn't finish, show "TLS handshaking" instead of "TLS"
Timo Sirainen <tss@iki.fi>
parents: 3863
diff changeset
8 #include "ssl-proxy.h"
2737
134ad6e8cd42 forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
9 #include "client-common.h"
134ad6e8cd42 forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
10
3384
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
11 #include <stdlib.h>
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
12
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
13 static const struct var_expand_table *
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
14 get_var_expand_table(struct client *client)
2737
134ad6e8cd42 forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
15 {
3384
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
16 static struct var_expand_table static_tab[] = {
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
17 { 'u', NULL },
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
18 { 'n', NULL },
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
19 { 'd', NULL },
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
20 { 's', NULL },
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
21 { 'h', NULL },
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
22 { 'l', NULL },
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
23 { 'r', NULL },
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
24 { 'p', NULL },
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
25 { 'm', NULL },
4861
a688269c0dd4 Added %a=local port and %b=remote port variables for
Timo Sirainen <tss@iki.fi>
parents: 4570
diff changeset
26 { 'a', NULL },
a688269c0dd4 Added %a=local port and %b=remote port variables for
Timo Sirainen <tss@iki.fi>
parents: 4570
diff changeset
27 { 'b', NULL },
3384
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
28 { 'c', NULL },
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
29 { '\0', NULL }
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
30 };
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
31 struct var_expand_table *tab;
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
32
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
33 tab = t_malloc(sizeof(static_tab));
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
34 memcpy(tab, static_tab, sizeof(static_tab));
2737
134ad6e8cd42 forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
35
3384
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
36 if (client->virtual_user != NULL) {
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
37 tab[0].value = client->virtual_user;
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
38 tab[1].value = t_strcut(client->virtual_user, '@');
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
39 tab[2].value = strchr(client->virtual_user, '@');
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
40 if (tab[2].value != NULL) tab[2].value++;
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
41 }
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
42 tab[3].value = login_protocol;
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
43 tab[4].value = getenv("HOME");
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
44 tab[5].value = net_ip2addr(&client->local_ip);
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
45 tab[6].value = net_ip2addr(&client->ip);
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
46 tab[7].value = my_pid;
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
47 tab[8].value = client->auth_mech_name == NULL ? NULL :
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
48 str_sanitize(client->auth_mech_name, MAX_MECH_NAME);
4861
a688269c0dd4 Added %a=local port and %b=remote port variables for
Timo Sirainen <tss@iki.fi>
parents: 4570
diff changeset
49 tab[9].value = dec2str(client->local_port);
a688269c0dd4 Added %a=local port and %b=remote port variables for
Timo Sirainen <tss@iki.fi>
parents: 4570
diff changeset
50 tab[10].value = dec2str(client->remote_port);
4570
cbbe2377f591 If SSL/TLS handshake didn't finish, show "TLS handshaking" instead of "TLS"
Timo Sirainen <tss@iki.fi>
parents: 3863
diff changeset
51 if (!client->tls) {
4861
a688269c0dd4 Added %a=local port and %b=remote port variables for
Timo Sirainen <tss@iki.fi>
parents: 4570
diff changeset
52 tab[11].value = client->secured ? "secured" : NULL;
4570
cbbe2377f591 If SSL/TLS handshake didn't finish, show "TLS handshaking" instead of "TLS"
Timo Sirainen <tss@iki.fi>
parents: 3863
diff changeset
53 } else {
4861
a688269c0dd4 Added %a=local port and %b=remote port variables for
Timo Sirainen <tss@iki.fi>
parents: 4570
diff changeset
54 tab[11].value = client->proxy != NULL &&
4570
cbbe2377f591 If SSL/TLS handshake didn't finish, show "TLS handshaking" instead of "TLS"
Timo Sirainen <tss@iki.fi>
parents: 3863
diff changeset
55 ssl_proxy_is_handshaked(client->proxy) ? "TLS" :
cbbe2377f591 If SSL/TLS handshake didn't finish, show "TLS handshaking" instead of "TLS"
Timo Sirainen <tss@iki.fi>
parents: 3863
diff changeset
56 "TLS handshaking";
cbbe2377f591 If SSL/TLS handshake didn't finish, show "TLS handshaking" instead of "TLS"
Timo Sirainen <tss@iki.fi>
parents: 3863
diff changeset
57 }
3384
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
58
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
59 return tab;
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
60 }
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
61
3863
55df57c028d4 Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents: 3501
diff changeset
62 static bool have_key(const struct var_expand_table *table, const char *str)
3384
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
63 {
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
64 char key;
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
65 unsigned int i;
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
66
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
67 key = var_get_key(str);
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
68 for (i = 0; table[i].key != '\0'; i++) {
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
69 if (table[i].key == key) {
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
70 return table[i].value != NULL &&
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
71 table[i].value[0] != '\0';
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
72 }
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
73 }
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
74 return FALSE;
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
75 }
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
76
6940
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
77 static void client_syslog_real(struct client *client, const char *msg)
3384
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
78 {
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
79 static struct var_expand_table static_tab[3] = {
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
80 { 's', NULL },
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
81 { '$', NULL },
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
82 { '\0', NULL }
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
83 };
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
84 const struct var_expand_table *var_expand_table;
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
85 struct var_expand_table *tab;
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
86 const char *p, *const *e;
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
87 string_t *str;
2737
134ad6e8cd42 forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
88
3384
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
89 var_expand_table = get_var_expand_table(client);
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
90
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
91 tab = t_malloc(sizeof(static_tab));
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
92 memcpy(tab, static_tab, sizeof(static_tab));
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
93
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
94 str = t_str_new(256);
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
95 for (e = log_format_elements; *e != NULL; e++) {
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
96 for (p = *e; *p != '\0'; p++) {
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
97 if (*p != '%' || p[1] == '\0')
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
98 continue;
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
99
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
100 p++;
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
101 if (have_key(var_expand_table, p)) {
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
102 if (str_len(str) > 0)
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
103 str_append(str, ", ");
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
104 var_expand(str, *e, var_expand_table);
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
105 break;
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
106 }
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
107 }
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
108 }
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
109
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
110 tab[0].value = t_strdup(str_c(str));
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
111 tab[1].value = msg;
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
112 str_truncate(str, 0);
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
113
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
114 var_expand(str, log_format, tab);
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
115 i_info("%s", str_c(str));
6940
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
116 }
3384
3b75956d20c4 Added configurable logging for login process. Added configurable pop3 logout
Timo Sirainen <tss@iki.fi>
parents: 2737
diff changeset
117
6940
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
118 void client_syslog(struct client *client, const char *msg)
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
119 {
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
120 T_FRAME(
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
121 client_syslog_real(client, msg);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents: 6429
diff changeset
122 );
2737
134ad6e8cd42 forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
123 }