Mercurial Hosting > luan

annotate src/luan/modules/url/LuanUrl.java @ 1509:0ba144491a42

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