Merged #139 "Raw link blob paths do not respect web.forwardSlashCharacter"

James Moger

2014-07-05 dc9af4ce8b21d1f586a3f3dcdc3d6ededdee738c

 src/main/java/com/gitblit/servlet/RawServlet.java

@@ -95,16 +95,17 @@
         baseURL = baseURL.substring(0, baseURL.length() - 1);
      }

      char fsc = '!';
      char c = GitblitContext.getManager(IRuntimeManager.class).getSettings().getChar(Keys.web.forwardSlashCharacter, '/');
      if (c != '/') {
         fsc = c;
      }
      if (branch != null) {
         char fsc = '!';
         char c = GitblitContext.getManager(IRuntimeManager.class).getSettings().getChar(Keys.web.forwardSlashCharacter, '/');
         if (c != '/') {
            fsc = c;
         }
         branch = branch.replace('/', fsc);
      }

      String encodedPath = path == null ? "" : path.replace(' ', '-');
      encodedPath = encodedPath.replace('/', fsc);
      try {
         encodedPath = URLEncoder.encode(encodedPath, "UTF-8");
      } catch (UnsupportedEncodingException e) {
@@ -257,6 +258,15 @@
                  // load, interpret, and serve text content as UTF-8
                  String [] encodings = runtimeManager.getSettings().getStrings(Keys.web.blobEncodings).toArray(new String[0]);
                  String content = JGitUtils.getStringContent(r, commit.getTree(), requestedPath, encodings);
                  if (content == null) {
                     logger.error("RawServlet Failed to load {} {} {}", repository, commit.getName(), path);
                     String str = MessageFormat.format(
                           "# Error\nSorry, the requested resource **{0}** was not found.",
                           requestedPath);
                     response.setStatus(HttpServletResponse.SC_NOT_FOUND);
                     error(response, str);
                     return;
                  }

                  byte [] bytes = content.getBytes(Constants.ENCODING);
                  response.setContentLength(bytes.length);