Modify OAuth client id to be unique across tenant instead of server - Tenant resolving

components/org.wso2.carbon.identity.auth.service/src/main/java/org/wso2/carbon/identity/auth/service/handler/impl/BasicClientAuthenticationHandler.java

@@ -33,6 +33,7 @@
 import org.wso2.carbon.identity.core.handler.InitConfig;
 import org.wso2.carbon.identity.oauth.IdentityOAuthAdminException;
 import org.wso2.carbon.identity.oauth.common.exception.InvalidOAuthClientException;
+import org.wso2.carbon.identity.oauth.dao.OAuthAppDO;
 import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception;
 import org.wso2.carbon.identity.oauth2.util.OAuth2Util;
 
@@ -49,6 +50,7 @@ public class BasicClientAuthenticationHandler extends AuthenticationHandler {
 
     private static final Log log = LogFactory.getLog(BasicClientAuthenticationHandler.class);
     private final String BASIC_AUTH_HEADER = "Basic";
+    private static final String APP_TENANT_QUERY_PARAM = "appTenant";
 
     @Override
     public void init(InitConfig initConfig) {
@@ -105,10 +107,26 @@ protected AuthenticationResult doAuthenticate(MessageContext messageContext) thr
                                     + " with client secret.");
                         }
 
-                        authenticationContext.addProperty(Constants.AUTH_CONTEXT_OAUTH_APP_PROPERTY,
-                                OAuth2Util.getAppInformationByClientId(clientId));
+                        String appTenant = ((AuthenticationContext) messageContext).getAuthenticationRequest()
+                                .getRequest().getParameter(APP_TENANT_QUERY_PARAM);
+                        OAuthAppDO oAuthAppDO;
+
+                        /*
+                            When the app tenant is not provided, it tries to retrieve an app for the tenant
+                            in the request path. Even though there could be a scenario for cross tenant access,
+                            the request should be authenticated with a client in the requested tenant. If not,
+                            should pass the app tenant as a query parameter.
+                         */
+                        if (StringUtils.isNotBlank(appTenant)) {
+                            oAuthAppDO = OAuth2Util.getAppInformationByClientId(clientId, appTenant);
+                        } else {
+                            oAuthAppDO = OAuth2Util.getAppInformationByClientId(clientId);
+                            appTenant = oAuthAppDO.getAppOwner().getTenantDomain();
+                        }
+
+                        authenticationContext.addProperty(Constants.AUTH_CONTEXT_OAUTH_APP_PROPERTY, oAuthAppDO);
 
