annotate src/pop3/main.c @ 10136:ff200b8e4929 HEAD

imap/pop3: Cleaned up initialization code.
author Timo Sirainen <tss@iki.fi>
date Thu, 22 Oct 2009 18:56:01 -0400
parents cb6dc691fa5a
children 7f0ccd367351
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"
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
9 #include "restrict-access.h"
9080
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
10 #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
11 #include "master-login.h"
9661
1780d56a9160 imap/pop3: Compiling fix.
Timo Sirainen <tss@iki.fi>
parents: 9653
diff changeset
12 #include "master-interface.h"
2976
96a4ab34c8f1 Added pop3_uidl_format setting.
Timo Sirainen <tss@iki.fi>
parents: 2952
diff changeset
13 #include "var-expand.h"
9080
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
14 #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
15
2873
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
16 #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
17 #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
18 #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
19
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
20 #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
21 (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
22
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
23 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
24 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
25
1646
a7c742b940e5 Added pop3 hooks
Timo Sirainen <tss@iki.fi>
parents: 1620
diff changeset
26 void (*hook_client_created)(struct client **client) = NULL;
a7c742b940e5 Added pop3 hooks
Timo Sirainen <tss@iki.fi>
parents: 1620
diff changeset
27
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 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
29 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
30 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
31
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
32 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
33 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
34 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
35 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
36
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
37 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
38 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
39 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
40 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
41 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
42 (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
43 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
44 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
45 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
46
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
47 static int
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
48 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
49 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
50 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
51 {
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
52 struct mail_storage_service_user *user;
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
53 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
54 struct client *client;
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
55 const struct pop3_settings *set;
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
56
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
57 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
58 &user, &mail_user, error_r) <= 0)
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
59 return -1;
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
60 set = mail_storage_service_user_get_set(user)[1];
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
61
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
62 restrict_access_allow_coredumps(TRUE);
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
63 if (set->shutdown_clients)
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
64 master_service_set_die_with_master(master_service, 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
65
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
66 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
67 T_BEGIN {
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
68 client_add_input(client, input_buf);
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
69 } T_END;
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
70 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
71 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
72
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
73 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
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 struct mail_storage_service_input input;
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
76 buffer_t *input_buf;
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
77 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
78
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
79 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
80 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
81 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
82 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
83 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
84 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
85 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
86 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
87 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
88 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
89 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
90
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
91 input_base64 = getenv("CLIENT_INPUT");
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
92 input_buf = input_base64 == NULL ? NULL :
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
93 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
94
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
95 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
96 input_buf, &error) < 0)
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
97 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
98 }
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
99
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
100 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
101 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
102 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
103 {
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
104 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
105 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
106 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
107
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
108 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
109 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
110 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
111 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
112 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
113 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
114
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
115 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
116 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
117 (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
118 return;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
119 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
120
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
121 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
122 client->auth_req.data_size);
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
123 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
124 &input_buf, &error) < 0) {
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
125 i_error("%s", error);
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
126 (void)close(client->fd);
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
127 }
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
128 }
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
129
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9147
diff changeset
130 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
131 {
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
132 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
133 /* 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
134 (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
135 } else {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
136 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
137 }
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9147
diff changeset
138 }
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9147
diff changeset
139
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
140 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
141 {
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
142 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
143 &pop3_setting_parser_info,
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
144 NULL
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
145 };
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
146 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
147 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
148
2873
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
149 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
150 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
151 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
152 "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
153 return 1;
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
154 }
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
155
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
156 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
157 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
158 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
159 } else {
9970
4b28edba5ff9 imap, pop3: Process permissions weren't properly dropped.
Timo Sirainen <tss@iki.fi>
parents: 9969
diff changeset
160 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
161 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
162 }
9080
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
163
10119
1e63221f5c83 Moved most of getopt() handling to lib-master.
Timo Sirainen <tss@iki.fi>
parents: 10101
diff changeset
164 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
165 &argc, &argv, NULL);
10119
1e63221f5c83 Moved most of getopt() handling to lib-master.
Timo Sirainen <tss@iki.fi>
parents: 10101
diff changeset
166 if (master_getopt(master_service) > 0)
1e63221f5c83 Moved most of getopt() handling to lib-master.
Timo Sirainen <tss@iki.fi>
parents: 10101
diff changeset
167 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
168 master_service_init_finish(master_service);
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
169
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
170 storage_service =
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
171 mail_storage_service_init(master_service,
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
172 set_roots, storage_service_flags);
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
173
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
174 /* 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
175 while handling its initial input */
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
176 io_loop_set_running(current_ioloop);
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
177
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
178 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
179 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
180 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
181 } 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
182 } else {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
183 master_login = master_login_init("auth-master",
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
184 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
185 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
186 }
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
187
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
188 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
189 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
190 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
191
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
192 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
193 master_login_deinit(&master_login);
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
194 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
195 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
196 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
197 }