[java-identity-provider] branch main updated: IDP-1806 - Trailing Blank in property yields inconsistent error
Scott Cantor
cantor.2 at osu.edu
Thu Jun 15 18:06:14 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=4606c1e42510023e8620789e0787271bf577daa5
The following commit(s) were added to refs/heads/main by this push:
new 4606c1e42 IDP-1806 - Trailing Blank in property yields inconsistent error
4606c1e42 is described below
commit 4606c1e42510023e8620789e0787271bf577daa5
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Jun 15 14:06:11 2023 -0400
IDP-1806 - Trailing Blank in property yields inconsistent error
https://shibboleth.atlassian.net/browse/IDP-1806
Convert more classes over to our Resource class.
---
.../authn/impl/HTPasswdCredentialValidator.java | 2 +-
.../idp/authn/impl/JAASCredentialValidator.java | 2 +-
.../net/shibboleth/idp/profile/ScriptedAction.java | 30 +++++-----------------
.../idp/profile/logic/ScriptedPredicate.java | 15 +++++------
4 files changed, 15 insertions(+), 34 deletions(-)
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidator.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidator.java
index 55f05eba9..d110dc50d 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidator.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidator.java
@@ -37,7 +37,6 @@ import org.apache.commons.codec.digest.Crypt;
import org.apache.commons.codec.digest.Md5Crypt;
import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
-import org.springframework.core.io.Resource;
import com.google.common.base.Strings;
@@ -53,6 +52,7 @@ import net.shibboleth.shared.codec.StringDigester.OutputFormat;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.LoggerFactory;
+import net.shibboleth.shared.resource.Resource;
/**
* A password validator that authenticates against Apache htpasswd files.
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/JAASCredentialValidator.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/JAASCredentialValidator.java
index 3241be0d5..a0a54d430 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/JAASCredentialValidator.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/JAASCredentialValidator.java
@@ -40,7 +40,6 @@ import javax.security.auth.login.LoginException;
import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
-import org.springframework.core.io.Resource;
import net.shibboleth.idp.authn.AbstractUsernamePasswordCredentialValidator;
import net.shibboleth.idp.authn.AuthnEventIds;
@@ -55,6 +54,7 @@ import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.primitive.StringSupport;
+import net.shibboleth.shared.resource.Resource;
/**
* A password validator that authenticates against JAAS.
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ScriptedAction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ScriptedAction.java
index 6645b50d4..c671a0544 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ScriptedAction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ScriptedAction.java
@@ -18,7 +18,6 @@
package net.shibboleth.idp.profile;
import java.io.IOException;
-import java.io.InputStream;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -29,11 +28,11 @@ import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
-import org.springframework.core.io.Resource;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.primitive.LoggerFactory;
+import net.shibboleth.shared.resource.Resource;
import net.shibboleth.shared.scripting.AbstractScriptEvaluator;
import net.shibboleth.shared.scripting.EvaluableScript;
@@ -58,25 +57,12 @@ public class ScriptedAction extends AbstractProfileAction {
/** Evaluator. */
@Nonnull private final ActionScriptEvaluator scriptEvaluator;
- /**
- * Constructor.
- *
- * @param theScript the script we will evaluate
- * @param extraInfo debugging information
- *
- * @deprecated ...
- */
- @Deprecated
- public ScriptedAction(@Nonnull final EvaluableScript theScript, @Nullable final String extraInfo) {
- scriptEvaluator = new ActionScriptEvaluator(theScript);
- }
-
/**
* Constructor.
*
* @param theScript the script we will evaluate
*/
- public ScriptedAction(@Nonnull final EvaluableScript theScript) {
+ protected ScriptedAction(@Nonnull final EvaluableScript theScript) {
scriptEvaluator = new ActionScriptEvaluator(theScript);
}
@@ -144,13 +130,11 @@ public class ScriptedAction extends AbstractProfileAction {
public static ScriptedAction resourceScript(@Nonnull @NotEmpty final String engineName,
@Nonnull final Resource resource)
throws ScriptException, IOException {
- try (final InputStream is = resource.getInputStream()) {
- final EvaluableScript script = new EvaluableScript();
- script.setEngineName(engineName);
- script.setScript(is);
- script.initializeWithScriptException();
- return new ScriptedAction(script);
- }
+ final EvaluableScript script = new EvaluableScript();
+ script.setEngineName(engineName);
+ script.setScript(resource);
+ script.initializeWithScriptException();
+ return new ScriptedAction(script);
}
/**
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/ScriptedPredicate.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/ScriptedPredicate.java
index 2fc525e26..230b9070a 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/ScriptedPredicate.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/ScriptedPredicate.java
@@ -17,9 +17,7 @@
package net.shibboleth.idp.profile.logic;
-
import java.io.IOException;
-import java.io.InputStream;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -32,6 +30,7 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.primitive.DeprecationSupport;
import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
import net.shibboleth.shared.scripting.EvaluableScript;
+import net.shibboleth.shared.spring.resource.ResourceHelper;
/**
* Deprecated stub for relocated class.
@@ -76,13 +75,11 @@ public class ScriptedPredicate extends net.shibboleth.profile.context.logic.Scri
*/
public static ScriptedPredicate resourceScript(@Nonnull @NotEmpty final String engineName,
@Nonnull final Resource resource) throws ScriptException, IOException {
- try (final InputStream is = resource.getInputStream()) {
- final EvaluableScript script = new EvaluableScript();
- script.setEngineName(engineName);
- script.setScript(is);
- script.initializeWithScriptException();
- return new ScriptedPredicate(script, resource.getDescription());
- }
+ final EvaluableScript script = new EvaluableScript();
+ script.setEngineName(engineName);
+ script.setScript(ResourceHelper.of(resource));
+ script.initializeWithScriptException();
+ return new ScriptedPredicate(script, resource.getDescription());
}
/**
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list