From cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 05 Jan 2012 17:34:05 -0500
Subject: [PATCH] Fixed bug in receive hook for repositories in subfolders
---
src/com/gitblit/WebXmlSettings.java | 72 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 3 deletions(-)
diff --git a/src/com/gitblit/WebXmlSettings.java b/src/com/gitblit/WebXmlSettings.java
index 0ff2a3e..7c8120b 100644
--- a/src/com/gitblit/WebXmlSettings.java
+++ b/src/com/gitblit/WebXmlSettings.java
@@ -15,31 +15,97 @@
*/
package com.gitblit;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.text.MessageFormat;
import java.util.Enumeration;
+import java.util.Map;
import java.util.Properties;
import javax.servlet.ServletContext;
+import com.gitblit.utils.StringUtils;
+
+/**
+ * Loads Gitblit settings from the context-parameter values of a web.xml file.
+ *
+ * @author James Moger
+ *
+ */
public class WebXmlSettings extends IStoredSettings {
private final Properties properties = new Properties();
-
+
+ private File overrideFile;
+
public WebXmlSettings(ServletContext context) {
super(WebXmlSettings.class);
Enumeration<?> keys = context.getInitParameterNames();
while (keys.hasMoreElements()) {
String key = keys.nextElement().toString();
String value = context.getInitParameter(key);
- properties.put(key, value);
+ properties.put(key, decodeValue(value));
+ logger.debug(key + "=" + properties.getProperty(key));
}
}
-
+
+ public void applyOverrides(File overrideFile) {
+ this.overrideFile = overrideFile;
+
+ // apply any web-configured overrides
+ if (overrideFile.exists()) {
+ try {
+ InputStream is = new FileInputStream(overrideFile);
+ properties.load(is);
+ is.close();
+ } catch (Throwable t) {
+ logger.error(
+ MessageFormat.format("Failed to apply {0} setting overrides",
+ overrideFile.getAbsolutePath()), t);
+ }
+ }
+ }
+
+ private String decodeValue(String value) {
+ // decode escaped backslashes and HTML entities
+ return StringUtils.decodeFromHtml(value).replace("\\\\", "\\");
+ }
+
@Override
protected Properties read() {
return properties;
}
@Override
+ public synchronized boolean saveSettings(Map<String, String> settings) {
+ try {
+ Properties props = new Properties();
+ // load pre-existing web-configuration
+ if (overrideFile.exists()) {
+ InputStream is = new FileInputStream(overrideFile);
+ props.load(is);
+ is.close();
+ }
+
+ // put all new settings and persist
+ props.putAll(settings);
+ OutputStream os = new FileOutputStream(overrideFile);
+ props.store(os, null);
+ os.close();
+
+ // override current runtime settings
+ properties.putAll(settings);
+ return true;
+ } catch (Throwable t) {
+ logger.error("Failed to save settings!", t);
+ }
+ return false;
+ }
+
+ @Override
public String toString() {
return "WEB.XML";
}
--
Gitblit v1.9.1