From a3361b40aa8f92849c50db27e349e17b87bebb1e Mon Sep 17 00:00:00 2001
From: wbauer <wbauer@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 9 Sep 2008 12:40:52 +0000
Subject: improved security handling and added shutdown handler

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@27 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/bku/online/conf/Configurator.java   |  8 +++---
 .../gv/egiz/bku/online/webapp/ResultServlet.java   |  3 ++-
 .../gv/egiz/bku/online/webapp/ShutdownHandler.java | 31 ++++++++++++++++++++++
 .../egiz/bku/online/conf/accessControlConfig.xml   |  3 +--
 .../src/main/webapp/WEB-INF/applicationContext.xml |  6 ++++-
 5 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ShutdownHandler.java

(limited to 'BKUOnline')

diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/conf/Configurator.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/conf/Configurator.java
index a0a268e4..de577139 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/conf/Configurator.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/conf/Configurator.java
@@ -52,9 +52,9 @@ public class Configurator {
 
 	protected void configureProviders() {
 		log.debug("Registering security providers");
-                Security.insertProviderAt(new IAIK(), 1);
-                Security.insertProviderAt(new ECCProvider(false), 2);
-    		Security.addProvider(new STALProvider());
+		Security.insertProviderAt(new IAIK(), 1);
+		Security.insertProviderAt(new ECCProvider(false), 2);
+		Security.addProvider(new STALProvider());
 		XSecProvider.addAsProvider(false);
 		StringBuilder sb = new StringBuilder();
 		sb.append("Registered providers: ");
@@ -65,7 +65,7 @@ public class Configurator {
 		log.debug(sb.toString());
 	}
 
-        public void configure() {
+	public void configure() {
 		configureProviders();
 		configUrlConnections();
 	}
diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java
index 6c1a4c3a..bc3edf18 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java
@@ -115,6 +115,7 @@ public class ResultServlet extends SpringBKUServlet {
     resp.setContentType(bp.getResultContentType());
     resp.setCharacterEncoding(encoding);
     bp.writeResultTo(resp.getOutputStream(), encoding);
-    session.invalidate();
+    session.invalidate();
+    getBindingProcessorManager().removeBindingProcessor(bp.getId());
   }
 }
diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ShutdownHandler.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ShutdownHandler.java
new file mode 100644
index 00000000..86da6c06
--- /dev/null
+++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ShutdownHandler.java
@@ -0,0 +1,31 @@
+package at.gv.egiz.bku.online.webapp;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextClosedEvent;
+
+import at.gv.egiz.bku.binding.BindingProcessorManager;
+
+public class ShutdownHandler implements ApplicationListener {
+
+	private static Log log = LogFactory.getLog(ShutdownHandler.class);
+
+	private BindingProcessorManager bindingProcessorManager;
+
+	public void setBindingProcessorManager(
+			BindingProcessorManager bindingProcessorManager) {
+		this.bindingProcessorManager = bindingProcessorManager;
+	}
+
+	@Override
+	public void onApplicationEvent(ApplicationEvent event) {
+		if (event instanceof ContextClosedEvent) {
+			log.info("Shutting down BKU");
+			bindingProcessorManager.shutdownNow();
+		}
+
+	}
+
+}
diff --git a/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/accessControlConfig.xml b/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/accessControlConfig.xml
index 69b45d1b..f8d1411c 100644
--- a/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/accessControlConfig.xml
+++ b/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/accessControlConfig.xml
@@ -54,8 +54,7 @@
 			<Rules>
 				<Rule Id="cmd-rule-1">
 					<AuthClass>certified</AuthClass>
-					<AnyPeer />
-					<Command Name="Infobox*">
+					<Command Name="Infobox.*">
 						<Param Name="InfoboxIdentifier">IdentityLink</Param>
 						<Param Name="PersonIdentifier">derived</Param>
 					</Command>
diff --git a/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml b/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml
index 4bb5e8e2..f87d09f5 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml
@@ -49,5 +49,9 @@
 		scope="singleton" init-method="configure">
 		<property name="resource" value="classpath:at/gv/egiz/bku/online/conf/defaultConf.properties"/>
 	</bean>
-
+	
+	<!-- Shutdown Event handler -->
+  <bean id="shutdown" class="at.gv.egiz.bku.online.webapp.ShutdownHandler">
+  <property name="bindingProcessorManager" ref="bindingProcessorManager"></property>
+  </bean>
 </beans>
\ No newline at end of file
-- 
cgit v1.2.3