You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2024/10/10 16:52:04 UTC
(cloudstack) tag 4.19.1.2 created (now 18fe4226cec)
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to tag 4.19.1.2
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
at 18fe4226cec (commit)
This tag includes the following new commits:
new 8a2f6528f1e Session Token Invalidation on Logout
new 123b426c16c fix quota resource access validation
new 4fa22f4d588 Validate QCOW2 on upload and register
new 13dd6983428 util: check JSESSIONID in cookies if user is passed
new b3f9824be1e Fix Vue devServer after CSRF fix
new 18fe4226cec Updating pom.xml version numbers for release 4.19.1.2
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(cloudstack) 04/06: util: check JSESSIONID in cookies if user is passed
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to tag 4.19.1.2
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 13dd6983428a535a5d401bce106dd5da9a1b802a
Author: Wei Zhou <we...@apache.org>
AuthorDate: Tue Sep 10 18:25:36 2024 +0200
util: check JSESSIONID in cookies if user is passed
---
.../api/command/ListAndSwitchSAMLAccountCmd.java | 7 +-
.../apache/cloudstack/saml/SAML2AuthManager.java | 3 +
.../cloudstack/saml/SAML2AuthManagerImpl.java | 3 +-
.../java/org/apache/cloudstack/saml/SAMLUtils.java | 25 ++++-
.../command/ListAndSwitchSAMLAccountCmdTest.java | 25 ++++-
server/src/main/java/com/cloud/api/ApiServer.java | 26 +++++-
server/src/main/java/com/cloud/api/ApiServlet.java | 102 +++++++++++++--------
test/integration/smoke/test_login.py | 1 +
ui/src/api/index.js | 10 ++
ui/src/store/modules/user.js | 1 -
utils/src/main/java/com/cloud/utils/HttpUtils.java | 42 +++++++--
.../test/java/com/cloud/utils/HttpUtilsTest.java | 86 ++++++++++++++---
12 files changed, 266 insertions(+), 65 deletions(-)
diff --git a/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmd.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmd.java
index 25f056adf68..c2f81cd3356 100644
--- a/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmd.java
+++ b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmd.java
@@ -48,6 +48,7 @@ import org.apache.cloudstack.saml.SAML2AuthManager;
import org.apache.cloudstack.saml.SAMLUtils;
import org.apache.log4j.Logger;
+import com.cloud.api.ApiServer;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.domain.Domain;
import com.cloud.domain.dao.DomainDao;
@@ -60,6 +61,8 @@ import com.cloud.user.dao.UserAccountDao;
import com.cloud.user.dao.UserDao;
import com.cloud.utils.HttpUtils;
+import org.apache.commons.lang3.EnumUtils;
+
@APICommand(name = "listAndSwitchSamlAccount", description = "Lists and switches to other SAML accounts owned by the SAML user", responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListAndSwitchSAMLAccountCmd extends BaseCmd implements APIAuthenticator {
public static final Logger s_logger = Logger.getLogger(ListAndSwitchSAMLAccountCmd.class.getName());
@@ -104,7 +107,9 @@ public class ListAndSwitchSAMLAccountCmd extends BaseCmd implements APIAuthentic
params, responseType));
}
- if (!HttpUtils.validateSessionKey(session, params, req.getCookies(), ApiConstants.SESSIONKEY)) {
+ HttpUtils.ApiSessionKeyCheckOption sessionKeyCheckOption = EnumUtils.getEnumIgnoreCase(HttpUtils.ApiSessionKeyCheckOption.class,
+ ApiServer.ApiSessionKeyCheckLocations.value(), HttpUtils.ApiSessionKeyCheckOption.CookieAndParameter);
+ if (!HttpUtils.validateSessionKey(session, params, req.getCookies(), ApiConstants.SESSIONKEY, sessionKeyCheckOption)) {
throw new ServerApiException(ApiErrorCode.UNAUTHORIZED, _apiServer.getSerializedApiError(ApiErrorCode.UNAUTHORIZED.getHttpCode(),
"Unauthorized session, please re-login",
params, responseType));
diff --git a/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAML2AuthManager.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAML2AuthManager.java
index 3a4030f9c0d..e10ea08012f 100644
--- a/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAML2AuthManager.java
+++ b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAML2AuthManager.java
@@ -73,6 +73,9 @@ public interface SAML2AuthManager extends PluggableAPIAuthenticator, PluggableSe
ConfigKey<Boolean> SAMLCheckSignature = new ConfigKey<Boolean>("Advanced", Boolean.class, "saml2.check.signature", "true",
"When enabled (default and recommended), SAML2 signature checks are enforced and lack of signature in the SAML SSO response will cause login exception. Disabling this is not advisable but provided for backward compatibility for users who are able to accept the risks.", false);
+ ConfigKey<String> SAMLUserSessionKeyPathAttribute = new ConfigKey<String>("Advanced", String.class, "saml2.user.sessionkey.path", "",
+ "The Path attribute of sessionkey cookie when SAML users have logged in. If not set, it will be set to the path of SAML redirection URL (saml2.redirect.url).", true);
+
SAMLProviderMetadata getSPMetadata();
SAMLProviderMetadata getIdPMetadata(String entityId);
Collection<SAMLProviderMetadata> getAllIdPMetadata();
diff --git a/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java
index dfa76414fb7..aa1e0be91c7 100644
--- a/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java
+++ b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java
@@ -542,6 +542,7 @@ public class SAML2AuthManagerImpl extends AdapterBase implements SAML2AuthManage
SAMLServiceProviderSingleSignOnURL, SAMLServiceProviderSingleLogOutURL,
SAMLCloudStackRedirectionUrl, SAMLUserAttributeName,
SAMLIdentityProviderMetadataURL, SAMLDefaultIdentityProviderId,
- SAMLSignatureAlgorithm, SAMLAppendDomainSuffix, SAMLTimeout, SAMLCheckSignature};
+ SAMLSignatureAlgorithm, SAMLAppendDomainSuffix, SAMLTimeout, SAMLCheckSignature,
+ SAMLUserSessionKeyPathAttribute};
}
}
diff --git 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
index f10bc891368..bb94c8af4c2 100644
--- 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
@@ -25,6 +25,8 @@ import java.io.IOException;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.math.BigInteger;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URLEncoder;
import java.nio.charset.Charset;
import java.security.InvalidKeyException;
@@ -101,7 +103,9 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.SAXException;
+import com.cloud.api.ApiServlet;
import com.cloud.utils.HttpUtils;
+import com.cloud.utils.exception.CloudRuntimeException;
public class SAMLUtils {
public static final Logger s_logger = Logger.getLogger(SAMLUtils.class);
@@ -296,7 +300,26 @@ public class SAMLUtils {
resp.addCookie(new Cookie("timezone", URLEncoder.encode(timezone, HttpUtils.UTF_8)));
}
resp.addCookie(new Cookie("userfullname", URLEncoder.encode(loginResponse.getFirstName() + " " + loginResponse.getLastName(), HttpUtils.UTF_8).replace("+", "%20")));
- resp.addHeader("SET-COOKIE", String.format("%s=%s;HttpOnly;Path=/client/api", ApiConstants.SESSIONKEY, loginResponse.getSessionKey()));
+
+ String redirectUrl = SAML2AuthManager.SAMLCloudStackRedirectionUrl.value();
+ String path = SAML2AuthManager.SAMLUserSessionKeyPathAttribute.value();
+ String domain = null;
+ try {
+ URI redirectUri = new URI(redirectUrl);
+ domain = redirectUri.getHost();
+ if (StringUtils.isBlank(path)) {
+ path = redirectUri.getPath();
+ }
+ if (StringUtils.isBlank(path)) {
+ path = "/";
+ }
+ } catch (URISyntaxException ex) {
+ throw new CloudRuntimeException("Invalid URI: " + redirectUrl);
+ }
+ 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);
+ resp.addHeader("SET-COOKIE", sessionKeyCookie);
}
/**
diff --git a/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmdTest.java b/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmdTest.java
index b4d230e3cd6..729334d22ce 100644
--- a/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmdTest.java
+++ b/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmdTest.java
@@ -27,6 +27,7 @@ import java.net.InetAddress;
import java.util.HashMap;
import java.util.Map;
+import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
@@ -88,6 +89,9 @@ public class ListAndSwitchSAMLAccountCmdTest extends TestCase {
@Mock
HttpServletRequest req;
+ final String sessionId = "node0xxxxxxxxxxxxx";
+ Cookie[] cookies;
+
@Test
public void testListAndSwitchSAMLAccountCmd() throws Exception {
// Setup
@@ -95,6 +99,7 @@ public class ListAndSwitchSAMLAccountCmdTest extends TestCase {
final String sessionKeyValue = "someSessionIDValue";
Mockito.when(session.getAttribute(ApiConstants.SESSIONKEY)).thenReturn(sessionKeyValue);
Mockito.when(session.getAttribute("userid")).thenReturn(2L);
+ Mockito.when(session.getId()).thenReturn(sessionId);
params.put(ApiConstants.USER_ID, new String[]{"2"});
params.put(ApiConstants.DOMAIN_ID, new String[]{"1"});
Mockito.when(userDao.findByUuid(anyString())).thenReturn(new UserVO(2L));
@@ -146,7 +151,25 @@ public class ListAndSwitchSAMLAccountCmdTest extends TestCase {
Mockito.verify(accountService, Mockito.times(0)).getUserAccountById(Mockito.anyLong());
}
- // valid sessionkey value test
+ // valid sessionkey value and invalid JSESSIONID test
+ cookies = new Cookie[2];
+ cookies[0] = new Cookie(ApiConstants.SESSIONKEY, sessionKeyValue);
+ cookies[1] = new Cookie("JSESSIONID", "invalid-JSESSIONID");
+ Mockito.when(req.getCookies()).thenReturn(cookies);
+ params.put(ApiConstants.SESSIONKEY, new String[]{sessionKeyValue});
+ try {
+ cmd.authenticate("command", params, session, null, HttpUtils.RESPONSE_TYPE_JSON, new StringBuilder(), req, resp);
+ } catch (ServerApiException exception) {
+ assertEquals(exception.getErrorCode(), ApiErrorCode.UNAUTHORIZED);
+ } finally {
+ Mockito.verify(accountService, Mockito.times(0)).getUserAccountById(Mockito.anyLong());
+ }
+
+ // valid sessionkey value and valid JSESSIONID test
+ cookies = new Cookie[2];
+ cookies[0] = new Cookie(ApiConstants.SESSIONKEY, sessionKeyValue);
+ cookies[1] = new Cookie("JSESSIONID", sessionId + ".node0");
+ Mockito.when(req.getCookies()).thenReturn(cookies);
params.put(ApiConstants.SESSIONKEY, new String[]{sessionKeyValue});
try {
cmd.authenticate("command", params, session, null, HttpUtils.RESPONSE_TYPE_JSON, new StringBuilder(), req, resp);
diff --git a/server/src/main/java/com/cloud/api/ApiServer.java b/server/src/main/java/com/cloud/api/ApiServer.java
index b1a04932cf9..d68f42470d5 100644
--- a/server/src/main/java/com/cloud/api/ApiServer.java
+++ b/server/src/main/java/com/cloud/api/ApiServer.java
@@ -33,6 +33,7 @@ import java.text.ParseException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
+import java.util.EnumSet;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
@@ -47,6 +48,7 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import java.util.stream.Collectors;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
@@ -168,6 +170,8 @@ import com.cloud.user.UserVO;
import com.cloud.utils.ConstantTimeComparator;
import com.cloud.utils.DateUtil;
import com.cloud.utils.HttpUtils;
+import com.cloud.utils.HttpUtils.ApiSessionKeySameSite;
+import com.cloud.utils.HttpUtils.ApiSessionKeyCheckOption;
import com.cloud.utils.Pair;
import com.cloud.utils.ReflectUtil;
import com.cloud.utils.StringUtils;
@@ -306,6 +310,24 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
, true
, ConfigKey.Scope.Global);
+ static final ConfigKey<String> ApiSessionKeyCookieSameSiteSetting = new ConfigKey<>(String.class
+ , "api.sessionkey.cookie.samesite"
+ , ConfigKey.CATEGORY_ADVANCED
+ , ApiSessionKeySameSite.Lax.name()
+ , "The SameSite attribute of cookie 'sessionkey'. Valid options are: Lax (default), Strict, NoneAndSecure and Null."
+ , true
+ , ConfigKey.Scope.Global, null, null, null, null, null, ConfigKey.Kind.Select,
+ EnumSet.allOf(ApiSessionKeySameSite.class).stream().map(Enum::toString).collect(Collectors.joining(", ")));
+
+ public static final ConfigKey<String> ApiSessionKeyCheckLocations = new ConfigKey<>(String.class
+ , "api.sessionkey.check.locations"
+ , ConfigKey.CATEGORY_ADVANCED
+ , ApiSessionKeyCheckOption.CookieAndParameter.name()
+ , "The locations of 'sessionkey' during the validation of the API requests. Valid options are: CookieOrParameter, ParameterOnly, CookieAndParameter (default)."
+ , true
+ , ConfigKey.Scope.Global, null, null, null, null, null, ConfigKey.Kind.Select,
+ EnumSet.allOf(ApiSessionKeyCheckOption.class).stream().map(Enum::toString).collect(Collectors.joining(", ")));
+
@Override
public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
messageBus.subscribe(AsyncJob.Topics.JOB_EVENT_PUBLISH, MessageDispatcher.getDispatcher(this));
@@ -1531,7 +1553,9 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
JSONDefaultContentType,
proxyForwardList,
useForwardHeader,
- listOfForwardHeaders
+ listOfForwardHeaders,
+ ApiSessionKeyCookieSameSiteSetting,
+ ApiSessionKeyCheckLocations
};
}
}
diff --git a/server/src/main/java/com/cloud/api/ApiServlet.java b/server/src/main/java/com/cloud/api/ApiServlet.java
index e719238afef..d9654f03916 100644
--- a/server/src/main/java/com/cloud/api/ApiServlet.java
+++ b/server/src/main/java/com/cloud/api/ApiServlet.java
@@ -47,6 +47,7 @@ import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.managed.context.ManagedContext;
import org.apache.cloudstack.utils.consoleproxy.ConsoleAccessUtils;
import org.apache.log4j.Logger;
+import org.apache.commons.lang3.EnumUtils;
import org.jetbrains.annotations.Nullable;
import org.springframework.stereotype.Component;
import org.springframework.web.context.support.SpringBeanAutowiringSupport;
@@ -63,13 +64,15 @@ import com.cloud.user.User;
import com.cloud.user.UserAccount;
import com.cloud.utils.HttpUtils;
+import com.cloud.utils.HttpUtils.ApiSessionKeySameSite;
+import com.cloud.utils.HttpUtils.ApiSessionKeyCheckOption;
import com.cloud.utils.StringUtils;
import com.cloud.utils.db.EntityManager;
import com.cloud.utils.net.NetUtils;
@Component("apiServlet")
public class ApiServlet extends HttpServlet {
- public static final Logger s_logger = Logger.getLogger(ApiServlet.class.getName());
+ public static final Logger LOGGER = Logger.getLogger(ApiServlet.class.getName());
private static final Logger s_accessLogger = Logger.getLogger("apiserver." + ApiServlet.class.getName());
private static final String REPLACEMENT = "_";
private static final String LOG_REPLACEMENTS = "[\n\r\t]";
@@ -127,7 +130,7 @@ public class ApiServlet extends HttpServlet {
String value = decodeUtf8(paramTokens[1]);
params.put(name, new String[] {value});
} else {
- s_logger.debug("Invalid parameter in URL found. param: " + param);
+ LOGGER.debug("Invalid parameter in URL found. param: " + param);
}
}
}
@@ -156,7 +159,7 @@ public class ApiServlet extends HttpServlet {
if (v.length > 1) {
String message = String.format("Query parameter '%s' has multiple values %s. Only the last value will be respected." +
"It is advised to pass only a single parameter", k, Arrays.toString(v));
- s_logger.warn(message);
+ LOGGER.warn(message);
}
});
@@ -167,7 +170,7 @@ public class ApiServlet extends HttpServlet {
try {
remoteAddress = getClientAddress(req);
} catch (UnknownHostException e) {
- s_logger.warn("UnknownHostException when trying to lookup remote IP-Address. This should never happen. Blocking request.", e);
+ LOGGER.warn("UnknownHostException when trying to lookup remote IP-Address. This should never happen. Blocking request.", e);
final String response = apiServer.getSerializedApiError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
"UnknownHostException when trying to lookup remote IP-Address", null,
HttpUtils.RESPONSE_TYPE_XML);
@@ -191,17 +194,17 @@ public class ApiServlet extends HttpServlet {
// logging the request start and end in management log for easy debugging
String reqStr = "";
String cleanQueryString = StringUtils.cleanString(req.getQueryString());
- if (s_logger.isDebugEnabled()) {
+ if (LOGGER.isDebugEnabled()) {
reqStr = auditTrailSb.toString() + " " + cleanQueryString;
- s_logger.debug("===START=== " + reqStr);
+ LOGGER.debug("===START=== " + reqStr);
}
try {
resp.setContentType(HttpUtils.XML_CONTENT_TYPE);
HttpSession session = req.getSession(false);
- if (s_logger.isTraceEnabled()) {
- s_logger.trace(String.format("session found: %s", session));
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace(String.format("session found: %s", session));
}
final Object[] responseTypeParam = params.get(ApiConstants.RESPONSE);
if (responseTypeParam != null) {
@@ -212,10 +215,10 @@ public class ApiServlet extends HttpServlet {
final String command = commandObj == null ? null : (String) commandObj[0];
final Object[] userObj = params.get(ApiConstants.USERNAME);
String username = userObj == null ? null : (String)userObj[0];
- if (s_logger.isTraceEnabled()) {
+ if (LOGGER.isTraceEnabled()) {
String logCommand = saveLogString(command);
String logName = saveLogString(username);
- s_logger.trace(String.format("command %s processing for user \"%s\"",
+ LOGGER.trace(String.format("command %s processing for user \"%s\"",
logCommand,
logName));
}
@@ -238,25 +241,26 @@ public class ApiServlet extends HttpServlet {
if (ApiServer.EnableSecureSessionCookie.value()) {
resp.setHeader("SET-COOKIE", String.format("JSESSIONID=%s;Secure;HttpOnly;Path=/client", session.getId()));
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Session cookie is marked secure!");
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Session cookie is marked secure!");
}
}
}
try {
- if (s_logger.isTraceEnabled()) {
- s_logger.trace(String.format("apiAuthenticator.authenticate(%s, params[%d], %s, %s, %s, %s, %s,%s)",
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace(String.format("apiAuthenticator.authenticate(%s, params[%d], %s, %s, %s, %s, %s,%s)",
saveLogString(command), params.size(), session.getId(), remoteAddress.getHostAddress(), saveLogString(responseType), "auditTrailSb", "req", "resp"));
}
responseString = apiAuthenticator.authenticate(command, params, session, remoteAddress, responseType, auditTrailSb, req, resp);
if (session != null && session.getAttribute(ApiConstants.SESSIONKEY) != null) {
- resp.addHeader("SET-COOKIE", String.format("%s=%s;HttpOnly", ApiConstants.SESSIONKEY, session.getAttribute(ApiConstants.SESSIONKEY)));
+ String sameSite = getApiSessionKeySameSite();
+ resp.addHeader("SET-COOKIE", String.format("%s=%s;HttpOnly;%s", ApiConstants.SESSIONKEY, session.getAttribute(ApiConstants.SESSIONKEY), sameSite));
}
} catch (ServerApiException e) {
httpResponseCode = e.getErrorCode().getHttpCode();
responseString = e.getMessage();
- s_logger.debug("Authentication failure: " + e.getMessage());
+ LOGGER.debug("Authentication failure: " + e.getMessage());
}
if (apiAuthenticator.getAPIType() == APIAuthenticationType.LOGOUT_API) {
@@ -289,7 +293,7 @@ public class ApiServlet extends HttpServlet {
return;
}
} else {
- s_logger.trace("no command available");
+ LOGGER.trace("no command available");
}
auditTrailSb.append(cleanQueryString);
final boolean isNew = ((session == null) ? true : session.isNew());
@@ -298,15 +302,15 @@ public class ApiServlet extends HttpServlet {
// we no longer rely on web-session here, verifyRequest will populate user/account information
// if a API key exists
- if (isNew && s_logger.isTraceEnabled()) {
- s_logger.trace(String.format("new session: %s", session));
+ if (isNew && LOGGER.isTraceEnabled()) {
+ LOGGER.trace(String.format("new session: %s", session));
}
if (!isNew && (command.equalsIgnoreCase(ValidateUserTwoFactorAuthenticationCodeCmd.APINAME) || (!skip2FAcheckForAPIs(command) && !skip2FAcheckForUser(session)))) {
- s_logger.debug("Verifying two factor authentication");
+ LOGGER.debug("Verifying two factor authentication");
boolean success = verify2FA(session, command, auditTrailSb, params, remoteAddress, responseType, req, resp);
if (!success) {
- s_logger.debug("Verification of two factor authentication failed");
+ LOGGER.debug("Verification of two factor authentication failed");
return;
}
}
@@ -319,8 +323,8 @@ public class ApiServlet extends HttpServlet {
if (account != null) {
if (invalidateHttpSessionIfNeeded(req, resp, auditTrailSb, responseType, params, session, account)) return;
} else {
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("no account, this request will be validated through apikey(%s)/signature");
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("no account, this request will be validated through apikey(%s)/signature");
}
}
@@ -330,8 +334,8 @@ public class ApiServlet extends HttpServlet {
CallContext.register(accountMgr.getSystemUser(), accountMgr.getSystemAccount());
}
setProjectContext(params);
- if (s_logger.isTraceEnabled()) {
- s_logger.trace(String.format("verifying request for user %s from %s with %d parameters",
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace(String.format("verifying request for user %s from %s with %d parameters",
userId, remoteAddress.getHostAddress(), params.size()));
}
if (apiServer.verifyRequest(params, userId, remoteAddress)) {
@@ -362,18 +366,34 @@ public class ApiServlet extends HttpServlet {
HttpUtils.writeHttpResponse(resp, serializedResponseText, se.getErrorCode().getHttpCode(), responseType, ApiServer.JSONcontentType.value());
auditTrailSb.append(" " + se.getErrorCode() + " " + se.getDescription());
} catch (final Exception ex) {
- s_logger.error("unknown exception writing api response", ex);
+ LOGGER.error("unknown exception writing api response", ex);
auditTrailSb.append(" unknown exception writing api response");
} finally {
s_accessLogger.info(auditTrailSb.toString());
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("===END=== " + reqStr);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("===END=== " + reqStr);
}
// cleanup user context to prevent from being peeked in other request context
CallContext.unregister();
}
}
+ public static String getApiSessionKeySameSite() {
+ ApiSessionKeySameSite sameSite = EnumUtils.getEnumIgnoreCase(ApiSessionKeySameSite.class,
+ ApiServer.ApiSessionKeyCookieSameSiteSetting.value(), ApiSessionKeySameSite.Lax);
+ switch (sameSite) {
+ case Strict:
+ return "SameSite=Strict";
+ case NoneAndSecure:
+ return "SameSite=None;Secure";
+ case Null:
+ return "";
+ case Lax:
+ default:
+ return "SameSite=Lax";
+ }
+ }
+
private boolean checkIfAuthenticatorIsOf2FA(String command) {
boolean verify2FA = false;
APIAuthenticator apiAuthenticator = authManager.getAPIAuthenticator(command);
@@ -402,7 +422,7 @@ public class ApiServlet extends HttpServlet {
Long userId = (Long) session.getAttribute("userid");
boolean is2FAverified = (boolean) session.getAttribute(ApiConstants.IS_2FA_VERIFIED);
if (is2FAverified) {
- s_logger.debug(String.format("Two factor authentication is already verified for the user %d, so skipping", userId));
+ LOGGER.debug(String.format("Two factor authentication is already verified for the user %d, so skipping", userId));
skip2FAcheck = true;
} else {
UserAccount userAccount = accountMgr.getUserAccountById(userId);
@@ -433,7 +453,7 @@ public class ApiServlet extends HttpServlet {
HttpUtils.writeHttpResponse(resp, responseString, HttpServletResponse.SC_OK, responseType, ApiServer.JSONcontentType.value());
verify2FA = true;
} else {
- s_logger.error("Cannot find API authenticator while verifying 2FA");
+ LOGGER.error("Cannot find API authenticator while verifying 2FA");
auditTrailSb.append(" Cannot find API authenticator while verifying 2FA");
verify2FA = false;
}
@@ -457,7 +477,7 @@ public class ApiServlet extends HttpServlet {
errorMsg = "Two factor authentication is mandated by admin, user needs to setup 2FA using setupUserTwoFactorAuthentication API and" +
" then verify 2FA using validateUserTwoFactorAuthenticationCode API before calling other APIs. Existing session is invalidated.";
}
- s_logger.error(errorMsg);
+ LOGGER.error(errorMsg);
invalidateHttpSession(session, String.format("Unable to process the API request for %s from %s due to %s", userId, remoteAddress.getHostAddress(), errorMsg));
auditTrailSb.append(" " + ApiErrorCode.UNAUTHORIZED2FA + " " + errorMsg);
@@ -488,7 +508,7 @@ public class ApiServlet extends HttpServlet {
private boolean requestChecksoutAsSane(HttpServletResponse resp, StringBuilder auditTrailSb, String responseType, Map<String, Object[]> params, HttpSession session, String command, Long userId, String account, Object accountObj) {
if ((userId != null) && (account != null) && (accountObj != null) && apiServer.verifyUser(userId)) {
if (command == null) {
- s_logger.info("missing command, ignoring request...");
+ LOGGER.info("missing command, ignoring request...");
auditTrailSb.append(" " + HttpServletResponse.SC_BAD_REQUEST + " " + "no command specified");
final String serializedResponse = apiServer.getSerializedApiError(HttpServletResponse.SC_BAD_REQUEST, "no command specified", params, responseType);
HttpUtils.writeHttpResponse(resp, serializedResponse, HttpServletResponse.SC_BAD_REQUEST, responseType, ApiServer.JSONcontentType.value());
@@ -509,7 +529,9 @@ public class ApiServlet extends HttpServlet {
}
private boolean invalidateHttpSessionIfNeeded(HttpServletRequest req, HttpServletResponse resp, StringBuilder auditTrailSb, String responseType, Map<String, Object[]> params, HttpSession session, String account) {
- if (!HttpUtils.validateSessionKey(session, params, req.getCookies(), ApiConstants.SESSIONKEY)) {
+ ApiSessionKeyCheckOption sessionKeyCheckOption = EnumUtils.getEnumIgnoreCase(ApiSessionKeyCheckOption.class,
+ ApiServer.ApiSessionKeyCheckLocations.value(), ApiSessionKeyCheckOption.CookieAndParameter);
+ if (!HttpUtils.validateSessionKey(session, params, req.getCookies(), ApiConstants.SESSIONKEY, sessionKeyCheckOption)) {
String msg = String.format("invalidating session %s for account %s", session.getId(), account);
invalidateHttpSession(session, msg);
auditTrailSb.append(" " + HttpServletResponse.SC_UNAUTHORIZED + " " + "unable to verify user credentials");
@@ -523,13 +545,13 @@ public class ApiServlet extends HttpServlet {
public static void invalidateHttpSession(HttpSession session, String msg) {
try {
- if (s_logger.isTraceEnabled()) {
- s_logger.trace(msg);
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace(msg);
}
session.invalidate();
} catch (final IllegalStateException ise) {
- if (s_logger.isTraceEnabled()) {
- s_logger.trace(String.format("failed to invalidate session %s", session.getId()));
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace(String.format("failed to invalidate session %s", session.getId()));
}
}
}
@@ -537,7 +559,7 @@ public class ApiServlet extends HttpServlet {
private void setProjectContext(Map<String, Object[]> requestParameters) {
final String[] command = (String[])requestParameters.get(ApiConstants.COMMAND);
if (command == null) {
- s_logger.info("missing command, ignoring request...");
+ LOGGER.info("missing command, ignoring request...");
return;
}
@@ -585,14 +607,14 @@ public class ApiServlet extends HttpServlet {
header = header.trim();
ip = getCorrectIPAddress(request.getHeader(header));
if (StringUtils.isNotBlank(ip)) {
- s_logger.debug(String.format("found ip %s in header %s ", ip, header));
+ LOGGER.debug(String.format("found ip %s in header %s ", ip, header));
break;
}
} // no address found in header so ip is blank and use remote addr
} // else not an allowed proxy address, ip is blank and use remote addr
}
if (StringUtils.isBlank(ip)) {
- s_logger.trace(String.format("no ip found in headers, returning remote address %s.", pretender.getHostAddress()));
+ LOGGER.trace(String.format("no ip found in headers, returning remote address %s.", pretender.getHostAddress()));
return pretender;
}
diff --git a/test/integration/smoke/test_login.py b/test/integration/smoke/test_login.py
index 40d8349a13d..acd6c4334ac 100644
--- a/test/integration/smoke/test_login.py
+++ b/test/integration/smoke/test_login.py
@@ -133,6 +133,7 @@ class TestLogin(cloudstackTestCase):
args["command"] = 'listUsers'
args["listall"] = 'true'
args["response"] = "json"
+ args["sessionkey"] = response.json()['loginresponse']['sessionkey']
response = session.get(self.server_url, params=args)
self.assertEqual(
response.status_code,
diff --git a/ui/src/api/index.js b/ui/src/api/index.js
index 14432010738..7ab87780a9d 100644
--- a/ui/src/api/index.js
+++ b/ui/src/api/index.js
@@ -15,8 +15,13 @@
// specific language governing permissions and limitations
// under the License.
+import Cookies from 'js-cookie'
import { axios, sourceToken } from '@/utils/request'
import { message, notification } from 'ant-design-vue'
+import { vueProps } from '@/vue-app'
+import {
+ ACCESS_TOKEN
+} from '@/store/mutation-types'
export function api (command, args = {}, method = 'GET', data = {}) {
let params = {}
@@ -30,6 +35,11 @@ export function api (command, args = {}, method = 'GET', data = {}) {
})
}
+ const sessionkey = vueProps.$localStorage.get(ACCESS_TOKEN) || Cookies.get('sessionkey')
+ if (sessionkey) {
+ args.sessionkey = sessionkey
+ }
+
return axios({
params: {
...args
diff --git a/ui/src/store/modules/user.js b/ui/src/store/modules/user.js
index 08a0c340c64..46a1905619f 100644
--- a/ui/src/store/modules/user.js
+++ b/ui/src/store/modules/user.js
@@ -24,7 +24,6 @@ import router from '@/router'
import store from '@/store'
import { oauthlogin, login, logout, api } from '@/api'
import { i18n } from '@/locales'
-import { sourceToken } from '@/utils/request'
import {
ACCESS_TOKEN,
diff --git a/utils/src/main/java/com/cloud/utils/HttpUtils.java b/utils/src/main/java/com/cloud/utils/HttpUtils.java
index a5d9f6a16b6..cc97bf4ba15 100644
--- a/utils/src/main/java/com/cloud/utils/HttpUtils.java
+++ b/utils/src/main/java/com/cloud/utils/HttpUtils.java
@@ -37,6 +37,14 @@ public class HttpUtils {
public static final String JSON_CONTENT_TYPE = "application/json; charset=UTF-8";
public static final String XML_CONTENT_TYPE = "text/xml; charset=UTF-8";
+ public enum ApiSessionKeySameSite {
+ Lax, Strict, NoneAndSecure, Null
+ }
+
+ public enum ApiSessionKeyCheckOption {
+ CookieOrParameter, ParameterOnly, CookieAndParameter
+ }
+
public static void addSecurityHeaders(final HttpServletResponse resp) {
if (resp.containsHeader("X-Content-Type-Options")) {
resp.setHeader("X-Content-Type-Options", "nosniff");
@@ -103,23 +111,43 @@ public class HttpUtils {
return null;
}
- public static boolean validateSessionKey(final HttpSession session, final Map<String, Object[]> params, final Cookie[] cookies, final String sessionKeyString) {
+ public static boolean validateSessionKey(final HttpSession session, final Map<String, Object[]> params, final Cookie[] cookies, final String sessionKeyString, final ApiSessionKeyCheckOption apiSessionKeyCheckLocations) {
if (session == null || sessionKeyString == null) {
return false;
}
+ final String jsessionidFromCookie = HttpUtils.findCookie(cookies, "JSESSIONID");
+ if (jsessionidFromCookie == null
+ || !(jsessionidFromCookie.startsWith(session.getId() + '.'))) {
+ s_logger.error("JSESSIONID from cookie is invalid.");
+ return false;
+ }
final String sessionKey = (String) session.getAttribute(sessionKeyString);
+ if (sessionKey == null) {
+ s_logger.error("sessionkey attribute of the session is null.");
+ return false;
+ }
final String sessionKeyFromCookie = HttpUtils.findCookie(cookies, sessionKeyString);
+ boolean isSessionKeyFromCookieValid = sessionKeyFromCookie != null && sessionKey.equals(sessionKeyFromCookie);
+
String[] sessionKeyFromParams = null;
if (params != null) {
sessionKeyFromParams = (String[]) params.get(sessionKeyString);
}
- if ((sessionKey == null)
- || (sessionKeyFromParams == null && sessionKeyFromCookie == null)
- || (sessionKeyFromParams != null && !sessionKey.equals(sessionKeyFromParams[0]))
- || (sessionKeyFromCookie != null && !sessionKey.equals(sessionKeyFromCookie))) {
- return false;
+ boolean isSessionKeyFromParamsValid = sessionKeyFromParams != null && sessionKey.equals(sessionKeyFromParams[0]);
+
+ switch (apiSessionKeyCheckLocations) {
+ case CookieOrParameter:
+ return (sessionKeyFromCookie != null || sessionKeyFromParams != null)
+ && (sessionKeyFromCookie == null || isSessionKeyFromCookieValid)
+ && (sessionKeyFromParams == null || isSessionKeyFromParamsValid);
+ case ParameterOnly:
+ return sessionKeyFromParams != null && isSessionKeyFromParamsValid
+ && (sessionKeyFromCookie == null || isSessionKeyFromCookieValid);
+ case CookieAndParameter:
+ default:
+ return sessionKeyFromCookie != null && isSessionKeyFromCookieValid
+ && sessionKeyFromParams != null && isSessionKeyFromParamsValid;
}
- return true;
}
}
diff --git a/utils/src/test/java/com/cloud/utils/HttpUtilsTest.java b/utils/src/test/java/com/cloud/utils/HttpUtilsTest.java
index e10a5a36b27..e94724ce3d6 100644
--- a/utils/src/test/java/com/cloud/utils/HttpUtilsTest.java
+++ b/utils/src/test/java/com/cloud/utils/HttpUtilsTest.java
@@ -60,35 +60,97 @@ public class HttpUtilsTest {
final String sessionKeyValue = "randomUniqueSessionID";
// session and sessionKeyString null test
- assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString));
+ assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.CookieOrParameter));
sessionKeyString = "sessionkey";
- assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString));
+ assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.CookieOrParameter));
// param and cookie null test
session = new MockHttpSession();
+ final String sessionId = session.getId();
session.setAttribute(sessionKeyString, sessionKeyValue);
- assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString));
+ assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.CookieOrParameter));
- // param null, cookies not null test
+ // param null, cookies not null test (JSESSIONID is null)
params = null;
cookies = new Cookie[]{new Cookie(sessionKeyString, sessionKeyValue)};
- assertFalse(HttpUtils.validateSessionKey(session, params, cookies, "randomString"));
- assertTrue(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString));
+ assertFalse(HttpUtils.validateSessionKey(session, params, cookies, "randomString", HttpUtils.ApiSessionKeyCheckOption.CookieOrParameter));
+ assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.CookieOrParameter));
+
+ // param null, cookies not null test (JSESSIONID is not null and matches)
+ cookies = new Cookie[2];
+ cookies[0] = new Cookie(sessionKeyString, sessionKeyValue);
+ cookies[1] = new Cookie("JSESSIONID", sessionId + ".node0");
+ assertFalse(HttpUtils.validateSessionKey(session, params, cookies, "randomString", HttpUtils.ApiSessionKeyCheckOption.CookieOrParameter));
+
+ // param null, cookies not null test (JSESSIONID is not null but mismatches)
+ cookies = new Cookie[2];
+ cookies[0] = new Cookie(sessionKeyString, sessionKeyValue);
+ cookies[1] = new Cookie("JSESSIONID", "node0xxxxxxxxxxxxx.node0");
+ assertFalse(HttpUtils.validateSessionKey(session, params, cookies, "randomString", HttpUtils.ApiSessionKeyCheckOption.CookieOrParameter));
+ assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.CookieOrParameter));
// param not null, cookies null test
params = new HashMap<String, Object[]>();
params.put(sessionKeyString, new String[]{"randomString"});
cookies = null;
- assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString));
+ assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.CookieOrParameter));
params.put(sessionKeyString, new String[]{sessionKeyValue});
- assertTrue(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString));
+ assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.CookieOrParameter));
- // both param and cookies not null test
+ // both param and cookies not null test (JSESSIONID is null)
params = new HashMap<String, Object[]>();
- cookies = new Cookie[]{new Cookie(sessionKeyString, sessionKeyValue)};
+ cookies = new Cookie[2];
+ cookies[0] = new Cookie(sessionKeyString, sessionKeyValue);
params.put(sessionKeyString, new String[]{"incorrectValue"});
- assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString));
+ assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.CookieOrParameter));
params.put(sessionKeyString, new String[]{sessionKeyValue});
- assertTrue(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString));
+ assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.CookieOrParameter));
+
+ // both param and cookies not null test (JSESSIONID is not null but mismatches)
+ params = new HashMap<String, Object[]>();
+ cookies = new Cookie[2];
+ cookies[0] = new Cookie(sessionKeyString, sessionKeyValue);
+ cookies[1] = new Cookie("JSESSIONID", "node0xxxxxxxxxxxxx.node0");
+ params.put(sessionKeyString, new String[]{"incorrectValue"});
+ assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.CookieOrParameter));
+ params.put(sessionKeyString, new String[]{sessionKeyValue});
+ assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.CookieOrParameter));
+
+ // both param and cookies not null test (JSESSIONID is not null amd matches)
+ params = new HashMap<String, Object[]>();
+ cookies = new Cookie[2];
+ cookies[0] = new Cookie(sessionKeyString, sessionKeyValue);
+ cookies[1] = new Cookie("JSESSIONID", sessionId + ".node0");
+ params.put(sessionKeyString, new String[]{"incorrectValue"});
+ assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.CookieOrParameter));
+ params.put(sessionKeyString, new String[]{sessionKeyValue});
+ assertTrue(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.CookieOrParameter));
+
+ // param not null, cookies null test (JSESSIONID is not null amd matches)
+ params = new HashMap<String, Object[]>();
+ cookies = new Cookie[1];
+ cookies[0] = new Cookie("JSESSIONID", sessionId + ".node0");
+ params.put(sessionKeyString, new String[]{"incorrectValue"});
+ assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.ParameterOnly));
+ assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.CookieAndParameter));
+ params.put(sessionKeyString, new String[]{sessionKeyValue});
+ assertTrue(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.ParameterOnly));
+ assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.CookieAndParameter));
+
+ // param not null (correct), cookies not null test (correct)
+ cookies = new Cookie[2];
+ cookies[0] = new Cookie(sessionKeyString, sessionKeyValue);
+ cookies[1] = new Cookie("JSESSIONID", sessionId + ".node0");
+ assertTrue(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.CookieOrParameter));
+ assertTrue(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.ParameterOnly));
+ assertTrue(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.CookieAndParameter));
+
+ // param not null (correct), cookies not null test (wrong)
+ cookies = new Cookie[2];
+ cookies[0] = new Cookie(sessionKeyString, "incorrectValue");
+ cookies[1] = new Cookie("JSESSIONID", sessionId + ".node0");
+ assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.CookieOrParameter));
+ assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.ParameterOnly));
+ assertFalse(HttpUtils.validateSessionKey(session, params, cookies, sessionKeyString, HttpUtils.ApiSessionKeyCheckOption.CookieAndParameter));
}
}
(cloudstack) 06/06: Updating pom.xml version numbers for release 4.19.1.2
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to tag 4.19.1.2
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 18fe4226cecc930ec0b39c43e5b63a48c17c2ad4
Author: Daan Hoogland <da...@onecht.net>
AuthorDate: Fri Oct 4 11:18:01 2024 +0200
Updating pom.xml version numbers for release 4.19.1.2
Signed-off-by: Daan Hoogland <da...@onecht.net>
---
agent/pom.xml | 2 +-
api/pom.xml | 2 +-
client/pom.xml | 2 +-
core/pom.xml | 2 +-
debian/changelog | 6 ++++++
developer/pom.xml | 2 +-
engine/api/pom.xml | 2 +-
engine/components-api/pom.xml | 2 +-
engine/orchestration/pom.xml | 2 +-
engine/pom.xml | 2 +-
engine/schema/pom.xml | 2 +-
engine/service/pom.xml | 2 +-
engine/storage/cache/pom.xml | 2 +-
engine/storage/configdrive/pom.xml | 2 +-
engine/storage/datamotion/pom.xml | 2 +-
engine/storage/image/pom.xml | 2 +-
engine/storage/integration-test/pom.xml | 2 +-
engine/storage/object/pom.xml | 2 +-
engine/storage/pom.xml | 2 +-
engine/storage/snapshot/pom.xml | 2 +-
engine/storage/volume/pom.xml | 2 +-
engine/userdata/cloud-init/pom.xml | 2 +-
engine/userdata/pom.xml | 2 +-
framework/agent-lb/pom.xml | 2 +-
framework/ca/pom.xml | 2 +-
framework/cluster/pom.xml | 2 +-
framework/config/pom.xml | 2 +-
framework/db/pom.xml | 2 +-
framework/direct-download/pom.xml | 2 +-
framework/events/pom.xml | 2 +-
framework/ipc/pom.xml | 2 +-
framework/jobs/pom.xml | 2 +-
framework/managed-context/pom.xml | 2 +-
framework/pom.xml | 2 +-
framework/quota/pom.xml | 2 +-
framework/rest/pom.xml | 2 +-
framework/security/pom.xml | 2 +-
framework/spring/lifecycle/pom.xml | 2 +-
framework/spring/module/pom.xml | 2 +-
plugins/acl/dynamic-role-based/pom.xml | 2 +-
plugins/acl/project-role-based/pom.xml | 2 +-
plugins/acl/static-role-based/pom.xml | 2 +-
plugins/affinity-group-processors/explicit-dedication/pom.xml | 2 +-
plugins/affinity-group-processors/host-affinity/pom.xml | 2 +-
plugins/affinity-group-processors/host-anti-affinity/pom.xml | 2 +-
plugins/affinity-group-processors/non-strict-host-affinity/pom.xml | 2 +-
.../affinity-group-processors/non-strict-host-anti-affinity/pom.xml | 2 +-
plugins/alert-handlers/snmp-alerts/pom.xml | 2 +-
plugins/alert-handlers/syslog-alerts/pom.xml | 2 +-
plugins/api/discovery/pom.xml | 2 +-
plugins/api/rate-limit/pom.xml | 2 +-
plugins/api/solidfire-intg-test/pom.xml | 2 +-
plugins/api/vmware-sioc/pom.xml | 2 +-
plugins/backup/dummy/pom.xml | 2 +-
plugins/backup/networker/pom.xml | 2 +-
plugins/backup/veeam/pom.xml | 2 +-
plugins/ca/root-ca/pom.xml | 2 +-
plugins/database/mysql-ha/pom.xml | 2 +-
plugins/database/quota/pom.xml | 2 +-
plugins/dedicated-resources/pom.xml | 2 +-
plugins/deployment-planners/implicit-dedication/pom.xml | 2 +-
plugins/deployment-planners/user-concentrated-pod/pom.xml | 2 +-
plugins/deployment-planners/user-dispersing/pom.xml | 2 +-
plugins/drs/cluster/balanced/pom.xml | 2 +-
plugins/drs/cluster/condensed/pom.xml | 2 +-
plugins/event-bus/inmemory/pom.xml | 2 +-
plugins/event-bus/kafka/pom.xml | 2 +-
plugins/event-bus/rabbitmq/pom.xml | 2 +-
plugins/ha-planners/skip-heurestics/pom.xml | 2 +-
plugins/host-allocators/random/pom.xml | 2 +-
plugins/hypervisors/baremetal/pom.xml | 2 +-
plugins/hypervisors/hyperv/pom.xml | 2 +-
plugins/hypervisors/kvm/pom.xml | 2 +-
plugins/hypervisors/ovm/pom.xml | 2 +-
plugins/hypervisors/ovm3/pom.xml | 2 +-
plugins/hypervisors/simulator/pom.xml | 2 +-
plugins/hypervisors/ucs/pom.xml | 2 +-
plugins/hypervisors/vmware/pom.xml | 2 +-
plugins/hypervisors/xenserver/pom.xml | 2 +-
plugins/integrations/cloudian/pom.xml | 2 +-
plugins/integrations/kubernetes-service/pom.xml | 2 +-
plugins/integrations/prometheus/pom.xml | 2 +-
plugins/metrics/pom.xml | 2 +-
plugins/network-elements/bigswitch/pom.xml | 2 +-
plugins/network-elements/brocade-vcs/pom.xml | 2 +-
plugins/network-elements/cisco-vnmc/pom.xml | 2 +-
plugins/network-elements/dns-notifier/pom.xml | 2 +-
plugins/network-elements/elastic-loadbalancer/pom.xml | 2 +-
plugins/network-elements/globodns/pom.xml | 2 +-
plugins/network-elements/internal-loadbalancer/pom.xml | 2 +-
plugins/network-elements/juniper-contrail/pom.xml | 2 +-
plugins/network-elements/netscaler/pom.xml | 2 +-
plugins/network-elements/nicira-nvp/pom.xml | 2 +-
plugins/network-elements/opendaylight/pom.xml | 2 +-
plugins/network-elements/ovs/pom.xml | 2 +-
plugins/network-elements/palo-alto/pom.xml | 2 +-
plugins/network-elements/stratosphere-ssp/pom.xml | 2 +-
plugins/network-elements/tungsten/pom.xml | 2 +-
plugins/network-elements/vxlan/pom.xml | 2 +-
plugins/outofbandmanagement-drivers/ipmitool/pom.xml | 2 +-
plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml | 2 +-
plugins/outofbandmanagement-drivers/redfish/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/shutdown/pom.xml | 2 +-
plugins/storage-allocators/random/pom.xml | 2 +-
plugins/storage/image/default/pom.xml | 2 +-
plugins/storage/image/s3/pom.xml | 2 +-
plugins/storage/image/sample/pom.xml | 2 +-
plugins/storage/image/swift/pom.xml | 2 +-
plugins/storage/object/minio/pom.xml | 2 +-
plugins/storage/object/simulator/pom.xml | 2 +-
plugins/storage/volume/adaptive/pom.xml | 2 +-
plugins/storage/volume/cloudbyte/pom.xml | 2 +-
plugins/storage/volume/datera/pom.xml | 2 +-
plugins/storage/volume/default/pom.xml | 2 +-
plugins/storage/volume/flasharray/pom.xml | 2 +-
plugins/storage/volume/linstor/pom.xml | 2 +-
plugins/storage/volume/nexenta/pom.xml | 2 +-
plugins/storage/volume/primera/pom.xml | 2 +-
plugins/storage/volume/sample/pom.xml | 2 +-
plugins/storage/volume/scaleio/pom.xml | 2 +-
plugins/storage/volume/solidfire/pom.xml | 2 +-
plugins/storage/volume/storpool/pom.xml | 2 +-
plugins/user-authenticators/ldap/pom.xml | 2 +-
plugins/user-authenticators/md5/pom.xml | 2 +-
plugins/user-authenticators/oauth2/pom.xml | 2 +-
plugins/user-authenticators/pbkdf2/pom.xml | 2 +-
plugins/user-authenticators/plain-text/pom.xml | 2 +-
plugins/user-authenticators/saml2/pom.xml | 2 +-
plugins/user-authenticators/sha256salted/pom.xml | 2 +-
plugins/user-two-factor-authenticators/static-pin/pom.xml | 2 +-
plugins/user-two-factor-authenticators/totp/pom.xml | 2 +-
pom.xml | 2 +-
quickcloud/pom.xml | 2 +-
server/pom.xml | 2 +-
services/console-proxy/pom.xml | 2 +-
services/console-proxy/rdpconsole/pom.xml | 2 +-
services/console-proxy/server/pom.xml | 2 +-
services/pom.xml | 2 +-
services/secondary-storage/controller/pom.xml | 2 +-
services/secondary-storage/pom.xml | 2 +-
services/secondary-storage/server/pom.xml | 2 +-
systemvm/pom.xml | 2 +-
test/pom.xml | 2 +-
tools/apidoc/pom.xml | 2 +-
tools/checkstyle/pom.xml | 2 +-
tools/devcloud-kvm/pom.xml | 2 +-
tools/devcloud4/pom.xml | 2 +-
tools/marvin/pom.xml | 2 +-
tools/pom.xml | 2 +-
usage/pom.xml | 2 +-
utils/pom.xml | 2 +-
vmware-base/pom.xml | 2 +-
153 files changed, 158 insertions(+), 152 deletions(-)
diff --git a/agent/pom.xml b/agent/pom.xml
index 25c032abf14..b25d246bd91 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
</parent>
<dependencies>
<dependency>
diff --git a/api/pom.xml b/api/pom.xml
index cdb4e802c2b..2daba5d2057 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
</parent>
<dependencies>
<dependency>
diff --git a/client/pom.xml b/client/pom.xml
index b50a5197bd9..0a098c00fbb 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
</parent>
<repositories>
<repository>
diff --git a/core/pom.xml b/core/pom.xml
index 31200bcadcd..e3b514e2770 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
</parent>
<dependencies>
<dependency>
diff --git a/debian/changelog b/debian/changelog
index d6ac588cba6..524c3891091 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cloudstack (4.19.1.2) unstable; urgency=low
+
+ * Update the version to 4.19.1.2
+
+ -- the Apache CloudStack project <de...@cloudstack.apache.org> Fri, 04 Oct 2024 11:18:01 +0200
+
cloudstack (4.19.1.1) unstable; urgency=low
* Update the version to 4.19.1.1
diff --git a/developer/pom.xml b/developer/pom.xml
index 6cb64ff1fea..25174bfeb25 100644
--- a/developer/pom.xml
+++ b/developer/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
</parent>
<dependencies>
<dependency>
diff --git a/engine/api/pom.xml b/engine/api/pom.xml
index 4ebed0e00be..2654a2ed8d7 100644
--- a/engine/api/pom.xml
+++ b/engine/api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/components-api/pom.xml b/engine/components-api/pom.xml
index de5afd58ff0..651b789dc98 100644
--- a/engine/components-api/pom.xml
+++ b/engine/components-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/orchestration/pom.xml b/engine/orchestration/pom.xml
index f0ab03017d3..dd4bc8aa510 100755
--- a/engine/orchestration/pom.xml
+++ b/engine/orchestration/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/pom.xml b/engine/pom.xml
index eeb19798ec1..3720b4d08b6 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
diff --git a/engine/schema/pom.xml b/engine/schema/pom.xml
index 4d144ae8d91..04de8a07f88 100644
--- a/engine/schema/pom.xml
+++ b/engine/schema/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/service/pom.xml b/engine/service/pom.xml
index acfedb5bd06..ba090f2c5b9 100644
--- a/engine/service/pom.xml
+++ b/engine/service/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
</parent>
<artifactId>cloud-engine-service</artifactId>
<packaging>war</packaging>
diff --git a/engine/storage/cache/pom.xml b/engine/storage/cache/pom.xml
index be1131d3bfe..773fca373af 100644
--- a/engine/storage/cache/pom.xml
+++ b/engine/storage/cache/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/storage/configdrive/pom.xml b/engine/storage/configdrive/pom.xml
index 1071fe5ea1a..ddf2bffc183 100644
--- a/engine/storage/configdrive/pom.xml
+++ b/engine/storage/configdrive/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/storage/datamotion/pom.xml b/engine/storage/datamotion/pom.xml
index cbb9c66f6e8..6f4a06473f3 100644
--- a/engine/storage/datamotion/pom.xml
+++ b/engine/storage/datamotion/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/storage/image/pom.xml b/engine/storage/image/pom.xml
index ff4afad2295..0658effcd50 100644
--- a/engine/storage/image/pom.xml
+++ b/engine/storage/image/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/storage/integration-test/pom.xml b/engine/storage/integration-test/pom.xml
index 1e1d5297488..21a24397985 100644
--- a/engine/storage/integration-test/pom.xml
+++ b/engine/storage/integration-test/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/storage/object/pom.xml b/engine/storage/object/pom.xml
index 9d4982af506..15e0639b031 100644
--- a/engine/storage/object/pom.xml
+++ b/engine/storage/object/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/storage/pom.xml b/engine/storage/pom.xml
index c98cfe4d297..ae5883aa68d 100644
--- a/engine/storage/pom.xml
+++ b/engine/storage/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/storage/snapshot/pom.xml b/engine/storage/snapshot/pom.xml
index d56fc91c85d..baa581bfc1f 100644
--- a/engine/storage/snapshot/pom.xml
+++ b/engine/storage/snapshot/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/storage/volume/pom.xml b/engine/storage/volume/pom.xml
index 25f81e9f926..4d1b634461c 100644
--- a/engine/storage/volume/pom.xml
+++ b/engine/storage/volume/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/userdata/cloud-init/pom.xml b/engine/userdata/cloud-init/pom.xml
index 9c2f92d411a..ece4cad7bf7 100644
--- a/engine/userdata/cloud-init/pom.xml
+++ b/engine/userdata/cloud-init/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>cloud-engine</artifactId>
<groupId>org.apache.cloudstack</groupId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/userdata/pom.xml b/engine/userdata/pom.xml
index 352a68738b7..77a24f3aa66 100644
--- a/engine/userdata/pom.xml
+++ b/engine/userdata/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/framework/agent-lb/pom.xml b/framework/agent-lb/pom.xml
index a65e24e2280..c728ccf6e2e 100644
--- a/framework/agent-lb/pom.xml
+++ b/framework/agent-lb/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>cloudstack-framework</artifactId>
<groupId>org.apache.cloudstack</groupId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
diff --git a/framework/ca/pom.xml b/framework/ca/pom.xml
index e05c55ee65c..7799d1ff262 100644
--- a/framework/ca/pom.xml
+++ b/framework/ca/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
diff --git a/framework/cluster/pom.xml b/framework/cluster/pom.xml
index 1dc046cd63f..b3dbc32eda1 100644
--- a/framework/cluster/pom.xml
+++ b/framework/cluster/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/framework/config/pom.xml b/framework/config/pom.xml
index 4f30a6ed2ba..e1da4732f7f 100644
--- a/framework/config/pom.xml
+++ b/framework/config/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/framework/db/pom.xml b/framework/db/pom.xml
index cc6b82787f3..2dbe24352e7 100644
--- a/framework/db/pom.xml
+++ b/framework/db/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/framework/direct-download/pom.xml b/framework/direct-download/pom.xml
index 0bdefa91a4d..a21e3e99b6f 100644
--- a/framework/direct-download/pom.xml
+++ b/framework/direct-download/pom.xml
@@ -32,7 +32,7 @@
<parent>
<artifactId>cloudstack-framework</artifactId>
<groupId>org.apache.cloudstack</groupId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
diff --git a/framework/events/pom.xml b/framework/events/pom.xml
index 73219ac1ec2..58b68cf4fb7 100644
--- a/framework/events/pom.xml
+++ b/framework/events/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/framework/ipc/pom.xml b/framework/ipc/pom.xml
index b9010371438..bc8cf2501e6 100644
--- a/framework/ipc/pom.xml
+++ b/framework/ipc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/framework/jobs/pom.xml b/framework/jobs/pom.xml
index 93690fd1505..de1cd1e79a4 100644
--- a/framework/jobs/pom.xml
+++ b/framework/jobs/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/framework/managed-context/pom.xml b/framework/managed-context/pom.xml
index d40ed883df1..9d14e7aa53e 100644
--- a/framework/managed-context/pom.xml
+++ b/framework/managed-context/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/framework/pom.xml b/framework/pom.xml
index 7b8bf9f72ec..ab7935d2898 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
</parent>
<build>
<plugins>
diff --git a/framework/quota/pom.xml b/framework/quota/pom.xml
index d4a325e94bc..cbc01880426 100644
--- a/framework/quota/pom.xml
+++ b/framework/quota/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml
index 0119e20a2fd..ca5d9c39beb 100644
--- a/framework/rest/pom.xml
+++ b/framework/rest/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>cloud-framework-rest</artifactId>
diff --git a/framework/security/pom.xml b/framework/security/pom.xml
index 80d596d7407..d565e153e5e 100644
--- a/framework/security/pom.xml
+++ b/framework/security/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/framework/spring/lifecycle/pom.xml b/framework/spring/lifecycle/pom.xml
index 673d9318907..27e6940a77b 100644
--- a/framework/spring/lifecycle/pom.xml
+++ b/framework/spring/lifecycle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/framework/spring/module/pom.xml b/framework/spring/module/pom.xml
index 2174116feb7..ed3668a4b9e 100644
--- a/framework/spring/module/pom.xml
+++ b/framework/spring/module/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/acl/dynamic-role-based/pom.xml b/plugins/acl/dynamic-role-based/pom.xml
index 1bad1036409..3e454a680a4 100644
--- a/plugins/acl/dynamic-role-based/pom.xml
+++ b/plugins/acl/dynamic-role-based/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/acl/project-role-based/pom.xml b/plugins/acl/project-role-based/pom.xml
index 3313467ac29..29160f41d21 100644
--- a/plugins/acl/project-role-based/pom.xml
+++ b/plugins/acl/project-role-based/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/acl/static-role-based/pom.xml b/plugins/acl/static-role-based/pom.xml
index 93f80b7c6dc..75f9e3d44c7 100644
--- a/plugins/acl/static-role-based/pom.xml
+++ b/plugins/acl/static-role-based/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/affinity-group-processors/explicit-dedication/pom.xml b/plugins/affinity-group-processors/explicit-dedication/pom.xml
index aaea68314a1..364552748e1 100644
--- a/plugins/affinity-group-processors/explicit-dedication/pom.xml
+++ b/plugins/affinity-group-processors/explicit-dedication/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/affinity-group-processors/host-affinity/pom.xml b/plugins/affinity-group-processors/host-affinity/pom.xml
index fd4dc621395..8ffc7757589 100644
--- a/plugins/affinity-group-processors/host-affinity/pom.xml
+++ b/plugins/affinity-group-processors/host-affinity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/affinity-group-processors/host-anti-affinity/pom.xml b/plugins/affinity-group-processors/host-anti-affinity/pom.xml
index fe586e3eeff..e2fd7007030 100644
--- a/plugins/affinity-group-processors/host-anti-affinity/pom.xml
+++ b/plugins/affinity-group-processors/host-anti-affinity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/affinity-group-processors/non-strict-host-affinity/pom.xml b/plugins/affinity-group-processors/non-strict-host-affinity/pom.xml
index 344d57f9a4d..1ac2b32d0c8 100644
--- a/plugins/affinity-group-processors/non-strict-host-affinity/pom.xml
+++ b/plugins/affinity-group-processors/non-strict-host-affinity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/affinity-group-processors/non-strict-host-anti-affinity/pom.xml b/plugins/affinity-group-processors/non-strict-host-anti-affinity/pom.xml
index cd86ae88117..87a53f5b82a 100644
--- a/plugins/affinity-group-processors/non-strict-host-anti-affinity/pom.xml
+++ b/plugins/affinity-group-processors/non-strict-host-anti-affinity/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/alert-handlers/snmp-alerts/pom.xml b/plugins/alert-handlers/snmp-alerts/pom.xml
index b1353e743b6..da2ff6e7759 100644
--- a/plugins/alert-handlers/snmp-alerts/pom.xml
+++ b/plugins/alert-handlers/snmp-alerts/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>cloudstack-plugins</artifactId>
<groupId>org.apache.cloudstack</groupId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/alert-handlers/syslog-alerts/pom.xml b/plugins/alert-handlers/syslog-alerts/pom.xml
index 0c3976cc811..f6214e0e8c8 100644
--- a/plugins/alert-handlers/syslog-alerts/pom.xml
+++ b/plugins/alert-handlers/syslog-alerts/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>cloudstack-plugins</artifactId>
<groupId>org.apache.cloudstack</groupId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/api/discovery/pom.xml b/plugins/api/discovery/pom.xml
index 088acb6523d..3d5db00370d 100644
--- a/plugins/api/discovery/pom.xml
+++ b/plugins/api/discovery/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/api/rate-limit/pom.xml b/plugins/api/rate-limit/pom.xml
index 4bddd771c0a..74651b9cc02 100644
--- a/plugins/api/rate-limit/pom.xml
+++ b/plugins/api/rate-limit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
diff --git a/plugins/api/solidfire-intg-test/pom.xml b/plugins/api/solidfire-intg-test/pom.xml
index c7e8cb677f5..ef86ad28aa4 100644
--- a/plugins/api/solidfire-intg-test/pom.xml
+++ b/plugins/api/solidfire-intg-test/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/api/vmware-sioc/pom.xml b/plugins/api/vmware-sioc/pom.xml
index 1138903aea5..a9c4f5b2fbf 100644
--- a/plugins/api/vmware-sioc/pom.xml
+++ b/plugins/api/vmware-sioc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/backup/dummy/pom.xml b/plugins/backup/dummy/pom.xml
index 9c0f783f65a..37e23578a8e 100644
--- a/plugins/backup/dummy/pom.xml
+++ b/plugins/backup/dummy/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>cloudstack-plugins</artifactId>
<groupId>org.apache.cloudstack</groupId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/backup/networker/pom.xml b/plugins/backup/networker/pom.xml
index 43a229a0cc2..bef73c3b113 100644
--- a/plugins/backup/networker/pom.xml
+++ b/plugins/backup/networker/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>cloudstack-plugins</artifactId>
<groupId>org.apache.cloudstack</groupId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/backup/veeam/pom.xml b/plugins/backup/veeam/pom.xml
index 6e3484e447e..50af6e2a8f2 100644
--- a/plugins/backup/veeam/pom.xml
+++ b/plugins/backup/veeam/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>cloudstack-plugins</artifactId>
<groupId>org.apache.cloudstack</groupId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/plugins/ca/root-ca/pom.xml b/plugins/ca/root-ca/pom.xml
index 749da5566ea..ed848716370 100644
--- a/plugins/ca/root-ca/pom.xml
+++ b/plugins/ca/root-ca/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/database/mysql-ha/pom.xml b/plugins/database/mysql-ha/pom.xml
index 875a44fc542..f092b09ce1a 100644
--- a/plugins/database/mysql-ha/pom.xml
+++ b/plugins/database/mysql-ha/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/database/quota/pom.xml b/plugins/database/quota/pom.xml
index 2f3410af2f7..d5bc0d67f41 100644
--- a/plugins/database/quota/pom.xml
+++ b/plugins/database/quota/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/dedicated-resources/pom.xml b/plugins/dedicated-resources/pom.xml
index 4a917c4a7f1..3932a619af5 100644
--- a/plugins/dedicated-resources/pom.xml
+++ b/plugins/dedicated-resources/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/deployment-planners/implicit-dedication/pom.xml b/plugins/deployment-planners/implicit-dedication/pom.xml
index cbd530a15da..d99e8baec99 100644
--- a/plugins/deployment-planners/implicit-dedication/pom.xml
+++ b/plugins/deployment-planners/implicit-dedication/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/deployment-planners/user-concentrated-pod/pom.xml b/plugins/deployment-planners/user-concentrated-pod/pom.xml
index 065fe546b06..231591a9dac 100644
--- a/plugins/deployment-planners/user-concentrated-pod/pom.xml
+++ b/plugins/deployment-planners/user-concentrated-pod/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/deployment-planners/user-dispersing/pom.xml b/plugins/deployment-planners/user-dispersing/pom.xml
index deb6b51231a..cafc155acad 100644
--- a/plugins/deployment-planners/user-dispersing/pom.xml
+++ b/plugins/deployment-planners/user-dispersing/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/drs/cluster/balanced/pom.xml b/plugins/drs/cluster/balanced/pom.xml
index 3aa5ed0467f..18970478c8b 100644
--- a/plugins/drs/cluster/balanced/pom.xml
+++ b/plugins/drs/cluster/balanced/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/drs/cluster/condensed/pom.xml b/plugins/drs/cluster/condensed/pom.xml
index 094f75058d7..b353db228f6 100644
--- a/plugins/drs/cluster/condensed/pom.xml
+++ b/plugins/drs/cluster/condensed/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/event-bus/inmemory/pom.xml b/plugins/event-bus/inmemory/pom.xml
index 7b107eef601..58d84ea1a20 100644
--- a/plugins/event-bus/inmemory/pom.xml
+++ b/plugins/event-bus/inmemory/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/event-bus/kafka/pom.xml b/plugins/event-bus/kafka/pom.xml
index f76693d2702..05a5a1f8c3d 100644
--- a/plugins/event-bus/kafka/pom.xml
+++ b/plugins/event-bus/kafka/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/event-bus/rabbitmq/pom.xml b/plugins/event-bus/rabbitmq/pom.xml
index e3e2d22f506..9306626672e 100644
--- a/plugins/event-bus/rabbitmq/pom.xml
+++ b/plugins/event-bus/rabbitmq/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/ha-planners/skip-heurestics/pom.xml b/plugins/ha-planners/skip-heurestics/pom.xml
index 54f753e19d1..1286be1092d 100644
--- a/plugins/ha-planners/skip-heurestics/pom.xml
+++ b/plugins/ha-planners/skip-heurestics/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/host-allocators/random/pom.xml b/plugins/host-allocators/random/pom.xml
index 71cecd96250..1aff16f0c4c 100644
--- a/plugins/host-allocators/random/pom.xml
+++ b/plugins/host-allocators/random/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/hypervisors/baremetal/pom.xml b/plugins/hypervisors/baremetal/pom.xml
index 7e595ee8fbd..dc121da0b7e 100755
--- a/plugins/hypervisors/baremetal/pom.xml
+++ b/plugins/hypervisors/baremetal/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>cloud-plugin-hypervisor-baremetal</artifactId>
diff --git a/plugins/hypervisors/hyperv/pom.xml b/plugins/hypervisors/hyperv/pom.xml
index e458f42002f..642c5a202f7 100644
--- a/plugins/hypervisors/hyperv/pom.xml
+++ b/plugins/hypervisors/hyperv/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<properties>
diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml
index 8772e2067f7..7db4f6e10ef 100644
--- a/plugins/hypervisors/kvm/pom.xml
+++ b/plugins/hypervisors/kvm/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/hypervisors/ovm/pom.xml b/plugins/hypervisors/ovm/pom.xml
index 071da377e8f..4afc662c391 100644
--- a/plugins/hypervisors/ovm/pom.xml
+++ b/plugins/hypervisors/ovm/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/hypervisors/ovm3/pom.xml b/plugins/hypervisors/ovm3/pom.xml
index 93bed50f557..cd78cbea4a0 100644
--- a/plugins/hypervisors/ovm3/pom.xml
+++ b/plugins/hypervisors/ovm3/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/hypervisors/simulator/pom.xml b/plugins/hypervisors/simulator/pom.xml
index fb6d76360c7..5d5f0f706ed 100644
--- a/plugins/hypervisors/simulator/pom.xml
+++ b/plugins/hypervisors/simulator/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>cloud-plugin-hypervisor-simulator</artifactId>
diff --git a/plugins/hypervisors/ucs/pom.xml b/plugins/hypervisors/ucs/pom.xml
index 715ff0badff..13a7cb2f01f 100644
--- a/plugins/hypervisors/ucs/pom.xml
+++ b/plugins/hypervisors/ucs/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>cloud-plugin-hypervisor-ucs</artifactId>
diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml
index b8889cbffec..7afb2890682 100644
--- a/plugins/hypervisors/vmware/pom.xml
+++ b/plugins/hypervisors/vmware/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/hypervisors/xenserver/pom.xml b/plugins/hypervisors/xenserver/pom.xml
index 5e200620338..cd63fc3a018 100644
--- a/plugins/hypervisors/xenserver/pom.xml
+++ b/plugins/hypervisors/xenserver/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/integrations/cloudian/pom.xml b/plugins/integrations/cloudian/pom.xml
index 901acb7abc7..812aa06034e 100644
--- a/plugins/integrations/cloudian/pom.xml
+++ b/plugins/integrations/cloudian/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/integrations/kubernetes-service/pom.xml b/plugins/integrations/kubernetes-service/pom.xml
index bc6d3adfdfb..41afdcc1448 100644
--- a/plugins/integrations/kubernetes-service/pom.xml
+++ b/plugins/integrations/kubernetes-service/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/integrations/prometheus/pom.xml b/plugins/integrations/prometheus/pom.xml
index f9cad05ac6e..edf42a1ec89 100644
--- a/plugins/integrations/prometheus/pom.xml
+++ b/plugins/integrations/prometheus/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/metrics/pom.xml b/plugins/metrics/pom.xml
index ac8fbe9e815..690820fa401 100644
--- a/plugins/metrics/pom.xml
+++ b/plugins/metrics/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/network-elements/bigswitch/pom.xml b/plugins/network-elements/bigswitch/pom.xml
index 88c661a906d..9cb94602f8a 100644
--- a/plugins/network-elements/bigswitch/pom.xml
+++ b/plugins/network-elements/bigswitch/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/network-elements/brocade-vcs/pom.xml b/plugins/network-elements/brocade-vcs/pom.xml
index 96193a10575..54a66d00759 100644
--- a/plugins/network-elements/brocade-vcs/pom.xml
+++ b/plugins/network-elements/brocade-vcs/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
diff --git a/plugins/network-elements/cisco-vnmc/pom.xml b/plugins/network-elements/cisco-vnmc/pom.xml
index 87b8bb5a581..3d7c4ab5e1d 100644
--- a/plugins/network-elements/cisco-vnmc/pom.xml
+++ b/plugins/network-elements/cisco-vnmc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/network-elements/dns-notifier/pom.xml b/plugins/network-elements/dns-notifier/pom.xml
index 0e0f8fe374c..a451da887b8 100644
--- a/plugins/network-elements/dns-notifier/pom.xml
+++ b/plugins/network-elements/dns-notifier/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>cloud-plugin-example-dns-notifier</artifactId>
diff --git a/plugins/network-elements/elastic-loadbalancer/pom.xml b/plugins/network-elements/elastic-loadbalancer/pom.xml
index dec208cb8d8..cae1d558403 100644
--- a/plugins/network-elements/elastic-loadbalancer/pom.xml
+++ b/plugins/network-elements/elastic-loadbalancer/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/network-elements/globodns/pom.xml b/plugins/network-elements/globodns/pom.xml
index 2d4e2e766a4..5ff56fcbcc7 100644
--- a/plugins/network-elements/globodns/pom.xml
+++ b/plugins/network-elements/globodns/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/network-elements/internal-loadbalancer/pom.xml b/plugins/network-elements/internal-loadbalancer/pom.xml
index 6dafbb44b05..8a6a1c47b02 100644
--- a/plugins/network-elements/internal-loadbalancer/pom.xml
+++ b/plugins/network-elements/internal-loadbalancer/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/network-elements/juniper-contrail/pom.xml b/plugins/network-elements/juniper-contrail/pom.xml
index 7b623f1df82..76e0a88ba60 100644
--- a/plugins/network-elements/juniper-contrail/pom.xml
+++ b/plugins/network-elements/juniper-contrail/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/network-elements/netscaler/pom.xml b/plugins/network-elements/netscaler/pom.xml
index 8e87e3336ea..9a5d1179a40 100644
--- a/plugins/network-elements/netscaler/pom.xml
+++ b/plugins/network-elements/netscaler/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml
index 2c6e4e7544f..17477536062 100644
--- a/plugins/network-elements/nicira-nvp/pom.xml
+++ b/plugins/network-elements/nicira-nvp/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/network-elements/opendaylight/pom.xml b/plugins/network-elements/opendaylight/pom.xml
index 16567f3fb18..a1e48697a04 100644
--- a/plugins/network-elements/opendaylight/pom.xml
+++ b/plugins/network-elements/opendaylight/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<profiles>
diff --git a/plugins/network-elements/ovs/pom.xml b/plugins/network-elements/ovs/pom.xml
index 1ba739869e4..0e0238a1f3b 100644
--- a/plugins/network-elements/ovs/pom.xml
+++ b/plugins/network-elements/ovs/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/network-elements/palo-alto/pom.xml b/plugins/network-elements/palo-alto/pom.xml
index 43cf93ad043..e78f6fcfd6a 100644
--- a/plugins/network-elements/palo-alto/pom.xml
+++ b/plugins/network-elements/palo-alto/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/network-elements/stratosphere-ssp/pom.xml b/plugins/network-elements/stratosphere-ssp/pom.xml
index 852591c771c..dd8ef92b24f 100644
--- a/plugins/network-elements/stratosphere-ssp/pom.xml
+++ b/plugins/network-elements/stratosphere-ssp/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/network-elements/tungsten/pom.xml b/plugins/network-elements/tungsten/pom.xml
index 907063ca987..cdfd5381475 100644
--- a/plugins/network-elements/tungsten/pom.xml
+++ b/plugins/network-elements/tungsten/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/plugins/network-elements/vxlan/pom.xml b/plugins/network-elements/vxlan/pom.xml
index b106aad623e..c255e9f6a71 100644
--- a/plugins/network-elements/vxlan/pom.xml
+++ b/plugins/network-elements/vxlan/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/outofbandmanagement-drivers/ipmitool/pom.xml b/plugins/outofbandmanagement-drivers/ipmitool/pom.xml
index 26a191a279e..0d662d34609 100644
--- a/plugins/outofbandmanagement-drivers/ipmitool/pom.xml
+++ b/plugins/outofbandmanagement-drivers/ipmitool/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml b/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml
index d90643d331d..3a2451ebd9d 100644
--- a/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml
+++ b/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/outofbandmanagement-drivers/redfish/pom.xml b/plugins/outofbandmanagement-drivers/redfish/pom.xml
index d4d1145d24e..5c6d594d51b 100644
--- a/plugins/outofbandmanagement-drivers/redfish/pom.xml
+++ b/plugins/outofbandmanagement-drivers/redfish/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 48f79588eb5..3cfaf7569bf 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
</parent>
<build>
<plugins>
diff --git a/plugins/shutdown/pom.xml b/plugins/shutdown/pom.xml
index b7ca2e40bac..833fb7b3a60 100644
--- a/plugins/shutdown/pom.xml
+++ b/plugins/shutdown/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage-allocators/random/pom.xml b/plugins/storage-allocators/random/pom.xml
index 2b62c6e5d3f..a151cf22e54 100644
--- a/plugins/storage-allocators/random/pom.xml
+++ b/plugins/storage-allocators/random/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/image/default/pom.xml b/plugins/storage/image/default/pom.xml
index 1925c870dfe..d9ff818c1ca 100644
--- a/plugins/storage/image/default/pom.xml
+++ b/plugins/storage/image/default/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/image/s3/pom.xml b/plugins/storage/image/s3/pom.xml
index 50c42978b1b..f705f19bded 100644
--- a/plugins/storage/image/s3/pom.xml
+++ b/plugins/storage/image/s3/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/image/sample/pom.xml b/plugins/storage/image/sample/pom.xml
index ef728bf7c43..63eb932a209 100644
--- a/plugins/storage/image/sample/pom.xml
+++ b/plugins/storage/image/sample/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/image/swift/pom.xml b/plugins/storage/image/swift/pom.xml
index f8124f5ed9d..df8a77b2886 100644
--- a/plugins/storage/image/swift/pom.xml
+++ b/plugins/storage/image/swift/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/object/minio/pom.xml b/plugins/storage/object/minio/pom.xml
index a0c803d2e70..5f384406995 100644
--- a/plugins/storage/object/minio/pom.xml
+++ b/plugins/storage/object/minio/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/object/simulator/pom.xml b/plugins/storage/object/simulator/pom.xml
index a8d83ee547e..f8fa5040db6 100644
--- a/plugins/storage/object/simulator/pom.xml
+++ b/plugins/storage/object/simulator/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/volume/adaptive/pom.xml b/plugins/storage/volume/adaptive/pom.xml
index e170a730c00..6dd4d340e7b 100644
--- a/plugins/storage/volume/adaptive/pom.xml
+++ b/plugins/storage/volume/adaptive/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/volume/cloudbyte/pom.xml b/plugins/storage/volume/cloudbyte/pom.xml
index 1a2a667e0cf..3d24826fdbd 100644
--- a/plugins/storage/volume/cloudbyte/pom.xml
+++ b/plugins/storage/volume/cloudbyte/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/volume/datera/pom.xml b/plugins/storage/volume/datera/pom.xml
index f8563f9a8ee..107017e052c 100644
--- a/plugins/storage/volume/datera/pom.xml
+++ b/plugins/storage/volume/datera/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/volume/default/pom.xml b/plugins/storage/volume/default/pom.xml
index c5a7e5561b1..b749ccb0f08 100644
--- a/plugins/storage/volume/default/pom.xml
+++ b/plugins/storage/volume/default/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/volume/flasharray/pom.xml b/plugins/storage/volume/flasharray/pom.xml
index 56f034a954e..f0abeb9a623 100644
--- a/plugins/storage/volume/flasharray/pom.xml
+++ b/plugins/storage/volume/flasharray/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/volume/linstor/pom.xml b/plugins/storage/volume/linstor/pom.xml
index 7d1c157dc5e..5dcfa1e311c 100644
--- a/plugins/storage/volume/linstor/pom.xml
+++ b/plugins/storage/volume/linstor/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/volume/nexenta/pom.xml b/plugins/storage/volume/nexenta/pom.xml
index 5b44b7087e3..93bab1b08ee 100644
--- a/plugins/storage/volume/nexenta/pom.xml
+++ b/plugins/storage/volume/nexenta/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/volume/primera/pom.xml b/plugins/storage/volume/primera/pom.xml
index cb137fd7480..c088270e788 100644
--- a/plugins/storage/volume/primera/pom.xml
+++ b/plugins/storage/volume/primera/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/volume/sample/pom.xml b/plugins/storage/volume/sample/pom.xml
index 7208076858b..4a2bfe651eb 100644
--- a/plugins/storage/volume/sample/pom.xml
+++ b/plugins/storage/volume/sample/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/volume/scaleio/pom.xml b/plugins/storage/volume/scaleio/pom.xml
index 96264a2e91f..581d8737c02 100644
--- a/plugins/storage/volume/scaleio/pom.xml
+++ b/plugins/storage/volume/scaleio/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/volume/solidfire/pom.xml b/plugins/storage/volume/solidfire/pom.xml
index 80f0d3aed3a..186991de98b 100644
--- a/plugins/storage/volume/solidfire/pom.xml
+++ b/plugins/storage/volume/solidfire/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/volume/storpool/pom.xml b/plugins/storage/volume/storpool/pom.xml
index ef2cc3eba70..8d7dcde2c19 100644
--- a/plugins/storage/volume/storpool/pom.xml
+++ b/plugins/storage/volume/storpool/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml
index fcffb84c9e7..672856a04fa 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/plugins/user-authenticators/md5/pom.xml b/plugins/user-authenticators/md5/pom.xml
index 69d39f1050a..52ce473916b 100644
--- a/plugins/user-authenticators/md5/pom.xml
+++ b/plugins/user-authenticators/md5/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/user-authenticators/oauth2/pom.xml b/plugins/user-authenticators/oauth2/pom.xml
index 18f594166ed..f28425ede94 100644
--- a/plugins/user-authenticators/oauth2/pom.xml
+++ b/plugins/user-authenticators/oauth2/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/user-authenticators/pbkdf2/pom.xml b/plugins/user-authenticators/pbkdf2/pom.xml
index 663f7eead60..e90b9d9de28 100644
--- a/plugins/user-authenticators/pbkdf2/pom.xml
+++ b/plugins/user-authenticators/pbkdf2/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/user-authenticators/plain-text/pom.xml b/plugins/user-authenticators/plain-text/pom.xml
index 81a07c47de1..b22c806ba04 100644
--- a/plugins/user-authenticators/plain-text/pom.xml
+++ b/plugins/user-authenticators/plain-text/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/user-authenticators/saml2/pom.xml b/plugins/user-authenticators/saml2/pom.xml
index 8742800328a..c019af8d629 100644
--- a/plugins/user-authenticators/saml2/pom.xml
+++ b/plugins/user-authenticators/saml2/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/user-authenticators/sha256salted/pom.xml b/plugins/user-authenticators/sha256salted/pom.xml
index 21d11ebb988..24aac411b10 100644
--- a/plugins/user-authenticators/sha256salted/pom.xml
+++ b/plugins/user-authenticators/sha256salted/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/user-two-factor-authenticators/static-pin/pom.xml b/plugins/user-two-factor-authenticators/static-pin/pom.xml
index f494d3898e3..ddbcdc422b0 100644
--- a/plugins/user-two-factor-authenticators/static-pin/pom.xml
+++ b/plugins/user-two-factor-authenticators/static-pin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/user-two-factor-authenticators/totp/pom.xml b/plugins/user-two-factor-authenticators/totp/pom.xml
index b9093d6afab..bc38e002e2b 100644
--- a/plugins/user-two-factor-authenticators/totp/pom.xml
+++ b/plugins/user-two-factor-authenticators/totp/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/pom.xml b/pom.xml
index e3228e574a9..0d7151527cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<packaging>pom</packaging>
<name>Apache CloudStack</name>
<description>Apache CloudStack is an IaaS ("Infrastructure as a Service") cloud orchestration platform.</description>
diff --git a/quickcloud/pom.xml b/quickcloud/pom.xml
index 7f81244db09..325fb7ff85a 100644
--- a/quickcloud/pom.xml
+++ b/quickcloud/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
diff --git a/server/pom.xml b/server/pom.xml
index 09d8ee309c9..a1187b426aa 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
</parent>
<repositories>
<repository>
diff --git a/services/console-proxy/pom.xml b/services/console-proxy/pom.xml
index 02ee2921d2a..2fa22292d6f 100644
--- a/services/console-proxy/pom.xml
+++ b/services/console-proxy/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-services</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
diff --git a/services/console-proxy/rdpconsole/pom.xml b/services/console-proxy/rdpconsole/pom.xml
index 0d74b451474..3858a78d460 100644
--- a/services/console-proxy/rdpconsole/pom.xml
+++ b/services/console-proxy/rdpconsole/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-service-console-proxy</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/services/console-proxy/server/pom.xml b/services/console-proxy/server/pom.xml
index 48024431a8d..99b9fea1bf7 100644
--- a/services/console-proxy/server/pom.xml
+++ b/services/console-proxy/server/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-service-console-proxy</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/services/pom.xml b/services/pom.xml
index 24169e8778d..ffa61f12cb2 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
diff --git a/services/secondary-storage/controller/pom.xml b/services/secondary-storage/controller/pom.xml
index c0dfb9e79ca..393e3604784 100644
--- a/services/secondary-storage/controller/pom.xml
+++ b/services/secondary-storage/controller/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-service-secondary-storage</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/services/secondary-storage/pom.xml b/services/secondary-storage/pom.xml
index a5a35c63c88..22db68a7983 100644
--- a/services/secondary-storage/pom.xml
+++ b/services/secondary-storage/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-services</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
diff --git a/services/secondary-storage/server/pom.xml b/services/secondary-storage/server/pom.xml
index fa6d40782a3..30fd233cd5f 100644
--- a/services/secondary-storage/server/pom.xml
+++ b/services/secondary-storage/server/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-service-secondary-storage</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/systemvm/pom.xml b/systemvm/pom.xml
index 4d742ad7a00..f0b330643c1 100644
--- a/systemvm/pom.xml
+++ b/systemvm/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
diff --git a/test/pom.xml b/test/pom.xml
index 7a68fcdcef1..eff245bc38a 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
</parent>
<dependencies>
<dependency>
diff --git a/tools/apidoc/pom.xml b/tools/apidoc/pom.xml
index 20196a42614..afefac3a74b 100644
--- a/tools/apidoc/pom.xml
+++ b/tools/apidoc/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-tools</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
diff --git a/tools/checkstyle/pom.xml b/tools/checkstyle/pom.xml
index fa4122d0391..d4a7743e9c6 100644
--- a/tools/checkstyle/pom.xml
+++ b/tools/checkstyle/pom.xml
@@ -22,7 +22,7 @@
<name>Apache CloudStack Developer Tools - Checkstyle Configuration</name>
<groupId>org.apache.cloudstack</groupId>
<artifactId>checkstyle</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/tools/devcloud-kvm/pom.xml b/tools/devcloud-kvm/pom.xml
index 1fbb630eff8..2bb84f2ba38 100644
--- a/tools/devcloud-kvm/pom.xml
+++ b/tools/devcloud-kvm/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-tools</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/tools/devcloud4/pom.xml b/tools/devcloud4/pom.xml
index d6ccfa14245..b7f3a39be22 100644
--- a/tools/devcloud4/pom.xml
+++ b/tools/devcloud4/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-tools</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/tools/marvin/pom.xml b/tools/marvin/pom.xml
index 94adc211b51..94ded408c9b 100644
--- a/tools/marvin/pom.xml
+++ b/tools/marvin/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-tools</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/tools/pom.xml b/tools/pom.xml
index 67ab345b527..2923919b4dd 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
diff --git a/usage/pom.xml b/usage/pom.xml
index cca3c59d49f..36dee654a93 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
</parent>
<dependencies>
<dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 8d3b6863c22..c585d586056 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/vmware-base/pom.xml b/vmware-base/pom.xml
index 958a461ee40..27bf264c364 100644
--- a/vmware-base/pom.xml
+++ b/vmware-base/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.19.1.1</version>
+ <version>4.19.1.2</version>
</parent>
<dependencies>
<dependency>
(cloudstack) 01/06: Session Token Invalidation on Logout
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to tag 4.19.1.2
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 8a2f6528f1ebfc3fd4b8fddcf06628f4f5a45126
Author: Daan Hoogland <da...@onecht.net>
AuthorDate: Wed Aug 28 15:22:29 2024 +0200
Session Token Invalidation on Logout
---
server/src/main/java/com/cloud/api/ApiServlet.java | 27 ++++++++++++----------
ui/src/api/index.js | 1 -
ui/src/store/modules/user.js | 11 +++++----
3 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/server/src/main/java/com/cloud/api/ApiServlet.java b/server/src/main/java/com/cloud/api/ApiServlet.java
index f6f46419c04..e719238afef 100644
--- a/server/src/main/java/com/cloud/api/ApiServlet.java
+++ b/server/src/main/java/com/cloud/api/ApiServlet.java
@@ -260,19 +260,22 @@ public class ApiServlet extends HttpServlet {
}
if (apiAuthenticator.getAPIType() == APIAuthenticationType.LOGOUT_API) {
- if (session != null) {
- final Long userId = (Long) session.getAttribute("userid");
- final Account account = (Account) session.getAttribute("accountobj");
- Long accountId = null;
- if (account != null) {
- accountId = account.getId();
- }
- auditTrailSb.insert(0, "(userId=" + userId + " accountId=" + accountId + " sessionId=" + session.getId() + ")");
- if (userId != null) {
- apiServer.logoutUser(userId);
- }
- invalidateHttpSession(session, "invalidating session after logout call");
+ if (session == null) {
+ throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Session not found for the logout process.");
}
+
+ final Long userId = (Long) session.getAttribute("userid");
+ final Account account = (Account) session.getAttribute("accountobj");
+ Long accountId = null;
+ if (account != null) {
+ accountId = account.getId();
+ }
+ auditTrailSb.insert(0, "(userId=" + userId + " accountId=" + accountId + " sessionId=" + session.getId() + ")");
+ if (userId != null) {
+ apiServer.logoutUser(userId);
+ }
+ invalidateHttpSession(session, "invalidating session after logout call");
+
final Cookie[] cookies = req.getCookies();
if (cookies != null) {
for (final Cookie cookie : cookies) {
diff --git a/ui/src/api/index.js b/ui/src/api/index.js
index 1db41661276..14432010738 100644
--- a/ui/src/api/index.js
+++ b/ui/src/api/index.js
@@ -65,7 +65,6 @@ export function login (arg) {
}
export function logout () {
- sourceToken.cancel()
message.destroy()
notification.destroy()
return api('logout')
diff --git a/ui/src/store/modules/user.js b/ui/src/store/modules/user.js
index fb5b6ff5e0b..08a0c340c64 100644
--- a/ui/src/store/modules/user.js
+++ b/ui/src/store/modules/user.js
@@ -24,6 +24,7 @@ import router from '@/router'
import store from '@/store'
import { oauthlogin, login, logout, api } from '@/api'
import { i18n } from '@/locales'
+import { sourceToken } from '@/utils/request'
import {
ACCESS_TOKEN,
@@ -374,11 +375,6 @@ const user = {
cloudianUrl = state.cloudian.url + 'logout.htm?redirect=' + encodeURIComponent(window.location.href)
}
- Object.keys(Cookies.get()).forEach(cookieName => {
- Cookies.remove(cookieName)
- Cookies.remove(cookieName, { path: '/client' })
- })
-
commit('SET_TOKEN', '')
commit('SET_APIS', {})
commit('SET_PROJECT', {})
@@ -406,6 +402,11 @@ const user = {
}
}).catch(() => {
resolve()
+ }).finally(() => {
+ Object.keys(Cookies.get()).forEach(cookieName => {
+ Cookies.remove(cookieName)
+ Cookies.remove(cookieName, { path: '/client' })
+ })
})
})
},
(cloudstack) 03/06: Validate QCOW2 on upload and register
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to tag 4.19.1.2
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 4fa22f4d5881406353d3dfeadb68050e2242fdb8
Author: Daniel Augusto Veronezi Salvador <gu...@apache.org>
AuthorDate: Fri Aug 30 19:03:28 2024 -0300
Validate QCOW2 on upload and register
---
.../storage/formatinspector/Qcow2HeaderField.java | 51 ++++
.../storage/formatinspector/Qcow2Inspector.java | 267 +++++++++++++++++++++
.../resource/NfsSecondaryStorageResource.java | 14 +-
.../storage/template/DownloadManagerImpl.java | 39 ++-
4 files changed, 360 insertions(+), 11 deletions(-)
diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/formatinspector/Qcow2HeaderField.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/formatinspector/Qcow2HeaderField.java
new file mode 100644
index 00000000000..4a8e8b51a47
--- /dev/null
+++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/formatinspector/Qcow2HeaderField.java
@@ -0,0 +1,51 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF 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.apache.cloudstack.storage.formatinspector;
+
+public enum Qcow2HeaderField {
+ MAGIC(0, 4),
+ VERSION(4, 4),
+ BACKING_FILE_OFFSET(8, 8),
+ BACKING_FILE_NAME_LENGTH(16, 4),
+ CLUSTER_BITS(20, 4),
+ SIZE(24, 8),
+ CRYPT_METHOD(32, 4),
+ L1_SIZE(36, 4),
+ LI_TABLE_OFFSET(40, 8),
+ REFCOUNT_TABLE_OFFSET(48, 8),
+ REFCOUNT_TABLE_CLUSTERS(56, 4),
+ NB_SNAPSHOTS(60, 4),
+ SNAPSHOTS_OFFSET(64, 8),
+ INCOMPATIBLE_FEATURES(72, 8);
+
+ private final int offset;
+ private final int length;
+
+ Qcow2HeaderField(int offset, int length) {
+ this.offset = offset;
+ this.length = length;
+ }
+
+ public int getLength() {
+ return length;
+ }
+
+ public int getOffset() {
+ return offset;
+ }
+}
diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/formatinspector/Qcow2Inspector.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/formatinspector/Qcow2Inspector.java
new file mode 100644
index 00000000000..1ad2076a12d
--- /dev/null
+++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/formatinspector/Qcow2Inspector.java
@@ -0,0 +1,267 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF 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.apache.cloudstack.storage.formatinspector;
+
+import com.cloud.utils.NumbersUtil;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.log4j.Logger;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Class to inspect QCOW2 files/objects. In our context, a QCOW2 might be a threat to the environment if it meets one of the following criteria when coming from external sources
+ * (like registering or uploading volumes and templates):
+ * <ul>
+ * <li>has a backing file reference;</li>
+ * <li>has an external data file reference;</li>
+ * <li>has unknown incompatible features.</li>
+ * </ul>
+ *
+ * The implementation was done based on the <a href="https://gitlab.com/qemu-project/qemu/-/blob/master/docs/interop/qcow2.txt"> QEMU's official interoperability documentation</a>
+ * and on the <a href="https://review.opendev.org/c/openstack/cinder/+/923247/2/cinder/image/format_inspector.py">OpenStack's Cinder implementation for Python</a>.
+ */
+public class Qcow2Inspector {
+ protected static Logger LOGGER = Logger.getLogger(Qcow2Inspector.class);
+
+ private static final byte[] QCOW_MAGIC_STRING = ArrayUtils.add("QFI".getBytes(), (byte) 0xfb);
+ private static final int INCOMPATIBLE_FEATURES_MAX_KNOWN_BIT = 4;
+ private static final int INCOMPATIBLE_FEATURES_MAX_KNOWN_BYTE = 0;
+ private static final int EXTERNAL_DATA_FILE_BYTE_POSITION = 7;
+ private static final int EXTERNAL_DATA_FILE_BIT = 2;
+ private static final byte EXTERNAL_DATA_FILE_BITMASK = (byte) (1 << EXTERNAL_DATA_FILE_BIT);
+
+ private static final Set<Qcow2HeaderField> SET_OF_HEADER_FIELDS_TO_READ = Set.of(Qcow2HeaderField.MAGIC,
+ Qcow2HeaderField.VERSION,
+ Qcow2HeaderField.SIZE,
+ Qcow2HeaderField.BACKING_FILE_OFFSET,
+ Qcow2HeaderField.INCOMPATIBLE_FEATURES);
+
+ /**
+ * Validates if the file is a valid and allowed QCOW2 (i.e.: does not contain external references).
+ * @param filePath Path of the file to be validated.
+ * @throws RuntimeException If the QCOW2 file meets one of the following criteria:
+ * <ul>
+ * <li>has a backing file reference;</li>
+ * <li>has an external data file reference;</li>
+ * <li>has unknown incompatible features.</li>
+ * </ul>
+ */
+ public static void validateQcow2File(String filePath) throws RuntimeException {
+ LOGGER.info(String.format("Verifying if [%s] is a valid and allowed QCOW2 file .", filePath));
+
+ Map<String, byte[]> headerFieldsAndValues;
+ try (InputStream inputStream = new FileInputStream(filePath)) {
+ headerFieldsAndValues = unravelQcow2Header(inputStream, filePath);
+ } catch (IOException ex) {
+ throw new RuntimeException(String.format("Unable to validate file [%s] due to: ", filePath), ex);
+ }
+
+ validateQcow2HeaderFields(headerFieldsAndValues, filePath);
+
+ LOGGER.info(String.format("[%s] is a valid and allowed QCOW2 file.", filePath));
+ }
+
+ /**
+ * Unravels the QCOW2 header in a serial fashion, iterating through the {@link Qcow2HeaderField}, reading the fields specified in
+ * {@link Qcow2Inspector#SET_OF_HEADER_FIELDS_TO_READ} and skipping the others.
+ * @param qcow2InputStream InputStream of the QCOW2 being unraveled.
+ * @param qcow2LogReference A reference (like the filename) of the QCOW2 being unraveled to print in the logs and exceptions.
+ * @return A map of the header fields and their values according to the {@link Qcow2Inspector#SET_OF_HEADER_FIELDS_TO_READ}.
+ * @throws IOException If the field cannot be read or skipped.
+ */
+ public static Map<String, byte[]> unravelQcow2Header(InputStream qcow2InputStream, String qcow2LogReference) throws IOException {
+ Map<String, byte[]> result = new HashMap<>();
+
+ LOGGER.debug(String.format("Unraveling QCOW2 [%s] headers.", qcow2LogReference));
+ for (Qcow2HeaderField qcow2Header : Qcow2HeaderField.values()) {
+ if (!SET_OF_HEADER_FIELDS_TO_READ.contains(qcow2Header)) {
+ skipHeader(qcow2InputStream, qcow2Header, qcow2LogReference);
+ continue;
+ }
+
+ byte[] headerValue = readHeader(qcow2InputStream, qcow2Header, qcow2LogReference);
+ result.put(qcow2Header.name(), headerValue);
+ }
+
+ return result;
+ }
+
+ /**
+ * Skips the field's length in the InputStream.
+ * @param qcow2InputStream InputStream of the QCOW2 being unraveled.
+ * @param field Field being skipped (name and length).
+ * @param qcow2LogReference A reference (like the filename) of the QCOW2 being unraveled to print in the logs and exceptions.
+ * @throws IOException If the bytes skipped do not match the field length.
+ */
+ protected static void skipHeader(InputStream qcow2InputStream, Qcow2HeaderField field, String qcow2LogReference) throws IOException {
+ LOGGER.trace(String.format("Skipping field [%s] of QCOW2 [%s].", field, qcow2LogReference));
+
+ if (qcow2InputStream.skip(field.getLength()) != field.getLength()) {
+ throw new IOException(String.format("Unable to skip field [%s] of QCOW2 [%s].", field, qcow2LogReference));
+ }
+ }
+
+ /**
+ * Reads the field's length in the InputStream.
+ * @param qcow2InputStream InputStream of the QCOW2 being unraveled.
+ * @param field Field being read (name and length).
+ * @param qcow2LogReference A reference (like the filename) of the QCOW2 being unraveled to print in the logs and exceptions.
+ * @throws IOException If the bytes read do not match the field length.
+ */
+ protected static byte[] readHeader(InputStream qcow2InputStream, Qcow2HeaderField field, String qcow2LogReference) throws IOException {
+ byte[] readBytes = new byte[field.getLength()];
+
+ LOGGER.trace(String.format("Reading field [%s] of QCOW2 [%s].", field, qcow2LogReference));
+ if (qcow2InputStream.read(readBytes) != field.getLength()) {
+ throw new IOException(String.format("Unable to read field [%s] of QCOW2 [%s].", field, qcow2LogReference));
+ }
+
+ LOGGER.trace(String.format("Read %s as field [%s] of QCOW2 [%s].", ArrayUtils.toString(readBytes), field, qcow2LogReference));
+ return readBytes;
+ }
+
+ /**
+ * Validates the values of the header fields {@link Qcow2HeaderField#MAGIC}, {@link Qcow2HeaderField#BACKING_FILE_OFFSET}, and {@link Qcow2HeaderField#INCOMPATIBLE_FEATURES}.
+ * @param headerFieldsAndValues A map of the header fields and their values.
+ * @param qcow2LogReference A reference (like the filename) of the QCOW2 being unraveled to print in the logs and exceptions.
+ * @throws SecurityException If the QCOW2 does not contain the QCOW magic string or contains a backing file reference or incompatible features.
+ */
+ public static void validateQcow2HeaderFields(Map<String, byte[]> headerFieldsAndValues, String qcow2LogReference) throws SecurityException{
+ byte[] fieldValue = headerFieldsAndValues.get(Qcow2HeaderField.MAGIC.name());
+ validateQcowMagicString(fieldValue, qcow2LogReference);
+
+ fieldValue = headerFieldsAndValues.get(Qcow2HeaderField.BACKING_FILE_OFFSET.name());
+ validateAbsenceOfBackingFileReference(NumbersUtil.bytesToLong(fieldValue), qcow2LogReference);
+
+ fieldValue = headerFieldsAndValues.get(Qcow2HeaderField.INCOMPATIBLE_FEATURES.name());
+ validateAbsenceOfIncompatibleFeatures(fieldValue, qcow2LogReference);
+ }
+
+ /**
+ * Verifies if the first 4 bytes of the header are the QCOW magic string. Throws an exception if not.
+ * @param headerMagicString The first 4 bytes of the header.
+ * @param qcow2LogReference A reference (like the filename) of the QCOW2 being unraveled to print in the logs and exceptions.
+ * @throws SecurityException If the header's magic string is not the QCOW magic string.
+ */
+ private static void validateQcowMagicString(byte[] headerMagicString, String qcow2LogReference) throws SecurityException {
+ LOGGER.debug(String.format("Verifying if [%s] has a valid QCOW magic string.", qcow2LogReference));
+
+ if (!Arrays.equals(QCOW_MAGIC_STRING, headerMagicString)) {
+ throw new SecurityException(String.format("[%s] is not a valid QCOW2 because its first 4 bytes are not the QCOW magic string.", qcow2LogReference));
+ }
+
+ LOGGER.debug(String.format("[%s] has a valid QCOW magic string.", qcow2LogReference));
+ }
+
+ /**
+ * Verifies if the QCOW2 has a backing file and throws an exception if so.
+ * @param backingFileOffset The backing file offset value of the QCOW2 header.
+ * @param qcow2LogReference A reference (like the filename) of the QCOW2 being unraveled to print in the logs and exceptions.
+ * @throws SecurityException If the QCOW2 has a backing file reference.
+ */
+ private static void validateAbsenceOfBackingFileReference(long backingFileOffset, String qcow2LogReference) throws SecurityException {
+ LOGGER.debug(String.format("Verifying if [%s] has a backing file reference.", qcow2LogReference));
+
+ if (backingFileOffset != 0) {
+ throw new SecurityException(String.format("[%s] has a backing file reference. This can be an attack to the infrastructure; therefore, we will not accept" +
+ " this QCOW2.", qcow2LogReference));
+ }
+
+ LOGGER.debug(String.format("[%s] does not have a backing file reference.", qcow2LogReference));
+ }
+
+ /**
+ * Verifies if the QCOW2 has incompatible features and throw an exception if it has an external data file reference or unknown incompatible features.
+ * @param incompatibleFeatures The incompatible features bytes of the QCOW2 header.
+ * @param qcow2LogReference A reference (like the filename) of the QCOW2 being unraveled to print in the logs and exceptions.
+ * @throws SecurityException If the QCOW2 has an external data file reference or unknown incompatible features.
+ */
+ private static void validateAbsenceOfIncompatibleFeatures(byte[] incompatibleFeatures, String qcow2LogReference) throws SecurityException {
+ LOGGER.debug(String.format("Verifying if [%s] has incompatible features.", qcow2LogReference));
+
+ if (NumbersUtil.bytesToLong(incompatibleFeatures) == 0) {
+ LOGGER.debug(String.format("[%s] does not have incompatible features.", qcow2LogReference));
+ return;
+ }
+
+ LOGGER.debug(String.format("[%s] has incompatible features.", qcow2LogReference));
+
+ validateAbsenceOfExternalDataFileReference(incompatibleFeatures, qcow2LogReference);
+ validateAbsenceOfUnknownIncompatibleFeatures(incompatibleFeatures, qcow2LogReference);
+ }
+
+ /**
+ * Verifies if the QCOW2 has an external data file reference and throw an exception if so.
+ * @param incompatibleFeatures The incompatible features bytes of the QCOW2 header.
+ * @param qcow2LogReference A reference (like the filename) of the QCOW2 being unraveled to print in the logs and exceptions.
+ * @throws SecurityException If the QCOW2 has an external data file reference.
+ */
+ private static void validateAbsenceOfExternalDataFileReference(byte[] incompatibleFeatures, String qcow2LogReference) throws SecurityException {
+ LOGGER.debug(String.format("Verifying if [%s] has an external data file reference.", qcow2LogReference));
+
+ if ((incompatibleFeatures[EXTERNAL_DATA_FILE_BYTE_POSITION] & EXTERNAL_DATA_FILE_BITMASK) != 0) {
+ throw new SecurityException(String.format("[%s] has an external data file reference. This can be an attack to the infrastructure; therefore, we will discard" +
+ " this file.", qcow2LogReference));
+ }
+
+ LOGGER.info(String.format("[%s] does not have an external data file reference.", qcow2LogReference));
+ }
+
+ /**
+ * Verifies if the QCOW2 has unknown incompatible features and throw an exception if so.
+ * <br/><br/>
+ * Unknown incompatible features are those with bit greater than
+ * {@link Qcow2Inspector#INCOMPATIBLE_FEATURES_MAX_KNOWN_BIT}, which will be the represented by bytes in positions greater than
+ * {@link Qcow2Inspector#INCOMPATIBLE_FEATURES_MAX_KNOWN_BYTE} (in Big Endian order). Therefore, we expect that those bytes are always zero. If not, an exception is thrown.
+ * @param incompatibleFeatures The incompatible features bytes of the QCOW2 header.
+ * @param qcow2LogReference A reference (like the filename) of the QCOW2 being unraveled to print in the logs and exceptions.
+ * @throws SecurityException If the QCOW2 has unknown incompatible features.
+ */
+ private static void validateAbsenceOfUnknownIncompatibleFeatures(byte[] incompatibleFeatures, String qcow2LogReference) throws SecurityException {
+ LOGGER.debug(String.format("Verifying if [%s] has unknown incompatible features [%s].", qcow2LogReference, ArrayUtils.toString(incompatibleFeatures)));
+
+ for (int byteNum = incompatibleFeatures.length - 1; byteNum >= 0; byteNum--) {
+ int bytePosition = incompatibleFeatures.length - 1 - byteNum;
+ LOGGER.trace(String.format("Looking for unknown incompatible feature bit in position [%s].", bytePosition));
+
+ byte bitmask = 0;
+ if (byteNum == INCOMPATIBLE_FEATURES_MAX_KNOWN_BYTE) {
+ bitmask = ((1 << INCOMPATIBLE_FEATURES_MAX_KNOWN_BIT) - 1);
+ }
+
+ LOGGER.trace(String.format("Bitmask for byte in position [%s] is [%s].", bytePosition, Integer.toBinaryString(bitmask)));
+
+ int featureBit = incompatibleFeatures[bytePosition] & ~bitmask;
+ if (featureBit != 0) {
+ throw new SecurityException(String.format("Found unknown incompatible feature bit [%s] in byte [%s] of [%s]. This can be an attack to the infrastructure; " +
+ "therefore, we will discard this QCOW2.", featureBit, bytePosition + Qcow2HeaderField.INCOMPATIBLE_FEATURES.getOffset(), qcow2LogReference));
+ }
+
+ LOGGER.trace(String.format("Did not find unknown incompatible feature in position [%s].", bytePosition));
+ }
+
+ LOGGER.info(String.format("[%s] does not have unknown incompatible features.", qcow2LogReference));
+ }
+
+}
diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
index 41cf11025a1..ceaa37926e9 100644
--- a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
+++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -71,6 +71,7 @@ import org.apache.cloudstack.storage.command.UploadStatusCommand;
import org.apache.cloudstack.storage.command.browser.ListDataStoreObjectsCommand;
import org.apache.cloudstack.storage.configdrive.ConfigDrive;
import org.apache.cloudstack.storage.configdrive.ConfigDriveBuilder;
+import org.apache.cloudstack.storage.formatinspector.Qcow2Inspector;
import org.apache.cloudstack.storage.template.DownloadManager;
import org.apache.cloudstack.storage.template.DownloadManagerImpl;
import org.apache.cloudstack.storage.template.UploadEntity;
@@ -3482,8 +3483,19 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
return result;
}
+ String finalFilename = resourcePath + "/" + templateFilename;
+
+ if (ImageStoreUtil.isCorrectExtension(finalFilename, "qcow2")) {
+ try {
+ Qcow2Inspector.validateQcow2File(finalFilename);
+ } catch (RuntimeException e) {
+ s_logger.error(String.format("Uploaded file [%s] is not a valid QCOW2.", finalFilename), e);
+ return "The uploaded file is not a valid QCOW2. Ask the administrator to check the logs for more details.";
+ }
+ }
+
// Set permissions for the downloaded template
- File downloadedTemplate = new File(resourcePath + "/" + templateFilename);
+ File downloadedTemplate = new File(finalFilename);
_storage.setWorldReadableAndWriteable(downloadedTemplate);
// Set permissions for template/volume.properties
diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java
index 11878ae6400..c946614934b 100644
--- a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java
+++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java
@@ -16,8 +16,6 @@
// under the License.
package org.apache.cloudstack.storage.template;
-import static com.cloud.utils.NumbersUtil.toHumanReadableSize;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -51,9 +49,11 @@ import org.apache.cloudstack.storage.command.DownloadProgressCommand.RequestType
import org.apache.cloudstack.storage.resource.IpTablesHelper;
import org.apache.cloudstack.storage.resource.NfsSecondaryStorageResource;
import org.apache.cloudstack.storage.resource.SecondaryStorageResource;
+import org.apache.cloudstack.storage.formatinspector.Qcow2HeaderField;
+import org.apache.cloudstack.storage.formatinspector.Qcow2Inspector;
import org.apache.cloudstack.utils.security.ChecksumValue;
import org.apache.cloudstack.utils.security.DigestHelper;
-import org.apache.commons.lang3.StringUtils;
+
import org.apache.log4j.Logger;
import com.cloud.agent.api.storage.DownloadAnswer;
@@ -91,7 +91,9 @@ import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.Proxy;
import com.cloud.utils.script.Script;
-import com.cloud.utils.storage.QCOW2Utils;
+import com.cloud.utils.StringUtils;
+
+import static com.cloud.utils.NumbersUtil.toHumanReadableSize;
public class DownloadManagerImpl extends ManagerBase implements DownloadManager {
private String _name;
@@ -365,11 +367,17 @@ public class DownloadManagerImpl extends ManagerBase implements DownloadManager
// The QCOW2 is the only format with a header,
// and as such can be easily read.
- try (InputStream inputStream = td.getS3ObjectInputStream();) {
- dnld.setTemplatesize(QCOW2Utils.getVirtualSize(inputStream, false));
- }
- catch (IOException e) {
- result = "Couldn't read QCOW2 virtual size. Error: " + e.getMessage();
+ try (InputStream inputStream = td.getS3ObjectInputStream()) {
+ Map<String, byte[]> qcow2HeaderFieldsAndValues = Qcow2Inspector.unravelQcow2Header(inputStream, td.getDownloadUrl());
+ Qcow2Inspector.validateQcow2HeaderFields(qcow2HeaderFieldsAndValues, td.getDownloadUrl());
+
+ dnld.setTemplatesize(NumbersUtil.bytesToLong(qcow2HeaderFieldsAndValues.get(Qcow2HeaderField.SIZE.name())));
+ } catch (IOException ex) {
+ result = String.format("Unable to read QCOW2 metadata. Error: %s", ex.getMessage());
+ LOGGER.error(result, ex);
+ } catch (SecurityException ex) {
+ result = String.format("[%s] is not a valid QCOW2:", td.getDownloadUrl());
+ LOGGER.error(result, ex);
}
}
@@ -515,8 +523,19 @@ public class DownloadManagerImpl extends ManagerBase implements DownloadManager
return result;
}
+ String finalFilename = resourcePath + "/" + templateFilename;
+
+ if (ImageFormat.QCOW2.equals(dnld.getFormat())) {
+ try {
+ Qcow2Inspector.validateQcow2File(finalFilename);
+ } catch (RuntimeException e) {
+ LOGGER.error(String.format("The downloaded file [%s] is not a valid QCOW2.", finalFilename), e);
+ return "The downloaded file is not a valid QCOW2. Ask the administrator to check the logs for more details.";
+ }
+ }
+
// Set permissions for the downloaded template
- File downloadedTemplate = new File(resourcePath + "/" + templateFilename);
+ File downloadedTemplate = new File(finalFilename);
_storage.setWorldReadableAndWriteable(downloadedTemplate);
setPermissionsForTheDownloadedTemplate(resourcePath, resourceType);
(cloudstack) 02/06: fix quota resource access validation
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to tag 4.19.1.2
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 123b426c16cf4fcadc30f55e8b7fd1a5d60bd09b
Author: Daan Hoogland <da...@onecht.net>
AuthorDate: Tue Aug 20 15:12:54 2024 +0200
fix quota resource access validation
---
.../main/java/com/cloud/user/AccountService.java | 2 +
.../cloudstack/api/command/QuotaBalanceCmd.java | 13 ++-
.../cloudstack/api/command/QuotaCreditsCmd.java | 6 +
.../cloudstack/api/command/QuotaStatementCmd.java | 6 +
.../contrail/management/MockAccountManager.java | 5 +
.../com/cloud/api/dispatch/ParamProcessWorker.java | 57 ++++-----
.../java/com/cloud/user/AccountManagerImpl.java | 14 +++
.../cloud/api/dispatch/ParamProcessWorkerTest.java | 129 +++++++++++++++++----
.../com/cloud/user/MockAccountManagerImpl.java | 5 +
9 files changed, 187 insertions(+), 50 deletions(-)
diff --git a/api/src/main/java/com/cloud/user/AccountService.java b/api/src/main/java/com/cloud/user/AccountService.java
index 63f5455cfd0..60db7abb734 100644
--- a/api/src/main/java/com/cloud/user/AccountService.java
+++ b/api/src/main/java/com/cloud/user/AccountService.java
@@ -116,6 +116,8 @@ public interface AccountService {
void checkAccess(Account account, AccessType accessType, boolean sameOwner, String apiName, ControlledEntity... entities) throws PermissionDeniedException;
+ void validateAccountHasAccessToResource(Account account, AccessType accessType, Object resource);
+
Long finalyzeAccountId(String accountName, Long domainId, Long projectId, boolean enabledOnly);
/**
diff --git a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaBalanceCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaBalanceCmd.java
index f4e248855fd..ecb6531d0cf 100644
--- a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaBalanceCmd.java
+++ b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaBalanceCmd.java
@@ -21,6 +21,8 @@ import java.util.List;
import javax.inject.Inject;
+import com.cloud.user.Account;
+import org.apache.cloudstack.api.ACL;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
@@ -42,6 +44,7 @@ public class QuotaBalanceCmd extends BaseCmd {
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, required = true, description = "Account Id for which statement needs to be generated")
private String accountName;
+ @ACL
@Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, required = true, entityType = DomainResponse.class, description = "If domain Id is given and the caller is domain admin then the statement is generated for domain.")
private Long domainId;
@@ -51,6 +54,7 @@ public class QuotaBalanceCmd extends BaseCmd {
@Parameter(name = ApiConstants.START_DATE, type = CommandType.DATE, description = "Start date range quota query. Use yyyy-MM-dd as the date format, e.g. startDate=2009-06-01.")
private Date startDate;
+ @ACL
@Parameter(name = ApiConstants.ACCOUNT_ID, type = CommandType.UUID, entityType = AccountResponse.class, description = "List usage records for the specified account")
private Long accountId;
@@ -104,7 +108,14 @@ public class QuotaBalanceCmd extends BaseCmd {
@Override
public long getEntityOwnerId() {
- return _accountService.getActiveAccountByName(accountName, domainId).getAccountId();
+ if (accountId != null) {
+ return accountId;
+ }
+ Account account = _accountService.getActiveAccountByName(accountName, domainId);
+ if (account != null) {
+ return account.getAccountId();
+ }
+ return Account.ACCOUNT_ID_SYSTEM;
}
@Override
diff --git a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaCreditsCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaCreditsCmd.java
index c47c0ad2d76..e83d52f94f4 100644
--- a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaCreditsCmd.java
+++ b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaCreditsCmd.java
@@ -18,6 +18,7 @@ package org.apache.cloudstack.api.command;
import com.cloud.user.Account;
+import org.apache.cloudstack.api.ACL;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -48,6 +49,7 @@ public class QuotaCreditsCmd extends BaseCmd {
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, required = true, description = "Account Id for which quota credits need to be added")
private String accountName;
+ @ACL
@Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, required = true, entityType = DomainResponse.class, description = "Domain for which quota credits need to be added")
private Long domainId;
@@ -132,6 +134,10 @@ public class QuotaCreditsCmd extends BaseCmd {
@Override
public long getEntityOwnerId() {
+ Account account = _accountService.getActiveAccountByName(accountName, domainId);
+ if (account != null) {
+ return account.getAccountId();
+ }
return Account.ACCOUNT_ID_SYSTEM;
}
diff --git a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaStatementCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaStatementCmd.java
index 4d1c233c37a..3219ba1448f 100644
--- a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaStatementCmd.java
+++ b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaStatementCmd.java
@@ -21,6 +21,7 @@ import java.util.List;
import javax.inject.Inject;
+import org.apache.cloudstack.api.ACL;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
@@ -44,6 +45,7 @@ public class QuotaStatementCmd extends BaseCmd {
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, required = true, description = "Optional, Account Id for which statement needs to be generated")
private String accountName;
+ @ACL
@Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, required = true, entityType = DomainResponse.class, description = "Optional, If domain Id is given and the caller is domain admin then the statement is generated for domain.")
private Long domainId;
@@ -56,6 +58,7 @@ public class QuotaStatementCmd extends BaseCmd {
@Parameter(name = ApiConstants.TYPE, type = CommandType.INTEGER, description = "List quota usage records for the specified usage type")
private Integer usageType;
+ @ACL
@Parameter(name = ApiConstants.ACCOUNT_ID, type = CommandType.UUID, entityType = AccountResponse.class, description = "List usage records for the specified account")
private Long accountId;
@@ -112,6 +115,9 @@ public class QuotaStatementCmd extends BaseCmd {
@Override
public long getEntityOwnerId() {
+ if (accountId != null) {
+ return accountId;
+ }
Account activeAccountByName = _accountService.getActiveAccountByName(accountName, domainId);
if (activeAccountByName != null) {
return activeAccountByName.getAccountId();
diff --git a/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
index 67cfe1df3e1..a3fac2c8be9 100644
--- a/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
+++ b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
@@ -451,6 +451,11 @@ public class MockAccountManager extends ManagerBase implements AccountManager {
// TODO Auto-generated method stub
}
+ @Override
+ public void validateAccountHasAccessToResource(Account account, AccessType accessType, Object resource) {
+ // TODO Auto-generated method stub
+ }
+
@Override
public Long finalyzeAccountId(String accountName, Long domainId, Long projectId, boolean enabledOnly) {
// TODO Auto-generated method stub
diff --git a/server/src/main/java/com/cloud/api/dispatch/ParamProcessWorker.java b/server/src/main/java/com/cloud/api/dispatch/ParamProcessWorker.java
index 9f07db4b033..b11a5282e62 100644
--- a/server/src/main/java/com/cloud/api/dispatch/ParamProcessWorker.java
+++ b/server/src/main/java/com/cloud/api/dispatch/ParamProcessWorker.java
@@ -32,8 +32,6 @@ import java.util.regex.Matcher;
import javax.inject.Inject;
-import org.apache.cloudstack.acl.ControlledEntity;
-import org.apache.cloudstack.acl.InfrastructureEntity;
import org.apache.cloudstack.acl.SecurityChecker;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.api.ACL;
@@ -288,40 +286,43 @@ public class ParamProcessWorker implements DispatchWorker {
doAccessChecks(cmd, entitiesToAccess);
}
- private void doAccessChecks(BaseCmd cmd, Map<Object, AccessType> entitiesToAccess) {
+ protected void doAccessChecks(BaseCmd cmd, Map<Object, AccessType> entitiesToAccess) {
+ Account[] owners = getEntityOwners(cmd);
+
Account caller = CallContext.current().getCallingAccount();
+ if (cmd instanceof BaseAsyncCreateCmd) {
+ // check that caller can access the owner account.
+ _accountMgr.checkAccess(caller, null, false, owners);
+ }
+
+ checkCallerAccessToEntities(caller, owners, entitiesToAccess);
+ }
+
+ protected Account[] getEntityOwners(BaseCmd cmd) {
List<Long> entityOwners = cmd.getEntityOwnerIds();
- Account[] owners = null;
if (entityOwners != null) {
- owners = entityOwners.stream().map(id -> _accountMgr.getAccount(id)).toArray(Account[]::new);
+ return entityOwners.stream().map(id -> _accountMgr.getAccount(id)).toArray(Account[]::new);
+ }
+
+ if (cmd.getEntityOwnerId() == Account.ACCOUNT_ID_SYSTEM && cmd instanceof BaseAsyncCmd && cmd.getApiResourceType() == ApiCommandResourceType.Network) {
+ s_logger.debug("Skipping access check on the network owner if the owner is ROOT/system.");
} else {
- if (cmd.getEntityOwnerId() == Account.ACCOUNT_ID_SYSTEM && cmd instanceof BaseAsyncCmd && ((BaseAsyncCmd)cmd).getApiResourceType() == ApiCommandResourceType.Network) {
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Skipping access check on the network owner if the owner is ROOT/system.");
- }
- owners = new Account[]{};
- } else {
- owners = new Account[]{_accountMgr.getAccount(cmd.getEntityOwnerId())};
+ Account owner = _accountMgr.getAccount(cmd.getEntityOwnerId());
+ if (owner != null) {
+ return new Account[]{owner};
}
}
+ return new Account[]{};
+ }
- if (cmd instanceof BaseAsyncCreateCmd) {
- // check that caller can access the owner account.
- _accountMgr.checkAccess(caller, null, false, owners);
+ protected void checkCallerAccessToEntities(Account caller, Account[] owners, Map<Object, AccessType> entitiesToAccess) {
+ if (entitiesToAccess.isEmpty()) {
+ return;
}
-
- if (!entitiesToAccess.isEmpty()) {
- // check that caller can access the owner account.
- _accountMgr.checkAccess(caller, null, false, owners);
- for (Map.Entry<Object,AccessType>entry : entitiesToAccess.entrySet()) {
- Object entity = entry.getKey();
- if (entity instanceof ControlledEntity) {
- _accountMgr.checkAccess(caller, entry.getValue(), true, (ControlledEntity) entity);
- } else if (entity instanceof InfrastructureEntity) {
- // FIXME: Move this code in adapter, remove code from
- // Account manager
- }
- }
+ _accountMgr.checkAccess(caller, null, false, owners);
+ for (Map.Entry<Object, AccessType> entry : entitiesToAccess.entrySet()) {
+ Object entity = entry.getKey();
+ _accountMgr.validateAccountHasAccessToResource(caller, entry.getValue(), entity);
}
}
diff --git a/server/src/main/java/com/cloud/user/AccountManagerImpl.java b/server/src/main/java/com/cloud/user/AccountManagerImpl.java
index 0a0d9265ac4..c7ceb00cb57 100644
--- a/server/src/main/java/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/main/java/com/cloud/user/AccountManagerImpl.java
@@ -43,6 +43,7 @@ import javax.naming.ConfigurationException;
import org.apache.cloudstack.acl.APIChecker;
import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.acl.InfrastructureEntity;
import org.apache.cloudstack.acl.QuerySelector;
import org.apache.cloudstack.acl.Role;
import org.apache.cloudstack.acl.RoleService;
@@ -722,6 +723,19 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
}
+ @Override
+ public void validateAccountHasAccessToResource(Account account, AccessType accessType, Object resource) {
+ Class<?> resourceClass = resource.getClass();
+ if (ControlledEntity.class.isAssignableFrom(resourceClass)) {
+ checkAccess(account, accessType, true, (ControlledEntity) resource);
+ } else if (Domain.class.isAssignableFrom(resourceClass)) {
+ checkAccess(account, (Domain) resource);
+ } else if (InfrastructureEntity.class.isAssignableFrom(resourceClass)) {
+ s_logger.trace("Validation of access to infrastructure entity has been disabled in CloudStack version 4.4.");
+ }
+ s_logger.debug(String.format("Account [%s] has access to resource.", account.getUuid()));
+ }
+
@Override
public Long checkAccessAndSpecifyAuthority(Account caller, Long zoneId) {
// We just care for resource domain admins for now, and they should be permitted to see only their zone.
diff --git a/server/src/test/java/com/cloud/api/dispatch/ParamProcessWorkerTest.java b/server/src/test/java/com/cloud/api/dispatch/ParamProcessWorkerTest.java
index cf2a43eceda..0604405f4a5 100644
--- a/server/src/test/java/com/cloud/api/dispatch/ParamProcessWorkerTest.java
+++ b/server/src/test/java/com/cloud/api/dispatch/ParamProcessWorkerTest.java
@@ -18,18 +18,10 @@
*/
package com.cloud.api.dispatch;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.NetworkRuleConflictException;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.user.Account;
-import com.cloud.user.AccountManager;
-import com.cloud.user.User;
-import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.context.CallContext;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -37,17 +29,53 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.InjectMocks;
+import org.mockito.Spy;
-import java.util.HashMap;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.address.AssociateIPAddrCmd;
+import org.apache.cloudstack.acl.SecurityChecker;
+import org.apache.cloudstack.context.CallContext;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.user.Account;
+import com.cloud.user.AccountManager;
+import com.cloud.user.User;
+import com.cloud.vm.VMInstanceVO;
@RunWith(MockitoJUnitRunner.class)
public class ParamProcessWorkerTest {
+ @Spy
+ @InjectMocks
+ private ParamProcessWorker paramProcessWorkerSpy;
+
+ @Mock
+ private AccountManager accountManagerMock;
+
+ @Mock
+ private Account callingAccountMock;
+
@Mock
- protected AccountManager accountManager;
+ private User callingUserMock;
- protected ParamProcessWorker paramProcessWorker;
+ @Mock
+ private Account ownerAccountMock;
+
+ @Mock
+ BaseCmd baseCmdMock;
+
+ private Account[] owners = new Account[]{ownerAccountMock};
+
+ private Map<Object, SecurityChecker.AccessType> entities = new HashMap<>();
public static class TestCmd extends BaseCmd {
@@ -65,7 +93,7 @@ public class ParamProcessWorkerTest {
@Override
public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
- ResourceAllocationException, NetworkRuleConflictException {
+ ResourceAllocationException, NetworkRuleConflictException {
// well documented nothing
}
@@ -83,9 +111,7 @@ public class ParamProcessWorkerTest {
@Before
public void setup() {
- CallContext.register(Mockito.mock(User.class), Mockito.mock(Account.class));
- paramProcessWorker = new ParamProcessWorker();
- paramProcessWorker._accountMgr = accountManager;
+ CallContext.register(callingUserMock, callingAccountMock);
}
@After
@@ -101,10 +127,71 @@ public class ParamProcessWorkerTest {
params.put("boolparam1", "true");
params.put("doubleparam1", "11.89");
final TestCmd cmd = new TestCmd();
- paramProcessWorker.processParameters(cmd, params);
+ paramProcessWorkerSpy.processParameters(cmd, params);
Assert.assertEquals("foo", cmd.strparam1);
Assert.assertEquals(100, cmd.intparam1);
Assert.assertTrue(Double.compare(cmd.doubleparam1, 11.89) == 0);
+ Mockito.verify(paramProcessWorkerSpy).doAccessChecks(Mockito.any(), Mockito.any());
+ }
+
+ @Test
+ public void doAccessChecksTestChecksCallerAccessToOwnerWhenCmdExtendsBaseAsyncCreateCmd() {
+ Mockito.doReturn(owners).when(paramProcessWorkerSpy).getEntityOwners(Mockito.any());
+ Mockito.doNothing().when(paramProcessWorkerSpy).checkCallerAccessToEntities(Mockito.any(), Mockito.any(), Mockito.any());
+
+ paramProcessWorkerSpy.doAccessChecks(new AssociateIPAddrCmd(), entities);
+
+ Mockito.verify(accountManagerMock).checkAccess(callingAccountMock, null, false, owners);
+ }
+
+ @Test
+ public void doAccessChecksTestChecksCallerAccessToEntities() {
+ Mockito.doReturn(owners).when(paramProcessWorkerSpy).getEntityOwners(Mockito.any());
+ Mockito.doNothing().when(paramProcessWorkerSpy).checkCallerAccessToEntities(Mockito.any(), Mockito.any(), Mockito.any());
+
+ paramProcessWorkerSpy.doAccessChecks(new AssociateIPAddrCmd(), entities);
+
+ Mockito.verify(paramProcessWorkerSpy).checkCallerAccessToEntities(callingAccountMock, owners, entities);
+ }
+
+ @Test
+ public void getEntityOwnersTestReturnsAccountsWhenCmdHasMultipleEntityOwners() {
+ Mockito.when(baseCmdMock.getEntityOwnerIds()).thenReturn(List.of(1L, 2L));
+ Mockito.doReturn(callingAccountMock).when(accountManagerMock).getAccount(1L);
+ Mockito.doReturn(ownerAccountMock).when(accountManagerMock).getAccount(2L);
+
+ List<Account> result = List.of(paramProcessWorkerSpy.getEntityOwners(baseCmdMock));
+
+ Assert.assertEquals(List.of(callingAccountMock, ownerAccountMock), result);
}
+ @Test
+ public void getEntityOwnersTestReturnsAccountWhenCmdHasOneEntityOwner() {
+ Mockito.when(baseCmdMock.getEntityOwnerId()).thenReturn(1L);
+ Mockito.when(baseCmdMock.getEntityOwnerIds()).thenReturn(null);
+ Mockito.doReturn(ownerAccountMock).when(accountManagerMock).getAccount(1L);
+
+ List<Account> result = List.of(paramProcessWorkerSpy.getEntityOwners(baseCmdMock));
+
+ Assert.assertEquals(List.of(ownerAccountMock), result);
+ }
+
+ @Test
+ public void checkCallerAccessToEntitiesTestChecksCallerAccessToOwners() {
+ entities.put(ownerAccountMock, SecurityChecker.AccessType.UseEntry);
+
+ paramProcessWorkerSpy.checkCallerAccessToEntities(callingAccountMock, owners, entities);
+
+ Mockito.verify(accountManagerMock).checkAccess(callingAccountMock, null, false, owners);
+ }
+
+ @Test
+ public void checkCallerAccessToEntitiesTestChecksCallerAccessToResource() {
+ VMInstanceVO vmInstanceVo = new VMInstanceVO();
+ entities.put(vmInstanceVo, SecurityChecker.AccessType.UseEntry);
+
+ paramProcessWorkerSpy.checkCallerAccessToEntities(callingAccountMock, owners, entities);
+
+ Mockito.verify(accountManagerMock).validateAccountHasAccessToResource(callingAccountMock, SecurityChecker.AccessType.UseEntry, vmInstanceVo);
+ }
}
diff --git a/server/src/test/java/com/cloud/user/MockAccountManagerImpl.java b/server/src/test/java/com/cloud/user/MockAccountManagerImpl.java
index fe7748b8581..f8558992440 100644
--- a/server/src/test/java/com/cloud/user/MockAccountManagerImpl.java
+++ b/server/src/test/java/com/cloud/user/MockAccountManagerImpl.java
@@ -438,6 +438,11 @@ public class MockAccountManagerImpl extends ManagerBase implements Manager, Acco
// TODO Auto-generated method stub
}
+ @Override
+ public void validateAccountHasAccessToResource(Account account, AccessType accessType, Object resource) {
+ // TODO Auto-generated method stub
+ }
+
@Override
public Long finalyzeAccountId(String accountName, Long domainId, Long projectId, boolean enabledOnly) {
// TODO Auto-generated method stub
(cloudstack) 05/06: Fix Vue devServer after CSRF fix
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to tag 4.19.1.2
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit b3f9824be1efffd12ca648748dc59e37f2a0e60f
Author: Daniel Augusto Veronezi Salvador <gu...@apache.org>
AuthorDate: Tue Sep 17 16:08:23 2024 -0300
Fix Vue devServer after CSRF fix
---
ui/vue.config.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/ui/vue.config.js b/ui/vue.config.js
index c74218b4bcf..9cae2ff66fb 100644
--- a/ui/vue.config.js
+++ b/ui/vue.config.js
@@ -142,7 +142,11 @@ const vueConfig = {
secure: false,
ws: false,
changeOrigin: true,
- proxyTimeout: 10 * 60 * 1000 // 10 minutes
+ proxyTimeout: 10 * 60 * 1000, // 10 minutes
+ cookieDomainRewrite: '*',
+ cookiePathRewrite: {
+ '/client': '/'
+ }
}
},
https: process.env.HTTPS_KEY ? {