safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-1629: Always include any pre-existing connection group attributes when exposing new ones.

Browse Source
This commit is contained in:
James Muehlner
2022-07-06 17:55:28 +00:00
parent 5b69bf405d
commit 374f1b5e49
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/conf/VaultAttributeService.java
View File

@@ -31,10 +31,13 @@ import org.apache.guacamole.form.Form;
public interface VaultAttributeService { public interface VaultAttributeService {
/** /**
* Return all connection group attributes to be exposed through the admin UI. * Return all custom connection group attributes to be exposed through the
* admin UI for the current vault implementation.
* *
* @return * @return
* All connection group attributes to be exposed through the admin UI. * All custom connection group attributes to be exposed through the
* admin UI for the current vault implementation.
*
*/ */
public Collection<Form> getConnectionGroupAttributes(); public Collection<Form> getConnectionGroupAttributes();
} }

10
extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/user/VaultUserContext.java
View File

@@ -28,6 +28,9 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.GuacamoleServerException; import org.apache.guacamole.GuacamoleServerException;
import org.apache.guacamole.form.Form; import org.apache.guacamole.form.Form;
@@ -425,7 +428,12 @@ public class VaultUserContext extends TokenInjectingUserContext {
@Override @Override
public Collection<Form> getConnectionGroupAttributes() { public Collection<Form> getConnectionGroupAttributes() {
return attributeService.getConnectionGroupAttributes();
// Add any custom attributes to any previously defined attributes
return Stream.concat(
super.getConnectionGroupAttributes().stream(),
attributeService.getConnectionGroupAttributes().stream()
).collect(Collectors.toUnmodifiableList());
} }
} }