Mercurial > dovecot > original-hg > dovecot-1.2

annotate src/pop3-login/pop3-proxy.c @ 5138:20302f49eda3 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't crash if the remote server disconnects before we're logged in.
author Timo Sirainen <tss@iki.fi>
date Thu, 15 Feb 2007 15:31:51 +0200
parents f2cc68a3a198
children 65c69a53a7be
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2768
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
1 /* Copyright (C) 2004 Timo Sirainen */
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
2
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
3 #include "common.h"
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
4 #include "ioloop.h"
2773
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
5 #include "istream.h"
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
6 #include "ostream.h"
2768
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
7 #include "base64.h"
2773
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
8 #include "safe-memset.h"
2768
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
9 #include "str.h"
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
10 #include "client.h"
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
11 #include "pop3-proxy.h"
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
12
2773
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
13 static void proxy_input(struct istream *input, struct ostream *output,
4907
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4873
diff changeset
14 struct pop3_client *client)
2773
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
15 {
2785
fc4b1ec1b3ef Use USER/PASS instad for AUTH PLAIN. Also don't require "+OK" to have
Timo Sirainen <tss@iki.fi>
parents: 2783
diff changeset
16 string_t *str;
5046
f2cc68a3a198 Log the proxy destination host:port.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
17 const char *line, *msg;
2773
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
18
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
19 if (input == NULL) {
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
20 if (client->io != NULL) {
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
21 /* remote authentication failed, we're just
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
22 freeing the proxy */
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
23 return;
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
24 }
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
25
5138
20302f49eda3 Don't crash if the remote server disconnects before we're logged in.
Timo Sirainen <tss@iki.fi>
parents: 5046
diff changeset
26 if (client->destroyed) {
20302f49eda3 Don't crash if the remote server disconnects before we're logged in.
Timo Sirainen <tss@iki.fi>
parents: 5046
diff changeset
27 /* we came here from client_destroy() */
20302f49eda3 Don't crash if the remote server disconnects before we're logged in.
Timo Sirainen <tss@iki.fi>
parents: 5046
diff changeset
28 return;
20302f49eda3 Don't crash if the remote server disconnects before we're logged in.
Timo Sirainen <tss@iki.fi>
parents: 5046
diff changeset
29 }
20302f49eda3 Don't crash if the remote server disconnects before we're logged in.
Timo Sirainen <tss@iki.fi>
parents: 5046
diff changeset
30
3054
a5dbe1e56c07 proxy: When we can't connect to remote server, show "Temporary login
Timo Sirainen <tss@iki.fi>
parents: 2850
diff changeset
31 /* failed for some reason, probably server disconnected */
3082
620a00db2c7c If login failed, send it as "-ERR [IN-USE]" rather as IMAP's "* BYE"..
Timo Sirainen <tss@iki.fi>
parents: 3054
diff changeset
32 client_send_line(client,
620a00db2c7c If login failed, send it as "-ERR [IN-USE]" rather as IMAP's "* BYE"..
Timo Sirainen <tss@iki.fi>
parents: 3054
diff changeset
33 "-ERR [IN-USE] Temporary login failure.");
3054
a5dbe1e56c07 proxy: When we can't connect to remote server, show "Temporary login
Timo Sirainen <tss@iki.fi>
parents: 2850
diff changeset
34 client_destroy(client, NULL);
2773
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
35 return;
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
36 }
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
37
5138
20302f49eda3 Don't crash if the remote server disconnects before we're logged in.
Timo Sirainen <tss@iki.fi>
parents: 5046
diff changeset
38 i_assert(!client->destroyed);
20302f49eda3 Don't crash if the remote server disconnects before we're logged in.
Timo Sirainen <tss@iki.fi>
parents: 5046
diff changeset
39
2773
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
40 switch (i_stream_read(input)) {
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
41 case -2:
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
42 /* buffer full */
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
43 i_error("pop-proxy(%s): Remote input buffer full",
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
44 client->common.virtual_user);
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
45 client_destroy_internal_failure(client);
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
46 return;
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
47 case -1:
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
48 /* disconnected */
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
49 client_destroy(client, "Proxy: Remote disconnected");
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
50 return;
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
51 }
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
52
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
53 line = i_stream_next_line(input);
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
54 if (line == NULL)
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
55 return;
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
56
2835
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
57 switch (client->proxy_state) {
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
58 case 0:
2773
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
59 /* this is a banner */
2785
fc4b1ec1b3ef Use USER/PASS instad for AUTH PLAIN. Also don't require "+OK" to have
Timo Sirainen <tss@iki.fi>
parents: 2783
diff changeset
60 if (strncmp(line, "+OK", 3) != 0) {
2773
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
61 i_error("pop3-proxy(%s): "
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
62 "Remote returned invalid banner: %s",
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
63 client->common.virtual_user, line);
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
64 client_destroy_internal_failure(client);
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
65 return;
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
66 }
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
67
2785
fc4b1ec1b3ef Use USER/PASS instad for AUTH PLAIN. Also don't require "+OK" to have
Timo Sirainen <tss@iki.fi>
parents: 2783
diff changeset
68 /* send USER command */
2773
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
69 str = t_str_new(128);
2785
fc4b1ec1b3ef Use USER/PASS instad for AUTH PLAIN. Also don't require "+OK" to have
Timo Sirainen <tss@iki.fi>
parents: 2783
diff changeset
70 str_append(str, "USER ");
fc4b1ec1b3ef Use USER/PASS instad for AUTH PLAIN. Also don't require "+OK" to have
Timo Sirainen <tss@iki.fi>
parents: 2783
diff changeset
71 str_append(str, client->proxy_user);
2773
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
72 str_append(str, "\r\n");
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
73 (void)o_stream_send(output, str_data(str), str_len(str));
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
74
2835
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
75 client->proxy_state++;
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
76 return;
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
77 case 1:
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
78 if (strncmp(line, "+OK", 3) != 0)
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
79 break;
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
80
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
81 /* USER successful, send PASS */
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
82 str = t_str_new(128);
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
83 str_append(str, "PASS ");
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
84 str_append(str, client->proxy_password);
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
85 str_append(str, "\r\n");
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
86 (void)o_stream_send(output, str_data(str),
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
87 str_len(str));
2773
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
88
2835
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
89 safe_memset(client->proxy_password, 0,
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
90 strlen(client->proxy_password));
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
91 i_free(client->proxy_password);
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
92 client->proxy_password = NULL;
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
93
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
94 client->proxy_state++;
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
95 return;
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
96 case 2:
2850
4e5b1a1494c5 Check that PASS replies with OK.
Timo Sirainen <tss@iki.fi>
parents: 2835
diff changeset
97 if (strncmp(line, "+OK", 3) != 0)
4e5b1a1494c5 Check that PASS replies with OK.
Timo Sirainen <tss@iki.fi>
parents: 2835
diff changeset
98 break;
4e5b1a1494c5 Check that PASS replies with OK.
Timo Sirainen <tss@iki.fi>
parents: 2835
diff changeset
99
2835
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
100 /* Login successful. Send this line to client. */
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
101 (void)o_stream_send_str(client->output, line);
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
102 (void)o_stream_send(client->output, "\r\n", 2);
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
103
5046
f2cc68a3a198 Log the proxy destination host:port.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
104 msg = t_strdup_printf("proxy(%s): started proxying to %s:%u",
f2cc68a3a198 Log the proxy destination host:port.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
105 client->common.virtual_user,
f2cc68a3a198 Log the proxy destination host:port.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
106 login_proxy_get_host(client->proxy),
f2cc68a3a198 Log the proxy destination host:port.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
107 login_proxy_get_port(client->proxy));
f2cc68a3a198 Log the proxy destination host:port.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
108
2835
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
109 login_proxy_detach(client->proxy, client->input,
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
110 client->output);
2773
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
111
2835
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
112 client->proxy = NULL;
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
113 client->input = NULL;
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
114 client->output = NULL;
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
115 client->common.fd = -1;
5046
f2cc68a3a198 Log the proxy destination host:port.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
116 client_destroy(client, msg);
2835
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
117 return;
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
118 }
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
119
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
120 /* Login failed. Send our own failure reply so client can't
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
121 figure out if user exists or not just by looking at the
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
122 reply string. */
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
123 client_send_line(client, "-ERR "AUTH_FAILED_MSG);
2785
fc4b1ec1b3ef Use USER/PASS instad for AUTH PLAIN. Also don't require "+OK" to have
Timo Sirainen <tss@iki.fi>
parents: 2783
diff changeset
124
2835
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
125 /* allow client input again */
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
126 i_assert(client->io == NULL);
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
127 client->io = io_add(client->common.fd, IO_READ,
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
128 client_input, client);
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
129
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
130 login_proxy_free(client->proxy);
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
131 client->proxy = NULL;
2773
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
132
2835
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
133 if (client->proxy_password != NULL) {
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
134 safe_memset(client->proxy_password, 0,
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
135 strlen(client->proxy_password));
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
136 i_free(client->proxy_password);
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
137 client->proxy_password = NULL;
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
138 }
2773
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
139
2835
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
140 i_free(client->proxy_user);
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
141 client->proxy_user = NULL;
2773
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
142 }
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
143
2768
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
144 int pop3_proxy_new(struct pop3_client *client, const char *host,
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
145 unsigned int port, const char *user, const char *password)
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
146 {
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
147 i_assert(user != NULL);
4770
88c29111fcee Crashfixes and more asserts. Mostly related to use of AUTHENTICATE/AUTH
Timo Sirainen <tss@iki.fi>
parents: 4669
diff changeset
148 i_assert(!client->destroyed);
2768
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
149
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
150 if (password == NULL) {
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
151 i_error("proxy(%s): password not given",
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
152 client->common.virtual_user);
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
153 return -1;
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
154 }
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
155
4560
507088c0d511 Fixes for handling near-full connection queues.
Timo Sirainen <tss@iki.fi>
parents: 3879
diff changeset
156 i_assert(client->refcount > 1);
507088c0d511 Fixes for handling near-full connection queues.
Timo Sirainen <tss@iki.fi>
parents: 3879
diff changeset
157 connection_queue_add(1);
507088c0d511 Fixes for handling near-full connection queues.
Timo Sirainen <tss@iki.fi>
parents: 3879
diff changeset
158
4770
88c29111fcee Crashfixes and more asserts. Mostly related to use of AUTHENTICATE/AUTH
Timo Sirainen <tss@iki.fi>
parents: 4669
diff changeset
159 if (client->destroyed) {
88c29111fcee Crashfixes and more asserts. Mostly related to use of AUTHENTICATE/AUTH
Timo Sirainen <tss@iki.fi>
parents: 4669
diff changeset
160 /* connection_queue_add() decided that we were the oldest
88c29111fcee Crashfixes and more asserts. Mostly related to use of AUTHENTICATE/AUTH
Timo Sirainen <tss@iki.fi>
parents: 4669
diff changeset
161 connection and killed us. */
88c29111fcee Crashfixes and more asserts. Mostly related to use of AUTHENTICATE/AUTH
Timo Sirainen <tss@iki.fi>
parents: 4669
diff changeset
162 return -1;
88c29111fcee Crashfixes and more asserts. Mostly related to use of AUTHENTICATE/AUTH
Timo Sirainen <tss@iki.fi>
parents: 4669
diff changeset
163 }
88c29111fcee Crashfixes and more asserts. Mostly related to use of AUTHENTICATE/AUTH
Timo Sirainen <tss@iki.fi>
parents: 4669
diff changeset
164
2773
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
165 client->proxy = login_proxy_new(&client->common, host, port,
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
166 proxy_input, client);
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
167 if (client->proxy == NULL)
2768
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
168 return -1;
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
169
2835
39c315e7697d Keep proxy_user stored until proxy is destroyed.
Timo Sirainen <tss@iki.fi>
parents: 2786
diff changeset
170 client->proxy_state = 0;
2773
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
171 client->proxy_user = i_strdup(user);
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
172 client->proxy_password = i_strdup(password);
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
173
e624a9ad6a30 More smart IMAP and POP3 proxies. Now if remote login fails, it just
Timo Sirainen <tss@iki.fi>
parents: 2768
diff changeset
174 /* disable input until authentication is finished */
3879
928229f8b3e6 deinit, unref, destroy, close, free, etc. functions now take a pointer to
Timo Sirainen <tss@iki.fi>
parents: 3082
diff changeset
175 if (client->io != NULL)
928229f8b3e6 deinit, unref, destroy, close, free, etc. functions now take a pointer to
Timo Sirainen <tss@iki.fi>
parents: 3082
diff changeset
176 io_remove(&client->io);
2768
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
177 return 0;
d344be0bb70f Added IMAP and POP3 proxying support.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
178 }