[java-shib-shared] branch main updated: Fix null and annotation bugs.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-shib-shared.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-shared.git;a=commit;h=8a9ea1b04e3c126f5fc2ac263aed2578651d0640

The following commit(s) were added to refs/heads/main by this push:
     new 8a9ea1b0 Fix null and annotation bugs.
8a9ea1b0 is described below

commit 8a9ea1b04e3c126f5fc2ac263aed2578651d0640
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Nov 7 12:41:21 2022 -0500

    Fix null and annotation bugs.
---
 .../spring/security/factory/KeyStoreFactoryBean.java    | 17 +++++++++++------
 .../security/factory/PrivateKeyFactoryBeanTest.java     |  1 +
 .../security/factory/PublicKeyFactoryBeanTest.java      |  1 +
 .../factory/X509CertificateChainFactoryBeanTest.java    |  1 +
 .../factory/X509CertificateFactoryBeanTest.java         |  1 +
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/KeyStoreFactoryBean.java b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/KeyStoreFactoryBean.java
index c399d061..5db7ed15 100644
--- a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/KeyStoreFactoryBean.java
+++ b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/KeyStoreFactoryBean.java
@@ -92,20 +92,25 @@ public class KeyStoreFactoryBean implements FactoryBean<KeyStore> {
     @Override public KeyStore getObject() throws Exception {
 
         if (keyStore == null) {
-            if (resource == null) {
+            
+            final Resource resource2 = resource;
+            if (resource2 == null) {
                 throw new FactoryBeanNotInitializedException("Resource property cannot be null");
             }
             
+            final KeyStore ks;
             if (provider != null && type != null) {
-                keyStore = KeyStore.getInstance(type, provider);
+                ks = KeyStore.getInstance(type, provider);
             } else if (type != null) {
-                keyStore = KeyStore.getInstance(type);
+                ks = KeyStore.getInstance(type);
             } else {
-                keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+                ks = KeyStore.getInstance(KeyStore.getDefaultType());
             }
-            try (final InputStream is = resource.getInputStream()) {
-                keyStore.load(is, keyPass.toCharArray());
+            try (final InputStream is = resource2.getInputStream()) {
+                ks.load(is, keyPass != null ? keyPass.toCharArray() : null);
             }
+            
+            keyStore = ks;
         }
 
         return keyStore;
diff --git a/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBeanTest.java b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBeanTest.java
index 59c54d2f..229d84fb 100644
--- a/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBeanTest.java
+++ b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBeanTest.java
@@ -30,6 +30,7 @@ import org.testng.annotations.Test;
 public class PrivateKeyFactoryBeanTest extends AbstractTestNGSpringContextTests {
 
     @Test public void testFactory() {
+        assert(applicationContext != null);
         final Object bean = applicationContext.getBean("key");
         Assert.assertNotNull(bean);
         Assert.assertTrue(bean instanceof RSAPrivateKey);
diff --git a/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBeanTest.java b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBeanTest.java
index 8dc820a5..7938d83b 100644
--- a/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBeanTest.java
+++ b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBeanTest.java
@@ -30,6 +30,7 @@ import org.testng.annotations.Test;
 public class PublicKeyFactoryBeanTest extends AbstractTestNGSpringContextTests {
 
     @Test public void testFactory() {
+        assert(applicationContext != null);
         final Object bean = applicationContext.getBean("key");
         Assert.assertNotNull(bean);
         Assert.assertTrue(bean instanceof RSAPublicKey);
diff --git a/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBeanTest.java b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBeanTest.java
index ccd55567..8fdd9be4 100644
--- a/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBeanTest.java
+++ b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBeanTest.java
@@ -30,6 +30,7 @@ import org.testng.annotations.Test;
 public class X509CertificateChainFactoryBeanTest extends AbstractTestNGSpringContextTests {
 
     @Test public void testFactory() {
+        assert(applicationContext != null);
         final Object bean = applicationContext.getBean("chain");
         Assert.assertNotNull(bean);
         final X509Certificate[] chain = (X509Certificate[])bean;
diff --git a/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBeanTest.java b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBeanTest.java
index baadfe3b..200cd2cc 100644
--- a/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBeanTest.java
+++ b/shib-security-spring/src/test/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBeanTest.java
@@ -32,6 +32,7 @@ import org.testng.annotations.Test;
 public class X509CertificateFactoryBeanTest extends AbstractTestNGSpringContextTests {
 
     @Test public void testFactory() {
+        assert(applicationContext != null);
         final Object bean = applicationContext.getBean("certificate");
         Assert.assertNotNull(bean);
         Assert.assertTrue(bean instanceof X509Certificate);

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