From 262e53ddcccf9080942bf783f8a715bfd4f0480f Mon Sep 17 00:00:00 2001
From: prabathabey <prabathabey@git.com>
Date: Sat, 19 Dec 2015 13:09:31 +0530
Subject: [PATCH] Further optimizing webapp authenticator valve implementation

---
 .../pom.xml                                   |  3 ++-
 .../OAuthTokenValidationStubFactory.java      | 13 ++++++-----
 .../authenticator/BasicAuthAuthenticator.java |  5 ++++
 .../CertificateAuthenticator.java             |  5 ++++
 .../authenticator/JWTAuthenticator.java       |  5 ++++
 .../authenticator/OAuthAuthenticator.java     | 23 ++++++++++++++++---
 .../authenticator/WebappAuthenticator.java    |  2 ++
 .../framework/config/AuthenticatorConfig.java | 11 +++++----
 ...uthenticatorFrameworkServiceComponent.java |  5 ++--
 .../conf/webapp-authenticator-config.xml      |  8 +++++++
 10 files changed, 63 insertions(+), 17 deletions(-)

diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
index 7684fb68e9..3414eea46f 100644
--- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
+++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
@@ -112,7 +112,8 @@
                             org.apache.commons.pool.impl,
                             org.apache.http.client,
                             org.apache.http.conn,
-                            org.apache.http.impl.client
+                            org.apache.http.impl.client,
+                            org.apache.http.impl.conn
                         </Import-Package>
                     </instructions>
                 </configuration>
diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/Utils/OAuthTokenValidationStubFactory.java b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/Utils/OAuthTokenValidationStubFactory.java
index 85e22d4519..88ceb34aeb 100644
--- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/Utils/OAuthTokenValidationStubFactory.java
+++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/Utils/OAuthTokenValidationStubFactory.java
@@ -31,6 +31,9 @@ import org.apache.commons.pool.PoolableObjectFactory;
 import org.apache.http.client.HttpClient;
 import org.apache.http.conn.ClientConnectionManager;
 import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingClientConnectionManager;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.wso2.carbon.identity.oauth2.stub.OAuth2TokenValidationServiceStub;
 import org.wso2.carbon.webapp.authenticator.framework.authenticator.oauth.OAuthConstants;
 import org.wso2.carbon.webapp.authenticator.framework.authenticator.oauth.OAuthTokenValidationException;
@@ -52,12 +55,10 @@ public class OAuthTokenValidationStubFactory implements PoolableObjectFactory {
         this.url = url;
         this.basicAuthHeader = new String(Base64.encodeBase64((adminUsername + ":" + adminPassword).getBytes()));
 
-        MultiThreadedHttpConnectionManager connectionManager = new MultiThreadedHttpConnectionManager();
-        connectionManager.getParams().setDefaultMaxConnectionsPerHost(
-                Integer.parseInt(properties.getProperty("MaxConnectionsPerHost")));
-        connectionManager.getParams().setMaxTotalConnections(
-                Integer.parseInt(properties.getProperty("MaxTotalConnections")));
-        this.httpClient = new DefaultHttpClient((ClientConnectionManager) connectionManager);
+        PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager();
+        connectionManager.setDefaultMaxPerRoute(Integer.parseInt(properties.getProperty("MaxConnectionsPerHost")));
+        connectionManager.setMaxTotal(Integer.parseInt(properties.getProperty("MaxTotalConnections")));
+        this.httpClient = HttpClients.custom().setConnectionManager(connectionManager).build();
     }
 
     @Override
diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/BasicAuthAuthenticator.java b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/BasicAuthAuthenticator.java
index 7b83a90923..06878d8ef8 100644
--- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/BasicAuthAuthenticator.java
+++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/BasicAuthAuthenticator.java
@@ -33,6 +33,11 @@ public class BasicAuthAuthenticator implements WebappAuthenticator {
 
     private static final String BASIC_AUTH_AUTHENTICATOR = "BasicAuth";
 
+    @Override
+    public void init() {
+
+    }
+
     @Override
     public boolean canHandle(Request request) {
         MessageBytes authorization =
diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/CertificateAuthenticator.java b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/CertificateAuthenticator.java
index cb59559ad5..ec2880d539 100644
--- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/CertificateAuthenticator.java
+++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/CertificateAuthenticator.java
@@ -26,6 +26,11 @@ public class CertificateAuthenticator implements WebappAuthenticator {
     private static final String CERTIFICATE_AUTHENTICATOR = "CertificateAuth";
     private static final String CERTIFICATE_VERIFICATION_HEADER = "certificate-verification-header";
 
+    @Override
+    public void init() {
+
+    }
+
     @Override
     public boolean canHandle(Request request) {
         String certVerificationHeader = request.getContext().findParameter(CERTIFICATE_VERIFICATION_HEADER);
diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/JWTAuthenticator.java b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/JWTAuthenticator.java
index 0f4cb51015..d48e4d0a29 100644
--- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/JWTAuthenticator.java
+++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/JWTAuthenticator.java
@@ -52,6 +52,11 @@ public class JWTAuthenticator implements WebappAuthenticator {
 	private static final String JWT_AUTHENTICATOR = "JWT";
 	private static final String JWT_ASSERTION_HEADER = "X-JWT-Assertion";
 
+    @Override
+    public void init() {
+
+    }
+
     @Override
     public boolean canHandle(Request request) {
 	    String authorizationHeader = request.getHeader(JWTAuthenticator.JWT_ASSERTION_HEADER);
diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/OAuthAuthenticator.java b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/OAuthAuthenticator.java
index 83838b87e1..1b29c9b389 100644
--- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/OAuthAuthenticator.java
+++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/OAuthAuthenticator.java
@@ -52,16 +52,33 @@ public class OAuthAuthenticator implements WebappAuthenticator {
 
     private static final Log log = LogFactory.getLog(OAuthAuthenticator.class);
 
-    public OAuthAuthenticator() {
+    @Override
+    public void init() {
+        if (properties == null) {
+            throw new IllegalArgumentException("Required properties needed to initialize OAuthAuthenticator are " +
+                    "not provided");
+        }
         String url = properties.getProperty("TokenValidationEndpointUrl");
+        if (url == null || url.isEmpty()) {
+            throw new IllegalArgumentException("OAuth token validation endpoint url is not provided");
+        }
         String adminUsername = properties.getProperty("Username");
+        if (adminUsername == null) {
+            throw new IllegalArgumentException("Username to connect to the OAuth token validation endpoint is " +
+                    "not provided");
+        }
         String adminPassword = properties.getProperty("Password");
+        if (adminPassword == null) {
+            throw new IllegalArgumentException("Password to connect to the OAuth token validation endpoint is " +
+                    "not provided");
+        }
         boolean isRemote = Boolean.parseBoolean(properties.getProperty("IsRemote"));
 
         Properties validatorProperties = new Properties();
         validatorProperties.setProperty("MaxTotalConnections", properties.getProperty("MaxTotalConnections"));
-        validatorProperties.setProperty("MaxConnectionsPerHost", properties.getProperty("MaxTotalConnectionsPerHost"));
-        this.tokenValidator = OAuthValidatorFactory.getNewValidator(url, adminUsername, adminPassword, isRemote, validatorProperties);
+        validatorProperties.setProperty("MaxConnectionsPerHost", properties.getProperty("MaxConnectionsPerHost"));
+        this.tokenValidator =
+                OAuthValidatorFactory.getNewValidator(url, adminUsername, adminPassword, isRemote, validatorProperties);
     }
 
     @Override
diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/WebappAuthenticator.java b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/WebappAuthenticator.java
index 7817ba10d3..5090920624 100644
--- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/WebappAuthenticator.java
+++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/WebappAuthenticator.java
@@ -30,6 +30,8 @@ public interface WebappAuthenticator {
         SUCCESS, FAILURE, CONTINUE
     }
 
+    void init();
+
     boolean canHandle(Request request);
 
     AuthenticationInfo authenticate(Request request, Response response);
diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/config/AuthenticatorConfig.java b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/config/AuthenticatorConfig.java
index d1669bed88..6a36ba2498 100644
--- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/config/AuthenticatorConfig.java
+++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/config/AuthenticatorConfig.java
@@ -18,10 +18,7 @@
  */
 package org.wso2.carbon.webapp.authenticator.framework.config;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.*;
 import java.util.List;
 
 @XmlRootElement(name = "Authenticator")
@@ -55,6 +52,10 @@ public class AuthenticatorConfig {
         return params;
     }
 
+    public void setParams(List<Parameter> params) {
+        this.params = params;
+    }
+
     @XmlRootElement(name = "Parameter")
     public static class Parameter {
         private String name;
@@ -69,7 +70,7 @@ public class AuthenticatorConfig {
             this.name = name;
         }
 
-        @XmlElement(name = "Value")
+        @XmlValue
         public String getValue() {
             return value;
         }
diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/internal/WebappAuthenticatorFrameworkServiceComponent.java b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/internal/WebappAuthenticatorFrameworkServiceComponent.java
index eef67ebaf7..c2684f9c97 100644
--- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/internal/WebappAuthenticatorFrameworkServiceComponent.java
+++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/internal/WebappAuthenticatorFrameworkServiceComponent.java
@@ -80,13 +80,14 @@ public class WebappAuthenticatorFrameworkServiceComponent {
             for (AuthenticatorConfig config : WebappAuthenticatorConfig.getInstance().getAuthenticators()) {
                 WebappAuthenticator authenticator = (WebappAuthenticator) Class.forName(config.getClassName()).
                         newInstance();
-                if (config.getParams() != null || !config.getParams().isEmpty()) {
+                if (config.getParams() != null && !config.getParams().isEmpty()) {
                     Properties properties = new Properties();
                     for (AuthenticatorConfig.Parameter param : config.getParams()) {
                         properties.setProperty(param.getName(), param.getValue());
                     }
                     authenticator.setProperties(properties);
                 }
+                authenticator.init();
                 repository.addAuthenticator(authenticator);
             }
             AuthenticatorFrameworkDataHolder.getInstance().setWebappAuthenticatorRepository(repository);
@@ -99,7 +100,7 @@ public class WebappAuthenticatorFrameworkServiceComponent {
                 log.debug("Web Application Authenticator Framework Bundle has been started successfully");
             }
         } catch (Throwable e) {
-            log.error("Error occurred while initializing the bundle", e);
+                log.error("Error occurred while initializing the bundle", e);
         }
     }
 
diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/webapp-authenticator-config.xml b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/webapp-authenticator-config.xml
index 067d8cd3ce..5099328df7 100644
--- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/webapp-authenticator-config.xml
+++ b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/webapp-authenticator-config.xml
@@ -3,6 +3,14 @@
 		<Authenticator>
 			<Name>OAuth</Name>
 			<ClassName>org.wso2.carbon.webapp.authenticator.framework.authenticator.OAuthAuthenticator</ClassName>
+            <Parameters>
+                <Parameter Name="TokenValidationEndpointUrl">https://localhost:9443</Parameter>
+                <Parameter Name="Username">admin</Parameter>
+                <Parameter Name="Password">admin</Parameter>
+                <Parameter Name="IsRemote">true</Parameter>
+                <Parameter Name="MaxConnectionsPerHost">10000</Parameter>
+                <Parameter Name="MaxTotalConnections">10000</Parameter>
+            </Parameters>
 		</Authenticator>
         <Authenticator>
             <Name>BasicAuth</Name>