BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 17a4f11e by Dmitriy Zaporozhets
Options

Merge pull request #4528 from akiva/master

Allow SSH keys to be of type ecdsa rather than only rsa and dsa (which are slower, older, and weaker)
parents 0d285c1c 88301d56
Showing with 1 addition and 1 deletion
app/models/key.rb
...@@ -22,7 +22,7 @@ class Key < ActiveRecord::Base ...@@ -22,7 +22,7 @@ class Key < ActiveRecord::Base
before_validation :strip_white_space before_validation :strip_white_space
validates :title, presence: true, length: { within: 0..255 } validates :title, presence: true, length: { within: 0..255 }
validates :key, presence: true, length: { within: 0..5000 }, format: { with: /\Assh-.*\Z/ }, uniqueness: true validates :key, presence: true, length: { within: 0..5000 }, format: { with: /\A(ssh|ecdsa)-.*\Z/ }, uniqueness: true
validate :fingerprintable_key validate :fingerprintable_key
delegate :name, :email, to: :user, prefix: true delegate :name, :email, to: :user, prefix: true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment