From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/wicket/pages/RawPage.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/RawPage.java b/src/main/java/com/gitblit/wicket/pages/RawPage.java
index ac4af6d..c435747 100644
--- a/src/main/java/com/gitblit/wicket/pages/RawPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RawPage.java
@@ -18,14 +18,18 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
+import java.text.MessageFormat;
import java.util.HashMap;
import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.IRequestTarget;
import org.apache.wicket.PageParameters;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.protocol.http.WebResponse;
+import org.apache.wicket.protocol.http.servlet.AbortWithWebErrorCodeException;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.slf4j.Logger;
@@ -65,6 +69,7 @@
final String repositoryName = WicketUtils.getRepositoryName(params);
final String objectId = WicketUtils.getObject(params);
final String blobPath = WicketUtils.getPath(params);
+
String[] encodings = getEncodings();
GitBlitWebSession session = GitBlitWebSession.get();
UserModel user = session.getUser();
@@ -87,6 +92,12 @@
if (StringUtils.isEmpty(blobPath)) {
// objectid referenced raw view
byte [] binary = JGitUtils.getByteContent(r, objectId);
+ if (binary == null) {
+ final String objectNotFound = MessageFormat.format("Raw page failed to find object {0} in {1}",
+ objectId, repositoryName);
+ logger.error(objectNotFound);
+ throw new AbortWithWebErrorCodeException(HttpServletResponse.SC_NOT_FOUND, objectNotFound);
+ }
contentType = "application/octet-stream";
response.setContentType(contentType);
response.setContentLength(binary.length);
@@ -98,6 +109,12 @@
} else {
// standard raw blob view
RevCommit commit = JGitUtils.getCommit(r, objectId);
+ if (commit == null) {
+ final String commitNotFound = MessageFormat.format("Raw page failed to find commit {0} in {1}",
+ objectId, repositoryName);
+ logger.error(commitNotFound);
+ throw new AbortWithWebErrorCodeException(HttpServletResponse.SC_NOT_FOUND, commitNotFound);
+ }
String filename = blobPath;
if (blobPath.indexOf('/') > -1) {
@@ -118,6 +135,9 @@
map.put(ext.toLowerCase(), 3);
}
+ final String blobNotFound = MessageFormat.format("Raw page failed to find blob {0} in {1} @ {2}",
+ blobPath, repositoryName, objectId);
+
if (extension != null) {
int type = 0;
if (map.containsKey(extension)) {
@@ -127,6 +147,10 @@
case 2:
// image blobs
byte[] image = JGitUtils.getByteContent(r, commit.getTree(), blobPath, true);
+ if (image == null) {
+ logger.error(blobNotFound);
+ throw new AbortWithWebErrorCodeException(HttpServletResponse.SC_NOT_FOUND, blobNotFound);
+ }
contentType = "image/" + extension.toLowerCase();
response.setContentType(contentType);
response.setContentLength(image.length);
@@ -139,6 +163,10 @@
case 3:
// binary blobs (download)
byte[] binary = JGitUtils.getByteContent(r, commit.getTree(), blobPath, true);
+ if (binary == null) {
+ logger.error(blobNotFound);
+ throw new AbortWithWebErrorCodeException(HttpServletResponse.SC_NOT_FOUND, blobNotFound);
+ }
contentType = "application/octet-stream";
response.setContentLength(binary.length);
response.setContentType(contentType);
@@ -172,6 +200,10 @@
// plain text
String content = JGitUtils.getStringContent(r, commit.getTree(),
blobPath, encodings);
+ if (content == null) {
+ logger.error(blobNotFound);
+ throw new AbortWithWebErrorCodeException(HttpServletResponse.SC_NOT_FOUND, blobNotFound);
+ }
contentType = "text/plain; charset=UTF-8";
response.setContentType(contentType);
try {
@@ -185,6 +217,10 @@
// plain text
String content = JGitUtils.getStringContent(r, commit.getTree(), blobPath,
encodings);
+ if (content == null) {
+ logger.error(blobNotFound);
+ throw new AbortWithWebErrorCodeException(HttpServletResponse.SC_NOT_FOUND, blobNotFound);
+ }
contentType = "text/plain; charset=UTF-8";
response.setContentType(contentType);
try {
--
Gitblit v1.9.1