dry

Author: simonLeary42

resources/lib/UnityUser.php

@@ -300,27 +300,23 @@ public function getSSHKeys(): array
         return $result;
     }
 
-    /* checks if key exists, ignoring the optional comment suffix */
-    public function SSHKeyExists(string $key): bool
+    private static function removeSSHKeyOptionalCommentSuffix(string $key): string
     {
-        // if a key is 3 words, assume the 3rd word is the optional comment suffix
-        $keyMatches = [];
-        if (preg_match("/^\s*(\S+\s+\S+)\s+(\S+)\s*$/", $key, $keyMatches)) {
-            $keyNoComment = $keyMatches[1];
+        $matches = [];
+        if (preg_match("/^\s*(\S+\s+\S+)\s+(\S+)\s*$/", $key, $matches)) {
+            return $matches[1];
         } else {
-            $keyNoComment = $key;
+            return $key;
         }
+    }
+
+    /* checks if key exists, ignoring the optional comment suffix */
+    public function SSHKeyExists(string $key): bool
+    {
+        $keyNoSuffix = self::removeSSHKeyOptionalCommentSuffix($key);
         foreach ($this->getSSHKeys() as $foundKey) {
-            if ($key === $foundKey) {
-                return true;
-            }
-            $foundKeyMatches = [];
-            if (preg_match("/^\s*(\S+\s+\S+)\s+(\S+)\s*$/", $foundKey, $foundKeyMatches)) {
-                $foundKeyNoComment = $foundKeyMatches[1];
-            } else {
-                $foundKeyNoComment = $foundKey;
-            }
-            if ($keyNoComment === $foundKeyNoComment) {
+            $foundKeyNoSuffix = self::removeSSHKeyOptionalCommentSuffix($foundKey);
+            if ($key === $foundKey || $keyNoSuffix === $foundKeyNoSuffix) {
                 return true;
             }
         }