Browse Source
If the application wants to, it can use sendError(String) to send one or more error messages to clients before the advertisements are sent. These will cause a C Git client to break out of the advertisement parsing loop, display "remote error: message\n", and terminate. Servers can optionally use this to send a detailed error to a client explaining why it cannot use the ReceivePack service on a repository. Over smart HTTP these errors are sent in a 200 OK response, and are in the payload, allowing the Git client to give the end-user the custom message rather than the generic error "403 Forbidden". Change-Id: I03f4345183765d21002118617174c77f71427b5a Signed-off-by: Shawn O. Pearce <spearce@spearce.org>stable-0.7
Shawn O. Pearce
15 years ago
2 changed files with 182 additions and 8 deletions
@ -0,0 +1,151 @@ |
|||||||
|
/* |
||||||
|
* Copyright (C) 2010, 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 java.util.Collections; |
||||||
|
|
||||||
|
import javax.servlet.http.HttpServletRequest; |
||||||
|
|
||||||
|
import org.eclipse.jetty.servlet.ServletContextHandler; |
||||||
|
import org.eclipse.jetty.servlet.ServletHolder; |
||||||
|
import org.eclipse.jgit.errors.RemoteRepositoryException; |
||||||
|
import org.eclipse.jgit.errors.RepositoryNotFoundException; |
||||||
|
import org.eclipse.jgit.http.server.GitServlet; |
||||||
|
import org.eclipse.jgit.http.server.resolver.DefaultReceivePackFactory; |
||||||
|
import org.eclipse.jgit.http.server.resolver.RepositoryResolver; |
||||||
|
import org.eclipse.jgit.http.server.resolver.ServiceNotAuthorizedException; |
||||||
|
import org.eclipse.jgit.http.server.resolver.ServiceNotEnabledException; |
||||||
|
import org.eclipse.jgit.http.test.util.HttpTestCase; |
||||||
|
import org.eclipse.jgit.junit.TestRepository; |
||||||
|
import org.eclipse.jgit.lib.Constants; |
||||||
|
import org.eclipse.jgit.lib.NullProgressMonitor; |
||||||
|
import org.eclipse.jgit.lib.ObjectId; |
||||||
|
import org.eclipse.jgit.lib.Repository; |
||||||
|
import org.eclipse.jgit.lib.RepositoryConfig; |
||||||
|
import org.eclipse.jgit.revwalk.RevBlob; |
||||||
|
import org.eclipse.jgit.revwalk.RevCommit; |
||||||
|
import org.eclipse.jgit.transport.ReceivePack; |
||||||
|
import org.eclipse.jgit.transport.RemoteRefUpdate; |
||||||
|
import org.eclipse.jgit.transport.Transport; |
||||||
|
import org.eclipse.jgit.transport.URIish; |
||||||
|
|
||||||
|
public class AdvertiseErrorTest extends HttpTestCase { |
||||||
|
private Repository remoteRepository; |
||||||
|
|
||||||
|
private URIish remoteURI; |
||||||
|
|
||||||
|
protected void setUp() throws Exception { |
||||||
|
super.setUp(); |
||||||
|
|
||||||
|
final TestRepository src = createTestRepository(); |
||||||
|
final String srcName = src.getRepository().getDirectory().getName(); |
||||||
|
|
||||||
|
ServletContextHandler app = server.addContext("/git"); |
||||||
|
GitServlet gs = new GitServlet(); |
||||||
|
gs.setRepositoryResolver(new RepositoryResolver() { |
||||||
|
public Repository open(HttpServletRequest req, String name) |
||||||
|
throws RepositoryNotFoundException, |
||||||
|
ServiceNotEnabledException { |
||||||
|
if (!name.equals(srcName)) |
||||||
|
throw new RepositoryNotFoundException(name); |
||||||
|
|
||||||
|
final Repository db = src.getRepository(); |
||||||
|
db.incrementOpen(); |
||||||
|
return db; |
||||||
|
} |
||||||
|
}); |
||||||
|
gs.setReceivePackFactory(new DefaultReceivePackFactory() { |
||||||
|
public ReceivePack create(HttpServletRequest req, Repository db) |
||||||
|
throws ServiceNotEnabledException, |
||||||
|
ServiceNotAuthorizedException { |
||||||
|
ReceivePack rp = super.create(req, db); |
||||||
|
rp.sendError("message line 1"); |
||||||
|
rp.sendError("no soup for you!"); |
||||||
|
rp.sendError("come back next year!"); |
||||||
|
return rp; |
||||||
|
} |
||||||
|
|
||||||
|
}); |
||||||
|
app.addServlet(new ServletHolder(gs), "/*"); |
||||||
|
|
||||||
|
server.setUp(); |
||||||
|
|
||||||
|
remoteRepository = src.getRepository(); |
||||||
|
remoteURI = toURIish(app, srcName); |
||||||
|
|
||||||
|
RepositoryConfig cfg = remoteRepository.getConfig(); |
||||||
|
cfg.setBoolean("http", null, "receivepack", true); |
||||||
|
cfg.save(); |
||||||
|
} |
||||||
|
|
||||||
|
public void testPush_CreateBranch() throws Exception { |
||||||
|
final TestRepository src = createTestRepository(); |
||||||
|
final RevBlob Q_txt = src.blob("new text"); |
||||||
|
final RevCommit Q = src.commit().add("Q", Q_txt).create(); |
||||||
|
final Repository db = src.getRepository(); |
||||||
|
final String dstName = Constants.R_HEADS + "new.branch"; |
||||||
|
final Transport t = Transport.open(db, remoteURI); |
||||||
|
try { |
||||||
|
final String srcExpr = Q.name(); |
||||||
|
final boolean forceUpdate = false; |
||||||
|
final String localName = null; |
||||||
|
final ObjectId oldId = null; |
||||||
|
|
||||||
|
RemoteRefUpdate update = new RemoteRefUpdate(src.getRepository(), |
||||||
|
srcExpr, dstName, forceUpdate, localName, oldId); |
||||||
|
try { |
||||||
|
t.push(NullProgressMonitor.INSTANCE, Collections |
||||||
|
.singleton(update)); |
||||||
|
fail("push completed without throwing exception"); |
||||||
|
} catch (RemoteRepositoryException error) { |
||||||
|
assertEquals(remoteURI + ": message line 1\n" //
|
||||||
|
+ "no soup for you!\n" //
|
||||||
|
+ "come back next year!", //
|
||||||
|
error.getMessage()); |
||||||
|
} |
||||||
|
} finally { |
||||||
|
t.close(); |
||||||
|
} |
||||||
|
} |
||||||
|
} |
Loading…
Reference in new issue