-
Notifications
You must be signed in to change notification settings - Fork 399
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'devel' into CB-4591-ssh-password-required
- Loading branch information
Showing
13 changed files
with
325 additions
and
107 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/registry/WebAuthProviderProperty.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| * DBeaver - Universal Database Manager | ||
| * Copyright (C) 2010-2024 DBeaver Corp and others | ||
| * | ||
| * Licensed 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 io.cloudbeaver.registry; | ||
|
|
||
| import org.eclipse.core.runtime.IConfigurationElement; | ||
| import org.jkiss.code.NotNull; | ||
| import org.jkiss.code.Nullable; | ||
| import org.jkiss.dbeaver.model.impl.PropertyDescriptor; | ||
|
|
||
| public class WebAuthProviderProperty extends PropertyDescriptor { | ||
| private final String[] requiredFeatures; | ||
| @Nullable | ||
| private final String type; | ||
|
|
||
| public WebAuthProviderProperty(String category, IConfigurationElement config) { | ||
| super(category, config); | ||
| String featuresAttr = config.getAttribute("requiredFeatures"); | ||
| this.requiredFeatures = featuresAttr == null ? new String[0] : featuresAttr.split(","); | ||
| this.type = config.getAttribute("type"); | ||
| } | ||
|
|
||
| @NotNull | ||
| public String[] getRequiredFeatures() { | ||
| return requiredFeatures; | ||
| } | ||
|
|
||
| @Nullable | ||
| public String getType() { | ||
| return type; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
...loudbeaver.model/src/io/cloudbeaver/registry/WebCommonAuthProviderPropertyDescriptor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| /* | ||
| * DBeaver - Universal Database Manager | ||
| * Copyright (C) 2010-2024 DBeaver Corp and others | ||
| * | ||
| * Licensed 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 io.cloudbeaver.registry; | ||
|
|
||
| import org.eclipse.core.runtime.IConfigurationElement; | ||
| import org.jkiss.code.NotNull; | ||
| import org.jkiss.dbeaver.model.impl.AbstractDescriptor; | ||
| import org.jkiss.utils.CommonUtils; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.HashSet; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
|
|
||
| public class WebCommonAuthProviderPropertyDescriptor extends AbstractDescriptor { | ||
| private final Set<String> supportedProviderCategories = new HashSet<>(); | ||
| private final Set<String> exclude = new HashSet<>(); | ||
| @NotNull | ||
| private final List<WebAuthProviderProperty> configurationParameters; | ||
|
|
||
| public WebCommonAuthProviderPropertyDescriptor(IConfigurationElement cfg) { | ||
| super(cfg); | ||
| configurationParameters = WebAuthProviderRegistry.readProperties(cfg); | ||
| String supportedCategoriesAttr = cfg.getAttribute("supportedProviderCategories"); | ||
| if (CommonUtils.isNotEmpty(supportedCategoriesAttr)) { | ||
| supportedProviderCategories.addAll(Arrays.stream(supportedCategoriesAttr.split(",")).toList()); | ||
| } | ||
|
|
||
| String excludeAttr = cfg.getAttribute("exclude"); | ||
| if (CommonUtils.isNotEmpty(excludeAttr)) { | ||
| exclude.addAll(Arrays.stream(excludeAttr.split(",")).toList()); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| @NotNull | ||
| public List<WebAuthProviderProperty> getConfigurationParameters() { | ||
| return configurationParameters; | ||
| } | ||
|
|
||
| private boolean supportAllProviders() { | ||
| return supportedProviderCategories.isEmpty() && exclude.isEmpty(); | ||
| } | ||
|
|
||
| public boolean isApplicableFor(@NotNull WebAuthProviderDescriptor providerDescriptor) { | ||
| if (supportAllProviders()) { | ||
| return true; | ||
| } | ||
| boolean supported = false; | ||
| for (String type : providerDescriptor.getTypes()) { | ||
| if (exclude.contains(type)) { | ||
| return false; | ||
| } | ||
| if (supportedProviderCategories.contains(type)) { | ||
| supported = true; | ||
| } | ||
| } | ||
| return supported; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| .root { | ||
| display: inline-flex; | ||
| align-items: center; | ||
| font-size: 12px; | ||
| } | ||
|
|
||
| .combobox { | ||
| width: 120px; | ||
| flex: 0 0 auto; | ||
| } |
Oops, something went wrong.