commit 478175995f1ea94f4b295906dda9d771ed1ff651
author Saša Živkov <zivkov@gmail.com> Fri Jan 20 15:53:53 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 20 15:53:53 2017 +0000
tree 6c40a5ecc65a19fccc3d0eeced4574efde7531de
parent b6bb00d3cb4f46546682cc843076910f7b7a8a93
parent 4bf87d8a3dc8aa8f0b77a9b95b9e66b7380bde1f

Merge "LfsSshAuth: Prevent repeated slash in response href" into stable-2.13

src/main/java/com/googlesource/gerrit/plugins/lfs/LfsSshAuth.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/lfs/LfsSshAuth.java b/src/main/java/com/googlesource/gerrit/plugins/lfs/LfsSshAuth.java
index d82abff..34a0937 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/lfs/LfsSshAuth.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/lfs/LfsSshAuth.java
@@ -54,10 +54,16 @@
       throws UnloggedFailure, Failure {
     try {
       URL url = new URL(canonicalWebUrl);
-      String href = url.getProtocol() + "://" + url.getAuthority()
-          + url.getPath() + "/" + args.get(0) + "/info/lfs";
+      String path = url.getPath();
+      StringBuilder href = new StringBuilder(url.getProtocol())
+          .append("://")
+          .append(url.getAuthority())
+          .append(path)
+          .append(path.endsWith("/") ? "" : "/")
+          .append(args.get(0))
+          .append("/info/lfs");
       Response.Action response = new Response.Action();
-      response.href = href;
+      response.href = href.toString();
       response.header =
           Collections.singletonMap(HDR_AUTHORIZATION, "not:required");