[java-identity-provider COMMIT] in /trunk/idp-installer/src/main/wix: ShibbolethIdP-registry.wxs procrun.wxs

[noreply at shibboleth.net]

Author: rdw
Date: Mon Aug 10 11:57:33 2015
New Revision: 7668

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7668&view=rev
Log:
IDP-787 Lockdown the registry

https://issues.shibboleth.net/jira/browse/IDP-787

Make the configuration for the procrun daemon non-world readable.

Modified:
    trunk/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
    trunk/idp-installer/src/main/wix/procrun.wxs

Modified: trunk/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs?rev=7668&r1=7667&r2=7668&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs	(original)
+++ trunk/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs	Mon Aug 10 11:57:33 2015
@@ -39,20 +39,36 @@
             </Component>
             <!-- Jetty Configuration-->
             <Component Id="JettyConfig" Directory="INSTALLDIR" Guid="{FE729EF2-8293-493A-80C9-69CF54DC4565}" KeyPath="yes" Win64="no">
-                <RegistryKey Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)\Parameters\Java" Root="HKLM">
+                <RegistryKey Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)\Parameters\Java" Root="HKLM" ForceCreateOnInstall="yes">
+                    <Permission User="Administrators" GenericAll="yes" />
+                    <Permission User="SYSTEM" GenericAll="yes" />
                     <RegistryValue Name="Options" Type="multiString">
+                        <Permission User="Administrators" GenericAll="yes" />
+                        <Permission User="SYSTEM" GenericAll="yes" />
                         <MultiStringValue>-Didp.home=[JAVA_IDP_HOME]</MultiStringValue>
                     </RegistryValue>
-                    <RegistryValue Name="JvmMx" Value="[JAVA_JVMMX]" Type="string" /><!-- Its an integer, but we added the # -->
+                    <RegistryValue Name="JvmMx" Value="[JAVA_JVMMX]" Type="string">
+                        <!-- Its an integer, but we added the # -->
+                        <Permission User="Administrators" GenericAll="yes" />
+                        <Permission User="SYSTEM" GenericAll="yes" />
+                    </RegistryValue>
                 </RegistryKey>
-                <RegistryKey Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)\Parameters\Start" Root="HKLM">
+                <RegistryKey Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)\Parameters\Start" Root="HKLM" ForceCreateOnInstall="yes">
+                    <Permission User="Administrators" GenericAll="yes" />
+                    <Permission User="SYSTEM" GenericAll="yes" />
                     <RegistryValue Name="Params" Type="multiString" Action="append">
+                        <Permission User="Administrators" GenericAll="yes" />
+                        <Permission User="SYSTEM" GenericAll="yes" />
                         <MultiStringValue>jetty.base=[INSTALLDIR]\jetty-base</MultiStringValue>
                         <MultiStringValue>jetty.logs=[INSTALLDIR]\jetty-base\logs</MultiStringValue>
                     </RegistryValue>
                 </RegistryKey>
-                <RegistryKey Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)\Parameters\Stop" Root="HKLM">
+                <RegistryKey Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)\Parameters\Stop" Root="HKLM" ForceCreateOnInstall="yes">
+                    <Permission User="Administrators" GenericAll="yes" />
+                    <Permission User="SYSTEM" GenericAll="yes" />
                     <RegistryValue Name="Params" Type="multiString" Action="append">
+                        <Permission User="Administrators" GenericAll="yes" />
+                        <Permission User="SYSTEM" GenericAll="yes" />
                         <MultiStringValue>jetty.base=[INSTALLDIR]\jetty-base</MultiStringValue>
                         <MultiStringValue>jetty.logs=[INSTALLDIR]\jetty-base\logs</MultiStringValue>
                     </RegistryValue>

Modified: trunk/idp-installer/src/main/wix/procrun.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/procrun.wxs?rev=7668&r1=7667&r2=7668&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/procrun.wxs	(original)
+++ trunk/idp-installer/src/main/wix/procrun.wxs	Mon Aug 10 11:57:33 2015
@@ -77,35 +77,51 @@
             <!-- Configure the service -->
 
             <Component Id="ServiceParameters" Directory="PROCRUNROOT" Guid="{EC1EA760-0113-4CAD-9719-ADFF1885FC53}" KeyPath="yes">
-                <RegistryKey ForceCreateOnInstall="yes" Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)\Parameters" Root="HKLM" />

[... 68 lines stripped ...]