opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-10-13 16:18:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1204 from dbeaver/tech/CB-2077

Browse Source 
CB-2077 save pattern variables
This commit is contained in:
Alexander Skoblikov
2022-10-20 00:23:12 +03:00
committed by GitHub
parent fefe419b68 415859ce2b
commit 6f7c671bcb
3 changed files with 113 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/WebAppUtils.java
+42
View File
@@ -27,6 +27,7 @@ import org.jkiss.dbeaver.model.app.DBPProject;
import org.jkiss.dbeaver.model.auth.SMAuthenticationManager;
import org.jkiss.dbeaver.model.rm.RMProjectType;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.utils.GeneralUtils;
import org.jkiss.utils.CommonUtils;
import javax.servlet.http.Cookie;
@@ -92,6 +93,47 @@ public class WebAppUtils {
return resultConfig;
}
@SuppressWarnings("unchecked")
public static Map<String, Object> mergeConfigurationsWithVariables(Map<String, Object> origin, Map<String, Object> additional) {
var resultConfig = new HashMap<String, Object>();
Set<String> rootKeys = new HashSet<>(additional.keySet());
for (var rootKey : rootKeys) {
var originValue = origin.get(rootKey);
var additionalValue = additional.get(rootKey);
if (additionalValue == null) {
continue;
}
if (originValue instanceof Map) {
var resultValue = mergeConfigurationsWithVariables((Map<String, Object>) originValue, (Map<String, Object>) additionalValue);
resultConfig.put(rootKey, resultValue);
} else {
resultConfig.put(rootKey, getExtractedValue(originValue, additionalValue));
}
}
return resultConfig;
}
public static Object getExtractedValue(Object oldValue, Object newValue) {
if (!(oldValue instanceof String)) {
return newValue;
}
String value = (String) oldValue;
if (!GeneralUtils.isVariablePattern(value)) {
return newValue;
}
String extractedVariable = GeneralUtils.extractVariableName(value);
if (extractedVariable != null) {
return GeneralUtils.variablePattern(extractedVariable + ":" + newValue);
} else {
return newValue;
}
}
@NotNull
public static String removeSideSlashes(String action) {
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBAppConfig.java
+6 -2
View File
@@ -218,12 +218,16 @@ public class CBAppConfig extends BaseAuthWebAppConfiguration implements WebAuthC
}
public <T> T getResourceQuota(String quotaId) {
return (T) resourceQuotas.get(quotaId);
Object quota = resourceQuotas.get(quotaId);
if (quota instanceof String) {
quota = CommonUtils.toDouble(quota);
}
return (T) quota;
}
public <T> T getResourceQuota(String quotaId, T defaultValue) {
if (resourceQuotas.containsKey(quotaId)) {
return (T) resourceQuotas.get(quotaId);
return (T) getResourceQuota(quotaId);
} else {
return defaultValue;
}
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
+65 -21
View File
@@ -112,6 +112,7 @@ public class CBApplication extends BaseWebApplication implements WebAuthApplicat
protected final Map<String, Object> databaseConfiguration = new HashMap<>();
private final CBAppConfig appConfiguration = new CBAppConfig();
private Map<String, String> externalProperties = new LinkedHashMap<>();
private Map<String, Object> originalConfigurationProperties = new LinkedHashMap<>();
// Persistence
private SMAdminController securityController;
@@ -650,13 +651,11 @@ public class CBApplication extends BaseWebApplication implements WebAuthApplicat
Map<String, Object> configProps = new LinkedHashMap<>();
if (configFile.exists()) {
log.debug("Read configuration [" + configFile.getAbsolutePath() + "]");
try (Reader reader = new InputStreamReader(new FileInputStream(configFile), StandardCharsets.UTF_8)) {
configProps.putAll(JSONUtils.parseMap(getGson(), reader));
patchConfigurationWithProperties(configProps); // patch original properties
// saves original configuration file
this.originalConfigurationProperties.putAll(readConfigurationFile(configFile));
} catch (IOException e) {
throw new DBException("Error parsing server configuration", e);
}
configProps.putAll(readConfigurationFile(configFile));
patchConfigurationWithProperties(configProps); // patch original properties
}
readAdditionalConfiguration(configProps);
@@ -682,6 +681,14 @@ public class CBApplication extends BaseWebApplication implements WebAuthApplicat
return configProps;
}
public Map<String, Object> readConfigurationFile(File configFile) throws DBException {
try (Reader reader = new InputStreamReader(new FileInputStream(configFile), StandardCharsets.UTF_8)) {
return JSONUtils.parseMap(getGson(), reader);
} catch (IOException e) {
throw new DBException("Error parsing server configuration", e);
}
}
private Gson getGson() {
// Stupid way to populate existing objects but ok google (https://github.com/google/gson/issues/431)
InstanceCreator<CBAppConfig> appConfigCreator = type -> appConfiguration;
@@ -875,36 +882,57 @@ public class CBApplication extends BaseWebApplication implements WebAuthApplicat
Map<String, Object> rootConfig = new LinkedHashMap<>();
{
var serverConfigProperties = new LinkedHashMap<String, Object>();
var originServerConfig = getServerConfigProps(this.originalConfigurationProperties); // get server properties from original configuration file
rootConfig.put("server", serverConfigProperties);
if (!CommonUtils.isEmpty(newServerName)) {
serverConfigProperties.put(CBConstants.PARAM_SERVER_NAME, newServerName);
copyConfigValue(originServerConfig, serverConfigProperties, CBConstants.PARAM_SERVER_NAME, newServerName);
}
if (!CommonUtils.isEmpty(newServerURL)) {
serverConfigProperties.put(CBConstants.PARAM_SERVER_URL, newServerURL);
copyConfigValue(
originServerConfig, serverConfigProperties, CBConstants.PARAM_SERVER_URL, newServerURL);
}
if (sessionExpireTime > 0) {
serverConfigProperties.put(CBConstants.PARAM_SESSION_EXPIRE_PERIOD, sessionExpireTime);
copyConfigValue(
originServerConfig, serverConfigProperties, CBConstants.PARAM_SESSION_EXPIRE_PERIOD, sessionExpireTime);
}
var databaseConfigProperties = new LinkedHashMap<String, Object>();
Map<String, Object> oldRuntimeDBConfig = JSONUtils.getObject(originServerConfig, CBConstants.PARAM_DB_CONFIGURATION);
if (!CommonUtils.isEmpty(databaseConfiguration)) {
serverConfigProperties.put(CBConstants.PARAM_DB_CONFIGURATION, databaseConfiguration);
for (Map.Entry<String, Object> mp : databaseConfiguration.entrySet()) {
copyConfigValue(oldRuntimeDBConfig, databaseConfigProperties, mp.getKey(), mp.getValue());
}
serverConfigProperties.put(CBConstants.PARAM_DB_CONFIGURATION, databaseConfigProperties);
}
}
{
var appConfigProperties = new LinkedHashMap<String, Object>();
Map<String, Object> oldAppConfig = JSONUtils.getObject(this.originalConfigurationProperties, "app");
rootConfig.put("app", appConfigProperties);
appConfigProperties.put("anonymousAccessEnabled", appConfig.isAnonymousAccessEnabled());
appConfigProperties.put("supportsCustomConnections", appConfig.isSupportsCustomConnections());
appConfigProperties.put("publicCredentialsSaveEnabled", appConfig.isPublicCredentialsSaveEnabled());
appConfigProperties.put("adminCredentialsSaveEnabled", appConfig.isAdminCredentialsSaveEnabled());
appConfigProperties.put("enableReverseProxyAuth", appConfig.isEnabledReverseProxyAuth());
appConfigProperties.put("forwardProxy", appConfig.isEnabledForwardProxy());
appConfigProperties.put("linkExternalCredentialsWithUser", appConfig.isLinkExternalCredentialsWithUser());
appConfigProperties.put("redirectOnFederatedAuth", appConfig.isRedirectOnFederatedAuth());
appConfigProperties.put(CBConstants.PARAM_RESOURCE_MANAGER_ENABLED, appConfig.isResourceManagerEnabled());
copyConfigValue(
oldAppConfig, appConfigProperties, "anonymousAccessEnabled", appConfig.isAnonymousAccessEnabled());
copyConfigValue(
oldAppConfig, appConfigProperties, "supportsCustomConnections", appConfig.isSupportsCustomConnections());
copyConfigValue(
oldAppConfig, appConfigProperties, "publicCredentialsSaveEnabled", appConfig.isPublicCredentialsSaveEnabled());
copyConfigValue(
oldAppConfig, appConfigProperties, "adminCredentialsSaveEnabled", appConfig.isAdminCredentialsSaveEnabled());
copyConfigValue(
oldAppConfig, appConfigProperties, "enableReverseProxyAuth", appConfig.isEnabledReverseProxyAuth());
copyConfigValue(
oldAppConfig, appConfigProperties, "forwardProxy", appConfig.isEnabledForwardProxy());
copyConfigValue(
oldAppConfig, appConfigProperties, "linkExternalCredentialsWithUser", appConfig.isLinkExternalCredentialsWithUser());
copyConfigValue(
oldAppConfig, appConfigProperties, "redirectOnFederatedAuth", appConfig.isRedirectOnFederatedAuth());
copyConfigValue(
oldAppConfig, appConfigProperties, CBConstants.PARAM_RESOURCE_MANAGER_ENABLED, appConfig.isResourceManagerEnabled());
Map<String, Object> resourceQuotas = appConfig.getResourceQuotas();
Map<String, Object> resourceQuotas = new LinkedHashMap<>();
Map<String, Object> originResourceQuotas = JSONUtils.getObject(oldAppConfig, CBConstants.PARAM_RESOURCE_QUOTAS);
for (Map.Entry<String, Object> mp : appConfig.getResourceQuotas().entrySet()) {
copyConfigValue(originResourceQuotas, resourceQuotas, mp.getKey(), mp.getValue());
}
appConfigProperties.put(CBConstants.PARAM_RESOURCE_QUOTAS, resourceQuotas);
{
@@ -1012,4 +1040,20 @@ public class CBApplication extends BaseWebApplication implements WebAuthApplicat
public Set<String> getAvailableAuthRoles() {
return Set.of();
}
// gets info about patterns from original configuration file and saves it to runtime config
private void copyConfigValue(Map<String, Object> oldConfig, Map<String, Object> newConfig, String key, Object defaultValue) {
Object value = oldConfig.get(key);
if (value instanceof Map && defaultValue instanceof Map) {
Map<String, Object> subValue = new LinkedHashMap<>();
Map<String, Object> oldConfigValue = JSONUtils.getObject(oldConfig, key);
for (Map.Entry<String, Object> entry : oldConfigValue.entrySet()) {
copyConfigValue(oldConfigValue, subValue, entry.getKey(), ((Map) defaultValue).get(entry.getKey()));
}
newConfig.put(key, subValue);
} else {
Object newConfigValue = WebAppUtils.getExtractedValue(oldConfig.get(key), defaultValue);
newConfig.put(key, newConfigValue);
}
}
}