From 2b8a0fd89bdf63dcf87ae868559b97f8d3e6eee2 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 08 Sep 2014 13:10:38 -0400
Subject: [PATCH] Fix ticket mail dropping bug when author does not have an address
---
src/main/java/com/gitblit/wicket/pages/BasePage.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/BasePage.java b/src/main/java/com/gitblit/wicket/pages/BasePage.java
index 3e3de53..b454b7a 100644
--- a/src/main/java/com/gitblit/wicket/pages/BasePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BasePage.java
@@ -93,6 +93,13 @@
if (app().settings().getBoolean(Keys.web.useResponsiveLayout, true)) {
add(CSSPackageResource.getHeaderContribution("bootstrap/css/bootstrap-responsive.css"));
}
+ if (app().settings().getBoolean(Keys.web.hideHeader, false)) {
+ add(CSSPackageResource.getHeaderContribution("hideheader.css"));
+ }
+ }
+
+ protected String getContextUrl() {
+ return getRequest().getRelativePathPrefixToContextRoot();
}
protected String getCanonicalUrl() {
@@ -159,6 +166,9 @@
// use default Wicket caching behavior
super.setHeaders(response);
}
+
+ // XRF vulnerability. issue-500 / ticket-166
+ response.setHeader("X-Frame-Options", "SAMEORIGIN");
}
/**
--
Gitblit v1.9.1