Mercurial > dovecot > core-2.2

annotate src/pop3/main.c @ 22219:bb35e45650fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pop3: client_create_from_input shouldn't process input This makes the pop3 code resemble the imap code more. Making the subsequent changes easier.
author Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
date Fri, 19 May 2017 10:58:18 +0300
parents b080ac94175d
children b4c9f96470ca
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
21390
2e2563132d5f Updated copyright notices to include the year 2017.
Stephan Bosch <stephan.bosch@dovecot.fi>
parents: 21389
diff changeset
1 /* Copyright (c) 2002-2017 Dovecot authors, see the included COPYING file */
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
2
9219
97cdfeb57129 Renamed headers to prevent collision if they were flattened on an install.
Mark Washenberger
parents: 9177
diff changeset
3 #include "pop3-common.h"
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
4 #include "ioloop.h"
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
5 #include "buffer.h"
9080
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
6 #include "istream.h"
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
7 #include "ostream.h"
10459
e9cbc461c525 imap, pop3: Added back ability to run post-login scripts.
Timo Sirainen <tss@iki.fi>
parents: 10456
diff changeset
8 #include "abspath.h"
9080
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
9 #include "base64.h"
10193
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
10 #include "str.h"
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
11 #include "process-title.h"
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
12 #include "restrict-access.h"
9080
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
13 #include "master-service.h"
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
14 #include "master-login.h"
9661
1780d56a9160 imap/pop3: Compiling fix.
Timo Sirainen <tss@iki.fi>
parents: 9653
diff changeset
15 #include "master-interface.h"
2976
96a4ab34c8f1 Added pop3_uidl_format setting.
Timo Sirainen <tss@iki.fi>
parents: 2952
diff changeset
16 #include "var-expand.h"
13033
ac006833cd66 pop3: If mail storage couldn't be initialized, send -ERR to client before disconnecting.
Timo Sirainen <tss@iki.fi>
parents: 12782
diff changeset
17 #include "mail-error.h"
10193
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
18 #include "mail-user.h"
9080
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
19 #include "mail-storage-service.h"
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
20
2873
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
21 #include <stdio.h>
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
22 #include <unistd.h>
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
23
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
24 #define IS_STANDALONE() \
12425
10c163bb5e22 "Running standalone?" check now uses a new DOVECOT_CHILD_PROCESS environment rather than GENERATION.
Timo Sirainen <tss@iki.fi>
parents: 12366
diff changeset
25 (getenv(MASTER_IS_PARENT_ENV) == NULL)
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
26
10193
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
27 static bool verbose_proctitle = FALSE;
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
28 static struct mail_storage_service_ctx *storage_service;
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
29 static struct master_login *master_login = NULL;
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
30
14220
771fab474b1c pop3: Added module contexts to struct client, and made client_destroy() a virtual method.
Timo Sirainen <tss@iki.fi>
parents: 14133
diff changeset
31 pop3_client_created_func_t *hook_client_created = NULL;
771fab474b1c pop3: Added module contexts to struct client, and made client_destroy() a virtual method.
Timo Sirainen <tss@iki.fi>
parents: 14133
diff changeset
32
771fab474b1c pop3: Added module contexts to struct client, and made client_destroy() a virtual method.
Timo Sirainen <tss@iki.fi>
parents: 14133
diff changeset
33 pop3_client_created_func_t *
771fab474b1c pop3: Added module contexts to struct client, and made client_destroy() a virtual method.
Timo Sirainen <tss@iki.fi>
parents: 14133
diff changeset
34 pop3_client_created_hook_set(pop3_client_created_func_t *new_hook)
771fab474b1c pop3: Added module contexts to struct client, and made client_destroy() a virtual method.
Timo Sirainen <tss@iki.fi>
parents: 14133
diff changeset
35 {
771fab474b1c pop3: Added module contexts to struct client, and made client_destroy() a virtual method.
Timo Sirainen <tss@iki.fi>
parents: 14133
diff changeset
36 pop3_client_created_func_t *old_hook = hook_client_created;
771fab474b1c pop3: Added module contexts to struct client, and made client_destroy() a virtual method.
Timo Sirainen <tss@iki.fi>
parents: 14133
diff changeset
37
771fab474b1c pop3: Added module contexts to struct client, and made client_destroy() a virtual method.
Timo Sirainen <tss@iki.fi>
parents: 14133
diff changeset
38 hook_client_created = new_hook;
771fab474b1c pop3: Added module contexts to struct client, and made client_destroy() a virtual method.
Timo Sirainen <tss@iki.fi>
parents: 14133
diff changeset
39 return old_hook;
771fab474b1c pop3: Added module contexts to struct client, and made client_destroy() a virtual method.
Timo Sirainen <tss@iki.fi>
parents: 14133
diff changeset
40 }
1646
a7c742b940e5 Added pop3 hooks
Timo Sirainen <tss@iki.fi>
parents: 1620
diff changeset
41
10193
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
42 void pop3_refresh_proctitle(void)
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
43 {
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
44 struct client *client;
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
45 string_t *title = t_str_new(128);
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
46
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
47 if (!verbose_proctitle)
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
48 return;
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
49
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
50 str_append_c(title, '[');
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
51 switch (pop3_client_count) {
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
52 case 0:
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
53 str_append(title, "idling");
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
54 break;
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
55 case 1:
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
56 client = pop3_clients;
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
57 str_append(title, client->user->username);
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
58 if (client->user->remote_ip != NULL) {
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
59 str_append_c(title, ' ');
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
60 str_append(title, net_ip2addr(client->user->remote_ip));
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
61 }
21746
574ad44a7c80 imap, pop3, indexer-worker: Add (deinit) to process title before autoexpunging runs.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents: 21390
diff changeset
62 if (client->destroyed)
574ad44a7c80 imap, pop3, indexer-worker: Add (deinit) to process title before autoexpunging runs.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents: 21390
diff changeset
63 str_append(title, " (deinit)");
10193
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
64 break;
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
65 default:
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
66 str_printfa(title, "%u connections", pop3_client_count);
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
67 break;
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
68 }
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
69 str_append_c(title, ']');
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
70 process_title_set(str_c(title));
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
71 }
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
72
10171
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
73 static void pop3_die(void)
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
74 {
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
75 /* do nothing. pop3 connections typically die pretty quick anyway. */
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
76 }
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
77
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
78 static void client_add_input(struct client *client, const buffer_t *buf)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
79 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
80 struct ostream *output;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
81
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
82 if (buf != NULL && buf->used > 0) {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
83 if (!i_stream_add_data(client->input, buf->data, buf->used))
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
84 i_panic("Couldn't add client input to stream");
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
85 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
86
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
87 output = client->output;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
88 o_stream_ref(output);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
89 o_stream_cork(output);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
90 (void)client_handle_input(client);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
91 o_stream_uncork(output);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
92 o_stream_unref(&output);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
93 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
94
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
95 static int
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
96 client_create_from_input(const struct mail_storage_service_input *input,
22219
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
97 int fd_in, int fd_out, struct client **client_r,
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
98 const char **error_r)
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
99 {
13033
ac006833cd66 pop3: If mail storage couldn't be initialized, send -ERR to client before disconnecting.
Timo Sirainen <tss@iki.fi>
parents: 12782
diff changeset
100 const char *lookup_error_str =
15785
7e292b8352d9 pop3: Use RFC 3206 [SYS/*] and [AUTH] response codes.
Timo Sirainen <tss@iki.fi>
parents: 15715
diff changeset
101 "-ERR [SYS/TEMP] "MAIL_ERRSTR_CRITICAL_MSG"\r\n";
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
102 struct mail_storage_service_user *user;
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
103 struct mail_user *mail_user;
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
104 const struct pop3_settings *set;
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
105
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
106 if (mail_storage_service_lookup_next(storage_service, input,
13033
ac006833cd66 pop3: If mail storage couldn't be initialized, send -ERR to client before disconnecting.
Timo Sirainen <tss@iki.fi>
parents: 12782
diff changeset
107 &user, &mail_user, error_r) <= 0) {
18629
9c4d1e1e252f Compiler warning fixes
Timo Sirainen <tss@iki.fi>
parents: 18137
diff changeset
108 if (write(fd_out, lookup_error_str, strlen(lookup_error_str)) < 0) {
9c4d1e1e252f Compiler warning fixes
Timo Sirainen <tss@iki.fi>
parents: 18137
diff changeset
109 /* ignored */
9c4d1e1e252f Compiler warning fixes
Timo Sirainen <tss@iki.fi>
parents: 18137
diff changeset
110 }
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
111 return -1;
13033
ac006833cd66 pop3: If mail storage couldn't be initialized, send -ERR to client before disconnecting.
Timo Sirainen <tss@iki.fi>
parents: 12782
diff changeset
112 }
10171
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
113 restrict_access_allow_coredumps(TRUE);
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
114
10171
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
115 set = mail_storage_service_user_get_set(user)[1];
10193
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
116 if (set->verbose_proctitle)
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
117 verbose_proctitle = TRUE;
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
118
22219
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
119 *client_r = client_create(fd_in, fd_out, input->session_id,
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
120 mail_user, user, set);
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
121
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
122 return 0;
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
123 }
22216
415130854a53 pop3: move pop3 session locking out of client_create
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 21816
diff changeset
124
22219
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
125 static int lock_session(struct client *client)
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
126 {
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
127 int ret;
22218
b080ac94175d pop3: client_create_from_input should return the client struct
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22217
diff changeset
128
22219
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
129 if (client->set->pop3_lock_session &&
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
130 (ret = pop3_lock_session(client)) <= 0) {
22216
415130854a53 pop3: move pop3 session locking out of client_create
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 21816
diff changeset
131 client_send_line(client, ret < 0 ?
415130854a53 pop3: move pop3 session locking out of client_create
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 21816
diff changeset
132 "-ERR [SYS/TEMP] Failed to create POP3 session lock." :
415130854a53 pop3: move pop3 session locking out of client_create
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 21816
diff changeset
133 "-ERR [IN-USE] Mailbox is locked by another POP3 session.");
415130854a53 pop3: move pop3 session locking out of client_create
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 21816
diff changeset
134 client_destroy(client, "Couldn't lock POP3 session");
415130854a53 pop3: move pop3 session locking out of client_create
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 21816
diff changeset
135 return -1;
415130854a53 pop3: move pop3 session locking out of client_create
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 21816
diff changeset
136 }
415130854a53 pop3: move pop3 session locking out of client_create
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 21816
diff changeset
137
22219
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
138 return 0;
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
139 }
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
140
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
141 static void add_input(struct client *client,
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
142 const buffer_t *input_buf)
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
143 {
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
144 const char *error;
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
145
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
146 if (lock_session(client) < 0)
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
147 return; /* no need to propagate an error */
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
148
19389
5528fd720619 pop3: Send "OK Logged in" before reading mailbox.
Timo Sirainen <tss@iki.fi>
parents: 19191
diff changeset
149 if (!IS_STANDALONE())
5528fd720619 pop3: Send "OK Logged in" before reading mailbox.
Timo Sirainen <tss@iki.fi>
parents: 19191
diff changeset
150 client_send_line(client, "+OK Logged in.");
22219
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
151
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
152 if (client_init_mailbox(client, &error) < 0) {
19389
5528fd720619 pop3: Send "OK Logged in" before reading mailbox.
Timo Sirainen <tss@iki.fi>
parents: 19191
diff changeset
153 i_error("%s", error);
5528fd720619 pop3: Send "OK Logged in" before reading mailbox.
Timo Sirainen <tss@iki.fi>
parents: 19191
diff changeset
154 client_destroy(client, error);
22219
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
155 return;
19389
5528fd720619 pop3: Send "OK Logged in" before reading mailbox.
Timo Sirainen <tss@iki.fi>
parents: 19191
diff changeset
156 }
22219
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
157
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
158 client_add_input(client, input_buf);
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
159 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
160
10985
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
161 static void main_stdio_run(const char *username)
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
162 {
22218
b080ac94175d pop3: client_create_from_input should return the client struct
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22217
diff changeset
163 struct client *client;
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
164 struct mail_storage_service_input input;
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
165 buffer_t *input_buf;
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
166 const char *value, *error, *input_base64;
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
167
21389
59437f8764c6 global: Replaced all instances of memset(p, 0, sizeof(*p)) with the new i_zero() macro.
Stephan Bosch <stephan.bosch@dovecot.fi>
parents: 19706
diff changeset
168 i_zero(&input);
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
169 input.module = input.service = "pop3";
10985
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
170 input.username = username != NULL ? username : getenv("USER");
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
171 if (input.username == NULL && IS_STANDALONE())
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
172 input.username = getlogin();
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
173 if (input.username == NULL)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
174 i_fatal("USER environment missing");
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
175 if ((value = getenv("IP")) != NULL)
14682
d0d7b810646b Make sure we check all the functions' return values. Minor API changes to simplify this.
Timo Sirainen <tss@iki.fi>
parents: 14576
diff changeset
176 (void)net_addr2ip(value, &input.remote_ip);
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
177 if ((value = getenv("LOCAL_IP")) != NULL)
14682
d0d7b810646b Make sure we check all the functions' return values. Minor API changes to simplify this.
Timo Sirainen <tss@iki.fi>
parents: 14576
diff changeset
178 (void)net_addr2ip(value, &input.local_ip);
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
179
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
180 input_base64 = getenv("CLIENT_INPUT");
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
181 input_buf = input_base64 == NULL ? NULL :
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
182 t_base64_decode_str(input_base64);
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
183
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
184 if (client_create_from_input(&input, STDIN_FILENO, STDOUT_FILENO,
22219
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
185 &client, &error) < 0)
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
186 i_fatal("%s", error);
22219
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
187 add_input(client, input_buf);
22218
b080ac94175d pop3: client_create_from_input should return the client struct
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22217
diff changeset
188 /* client may be destroyed now */
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
189 }
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
190
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
191 static void
22217
d39bef1e08a2 pop3: rename login_client_connected() client arg to login_client
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22216
diff changeset
192 login_client_connected(const struct master_login_client *login_client,
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
193 const char *username, const char *const *extra_fields)
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
194 {
22218
b080ac94175d pop3: client_create_from_input should return the client struct
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22217
diff changeset
195 struct client *client;
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
196 struct mail_storage_service_input input;
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
197 const char *error;
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
198 buffer_t input_buf;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
199
21389
59437f8764c6 global: Replaced all instances of memset(p, 0, sizeof(*p)) with the new i_zero() macro.
Stephan Bosch <stephan.bosch@dovecot.fi>
parents: 19706
diff changeset
200 i_zero(&input);
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
201 input.module = input.service = "pop3";
22217
d39bef1e08a2 pop3: rename login_client_connected() client arg to login_client
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22216
diff changeset
202 input.local_ip = login_client->auth_req.local_ip;
d39bef1e08a2 pop3: rename login_client_connected() client arg to login_client
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22216
diff changeset
203 input.remote_ip = login_client->auth_req.remote_ip;
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
204 input.username = username;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
205 input.userdb_fields = extra_fields;
22217
d39bef1e08a2 pop3: rename login_client_connected() client arg to login_client
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22216
diff changeset
206 input.session_id = login_client->session_id;
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
207
22217
d39bef1e08a2 pop3: rename login_client_connected() client arg to login_client
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22216
diff changeset
208 buffer_create_from_const_data(&input_buf, login_client->data,
d39bef1e08a2 pop3: rename login_client_connected() client arg to login_client
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22216
diff changeset
209 login_client->auth_req.data_size);
d39bef1e08a2 pop3: rename login_client_connected() client arg to login_client
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22216
diff changeset
210 if (client_create_from_input(&input, login_client->fd, login_client->fd,
22219
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
211 &client, &error) < 0) {
22217
d39bef1e08a2 pop3: rename login_client_connected() client arg to login_client
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22216
diff changeset
212 int fd = login_client->fd;
14691
3945a3646c67 Changed i_close_fd() API to set the fd to -1 after closing.
Timo Sirainen <tss@iki.fi>
parents: 14687
diff changeset
213
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
214 i_error("%s", error);
14691
3945a3646c67 Changed i_close_fd() API to set the fd to -1 after closing.
Timo Sirainen <tss@iki.fi>
parents: 14687
diff changeset
215 i_close_fd(&fd);
10456
f0fd3bd7c122 imap, pop3: If client creation fails, update lib-master connection count.
Timo Sirainen <tss@iki.fi>
parents: 10455
diff changeset
216 master_service_client_connection_destroyed(master_service);
22219
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
217 return;
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
218 }
22219
bb35e45650fe pop3: client_create_from_input shouldn't process input
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22218
diff changeset
219 add_input(client, &input_buf);
22218
b080ac94175d pop3: client_create_from_input should return the client struct
Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
parents: 22217
diff changeset
220 /* client may be destroyed now */
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
221 }
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
222
11018
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes).
Timo Sirainen <tss@iki.fi>
parents: 11011
diff changeset
223 static void login_client_failed(const struct master_login_client *client,
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes).
Timo Sirainen <tss@iki.fi>
parents: 11011
diff changeset
224 const char *errormsg)
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes).
Timo Sirainen <tss@iki.fi>
parents: 11011
diff changeset
225 {
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes).
Timo Sirainen <tss@iki.fi>
parents: 11011
diff changeset
226 const char *msg;
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes).
Timo Sirainen <tss@iki.fi>
parents: 11011
diff changeset
227
15785
7e292b8352d9 pop3: Use RFC 3206 [SYS/*] and [AUTH] response codes.
Timo Sirainen <tss@iki.fi>
parents: 15715
diff changeset
228 msg = t_strdup_printf("-ERR [SYS/TEMP] %s\r\n", errormsg);
11212
6d9265a3a620 Compiler warning fix.
Timo Sirainen <tss@iki.fi>
parents: 11018
diff changeset
229 if (write(client->fd, msg, strlen(msg)) < 0) {
6d9265a3a620 Compiler warning fix.
Timo Sirainen <tss@iki.fi>
parents: 11018
diff changeset
230 /* ignored */
6d9265a3a620 Compiler warning fix.
Timo Sirainen <tss@iki.fi>
parents: 11018
diff changeset
231 }
11018
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes).
Timo Sirainen <tss@iki.fi>
parents: 11011
diff changeset
232 }
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes).
Timo Sirainen <tss@iki.fi>
parents: 11011
diff changeset
233
11388
b8d3c96e61a7 lib-master API changed to avoid accidentally leaking client connections.
Timo Sirainen <tss@iki.fi>
parents: 11212
diff changeset
234 static void client_connected(struct master_service_connection *conn)
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9147
diff changeset
235 {
11661
1799fbbd104b imap, pop3: Added an assert to client_connected().
Pascal Volk <user@localhost.localdomain.org>
parents: 11388
diff changeset
236 /* when running standalone, we shouldn't even get here */
1799fbbd104b imap, pop3: Added an assert to client_connected().
Pascal Volk <user@localhost.localdomain.org>
parents: 11388
diff changeset
237 i_assert(master_login != NULL);
1799fbbd104b imap, pop3: Added an assert to client_connected().
Pascal Volk <user@localhost.localdomain.org>
parents: 11388
diff changeset
238
1799fbbd104b imap, pop3: Added an assert to client_connected().
Pascal Volk <user@localhost.localdomain.org>
parents: 11388
diff changeset
239 master_service_client_connection_accept(conn);
1799fbbd104b imap, pop3: Added an assert to client_connected().
Pascal Volk <user@localhost.localdomain.org>
parents: 11388
diff changeset
240 master_login_add(master_login, conn->fd);
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9147
diff changeset
241 }
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9147
diff changeset
242
10120
b584904d3bc7 Moved process title init to lib-master. With Linux-hack enabled it now preserves command args.
Timo Sirainen <tss@iki.fi>
parents: 10119
diff changeset
243 int main(int argc, char *argv[])
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
244 {
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
245 static const struct setting_parser_info *set_roots[] = {
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
246 &pop3_setting_parser_info,
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
247 NULL
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
248 };
13964
9015f0b8fa4d imap, pop3: Added -t parameter to specify post-login script timeout.
Timo Sirainen <tss@iki.fi>
parents: 13033
diff changeset
249 struct master_login_settings login_set;
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
250 enum master_service_flags service_flags = 0;
21816
869db4bcecdb lib-storage: Replace MAIL_STORAGE_SERVICE_FLAG_AUTOEXPUNGE with explicit mail_user_autoexpunge()
Timo Sirainen <timo.sirainen@dovecot.fi>
parents: 21746
diff changeset
251 enum mail_storage_service_flags storage_service_flags = 0;
19706
3a4866198d8f imap, pop3, imap-urlauth: Added -a <auth-master socket path> parameter
Timo Sirainen <timo.sirainen@dovecot.fi>
parents: 19601
diff changeset
252 const char *username = NULL, *auth_socket_path = "auth-master";
10985
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
253 int c;
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
254
21389
59437f8764c6 global: Replaced all instances of memset(p, 0, sizeof(*p)) with the new i_zero() macro.
Stephan Bosch <stephan.bosch@dovecot.fi>
parents: 19706
diff changeset
255 i_zero(&login_set);
13964
9015f0b8fa4d imap, pop3: Added -t parameter to specify post-login script timeout.
Timo Sirainen <tss@iki.fi>
parents: 13033
diff changeset
256 login_set.postlogin_timeout_secs = MASTER_POSTLOGIN_TIMEOUT_DEFAULT;
9015f0b8fa4d imap, pop3: Added -t parameter to specify post-login script timeout.
Timo Sirainen <tss@iki.fi>
parents: 13033
diff changeset
257
2873
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
258 if (IS_STANDALONE() && getuid() == 0 &&
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
259 net_getpeername(1, NULL, NULL) == 0) {
15785
7e292b8352d9 pop3: Use RFC 3206 [SYS/*] and [AUTH] response codes.
Timo Sirainen <tss@iki.fi>
parents: 15715
diff changeset
260 printf("-ERR [SYS/PERM] pop3 binary must not be started from "
2873
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
261 "inetd, use pop3-login instead.\n");
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
262 return 1;
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
263 }
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
264
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
265 if (IS_STANDALONE()) {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
266 service_flags |= MASTER_SERVICE_FLAG_STANDALONE |
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
267 MASTER_SERVICE_FLAG_STD_CLIENT;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
268 } else {
10194
40d8df2b4111 imap, pop3: Connection counting fixes.
Timo Sirainen <tss@iki.fi>
parents: 10193
diff changeset
269 service_flags |= MASTER_SERVICE_FLAG_KEEP_CONFIG_OPEN;
9970
4b28edba5ff9 imap, pop3: Process permissions weren't properly dropped.
Timo Sirainen <tss@iki.fi>
parents: 9969
diff changeset
270 storage_service_flags |=
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
271 MAIL_STORAGE_SERVICE_FLAG_DISALLOW_ROOT;
9970
4b28edba5ff9 imap, pop3: Process permissions weren't properly dropped.
Timo Sirainen <tss@iki.fi>
parents: 9969
diff changeset
272 }
9080
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
273
10119
1e63221f5c83 Moved most of getopt() handling to lib-master.
Timo Sirainen <tss@iki.fi>
parents: 10101
diff changeset
274 master_service = master_service_init("pop3", service_flags,
19706
3a4866198d8f imap, pop3, imap-urlauth: Added -a <auth-master socket path> parameter
Timo Sirainen <timo.sirainen@dovecot.fi>
parents: 19601
diff changeset
275 &argc, &argv, "a:t:u:");
10985
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
276 while ((c = master_getopt(master_service)) > 0) {
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
277 switch (c) {
19706
3a4866198d8f imap, pop3, imap-urlauth: Added -a <auth-master socket path> parameter
Timo Sirainen <timo.sirainen@dovecot.fi>
parents: 19601
diff changeset
278 case 'a':
3a4866198d8f imap, pop3, imap-urlauth: Added -a <auth-master socket path> parameter
Timo Sirainen <timo.sirainen@dovecot.fi>
parents: 19601
diff changeset
279 auth_socket_path = optarg;
3a4866198d8f imap, pop3, imap-urlauth: Added -a <auth-master socket path> parameter
Timo Sirainen <timo.sirainen@dovecot.fi>
parents: 19601
diff changeset
280 break;
13964
9015f0b8fa4d imap, pop3: Added -t parameter to specify post-login script timeout.
Timo Sirainen <tss@iki.fi>
parents: 13033
diff changeset
281 case 't':
9015f0b8fa4d imap, pop3: Added -t parameter to specify post-login script timeout.
Timo Sirainen <tss@iki.fi>
parents: 13033
diff changeset
282 if (str_to_uint(optarg, &login_set.postlogin_timeout_secs) < 0 ||
9015f0b8fa4d imap, pop3: Added -t parameter to specify post-login script timeout.
Timo Sirainen <tss@iki.fi>
parents: 13033
diff changeset
283 login_set.postlogin_timeout_secs == 0)
9015f0b8fa4d imap, pop3: Added -t parameter to specify post-login script timeout.
Timo Sirainen <tss@iki.fi>
parents: 13033
diff changeset
284 i_fatal("Invalid -t parameter: %s", optarg);
9015f0b8fa4d imap, pop3: Added -t parameter to specify post-login script timeout.
Timo Sirainen <tss@iki.fi>
parents: 13033
diff changeset
285 break;
10985
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
286 case 'u':
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
287 storage_service_flags |=
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
288 MAIL_STORAGE_SERVICE_FLAG_USERDB_LOOKUP;
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
289 username = optarg;
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
290 break;
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
291 default:
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
292 return FATAL_DEFAULT;
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
293 }
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
294 }
13964
9015f0b8fa4d imap, pop3: Added -t parameter to specify post-login script timeout.
Timo Sirainen <tss@iki.fi>
parents: 13033
diff changeset
295
19706
3a4866198d8f imap, pop3, imap-urlauth: Added -a <auth-master socket path> parameter
Timo Sirainen <timo.sirainen@dovecot.fi>
parents: 19601
diff changeset
296 login_set.auth_socket_path = t_abspath(auth_socket_path);
13964
9015f0b8fa4d imap, pop3: Added -t parameter to specify post-login script timeout.
Timo Sirainen <tss@iki.fi>
parents: 13033
diff changeset
297 if (argv[optind] != NULL)
9015f0b8fa4d imap, pop3: Added -t parameter to specify post-login script timeout.
Timo Sirainen <tss@iki.fi>
parents: 13033
diff changeset
298 login_set.postlogin_socket_path = t_abspath(argv[optind]);
9015f0b8fa4d imap, pop3: Added -t parameter to specify post-login script timeout.
Timo Sirainen <tss@iki.fi>
parents: 13033
diff changeset
299 login_set.callback = login_client_connected;
9015f0b8fa4d imap, pop3: Added -t parameter to specify post-login script timeout.
Timo Sirainen <tss@iki.fi>
parents: 13033
diff changeset
300 login_set.failure_callback = login_client_failed;
10459
e9cbc461c525 imap, pop3: Added back ability to run post-login scripts.
Timo Sirainen <tss@iki.fi>
parents: 10456
diff changeset
301
10171
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
302 master_service_set_die_callback(master_service, pop3_die);
9147
bf448752f6c4 Pass remote/local IPs to mail_users. Standalone mail programs now log with mail_log_prefix.
Timo Sirainen <tss@iki.fi>
parents: 9106
diff changeset
303
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
304 storage_service =
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
305 mail_storage_service_init(master_service,
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
306 set_roots, storage_service_flags);
16508
754d244b8249 Call master_service_init_finish() only after all of the initialization is done.
Timo Sirainen <tss@iki.fi>
parents: 15786
diff changeset
307 master_service_init_finish(master_service);
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
308
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
309 /* fake that we're running, so we know if client was destroyed
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
310 while handling its initial input */
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
311 io_loop_set_running(current_ioloop);
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
312
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
313 if (IS_STANDALONE()) {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
314 T_BEGIN {
10985
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
315 main_stdio_run(username);
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
316 } T_END;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
317 } else {
13964
9015f0b8fa4d imap, pop3: Added -t parameter to specify post-login script timeout.
Timo Sirainen <tss@iki.fi>
parents: 13033
diff changeset
318 master_login = master_login_init(master_service, &login_set);
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
319 io_loop_set_running(current_ioloop);
9080
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
320 }
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
321
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
322 if (io_loop_is_running(current_ioloop))
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
323 master_service_run(master_service, client_connected);
17841
576da94fd669 imap, pop3: Show user's proper log prefix when deinitializing users at exit.
Timo Sirainen <tss@iki.fi>
parents: 17130
diff changeset
324 clients_destroy_all(storage_service);
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
325
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
326 if (master_login != NULL)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
327 master_login_deinit(&master_login);
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
328 mail_storage_service_deinit(&storage_service);
9348
0c587f108916 lib-master has now a global master_service variable that all binaries use.
Timo Sirainen <tss@iki.fi>
parents: 9263
diff changeset
329 master_service_deinit(&master_service);
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
330 return 0;
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
331 }