Browse Source
git-core follows HTTP redirects so JGit should also provide this.
Implement config setting http.followRedirects with possible values
"false" (= never), "true" (= always), and "initial" (only on GET, but
not on POST).[1]
We must do our own redirect handling and cannot rely on the support
that the underlying real connection may offer. At least the JDK's
HttpURLConnection has two features that get in the way:
* it does not allow cross-protocol redirects and thus fails on
http->https redirects (for instance, on Github).
* it translates a redirect after a POST to a GET unless the system
property "http.strictPostRedirect" is set to true. We don't want
to manipulate that system setting nor require it.
Additionally, git has its own rules about what redirects it accepts;[2]
for instance, it does not allow a redirect that adds query arguments.
We handle response codes 301, 302, 303, and 307 as per RFC 2616.[3]
On POST we do not handle 303, and we follow redirects only if
http.followRedirects == true.
Redirects are followed only a certain number of times. There are two
ways to control that limit:
* by default, the limit is given by the http.maxRedirects system
property that is also used by the JDK. If the system property is
not set, the default is 5. (This is much lower than the JDK default
of 20, but I don't see the value of following so many redirects.)
* this can be overwritten by a http.maxRedirects git config setting.
The JGit http.* git config settings are currently all global; JGit has
no support yet for URI-specific settings "http.<pattern>.name". Adding
support for that is well beyond the scope of this change.
Like git-core, we log every redirect attempt (LOG.info) so that users
may know about the redirection having occurred.
Extends the test framework to configure an AppServer with HTTPS support
so that we can test cloning via HTTPS and redirections involving HTTPS.
[1] https://git-scm.com/docs/git-config
[2] 6628eb41db
[3] https://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
CQ: 13987
Bug: 465167
Change-Id: I86518cb76842f7d326b51f8715e3bbf8ada89859
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
stable-4.9
Thomas Wolf
10 years ago
committed by
Matthias Sohn
13 changed files with 1108 additions and 142 deletions
@ -0,0 +1,85 @@ |
|||||||
|
/* |
||||||
|
* Copyright (C) 2016, 2017 Google Inc. |
||||||
|
* and other copyright owners as documented in the project's IP log. |
||||||
|
* |
||||||
|
* This program and the accompanying materials are made available |
||||||
|
* under the terms of the Eclipse Distribution License v1.0 which |
||||||
|
* accompanies this distribution, is reproduced below, and is |
||||||
|
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||||
|
* |
||||||
|
* All rights reserved. |
||||||
|
* |
||||||
|
* Redistribution and use in source and binary forms, with or |
||||||
|
* without modification, are permitted provided that the following |
||||||
|
* conditions are met: |
||||||
|
* |
||||||
|
* - Redistributions of source code must retain the above copyright |
||||||
|
* notice, this list of conditions and the following disclaimer. |
||||||
|
* |
||||||
|
* - Redistributions in binary form must reproduce the above |
||||||
|
* copyright notice, this list of conditions and the following |
||||||
|
* disclaimer in the documentation and/or other materials provided |
||||||
|
* with the distribution. |
||||||
|
* |
||||||
|
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||||
|
* names of its contributors may be used to endorse or promote |
||||||
|
* products derived from this software without specific prior |
||||||
|
* written permission. |
||||||
|
* |
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||||
|
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||||
|
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||||
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||||
|
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||||
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||||
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||||
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||||
|
*/ |
||||||
|
package org.eclipse.jgit.http.test; |
||||||
|
|
||||||
|
import javax.servlet.http.HttpServletRequest; |
||||||
|
|
||||||
|
import org.eclipse.jgit.errors.RepositoryNotFoundException; |
||||||
|
import org.eclipse.jgit.junit.TestRepository; |
||||||
|
import org.eclipse.jgit.lib.Repository; |
||||||
|
import org.eclipse.jgit.transport.resolver.RepositoryResolver; |
||||||
|
import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; |
||||||
|
|
||||||
|
/** A simple repository resolver for tests. */ |
||||||
|
public final class TestRepositoryResolver |
||||||
|
implements RepositoryResolver<HttpServletRequest> { |
||||||
|
|
||||||
|
private final TestRepository<Repository> repo; |
||||||
|
|
||||||
|
private final String repoName; |
||||||
|
|
||||||
|
/** |
||||||
|
* Creates a new {@link TestRepositoryResolver} that resolves the given name to |
||||||
|
* the given repository. |
||||||
|
* |
||||||
|
* @param repo |
||||||
|
* to resolve to |
||||||
|
* @param repoName |
||||||
|
* to match |
||||||
|
*/ |
||||||
|
public TestRepositoryResolver(TestRepository<Repository> repo, String repoName) { |
||||||
|
this.repo = repo; |
||||||
|
this.repoName = repoName; |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public Repository open(HttpServletRequest req, String name) |
||||||
|
throws RepositoryNotFoundException, ServiceNotEnabledException { |
||||||
|
if (!name.equals(repoName)) { |
||||||
|
throw new RepositoryNotFoundException(name); |
||||||
|
} |
||||||
|
Repository db = repo.getRepository(); |
||||||
|
db.incrementOpen(); |
||||||
|
return db; |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,280 @@ |
|||||||
|
/* |
||||||
|
* Copyright (C) 2017 Thomas Wolf <thomas.wolf@paranor.ch> |
||||||
|
* and other copyright owners as documented in the project's IP log. |
||||||
|
* |
||||||
|
* This program and the accompanying materials are made available |
||||||
|
* under the terms of the Eclipse Distribution License v1.0 which |
||||||
|
* accompanies this distribution, is reproduced below, and is |
||||||
|
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||||
|
* |
||||||
|
* All rights reserved. |
||||||
|
* |
||||||
|
* Redistribution and use in source and binary forms, with or |
||||||
|
* without modification, are permitted provided that the following |
||||||
|
* conditions are met: |
||||||
|
* |
||||||
|
* - Redistributions of source code must retain the above copyright |
||||||
|
* notice, this list of conditions and the following disclaimer. |
||||||
|
* |
||||||
|
* - Redistributions in binary form must reproduce the above |
||||||
|
* copyright notice, this list of conditions and the following |
||||||
|
* disclaimer in the documentation and/or other materials provided |
||||||
|
* with the distribution. |
||||||
|
* |
||||||
|
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||||
|
* names of its contributors may be used to endorse or promote |
||||||
|
* products derived from this software without specific prior |
||||||
|
* written permission. |
||||||
|
* |
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||||
|
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||||
|
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||||
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||||
|
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||||
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||||
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||||
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||||
|
*/ |
||||||
|
|
||||||
|
package org.eclipse.jgit.http.test; |
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals; |
||||||
|
import static org.junit.Assert.assertFalse; |
||||||
|
import static org.junit.Assert.assertTrue; |
||||||
|
import static org.junit.Assert.fail; |
||||||
|
|
||||||
|
import java.io.IOException; |
||||||
|
import java.util.Arrays; |
||||||
|
import java.util.Collection; |
||||||
|
import java.util.EnumSet; |
||||||
|
import java.util.List; |
||||||
|
|
||||||
|
import javax.servlet.DispatcherType; |
||||||
|
import javax.servlet.Filter; |
||||||
|
import javax.servlet.FilterChain; |
||||||
|
import javax.servlet.FilterConfig; |
||||||
|
import javax.servlet.ServletException; |
||||||
|
import javax.servlet.ServletRequest; |
||||||
|
import javax.servlet.ServletResponse; |
||||||
|
import javax.servlet.http.HttpServletRequest; |
||||||
|
import javax.servlet.http.HttpServletResponse; |
||||||
|
|
||||||
|
import org.eclipse.jetty.servlet.FilterHolder; |
||||||
|
import org.eclipse.jetty.servlet.ServletContextHandler; |
||||||
|
import org.eclipse.jetty.servlet.ServletHolder; |
||||||
|
import org.eclipse.jgit.errors.TransportException; |
||||||
|
import org.eclipse.jgit.http.server.GitServlet; |
||||||
|
import org.eclipse.jgit.junit.TestRepository; |
||||||
|
import org.eclipse.jgit.junit.http.AccessEvent; |
||||||
|
import org.eclipse.jgit.junit.http.AppServer; |
||||||
|
import org.eclipse.jgit.junit.http.HttpTestCase; |
||||||
|
import org.eclipse.jgit.lib.ConfigConstants; |
||||||
|
import org.eclipse.jgit.lib.NullProgressMonitor; |
||||||
|
import org.eclipse.jgit.lib.Repository; |
||||||
|
import org.eclipse.jgit.revwalk.RevBlob; |
||||||
|
import org.eclipse.jgit.revwalk.RevCommit; |
||||||
|
import org.eclipse.jgit.storage.file.FileBasedConfig; |
||||||
|
import org.eclipse.jgit.transport.HttpTransport; |
||||||
|
import org.eclipse.jgit.transport.Transport; |
||||||
|
import org.eclipse.jgit.transport.URIish; |
||||||
|
import org.eclipse.jgit.transport.http.HttpConnectionFactory; |
||||||
|
import org.eclipse.jgit.transport.http.JDKHttpConnectionFactory; |
||||||
|
import org.eclipse.jgit.transport.http.apache.HttpClientConnectionFactory; |
||||||
|
import org.eclipse.jgit.util.FS; |
||||||
|
import org.eclipse.jgit.util.HttpSupport; |
||||||
|
import org.eclipse.jgit.util.SystemReader; |
||||||
|
import org.junit.Before; |
||||||
|
import org.junit.Test; |
||||||
|
import org.junit.runner.RunWith; |
||||||
|
import org.junit.runners.Parameterized; |
||||||
|
import org.junit.runners.Parameterized.Parameters; |
||||||
|
|
||||||
|
@RunWith(Parameterized.class) |
||||||
|
public class SmartClientSmartServerSslTest extends HttpTestCase { |
||||||
|
|
||||||
|
private URIish remoteURI; |
||||||
|
|
||||||
|
private URIish secureURI; |
||||||
|
|
||||||
|
private RevBlob A_txt; |
||||||
|
|
||||||
|
private RevCommit A, B; |
||||||
|
|
||||||
|
@Parameters |
||||||
|
public static Collection<Object[]> data() { |
||||||
|
// run all tests with both connection factories we have
|
||||||
|
return Arrays.asList(new Object[][] { |
||||||
|
{ new JDKHttpConnectionFactory() }, |
||||||
|
{ new HttpClientConnectionFactory() } }); |
||||||
|
} |
||||||
|
|
||||||
|
public SmartClientSmartServerSslTest(HttpConnectionFactory cf) { |
||||||
|
HttpTransport.setConnectionFactory(cf); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
protected AppServer createServer() { |
||||||
|
return new AppServer(0, 0); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
@Before |
||||||
|
public void setUp() throws Exception { |
||||||
|
super.setUp(); |
||||||
|
|
||||||
|
final TestRepository<Repository> src = createTestRepository(); |
||||||
|
final String srcName = src.getRepository().getDirectory().getName(); |
||||||
|
src.getRepository() |
||||||
|
.getConfig() |
||||||
|
.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null, |
||||||
|
ConfigConstants.CONFIG_KEY_LOGALLREFUPDATES, true); |
||||||
|
|
||||||
|
GitServlet gs = new GitServlet(); |
||||||
|
|
||||||
|
ServletContextHandler app = addNormalContext(gs, src, srcName); |
||||||
|
|
||||||
|
server.setUp(); |
||||||
|
|
||||||
|
remoteURI = toURIish(app, srcName); |
||||||
|
secureURI = new URIish(rewriteUrl(remoteURI.toString(), "https", |
||||||
|
server.getSecurePort())); |
||||||
|
|
||||||
|
A_txt = src.blob("A"); |
||||||
|
A = src.commit().add("A_txt", A_txt).create(); |
||||||
|
B = src.commit().parent(A).add("A_txt", "C").add("B", "B").create(); |
||||||
|
src.update(master, B); |
||||||
|
|
||||||
|
src.update("refs/garbage/a/very/long/ref/name/to/compress", B); |
||||||
|
|
||||||
|
FileBasedConfig userConfig = SystemReader.getInstance() |
||||||
|
.openUserConfig(null, FS.DETECTED); |
||||||
|
userConfig.setBoolean("http", null, "sslVerify", false); |
||||||
|
userConfig.save(); |
||||||
|
} |
||||||
|
|
||||||
|
private ServletContextHandler addNormalContext(GitServlet gs, TestRepository<Repository> src, String srcName) { |
||||||
|
ServletContextHandler app = server.addContext("/git"); |
||||||
|
app.addFilter(new FilterHolder(new Filter() { |
||||||
|
|
||||||
|
@Override |
||||||
|
public void init(FilterConfig filterConfig) |
||||||
|
throws ServletException { |
||||||
|
// empty
|
||||||
|
} |
||||||
|
|
||||||
|
// Redirects http to https for requests containing "/https/".
|
||||||
|
@Override |
||||||
|
public void doFilter(ServletRequest request, |
||||||
|
ServletResponse response, FilterChain chain) |
||||||
|
throws IOException, ServletException { |
||||||
|
final HttpServletResponse httpServletResponse = (HttpServletResponse) response; |
||||||
|
final HttpServletRequest httpServletRequest = (HttpServletRequest) request; |
||||||
|
final StringBuffer fullUrl = httpServletRequest.getRequestURL(); |
||||||
|
if (httpServletRequest.getQueryString() != null) { |
||||||
|
fullUrl.append("?") |
||||||
|
.append(httpServletRequest.getQueryString()); |
||||||
|
} |
||||||
|
String urlString = rewriteUrl(fullUrl.toString(), "https", |
||||||
|
server.getSecurePort()); |
||||||
|
httpServletResponse |
||||||
|
.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY); |
||||||
|
httpServletResponse.setHeader(HttpSupport.HDR_LOCATION, |
||||||
|
urlString.replace("/https/", "/")); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public void destroy() { |
||||||
|
// empty
|
||||||
|
} |
||||||
|
}), "/https/*", EnumSet.of(DispatcherType.REQUEST)); |
||||||
|
app.addFilter(new FilterHolder(new Filter() { |
||||||
|
|
||||||
|
@Override |
||||||
|
public void init(FilterConfig filterConfig) |
||||||
|
throws ServletException { |
||||||
|
// empty
|
||||||
|
} |
||||||
|
|
||||||
|
// Redirects https back to http for requests containing "/back/".
|
||||||
|
@Override |
||||||
|
public void doFilter(ServletRequest request, |
||||||
|
ServletResponse response, FilterChain chain) |
||||||
|
throws IOException, ServletException { |
||||||
|
final HttpServletResponse httpServletResponse = (HttpServletResponse) response; |
||||||
|
final HttpServletRequest httpServletRequest = (HttpServletRequest) request; |
||||||
|
final StringBuffer fullUrl = httpServletRequest.getRequestURL(); |
||||||
|
if (httpServletRequest.getQueryString() != null) { |
||||||
|
fullUrl.append("?") |
||||||
|
.append(httpServletRequest.getQueryString()); |
||||||
|
} |
||||||
|
String urlString = rewriteUrl(fullUrl.toString(), "http", |
||||||
|
server.getPort()); |
||||||
|
httpServletResponse |
||||||
|
.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY); |
||||||
|
httpServletResponse.setHeader(HttpSupport.HDR_LOCATION, |
||||||
|
urlString.replace("/back/", "/")); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public void destroy() { |
||||||
|
// empty
|
||||||
|
} |
||||||
|
}), "/back/*", EnumSet.of(DispatcherType.REQUEST)); |
||||||
|
gs.setRepositoryResolver(new TestRepositoryResolver(src, srcName)); |
||||||
|
app.addServlet(new ServletHolder(gs), "/*"); |
||||||
|
return app; |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testInitialClone_ViaHttps() throws Exception { |
||||||
|
Repository dst = createBareRepository(); |
||||||
|
assertFalse(dst.hasObject(A_txt)); |
||||||
|
|
||||||
|
try (Transport t = Transport.open(dst, secureURI)) { |
||||||
|
t.fetch(NullProgressMonitor.INSTANCE, mirror(master)); |
||||||
|
} |
||||||
|
assertTrue(dst.hasObject(A_txt)); |
||||||
|
assertEquals(B, dst.exactRef(master).getObjectId()); |
||||||
|
fsck(dst, B); |
||||||
|
|
||||||
|
List<AccessEvent> requests = getRequests(); |
||||||
|
assertEquals(2, requests.size()); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testInitialClone_RedirectToHttps() throws Exception { |
||||||
|
Repository dst = createBareRepository(); |
||||||
|
assertFalse(dst.hasObject(A_txt)); |
||||||
|
|
||||||
|
URIish cloneFrom = extendPath(remoteURI, "/https"); |
||||||
|
try (Transport t = Transport.open(dst, cloneFrom)) { |
||||||
|
t.fetch(NullProgressMonitor.INSTANCE, mirror(master)); |
||||||
|
} |
||||||
|
assertTrue(dst.hasObject(A_txt)); |
||||||
|
assertEquals(B, dst.exactRef(master).getObjectId()); |
||||||
|
fsck(dst, B); |
||||||
|
|
||||||
|
List<AccessEvent> requests = getRequests(); |
||||||
|
assertEquals(3, requests.size()); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testInitialClone_RedirectBackToHttp() throws Exception { |
||||||
|
Repository dst = createBareRepository(); |
||||||
|
assertFalse(dst.hasObject(A_txt)); |
||||||
|
|
||||||
|
URIish cloneFrom = extendPath(secureURI, "/back"); |
||||||
|
try (Transport t = Transport.open(dst, cloneFrom)) { |
||||||
|
t.fetch(NullProgressMonitor.INSTANCE, mirror(master)); |
||||||
|
fail("Should have failed (redirect from https to http)"); |
||||||
|
} catch (TransportException e) { |
||||||
|
assertTrue(e.getMessage().contains("not allowed")); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
} |
||||||
Loading…
Reference in new issue