Changeset 1139


Ignore:
Timestamp:
2009-03-11 12:29:07 (4 years ago)
Author:
bruno
Message:

Further renaming of "Authentication Mechanism" to "Authentication Method".

Location:
trunk
Files:
11 edited
7 moved

Legend:

Unmodified
Added
Removed

  • trunk/modules/kauri-security/kauri-security-api/src/main/java/org/kauriproject/security/AuthenticationMethod.java

    r1137 r1139  
    2424 * This interface covers the protocol-specific part of authentication: 
    2525 * extracting the authentication details (e.g. username and password) from 
    26  * the request. 
     26 * the request and sending a challenge. 
    2727 * 
    2828 * <p>It does not concern itself with validating that the the authentication 
    … …  
    3636 * various *ProcessingFitlers and ProcessingFilterEntryPoints. 
    3737 */ 
    38 public interface AuthenticationMechanism { 
     38public interface AuthenticationMethod { 
    3939     
    4040    /** 
    … …  
    5454     * Creates a challenge (e.g. by setting a ChallengeResponse or redirecting or rendering a login form). 
    5555     * 
    56      * <p>If the authentication mechanism is incapable of sending a challenge, an 
     56     * <p>If the authentication method is incapable of sending a challenge, an 
    5757     * UnsupportedOperationException may be thrown 
    5858     * 

  • trunk/modules/kauri-security/kauri-security-auth-methods/src/main/java/org/kauriproject/security/providers/AbstractAuthenticationMethod.java

    r1138 r1139  
    1616package org.kauriproject.security.providers; 
    1717 
    18 import org.kauriproject.security.AuthenticationMechanism; 
     18import org.kauriproject.security.AuthenticationMethod; 
    1919import org.kauriproject.security.Realm; 
    2020import org.restlet.data.Request; 
    … …  
    2222import org.springframework.security.Authentication; 
    2323 
    24 public abstract class AbstractAuthenticationMechanism implements AuthenticationMechanism { 
     24public abstract class AbstractAuthenticationMethod implements AuthenticationMethod { 
    2525 
    2626    abstract public Authentication getAuthentication(Request request, Response response, Realm realm); 

  • trunk/modules/kauri-security/kauri-security-auth-methods/src/main/java/org/kauriproject/security/providers/BasicAuthenticationMethod.java

    r1138 r1139  
    2727import org.springframework.security.providers.UsernamePasswordAuthenticationToken; 
    2828 
    29 public class BasicAuthenticationMechanism extends AbstractAuthenticationMechanism { 
     29public class BasicAuthenticationMethod extends AbstractAuthenticationMethod { 
    3030 
    3131    public Authentication getAuthentication(Request request, Response response, Realm realm) throws AuthenticationException { 

  • trunk/modules/kauri-security/kauri-security-auth-methods/src/main/java/org/kauriproject/security/providers/BelgianEidAuthenticationMethod.java

    r1138 r1139  
    11package org.kauriproject.security.providers; 
    22 
    3 import org.kauriproject.security.AuthenticationMechanism; 
     3import org.kauriproject.security.AuthenticationMethod; 
    44import org.kauriproject.security.Realm; 
    55import org.kauriproject.util.restlet.ResponseUtil; 
    … …  
    1818import java.util.ArrayList; 
    1919import java.util.Map; 
    20 import java.util.HashMap; 
    2120import java.io.ByteArrayOutputStream; 
    2221import java.io.ByteArrayInputStream; 
    … …  
    2423 
    2524/** 
    26  * Belgian eID authentication mechanism. 
     25 * Belgian eID authentication method. 
    2726 * 
    2827 * <p>See http://eid.belgium.be/ 
    … …  
    3433 * name is subject to specific laws. 
    3534 */ 
    36 public class BelgianEidAuthenticationMechanism implements AuthenticationMechanism, InitializingBean { 
     35public class BelgianEidAuthenticationMethod implements AuthenticationMethod, InitializingBean { 
    3736    private BelgianEidPrincipalExtractor principalExtractor; 
    3837    private String challengePage; 

  • trunk/modules/kauri-security/kauri-security-auth-methods/src/main/java/org/kauriproject/security/providers/DigestAuthenticationMethod.java

    r1138 r1139  
    5454 *  http://www.acegisecurity.org/acegi-security/xref/org/acegisecurity/ui/digestauth/DigestProcessingFilter.html 
    5555 */ 
    56 public class DigestAuthenticationMechanism extends AbstractAuthenticationMechanism { 
    57      
    58     private static final Log logger = LogFactory.getLog(DigestAuthenticationMechanism.class); 
     56public class DigestAuthenticationMethod extends AbstractAuthenticationMethod { 
     57     
     58    private static final Log logger = LogFactory.getLog(DigestAuthenticationMethod.class); 
    5959     
    6060    private Random random = new Random(); 

  • trunk/modules/kauri-security/kauri-security-auth-methods/src/main/java/org/kauriproject/security/providers/FormAuthenticationMethod.java

    r1138 r1139  
    2323import org.kauriproject.runtime.rapi.KauriModule; 
    2424 
    25 public class FormAuthenticationMechanism extends AbstractAuthenticationMechanism implements InitializingBean { 
     25public class FormAuthenticationMethod extends AbstractAuthenticationMethod implements InitializingBean { 
    2626     
    2727    private KauriModule kauriModule; 
    … …  
    2929    private PreAuthenticatedAuthenticationTokenStore preAuthTokenStore = null; 
    3030 
    31     public FormAuthenticationMechanism(KauriModule kauriModule) { 
     31    public FormAuthenticationMethod(KauriModule kauriModule) { 
    3232        this.kauriModule = kauriModule; 
    3333    } 

  • trunk/modules/kauri-security/kauri-security-auth-methods/src/main/java/org/kauriproject/security/providers/LoginRestlet.java

    r1128 r1139  
    3030 
    3131/** 
    32  * The LoginRestlet implements the login-form for the {@link FormAuthenticationMechanism}. 
     32 * The LoginRestlet implements the login-form for the {@link FormAuthenticationMethod}. 
    3333 */ 
    3434public class LoginRestlet extends LoginLogoutBaseRestlet { 

  • trunk/modules/kauri-security/kauri-security-auth-methods/src/main/java/org/kauriproject/security/providers/LogoutRestlet.java

    r1128 r1139  
    2424 
    2525/** 
    26  * The LogoutRestlet implements the logout-form for the {@link FormAuthenticationMechanism}. 
     26 * The LogoutRestlet implements the logout-form for the {@link FormAuthenticationMethod}. 
    2727 */ 
    2828public class LogoutRestlet extends LoginLogoutBaseRestlet { 

  • trunk/modules/kauri-security/kauri-security-impl/src/main/java/org/kauriproject/security/infrastructure/AuthenticationMethodEntry.java

    r1137 r1139  
    11package org.kauriproject.security.infrastructure; 
    22 
    3 import org.kauriproject.security.AuthenticationMechanism; 
     3import org.kauriproject.security.AuthenticationMethod; 
    44 
    5 public class AuthenticationMechanismEntry { 
    6     private AuthenticationMechanism mechanism; 
     5public class AuthenticationMethodEntry { 
     6    private AuthenticationMethod method; 
    77    private int strength; 
    88 
    9     public AuthenticationMechanismEntry(AuthenticationMechanism mechanism, int strength) { 
    10         this.mechanism = mechanism; 
     9    public AuthenticationMethodEntry(AuthenticationMethod method, int strength) { 
     10        this.method = method; 
    1111        this.strength = strength; 
    1212    } 
    1313 
    14     public AuthenticationMechanism get() { 
    15         return mechanism; 
     14    public AuthenticationMethod get() { 
     15        return method; 
    1616    } 
    1717 

  • trunk/modules/kauri-security/kauri-security-impl/src/main/java/org/kauriproject/security/infrastructure/RealmImpl.java

    r1104 r1139  
    1818import java.util.List; 
    1919 
    20 import org.kauriproject.security.AuthenticationMechanism; 
     20import org.kauriproject.security.AuthenticationMethod; 
    2121import org.kauriproject.security.Realm; 
    2222import org.springframework.security.AccessDecisionManager; 
    … …  
    2626public class RealmImpl implements Realm { 
    2727    private String name; 
    28     private List<AuthenticationMechanismEntry> authenticationMechanisms; 
     28    private List<AuthenticationMethodEntry> authenticationMethods; 
    2929    private AuthenticationManager authenticationManager; 
    3030    private AccessDecisionManager accessDecisionManager; 
    … …  
    3232 
    3333    public RealmImpl(String name, ObjectDefinitionSource objectDefinitionSource, 
    34             List<AuthenticationMechanismEntry> authenticationMechanisms, AuthenticationManager authenticationManager, 
     34            List<AuthenticationMethodEntry> authenticationMethods, AuthenticationManager authenticationManager, 
    3535            AccessDecisionManager accessDecisionManager) { 
    3636        this.name = name; 
    3737        this.objectDefinitionSource = objectDefinitionSource; 
    38         this.authenticationMechanisms = authenticationMechanisms; 
     38        this.authenticationMethods = authenticationMethods; 
    3939        this.authenticationManager = authenticationManager; 
    4040        this.accessDecisionManager = accessDecisionManager; 
    … …  
    4545    } 
    4646 
    47     public List<AuthenticationMechanismEntry> getAuthenticationMechanisms() { 
    48         return authenticationMechanisms; 
     47    public List<AuthenticationMethodEntry> getAuthenticationMethods() { 
     48        return authenticationMethods; 
    4949    } 
    5050 
    … …  
    6262 
    6363    /** 
    64      * Returns the weakest AuthenticationMechanism for which the the strength is 
     64     * Returns the weakest AuthenticationMethod for which the the strength is 
    6565     * >= the requested strength, or null if there is no such entry. 
    6666     */ 
    67     public AuthenticationMechanism getAuthenticationMechanismForStrength(int strength) { 
    68         AuthenticationMechanismEntry strongEnoughEntry = null; 
     67    public AuthenticationMethod getAuthenticationMethodForStrength(int strength) { 
     68        AuthenticationMethodEntry strongEnoughEntry = null; 
    6969 
    70         for (AuthenticationMechanismEntry entry : authenticationMechanisms) { 
     70        for (AuthenticationMethodEntry entry : authenticationMethods) { 
    7171            if (entry.getStrength() >= strength) { 
    7272                if (strongEnoughEntry == null) 
    … …  
    8080    } 
    8181     
    82     public AuthenticationMechanism getDefaultAuthenticationMechanism() { 
    83         return authenticationMechanisms.get(authenticationMechanisms.size() - 1).get(); 
     82    public AuthenticationMethod getDefaultAuthenticationMethod() { 
     83        return authenticationMethods.get(authenticationMethods.size() - 1).get(); 
    8484    } 
    8585 

  • trunk/modules/kauri-security/kauri-security-impl/src/main/java/org/kauriproject/security/infrastructure/RealmsBuilder.java

    r1109 r1139  
    2020import org.kauriproject.conf.Conf; 
    2121import org.kauriproject.conf.ConfException; 
    22 import org.kauriproject.security.AuthenticationMechanism; 
     22import org.kauriproject.security.AuthenticationMethod; 
    2323import org.kauriproject.runtime.rapi.KauriModule; 
    2424import org.springframework.security.*; 
    … …  
    6060            } 
    6161 
    62             List<Conf> authMechConfs = realmConf.getRequiredChild("authenticationMechanisms").getChildren("authenticationMechanism"); 
    63             List<AuthenticationMechanismEntry> authMechs = new ArrayList<AuthenticationMechanismEntry>(); 
     62            List<Conf> authMechConfs = realmConf.getRequiredChild("authenticationMethods").getChildren("authenticationMethod"); 
     63            List<AuthenticationMethodEntry> authMethods = new ArrayList<AuthenticationMethodEntry>(); 
    6464            for (Conf authMechConf : authMechConfs) { 
    6565                int strength = authMechConf.getAttributeAsInteger("strength", 0); 
    66                 AuthenticationMechanism mechanism = getBean(authMechConf, AuthenticationMechanism.class, module); 
    67                 authMechs.add(new AuthenticationMechanismEntry(mechanism, strength)); 
     66                AuthenticationMethod method = getBean(authMechConf, AuthenticationMethod.class, module); 
     67                authMethods.add(new AuthenticationMethodEntry(method, strength)); 
    6868            } 
    6969 
    … …  
    7474                    AccessDecisionManager.class, module); 
    7575 
    76             RealmImpl realm = new RealmImpl(name, objectDefinitionSource, authMechs, authenticationManager, accessDecisionManager); 
     76            RealmImpl realm = new RealmImpl(name, objectDefinitionSource, authMethods, authenticationManager, accessDecisionManager); 
    7777 
    7878            realms.add(realm); 

  • trunk/modules/kauri-security/kauri-security-impl/src/main/java/org/kauriproject/security/infrastructure/SecurityFilter.java

    r1126 r1139  
    2424 
    2525import org.kauriproject.runtime.rapi.KauriModule; 
    26 import org.kauriproject.security.AuthenticationMechanism; 
     26import org.kauriproject.security.AuthenticationMethod; 
    2727import org.kauriproject.security.RestserviceInvocation; 
    2828import org.kauriproject.security.MalformedAuthenticationRequestException; 
    … …  
    8585        Authentication existingAuthToken = SecurityContextHolder.getContext().getAuthentication(); 
    8686        Authentication authToken = null; 
    87         AuthenticationMechanismEntry selectedAuthMechanism = null; 
     87        AuthenticationMethodEntry selectedAuthMethod = null; 
    8888 
    8989        if (existingAuthToken == null) { 
    9090            // 
    91             // Look for authentication information on the request by querying all authentication mechanisms 
     91            // Look for authentication information on the request by querying all authentication methods 
    9292            // 
    9393 
    94             for (AuthenticationMechanismEntry authenticationMechanism : filterContext.realm.getAuthenticationMechanisms()) { 
     94            for (AuthenticationMethodEntry authenticationMethod : filterContext.realm.getAuthenticationMethods()) { 
    9595                try { 
    96                     authToken = authenticationMechanism.get().getAuthentication(request, response, filterContext.realm); 
     96                    authToken = authenticationMethod.get().getAuthentication(request, response, filterContext.realm); 
    9797                } catch (AuthenticationException ae) { 
    98                     return handleException(request, response, authToken, authenticationMechanism.get(), ae, filterContext); 
     98                    return handleException(request, response, authToken, authenticationMethod.get(), ae, filterContext); 
    9999                } 
    100100 
    101101                if (authToken != null) { 
    102                     selectedAuthMechanism = authenticationMechanism; 
     102                    selectedAuthMethod = authenticationMethod; 
    103103                    break; 
    104104                } 
    … …  
    110110            } 
    111111 
    112             // If strength is not great enough, send a challenge for an appropriate auth mechanism 
    113             if (selectedAuthMechanism.getStrength() < filterContext.requiredStrength) { 
     112            // If strength is not great enough, send a challenge for an appropriate auth method 
     113            if (selectedAuthMethod.getStrength() < filterContext.requiredStrength) { 
    114114                return sendChallenge(request, response, filterContext, "stronger-authentication-required"); 
    115115            } 
    … …  
    124124                } 
    125125            } catch (AuthenticationException ae) { 
    126                 return handleException(request, response, authToken, selectedAuthMechanism.get(), ae, filterContext); 
     126                return handleException(request, response, authToken, selectedAuthMethod.get(), ae, filterContext); 
    127127            } 
    128128        } else { 
    … …  
    146146                filterContext.realm.getAccessDecisionManager().decide(authToken, filterContext.invocation, filterContext.configAttrDef); 
    147147            } catch (AccessDeniedException ade) { 
    148                 return handleException(request, response, authToken, selectedAuthMechanism.get(), ade, filterContext); 
     148                return handleException(request, response, authToken, selectedAuthMethod.get(), ade, filterContext); 
    149149            } catch (AuthenticationException ae) { 
    150                 return handleException(request, response, authToken, selectedAuthMechanism.get(), ae, filterContext); 
     150                return handleException(request, response, authToken, selectedAuthMethod.get(), ae, filterContext); 
    151151            } 
    152152 
    … …  
    215215 
    216216    private int sendChallenge(Request request, Response response, SecurityFilterContext filterContext, String reason) { 
    217         AuthenticationMechanism mechanism = filterContext.realm.getAuthenticationMechanismForStrength( 
     217        AuthenticationMethod method = filterContext.realm.getAuthenticationMethodForStrength( 
    218218                filterContext.requiredStrength); 
    219219 
    220         if (mechanism == null) { 
    221             String message = String.format("No authentication mechanism available with sufficient strength (%s) in realm %s.", 
     220        if (method == null) { 
     221            String message = String.format("No authentication method available with sufficient strength (%s) in realm %s.", 
    222222                            filterContext.requiredStrength, filterContext.realm.getName()); 
    223223            throw new RuntimeException(message); 
    224224        } 
    225225 
    226         mechanism.challenge(request, response, filterContext.realm, reason); 
     226        method.challenge(request, response, filterContext.realm, reason); 
    227227 
    228228        return Filter.STOP; 
    … …  
    230230     
    231231    private int handleException(Request request, Response response, Authentication authToken, 
    232             AuthenticationMechanism authMechanism, Exception exception, SecurityFilterContext filterContext) { 
     232            AuthenticationMethod authMethod, Exception exception, SecurityFilterContext filterContext) { 
    233233        if (exception instanceof MalformedAuthenticationRequestException) { 
    234234            response.setStatus(Status.CLIENT_ERROR_BAD_REQUEST, exception, exception.getMessage()); 
    235235        } else if (exception instanceof AuthenticationException) { 
    236             if (authMechanism.isRechallengeEnabled()) { 
    237                 authMechanism.challenge(request, response, filterContext.realm, null); // 401 
     236            if (authMethod.isRechallengeEnabled()) { 
     237                authMethod.challenge(request, response, filterContext.realm, null); // 401 
    238238            } else { 
    239239                response.setStatus(Status.CLIENT_ERROR_FORBIDDEN, exception); 
    … …  
    241241        } else if (exception instanceof AccessDeniedException) { 
    242242            if (authToken != null && authenticationTrustResolver.isAnonymous(authToken)) { 
    243                 authMechanism.challenge(request, response, filterContext.realm, null); 
     243                authMethod.challenge(request, response, filterContext.realm, null); 
    244244            } else { 
    245245                response.setStatus(Status.CLIENT_ERROR_FORBIDDEN, exception); 

  • trunk/modules/kauri-security/kauri-security-impl/src/test/confs/securitytest/security/auth.xml

    r1104 r1139  
    44 
    55    <realm name="basic"> 
    6       <authenticationMechanisms> 
    7         <authenticationMechanism moduleId="securitytest" beanId="basicAuthMechanism"/> 
    8       </authenticationMechanisms> 
     6      <authenticationMethods> 
     7        <authenticationMethod moduleId="securitytest" beanId="basicAuthMethod"/> 
     8      </authenticationMethods> 
    99      <authenticationManager moduleId="securitytest" beanId="authenticationManager"/> 
    1010      <accessDecisionManager moduleId="securitytest" beanId="accessDecisionManager"/> 
    … …  
    1616 
    1717    <realm name="digest"> 
    18       <authenticationMechanisms> 
    19         <authenticationMechanism moduleId="securitytest" beanId="digestAuthMechanism"/> 
    20       </authenticationMechanisms> 
     18      <authenticationMethods> 
     19        <authenticationMethod moduleId="securitytest" beanId="digestAuthMethod"/> 
     20      </authenticationMethods> 
    2121      <authenticationManager moduleId="securitytest" beanId="authenticationManager"/> 
    2222      <accessDecisionManager moduleId="securitytest" beanId="accessDecisionManager"/> 
    … …  
    2828 
    2929    <realm name="cookie-based"> 
    30       <authenticationMechanisms> 
    31         <authenticationMechanism moduleId="securitytest" beanId="formAuthMechanism"/> 
    32       </authenticationMechanisms> 
     30      <authenticationMethods> 
     31        <authenticationMethod moduleId="securitytest" beanId="formAuthMethod"/> 
     32      </authenticationMethods> 
    3333      <authenticationManager moduleId="securitytest" beanId="authenticationManager"/> 
    3434      <accessDecisionManager moduleId="securitytest" beanId="accessDecisionManager"/> 
    … …  
    4040 
    4141    <realm name="customdefsource"> 
    42       <authenticationMechanisms> 
    43         <authenticationMechanism moduleId="securitytest" beanId="basicAuthMechanism"/> 
    44       </authenticationMechanisms> 
     42      <authenticationMethods> 
     43        <authenticationMethod moduleId="securitytest" beanId="basicAuthMethod"/> 
     44      </authenticationMethods> 
    4545      <authenticationManager moduleId="securitytest" beanId="authenticationManager"/> 
    4646      <accessDecisionManager moduleId="securitytest" beanId="customDecisionManager"/> 
    … …  
    4949 
    5050    <realm name="patterns"> 
    51       <authenticationMechanisms> 
    52         <authenticationMechanism moduleId="securitytest" beanId="basicAuthMechanism"/> 
    53       </authenticationMechanisms> 
     51      <authenticationMethods> 
     52        <authenticationMethod moduleId="securitytest" beanId="basicAuthMethod"/> 
     53      </authenticationMethods> 
    5454      <authenticationManager moduleId="securitytest" beanId="authenticationManager"/> 
    5555      <accessDecisionManager moduleId="securitytest" beanId="accessDecisionManager"/> 
    … …  
    6262 
    6363    <realm name="strengths"> 
    64       <authenticationMechanisms> 
    65         <authenticationMechanism moduleId="securitytest" beanId="basicAuthMechanism" strength="1"/> 
    66         <authenticationMechanism moduleId="securitytest" beanId="digestAuthMechanism" strength="2"/> 
    67       </authenticationMechanisms> 
     64      <authenticationMethods> 
     65        <authenticationMethod moduleId="securitytest" beanId="basicAuthMethod" strength="1"/> 
     66        <authenticationMethod moduleId="securitytest" beanId="digestAuthMethod" strength="2"/> 
     67      </authenticationMethods> 
    6868      <authenticationManager moduleId="securitytest" beanId="authenticationManager"/> 
    6969      <accessDecisionManager moduleId="securitytest" beanId="accessDecisionManager"/> 

  • trunk/modules/kauri-security/kauri-security-impl/src/test/java/org/kauriproject/security/test/SecurityTest.java

    r1104 r1139  
    163163        doTestBasic(externalPrefix, "/strengths/strength2", externalSuffix, USER, USERPW, 401); 
    164164        doTestDigest(externalPrefix, "/strengths/strength2", externalSuffix, USER, USERPW, 200); 
    165         // there's no mechanism with strength 3 
     165        // there's no method with strength 3 
    166166        doTestBasic(externalPrefix, "/strengths/strength3", externalSuffix, USER, USERPW, 500); 
    167167    } 

  • trunk/modules/kauri-security/kauri-security-impl/src/test/modulesrc/org/kauriproject/security/test/testmodules/security/KAURI-INF/spring/services.xml

    r1128 r1139  
    8181  </bean> 
    8282   
    83   <bean id="basicAuthMechanism" class="org.kauriproject.security.providers.BasicAuthenticationMechanism"/> 
     83  <bean id="basicAuthMethod" class="org.kauriproject.security.providers.BasicAuthenticationMethod"/> 
    8484 
    85   <bean id="digestAuthMechanism" class="org.kauriproject.security.providers.DigestAuthenticationMechanism"> 
     85  <bean id="digestAuthMethod" class="org.kauriproject.security.providers.DigestAuthenticationMethod"> 
    8686    <property name="userDetailsService" ref="userDetailsService"/> 
    8787  </bean> 
    … …  
    9090  </bean> 
    9191   
    92   <bean id="formAuthMechanism" class="org.kauriproject.security.providers.FormAuthenticationMechanism"> 
     92  <bean id="formAuthMethod" class="org.kauriproject.security.providers.FormAuthenticationMethod"> 
    9393    <constructor-arg ref="module"/> 
    9494    <property name="preAuthTokenStore" ref="preAuthTokenStore"/> 

  • trunk/samples/kauri-security-sample/conf/security/auth.xml

    r1118 r1139  
    55    <!-- Simple basic authentication sample --> 
    66    <realm name="realm1"> 
    7       <authenticationMechanisms> 
    8         <authenticationMechanism moduleId="samples.security" beanId="basicAuthMechanism"/> 
    9       </authenticationMechanisms> 
     7      <authenticationMethods> 
     8        <authenticationMethod moduleId="samples.security" beanId="basicAuthMethod"/> 
     9      </authenticationMethods> 
    1010      <authenticationManager moduleId="samples.security" beanId="authenticationManager"/> 
    1111      <accessDecisionManager moduleId="samples.security" beanId="accessDecisionManager"/> 
    … …  
    1818    <!-- Simple digest authentication sample --> 
    1919    <realm name="realm2"> 
    20       <authenticationMechanisms> 
    21         <authenticationMechanism moduleId="samples.security" beanId="digestAuthMechanism"/> 
    22       </authenticationMechanisms> 
     20      <authenticationMethods> 
     21        <authenticationMethod moduleId="samples.security" beanId="digestAuthMethod"/> 
     22      </authenticationMethods> 
    2323      <authenticationManager moduleId="samples.security" beanId="authenticationManager"/> 
    2424      <accessDecisionManager moduleId="samples.security" beanId="accessDecisionManager"/> 
    … …  
    3131    <!-- Form authentication sample --> 
    3232    <realm name="realm3"> 
    33       <authenticationMechanisms> 
    34         <authenticationMechanism moduleId="samples.security" beanId="formAuthMechanism"/> 
    35       </authenticationMechanisms> 
     33      <authenticationMethods> 
     34        <authenticationMethod moduleId="samples.security" beanId="formAuthMethod"/> 
     35      </authenticationMethods> 
    3636      <authenticationManager moduleId="samples.security" beanId="authenticationManager"/> 
    3737      <accessDecisionManager moduleId="samples.security" beanId="accessDecisionManager"/> 
    … …  
    4646    </realm> 
    4747 
    48     <!-- Auth mechanism strength sample --> 
     48    <!-- Auth method strength sample --> 
    4949    <realm name="realm4"> 
    50       <authenticationMechanisms> 
    51         <authenticationMechanism moduleId="samples.security" beanId="basicAuthMechanism" strength="1"/> 
    52         <authenticationMechanism moduleId="samples.security" beanId="digestAuthMechanism" strength="2"/> 
    53       </authenticationMechanisms> 
     50      <authenticationMethods> 
     51        <authenticationMethod moduleId="samples.security" beanId="basicAuthMethod" strength="1"/> 
     52        <authenticationMethod moduleId="samples.security" beanId="digestAuthMethod" strength="2"/> 
     53      </authenticationMethods> 
    5454      <authenticationManager moduleId="samples.security" beanId="authenticationManager"/> 
    5555      <accessDecisionManager moduleId="samples.security" beanId="accessDecisionManager"/> 
    … …  
    6262    <!-- Second form authentication sample --> 
    6363    <realm name="realm5"> 
    64       <authenticationMechanisms> 
    65         <authenticationMechanism moduleId="samples.security" beanId="formAuthMechanism2"/> 
    66       </authenticationMechanisms> 
     64      <authenticationMethods> 
     65        <authenticationMethod moduleId="samples.security" beanId="formAuthMethod2"/> 
     66      </authenticationMethods> 
    6767      <authenticationManager moduleId="samples.security" beanId="authenticationManager"/> 
    6868      <accessDecisionManager moduleId="samples.security" beanId="accessDecisionManager"/> 
    … …  
    7575    <!-- Belgian eID sample --> 
    7676    <realm name="realm6"> 
    77       <authenticationMechanisms> 
    78         <authenticationMechanism moduleId="samples.security" beanId="beidAuthMechanism"/> 
    79       </authenticationMechanisms> 
     77      <authenticationMethods> 
     78        <authenticationMethod moduleId="samples.security" beanId="beidAuthMethod"/> 
     79      </authenticationMethods> 
    8080      <authenticationManager moduleId="samples.security" beanId="authenticationManager"/> 
    8181      <accessDecisionManager moduleId="samples.security" beanId="accessDecisionManager"/> 

  • trunk/samples/kauri-security-sample/src/main/kauri/pages/index.html.xml

    r1119 r1139  
    5959    <h3>Realm 4 : authentication strengths</h3> 
    6060 
    61     <p>A realm can be associated with multiple authentication mechanisms. Each authentication 
    62     mechanism can be assigned a strength, and resource can require a certain strength to 
     61    <p>A realm can be associated with multiple authentication methods. Each authentication 
     62    method can be assigned a strength, and resource can require a certain strength to 
    6363    access them. For example, more sensitive resources could require login using client 
    6464    certificates (such as Belgian eID).</p> 

  • trunk/samples/kauri-security-sample/src/main/kauri/spring/services.xml

    r1128 r1139  
    114114  </bean> 
    115115 
    116   <bean id="basicAuthMechanism" class="org.kauriproject.security.providers.BasicAuthenticationMechanism"/> 
     116  <bean id="basicAuthMethod" class="org.kauriproject.security.providers.BasicAuthenticationMethod"/> 
    117117 
    118   <bean id="digestAuthMechanism" class="org.kauriproject.security.providers.DigestAuthenticationMechanism"> 
     118  <bean id="digestAuthMethod" class="org.kauriproject.security.providers.DigestAuthenticationMethod"> 
    119119    <property name="userDetailsService" ref="userDetailsService"/> 
    120120  </bean> 
    … …  
    126126  </bean> 
    127127 
    128   <bean id="formAuthMechanism" class="org.kauriproject.security.providers.FormAuthenticationMechanism"> 
     128  <bean id="formAuthMethod" class="org.kauriproject.security.providers.FormAuthenticationMethod"> 
    129129    <constructor-arg ref="module"/> 
    130130    <property name="preAuthTokenStore" ref="preAuthTokenStore"/> 
    … …  
    132132  </bean> 
    133133 
    134   <bean id="formAuthMechanism2" class="org.kauriproject.security.providers.FormAuthenticationMechanism"> 
     134  <bean id="formAuthMethod" class="org.kauriproject.security.providers.FormAuthenticationMethod"> 
    135135    <constructor-arg ref="module"/> 
    136136    <property name="preAuthTokenStore" ref="preAuthTokenStore2"/> 
    … …  
    138138  </bean> 
    139139 
    140   <bean id="beidAuthMechanism" class="org.kauriproject.security.providers.BelgianEidAuthenticationMechanism"> 
     140  <bean id="beidAuthMethod" class="org.kauriproject.security.providers.BelgianEidAuthenticationMethod"> 
    141141    <property name="principalExtractor" ref="beidPrincipalExtractor"/> 
    142142    <property name="httpsPort" value="8443"/> <!-- See also the port number in connectors.xml --> 
Note: See TracChangeset for help on using the changeset viewer.