From dcbc259776c8e2cfc8f8ba49e8c7674a5b5f1ea6 Mon Sep 17 00:00:00 2001 From: nlevitt Date: Sat, 30 Jul 2011 01:30:44 +0000 Subject: [PATCH] Fix HER-1917 failure to use good http authentication type if server supports any that heritrix doesn't - problem reported and fix suggested by Adam Wilmer * HttpAuthenticationCredential.java populate() + http.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, + Arrays.asList(AuthPolicy.DIGEST, AuthPolicy.BASIC)); --- .../modules/credential/HttpAuthenticationCredential.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/src/main/java/org/archive/modules/credential/HttpAuthenticationCredential.java b/modules/src/main/java/org/archive/modules/credential/HttpAuthenticationCredential.java index 3152444b..6491f199 100644 --- a/modules/src/main/java/org/archive/modules/credential/HttpAuthenticationCredential.java +++ b/modules/src/main/java/org/archive/modules/credential/HttpAuthenticationCredential.java @@ -19,6 +19,7 @@ package org.archive.modules.credential; +import java.util.Arrays; import java.util.Iterator; import java.util.Set; import java.util.logging.Logger; @@ -27,6 +28,7 @@ import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpMethod; import org.apache.commons.httpclient.URIException; import org.apache.commons.httpclient.UsernamePasswordCredentials; +import org.apache.commons.httpclient.auth.AuthPolicy; import org.apache.commons.httpclient.auth.AuthScope; import org.archive.modules.CrawlURI; @@ -129,6 +131,10 @@ public class HttpAuthenticationCredential extends Credential { logger.fine("Credentials for realm " + getRealm() + " for CrawlURI " + curi.toString() + " added to request: " + result); + + http.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, + Arrays.asList(AuthPolicy.DIGEST, AuthPolicy.BASIC)); + result = true; } catch (URIException e) { logger.severe("Failed to parse host from " + curi + ": " +