[java-identity-provider] branch master updated: Finalize? handling of registry for new and upgraded systems.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=ab87946a5f61b13edbcaeae46a45d2acb6fad2bb

The following commit(s) were added to refs/heads/master by this push:
       new  ab87946   Finalize? handling of registry for new and upgraded systems.
ab87946 is described below

commit ab87946a5f61b13edbcaeae46a45d2acb6fad2bb
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jan 14 09:46:00 2020 -0500

    Finalize? handling of registry for new and upgraded systems.
---
 .../src/main/resources/conf/services.properties     |  1 -
 idp-conf/src/main/resources/conf/services.xml       |  8 --------
 .../main/resources/system/conf/services-system.xml  |  2 +-
 .../net/shibboleth/idp/installer/V4Install.java     | 21 +--------------------
 4 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/idp-conf/src/main/resources/conf/services.properties b/idp-conf/src/main/resources/conf/services.properties
index 0ffc01b..ff310d7 100644
--- a/idp-conf/src/main/resources/conf/services.properties
+++ b/idp-conf/src/main/resources/conf/services.properties
@@ -24,7 +24,6 @@ idp.service.relyingparty.ignoreUnmappedEntityAttributes=true
 # Set to false if not using ByReference MetadataFilters for a small perf gain
 #idp.service.metadata.enableByReferenceFilters = true
 
-# Set to shibboleth.LegacyAttributeRegistryResources to support only AttributeEncoders
 #idp.service.attribute.registry.resources = shibboleth.AttributeRegistryResources
 #idp.service.attribute.registry.failFast = false
 idp.service.attribute.registry.checkInterval = PT15M
diff --git a/idp-conf/src/main/resources/conf/services.xml b/idp-conf/src/main/resources/conf/services.xml
index b61b6be..5a4cdea 100644
--- a/idp-conf/src/main/resources/conf/services.xml
+++ b/idp-conf/src/main/resources/conf/services.xml
@@ -63,7 +63,6 @@
         <value>%{idp.home}/conf/attribute-resolver.xml</value>
     </util:list>
 
-    <!-- This set of resources relies on (at least) the new registry mappings. -->
     <util:list id ="shibboleth.AttributeRegistryResources">
         <value>%{idp.home}/conf/attribute-registry.xml</value>
         <value>%{idp.home}/system/conf/attribute-registry-system.xml</value>
@@ -71,13 +70,6 @@
         <value>%{idp.home}/conf/attribute-resolver.xml</value>
     </util:list>
 
-    <!-- This set of resources uses only AttributeEncoders for compatibility. -->
-    <util:list id ="shibboleth.LegacyAttributeRegistryResources">
-        <value>%{idp.home}/conf/attribute-registry.xml</value>
-        <value>%{idp.home}/system/conf/attribute-registry-system.xml</value>
-        <value>%{idp.home}/conf/attribute-resolver.xml</value>
-    </util:list>
-
     <util:list id ="shibboleth.AttributeFilterResources">
         <value>%{idp.home}/conf/attribute-filter.xml</value>
     </util:list>
diff --git a/idp-conf/src/main/resources/system/conf/services-system.xml b/idp-conf/src/main/resources/system/conf/services-system.xml
index 1cc2546..4884bb1 100644
--- a/idp-conf/src/main/resources/system/conf/services-system.xml
+++ b/idp-conf/src/main/resources/system/conf/services-system.xml
@@ -71,8 +71,8 @@
     </bean>
     <util:list id ="shibboleth.DefaultAttributeRegistryResources">
         <value>%{idp.home}/conf/attribute-registry.xml</value>
+        <value>%{idp.home}/conf/attribute-resolver.xml</value>
         <value>%{idp.home}/system/conf/attribute-registry-system.xml</value>
-        <value>%{idp.home}/conf/attributes/default-rules.xml</value>
     </util:list>
 
     <bean id="shibboleth.NameIdentifierGenerationService" class="net.shibboleth.ext.spring.service.ReloadableSpringService" 
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
index 4e43073..9bc3808 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
@@ -312,26 +312,7 @@ public class V4Install extends AbstractInitializableComponent {
                 throw new BuildException("Failed to generate secrets.properties", e);
             }
         } else if (CurrentInstallState.V3_VERSION.equals(currentState.getInstalledVersion())) {
-            log.debug("Detected a V3 to V4 update.  Editing services.properties");
-            final Path servicesProps = conf.resolve("services.properties");
-            if (!Files.exists(servicesProps)) {
-                log.warn("Previous Version V3 but no services.properties?");
-            } else {
-                try {
-                    // Handle services.properties for a 3->4 upgrade.
-                    final PropertiesWithComments propertiesToReWrite = new PropertiesWithComments();
-                    final File servicesPropsFile = servicesProps.toFile();
-                    propertiesToReWrite.load(new FileInputStream(servicesPropsFile));
-                    propertiesToReWrite.addComment(
-                            "idp.service.attribute.registry.resources modified during v3 upgrade "
-                            + Instant.now().toString());
-                    propertiesToReWrite.replaceProperty("idp.service.attribute.registry.resources",
-                            "shibboleth.LegacyAttributeRegistryResources");
-                    propertiesToReWrite.store(new FileOutputStream(servicesPropsFile));
-                } catch (final IOException e) {
-                    throw new BuildException("Failed to update services.properties", e);
-                }            
-            }
+            log.debug("Detected a V3 to V4 update.");
         }
     }
     // CheckStyle: CyclomaticComplexity|MethodLength ON

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.