Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restricts if carbon.super added to URL when relevant config is disabled #244

Closed
wants to merge 3 commits into from
Closed

Restricts if carbon.super added to URL when relevant config is disabled #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d00041b
Restricts if carbon.super added to URL when relevant config is disabled
Thisara-Welmilla Oct 11, 2023
1a073c4
Merge branch 'master' into improve-tenant-qualified-URL
Thisara-Welmilla Oct 23, 2023
5219c83
Version bump
Thisara-Welmilla Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 26 additions & 7 deletions ...c/main/java/org/wso2/carbon/identity/context/rewrite/valve/TenantContextRewriteValve.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.valves.ValveBase;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Expand All @@ -38,14 +37,9 @@
import org.wso2.carbon.identity.core.util.IdentityUtil;
import org.wso2.carbon.user.api.UserStoreException;
import org.wso2.carbon.user.core.tenant.TenantManager;
import org.wso2.carbon.utils.CarbonUtils;
import org.wso2.carbon.utils.multitenancy.MultitenantConstants;

import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
Expand Down Expand Up @@ -138,6 +132,13 @@ public void invoke(Request request, Response response) throws IOException, Servl
if (tenantDomain != null &&
!tenantManager.isTenantActive(IdentityTenantUtil.getTenantId(tenantDomain))) {
handleInvalidTenantDomainErrorResponse(response, HttpServletResponse.SC_NOT_FOUND, tenantDomain);
} else if (IdentityTenantUtil.isTenantQualifiedUrlsEnabled() && !isValidTenantQualifiedUrl(requestURI)) {
if (log.isDebugEnabled()) {
log.debug("/t/carbon.super should be appended to the request URL only if the Tenant qualified URL " +
"feature is enabled and AppendSuperTenantInUrl configuration is enabled. Hence " +
"restricting the access to super tenant.");
}
handleRestrictedTenantDomainErrorResponse(request, response);
} else {
IdentityUtil.threadLocalProperties.get().put(TENANT_NAME_FROM_CONTEXT, tenantDomain);

Expand Down Expand Up @@ -320,4 +321,22 @@ private void handleRestrictedTenantDomainErrorResponse(Request request, Response
response.getWriter().print(errorPage);
}
}

/**
* Validate request URI whether it contains tenant in the context path according to the configurations.
*
* @param requestURI Request URI
* @return boolean whether requestURI is
*/
private boolean isValidTenantQualifiedUrl(String requestURI) {

String tenantInContextPath = "/t/" + MultitenantConstants.SUPER_TENANT_DOMAIN_NAME;
if (IdentityTenantUtil.isSuperTenantRequiredInUrl() && requestURI.contains(tenantInContextPath)) {
return true;
} else if (!IdentityTenantUtil.isSuperTenantRequiredInUrl() && !requestURI.contains(tenantInContextPath)) {
return true;
}

return false;
}
}
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@
<org.wso2.carbon.identity.cors.valve.version>${project.version}</org.wso2.carbon.identity.cors.valve.version>

<!--Carbon identity version-->
<identity.framework.version>5.25.393</identity.framework.version>
<identity.framework.version>5.25.429</identity.framework.version>
<carbon.identity.package.import.version.range>[5.17.8, 7.0.0)</carbon.identity.package.import.version.range>

<org.wso2.carbon.identity.oauth.version>6.11.128</org.wso2.carbon.identity.oauth.version>
Expand Down
Loading