[jboss-svn-commits] JBL Code SVN: r35495 - labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/server/security.

[jboss-svn-commits at lists.jboss.org]

Author: tsurdilovic
Date: 2010-10-12 12:36:58 -0400 (Tue, 12 Oct 2010)
New Revision: 35495

Modified:
   labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java
Log:
BRMS-383 - Add ability for serialization security settings to be added to preferences.properties


Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java	2010-10-12 13:34:57 UTC (rev 35494)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java	2010-10-12 16:36:58 UTC (rev 35495)
@@ -195,6 +195,13 @@
         final String dateFormat = "drools.dateformat";
         final String defaultLanguage = "drools.defaultlanguage";
         final String defaultCountry = "drools.defaultcountry";
+        final String serializationSign = "drools.serialization.sign";
+        final String privateKeyStoreURL = "drools.serialization.private.keyStoreURL";
+        final String privateKeyStorePwd = "drools.serialization.private.keyStorePwd";
+        final String privateKeyAlias = "drools.serialization.private.keyAlias";
+        final String privateKeyPwd = "drools.serialization.private.keyPwd";
+        final String publicKeyStoreURL = "drools.serialization.public.keyStoreURL";
+        final String publicKeyStorePwd = "drools.serialization.public.keyStorePwd";
 
         // Set properties that were specified in the properties file
         if ( prefs.containsKey( dateFormat ) ) {
@@ -209,6 +216,35 @@
             System.setProperty( defaultCountry,
                                 prefs.get( defaultCountry ) );
         }
+        
+        if ( prefs.containsKey( serializationSign ) ) {
+            System.setProperty( serializationSign,
+                                prefs.get( serializationSign ) );
+        }
+        if ( prefs.containsKey( privateKeyStoreURL ) ) {
+            System.setProperty( privateKeyStoreURL,
+                                prefs.get( privateKeyStoreURL ) );
+        }
+        if ( prefs.containsKey( privateKeyStorePwd ) ) {
+            System.setProperty( privateKeyStorePwd,
+                                prefs.get( privateKeyStorePwd ) );
+        }
+        if ( prefs.containsKey( privateKeyAlias ) ) {
+            System.setProperty( privateKeyAlias,
+                                prefs.get( privateKeyAlias ) );
+        }
+        if ( prefs.containsKey( privateKeyPwd ) ) {
+            System.setProperty( privateKeyPwd,
+                                prefs.get( privateKeyPwd ) );
+        }
+        if ( prefs.containsKey( publicKeyStoreURL ) ) {
+            System.setProperty( publicKeyStoreURL,
+                                prefs.get( publicKeyStoreURL ) );
+        }
+        if ( prefs.containsKey( publicKeyStorePwd ) ) {
+            System.setProperty( publicKeyStorePwd,
+                                prefs.get( publicKeyStorePwd ) );
+        }
 
         // If properties were not set in the file, use the defaults
         if ( !prefs.containsKey( dateFormat ) ) {
@@ -223,5 +259,9 @@
             prefs.put( defaultCountry,
                        System.getProperty( defaultCountry ) );
         }
+        
+        // For security Serialization we DO NOT want to set any default 
+        // as those can be set through other means and we don't want 
+        // to override or mess with that
     }
 }