src/server/daemon/sessionhandler.c

Sat, 13 Jan 2018 16:44:05 +0100

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Sat, 13 Jan 2018 16:44:05 +0100
branch
aio
changeset 191
391ccd490d97
parent 188
0e6a05c779e0
child 192
6a145e13d933
permissions
-rw-r--r--

moves IOStream creation to the sessionhandler

1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1 /*
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
3 *
44
3da1f7b6847f added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 41
diff changeset
4 * Copyright 2013 Olaf Wintermann. All rights reserved.
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
5 *
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
6 * Redistribution and use in source and binary forms, with or without
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
7 * modification, are permitted provided that the following conditions are met:
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
8 *
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
10 * notice, this list of conditions and the following disclaimer.
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
11 *
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
14 * documentation and/or other materials provided with the distribution.
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
15 *
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
27 */
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
28
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
29 #include <stdio.h>
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
30 #include <stdlib.h>
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
31 #include <errno.h>
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
32
14
b8bf95b39952 New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1
diff changeset
33 #include "../public/nsapi.h"
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
34
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
35 #include "sessionhandler.h"
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
36 #include "httprequest.h"
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
37 #include "httpparser.h"
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
38 #include "log.h"
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
39 #include "error.h"
79
f48cea237ec3 fixed some memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 78
diff changeset
40 #include "httplistener.h"
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
41
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
42 typedef struct _event_http_io {
159
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
43 HTTPRequest *request;
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
44 HttpParser *parser;
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
45 int error;
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
46 } EventHttpIO;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
47
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
48
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
49 int connection_read(Connection *conn, void *buf, int len) {
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
50 return (int)read(conn->fd, buf, len);
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
51 }
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
52
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
53 int connection_write(Connection *conn, const void *buf, int len) {
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
54 return (int)write(conn->fd, buf, len);
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
55 }
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
56
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
57 void connection_close(Connection *conn) {
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
58 close(conn->fd);
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
59 }
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
60
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
61 int connection_ssl_read(Connection *conn, void *buf, int len) {
128
288fd9b9a739 fixes ssl shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 114
diff changeset
62 int ret = SSL_read(conn->ssl, buf, len);
288fd9b9a739 fixes ssl shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 114
diff changeset
63 if(ret <= 0) {
133
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
64 conn->ssl_error = SSL_get_error(conn->ssl, ret);
128
288fd9b9a739 fixes ssl shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 114
diff changeset
65 }
288fd9b9a739 fixes ssl shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 114
diff changeset
66 return ret;
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
67 }
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
68
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
69 int connection_ssl_write(Connection *conn, const void *buf, int len) {
128
288fd9b9a739 fixes ssl shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 114
diff changeset
70 int ret = SSL_write(conn->ssl, buf, len);
288fd9b9a739 fixes ssl shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 114
diff changeset
71 if(ret <= 0) {
133
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
72 conn->ssl_error = SSL_get_error(conn->ssl, ret);
128
288fd9b9a739 fixes ssl shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 114
diff changeset
73 }
288fd9b9a739 fixes ssl shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 114
diff changeset
74 return ret;
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
75 }
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
76
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
77 void connection_ssl_close(Connection *conn) {
142
55298bc9ed28 adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 141
diff changeset
78 if(!conn->ssl_error) {
55298bc9ed28 adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 141
diff changeset
79 int ret = SSL_shutdown(conn->ssl);
55298bc9ed28 adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 141
diff changeset
80 if(ret != 1) {
55298bc9ed28 adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 141
diff changeset
81 conn->ssl_error = SSL_get_error(conn->ssl, ret);
55298bc9ed28 adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 141
diff changeset
82 log_ereport(LOG_VERBOSE, "SSL_shutdown failed: %d", conn->ssl_error);
55298bc9ed28 adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 141
diff changeset
83 }
133
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
84 }
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
85 close(conn->fd);
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
86 }
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
87
114
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
88 void connection_destroy(Connection *conn) {
128
288fd9b9a739 fixes ssl shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 114
diff changeset
89 conn->close(conn);
114
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
90 if(conn->ssl) {
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
91 SSL_free(conn->ssl);
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
92 }
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
93 free(conn);
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
94 }
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
95
191
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
96 IOStream* create_connection_iostream(SessionHandler *sh, Connection *conn, pool_handle_t *pool, WSBool *ssl) {
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
97 IOStream *io = NULL;
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
98 if(conn->ssl) {
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
99 io = sslstream_new(pool, conn->ssl);
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
100 *ssl = 1;
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
101 } else {
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
102 io = sysstream_new(pool, conn->fd);
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
103 *ssl = 0;
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
104 }
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
105 return io;
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
106 }
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
107
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
108
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
109 SessionHandler* create_basic_session_handler() {
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
110 BasicSessionHandler *handler = malloc(sizeof(BasicSessionHandler));
67
50505dc3f8a6 dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 60
diff changeset
111 handler->threadpool = threadpool_new(4, 8);
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
112 handler->sh.enqueue_connection = basic_enq_conn;
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
113 handler->sh.keep_alive = basic_keep_alive;
191
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
114 handler->sh.create_iostream = create_connection_iostream;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
115
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
116 return (SessionHandler*)handler;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
117 }
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
118
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
119 void basic_enq_conn(SessionHandler *handler, Connection *conn) {
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
120 BasicSessionHandler *sh = (BasicSessionHandler*)handler;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
121 conn->session_handler = handler;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
122 threadpool_run(sh->threadpool, basic_run_session, conn);
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
123 }
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
124
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
125 void* basic_run_session(void *data) {
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
126 Connection *conn = (Connection*)data;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
127
46
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
128 HTTPRequest request;
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
129 http_request_init(&request);
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
130 request.connection = conn;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
131
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
132 // read request
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
133 netbuf *buf = malloc(sizeof(netbuf));
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
134 buf->rdtimeout = 120;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
135 buf->pos = 0;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
136 buf->cursize = 0;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
137 buf->maxsize = 2048;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
138 buf->sd = &conn->fd;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
139 buf->inbuf = malloc(2048);
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
140 buf->errmsg = NULL;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
141
46
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
142 request.netbuf = buf;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
143
46
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
144 HttpParser *parser = http_parser_new(&request);
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
145 int state;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
146 int r;
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
147 r = conn->read(conn, buf->inbuf + buf->pos, buf->maxsize - buf->pos);
114
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
148 if(r <= 0) {
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
149 // TODO: error handling
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
150 fprintf(stderr, "%s\n", "Error: Cannot read from socket");
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
151 return NULL;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
152 }
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
153 buf->cursize += r;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
154 while((state = http_parser_process(parser)) != 0) {
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
155 if(state == 2) {
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
156 // TODO: error handling
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
157 fprintf(stderr, "%s\n", "Error: Cannot parse http request");
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
158 return NULL;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
159 }
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
160 r = conn->read(conn, buf->inbuf + buf->pos, buf->maxsize - buf->pos);
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
161 if(r == -1) {
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
162 // TODO: error handling
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
163 fprintf(stderr, "%s\n", "Error: Cannot read from socket");
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
164 return NULL;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
165 }
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
166 buf->cursize += r;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
167 }
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
168
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
169 // process request
159
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
170 r = handle_request(&request, NULL, NULL); // TODO: use correct thread pool
46
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
171
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
172 // TODO: free, see evt_request_finish
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
173
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
174 return NULL;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
175 }
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
176
78
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
177 void basic_keep_alive(SessionHandler *handler, Connection *conn) {
135
471e28cca288 ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
178 connection_destroy(conn);
78
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
179 }
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
180
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
181
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
182 /* ----- event session handler ----- */
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
183
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
184 SessionHandler* create_event_session_handler() {
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
185 EventSessionHandler *handler = malloc(sizeof(EventSessionHandler));
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
186 handler->eventhandler = get_default_event_handler();
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
187 handler->sh.enqueue_connection = evt_enq_conn;
78
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
188 handler->sh.keep_alive = evt_keep_alive;
191
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
189 handler->sh.create_iostream = create_connection_iostream;
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
190 return (SessionHandler*)handler;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
191 }
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
192
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
193 void evt_enq_conn(SessionHandler *handler, Connection *conn) {
46
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
194 HTTPRequest *request = malloc(sizeof(HTTPRequest));
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
195 http_request_init(request);
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
196 request->connection = conn;
46
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
197 conn->session_handler = handler;
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
198
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
199 // set socket non blocking
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
200 int flags;
188
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
201 if ((flags = fcntl(conn->fd, F_GETFL, 0)) == -1) {
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
202 flags = 0;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
203 }
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
204 if (fcntl(conn->fd, F_SETFL, flags | O_NONBLOCK) != 0) {
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
205 perror("Error: start_event_session: fcntl");
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
206 // TODO: error
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
207 }
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
208
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
209 // TODO: remove code redundancy (basic_run_session)
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
210
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
211 // read request
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
212 netbuf *buf = malloc(sizeof(netbuf));
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
213 buf->rdtimeout = 120;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
214 buf->pos = 0;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
215 buf->cursize = 0;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
216 buf->maxsize = 2048;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
217 buf->sd = &conn->fd;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
218 buf->inbuf = malloc(2048);
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
219 buf->errmsg = NULL;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
220
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
221 request->netbuf = buf;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
222
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
223 HttpParser *parser = http_parser_new(request);
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
224
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
225 EventHttpIO *io = malloc(sizeof(EventHttpIO));
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
226 if(io == NULL) {
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
227 // TODO: error handling
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
228 }
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
229 io->request = request;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
230 io->parser = parser;
152
8b85c5face66 improves sessionhandler logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 142
diff changeset
231 io->error = 0;
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
232
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
233 /*
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
234 * to start the request handling, we begin with a poll on the socket,
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
235 *
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
236 * evt_enq_conn() --> event handler --> handle_request()
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
237 */
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
238
159
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
239 Event *event = malloc(sizeof(Event));
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
240 ZERO(event, sizeof(Event));
188
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
241 event->fn = conn->ssl ? evt_request_ssl_accept : evt_request_input;
46
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
242 event->finish = evt_request_finish;
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
243 event->cookie = io;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
244
159
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
245 EventHandler *ev = ev_instance(((EventSessionHandler*)handler)->eventhandler);
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
246
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
247 if(ev_pollin(ev, conn->fd, event) != 0) {
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
248 // TODO: ev_pollin should log, intercept some errors here
133
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
249 log_ereport(LOG_FAILURE, "Cannot enqueue connection");
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
250 connection_destroy(conn);
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
251 // TODO: free stuff
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
252 }
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
253 }
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
254
188
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
255 int evt_request_ssl_accept(EventHandler *handler, Event *event) {
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
256 EventHttpIO *io = event->cookie;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
257 Connection *conn = io->request->connection;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
258
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
259 int ret = SSL_accept(conn->ssl);
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
260 if(ret <= 0) {
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
261 int error = SSL_get_error(conn->ssl, ret);
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
262 char *errstr;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
263 switch(error) {
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
264 default: errstr = "unknown"; break;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
265 case SSL_ERROR_WANT_READ: {
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
266 event->events = EVENT_POLLIN;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
267 return 1;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
268 }
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
269 case SSL_ERROR_WANT_WRITE: {
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
270 event->events = EVENT_POLLOUT;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
271 return 1;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
272 }
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
273 case SSL_ERROR_ZERO_RETURN: errstr = "SSL_ERROR_ZERO_RETURN"; break;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
274 case SSL_ERROR_WANT_CONNECT: errstr = "SSL_ERROR_WANT_CONNECT"; break;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
275 case SSL_ERROR_WANT_ACCEPT: errstr = "SSL_ERROR_WANT_ACCEPT"; break;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
276 case SSL_ERROR_WANT_X509_LOOKUP: errstr = "SSL_ERROR_WANT_X509_LOOKUP"; break;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
277 case SSL_ERROR_SYSCALL: errstr = "SSL_ERROR_SYSCALL"; break;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
278 case SSL_ERROR_SSL: errstr = "SL_ERROR_SSL"; break;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
279
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
280 log_ereport(LOG_VERBOSE, "SSL accept error[%d]: %s", error, errstr);
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
281 event->finish = evt_request_error;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
282 io->error = 1;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
283 return 0;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
284 }
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
285 }
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
286
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
287 // SSL_accept successful, start request input now
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
288 event->fn = evt_request_input;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
289 return evt_request_input(handler, event);
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
290 }
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
291
159
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
292 int evt_request_input(EventHandler *handler, Event *event) {
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
293 EventHttpIO *io = event->cookie;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
294 HttpParser *parser = io->parser;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
295 HTTPRequest *request = io->request;
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
296 Connection *conn = io->request->connection;
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
297 netbuf *buf = request->netbuf;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
298
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
299 int state;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
300 int r;
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
301 r = conn->read(
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
302 conn,
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
303 buf->inbuf + buf->pos,
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
304 buf->maxsize - buf->pos);
114
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
305 if(r <= 0) {
133
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
306 if(conn->ssl) {
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
307 // SSL specific error handling
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
308 switch(conn->ssl_error) {
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
309 case SSL_ERROR_WANT_READ: {
159
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
310 event->events = EVENT_POLLIN;
133
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
311 return 1;
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
312 }
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
313 case SSL_ERROR_WANT_WRITE: {
159
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
314 event->events = EVENT_POLLOUT;
133
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
315 return 1;
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
316 }
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
317 }
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
318 }
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
319
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
320 event->finish = evt_request_error;
152
8b85c5face66 improves sessionhandler logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 142
diff changeset
321 io->error = 1;
41
bb7a1f5a8b48 added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 37
diff changeset
322 return 0;
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
323 }
48
37a512d7b8f6 fixed some memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 47
diff changeset
324 //fwrite(buf->inbuf + buf->pos, 1, r, stdout);
37a512d7b8f6 fixed some memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 47
diff changeset
325 //printf("\n");
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
326
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
327 buf->cursize += r;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
328 state = http_parser_process(parser);
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
329 if(state == 2) {
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
330 // parse error
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
331 fatal_error(request, 400);
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
332 event->finish = evt_request_error;
152
8b85c5face66 improves sessionhandler logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 142
diff changeset
333 io->error = 2;
41
bb7a1f5a8b48 added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 37
diff changeset
334 return 0;
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
335 } else if(state == 1) {
41
bb7a1f5a8b48 added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 37
diff changeset
336 /*
bb7a1f5a8b48 added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 37
diff changeset
337 * we need more data -> return 1 to tell the event handler to
bb7a1f5a8b48 added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 37
diff changeset
338 * continue polling
bb7a1f5a8b48 added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 37
diff changeset
339 */
159
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
340 event->events = EVENT_POLLIN;
41
bb7a1f5a8b48 added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 37
diff changeset
341 return 1;
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
342 }
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
343
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
344 // we are done with reading
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
345
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
346 // set socket blocking
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
347 int flags;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
348 if (-1 == (flags = fcntl(request->connection->fd, F_GETFL, 0))) {
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
349 flags = 0;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
350 }
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
351 if (fcntl(request->connection->fd, F_SETFL, flags & ~O_NONBLOCK) != 0) {
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
352 // just close the connection if fcntl fails
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
353 event->finish = evt_request_error;
152
8b85c5face66 improves sessionhandler logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 142
diff changeset
354 io->error = 3;
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
355 return 0;
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
356 }
46
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
357
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
358 /*
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
359 * process request
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
360 *
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
361 * We return 0 to finish request input. The event handler than stops
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
362 * polling and executes event->finish (evt_request_input_finish)
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
363 */
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
364 return 0;
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
365 }
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
366
159
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
367 int evt_request_finish(EventHandler *h, Event *event) {
46
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
368 EventHttpIO *io = event->cookie;
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
369 HttpParser *parser = io->parser;
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
370 HTTPRequest *request = io->request;
67
50505dc3f8a6 dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 60
diff changeset
371
159
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
372 int r = handle_request(request, NULL, h);
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
373 if(r != 0) {
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
374 // TODO: error message
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
375 close(request->connection->fd);
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
376 }
41
bb7a1f5a8b48 added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 37
diff changeset
377
46
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
378 /*
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
379 * handle_request can return before the request is finished, but it copies
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
380 * all important data. We can free request, parser and event
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
381 *
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
382 * don't free request->netbuf and request->connection
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
383 */
114
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
384 http_request_cleanup(request);
46
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
385 http_parser_free(parser);
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
386
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
387 free(io);
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
388 free(event);
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
389
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
390 return 0;
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
391 }
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
392
159
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
393 int evt_request_error(EventHandler *h, Event *event) {
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
394 EventHttpIO *io = event->cookie;
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
395 HttpParser *parser = io->parser;
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
396 HTTPRequest *request = io->request;
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
397
152
8b85c5face66 improves sessionhandler logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 142
diff changeset
398 if(event->error) {
8b85c5face66 improves sessionhandler logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 142
diff changeset
399 log_ereport(LOG_VERBOSE, "sessionhandler http io error: %d", io->error);
8b85c5face66 improves sessionhandler logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 142
diff changeset
400 }
8b85c5face66 improves sessionhandler logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 142
diff changeset
401
114
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
402 free(request->netbuf->inbuf);
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
403 free(request->netbuf);
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
404
114
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
405 cfg_unref(request->connection->listener->cfg);
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
406 connection_destroy(request->connection);
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
407
114
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
408 http_request_cleanup(request);
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
409 http_parser_free(parser);
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
410
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
411 free(io);
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
412 free(event);
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
413
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
414 return 0;
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
415 }
78
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
416
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
417 void evt_keep_alive(SessionHandler *handler, Connection *conn) {
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
418 // TODO: set timeout
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
419
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
420 /* TODO:
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
421 * Don't just re-enqueue the connection
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
422 * create a evt_req_init function which does most of the evt_enq_conn stuff
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
423 * but don't poll.
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
424 * evt_keep_alive should poll and if an event occurs:
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
425 * evt_req_init
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
426 * evt_request_input
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
427 * evt_enq_conn should do:
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
428 * evt_req_init
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
429 * ev_pollin
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
430 */
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
431 evt_enq_conn(handler, conn);
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
432 }

mercurial