Browse Source

Allow ant:get task to disable authentication on redirect.

When the server answers with a redirect response, the request to the new
location may or may not need a second authentication. To disable the
authentication, the new attribute "authenticateOnRedirect" can be set to
"false".
master
Berno Langer 3 years ago
parent
commit
0f3985c356
2 changed files with 23 additions and 3 deletions
  1. +6
    -0
      manual/Tasks/get.html
  2. +17
    -3
      src/main/org/apache/tools/ant/taskdefs/Get.java

+ 6
- 0
manual/Tasks/get.html View File

@@ -91,6 +91,12 @@ the request is relayed to the proxy.</p>
<td>password for basic HTTP authentication</td>
<td>Yes if <var>username</var> is set</td>
</tr>
<tr>
<td>authenticateOnRedirect</td>
<td>Whether the credentials should also be sent to the new location when a redirect is followed.<br/>
<em>since Ant 1.10.13</em></td>
<td>No; default is <q>true</q></td>
</tr>
<tr>
<td>maxtime</td>
<td>Maximum time in seconds a single download may take, otherwise it will be interrupted and


+ 17
- 3
src/main/org/apache/tools/ant/taskdefs/Get.java View File

@@ -82,6 +82,7 @@ public class Get extends Task {
private boolean ignoreErrors = false;
private String uname = null;
private String pword = null;
private boolean authenticateOnRedirect = true; // on by default for backward compatibility
private long maxTime = 0;
private int numberRetries = NUMBER_RETRIES;
private boolean skipExisting = false;
@@ -405,6 +406,16 @@ public class Get extends Task {
this.pword = p;
}

/**
* If true, credentials are set when following a redirect to a new location.
*
* @param v "true" to enable sending the credentials on redirect; "false" otherwise
* @since Ant 1.10.13
*/
public void setAuthenticateOnRedirect(final boolean v) {
this.authenticateOnRedirect = v;
}

/**
* The time in seconds the download is allowed to take before
* being terminated.
@@ -685,7 +696,7 @@ public class Get extends Task {

private boolean get() throws IOException, BuildException {

connection = openConnection(source);
connection = openConnection(source, uname, pword);

if (connection == null) {
return false;
@@ -735,7 +746,8 @@ public class Get extends Task {
return true;
}

private URLConnection openConnection(final URL aSource) throws IOException {
private URLConnection openConnection(final URL aSource, final String uname,
final String pword) throws IOException {

// set up the URL connection
final URLConnection connection = aSource.openConnection();
@@ -795,7 +807,9 @@ public class Get extends Task {
if (!redirectionAllowed(aSource, newURL)) {
return null;
}
return openConnection(newURL);
return openConnection(newURL,
authenticateOnRedirect ? uname : null,
authenticateOnRedirect ? pword : null);
}
// next test for a 304 result (HTTP only)
final long lastModified = httpConnection.getLastModified();


Loading…
Cancel
Save