[java-identity-provider COMMIT] in /trunk: idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractRemoteUs...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Oct 11 15:21:57 2013
New Revision: 4843

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4843&view=rev
Log:
Refactor use of HttpServlet* in profile actions out of context into injected objects.

Modified:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractRemoteUser.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddress.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUserAgentIdentifier.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromBasicAuth.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromFormRequest.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractRemoteUserTest.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddressTest.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentIdntifierTest.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromBasicAuthTest.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromFormRequestTest.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateRemoteUserTest.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUserAgentAddressTest.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAASTest.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/ProfileRequestContextTest.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/InitializeProfileRequestContext.java

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractRemoteUser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractRemoteUser.java?rev=4843&r1=4842&r2=4843&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractRemoteUser.java (original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractRemoteUser.java Fri Oct 11 15:21:57 2013
@@ -48,7 +48,7 @@
  * @event {@link org.opensaml.profile.action.EventIds#PROCEED_EVENT_ID}
  * @event {@link AuthnEventIds#NO_CREDENTIALS}
  * @pre <pre>ProfileRequestContext.getSubcontext(AuthenticationContext.class, false) != null</pre>
- * @post If ProfileRequestContext.getHttpRequest() != null, the content of either the getRemoteUser()
+ * @post If getHttpServletRequest() != null, the content of either the getRemoteUser()
  * method or a designated header or attribute will be attached via a {@link UsernameContext}.
  */
 public class ExtractRemoteUser extends AbstractExtractionAction {
@@ -120,9 +120,9 @@
     protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext,
             @Nonnull final AuthenticationContext authenticationContext) throws AuthenticationException {
 
-        final HttpServletRequest request = profileRequestContext.getHttpRequest();
+        final HttpServletRequest request = getHttpServletRequest();
         if (request == null) {
-            log.debug("{} profile request context does not contain an HttpServletRequest", getLogPrefix());
+            log.debug("{} profile action does not contain an HttpServletRequest", getLogPrefix());
             ActionSupport.buildEvent(profileRequestContext, AuthnEventIds.NO_CREDENTIALS);
             return;
         }

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddress.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddress.java?rev=4843&r1=4842&r2=4843&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddress.java (original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddress.java Fri Oct 11 15:21:57 2013
@@ -40,7 +40,7 @@
  * @event {@link org.opensaml.profile.action.EventIds#PROCEED_EVENT_ID}
  * @event {@link AuthnEventIds#NO_CREDENTIALS}
  * @pre <pre>ProfileRequestContext.getSubcontext(AuthenticationContext.class, false) != null</pre>
- * @post If ProfileRequestContext.getHttpRequest() != null, the content of getRemoteAddr() will be
+ * @post If getHttpServletRequest() != null, the content of getRemoteAddr() will be
  * attached via a {@link UserAgentContext}, provided it is a valid IP address.
  */
 public class ExtractUserAgentAddress extends AbstractExtractionAction {
@@ -52,9 +52,9 @@
     protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext,

[... 742 lines stripped ...]