summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/models/ssh_key.rb2
-rw-r--r--test/unit/ssh_key_test.rb3
2 files changed, 4 insertions, 1 deletions
diff --git a/app/models/ssh_key.rb b/app/models/ssh_key.rb
index 061ef1f..3440f78 100644
--- a/app/models/ssh_key.rb
+++ b/app/models/ssh_key.rb
@@ -23,7 +23,7 @@ class SshKey < ActiveRecord::Base
include ActiveMessaging::MessageSender
belongs_to :user
- SSH_KEY_FORMAT = /^ssh\-[a-z0-9]{3,4} [a-z0-9\+=\/]+ [a-z0-9_\.\-\ \+\/:]*(@[a-z0-9\.\-]*)?$/ims
+ SSH_KEY_FORMAT = /^ssh\-[a-z0-9]{3,4} [a-z0-9\+=\/]+ [a-z0-9_\.\-\ \+\/:]*(@[a-z0-9\.\-_]*)?$/ims
validates_presence_of :user_id, :key
validates_format_of :key, :with => SSH_KEY_FORMAT
diff --git a/test/unit/ssh_key_test.rb b/test/unit/ssh_key_test.rb
index 770e5a1..1d20b46 100644
--- a/test/unit/ssh_key_test.rb
+++ b/test/unit/ssh_key_test.rb
@@ -46,6 +46,9 @@ class SshKeyTest < ActiveSupport::TestCase
key.key = "ssh-rsa AAAAB3Nz/aC1yc2EAAAABIwAAAQE foo@steakhouse.local"
assert key.valid?
+
+ key.key = 'ssh-rsa AAAAB3Nz/aC1yc2EAAAABIwAAAQE foo@steak_house.local'
+ assert key.valid?
end
should "allows a wider range of extended comments" do