From fafeb68da33d531bcf83ecfc1399b4770ada6e4b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 17 Sep 2014 11:37:46 -0400
Subject: [PATCH] Ensure TicketModel comment text is not null in hasComment() test
---
src/main/java/com/gitblit/wicket/pages/BasePage.java | 7 +++++++
1 files changed, 7 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 7d3d3a2..b454b7a 100644
--- a/src/main/java/com/gitblit/wicket/pages/BasePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BasePage.java
@@ -98,6 +98,10 @@
}
}
+ protected String getContextUrl() {
+ return getRequest().getRelativePathPrefixToContextRoot();
+ }
+
protected String getCanonicalUrl() {
return getCanonicalUrl(getClass(), getPageParameters());
}
@@ -162,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