annotate src/pop3/main.c @ 10194:40d8df2b4111 HEAD

imap, pop3: Connection counting fixes. Multiple real connections can come from "login connections". For now don't even try to count login connections.
author Timo Sirainen <tss@iki.fi>
date Mon, 26 Oct 2009 20:11:48 -0400
parents 02e852b2c2c3
children 6c9d97878efe
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
8590
b9faf4db2a9f Updated copyright notices to include year 2009.
Timo Sirainen <tss@iki.fi>
parents: 8467
diff changeset
1 /* Copyright (c) 2002-2009 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"
9080
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
8 #include "base64.h"
10193
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
9 #include "str.h"
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
10 #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
11 #include "restrict-access.h"
9080
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
12 #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
13 #include "master-login.h"
9661
1780d56a9160 imap/pop3: Compiling fix.
Timo Sirainen <tss@iki.fi>
parents: 9653
diff changeset
14 #include "master-interface.h"
2976
96a4ab34c8f1 Added pop3_uidl_format setting.
Timo Sirainen <tss@iki.fi>
parents: 2952
diff changeset
15 #include "var-expand.h"
10193
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
16 #include "mail-user.h"
9080
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
17 #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
18
2873
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
19 #include <stdio.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 #include <stdlib.h>
2873
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
21 #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
22
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
23 #define IS_STANDALONE() \
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
24 (getenv(MASTER_UID_ENV) == NULL)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
25
10193
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
26 static bool verbose_proctitle = FALSE;
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
27 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
28 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
29
1646
a7c742b940e5 Added pop3 hooks
Timo Sirainen <tss@iki.fi>
parents: 1620
diff changeset
30 void (*hook_client_created)(struct client **client) = NULL;
a7c742b940e5 Added pop3 hooks
Timo Sirainen <tss@iki.fi>
parents: 1620
diff changeset
31
10193
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
32 void pop3_refresh_proctitle(void)
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
33 {
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
34 struct client *client;
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
35 string_t *title = t_str_new(128);
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
36
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
37 if (!verbose_proctitle)
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
38 return;
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
39
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
40 str_append_c(title, '[');
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
41 switch (pop3_client_count) {
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
42 case 0:
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
43 str_append(title, "idling");
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
44 break;
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
45 case 1:
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
46 client = pop3_clients;
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
47 str_append(title, client->user->username);
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
48 if (client->user->remote_ip != NULL) {
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
49 str_append_c(title, ' ');
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
50 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
51 }
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
52 break;
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
53 default:
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
54 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
55 break;
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
56 }
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
57 str_append_c(title, ']');
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
58 process_title_set(str_c(title));
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
59 }
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
60
10171
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
61 static void pop3_die(void)
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
62 {
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
63 /* 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
64 }
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
65
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
66 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
67 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
68 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
69
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
70 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
71 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
72 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
73 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
74
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
75 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
76 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
77 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
78 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
79 client_send_line(client, "+OK Logged in.");
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
80 (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
81 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
82 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
83 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
84
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
85 static int
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
86 client_create_from_input(const struct mail_storage_service_input *input,
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
87 int fd_in, int fd_out, const buffer_t *input_buf,
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
88 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
89 {
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
90 struct mail_storage_service_user *user;
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
91 struct mail_user *mail_user;
7927
2351a81ce699 If commands are pipelined after the login command, pass them to the
Timo Sirainen <tss@iki.fi>
parents: 7109
diff changeset
92 struct client *client;
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
93 const struct pop3_settings *set;
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
94
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
95 if (mail_storage_service_lookup_next(storage_service, input,
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
96 &user, &mail_user, error_r) <= 0)
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
97 return -1;
10171
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
98 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
99
10171
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
100 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
101 if (set->verbose_proctitle)
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
102 verbose_proctitle = TRUE;
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
103
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
104 client = client_create(fd_in, fd_out, mail_user, user, set);
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
105 T_BEGIN {
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
106 client_add_input(client, input_buf);
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
107 } T_END;
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
108 return 0;
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
109 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
110
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
111 static void main_stdio_run(void)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
112 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
113 struct mail_storage_service_input input;
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
114 buffer_t *input_buf;
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
115 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
116
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
117 memset(&input, 0, sizeof(input));
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
118 input.module = input.service = "pop3";
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
119 input.username = getenv("USER");
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
120 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
121 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
122 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
123 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
124 if ((value = getenv("IP")) != NULL)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
125 net_addr2ip(value, &input.remote_ip);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
126 if ((value = getenv("LOCAL_IP")) != NULL)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
127 net_addr2ip(value, &input.local_ip);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
128
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
129 input_base64 = getenv("CLIENT_INPUT");
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
130 input_buf = input_base64 == NULL ? NULL :
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
131 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
132
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
133 if (client_create_from_input(&input, STDIN_FILENO, STDOUT_FILENO,
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
134 input_buf, &error) < 0)
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
135 i_fatal("%s", error);
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
136 }
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
137
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
138 static void
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
139 login_client_connected(const struct master_login_client *client,
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
140 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
141 {
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
142 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
143 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
144 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
145
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
146 memset(&input, 0, sizeof(input));
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
147 input.module = input.service = "pop3";
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
148 input.local_ip = client->auth_req.local_ip;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
149 input.remote_ip = client->auth_req.remote_ip;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
150 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
151 input.userdb_fields = extra_fields;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
152
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
153 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
154 i_error("login client: Username missing from auth reply");
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
155 (void)close(client->fd);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
156 return;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
157 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
158
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
159 buffer_create_const_data(&input_buf, client->data,
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
160 client->auth_req.data_size);
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
161 if (client_create_from_input(&input, client->fd, client->fd,
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
162 &input_buf, &error) < 0) {
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
163 i_error("%s", error);
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
164 (void)close(client->fd);
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
165 }
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
166 }
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
167
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9147
diff changeset
168 static void client_connected(const struct master_service_connection *conn)
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9147
diff changeset
169 {
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
170 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
171 /* running standalone, we shouldn't even get here */
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
172 (void)close(conn->fd);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
173 } else {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
174 master_login_add(master_login, conn->fd);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
175 }
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9147
diff changeset
176 }
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9147
diff changeset
177
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
178 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
179 {
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
180 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
181 &pop3_setting_parser_info,
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
182 NULL
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
183 };
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
184 enum master_service_flags service_flags = 0;
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
185 enum mail_storage_service_flags storage_service_flags = 0;
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
186
2873
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
187 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
188 net_getpeername(1, NULL, NULL) == 0) {
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
189 printf("-ERR pop3 binary must not be started from "
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
190 "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
191 return 1;
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
192 }
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
193
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
194 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
195 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
196 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
197 } else {
10194
40d8df2b4111 imap, pop3: Connection counting fixes.
Timo Sirainen <tss@iki.fi>
parents: 10193
diff changeset
198 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
199 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
200 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
201 }
9080
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
202
10119
1e63221f5c83 Moved most of getopt() handling to lib-master.
Timo Sirainen <tss@iki.fi>
parents: 10101
diff changeset
203 master_service = master_service_init("pop3", service_flags,
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
204 &argc, &argv, NULL);
10119
1e63221f5c83 Moved most of getopt() handling to lib-master.
Timo Sirainen <tss@iki.fi>
parents: 10101
diff changeset
205 if (master_getopt(master_service) > 0)
1e63221f5c83 Moved most of getopt() handling to lib-master.
Timo Sirainen <tss@iki.fi>
parents: 10101
diff changeset
206 return FATAL_DEFAULT;
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 master_service_init_finish(master_service);
10171
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
208 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
209
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
210 storage_service =
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
211 mail_storage_service_init(master_service,
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
212 set_roots, storage_service_flags);
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
213
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
214 /* 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
215 while handling its initial input */
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
216 io_loop_set_running(current_ioloop);
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
217
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
218 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
219 T_BEGIN {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
220 main_stdio_run();
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
221 } 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
222 } else {
10194
40d8df2b4111 imap, pop3: Connection counting fixes.
Timo Sirainen <tss@iki.fi>
parents: 10193
diff changeset
223 master_login = master_login_init(master_service, "auth-master",
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
224 login_client_connected);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
225 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
226 }
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
227
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
228 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
229 master_service_run(master_service, client_connected);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
230 clients_destroy_all();
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
231
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
232 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
233 master_login_deinit(&master_login);
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
234 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
235 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
236 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
237 }