[java-identity-provider] 05/05: JSCRIPTING-3 Work around bug in scripting provider current release

[Rod Widdowson]

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

rdw 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=e14f644b78691a73a6c0d3d4b331830f5b911630

commit e14f644b78691a73a6c0d3d4b331830f5b911630
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Jul 30 16:25:02 2020 +0100

    JSCRIPTING-3 Work around bug in scripting provider current release
    
    https://issues.shibboleth.net/jira/browse/JSCRIPTING-3
    
    This allows one of the download installer tests to run (the one
    least likely to fail when downloading from maven central).
---
 .../net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java | 8 ++++++--
 .../shibboleth/idp/installer/plugin/impl/PluginInstallerTest.java | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java
index c756e9500..f5475e6ba 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java
@@ -264,7 +264,7 @@ public final class PluginInstaller extends AbstractInitializableComponent implem
                        description = plugin;
                        return;
                    }
-                   log.debug("Did not match {}", pluginId);
+                   log.trace("Did not match {}", pluginId);
                }
            }
            log.error("Could not locate description for {} in distribution {}", pluginId, libDir);
@@ -494,7 +494,11 @@ public final class PluginInstaller extends AbstractInitializableComponent implem
                 log.error("identity property file {} did not contain 'pluginid' property", propertyFile);
                 throw new BuildException("No property in ID file");
             }
-            setPluginId(id);
+            if (pluginId != null && !pluginId.equals(id)) {
+                log.error("Downloaded plugin id {} overriden by provided id {}", id, pluginId);
+            } else {
+                setPluginId(id);
+            }
         } catch (final IOException e) {
             log.error("Could not load plugin identity at {}", propertyFile, e);
             throw new BuildException(e);
diff --git a/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerTest.java b/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerTest.java
index 9a53114ff..c6f5ca425 100644
--- a/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerTest.java
+++ b/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerTest.java
@@ -96,8 +96,9 @@ public class PluginInstallerTest extends BasePluginTest {
     }
 
     
-    @Test(enabled = false) public void testUnpackTgz() throws ComponentInitializationException, IOException {
+    @Test(enabled = true) public void testUnpackTgz() throws ComponentInitializationException, IOException {
         try (final PluginInstaller inst = new PluginInstaller()) {
+            inst.setPluginId("net.shibboleth.idp.plugin.rhino");
             inst.setIdpHome(getIdpHome());
             inst.setAcceptCert(loggingAcceptCert);
             inst.setAcceptDownload(loggingAcceptDownLoad);

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