X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f4ca9ad94a6bb006d1f3c7ba207837f1736d1247..be13306c210c458dfd74f9a1aab8377534f8760f:/services/api/app/models/authorized_key.rb?ds=sidebyside diff --git a/services/api/app/models/authorized_key.rb b/services/api/app/models/authorized_key.rb index 452cd6967b..8aefa8db81 100644 --- a/services/api/app/models/authorized_key.rb +++ b/services/api/app/models/authorized_key.rb @@ -1,3 +1,7 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + class AuthorizedKey < ArvadosModel include HasUuid include KindAndEtag @@ -5,7 +9,11 @@ class AuthorizedKey < ArvadosModel before_create :permission_to_set_authorized_user_uuid before_update :permission_to_set_authorized_user_uuid - belongs_to :authorized_user, :foreign_key => :authorized_user_uuid, :class_name => 'User', :primary_key => :uuid + belongs_to :authorized_user, + foreign_key: 'authorized_user_uuid', + class_name: 'User', + primary_key: 'uuid', + optional: true validate :public_key_must_be_unique @@ -33,17 +41,11 @@ class AuthorizedKey < ArvadosModel def public_key_must_be_unique if self.public_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('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 + # Valid if no other rows have this public 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 return true