repo/luan: src/luan/modules/url/LuanUrl.java comparison

better http authentication

author	Franklin Schmidt <fschmidt@gmail.com>
date	Wed, 27 Jan 2021 15:31:26 -0700
parents	3ebf9781707c
children	f7e2df85fc0a

comparison

equal deleted inserted replaced

-:f118ead273a1
+:0160650180bc
 		} catch(IOException e) {
 			int responseCode = httpCon.getResponseCode();
 			if( responseCode == 401 && authUsername != null && authorization==null ) {
 				String authStr = httpCon.getHeaderField("www-authenticate");
 				//System.out.println("auth = "+authStr);
+				List<WwwAuthenticate> auths;
 				try {
-					WwwAuthenticate auth = new WwwAuthenticate(authStr);
+					auths = WwwAuthenticate.parse(authStr);
+				} catch(ParseException pe) {
+					throw new LuanException(pe);
+				}
+				for( WwwAuthenticate auth : auths ) {
 					if( auth.type.equals("Basic") ) {
 						String val = basicAuth(authUsername,authPassword);
 						throw new AuthException(val);
 					} else if( auth.type.equals("Digest") ) {
 						String realm = auth.options.get("realm");
 							val += ", nc=" + nc;
 							val += ", cnonce=\"" + cnonce + "\"";
 						}
 						//System.out.println("val = "+val);
 						throw new AuthException(val);
-					} else
+					}
-						throw new RuntimeException(auth.type);
+				}
-				} catch(ParseException pe) {
+				throw new RuntimeException(authStr);
-					throw new LuanException(pe);
-				}
 			}
 			String msg = "" + responseCode;
 			String responseMessage = httpCon.getResponseMessage();
 			if( responseMessage != null )
 				msg += " - " + responseMessage;

Mercurial Hosting > luan