[java-identity-provider COMMIT] in /trunk/idp-attribute-filter-impl/src: main/java/net/shibboleth/idp/attribute/filte...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Sep  5 13:14:20 2011
New Revision: 4055

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4055&view=rev
Log:
https://issues.shibboleth.net/jira/browse/IDP-40 Create attribute policy requirement implementation based on IdPv2 Authentication Method string match functor
https://issues.shibboleth.net/jira/browse/IDP-39 Create attribute policy requirement implementation based on IdPv2 Authentication Method regex match functor

and tests

Added:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AuthenticationMethodRegexCriterion.java   (with props)
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AuthenticationMethodStringCriterion.java   (with props)
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/policy/TestAuthenticationMethodRegex.java   (with props)
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/policy/TestAuthenticationMethodString.java   (with props)
Modified:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/ContextNavigationSupport.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/PrincipalNameRegexCriterion.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/PrincipalNameStringCriterion.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/policy/TestPrincipalNameRegex.java

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/ContextNavigationSupport.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/ContextNavigationSupport.java?rev=4055&r1=4054&r2=4055&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/ContextNavigationSupport.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/ContextNavigationSupport.java Mon Sep  5 13:14:20 2011
@@ -64,8 +64,7 @@
      * @return the relying party, never null or empty.
      * @throws EvaluationException if we get an error in traversal.
      */
-    public static String getIncomingIssuer(final AttributeFilterContext filterContext) 
-            throws EvaluationException {
+    public static String getIncomingIssuer(final AttributeFilterContext filterContext) throws EvaluationException {
         return getIssuer(filterContext, true);
     }
 
@@ -76,8 +75,7 @@
      * @return the relying party, never null or empty.
      * @throws EvaluationException if we get an error in traversal.
      */
-    public static String getOutgoingIssuer(final AttributeFilterContext filterContext) 
-            throws EvaluationException {
+    public static String getOutgoingIssuer(final AttributeFilterContext filterContext) throws EvaluationException {
         return getIssuer(filterContext, false);
     }
 
@@ -89,7 +87,7 @@
      * @return the relying party, never null or empty.
      * @throws EvaluationException if we get an error in traversal.
      */
-    public static String getIssuer(final AttributeFilterContext filterContext, final boolean useIncoming)
+    private static String getIssuer(final AttributeFilterContext filterContext, final boolean useIncoming)
             throws EvaluationException {
         final SubcontextContainer parent = filterContext.getOwner();
         if (!(parent instanceof InOutOperationContext)) {
@@ -129,8 +127,7 @@
         }
         final String retVal = StringSupport.trimOrNull(messageMetadata.getMessageIssuer());
         if (null == retVal) {
-            LoggerFactory.getLogger(ContextNavigationSupport.class).error(
-                    "Attribute Filter:  entityId was empty.");
+            LoggerFactory.getLogger(ContextNavigationSupport.class).error("Attribute Filter:  entityId was empty.");
             throw new EvaluationException("Attribute Filter: entityId was empty.");
         }
         return retVal;
@@ -167,7 +164,7 @@
             LoggerFactory.getLogger(ContextNavigationSupport.class).error(errMsg);
             throw new EvaluationException(errMsg);
         }
-        
+
         final AuthenticationEvent event = serviceSession.getAuthenticationEvent();
         if (null == event) {
             String errMsg = "Attribute Filter : No valid authentication even for " + relyingParty + ".";

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/PrincipalNameRegexCriterion.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/PrincipalNameRegexCriterion.java?rev=4055&r1=4054&r2=4055&view=diff

[... 61 lines stripped ...]