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.

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

Merge 4.3.0-kernel-upgrade to master #13379

Merged
merged 48 commits into from
Feb 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
699f4a3
Add kernel upgrade changes
msm1992 Feb 1, 2024
a0e4c0e
Upgrade kernel version to 4.9.0
msm1992 Feb 1, 2024
d6ec71b
Fix event.handler.notification version
msm1992 Feb 1, 2024
dfd17a2
Add org.wso2.carbon.identity.organization.management.core.server.feature
msm1992 Feb 1, 2024
c2f6845
Add identity.branding.preference.management feature
msm1992 Feb 1, 2024
b19bde3
Upgrade dependency bumps
tgtshanika Feb 6, 2024
d9ecae6
Revert identity-apps version
msm1992 Feb 6, 2024
2776965
Upgrade kernel version to 4.9.26.alpha
msm1992 Feb 7, 2024
0cb4104
Upgrade outbound-auth-samlsso version to 5.8.11
msm1992 Feb 7, 2024
fe5a2db
Upgrade carbon-apimgt version to latest snapshot version
msm1992 Feb 7, 2024
386f9d4
Merge pull request #13351 from msm1992/master-4.3.0
msm1992 Feb 7, 2024
2f60884
Upgrade IS components to latest versions (#13353)
msm1992 Feb 7, 2024
8b07827
Upgrade dependencies
tgtshanika Feb 7, 2024
6f58fde
Merge branch '4.3.0-kernel-upgrade' into 4.3.0-dependency-bumps
msm1992 Feb 8, 2024
73b0324
Merge pull request #13354 from tgtshanika/4.3.0-dependency-bumps
msm1992 Feb 8, 2024
80970c4
upgrade identity-metadata-saml2 version
msm1992 Feb 8, 2024
fa04a98
upgrade identity-metadata-saml2 version (#13355)
msm1992 Feb 8, 2024
44a832a
Remove AUTO_SERVER=TRUE from DB URLs
msm1992 Feb 8, 2024
4185932
Update test resources to support H2 version upgrade
msm1992 Feb 8, 2024
4ab6a28
Upgrade H2 version (#13357)
msm1992 Feb 8, 2024
edff6a7
Merge branch '4.3.0-kernel-upgrade-1' of github.com:msm1992/product-a…
dushaniw Feb 11, 2024
efd23d3
Update multitenancy and carbon-messaging versions
Feb 12, 2024
1934b6f
Merge pull request #13362 from npamudika/4.3.0-kernel-upgrade
npamudika Feb 12, 2024
c4f4608
update connector and is versions
dushaniw Feb 12, 2024
4c20548
upgrade poi version
YasasRangika Feb 12, 2024
9aa59e2
Merge pull request #13363 from dushaniw/4.3.0-kernel-upgrade-token-pe…
dushaniw Feb 13, 2024
d7a28fd
Revert "update connector and is versions"
dushaniw Feb 13, 2024
3081c34
Merge pull request #13365 from wso2/revert-13363-4.3.0-kernel-upgrade…
tgtshanika Feb 13, 2024
02e80ef
Merge pull request #13358 from YasasRangika/yasas-4.3.0-kernel-upgrade
npamudika Feb 13, 2024
d4b9efa
enable token revoke header config.
dushaniw Feb 13, 2024
60d795a
Merge pull request #13366 from dushaniw/4.3.0-kernel-integration-tests
npamudika Feb 13, 2024
6027f0a
Bump identity versions
HiranyaKavishani Feb 13, 2024
7926b23
revert wso2is.km.version
HiranyaKavishani Feb 13, 2024
50408cb
Bump kernel and identity versions (#13367)
HiranyaKavishani Feb 13, 2024
f4ee5e1
bump kernel version
HiranyaKavishani Feb 13, 2024
2823d00
Merge pull request #13368 from HiranyaKavishani/4.3.0-kernel-upgrade
npamudika Feb 13, 2024
c51ab9c
Upgrade versions
Feb 14, 2024
97b4d30
Merge pull request #13370 from npamudika/4.3.0-kernel-upgrade
npamudika Feb 14, 2024
afd5129
Sync jsp changes from identity apps to product apim (#13371)
RusJaI Feb 14, 2024
20ca9e1
Add json-smart as a test dependency to fix a CNF
msm1992 Feb 15, 2024
97659f2
Merge pull request #13372 from msm1992/4.3.0-kernel-upgrade-1
npamudika Feb 15, 2024
4d648db
Bump identity version (#13373)
HiranyaKavishani Feb 15, 2024
01086c2
Sync jsp changes from identity apps (#13376)
RusJaI Feb 16, 2024
1050e6b
Fix test failures (#13375)
dushaniw Feb 16, 2024
92a29de
Upgrade synapse and mediation (#13374)
tgtshanika Feb 16, 2024
4029d77
Upgrade synapse and mediation versions
Feb 16, 2024
15bac7f
Bump apimgt and apps versions
Feb 17, 2024
33fcfd4
Merge branch 'master' into 4.3.0-kernel-upgrade
npamudika Feb 17, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ product.key=AM
product.version=4.3.0
product.wum.name=wso2am

carbon.version=4.8.1
carbon.version=4.9.26.alpha1
am.version=4.3.0
default.server.role=APIManager
bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type = "database_unique_id"

[database.apim_db]
type = "h2"
url = "jdbc:h2:./repository/database/WSO2AM_DB;AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE"
url = "jdbc:h2:./repository/database/WSO2AM_DB;DB_CLOSE_ON_EXIT=FALSE"
username = "wso2carbon"
password = "wso2carbon"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@
name="password"
value=""
autocomplete="off"
required
tabindex="2"
placeholder="<%=AuthenticationEndpointUtil.i18n(resourceBundle, "password")%>"
data-testid="login-page-password-input"
Expand Down Expand Up @@ -403,7 +404,7 @@
name="chkRemember"
data-testid="login-page-remember-me-checkbox"
>
<label><%=AuthenticationEndpointUtil.i18n(resourceBundle, "remember.me")%></label>
<label for="chkRemember"><%=AuthenticationEndpointUtil.i18n(resourceBundle, "remember.me")%></label>
</div>
</div>
<input type="hidden" name="sessionDataKey" value='<%=Encode.forHtmlAttribute
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
~ under the License.
--%>

<!-- page content -->
<%-- page content --%>
<div class="ui grid">
<div class="two column row"></div>
<div class="four wide computer four wide tablet column">
<div id="toc" class="ui segment toc"></div>
</div>
<div class="twelve wide computer twelve wide tablet column">
<!-- content -->
<%-- content --%>
<div>
<div>
<h1>
Expand Down Expand Up @@ -174,7 +174,7 @@
<%-- /Customizable content --%>
</div>
</div>
<!-- /content -->
<%-- /content --%>
</div>
</div>
</div>
10 changes: 5 additions & 5 deletions modules/distribution/product/src/main/extensions/error.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
layoutData.put("containerSize", "large");
%>
<!doctype html>
<html>
<html lang="en-US">
<head>
<!-- header -->
<%-- header --%>
<%
File headerFile = new File(getServletContext().getRealPath("extensions/header.jsp"));
if (headerFile.exists()) {
Expand All @@ -62,7 +62,7 @@
<body class="login-portal layout recovery-layout">
<layout:main layoutName="<%= layout %>" layoutFileRelativePath="<%= layoutFileRelativePath %>" data="<%= layoutData %>" >
<layout:component componentName="ProductHeader" >
<!-- product-title -->
<%-- product-title --%>
<%
File productTitleFile = new File(getServletContext().getRealPath("extensions/product-title.jsp"));
if (productTitleFile.exists()) {
Expand Down Expand Up @@ -102,7 +102,7 @@
</div>
</layout:component>
<layout:component componentName="ProductFooter" >
<!-- product-footer -->
<%-- product-footer --%>
<%
File productFooterFile = new File(getServletContext().getRealPath("extensions/product-footer.jsp"));
if (productFooterFile.exists()) {
Expand All @@ -114,7 +114,7 @@
</layout:component>
</layout:main>

<!-- footer -->
<%-- footer --%>
<%
File footerFile = new File(getServletContext().getRealPath("extensions/footer.jsp"));
if (footerFile.exists()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<link rel="icon" href="libs/themes/default/assets/images/favicon.ico" type="image/x-icon"/>
<link href="libs/themes/default/theme.2857d6ef.min.css" rel="stylesheet">
<link href="libs/themes/default/theme.70534561.min.css" rel="stylesheet">

<title><%=request.getAttribute("pageTitle")%></title>

Expand Down
43 changes: 27 additions & 16 deletions modules/distribution/product/src/main/extensions/login.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,24 @@
String multiOptionURIParam = "";
if (localAuthenticatorNames.size() > 1 || idpAuthenticatorMapping != null && idpAuthenticatorMapping.size() > 1) {
String baseURL;
try {
baseURL = ServiceURLBuilder.create().addPath(request.getRequestURI()).build().getRelativePublicURL();
} catch (URLBuilderException e) {
request.setAttribute(STATUS, AuthenticationEndpointUtil.i18n(resourceBundle, "internal.error.occurred"));
request.setAttribute(STATUS_MSG, AuthenticationEndpointUtil.i18n(resourceBundle, "error.when.processing.authentication.request"));
request.getRequestDispatcher("error.do").forward(request, response);
return;
// Check whether authentication endpoint is hosted externally.
String isHostedExternally = application.getInitParameter("IsHostedExternally");
if (Boolean.parseBoolean(isHostedExternally)) {
String requestURI = request.getRequestURI();
if (StringUtils.isNotBlank(requestURI)) {
requestURI = requestURI.startsWith("/") ? requestURI : "/" + requestURI;
requestURI = requestURI.endsWith("/") ? requestURI.substring(0, requestURI.length() - 1) : requestURI;
}
baseURL = requestURI;
} else {
try {
baseURL = ServiceURLBuilder.create().addPath(request.getRequestURI()).build().getRelativePublicURL();
} catch (URLBuilderException e) {
request.setAttribute(STATUS, AuthenticationEndpointUtil.i18n(resourceBundle, "internal.error.occurred"));
request.setAttribute(STATUS_MSG, AuthenticationEndpointUtil.i18n(resourceBundle, "error.when.processing.authentication.request"));
request.getRequestDispatcher("error.do").forward(request, response);
return;
}
}

String queryParamString = request.getQueryString() != null ? ("?" + request.getQueryString()) : "";
Expand Down Expand Up @@ -193,7 +204,7 @@
<!doctype html>
<html>
<head>
<!-- header -->
<%-- header --%>
<%
File headerFile = new File(getServletContext().getRealPath("extensions/header.jsp"));
if (headerFile.exists()) {
Expand Down Expand Up @@ -222,7 +233,7 @@

<layout:main layoutName="<%= layout %>" layoutFileRelativePath="<%= layoutFileRelativePath %>" data="<%= layoutData %>" >
<layout:component componentName="ProductHeader" >
<!-- product-title -->
<%-- product-title --%>
<%
File productTitleFile = new File(getServletContext().getRealPath("extensions/product-title.jsp"));
if (productTitleFile.exists()) {
Expand Down Expand Up @@ -353,14 +364,14 @@
<div class="external-login blurring external-login-dimmer">
<div class="field">
<button
class="ui button fluid"
class="ui button secondary fluid"
onclick="handleNoDomain(this,
'<%=Encode.forJavaScriptAttribute(Encode.forUriComponent(idpName))%>',
'<%=Encode.forJavaScriptAttribute(Encode.forUriComponent(idpEntry.getValue()))%>')"
id="icon-<%=iconId%>"
title="<%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with")%> <%=Encode.forHtmlAttribute(idpName)%>"
>
<img class="ui image" src="<%=Encode.forHtmlAttribute(imageURL)%>">
<img role="presentation" class="ui image" src="<%=Encode.forHtmlAttribute(imageURL)%>">
<span><%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with")%> <%=Encode.forHtmlContent(idpName)%></span>
</button>
</div>
Expand All @@ -374,7 +385,7 @@
<button class="ui blue labeled icon button fluid"
onclick="handleNoDomain(this,
'<%=Encode.forJavaScriptAttribute(Encode.forUriComponent(idpEntry.getKey()))%>',
'IWAAuthenticator')"
'IwaNTLMAuthenticator')"
id="icon-<%=iconId%>"
title="<%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with")%> IWA">
<%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with")%> <strong>IWA</strong>
Expand Down Expand Up @@ -408,7 +419,7 @@
title="<%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with")%>
<%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with" )%>">
<i class="usb icon"></i>
<img src="libs/themes/default/assets/images/icons/fingerprint.svg" alt="Fido Logo" />
<img role="presentation" src="libs/themes/default/assets/images/icons/fingerprint.svg" alt="Fido Logo" />
<span>
<%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with" )%>
<%=AuthenticationEndpointUtil.i18n(resourceBundle, "fido.authenticator" )%>
Expand All @@ -427,7 +438,7 @@
title="<%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with")%>
<%=AuthenticationEndpointUtil.i18n(resourceBundle, "magic.link" )%>"
data-componentid="login-page-sign-in-with-magic-link">
<img class="ui image" src="libs/themes/default/assets/images/icons/magic-link-icon.svg" alt="Magic Link Logo" />
<img role="presentation" class="ui image" src="libs/themes/default/assets/images/icons/magic-link-icon.svg" alt="Magic Link Logo" />
<span>
<%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with" )%>
<%=AuthenticationEndpointUtil.i18n(resourceBundle, "magic.link" )%>
Expand Down Expand Up @@ -461,7 +472,7 @@
</div>
</layout:component>
<layout:component componentName="ProductFooter" >
<!-- product-footer -->
<%-- product-footer --%>
<%
File productFooterFile = new File(getServletContext().getRealPath("extensions/product-footer.jsp"));
if (productFooterFile.exists()) {
Expand All @@ -473,7 +484,7 @@
</layout:component>
</layout:main>

<!-- footer -->
<%-- footer --%>
<%
File footerFile = new File(getServletContext().getRealPath("extensions/footer.jsp"));
if (footerFile.exists()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
%>

<!doctype html>
<html>
<html lang="en-US">
<head>
<%
File headerFile = new File(getServletContext().getRealPath("extensions/header.jsp"));
Expand All @@ -131,7 +131,7 @@
<body class="login-portal layout recovery-layout">
<layout:main layoutName="<%= layout %>" layoutFileRelativePath="<%= layoutFileRelativePath %>" data="<%= layoutData %>" >
<layout:component componentName="ProductHeader" >
<!-- product-title -->
<%-- product-title --%>
<%
File productTitleFile = new File(getServletContext().getRealPath("extensions/product-title.jsp"));
if (productTitleFile.exists()) {
Expand All @@ -143,7 +143,7 @@
</layout:component>
<layout:component componentName="MainSection" >
<div class="ui segment">
<!-- page content -->
<%-- page content --%>
<h3 class="ui header">
<%=IdentityManagementEndpointUtil.i18n(recoveryResourceBundle, "Recover.password")%>
</h3>
Expand Down Expand Up @@ -275,7 +275,7 @@
</div>
</layout:component>
<layout:component componentName="ProductFooter" >
<!-- product-footer -->
<%-- product-footer --%>
<%
File productFooterFile = new File(getServletContext().getRealPath("extensions/product-footer.jsp"));
if (productFooterFile.exists()) {
Expand All @@ -287,7 +287,7 @@
</layout:component>
</layout:main>

<!-- footer -->
<%-- footer --%>
<%
File footerFile = new File(getServletContext().getRealPath("extensions/footer.jsp"));
if (footerFile.exists()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
~ under the License.
--%>

<!-- page content -->
<%-- page content -->
<div class="ui grid">
<div class="two column row"></div>
<div class="four wide computer four wide tablet column">
<div id="toc" class="ui segment toc"></div>
</div>
<div class="twelve wide computer twelve wide tablet column">
<!-- content -->
<%-- content --%>
<div>
<div>
<h1>
Expand Down Expand Up @@ -141,7 +141,7 @@
<%-- /Customizable content --%>
</div>
</div>
<!-- /content -->
<%-- /content --%>
</div>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<!-- localize.jsp MUST already be included in the calling script -->

<!-- footer -->
<%-- footer --%>
<footer class="footer" style="text-align: center">
<div class="container-fluid">
<p><%=request.getAttribute("footerText")%> | &copy;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
%>

<!doctype html>
<html>
<html lang="en-US">
<head>
<%
File headerFile = new File(getServletContext().getRealPath("extensions/header.jsp"));
Expand Down Expand Up @@ -134,7 +134,7 @@
</div>
</div>

<!-- footer -->
<%-- footer --%>
<%
File footerFile = new File(getServletContext().getRealPath("extensions/footer.jsp"));
if (footerFile.exists()) {
Expand Down
Loading
Loading