11345: Clamp retry-after to (0, max_retry_wait). Deindent retry_wrapper a bit for...

[arvados.git] / 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 5856e0c8e8d9a6a2c0b7e0edb9c01e782b3dfc77..452cd6967bfa7c40d22f8746cc69c2ea10c7fc89 100644 (file)
--- a/services/api/app/models/authorized_key.rb
+++ b/services/api/app/models/authorized_key.rb
@@ -33,13 +33,14 @@ class AuthorizedKey < ArvadosModel
 
   def public_key_must_be_unique
     if self.public_key
-      key = /^ssh-(rsa|dss) [A-Za-z0-9+\/=\+]+\b/.match(self.public_key)
-      
-      if not 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?
+        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