Преглед изворни кода

Fix raw page binary content type when running behind reverse proxy

Change-Id: I9f613114b2bb4c1dacae6e67c7673149a0476cf1
tags/v1.4.0
James Moger пре 10 година
родитељ
комит
9996f7217e
2 измењених фајлова са 21 додато и 5 уклоњено
  1. 1
    0
      releases.moxie
  2. 20
    5
      src/main/java/com/gitblit/wicket/pages/RawPage.java

+ 1
- 0
releases.moxie Прегледај датотеку

- Fix potential NPE on removing uncached repository from cache - Fix potential NPE on removing uncached repository from cache
- Ignore the default contents of .git/description file - Ignore the default contents of .git/description file
- Fix error on generating activity page when there is no activity - Fix error on generating activity page when there is no activity
- Fix raw page content type of binaries when running behind a reverse proxy
changes: changes:
- Personal repository prefix (~) is now configurable (issue-265) - Personal repository prefix (~) is now configurable (issue-265)
- Reversed line links in blob view (issue-309) - Reversed line links in blob view (issue-309)

+ 20
- 5
src/main/java/com/gitblit/wicket/pages/RawPage.java Прегледај датотеку

private final Logger logger = LoggerFactory.getLogger(getClass().getSimpleName()); private final Logger logger = LoggerFactory.getLogger(getClass().getSimpleName());
String contentType;
public RawPage(final PageParameters params) { public RawPage(final PageParameters params) {
super(params); super(params);
if (StringUtils.isEmpty(blobPath)) { if (StringUtils.isEmpty(blobPath)) {
// objectid referenced raw view // objectid referenced raw view
byte [] binary = JGitUtils.getByteContent(r, objectId); byte [] binary = JGitUtils.getByteContent(r, objectId);
response.setContentType("application/octet-stream");
contentType = "application/octet-stream";
response.setContentType(contentType);
response.setContentLength(binary.length); response.setContentLength(binary.length);
try { try {
response.getOutputStream().write(binary); response.getOutputStream().write(binary);
case 2: case 2:
// image blobs // image blobs
byte[] image = JGitUtils.getByteContent(r, commit.getTree(), blobPath, true); 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); response.setContentLength(image.length);
try { try {
response.getOutputStream().write(image); response.getOutputStream().write(image);
case 3: case 3:
// binary blobs (download) // binary blobs (download)
byte[] binary = JGitUtils.getByteContent(r, commit.getTree(), blobPath, true); byte[] binary = JGitUtils.getByteContent(r, commit.getTree(), blobPath, true);
contentType = "application/octet-stream";
response.setContentLength(binary.length); response.setContentLength(binary.length);
response.setContentType("application/octet-stream; charset=UTF-8");
response.setContentType(contentType);
try { try {
WebRequest request = (WebRequest) requestCycle.getRequest(); WebRequest request = (WebRequest) requestCycle.getRequest();
// plain text // plain text
String content = JGitUtils.getStringContent(r, commit.getTree(), String content = JGitUtils.getStringContent(r, commit.getTree(),
blobPath, encodings); blobPath, encodings);
response.setContentType("text/plain; charset=UTF-8");
contentType = "text/plain; charset=UTF-8";
response.setContentType(contentType);
try { try {
response.getOutputStream().write(content.getBytes("UTF-8")); response.getOutputStream().write(content.getBytes("UTF-8"));
} catch (Exception e) { } catch (Exception e) {
// plain text // plain text
String content = JGitUtils.getStringContent(r, commit.getTree(), blobPath, String content = JGitUtils.getStringContent(r, commit.getTree(), blobPath,
encodings); encodings);
response.setContentType("text/plain; charset=UTF-8");
contentType = "text/plain; charset=UTF-8";
response.setContentType(contentType);
try { try {
response.getOutputStream().write(content.getBytes("UTF-8")); response.getOutputStream().write(content.getBytes("UTF-8"));
} catch (Exception e) { } catch (Exception e) {
} }
}); });
} }
@Override
protected void setHeaders(WebResponse response) {
super.setHeaders(response);
if (!StringUtils.isEmpty(contentType)) {
response.setContentType(contentType);
}
}
} }

Loading…
Откажи
Сачувај