Skip to content

FIx authentication issues with try it tool #2690

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

Merged
dulanjalidilmi merged 1 commit into from
Jun 19, 2020
Merged

FIx authentication issues with try it tool #2690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/CarbonUILoginUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,13 +556,16 @@ protected static String getForcedSignOutRequestedURI(String requestedURI,
protected static int handleLoginPageRequest(String requestedURI, HttpServletRequest request,
HttpServletResponse response, boolean authenticated, String context, String indexPageURL)
throws IOException {
boolean isTryIt = requestedURI.indexOf("admin/jsp/WSRequestXSSproxy_ajaxprocessor.jsp") > -1;
boolean isFileDownload = requestedURI.endsWith("/filedownload");
if (requestedURI.indexOf("login.jsp") > -1
|| requestedURI.indexOf("login_ajaxprocessor.jsp") > -1
|| requestedURI.indexOf("admin/layout/template.jsp") > -1
|| requestedURI.endsWith("/filedownload") || requestedURI.endsWith("/fileupload")
|| isFileDownload
|| requestedURI.endsWith("/fileupload")
|| requestedURI.indexOf("/fileupload/") > -1
|| requestedURI.indexOf("login_action.jsp") > -1
|| requestedURI.indexOf("admin/jsp/WSRequestXSSproxy_ajaxprocessor.jsp") > -1
|| isTryIt
|| requestedURI.indexOf("tryit/JAXRSRequestXSSproxy_ajaxprocessor.jsp") > -1) {

if ((requestedURI.indexOf("login.jsp") > -1
Expand All @@ -584,6 +587,11 @@ protected static int handleLoginPageRequest(String requestedURI, HttpServletRequ
// redirect relative to the servlet container root
response.sendRedirect(context + "/carbon/admin/index.jsp");
return RETURN_FALSE;
} else if ((isTryIt || isFileDownload) && !authenticated) {
if (isFileDownload) {
response.sendRedirect(context + "/carbon/admin/index.jsp");
}
return RETURN_FALSE;
} else if (requestedURI.indexOf("login_action.jsp") > -1 && !authenticated) {
// User is not yet authenticated and now trying to get authenticated
// do nothing, leave for authentication at the end
Expand Down
3 changes: 3 additions & 0 deletions core/org.wso2.carbon.ui/src/main/resources/web/admin/jsp/WSRequestXSSproxy_ajaxprocessor.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@
return documentBuilder;
}
%><%
if ("true".equalsIgnoreCase(System.getProperty("tryItFunctionalityDisabled"))) {
return;
}
boolean useWSS = false;
String policy = "<wsp:Policy wsu:Id=\"UTOverTransport\"\n" +
" xmlns:wsu=\"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd\"\n" +
Expand Down