From 52fab37c61232afb1f0104d824b1645b39191ace Mon Sep 17 00:00:00 2001 From: harshanl Date: Wed, 21 Oct 2015 15:43:26 +0530 Subject: [PATCH] Fixed issue in permission validator --- .../validators/PermissionBasedScopeValidator.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java b/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java index 71138525c98..f419362f2ea 100644 --- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java +++ b/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java @@ -66,7 +66,11 @@ public class PermissionBasedScopeValidator extends OAuth2ScopeValidator { String url = resource.substring(0, idx); String method = resource.substring(++idx, resource.length()); //This is to remove the url params - url = url.substring(0, url.indexOf('?')); + int urlParamIndex = url.indexOf('?'); + if(urlParamIndex > 0) { + url = url.substring(0, urlParamIndex); + } + Properties properties = new Properties(); properties.put(PermissionBasedScopeValidator.URL_PROPERTY, url); properties.put(PermissionBasedScopeValidator.HTTP_METHOD_PROPERTY, method);