From 2f3c342b5751f0ea41b0711b6d8757471572a79c Mon Sep 17 00:00:00 2001
From: aholland <aholland@a1dutch.co.uk>
Date: Mon, 24 Feb 2014 17:44:39 -0500
Subject: [PATCH] openshift war support (non express)
---
src/main/java/com/gitblit/wicket/pages/RawPage.java | 66 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/RawPage.java b/src/main/java/com/gitblit/wicket/pages/RawPage.java
index 27a01f9..ac4af6d 100644
--- a/src/main/java/com/gitblit/wicket/pages/RawPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RawPage.java
@@ -16,19 +16,21 @@
package com.gitblit.wicket.pages;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Map;
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.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitblit.GitBlit;
import com.gitblit.Keys;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
@@ -41,9 +43,11 @@
private final Logger logger = LoggerFactory.getLogger(getClass().getSimpleName());
+ String contentType;
+
public RawPage(final PageParameters params) {
super(params);
-
+
if (!params.containsKey("r")) {
error(getString("gb.repositoryNotSpecified"));
redirectToInterceptPage(new RepositoriesPage());
@@ -61,19 +65,19 @@
final String repositoryName = WicketUtils.getRepositoryName(params);
final String objectId = WicketUtils.getObject(params);
final String blobPath = WicketUtils.getPath(params);
- String[] encodings = GitBlit.getEncodings();
+ String[] encodings = getEncodings();
GitBlitWebSession session = GitBlitWebSession.get();
UserModel user = session.getUser();
-
- RepositoryModel model = GitBlit.self().getRepositoryModel(user, repositoryName);
+
+ RepositoryModel model = app().repositories().getRepositoryModel(user, repositoryName);
if (model == null) {
// user does not have permission
error(getString("gb.canNotLoadRepository") + " " + repositoryName);
redirectToInterceptPage(new RepositoriesPage());
return;
}
-
- Repository r = GitBlit.self().getRepository(repositoryName);
+
+ Repository r = app().repositories().getRepository(repositoryName);
if (r == null) {
error(getString("gb.canNotLoadRepository") + " " + repositoryName);
redirectToInterceptPage(new RepositoriesPage());
@@ -83,7 +87,8 @@
if (StringUtils.isEmpty(blobPath)) {
// objectid referenced raw view
byte [] binary = JGitUtils.getByteContent(r, objectId);
- response.setContentType("application/octet-stream");
+ contentType = "application/octet-stream";
+ response.setContentType(contentType);
response.setContentLength(binary.length);
try {
response.getOutputStream().write(binary);
@@ -106,10 +111,10 @@
// Map the extensions to types
Map<String, Integer> map = new HashMap<String, Integer>();
- for (String ext : GitBlit.getStrings(Keys.web.imageExtensions)) {
+ for (String ext : app().settings().getStrings(Keys.web.imageExtensions)) {
map.put(ext.toLowerCase(), 2);
}
- for (String ext : GitBlit.getStrings(Keys.web.binaryExtensions)) {
+ for (String ext : app().settings().getStrings(Keys.web.binaryExtensions)) {
map.put(ext.toLowerCase(), 3);
}
@@ -122,7 +127,8 @@
case 2:
// image blobs
byte[] image = JGitUtils.getByteContent(r, commit.getTree(), blobPath, true);
- response.setContentType("image/" + extension.toLowerCase());
+ contentType = "image/" + extension.toLowerCase();
+ response.setContentType(contentType);
response.setContentLength(image.length);
try {
response.getOutputStream().write(image);
@@ -133,9 +139,29 @@
case 3:
// binary blobs (download)
byte[] binary = JGitUtils.getByteContent(r, commit.getTree(), blobPath, true);
+ contentType = "application/octet-stream";
response.setContentLength(binary.length);
- response.setContentType("application/octet-stream");
- response.setHeader("Content-Disposition", "attachment; filename=\"" + filename + "\"");
+ response.setContentType(contentType);
+
+ try {
+ WebRequest request = (WebRequest) requestCycle.getRequest();
+ String userAgent = request.getHttpServletRequest().getHeader("User-Agent");
+
+ if (userAgent != null && userAgent.indexOf("MSIE 5.5") > -1) {
+ response.setHeader("Content-Disposition", "filename=\""
+ + URLEncoder.encode(filename, "UTF-8") + "\"");
+ } else if (userAgent != null && userAgent.indexOf("MSIE") > -1) {
+ response.setHeader("Content-Disposition", "attachment; filename=\""
+ + URLEncoder.encode(filename, "UTF-8") + "\"");
+ } else {
+ response.setHeader("Content-Disposition", "attachment; filename=\""
+ + new String(filename.getBytes("UTF-8"), "latin1") + "\"");
+ }
+ }
+ catch (UnsupportedEncodingException e) {
+ response.setHeader("Content-Disposition", "attachment; filename=\"" + filename + "\"");
+ }
+
try {
response.getOutputStream().write(binary);
} catch (IOException e) {
@@ -146,7 +172,8 @@
// plain text
String content = JGitUtils.getStringContent(r, commit.getTree(),
blobPath, encodings);
- response.setContentType("text/plain; charset=UTF-8");
+ contentType = "text/plain; charset=UTF-8";
+ response.setContentType(contentType);
try {
response.getOutputStream().write(content.getBytes("UTF-8"));
} catch (Exception e) {
@@ -158,7 +185,8 @@
// plain text
String content = JGitUtils.getStringContent(r, commit.getTree(), blobPath,
encodings);
- response.setContentType("text/plain; charset=UTF-8");
+ contentType = "text/plain; charset=UTF-8";
+ response.setContentType(contentType);
try {
response.getOutputStream().write(content.getBytes("UTF-8"));
} catch (Exception e) {
@@ -170,4 +198,12 @@
}
});
}
+
+ @Override
+ protected void setHeaders(WebResponse response) {
+ super.setHeaders(response);
+ if (!StringUtils.isEmpty(contentType)) {
+ response.setContentType(contentType);
+ }
+ }
}
--
Gitblit v1.9.1