From 9c7bb3d377a0637ff034be407cb9c03c606647a9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 27 Oct 2013 11:05:11 -0400
Subject: [PATCH] Add setting to automatically redirect http requests to the https port
---
src/main/java/com/gitblit/wicket/pages/RepositoryPage.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
index 3b1d296..bc7dfa9 100644
--- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
@@ -39,7 +39,6 @@
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.protocol.http.RequestUtils;
import org.apache.wicket.request.target.basic.RedirectRequestTarget;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import org.eclipse.jgit.lib.PersonIdent;
@@ -653,17 +652,31 @@
*
* @return a link renderer
*/
- protected LinkRenderer getLinkRenderer() {
+ protected LinkRenderer getMarkdownLinkRenderer() {
RevCommit head = JGitUtils.getCommit(r, "HEAD");
final String id = getBestCommitId(head);
LinkRenderer renderer = new LinkRenderer() {
@Override
public Rendering render(WikiLinkNode node) {
try {
- String path = URLEncoder.encode(node.getText().replace(' ', '-'), "UTF-8");
- String name = node.getText();
+ String fsc = GitBlit.getString(Keys.web.forwardSlashCharacter, "/");
+ // adjust the request path
+ String path = node.getText().charAt(0) == '/' ? node.getText().substring(1) : node.getText();
+ path = URLEncoder.encode(path.replace(' ', '-'), "UTF-8").replace("%2F", fsc);
+
+ // extract document name
+ String name = node.getText().replace('_', ' ');
if (name.indexOf('/') > -1) {
name = name.substring(name.lastIndexOf('/') + 1);
+ }
+
+ // strip Markdown extension
+ for (String ext : GitBlit.getStrings(Keys.web.markdownExtensions)) {
+ String x = "." + ext;
+ if (name.endsWith(x)) {
+ name = name.substring(0, name.length() - x.length());
+ break;
+ }
}
String url = urlFor(MarkdownPage.class, WicketUtils.newPathParameter(repositoryName, id, path)).toString();
return new Rendering(url, name);
@@ -709,9 +722,7 @@
String searchString = searchBoxModel.getObject();
if (StringUtils.isEmpty(searchString)) {
// redirect to self to avoid wicket page update bug
- PageParameters params = RepositoryPage.this.getPageParameters();
- String relativeUrl = urlFor(RepositoryPage.this.getClass(), params).toString();
- String absoluteUrl = RequestUtils.toAbsolutePath(relativeUrl);
+ String absoluteUrl = getCanonicalUrl();
getRequestCycle().setRequestTarget(new RedirectRequestTarget(absoluteUrl));
return;
}
@@ -733,8 +744,7 @@
// use an absolute url to workaround Wicket-Tomcat problems with
// mounted url parameters (issue-111)
PageParameters params = WicketUtils.newSearchParameter(repositoryName, null, searchString, searchType);
- String relativeUrl = urlFor(searchPageClass, params).toString();
- String absoluteUrl = RequestUtils.toAbsolutePath(relativeUrl);
+ String absoluteUrl = getCanonicalUrl(searchPageClass, params);
getRequestCycle().setRequestTarget(new RedirectRequestTarget(absoluteUrl));
}
}
--
Gitblit v1.9.1