This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 14460f49e1577276fc1b80b998ecfc36a45bc420
Merge: e57a82a4f52 38c7c6e9865
Author: Wei Zhou <weiz...@apache.org>
AuthorDate: Thu Dec 12 11:55:39 2024 +0100
Merge remote-tracking branch 'apache/4.19' into 4.20
.../java/org/apache/cloudstack/saml/SAMLUtils.java | 1 +
ui/src/components/menu/SMenu.vue | 6 +++++
ui/src/components/view/InfoCard.vue | 26 +++++++++++++++++-----
ui/src/components/view/ListView.vue | 6 ++---
ui/src/config/section/network.js | 2 +-
ui/src/core/ext.js | 8 ++-----
6 files changed, 33 insertions(+), 16 deletions(-)
diff --cc
plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAMLUtils.java
index 54f6e84fe36,fd68e2be1ae..364a43e93c0
---
a/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAMLUtils.java
+++
b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAMLUtils.java
@@@ -319,8 -318,9 +319,9 @@@ public class SAMLUtils
}
String sameSite = ApiServlet.getApiSessionKeySameSite();
String sessionKeyCookie = String.format("%s=%s;Domain=%s;Path=%s;%s",
ApiConstants.SESSIONKEY, loginResponse.getSessionKey(), domain, path, sameSite);
- s_logger.debug("Adding sessionkey cookie to response: " +
sessionKeyCookie);
+ LOGGER.debug("Adding sessionkey cookie to response: " +
sessionKeyCookie);
resp.addHeader("SET-COOKIE", sessionKeyCookie);
+ resp.addHeader("SET-COOKIE",
String.format("%s=%s;HttpOnly;Path=/client/api;%s", ApiConstants.SESSIONKEY,
loginResponse.getSessionKey(), sameSite));
}
/**
