Mercurial Hosting > luan

annotate src/luan/webserver/Connection.java @ 1207:59289af20d9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
better webserver logging
author Franklin Schmidt <fschmidt@gmail.com>
date Wed, 07 Mar 2018 16:48:32 -0700
parents 9d3835e88204
children 85aa7961239a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1137
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
1 package luan.webserver;
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
2
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
3 import java.io.InputStream;
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
4 import java.io.OutputStream;
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
5 import java.io.IOException;
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
6 import java.net.Socket;
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
7 import org.slf4j.Logger;
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
8 import org.slf4j.LoggerFactory;
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
9 import luan.lib.parser.ParseException;
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
10
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
11
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
12 final class Connection {
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
13 private static final Logger logger = LoggerFactory.getLogger(Connection.class);
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
14
1142
0f59eab45f3d webserver - threading
Franklin Schmidt <fschmidt@gmail.com>
parents: 1138
diff changeset
15 static void handle(Server server,Socket socket) {
0f59eab45f3d webserver - threading
Franklin Schmidt <fschmidt@gmail.com>
parents: 1138
diff changeset
16 new Connection(server,socket).handle();
0f59eab45f3d webserver - threading
Franklin Schmidt <fschmidt@gmail.com>
parents: 1138
diff changeset
17 }
0f59eab45f3d webserver - threading
Franklin Schmidt <fschmidt@gmail.com>
parents: 1138
diff changeset
18
1137
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
19 private final Server server;
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
20 private final Socket socket;
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
21
1142
0f59eab45f3d webserver - threading
Franklin Schmidt <fschmidt@gmail.com>
parents: 1138
diff changeset
22 private Connection(Server server,Socket socket) {
1137
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
23 this.server = server;
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
24 this.socket = socket;
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
25 }
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
26
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
27 private void handle() {
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
28 try {
1144
ae0a048f3bc7 webserver - handle POST params
Franklin Schmidt <fschmidt@gmail.com>
parents: 1142
diff changeset
29 Request request = new Request();
1194
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
30 Response response;
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
31 try {
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
32 {
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
33 InputStream in = socket.getInputStream();
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
34 byte[] a = new byte[8192];
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
35 int endOfHeader;
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
36 int size = 0;
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
37 int left = a.length;
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
38 outer: while(true) {
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
39 int n = in.read(a,size,left);
1144
ae0a048f3bc7 webserver - handle POST params
Franklin Schmidt <fschmidt@gmail.com>
parents: 1142
diff changeset
40 if( n == -1 ) {
1194
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
41 if( size == 0 ) {
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
42 socket.close();
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
43 return;
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
44 }
1144
ae0a048f3bc7 webserver - handle POST params
Franklin Schmidt <fschmidt@gmail.com>
parents: 1142
diff changeset
45 throw new IOException("unexpected end of input at "+size);
ae0a048f3bc7 webserver - handle POST params
Franklin Schmidt <fschmidt@gmail.com>
parents: 1142
diff changeset
46 }
ae0a048f3bc7 webserver - handle POST params
Franklin Schmidt <fschmidt@gmail.com>
parents: 1142
diff changeset
47 size += n;
1194
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
48 for( int i=0; i<=size-4; i++ ) {
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
49 if( a[i]=='\r' && a[i+1]=='\n' && a[i+2]=='\r' && a[i+3]=='\n' ) {
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
50 endOfHeader = i + 4;
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
51 break outer;
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
52 }
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
53 }
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
54 left -= n;
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
55 if( left == 0 ) {
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
56 byte[] a2 = new byte[2*a.length];
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
57 System.arraycopy(a,0,a2,0,size);
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
58 a = a2;
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
59 left = a.length - size;
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
60 }
1144
ae0a048f3bc7 webserver - handle POST params
Franklin Schmidt <fschmidt@gmail.com>
parents: 1142
diff changeset
61 }
1194
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
62 String rawHead = new String(a,0,endOfHeader);
1197
886e14903c1e better Content-Type handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 1196
diff changeset
63 //System.out.println(rawHead);
1194
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
64 request.rawHead = rawHead;
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
65 RequestParser parser = new RequestParser(request);
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
66 parser.parseHead();
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
67
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
68 String lenStr = (String)request.headers.get("content-length");
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
69 if( lenStr != null ) {
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
70 int len = Integer.parseInt(lenStr);
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
71 byte[] body = new byte[len];
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
72 size -= endOfHeader;
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
73 System.arraycopy(a,endOfHeader,body,0,size);
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
74 while( size < len ) {
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
75 int n = in.read(body,size,len-size);
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
76 if( n == -1 ) {
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
77 throw new IOException("unexpected end of input at "+size);
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
78 }
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
79 size += n;
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
80 }
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
81 request.body = body;
1197
886e14903c1e better Content-Type handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 1196
diff changeset
82 //System.out.println(new String(request.body));
1194
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
83 }
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
84
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
85 String contentType = (String)request.headers.get("content-type");
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
86 if( contentType != null ) {
1197
886e14903c1e better Content-Type handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 1196
diff changeset
87 if( "application/x-www-form-urlencoded".equals(contentType) ) {
886e14903c1e better Content-Type handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 1196
diff changeset
88 parser.parseUrlencoded();
886e14903c1e better Content-Type handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 1196
diff changeset
89 } else if( contentType.startsWith("multipart/form-data;") ) {
886e14903c1e better Content-Type handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 1196
diff changeset
90 parser.parseMultipart();
1145
12ececf30597 webserver - minor
Franklin Schmidt <fschmidt@gmail.com>
parents: 1144
diff changeset
91 } else {
1198
9d3835e88204 better query handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 1197
diff changeset
92 logger.warn("unknown request content-type: "+contentType);
1145
12ececf30597 webserver - minor
Franklin Schmidt <fschmidt@gmail.com>
parents: 1144
diff changeset
93 }
1144
ae0a048f3bc7 webserver - handle POST params
Franklin Schmidt <fschmidt@gmail.com>
parents: 1142
diff changeset
94 }
1137
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
95 }
1194
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
96 response = server.handler.handle(request);
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
97 } catch(ParseException e) {
1207
59289af20d9a better webserver logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1198
diff changeset
98 logger.error("parse error\n"+request.rawHead.trim()+"\n",e);
1194
bd0420fb3dd0 handle ParseException in webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
99 response = Response.errorResponse(Status.BAD_REQUEST,e.toString());
1137
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
100 }
1148
49fb4e83484f webserver - change headers to lower case
Franklin Schmidt <fschmidt@gmail.com>
parents: 1147
diff changeset
101 response.headers.put("connection","close");
49fb4e83484f webserver - change headers to lower case
Franklin Schmidt <fschmidt@gmail.com>
parents: 1147
diff changeset
102 response.headers.put("content-length",Long.toString(response.body.length));
1137
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
103 byte[] header = response.toHeaderString().getBytes();
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
104
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
105 OutputStream out = socket.getOutputStream();
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
106 out.write(header);
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
107 copyAll(response.body.content,out);
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
108 out.close();
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
109 socket.close();
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
110 } catch(IOException e) {
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
111 logger.info("",e);
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
112 }
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
113 }
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
114
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
115 private static void copyAll(InputStream in,OutputStream out)
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
116 throws IOException
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
117 {
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
118 byte[] a = new byte[8192];
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
119 int n;
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
120 while( (n=in.read(a)) != -1 ) {
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
121 out.write(a,0,n);
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
122 }
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
123 }
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
124
c123ee15f99b add webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
125 }