[java-identity-provider] branch main updated: JSPROF-1 - Move RelyingParty "layer" into java-shib-profile
Scott Cantor
cantor.2 at osu.edu
Wed Feb 15 16:30:40 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=b9185518f16b7ffa87b85ec67fe9447d4490f336
The following commit(s) were added to refs/heads/main by this push:
new b9185518f JSPROF-1 - Move RelyingParty "layer" into java-shib-profile
b9185518f is described below
commit b9185518f16b7ffa87b85ec67fe9447d4490f336
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Feb 15 11:30:37 2023 -0500
JSPROF-1 - Move RelyingParty "layer" into java-shib-profile
https://shibboleth.atlassian.net/browse/JSPROF-1
Move AuditContext out.
---
.../net/shibboleth/idp/authn/AuthnAuditFields.java | 2 +-
.../impl/AbstractAuditingValidationAction.java | 2 +-
.../idp/cas/protocol/CASAuditFields.java | 2 +-
.../idp/conf/profile-intercept-system.xml | 2 +-
.../idp/flows/authn/authn-abstract-beans.xml | 2 +-
.../idp/flows/saml/saml2/slo-back-flow.xml | 2 +-
.../idp/consent/audit/impl/ConsentAuditFields.java | 2 +-
.../net/shibboleth/idp/profile/IdPAuditFields.java | 2 +-
.../idp/profile/context/AuditContext.java | 66 ----------------------
.../profile/audit/impl/PopulateAuditContext.java | 2 +-
.../idp/profile/audit/impl/WriteAuditLog.java | 2 +-
.../audit/impl/PopulateAuditContextTest.java | 2 +-
.../idp/profile/audit/impl/WriteAuditLogTest.java | 2 +-
.../idp/saml/profile/SAMLAuditFields.java | 2 +-
.../idp/saml/audit/impl/WriteFTICKSLog.java | 2 +-
.../impl/RestoreProfileRequestContextTree.java | 2 +-
.../impl/SaveProfileRequestContextTree.java | 2 +-
17 files changed, 16 insertions(+), 82 deletions(-)
diff --git a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthnAuditFields.java b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthnAuditFields.java
index 79a543a8f..55e0aead2 100644
--- a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthnAuditFields.java
+++ b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthnAuditFields.java
@@ -22,7 +22,7 @@ import javax.annotation.Nonnull;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
/**
- * Constants to use for audit logging fields stored in an {@link net.shibboleth.idp.profile.context.AuditContext}.
+ * Constants to use for audit logging fields stored in an {@link net.shibboleth.profile.context.AuditContext}.
*/
public final class AuthnAuditFields {
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/AbstractAuditingValidationAction.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/AbstractAuditingValidationAction.java
index fdcdd5c66..796463269 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/AbstractAuditingValidationAction.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/AbstractAuditingValidationAction.java
@@ -33,7 +33,7 @@ import net.shibboleth.idp.authn.AbstractValidationAction;
import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.profile.audit.impl.PopulateAuditContext;
import net.shibboleth.idp.profile.audit.impl.WriteAuditLog;
-import net.shibboleth.idp.profile.context.AuditContext;
+import net.shibboleth.profile.context.AuditContext;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.logic.Constraint;
diff --git a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/CASAuditFields.java b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/CASAuditFields.java
index 108c7cff4..cf66d65aa 100644
--- a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/CASAuditFields.java
+++ b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/CASAuditFields.java
@@ -22,7 +22,7 @@ import javax.annotation.Nonnull;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
/**
- * Constants to use for audit logging fields stored in an {@link net.shibboleth.idp.profile.context.AuditContext}.
+ * Constants to use for audit logging fields stored in an {@link net.shibboleth.profile.context.AuditContext}.
*
* @author Marvin S. Addison
* @since 3.2.0
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/profile-intercept-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/profile-intercept-system.xml
index df5e8764c..f98dbd50d 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/profile-intercept-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/profile-intercept-system.xml
@@ -81,7 +81,7 @@
<constructor-arg name="g">
<bean id="shibboleth.ChildLookup.AuditContext"
class="org.opensaml.messaging.context.navigate.ChildContextLookup"
- c:type="#{ T(net.shibboleth.idp.profile.context.AuditContext) }"
+ c:type="#{ T(net.shibboleth.profile.context.AuditContext) }"
c:createContext="true" />
</constructor-arg>
<constructor-arg name="f">
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-abstract-beans.xml
index 25dcb9403..b511f0e2a 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-abstract-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-abstract-beans.xml
@@ -28,7 +28,7 @@
<constructor-arg name="g">
<bean id="shibboleth.ChildLookup.AuditContext"
class="org.opensaml.messaging.context.navigate.ChildContextLookup"
- c:type="#{ T(net.shibboleth.idp.profile.context.AuditContext) }"
+ c:type="#{ T(net.shibboleth.profile.context.AuditContext) }"
c:createContext="true" />
</constructor-arg>
<constructor-arg name="f">
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-back-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-back-flow.xml
index bcf3a2b31..0897287eb 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-back-flow.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-back-flow.xml
@@ -73,7 +73,7 @@
<evaluate expression="conversationScope.LogoutStatus and opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.session.context.LogoutPropagationContext)).getResult() == T(net.shibboleth.idp.session.context.LogoutPropagationContext.Result).Success"
result="conversationScope.LogoutStatus" />
<evaluate expression="opensamlProfileRequestContext.removeSubcontext(T(net.shibboleth.idp.session.context.LogoutPropagationContext))" />
- <evaluate expression="opensamlProfileRequestContext.removeSubcontext(T(net.shibboleth.idp.profile.context.AuditContext))" />
+ <evaluate expression="opensamlProfileRequestContext.removeSubcontext(T(net.shibboleth.profile.context.AuditContext))" />
</on-exit>
</subflow-state>
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/ConsentAuditFields.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/ConsentAuditFields.java
index 586dde405..a54ffaaf9 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/ConsentAuditFields.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/ConsentAuditFields.java
@@ -22,7 +22,7 @@ import javax.annotation.Nonnull;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
/**
- * Constants to use for audit logging fields stored in an {@link net.shibboleth.idp.profile.context.AuditContext} as a
+ * Constants to use for audit logging fields stored in an {@link net.shibboleth.profile.context.AuditContext} as a
* child of an {@link net.shibboleth.idp.consent.context.ConsentContext}.
*/
public final class ConsentAuditFields {
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/IdPAuditFields.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/IdPAuditFields.java
index 4bc415968..c1001fabf 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/IdPAuditFields.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/IdPAuditFields.java
@@ -22,7 +22,7 @@ import javax.annotation.Nonnull;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
/**
- * Constants to use for audit logging fields stored in an {@link net.shibboleth.idp.profile.context.AuditContext}.
+ * Constants to use for audit logging fields stored in an {@link net.shibboleth.profile.context.AuditContext}.
*/
public final class IdPAuditFields {
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/AuditContext.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/AuditContext.java
deleted file mode 100644
index ba10aee4d..000000000
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/AuditContext.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.profile.context;
-
-import java.util.Collection;
-
-import javax.annotation.Nonnull;
-
-import org.opensaml.messaging.context.BaseContext;
-
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-
-import net.shibboleth.shared.annotation.constraint.Live;
-import net.shibboleth.shared.annotation.constraint.NonnullElements;
-import net.shibboleth.shared.annotation.constraint.NotEmpty;
-
-/**
- * {@link BaseContext} containing information to preserve for auditing/logging.
- */
-public final class AuditContext extends BaseContext {
-
- /** Extensible map of arbitrary field to data mappings. */
- @Nonnull @NonnullElements private Multimap<String,String> fieldMap;
-
- /** Constructor. */
- public AuditContext() {
- fieldMap = HashMultimap.create(20, 1);
- }
-
- /**
- * Get a live view of the map of field/data mappings.
- *
- * @return field/data mappings
- */
- @Nonnull @NonnullElements @Live public Multimap<String,String> getFields() {
- return fieldMap;
- }
-
- /**
- * Get a live collection of values associated with a field.
- *
- * @param field field to retrieve
- *
- * @return the field's values
- */
- @Nonnull @NonnullElements @Live public Collection<String> getFieldValues(@Nonnull @NotEmpty final String field) {
- return fieldMap.get(field);
- }
-
-}
\ No newline at end of file
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContext.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContext.java
index 1621b128b..329cc81e1 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContext.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContext.java
@@ -39,7 +39,7 @@ import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
import net.shibboleth.idp.profile.AbstractProfileAction;
-import net.shibboleth.idp.profile.context.AuditContext;
+import net.shibboleth.profile.context.AuditContext;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.annotation.constraint.NotLive;
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLog.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLog.java
index 9276d949e..20cd0b614 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLog.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLog.java
@@ -42,7 +42,7 @@ import org.springframework.webflow.execution.RequestContext;
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.profile.IdPAuditFields;
-import net.shibboleth.idp.profile.context.AuditContext;
+import net.shibboleth.profile.context.AuditContext;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.annotation.constraint.NotLive;
diff --git a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContextTest.java b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContextTest.java
index d97f696b4..c96dc26f6 100644
--- a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContextTest.java
+++ b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContextTest.java
@@ -27,10 +27,10 @@ import java.util.function.Function;
import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.audit.impl.PopulateAuditContext.FormattingMapParser;
-import net.shibboleth.idp.profile.context.AuditContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
+import net.shibboleth.profile.context.AuditContext;
import net.shibboleth.shared.component.ComponentInitializationException;
import org.springframework.webflow.execution.Event;
diff --git a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLogTest.java b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLogTest.java
index aee3aca09..70ee5a319 100644
--- a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLogTest.java
+++ b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLogTest.java
@@ -31,10 +31,10 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import jakarta.servlet.http.HttpServletRequest;
-import net.shibboleth.idp.profile.context.AuditContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
+import net.shibboleth.profile.context.AuditContext;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.primitive.NonnullSupplier;
import net.shibboleth.shared.testing.ConstantSupplier;
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/SAMLAuditFields.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/SAMLAuditFields.java
index 5c3418fde..4f9bf9654 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/SAMLAuditFields.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/SAMLAuditFields.java
@@ -22,7 +22,7 @@ import javax.annotation.Nonnull;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
/**
- * Constants to use for audit logging fields stored in an {@link net.shibboleth.idp.profile.context.AuditContext}.
+ * Constants to use for audit logging fields stored in an {@link net.shibboleth.profile.context.AuditContext}.
*/
public final class SAMLAuditFields {
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/WriteFTICKSLog.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/WriteFTICKSLog.java
index 2c7a83679..201be22e3 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/WriteFTICKSLog.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/WriteFTICKSLog.java
@@ -32,8 +32,8 @@ import org.opensaml.saml.common.SAMLObject;
import net.shibboleth.idp.authn.context.SubjectContext;
import net.shibboleth.idp.authn.context.navigate.SubjectContextPrincipalLookupFunction;
import net.shibboleth.idp.profile.AbstractProfileAction;
-import net.shibboleth.idp.profile.context.AuditContext;
import net.shibboleth.idp.profile.context.navigate.ResponderIdLookupFunction;
+import net.shibboleth.profile.context.AuditContext;
import net.shibboleth.profile.context.navigate.RelyingPartyIdLookupFunction;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
diff --git a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/RestoreProfileRequestContextTree.java b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/RestoreProfileRequestContextTree.java
index 8b63ec0de..e331a3174 100644
--- a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/RestoreProfileRequestContextTree.java
+++ b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/RestoreProfileRequestContextTree.java
@@ -19,8 +19,8 @@ package net.shibboleth.idp.session.impl;
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.profile.ActionSupport;
-import net.shibboleth.idp.profile.context.AuditContext;
import net.shibboleth.idp.session.context.LogoutContext;
+import net.shibboleth.profile.context.AuditContext;
import net.shibboleth.profile.context.RelyingPartyContext;
import net.shibboleth.shared.logic.Constraint;
diff --git a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/SaveProfileRequestContextTree.java b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/SaveProfileRequestContextTree.java
index e05b6275c..69e78bab6 100644
--- a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/SaveProfileRequestContextTree.java
+++ b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/SaveProfileRequestContextTree.java
@@ -19,8 +19,8 @@ package net.shibboleth.idp.session.impl;
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.profile.ActionSupport;
-import net.shibboleth.idp.profile.context.AuditContext;
import net.shibboleth.idp.session.context.LogoutContext;
+import net.shibboleth.profile.context.AuditContext;
import net.shibboleth.profile.context.RelyingPartyContext;
import net.shibboleth.shared.logic.Constraint;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list