-                        if (OAuth2Util.authenticateClient(clientId, clientSecret)) {
+                        if (OAuth2Util.authenticateClient(clientId, clientSecret, appTenant)) {
                             authenticationResult.setAuthenticationStatus(AuthenticationStatus.SUCCESS);
                         } else {
                             authenticationResult.setAuthenticationStatus(AuthenticationStatus.FAILED);

components/org.wso2.carbon.identity.auth.valve/pom.xml

@@ -76,6 +76,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
+            <artifactId>org.wso2.carbon.identity.oauth</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.json.wso2</groupId>
             <artifactId>json</artifactId>
@@ -133,6 +137,7 @@
                         --add-opens=java.base/java.util=ALL-UNNAMED
                         --add-opens=java.base/java.lang=ALL-UNNAMED
                         --add-opens=java.base/java.io=ALL-UNNAMED
+                        --add-opens=java.base/java.util.regex=ALL-UNNAMED
                     </argLine>
                 </configuration>
             </plugin>
@@ -218,7 +223,13 @@
                             org.wso2.carbon.identity.core.util.*; version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.core.*; version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.auth.service.*;version="${org.wso2.carbon.identity.auth.service.version.range}",
-                            org.apache.catalina.*;version="1.7.0"
+                            org.apache.catalina.*;version="1.7.0",
+                            org.wso2.carbon.identity.oauth.common.exception;version="${org.wso2.carbon.identity.oauth.import.version.range}",
+                            org.wso2.carbon.identity.oauth.common;version="${org.wso2.carbon.identity.oauth.import.version.range}",
+                            org.wso2.carbon.identity.oauth.dao;version="${org.wso2.carbon.identity.oauth.import.version.range}",
+                            org.wso2.carbon.identity.oauth2;version="${org.wso2.carbon.identity.oauth.import.version.range}",
+                            org.wso2.carbon.identity.oauth2.client.authentication;version="${org.wso2.carbon.identity.oauth.import.version.range}",
+                            org.wso2.carbon.identity.oauth2.util;version="${org.wso2.carbon.identity.oauth.import.version.range}"
                         </Import-Package>
                         <Export-Package>org.wso2.carbon.identity.auth.valve.*;
                             version="${org.wso2.carbon.identity.auth.valve.version}"

components/org.wso2.carbon.identity.auth.valve/src/main/java/org/wso2/carbon/identity/auth/valve/OAuthAppTenantResolverValve.java

@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.auth.valve;
+
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
+import org.apache.catalina.valves.ValveBase;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.identity.core.util.IdentityUtil;
+import org.wso2.carbon.identity.oauth.common.exception.InvalidOAuthClientException;
+import org.wso2.carbon.identity.oauth.dao.OAuthAppDO;
+import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception;
+import org.wso2.carbon.identity.oauth2.client.authentication.OAuthClientAuthnException;
+import org.wso2.carbon.identity.oauth2.util.OAuth2Util;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+
+import static org.wso2.carbon.identity.oauth.common.OAuthConstants.OAuth10AParams.OAUTH_CONSUMER_KEY;
+import static org.wso2.carbon.identity.oauth.common.OAuthConstants.OAuth20Params.CLIENT_ID;
+import static org.wso2.carbon.identity.oauth.common.OAuthConstants.TENANT_NAME_FROM_CONTEXT;
+
+/**
+ * This valve is used to resolve the tenant domain of the OAuth application.
+ *
+ * When tenant qualified urls are not enabled, we need to set the tenant domain of the oauth app to the thread
+ * local. This is because with the client id tenant uniqueness improvement, DAO layer requires the tenant domain
+ * and client id to retrieve an app when the tenant is not available in the request path. Note that when tenant
+ * qualified urls are disabled, client id is unique across the server.
+ */
+public class OAuthAppTenantResolverValve extends ValveBase {
+
+    private static final Log LOG = LogFactory.getLog(OAuthAppTenantResolverValve.class);
+    private static String oAuthServerBaseURL = null;
+    private static String oAuth2ServerBaseURL = null;
+
+    @Override
+    public void invoke(Request request, Response response) throws IOException, ServletException {
+
+        try {
+            if (isOAuthRequest(request)) {
+                String appTenant = "";
+                String clientId = request.getParameter(CLIENT_ID);
+
+                if (StringUtils.isEmpty(clientId) && isOAuth10ARequest(request)) {
+                    clientId = request.getParameter(OAUTH_CONSUMER_KEY);
+                }
+
+                // If empty, try to get the client id from the authorization header.
+                if (StringUtils.isEmpty(clientId)) {
+                    if (OAuth2Util.isBasicAuthorizationHeaderExists(request)) {
+                        try {
+                            String[] credentials = OAuth2Util.extractCredentialsFromAuthzHeader(request);
+                            if (credentials != null) {
+                                clientId = credentials[0];
+                            }
+                        } catch (OAuthClientAuthnException e) {
+                            if (LOG.isDebugEnabled()) {
+                                LOG.debug("Error while extracting credentials from authorization header.", e);
+                            }
+                        }
+                    }
+                }
+
+                if (StringUtils.isNotEmpty(clientId)) {
+                    try {
+                        OAuthAppDO oAuthAppDO = OAuth2Util.getAppInformationByClientIdOnly(clientId);
+                        appTenant = OAuth2Util.getTenantDomainOfOauthApp(oAuthAppDO);
+                    } catch (IdentityOAuth2Exception e) {
+                        LOG.error("Error while getting oauth app for client Id: " + clientId, e);
+                    } catch (InvalidOAuthClientException e) {
+                        if (LOG.isDebugEnabled()) {
+                            LOG.debug("Error while getting oauth app for client Id: " + clientId, e);
+                        }
+                    }
+                }
+
+                // Set the tenant name to thread local properties.
+                if (StringUtils.isNotEmpty(appTenant)) {
+                    IdentityUtil.threadLocalProperties.get().put(TENANT_NAME_FROM_CONTEXT, appTenant);
+                }
+            }
+            getNext().invoke(request, response);
+        } finally {
+            // Clear thread local tenant name.
+            unsetThreadLocalContextTenantName();
+        }
+    }
+
+    /**
+     * Check whether the request is an OAuth request.
+     *
+     * @param request Http servlet request.
+     * @return True if the request is an OAuth request.
+     */
+    private boolean isOAuthRequest(Request request) {
+
+        initBaseUrls();
+        String requestUrl = request.getRequestURL().toString();
+        return StringUtils.isNotEmpty(requestUrl) && (requestUrl.startsWith(oAuth2ServerBaseURL) ||
+                requestUrl.startsWith(oAuthServerBaseURL));
+    }
+
+    /**
+     * Check whether the request is an OAuth 1.0 request.
+     *
+     * @param request Http servlet request.
+     * @return True if the request is an OAuth 1.0 request.
+     */
+    private boolean isOAuth10ARequest(Request request) {
+
+        String requestUrl = request.getRequestURL().toString();
+        return StringUtils.isNotEmpty(requestUrl) && requestUrl.startsWith(oAuthServerBaseURL);
+    }
+
+    /**
+     * Unset the context tenant name from thread local properties.
+     */
+    private void unsetThreadLocalContextTenantName() {
+
+        if (IdentityUtil.threadLocalProperties.get().get(TENANT_NAME_FROM_CONTEXT) != null) {
+            IdentityUtil.threadLocalProperties.get().remove(TENANT_NAME_FROM_CONTEXT);
+        }
+    }
+
+    /**
+     * Initialize the base urls.
+     */
+    private void initBaseUrls() {
+
+        if (StringUtils.isEmpty(oAuthServerBaseURL)) {
+            oAuthServerBaseURL = IdentityUtil.getServerURL("/oauth", true, true) + "/";
+        }
+        if (StringUtils.isEmpty(oAuth2ServerBaseURL)) {
+            oAuth2ServerBaseURL = IdentityUtil.getServerURL("/oauth2", true, true) + "/";
+        }
+    }
+}