GUACAMOLE-1868: Add support for new PAM Hostname field.

apache · Oct 19, 2023 · a8fea18 · a8fea18
1 parent 3514a21
commit a8fea18
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/...amole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmRecordService.java b/...amole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmRecordService.java
@@ -30,6 +30,7 @@
 import com.keepersecurity.secretsManager.core.KeyPair;
 import com.keepersecurity.secretsManager.core.KeyPairs;
 import com.keepersecurity.secretsManager.core.Login;
+import com.keepersecurity.secretsManager.core.PamHostnames;
 import com.keepersecurity.secretsManager.core.Password;
 import com.keepersecurity.secretsManager.core.SecretsManager;
 import com.keepersecurity.secretsManager.core.Text;
@@ -60,7 +61,7 @@ public class KsmRecordService {
      * hostnames/addresses.
      */
     private static final Pattern HOSTNAME_LABEL_PATTERN =
-            Pattern.compile("hostname|(ip\\s*)?address", Pattern.CASE_INSENSITIVE);
+            Pattern.compile("(pam)?hostname|(ip\\s*)?address", Pattern.CASE_INSENSITIVE);
 
     /**
      * Regular expression which matches the labels of custom fields containing
@@ -411,6 +412,11 @@ public String getHostname(KeeperRecord record) {
         if (hostsField != null)
             return getSingleStringValue(hostsField.getValue(), Host::getHostName);
 
+        // Next, try a PAM hostname
+        PamHostnames pamHostsField = getField(record, PamHostnames.class, null);
+        if (pamHostsField != null)
+            return getSingleStringValue(pamHostsField.getValue(), Host::getHostName);
+
         KeeperRecordData data = record.getData();
         List<KeeperRecordField> custom = data.getCustom();