[java-idp-oidc] branch main updated: Some flow cleanup.
Scott Cantor
cantor.2 at osu.edu
Wed Mar 9 14:34:25 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=929de9913ae6bf39e844f65c01ee4e4c7b987d3a
The following commit(s) were added to refs/heads/main by this push:
new 929de991 Some flow cleanup.
929de991 is described below
commit 929de9913ae6bf39e844f65c01ee4e4c7b987d3a
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Mar 9 09:34:22 2022 -0500
Some flow cleanup.
---
.../op/profile/impl/IssueRegistrationAccessToken.java | 15 ++++++---------
.../issue-registration-access-token-beans.xml | 7 -------
.../issue-registration-access-token-flow.xml | 1 -
.../flow/IssueRegistrationAccessTokenFlowTest.java | 3 ++-
4 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/IssueRegistrationAccessToken.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/IssueRegistrationAccessToken.java
index 0c51aa1c..473b39c7 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/IssueRegistrationAccessToken.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/IssueRegistrationAccessToken.java
@@ -25,6 +25,7 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import org.opensaml.messaging.context.MessageContext;
import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
@@ -256,12 +257,6 @@ public class IssueRegistrationAccessToken extends AbstractProfileAction {
log.warn("{} Web Flow request context not found in Spring request context", getLogPrefix());
return false;
}
-
- if (profileRequestContext.getOutboundMessageContext() == null) {
- log.error("{} No outbound message context found", getLogPrefix());
- ActionSupport.buildEvent(profileRequestContext, EventIds.INVALID_PROFILE_CTX);
- return false;
- }
idGenerator = idGeneratorLookupStrategy.apply(profileRequestContext);
if (idGenerator == null) {
@@ -330,18 +325,20 @@ public class IssueRegistrationAccessToken extends AbstractProfileAction {
final String encryptedValue = dataSealer.wrap(value, claimsSet.getExpiration());
log.debug("{} Encrypted the JSON into {}", getLogPrefix(), encryptedValue);
accessToken = new BearerAccessToken(encryptedValue, tokenLifetime.getSeconds(), null);
- } catch (JsonProcessingException e) {
+ } catch (final JsonProcessingException e) {
log.error("{} Could not build JSON", getLogPrefix(), e);
ActionSupport.buildEvent(profileRequestContext, EventIds.IO_ERROR);
return;
- } catch (DataSealerException e) {
+ } catch (final DataSealerException e) {
log.error("{} Could not encrypt the claims set", getLogPrefix(), e);
ActionSupport.buildEvent(profileRequestContext, EventIds.IO_ERROR);
return;
}
final TokenResponse response = new AccessTokenResponse(new Tokens(accessToken, null));
- profileRequestContext.getOutboundMessageContext().setMessage(response);
+ final MessageContext mc = new MessageContext();
+ mc.setMessage(response);
+ profileRequestContext.setOutboundMessageContext(mc);
}
}
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-beans.xml
index 0342c792..02c80503 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-beans.xml
@@ -28,10 +28,6 @@
<!-- Work beans. -->
- <bean id="InitializeOutboundMessageContext"
- class="net.shibboleth.idp.plugin.oidc.op.profile.impl.InitializeOutboundTokenResponseMessageContext"
- scope="prototype" />
-
<bean id="IssueRegistrationAccessToken"
class="net.shibboleth.idp.plugin.oidc.op.profile.impl.IssueRegistrationAccessToken" scope="prototype"
p:httpServletResponse-ref="shibboleth.HttpServletResponse"
@@ -102,9 +98,6 @@
class="net.shibboleth.oidc.metadata.policy.impl.DefaultMetadataPolicyResponseHandler"
p:parsingStrategy-ref="shibboleth.oidc.admin.ParsingStrategy" />
- <bean id="FormOutboundMessage"
- class="net.shibboleth.idp.plugin.oidc.op.profile.impl.FormOutboundTokenResponseMessage" scope="prototype" />
-
<bean id="oidc.messageEncoderFactory"
class="net.shibboleth.idp.plugin.oidc.op.encoding.impl.OIDCResponseEncoderFactory"
p:messageEncoder-ref="oidc.nimbusEncoder" scope="prototype" />
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-flow.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-flow.xml
index 4f07ff68..0c66ba19 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-flow.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-flow.xml
@@ -17,7 +17,6 @@
<evaluate expression="InitializeProfileRequestContext" />
<evaluate expression="PopulateMetricContext" />
<evaluate expression="FlowStartPopulateAuditContext" />
- <evaluate expression="InitializeOutboundMessageContext" />
<evaluate expression="'proceed'" />
<!-- Branch to determine if authentication is required. -->
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/IssueRegistrationAccessTokenFlowTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/IssueRegistrationAccessTokenFlowTest.java
index ee815276..821259f8 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/IssueRegistrationAccessTokenFlowTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/IssueRegistrationAccessTokenFlowTest.java
@@ -40,8 +40,9 @@ import net.shibboleth.idp.plugin.oidc.op.cli.IssueRegistrationAccessTokenArgumen
public class IssueRegistrationAccessTokenFlowTest extends AbstractOidcFlowTest {
/** The flow id. */
- @Nonnull public final static String FLOW_ID = "admin/oidc/issue-registration-access-token";
+ @Nonnull public static final String FLOW_ID = "admin/oidc/issue-registration-access-token";
+ /** Constructor. */
public IssueRegistrationAccessTokenFlowTest() {
super(FLOW_ID);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list