From 8a842e8f8e7d26b94684e30de0b29980d36c7e17 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Mon, 17 Apr 2017 17:37:46 +0530
Subject: [PATCH 1/2] restricted basic auth support

---
 .../src/main/webapp/WEB-INF/web.xml                       | 5 +++++
 .../framework/authenticator/BasicAuthAuthenticator.java   | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/src/main/webapp/WEB-INF/web.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/src/main/webapp/WEB-INF/web.xml
index 9850eb5da5f..3a900cd914d 100644
--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/src/main/webapp/WEB-INF/web.xml
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/src/main/webapp/WEB-INF/web.xml
@@ -39,6 +39,11 @@
         <param-name>doAuthentication</param-name>
         <param-value>true</param-value>
     </context-param>
+	<!--This is to support basic auth.-->
+	<context-param>
+		<param-name>basicAuth</param-name>
+		<param-value>true</param-value>
+	</context-param>
 
     <!--publish to apim-->
     <context-param>
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 c4d2da95b6d..0dfc9c5d704 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
@@ -49,6 +49,9 @@ public class BasicAuthAuthenticator implements WebappAuthenticator {
 
     @Override
     public boolean canHandle(Request request) {
+        if (!isSupportsAuthentication(request)) {
+            return false;
+        }
         MessageBytes authorization =
                 request.getCoyoteRequest().getMimeHeaders().getValue(Constants.HTTPHeaders.HEADER_HTTP_AUTHORIZATION);
         if (authorization != null) {
@@ -156,4 +159,9 @@ public class BasicAuthAuthenticator implements WebappAuthenticator {
         }
     }
 
+    private boolean isSupportsAuthentication(Request request) {
+        String param = request.getContext().findParameter("basicAuth");
+        return (param == null || !Boolean.parseBoolean(param));
+    }
+
 }

From 0444f63a071db00f01bcefec3bfe2c73985ed0ba Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Tue, 18 Apr 2017 10:13:58 +0530
Subject: [PATCH 2/2] renamed method name

---
 .../framework/authenticator/BasicAuthAuthenticator.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 0dfc9c5d704..f384efe6f52 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
@@ -49,7 +49,7 @@ public class BasicAuthAuthenticator implements WebappAuthenticator {
 
     @Override
     public boolean canHandle(Request request) {
-        if (!isSupportsAuthentication(request)) {
+        if (!isAuthenticationSupported(request)) {
             return false;
         }
         MessageBytes authorization =
@@ -159,7 +159,7 @@ public class BasicAuthAuthenticator implements WebappAuthenticator {
         }
     }
 
-    private boolean isSupportsAuthentication(Request request) {
+    private boolean isAuthenticationSupported(Request request) {
         String param = request.getContext().findParameter("basicAuth");
         return (param == null || !Boolean.parseBoolean(param));
     }