class AuthorizedKey < ArvadosModel
- include AssignUuid
+ include HasUuid
include KindAndEtag
include CommonApiTemplate
before_create :permission_to_set_authorized_user_uuid
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