Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
b98f414a
Commit
b98f414a
authored
11 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'key_uniqueness' of /home/git/repositories/gitlab/gitlabhq
parents
dcac37d9
aa0473d0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
24 deletions
+15
-24
app/models/key.rb
app/models/key.rb
+6
-20
spec/models/key_spec.rb
spec/models/key_spec.rb
+9
-4
No files found.
app/models/key.rb
View file @
b98f414a
...
...
@@ -21,11 +21,11 @@ class Key < ActiveRecord::Base
attr_accessible
:key
,
:title
before_validation
:strip_white_space
before_validation
:strip_white_space
,
:generate_fingerpint
validates
:title
,
presence:
true
,
length:
{
within:
0
..
255
}
validates
:key
,
presence:
true
,
length:
{
within:
0
..
5000
},
format:
{
with:
/\A(ssh|ecdsa)-.*\Z/
},
uniqueness:
true
validate
:fingerprintable_key
validate
s
:fingerprint
,
uniqueness:
true
,
presence:
{
message:
'cannot be generated'
}
delegate
:name
,
:email
,
to: :user
,
prefix:
true
...
...
@@ -33,15 +33,6 @@ class Key < ActiveRecord::Base
self
.
key
=
key
.
strip
unless
key
.
blank?
end
def
fingerprintable_key
return
true
unless
key
# Don't test if there is no key.
unless
generate_fingerpint
errors
.
add
(
:key
,
"can't be fingerprinted"
)
false
end
end
# projects that has this key
def
projects
user
.
authorized_projects
...
...
@@ -54,26 +45,21 @@ class Key < ActiveRecord::Base
private
def
generate_fingerpint
self
.
fingerprint
=
nil
return
unless
key
.
present?
cmd_status
=
0
cmd_output
=
''
file
=
Tempfile
.
new
(
'gitlab_key_file'
)
begin
Tempfile
.
open
(
'gitlab_key_file'
)
do
|
file
|
file
.
puts
key
file
.
rewind
cmd_output
,
cmd_status
=
popen
(
"ssh-keygen -lf
#{
file
.
path
}
"
,
'/tmp'
)
ensure
file
.
close
file
.
unlink
# deletes the temp file
end
if
cmd_status
.
zero?
cmd_output
.
gsub
/([\d\h]{2}:)+[\d\h]{2}/
do
|
match
|
self
.
fingerprint
=
match
end
true
else
false
end
end
end
This diff is collapsed.
Click to expand it.
spec/models/key_spec.rb
View file @
b98f414a
...
...
@@ -42,17 +42,22 @@ describe Key do
build
(
:key
,
user:
user
).
should
be_valid
end
it
"does not accept
s th
e key twice"
do
it
"does not accept
the exact sam
e key twice"
do
create
(
:key
,
user:
user
)
build
(
:key
,
user:
user
).
should_not
be_valid
end
it
"does not accept a duplicate key with a different comment"
do
create
(
:key
,
user:
user
)
duplicate
=
build
(
:key
,
user:
user
)
duplicate
.
key
<<
' extra comment'
duplicate
.
should_not
be_valid
end
end
context
"validate it is a fingerprintable key"
do
let
(
:user
)
{
create
(
:user
)
}
it
"accepts the fingerprintable key"
do
build
(
:key
,
user:
user
).
should
be_valid
build
(
:key
).
should
be_valid
end
it
"rejects the unfingerprintable key (contains space in middle)"
do
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment