Update igw-dev branch with latest IGW release

.gitignore

@@ -25,4 +25,6 @@ target
 *pom.xml.next
 *pom.xml.tag
 *release.properties
-*.DS_STORE
+*.DS_STORE
+
+dependency-reduced-pom.xml

components/api-invocation-handler/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.wso2telco.dep</groupId>
         <artifactId>component-dep</artifactId>
-        <version>3.0.2-SNAPSHOT</version>
+        <version>3.0.4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/apim-loghandler/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.wso2telco.dep</groupId>
         <artifactId>component-dep</artifactId>
-        <version>3.0.2-SNAPSHOT</version>
+        <version>3.0.4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/billing/billing-extension/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.wso2telco.dep</groupId>
 		<artifactId>component-dep</artifactId>
-		<version>3.0.2-SNAPSHOT</version>
+		<version>3.0.4-SNAPSHOT</version>
 		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 

components/billing/billing-service/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.wso2telco.dep</groupId>
 		<artifactId>component-dep</artifactId>
-		<version>3.0.2-SNAPSHOT</version>
+		<version>3.0.4-SNAPSHOT</version>
 		<relativePath>../../../pom.xml</relativePath>	
 	</parent>
 

components/ipvalidate-handler/pom.xml

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.wso2telco.dep</groupId>
+		<artifactId>component-dep</artifactId>
+		<version>3.0.4-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>ipvalidate-handler</artifactId>
+	<packaging>bundle</packaging>
+	<name>ipvalidate-handler</name>
+	<version>3.0.4-SNAPSHOT</version>
+	<url>http://maven.apache.org</url>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.synapse</groupId>
+			<artifactId>synapse-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.wso2.carbon.apimgt</groupId>
+			<artifactId>org.wso2.carbon.apimgt.gateway</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.wso2.carbon.apimgt</groupId>
+			<artifactId>org.wso2.carbon.apimgt.gateway</artifactId>
+		</dependency>
+		<dependency>
+            <groupId>com.wso2telco.core</groupId>
+            <artifactId>dbutils</artifactId>
+        </dependency>
+		<dependency>
+            <groupId>javax.cache</groupId>
+            <artifactId>cache-api</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.1</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+
+	<build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-scr-plugin</artifactId>
+                <version>1.7.2</version>
+                <executions>
+                    <execution>
+                        <id>generate-scr-scrdescriptor</id>
+                        <goals>
+                            <goal>scr</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <version>2.3.5</version>
+                <configuration>
+                    <obrRepository>NONE</obrRepository>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                       <Export-Package>
+                            com.wso2telco.dep.ipvalidate.handler.*
+                        </Export-Package>
+                        <Import-Package>
+                            *;resolution:=optional
+                        </Import-Package>
+                        <Embed-Dependency>
+                            scribe;scope=compile|runtime;inline=false;
+                        </Embed-Dependency>
+                        <DynamicImport-Package>*</DynamicImport-Package>
+                        <Carbon-Component>UIBundle</Carbon-Component>
+
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

components/ipvalidate-handler/src/main/java/com/wso2telco/dep/ipvalidate/handler/IPValidateHandler.java

@@ -0,0 +1,176 @@
+package com.wso2telco.dep.ipvalidate.handler;
+
+import java.util.Map;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.http.HttpHeaders;
+import org.apache.synapse.Mediator;
+import org.apache.synapse.MessageContext;
+import org.apache.synapse.SynapseConstants;
+import org.apache.synapse.core.axis2.Axis2MessageContext;
+import org.apache.synapse.transport.passthru.PassThroughConstants;
+import org.apache.synapse.transport.passthru.util.RelayUtils;
+import org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler;
+import org.wso2.carbon.apimgt.gateway.handlers.security.APISecurityConstants;
+import org.wso2.carbon.apimgt.gateway.handlers.security.APISecurityException;
+
+import com.wso2telco.dep.ipvalidate.handler.validation.ClientValidator;
+import com.wso2telco.dep.ipvalidate.handler.validation.configuration.IPValidationProperties;
+import com.wso2telco.dep.ipvalidate.handler.validation.dto.RequestData;
+import com.wso2telco.dep.ipvalidate.handler.validation.impl.ClientValidatorImpl;
+import com.wso2telco.dep.ipvalidate.handler.validation.service.ValidationCacheService;
+
+public class IPValidateHandler extends APIAuthenticationHandler {
+
+	private static final Log log = LogFactory.getLog(IPValidateHandler.class);
+	private ClientValidator clientvalidator = null;	
+
+	public boolean handleRequest(MessageContext messageContext) {
+		log.debug("Request received : " + messageContext);
+
+		try {
+
+			Map headers = getTransportHeaders(messageContext);
+			log.debug("headers : " + headers);
+			RequestData requestData = new RequestData();
+
+			requestData.setClientkey(getClientKey(messageContext));
+			requestData.setHostip(getHostIP(headers));
+
+			if (IPValidationProperties.isCustomValidationEnabled()) {
+				clientvalidator = new ClientValidatorImpl();
+				if (clientvalidator.validateRequest(requestData)) {
+					ValidationCacheService validationCacheService = new ValidationCacheService();
+					String clientToken = validationCacheService.getTokenfromCache(requestData.getClientkey());
+					if (clientToken != null) {
+						setTokentoContext(messageContext, clientToken);
+					} else {
+						throw new APISecurityException(IPValidationProperties.getValidationFalidErrCode(),
+								IPValidationProperties.getValidationFalidErrMsg());
+					}
+				} else {
+					throw new APISecurityException(IPValidationProperties.getInvalidHostErrCode(),
+							IPValidationProperties.getInvalidHostErrMsg());
+				}
+			}
+			return super.handleRequest(messageContext);
+		} catch (APISecurityException e) {
+			log.error("Error : " + e);
+			handleIPValidateFailure(messageContext, e);
+			return false;
+		}
+	}
+
+	private Map getTransportHeaders(MessageContext messageContext) {
+		return (Map) ((Axis2MessageContext) messageContext).getAxis2MessageContext()
+				.getProperty(org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS);
+	}
+
+	private String getHostIP(Map headers) {
+		String hostIp = null;
+
+		if (headers.get(IPValidationProperties.getIpHeaderName()) != null) {
+			hostIp = String.valueOf(headers.get(IPValidationProperties.getIpHeaderName())).split(",")[0];
+		} else if (headers.get(IPValidationProperties.getHostHeaderName()) != null) {
+			hostIp = String.valueOf(headers.get(IPValidationProperties.getHostHeaderName())).split(":")[0];
+		}
+		return hostIp;
+	}
+
+	private String getClientKey(MessageContext messageContext) throws APISecurityException
+	{
+		String clientKey = null;
+
+		try
+		{
+			String urlPath = messageContext.getTo().toString().split("[?]")[1];
+			String keyParam = urlPath.split("=")[0];
+			if(keyParam.equalsIgnoreCase(IPValidationProperties.getClientKeyParamName()))
+			{
+				clientKey = urlPath.split("=")[1];
+			} else
+			{
+				log.error("Invalid query parameter ");
+				throw new APISecurityException(IPValidationProperties.getValidationFalidErrCode(),
+						IPValidationProperties.getValidationFalidErrMsg());
+			}
+		}
+		catch(Exception e)
+		{
+			log.error("Error occurred while geting client key " + e);
+			throw new APISecurityException(IPValidationProperties.getValidationFalidErrCode(),
+					IPValidationProperties.getValidationFalidErrMsg());
+		}
+		return clientKey;
+	}
+
+	private void handleIPValidateFailure(MessageContext messageContext, APISecurityException e) {
+        messageContext.setProperty(SynapseConstants.ERROR_CODE, e.getErrorCode());
+        messageContext.setProperty(SynapseConstants.ERROR_MESSAGE,
+                APISecurityConstants.getAuthenticationFailureMessage(e.getErrorCode()));
+        messageContext.setProperty(SynapseConstants.ERROR_EXCEPTION, e);
+
+        Mediator sequence = messageContext.getSequence(APISecurityConstants.API_AUTH_FAILURE_HANDLER);
+        // Invoke the custom error handler specified by the user
+        if (sequence != null && !sequence.mediate(messageContext)) {
+            // If needed user should be able to prevent the rest of the fault handling
+            // logic from getting executed
+            return;
+        }
+        // By default we send a 401 response back
+        org.apache.axis2.context.MessageContext axis2MC = ((Axis2MessageContext) messageContext).
+                getAxis2MessageContext();
+        // This property need to be set to avoid sending the content in pass-through pipe (request message)
+        // as the response.
+        axis2MC.setProperty(PassThroughConstants.MESSAGE_BUILDER_INVOKED, Boolean.TRUE);
+        try {
+            RelayUtils.consumeAndDiscardMessage(axis2MC);
+        } catch (AxisFault axisFault) {
+            //In case of an error it is logged and the process is continued because we're setting a fault message in the payload.
+            log.error("Error occurred while consuming and discarding the message", axisFault);
+        }
+        axis2MC.setProperty(Constants.Configuration.MESSAGE_TYPE, "application/soap+xml");
+        int status;
+        if (e.getErrorCode() == APISecurityConstants.API_AUTH_GENERAL_ERROR) {
+            status = HttpStatus.SC_INTERNAL_SERVER_ERROR;
+        } else if (e.getErrorCode() == APISecurityConstants.API_AUTH_INCORRECT_API_RESOURCE ||
+                e.getErrorCode() == APISecurityConstants.API_AUTH_FORBIDDEN ||
+                e.getErrorCode() == APISecurityConstants.INVALID_SCOPE) {
+            status = HttpStatus.SC_FORBIDDEN;
+        } else {
+            status = HttpStatus.SC_UNAUTHORIZED;
+            Map<String, String> headers =
+                    (Map) axis2MC.getProperty(org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS);
+            if (headers != null) {
+                headers.put(HttpHeaders.WWW_AUTHENTICATE, getAuthenticator().getChallengeString() +
+                        ", error=\"invalid token\"" +
+                        ", error_description=\"The access token expired\"");
+                axis2MC.setProperty(org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS, headers);
+            }
+        }
+
+        if (messageContext.isDoingPOX() || messageContext.isDoingGET()) {
+            setFaultPayload(messageContext, e);
+        } else {
+            setSOAPFault(messageContext, e);
+        }
+        sendFault(messageContext, status);
+    }
+
+
+	private void setTokentoContext(MessageContext messageContext, String token) {
+		Map headers = getTransportHeaders(messageContext);
+		Axis2MessageContext axis2smc = (Axis2MessageContext) messageContext;
+		org.apache.axis2.context.MessageContext axis2MessageCtx = axis2smc.getAxis2MessageContext();
+
+		if (headers != null && headers instanceof Map) {
+			Map headersMap = (Map) headers;
+			headersMap.put("Authorization", "Bearer " + token);
+			axis2MessageCtx.setProperty(org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS, headersMap);
+		}
+	}
+}

components/ipvalidate-handler/src/main/java/com/wso2telco/dep/ipvalidate/handler/validation/ClientValidator.java

@@ -0,0 +1,11 @@
+package com.wso2telco.dep.ipvalidate.handler.validation;
+
+import org.wso2.carbon.apimgt.gateway.handlers.security.APISecurityException;
+
+import com.wso2telco.dep.ipvalidate.handler.validation.dto.RequestData;
+
+public interface ClientValidator {
+
+	public boolean validateRequest(RequestData requestdata) throws APISecurityException ;
+
+}

components/ipvalidate-handler/src/main/java/com/wso2telco/dep/ipvalidate/handler/validation/CustomValidator.java

@@ -0,0 +1,17 @@
+package com.wso2telco.dep.ipvalidate.handler.validation;
+
+import org.wso2.carbon.apimgt.gateway.handlers.security.APISecurityException;
+
+import com.wso2telco.dep.ipvalidate.handler.validation.dto.RequestData;
+
+public abstract class CustomValidator {
+
+	protected CustomValidator nextValidator;
+
+	public void setNextValidator(CustomValidator nextValidator) {
+		this.nextValidator = nextValidator;
+	}
+
+	public abstract boolean doValidation(RequestData requestData) throws APISecurityException;
+
+}