Mercurial Hosting > luan
annotate src/luan/webserver/RequestParser.java @ 1212:220228bf1af9
better urlDecode error handling
author | Franklin Schmidt <fschmidt@gmail.com> |
---|---|
date | Mon, 12 Mar 2018 20:33:02 -0600 |
parents | 1e23b913c327 |
children | b99947af8b79 |
rev | line source |
---|---|
1137 | 1 package luan.webserver; |
2 | |
1212
220228bf1af9
better urlDecode error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1208
diff
changeset
|
3 import java.io.UnsupportedEncodingException; |
220228bf1af9
better urlDecode error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1208
diff
changeset
|
4 import java.net.URLDecoder; |
1143
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
5 import java.util.List; |
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
6 import java.util.ArrayList; |
1197
886e14903c1e
better Content-Type handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1194
diff
changeset
|
7 import org.slf4j.Logger; |
886e14903c1e
better Content-Type handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1194
diff
changeset
|
8 import org.slf4j.LoggerFactory; |
1137 | 9 import luan.lib.parser.Parser; |
10 import luan.lib.parser.ParseException; | |
11 | |
12 | |
1144
ae0a048f3bc7
webserver - handle POST params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1143
diff
changeset
|
13 final class RequestParser { |
1198
9d3835e88204
better query handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1197
diff
changeset
|
14 private static final Logger logger = LoggerFactory.getLogger(RequestParser.class); |
1144
ae0a048f3bc7
webserver - handle POST params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1143
diff
changeset
|
15 private final Request request; |
ae0a048f3bc7
webserver - handle POST params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1143
diff
changeset
|
16 private Parser parser; |
1137 | 17 |
1144
ae0a048f3bc7
webserver - handle POST params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1143
diff
changeset
|
18 RequestParser(Request request) { |
ae0a048f3bc7
webserver - handle POST params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1143
diff
changeset
|
19 this.request = request; |
1137 | 20 } |
21 | |
1145 | 22 void parseUrlencoded() throws ParseException { |
1197
886e14903c1e
better Content-Type handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1194
diff
changeset
|
23 if( request.body == null ) { |
1198
9d3835e88204
better query handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1197
diff
changeset
|
24 logger.warn("body is null\n"+request.rawHead); |
1197
886e14903c1e
better Content-Type handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1194
diff
changeset
|
25 return; |
886e14903c1e
better Content-Type handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1194
diff
changeset
|
26 } |
1147
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
27 this.parser = new Parser(Util.toString(request.body)); |
1144
ae0a048f3bc7
webserver - handle POST params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1143
diff
changeset
|
28 parseQuery(); |
ae0a048f3bc7
webserver - handle POST params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1143
diff
changeset
|
29 require( parser.endOfInput() ); |
1137 | 30 } |
31 | |
1144
ae0a048f3bc7
webserver - handle POST params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1143
diff
changeset
|
32 void parseHead() throws ParseException { |
ae0a048f3bc7
webserver - handle POST params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1143
diff
changeset
|
33 this.parser = new Parser(request.rawHead); |
1137 | 34 parseRequestLine(); |
35 while( !parser.match("\r\n") ) { | |
36 parserHeaderField(); | |
37 } | |
1146
2dda3c92a473
webserver - implement cookies
Franklin Schmidt <fschmidt@gmail.com>
parents:
1145
diff
changeset
|
38 parseCookies(); |
1137 | 39 } |
40 | |
41 private void parseRequestLine() throws ParseException { | |
42 parseMethod(); | |
43 require( parser.match(' ') ); | |
1143
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
44 parseRawPath(); |
1137 | 45 require( parser.match(' ') ); |
46 parseProtocol(); | |
47 require( parser.match("\r\n") ); | |
48 } | |
49 | |
50 private void parseMethod() throws ParseException { | |
51 int start = parser.currentIndex(); | |
52 if( !methodChar() ) | |
53 throw new ParseException(parser,"no method"); | |
54 while( methodChar() ); | |
55 request.method = parser.textFrom(start); | |
56 } | |
57 | |
58 private boolean methodChar() { | |
59 return parser.inCharRange('A','Z'); | |
60 } | |
61 | |
1143
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
62 private void parseRawPath() throws ParseException { |
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
63 int start = parser.currentIndex(); |
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
64 parsePath(); |
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
65 if( parser.match('?') ) |
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
66 parseQuery(); |
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
67 request.rawPath = parser.textFrom(start); |
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
68 } |
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
69 |
1137 | 70 private void parsePath() throws ParseException { |
71 int start = parser.currentIndex(); | |
72 if( !parser.match('/') ) | |
73 throw new ParseException(parser,"bad path"); | |
1143
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
74 while( safePathChar() || parser.anyOf("&=") ); |
1212
220228bf1af9
better urlDecode error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1208
diff
changeset
|
75 request.path = urlDecode( parser.textFrom(start) ); |
1143
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
76 } |
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
77 |
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
78 private void parseQuery() throws ParseException { |
1198
9d3835e88204
better query handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1197
diff
changeset
|
79 do { |
1143
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
80 int start = parser.currentIndex(); |
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
81 while( queryChar() ); |
1212
220228bf1af9
better urlDecode error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1208
diff
changeset
|
82 String name = urlDecode( parser.textFrom(start) ); |
1198
9d3835e88204
better query handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1197
diff
changeset
|
83 String value = null; |
1143
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
84 if( parser.match('=') ) { |
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
85 start = parser.currentIndex(); |
1198
9d3835e88204
better query handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1197
diff
changeset
|
86 while( queryChar() || parser.match('=') ); |
1212
220228bf1af9
better urlDecode error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1208
diff
changeset
|
87 value = urlDecode( parser.textFrom(start) ); |
1143
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
88 } |
1198
9d3835e88204
better query handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1197
diff
changeset
|
89 if( name.length() > 0 || value != null ) { |
9d3835e88204
better query handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1197
diff
changeset
|
90 if( value==null ) |
9d3835e88204
better query handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1197
diff
changeset
|
91 value = ""; |
9d3835e88204
better query handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1197
diff
changeset
|
92 Util.add(request.parameters,name,value); |
9d3835e88204
better query handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1197
diff
changeset
|
93 } |
9d3835e88204
better query handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1197
diff
changeset
|
94 } while( parser.match('&') ); |
1143
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
95 } |
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
96 |
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
97 private boolean queryChar() { |
1198
9d3835e88204
better query handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1197
diff
changeset
|
98 return parser.noneOf("=&# \t\n\f\r\u000b"); |
1143
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
99 } |
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
100 |
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
101 // where did I get this? |
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
102 private boolean safePathChar() { |
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
103 return parser.inCharRange('A','Z') |
1137 | 104 || parser.inCharRange('a','z') |
105 || parser.inCharRange('0','9') | |
1143
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
106 || parser.anyOf("-._~:/[]@!$'()*+,;`.%") |
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
107 ; |
1137 | 108 } |
109 | |
110 private void parseProtocol() throws ParseException { | |
111 int start = parser.currentIndex(); | |
112 if( !( | |
113 parser.match("HTTP/") | |
114 && parser.inCharRange('0','9') | |
115 && parser.match('.') | |
116 && parser.inCharRange('0','9') | |
117 ) ) | |
118 throw new ParseException(parser,"bad protocol"); | |
119 request.protocol = parser.textFrom(start); | |
120 } | |
121 | |
122 | |
123 private void parserHeaderField() throws ParseException { | |
124 String name = parseName(); | |
125 require( parser.match(':') ); | |
126 while( parser.anyOf(" \t") ); | |
127 String value = parseValue(); | |
128 while( parser.anyOf(" \t") ); | |
129 require( parser.match("\r\n") ); | |
1146
2dda3c92a473
webserver - implement cookies
Franklin Schmidt <fschmidt@gmail.com>
parents:
1145
diff
changeset
|
130 Util.add(request.headers,name,value); |
1137 | 131 } |
132 | |
133 private String parseName() throws ParseException { | |
1148
49fb4e83484f
webserver - change headers to lower case
Franklin Schmidt <fschmidt@gmail.com>
parents:
1147
diff
changeset
|
134 int start = parser.currentIndex(); |
1137 | 135 require( tokenChar() ); |
1148
49fb4e83484f
webserver - change headers to lower case
Franklin Schmidt <fschmidt@gmail.com>
parents:
1147
diff
changeset
|
136 while( tokenChar() ); |
49fb4e83484f
webserver - change headers to lower case
Franklin Schmidt <fschmidt@gmail.com>
parents:
1147
diff
changeset
|
137 return parser.textFrom(start).toLowerCase(); |
1137 | 138 } |
139 | |
1148
49fb4e83484f
webserver - change headers to lower case
Franklin Schmidt <fschmidt@gmail.com>
parents:
1147
diff
changeset
|
140 private String parseValue() throws ParseException { |
1137 | 141 int start = parser.currentIndex(); |
142 while( !testEndOfValue() ) | |
1148
49fb4e83484f
webserver - change headers to lower case
Franklin Schmidt <fschmidt@gmail.com>
parents:
1147
diff
changeset
|
143 require( parser.anyChar() ); |
1137 | 144 return parser.textFrom(start); |
145 } | |
146 | |
147 private boolean testEndOfValue() { | |
148 parser.begin(); | |
149 while( parser.anyOf(" \t") ); | |
150 boolean b = parser.endOfInput() || parser.anyOf("\r\n"); | |
151 parser.failure(); // rollback | |
152 return b; | |
153 } | |
154 | |
155 private void require(boolean b) throws ParseException { | |
156 if( !b ) | |
157 throw new ParseException(parser,"failed"); | |
158 } | |
159 | |
160 boolean tokenChar() { | |
161 if( parser.endOfInput() ) | |
162 return false; | |
163 char c = parser.currentChar(); | |
164 if( 32 <= c && c <= 126 && "()<>@,;:\\\"/[]?={} \t\r\n".indexOf(c) == -1 ) { | |
165 parser.anyChar(); | |
166 return true; | |
167 } else { | |
168 return false; | |
169 } | |
170 } | |
1143
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
171 |
1146
2dda3c92a473
webserver - implement cookies
Franklin Schmidt <fschmidt@gmail.com>
parents:
1145
diff
changeset
|
172 |
2dda3c92a473
webserver - implement cookies
Franklin Schmidt <fschmidt@gmail.com>
parents:
1145
diff
changeset
|
173 private void parseCookies() throws ParseException { |
1148
49fb4e83484f
webserver - change headers to lower case
Franklin Schmidt <fschmidt@gmail.com>
parents:
1147
diff
changeset
|
174 String text = (String)request.headers.get("cookie"); |
1146
2dda3c92a473
webserver - implement cookies
Franklin Schmidt <fschmidt@gmail.com>
parents:
1145
diff
changeset
|
175 if( text == null ) |
2dda3c92a473
webserver - implement cookies
Franklin Schmidt <fschmidt@gmail.com>
parents:
1145
diff
changeset
|
176 return; |
2dda3c92a473
webserver - implement cookies
Franklin Schmidt <fschmidt@gmail.com>
parents:
1145
diff
changeset
|
177 this.parser = new Parser(text); |
2dda3c92a473
webserver - implement cookies
Franklin Schmidt <fschmidt@gmail.com>
parents:
1145
diff
changeset
|
178 while(true) { |
2dda3c92a473
webserver - implement cookies
Franklin Schmidt <fschmidt@gmail.com>
parents:
1145
diff
changeset
|
179 int start = parser.currentIndex(); |
2dda3c92a473
webserver - implement cookies
Franklin Schmidt <fschmidt@gmail.com>
parents:
1145
diff
changeset
|
180 while( parser.noneOf("=;") ); |
1212
220228bf1af9
better urlDecode error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1208
diff
changeset
|
181 String name = urlDecode( parser.textFrom(start) ); |
1146
2dda3c92a473
webserver - implement cookies
Franklin Schmidt <fschmidt@gmail.com>
parents:
1145
diff
changeset
|
182 if( parser.match('=') ) { |
2dda3c92a473
webserver - implement cookies
Franklin Schmidt <fschmidt@gmail.com>
parents:
1145
diff
changeset
|
183 start = parser.currentIndex(); |
2dda3c92a473
webserver - implement cookies
Franklin Schmidt <fschmidt@gmail.com>
parents:
1145
diff
changeset
|
184 while( parser.noneOf(";") ); |
1212
220228bf1af9
better urlDecode error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1208
diff
changeset
|
185 String value = urlDecode( parser.textFrom(start) ); |
1146
2dda3c92a473
webserver - implement cookies
Franklin Schmidt <fschmidt@gmail.com>
parents:
1145
diff
changeset
|
186 request.cookies.put(name,value); |
2dda3c92a473
webserver - implement cookies
Franklin Schmidt <fschmidt@gmail.com>
parents:
1145
diff
changeset
|
187 } |
2dda3c92a473
webserver - implement cookies
Franklin Schmidt <fschmidt@gmail.com>
parents:
1145
diff
changeset
|
188 if( parser.endOfInput() ) |
2dda3c92a473
webserver - implement cookies
Franklin Schmidt <fschmidt@gmail.com>
parents:
1145
diff
changeset
|
189 return; |
1208
1e23b913c327
minor cookie parsing fix
Franklin Schmidt <fschmidt@gmail.com>
parents:
1198
diff
changeset
|
190 require( parser.match(';') ); |
1e23b913c327
minor cookie parsing fix
Franklin Schmidt <fschmidt@gmail.com>
parents:
1198
diff
changeset
|
191 parser.match(' '); // optional for bad browsers |
1143
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
192 } |
3bf5190b3c77
webserver - handle GET params
Franklin Schmidt <fschmidt@gmail.com>
parents:
1137
diff
changeset
|
193 } |
1146
2dda3c92a473
webserver - implement cookies
Franklin Schmidt <fschmidt@gmail.com>
parents:
1145
diff
changeset
|
194 |
1147
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
195 |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
196 private static final String contentTypeStart = "multipart/form-data; boundary="; |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
197 |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
198 void parseMultipart() throws ParseException { |
1197
886e14903c1e
better Content-Type handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1194
diff
changeset
|
199 if( request.body == null ) { |
1198
9d3835e88204
better query handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1197
diff
changeset
|
200 logger.warn("body is null\n"+request.rawHead); |
1197
886e14903c1e
better Content-Type handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1194
diff
changeset
|
201 return; |
886e14903c1e
better Content-Type handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1194
diff
changeset
|
202 } |
1148
49fb4e83484f
webserver - change headers to lower case
Franklin Schmidt <fschmidt@gmail.com>
parents:
1147
diff
changeset
|
203 String contentType = (String)request.headers.get("content-type"); |
1147
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
204 if( !contentType.startsWith(contentTypeStart) ) |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
205 throw new RuntimeException(contentType); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
206 String boundary = "--"+contentType.substring(contentTypeStart.length()); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
207 this.parser = new Parser(Util.toString(request.body)); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
208 require( parser.match(boundary) ); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
209 boundary = "\r\n" + boundary; |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
210 while( !parser.match("--\r\n") ) { |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
211 require( parser.match("\r\n") ); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
212 require( parser.match("Content-Disposition: form-data; name=") ); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
213 String name = quotedString(); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
214 String filename = null; |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
215 boolean isBinary = false; |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
216 if( parser.match("; filename=") ) { |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
217 filename = quotedString(); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
218 require( parser.match("\r\n") ); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
219 require( parser.match("Content-Type: ") ); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
220 if( parser.match("application/octet-stream") ) { |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
221 isBinary = true; |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
222 } else if( parser.match("text/plain") ) { |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
223 isBinary = false; |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
224 } else |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
225 throw new ParseException(parser,"bad file content-type"); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
226 } |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
227 require( parser.match("\r\n") ); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
228 require( parser.match("\r\n") ); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
229 int start = parser.currentIndex(); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
230 while( !parser.test(boundary) ) { |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
231 require( parser.anyChar() ); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
232 } |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
233 String value = parser.textFrom(start); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
234 if( filename == null ) { |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
235 Util.add(request.parameters,name,value); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
236 } else { |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
237 Object content = isBinary ? Util.toBytes(value) : value; |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
238 Request.MultipartFile mf = new Request.MultipartFile(filename,content); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
239 Util.add(request.parameters,name,mf); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
240 } |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
241 require( parser.match(boundary) ); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
242 } |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
243 } |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
244 |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
245 private String quotedString() throws ParseException { |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
246 StringBuilder sb = new StringBuilder(); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
247 require( parser.match('"') ); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
248 while( !parser.match('"') ) { |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
249 if( parser.match("\\\"") ) { |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
250 sb.append('"'); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
251 } else { |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
252 require( parser.anyChar() ); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
253 sb.append( parser.lastChar() ); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
254 } |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
255 } |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
256 return sb.toString(); |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
257 } |
30d87b7d1d62
webserver - support multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1146
diff
changeset
|
258 |
1212
220228bf1af9
better urlDecode error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1208
diff
changeset
|
259 private String urlDecode(String s) throws ParseException { |
220228bf1af9
better urlDecode error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1208
diff
changeset
|
260 try { |
220228bf1af9
better urlDecode error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1208
diff
changeset
|
261 return URLDecoder.decode(s,"UTF-8"); |
220228bf1af9
better urlDecode error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1208
diff
changeset
|
262 } catch(UnsupportedEncodingException e) { |
220228bf1af9
better urlDecode error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1208
diff
changeset
|
263 parser.rollback(); |
220228bf1af9
better urlDecode error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1208
diff
changeset
|
264 throw new ParseException(parser,e); |
220228bf1af9
better urlDecode error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1208
diff
changeset
|
265 } catch(IllegalArgumentException e) { |
220228bf1af9
better urlDecode error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1208
diff
changeset
|
266 parser.rollback(); |
220228bf1af9
better urlDecode error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1208
diff
changeset
|
267 throw new ParseException(parser,e); |
220228bf1af9
better urlDecode error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1208
diff
changeset
|
268 } |
220228bf1af9
better urlDecode error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1208
diff
changeset
|
269 } |
220228bf1af9
better urlDecode error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1208
diff
changeset
|
270 |
1137 | 271 } |