X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b29b5f97cf4f571114d0c73794b508d65af4331c..b402e6a66e569167c0e990a4fdfc2843df76afd8:/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 14db0b1126..5856e0c8e8 100644
--- a/services/api/app/models/authorized_key.rb
+++ b/services/api/app/models/authorized_key.rb
@@ -1,5 +1,5 @@
 class AuthorizedKey < ArvadosModel
-  include AssignUuid
+  include HasUuid
   include KindAndEtag
   include CommonApiTemplate
   before_create :permission_to_set_authorized_user_uuid
@@ -33,10 +33,10 @@ class AuthorizedKey < ArvadosModel
 
   def public_key_must_be_unique
     if self.public_key
-      key = /ssh-rsa [A-Za-z0-9+\/]+/.match(self.public_key)
+      key = /^ssh-(rsa|dss) [A-Za-z0-9+\/=\+]+\b/.match(self.public_key)
       
       if not key
-        errors.add(:public_key, "does not appear to be a valid ssh-rsa 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?