X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/09898bcec15c30328ae9e720e9a0c7be1595a004..442a871e7f3476938d0ebb3adbe3b9a7742f03ad:/services/api/app/models/authorized_key.rb

diff --git a/services/api/app/models/authorized_key.rb b/services/api/app/models/authorized_key.rb
index 2b30d4b7e3..a5c5081c40 100644
--- a/services/api/app/models/authorized_key.rb
+++ b/services/api/app/models/authorized_key.rb
@@ -1,5 +1,9 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 class AuthorizedKey < ArvadosModel
-  include AssignUuid
+  include HasUuid
   include KindAndEtag
   include CommonApiTemplate
   before_create :permission_to_set_authorized_user_uuid
@@ -33,14 +37,15 @@ class AuthorizedKey < ArvadosModel
 
   def public_key_must_be_unique
     if self.public_key
-      key = /ssh-rsa [A-Za-z0-9+\/]+/.match(self.public_key)
-      
-      if not key
-        errors.add(:public_key, "Does not appear to be a valid ssh-rsa key")
+      valid_key = SSHKey.valid_ssh_public_key? self.public_key
+
+      if not valid_key
+        errors.add(:public_key, "does not appear to be a valid ssh-rsa or dsa public key")
       else
         # Valid if no other rows have this public key
-        if self.class.where('public_key like ?', "%#{key[0]}%").any?
-          errors.add(:public_key, "Key already exists in the database, use a different key.")
+        if self.class.where('uuid != ? and public_key like ?',
+                            uuid || '', "%#{self.public_key}%").any?
+          errors.add(:public_key, "already exists in the database, use a different key.")
           return false
         end
       end