Mercurial Hosting > luan
annotate src/luan/modules/url/LuanUrl.java @ 1318:35a6a195819f
in authorization rename user to username
author | Franklin Schmidt <fschmidt@gmail.com> |
---|---|
date | Sun, 03 Feb 2019 22:17:50 -0700 |
parents | c286c1e36b81 |
children | 25746915a241 |
rev | line source |
---|---|
725
a741a3a33423
add url support for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
723
diff
changeset
|
1 package luan.modules.url; |
722 | 2 |
3 import java.io.InputStream; | |
4 import java.io.InputStreamReader; | |
5 import java.io.OutputStream; | |
6 import java.io.Reader; | |
7 import java.io.IOException; | |
1315 | 8 import java.io.FileNotFoundException; |
722 | 9 import java.io.UnsupportedEncodingException; |
10 import java.net.URL; | |
11 import java.net.URLConnection; | |
12 import java.net.HttpURLConnection; | |
13 import java.net.URLEncoder; | |
1317
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
14 import java.security.MessageDigest; |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
15 import java.security.NoSuchAlgorithmException; |
722 | 16 import java.util.Map; |
17 import java.util.HashMap; | |
18 import java.util.List; | |
19 import java.util.Base64; | |
1317
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
20 import luan.lib.parser.ParseException; |
733
ffbbe25dab09
add http option time_out
Franklin Schmidt <fschmidt@gmail.com>
parents:
726
diff
changeset
|
21 import luan.Luan; |
722 | 22 import luan.LuanState; |
23 import luan.LuanTable; | |
24 import luan.LuanJavaFunction; | |
25 import luan.LuanException; | |
725
a741a3a33423
add url support for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
723
diff
changeset
|
26 import luan.modules.IoLuan; |
a741a3a33423
add url support for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
723
diff
changeset
|
27 import luan.modules.Utils; |
722 | 28 |
29 | |
30 public final class LuanUrl extends IoLuan.LuanIn { | |
725
a741a3a33423
add url support for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
723
diff
changeset
|
31 |
722 | 32 private static enum Method { GET, POST, DELETE } |
33 | |
34 private URL url; | |
35 private Method method = Method.GET; | |
1317
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
36 private final Map<String,Object> headers = new HashMap<String,Object>(); |
1244 | 37 private String content = ""; |
725
a741a3a33423
add url support for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
723
diff
changeset
|
38 private MultipartClient multipart = null; |
733
ffbbe25dab09
add http option time_out
Franklin Schmidt <fschmidt@gmail.com>
parents:
726
diff
changeset
|
39 private int timeout = 0; |
1318
35a6a195819f
in authorization rename user to username
Franklin Schmidt <fschmidt@gmail.com>
parents:
1317
diff
changeset
|
40 private String authUsername = null; |
1317
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
41 private String authPassword = null; |
722 | 42 |
1267 | 43 public LuanUrl(URL url,LuanTable options) throws LuanException { |
722 | 44 this.url = url; |
45 if( options != null ) { | |
1267 | 46 Map map = options.asMap(); |
722 | 47 String methodStr = getString(map,"method"); |
48 if( methodStr != null ) { | |
49 methodStr = methodStr.toUpperCase(); | |
50 try { | |
51 this.method = Method.valueOf(methodStr); | |
52 } catch(IllegalArgumentException e) { | |
53 throw new LuanException( "invalid method: "+methodStr ); | |
54 } | |
55 } | |
1267 | 56 Map headerMap = getMap(map,"headers"); |
723 | 57 if( headerMap != null ) { |
58 for( Object hack : headerMap.entrySet() ) { | |
59 Map.Entry entry = (Map.Entry)hack; | |
1150
0842b9b570f8
change http headers interface
Franklin Schmidt <fschmidt@gmail.com>
parents:
1094
diff
changeset
|
60 String name = (String)entry.getKey(); |
723 | 61 Object val = entry.getValue(); |
62 if( val instanceof String ) { | |
63 headers.put(name,val); | |
64 } else { | |
65 if( !(val instanceof LuanTable) ) | |
1150
0842b9b570f8
change http headers interface
Franklin Schmidt <fschmidt@gmail.com>
parents:
1094
diff
changeset
|
66 throw new LuanException( "header '"+name+"' must be string or table" ); |
723 | 67 LuanTable t = (LuanTable)val; |
68 if( !t.isList() ) | |
1150
0842b9b570f8
change http headers interface
Franklin Schmidt <fschmidt@gmail.com>
parents:
1094
diff
changeset
|
69 throw new LuanException( "header '"+name+"' table must be list" ); |
723 | 70 headers.put(name,t.asList()); |
71 } | |
72 } | |
73 } | |
1267 | 74 Map auth = getMap(map,"authorization"); |
722 | 75 if( auth != null ) { |
1151 | 76 if( headers!=null && headers.containsKey("authorization") ) |
77 throw new LuanException( "can't define authorization with header 'authorization' defined" ); | |
1318
35a6a195819f
in authorization rename user to username
Franklin Schmidt <fschmidt@gmail.com>
parents:
1317
diff
changeset
|
78 String username = getString(auth,"username"); |
35a6a195819f
in authorization rename user to username
Franklin Schmidt <fschmidt@gmail.com>
parents:
1317
diff
changeset
|
79 if( username==null ) username = ""; |
722 | 80 String password = getString(auth,"password"); |
1317
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
81 if( password==null ) password = ""; |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
82 String type = getString(auth,"type"); |
722 | 83 if( !auth.isEmpty() ) |
84 throw new LuanException( "unrecognized authorization options: "+auth ); | |
1317
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
85 if( type != null ) { |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
86 if( !type.toLowerCase().equals("basic") ) |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
87 throw new LuanException( "authorization type can only be 'basic' or nil" ); |
1318
35a6a195819f
in authorization rename user to username
Franklin Schmidt <fschmidt@gmail.com>
parents:
1317
diff
changeset
|
88 String val = basicAuth(username,password); |
1317
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
89 headers.put("authorization",val); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
90 } else { |
1318
35a6a195819f
in authorization rename user to username
Franklin Schmidt <fschmidt@gmail.com>
parents:
1317
diff
changeset
|
91 authUsername = username; |
1317
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
92 authPassword = password; |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
93 } |
722 | 94 } |
1267 | 95 Map params = getMap(map,"parameters"); |
726
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
96 String enctype = getString(map,"enctype"); |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
97 if( enctype != null ) { |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
98 if( !enctype.equals("multipart/form-data") ) |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
99 throw new LuanException( "unrecognized enctype: "+enctype ); |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
100 if( this.method!=Method.POST ) |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
101 throw new LuanException( "multipart/form-data can only be used with POST" ); |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
102 if( params==null ) |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
103 throw new LuanException( "multipart/form-data requires parameters" ); |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
104 if( params.isEmpty() ) |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
105 throw new LuanException( "multipart/form-data parameters can't be empty" ); |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
106 multipart = new MultipartClient(params); |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
107 } |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
108 else if( params != null ) { |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
109 StringBuilder sb = new StringBuilder(); |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
110 for( Object hack : params.entrySet() ) { |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
111 Map.Entry entry = (Map.Entry)hack; |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
112 String key = (String)entry.getKey(); |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
113 Object val = entry.getValue(); |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
114 String keyEnc = encode(key); |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
115 if( val instanceof String ) { |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
116 and(sb); |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
117 sb.append( keyEnc ).append( '=' ).append( encode((String)val) ); |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
118 } else { |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
119 if( !(val instanceof LuanTable) ) |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
120 throw new LuanException( "parameter '"+key+"' must be string or table" ); |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
121 LuanTable t = (LuanTable)val; |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
122 if( !t.isList() ) |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
123 throw new LuanException( "parameter '"+key+"' table must be list" ); |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
124 for( Object obj : t.asList() ) { |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
125 if( !(obj instanceof String) ) |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
126 throw new LuanException( "parameter '"+key+"' values must be strings" ); |
722 | 127 and(sb); |
726
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
128 sb.append( keyEnc ).append( '=' ).append( encode((String)obj) ); |
722 | 129 } |
130 } | |
726
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
131 } |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
132 if( this.method==Method.POST ) { |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
133 content = sb.toString(); |
780
6a87d51ae0ed
allow parameters for HTTP DELETE
Franklin Schmidt <fschmidt@gmail.com>
parents:
775
diff
changeset
|
134 } else { |
726
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
135 String urlS = this.url.toString(); |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
136 if( urlS.indexOf('?') == -1 ) { |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
137 urlS += '?'; |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
138 } else { |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
139 urlS += '&'; |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
140 } |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
141 urlS += sb; |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
142 try { |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
143 this.url = new URL(urlS); |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
144 } catch(IOException e) { |
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
145 throw new RuntimeException(e); |
722 | 146 } |
147 } | |
148 } | |
733
ffbbe25dab09
add http option time_out
Franklin Schmidt <fschmidt@gmail.com>
parents:
726
diff
changeset
|
149 Integer timeout = getInt(map,"time_out"); |
ffbbe25dab09
add http option time_out
Franklin Schmidt <fschmidt@gmail.com>
parents:
726
diff
changeset
|
150 if( timeout != null ) |
ffbbe25dab09
add http option time_out
Franklin Schmidt <fschmidt@gmail.com>
parents:
726
diff
changeset
|
151 this.timeout = timeout; |
722 | 152 if( !map.isEmpty() ) |
153 throw new LuanException( "unrecognized options: "+map ); | |
154 } | |
155 } | |
156 | |
157 private static void and(StringBuilder sb) { | |
158 if( sb.length() > 0 ) | |
159 sb.append('&'); | |
160 } | |
161 | |
162 private static String encode(String s) { | |
163 try { | |
164 return URLEncoder.encode(s,"UTF-8"); | |
165 } catch(UnsupportedEncodingException e) { | |
166 throw new RuntimeException(e); | |
167 } | |
168 } | |
169 | |
170 private static String getString(Map map,String key) throws LuanException { | |
171 Object val = map.remove(key); | |
172 if( val!=null && !(val instanceof String) ) | |
173 throw new LuanException( "parameter '"+key+"' must be a string" ); | |
174 return (String)val; | |
175 } | |
176 | |
733
ffbbe25dab09
add http option time_out
Franklin Schmidt <fschmidt@gmail.com>
parents:
726
diff
changeset
|
177 private static Integer getInt(Map map,String key) throws LuanException { |
ffbbe25dab09
add http option time_out
Franklin Schmidt <fschmidt@gmail.com>
parents:
726
diff
changeset
|
178 Object val = map.remove(key); |
ffbbe25dab09
add http option time_out
Franklin Schmidt <fschmidt@gmail.com>
parents:
726
diff
changeset
|
179 if( val==null ) |
ffbbe25dab09
add http option time_out
Franklin Schmidt <fschmidt@gmail.com>
parents:
726
diff
changeset
|
180 return null; |
ffbbe25dab09
add http option time_out
Franklin Schmidt <fschmidt@gmail.com>
parents:
726
diff
changeset
|
181 Integer i = Luan.asInteger(val); |
ffbbe25dab09
add http option time_out
Franklin Schmidt <fschmidt@gmail.com>
parents:
726
diff
changeset
|
182 if( i==null ) |
ffbbe25dab09
add http option time_out
Franklin Schmidt <fschmidt@gmail.com>
parents:
726
diff
changeset
|
183 throw new LuanException( "parameter '"+key+"' must be an integer" ); |
ffbbe25dab09
add http option time_out
Franklin Schmidt <fschmidt@gmail.com>
parents:
726
diff
changeset
|
184 return i; |
ffbbe25dab09
add http option time_out
Franklin Schmidt <fschmidt@gmail.com>
parents:
726
diff
changeset
|
185 } |
ffbbe25dab09
add http option time_out
Franklin Schmidt <fschmidt@gmail.com>
parents:
726
diff
changeset
|
186 |
722 | 187 private static LuanTable getTable(Map map,String key) throws LuanException { |
188 Object val = map.remove(key); | |
189 if( val!=null && !(val instanceof LuanTable) ) | |
190 throw new LuanException( "parameter '"+key+"' must be a table" ); | |
191 return (LuanTable)val; | |
192 } | |
193 | |
1267 | 194 private static Map getMap(Map map,String key) throws LuanException { |
722 | 195 LuanTable t = getTable(map,key); |
1267 | 196 return t==null ? null : t.asMap(); |
722 | 197 } |
198 | |
1267 | 199 @Override public InputStream inputStream(LuanState luan) throws IOException, LuanException { |
1317
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
200 try { |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
201 return inputStream(luan,null); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
202 } catch(AuthException e) { |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
203 try { |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
204 return inputStream(luan,e.authorization); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
205 } catch(AuthException e2) { |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
206 throw new RuntimeException(e2); // never |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
207 } |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
208 } |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
209 } |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
210 |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
211 private InputStream inputStream(LuanState luan,String authorization) |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
212 throws IOException, LuanException, AuthException |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
213 { |
722 | 214 URLConnection con = url.openConnection(); |
733
ffbbe25dab09
add http option time_out
Franklin Schmidt <fschmidt@gmail.com>
parents:
726
diff
changeset
|
215 if( timeout != 0 ) { |
ffbbe25dab09
add http option time_out
Franklin Schmidt <fschmidt@gmail.com>
parents:
726
diff
changeset
|
216 con.setConnectTimeout(timeout); |
ffbbe25dab09
add http option time_out
Franklin Schmidt <fschmidt@gmail.com>
parents:
726
diff
changeset
|
217 con.setReadTimeout(timeout); |
ffbbe25dab09
add http option time_out
Franklin Schmidt <fschmidt@gmail.com>
parents:
726
diff
changeset
|
218 } |
1317
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
219 for( Map.Entry<String,Object> entry : headers.entrySet() ) { |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
220 String key = entry.getKey(); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
221 Object val = entry.getValue(); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
222 if( val instanceof String ) { |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
223 con.addRequestProperty(key,(String)val); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
224 } else { |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
225 List list = (List)val; |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
226 for( Object obj : list ) { |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
227 con.addRequestProperty(key,(String)obj); |
722 | 228 } |
229 } | |
230 } | |
1317
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
231 if( authorization != null ) |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
232 con.addRequestProperty("Authorization",authorization); |
1087
4aab4dd3ac9c
improve url error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1085
diff
changeset
|
233 if( !(con instanceof HttpURLConnection) ) { |
4aab4dd3ac9c
improve url error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1085
diff
changeset
|
234 if( method!=Method.GET ) |
4aab4dd3ac9c
improve url error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1085
diff
changeset
|
235 throw new LuanException("method must be GET but is "+method); |
722 | 236 return con.getInputStream(); |
237 } | |
238 | |
239 HttpURLConnection httpCon = (HttpURLConnection)con; | |
240 | |
1087
4aab4dd3ac9c
improve url error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1085
diff
changeset
|
241 if( method==Method.GET ) { |
1317
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
242 return getInputStream(luan,httpCon,authorization); |
1087
4aab4dd3ac9c
improve url error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1085
diff
changeset
|
243 } |
4aab4dd3ac9c
improve url error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1085
diff
changeset
|
244 |
722 | 245 if( method==Method.DELETE ) { |
246 httpCon.setRequestMethod("DELETE"); | |
1317
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
247 return getInputStream(luan,httpCon,authorization); |
722 | 248 } |
249 | |
250 // POST | |
251 | |
1165
668f29bc52ea
clean up content-type
Franklin Schmidt <fschmidt@gmail.com>
parents:
1151
diff
changeset
|
252 // httpCon.setRequestProperty("content-type","application/x-www-form-urlencoded"); |
722 | 253 httpCon.setDoOutput(true); |
254 httpCon.setRequestMethod("POST"); | |
255 | |
725
a741a3a33423
add url support for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
723
diff
changeset
|
256 OutputStream out; |
a741a3a33423
add url support for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
723
diff
changeset
|
257 if( multipart != null ) { |
a741a3a33423
add url support for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
723
diff
changeset
|
258 out = multipart.write(httpCon); |
a741a3a33423
add url support for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
723
diff
changeset
|
259 } else { |
a741a3a33423
add url support for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
723
diff
changeset
|
260 byte[] post = content.getBytes(); |
a741a3a33423
add url support for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
723
diff
changeset
|
261 // httpCon.setRequestProperty("Content-Length",Integer.toString(post.length)); |
a741a3a33423
add url support for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
723
diff
changeset
|
262 out = httpCon.getOutputStream(); |
a741a3a33423
add url support for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
723
diff
changeset
|
263 out.write(post); |
a741a3a33423
add url support for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
723
diff
changeset
|
264 } |
726
14f136a4641f
use enctype for multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
725
diff
changeset
|
265 out.flush(); |
722 | 266 try { |
1317
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
267 return getInputStream(luan,httpCon,authorization); |
722 | 268 } finally { |
269 out.close(); | |
270 } | |
271 } | |
272 | |
1317
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
273 private InputStream getInputStream(LuanState luan,HttpURLConnection httpCon,String authorization) |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
274 throws IOException, LuanException, AuthException |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
275 { |
1085
a04da9a3e9eb
improve url delete error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
780
diff
changeset
|
276 try { |
a04da9a3e9eb
improve url delete error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
780
diff
changeset
|
277 return httpCon.getInputStream(); |
1315 | 278 } catch(FileNotFoundException e) { |
279 throw e; | |
1085
a04da9a3e9eb
improve url delete error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
780
diff
changeset
|
280 } catch(IOException e) { |
1094
cb4c20fce7d0
add "response_code" and "response_message" to http url luan exceptions
Franklin Schmidt <fschmidt@gmail.com>
parents:
1087
diff
changeset
|
281 int responseCode = httpCon.getResponseCode(); |
1318
35a6a195819f
in authorization rename user to username
Franklin Schmidt <fschmidt@gmail.com>
parents:
1317
diff
changeset
|
282 if( responseCode == 401 && authUsername != null && authorization==null ) { |
1317
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
283 String authStr = httpCon.getHeaderField("www-authenticate"); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
284 //System.out.println("auth = "+authStr); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
285 try { |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
286 WwwAuthenticate auth = new WwwAuthenticate(authStr); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
287 if( auth.type.equals("Basic") ) { |
1318
35a6a195819f
in authorization rename user to username
Franklin Schmidt <fschmidt@gmail.com>
parents:
1317
diff
changeset
|
288 String val = basicAuth(authUsername,authPassword); |
1317
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
289 throw new AuthException(val); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
290 } else if( auth.type.equals("Digest") ) { |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
291 String realm = auth.options.get("realm"); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
292 if(realm==null) throw new RuntimeException("missing realm"); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
293 String algorithm = auth.options.get("algorithm"); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
294 if( algorithm!=null && !algorithm.equals("MD5") ) |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
295 throw new LuanException("unsupported digest algorithm: "+algorithm); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
296 String qop = auth.options.get("qop"); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
297 if( qop!=null && !qop.equals("auth") ) |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
298 throw new LuanException("unsupported digest qop: "+qop); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
299 String nonce = auth.options.get("nonce"); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
300 if(nonce==null) throw new RuntimeException("missing nonce"); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
301 String uri = fullPath(url); |
1318
35a6a195819f
in authorization rename user to username
Franklin Schmidt <fschmidt@gmail.com>
parents:
1317
diff
changeset
|
302 String a1 = authUsername + ':' + realm + ':' + authPassword; |
1317
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
303 String a2 = "" + method + ':' + uri; |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
304 String nc = "00000001"; |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
305 String cnonce = "7761faf2daa45b3b"; // who cares? |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
306 String response = md5(a1) + ':' + nonce; |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
307 if( qop != null ) { |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
308 response += ':' + nc + ':' + cnonce + ':' + qop; |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
309 } |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
310 response += ':' + md5(a2); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
311 response = md5(response); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
312 String val = "Digest"; |
1318
35a6a195819f
in authorization rename user to username
Franklin Schmidt <fschmidt@gmail.com>
parents:
1317
diff
changeset
|
313 val += " username=\"" + authUsername + "\""; |
1317
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
314 val += ", realm=\"" + realm + "\""; |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
315 val += ", uri=\"" + uri + "\""; |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
316 val += ", nonce=\"" + nonce + "\""; |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
317 val += ", response=\"" + response + "\""; |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
318 if( qop != null ) { |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
319 val += ", qop=" + qop; |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
320 val += ", nc=" + nc; |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
321 val += ", cnonce=\"" + cnonce + "\""; |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
322 } |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
323 //System.out.println("val = "+val); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
324 throw new AuthException(val); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
325 } else |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
326 throw new RuntimeException(auth.type); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
327 } catch(ParseException pe) { |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
328 throw new LuanException(pe); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
329 } |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
330 } |
1094
cb4c20fce7d0
add "response_code" and "response_message" to http url luan exceptions
Franklin Schmidt <fschmidt@gmail.com>
parents:
1087
diff
changeset
|
331 String responseMessage = httpCon.getResponseMessage(); |
1085
a04da9a3e9eb
improve url delete error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
780
diff
changeset
|
332 InputStream is = httpCon.getErrorStream(); |
a04da9a3e9eb
improve url delete error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
780
diff
changeset
|
333 if( is == null ) |
a04da9a3e9eb
improve url delete error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
780
diff
changeset
|
334 throw e; |
a04da9a3e9eb
improve url delete error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
780
diff
changeset
|
335 Reader in = new InputStreamReader(is); |
a04da9a3e9eb
improve url delete error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
780
diff
changeset
|
336 String msg = Utils.readAll(in); |
a04da9a3e9eb
improve url delete error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
780
diff
changeset
|
337 in.close(); |
1094
cb4c20fce7d0
add "response_code" and "response_message" to http url luan exceptions
Franklin Schmidt <fschmidt@gmail.com>
parents:
1087
diff
changeset
|
338 LuanException le = new LuanException(msg,e); |
1267 | 339 LuanTable tbl = le.table(luan); |
1094
cb4c20fce7d0
add "response_code" and "response_message" to http url luan exceptions
Franklin Schmidt <fschmidt@gmail.com>
parents:
1087
diff
changeset
|
340 tbl.rawPut("response_code",responseCode); |
cb4c20fce7d0
add "response_code" and "response_message" to http url luan exceptions
Franklin Schmidt <fschmidt@gmail.com>
parents:
1087
diff
changeset
|
341 tbl.rawPut("response_message",responseMessage); |
cb4c20fce7d0
add "response_code" and "response_message" to http url luan exceptions
Franklin Schmidt <fschmidt@gmail.com>
parents:
1087
diff
changeset
|
342 throw le; |
1085
a04da9a3e9eb
improve url delete error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
780
diff
changeset
|
343 } |
a04da9a3e9eb
improve url delete error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
780
diff
changeset
|
344 } |
a04da9a3e9eb
improve url delete error handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
780
diff
changeset
|
345 |
722 | 346 @Override public String to_string() { |
347 return url.toString(); | |
348 } | |
349 | |
350 @Override public String to_uri_string() { | |
351 return url.toString(); | |
352 } | |
353 | |
1318
35a6a195819f
in authorization rename user to username
Franklin Schmidt <fschmidt@gmail.com>
parents:
1317
diff
changeset
|
354 private static String basicAuth(String username,String password) { |
35a6a195819f
in authorization rename user to username
Franklin Schmidt <fschmidt@gmail.com>
parents:
1317
diff
changeset
|
355 String s = username + ':' + password; |
1317
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
356 return "Basic " + Base64.getEncoder().encodeToString(s.getBytes()); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
357 } |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
358 |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
359 private final class AuthException extends Exception { |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
360 final String authorization; |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
361 |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
362 AuthException(String authorization) { |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
363 this.authorization = authorization; |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
364 } |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
365 } |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
366 |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
367 // retarded java api lacks this |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
368 public static String fullPath(URL url) { |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
369 String path = url.getPath(); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
370 String query = url.getQuery(); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
371 if( query != null ) |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
372 path += "?" + query; |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
373 return path; |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
374 } |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
375 |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
376 // retarded java api lacks this |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
377 public static String md5(String s) { |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
378 try { |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
379 byte[] md5 = MessageDigest.getInstance("MD5").digest(s.getBytes()); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
380 StringBuffer sb = new StringBuffer(); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
381 for( byte b : md5 ) { |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
382 sb.append( String.format("%02x",b) ); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
383 } |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
384 return sb.toString(); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
385 } catch(NoSuchAlgorithmException e) { |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
386 throw new RuntimeException(e); |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
387 } |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
388 } |
c286c1e36b81
add client digest authentication
Franklin Schmidt <fschmidt@gmail.com>
parents:
1315
diff
changeset
|
389 |
722 | 390 } |