Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
56e950071da4
Commit
da2189df
authored
Jan 31, 2018
by
Douwe Maan
Browse files
Validate user namespace before saving so that errors persist on model
parent
d78eb9666445
Changes
6
Hide whitespace changes
Inline
Side-by-side
app/models/namespace.rb
View file @
56e95007
...
...
@@ -20,6 +20,9 @@ class Namespace < ActiveRecord::Base
has_many
:projects
,
dependent: :destroy
# rubocop:disable Cop/ActiveRecordDependent
has_many
:project_statistics
# This should _not_ be `inverse_of: :namespace`, because that would also set
# `user.namespace` when this user creates a group with themselves as `owner`.
belongs_to
:owner
,
class_name:
"User"
belongs_to
:parent
,
class_name:
"Namespace"
...
...
app/models/user.rb
View file @
56e95007
...
...
@@ -77,7 +77,7 @@ def update_tracked_fields!(request)
#
# Namespace for personal projects
has_one
:namespace
,
->
{
where
(
type:
nil
)
},
dependent: :destroy
,
foreign_key: :owner_id
,
autosave:
true
# rubocop:disable Cop/ActiveRecordDependent
has_one
:namespace
,
->
{
where
(
type:
nil
)
},
dependent: :destroy
,
foreign_key: :owner_id
,
inverse_of: :owner
,
autosave:
true
# rubocop:disable Cop/ActiveRecordDependent
# Profile
has_many
:keys
,
->
do
...
...
@@ -171,7 +171,7 @@ def update_tracked_fields!(request)
before_save
:ensure_user_rights_and_limits
,
if:
->
(
user
)
{
user
.
new_record?
||
user
.
external_changed?
}
before_save
:skip_reconfirmation!
,
if:
->
(
user
)
{
user
.
email_changed?
&&
user
.
read_only_attribute?
(
:email
)
}
before_save
:check_for_verified_email
,
if:
->
(
user
)
{
user
.
email_changed?
&&
!
user
.
new_record?
}
after_save
:ensure_namespace_correct
before_validation
:ensure_namespace_correct
after_update
:username_changed_hook
,
if: :username_changed?
after_destroy
:post_destroy_hook
after_destroy
:remove_key_cache
...
...
@@ -884,16 +884,10 @@ def hook_attrs
end
def
ensure_namespace_correct
# Ensure user has namespace
create_namespace!
(
path:
username
,
name:
username
)
unless
namespace
if
username_changed?
unless
namespace
.
update_attributes
(
path:
username
,
name:
username
)
namespace
.
errors
.
each
do
|
attribute
,
message
|
self
.
errors
.
add
(
:"namespace_
#{
attribute
}
"
,
message
)
end
raise
ActiveRecord
::
RecordInvalid
.
new
(
namespace
)
end
if
namespace
namespace
.
path
=
namespace
.
name
=
username
if
username_changed?
else
build_namespace
(
path:
username
,
name:
username
)
end
end
...
...
changelogs/unreleased/dm-user-namespace-route-path-validation.yml
0 → 100644
View file @
56e95007
---
title
:
Validate user namespace before saving so that errors persist on model
merge_request
:
author
:
type
:
fixed
spec/lib/gitlab/closing_issue_extractor_spec.rb
View file @
56e95007
...
...
@@ -3,7 +3,7 @@
describe
Gitlab
::
ClosingIssueExtractor
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project2
)
{
create
(
:project
)
}
let
(
:forked_project
)
{
Projects
::
ForkService
.
new
(
project
,
project
.
creator
).
execute
}
let
(
:forked_project
)
{
Projects
::
ForkService
.
new
(
project
,
project
2
.
creator
).
execute
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
let
(
:issue2
)
{
create
(
:issue
,
project:
project2
)
}
let
(
:reference
)
{
issue
.
to_reference
}
...
...
@@ -14,6 +14,7 @@
before
do
project
.
add_developer
(
project
.
creator
)
project
.
add_developer
(
project2
.
creator
)
project2
.
add_master
(
project
.
creator
)
end
...
...
spec/models/user_spec.rb
View file @
56e95007
...
...
@@ -101,7 +101,7 @@
user
=
build
(
:user
,
username:
'dashboard'
)
expect
(
user
).
not_to
be_valid
expect
(
user
.
errors
.
values
).
to
eq
[
[
'dashboard is a reserved name'
]
]
expect
(
user
.
errors
.
messages
[
:username
]
).
to
eq
[
'dashboard is a reserved name'
]
end
it
'allows child names'
do
...
...
@@ -132,6 +132,23 @@
expect
(
user
.
errors
.
messages
[
:username
].
first
).
to
match
(
'cannot be changed if a personal project has container registry tags'
)
end
end
context
'when the username was used by another user before'
do
let
(
:username
)
{
'foo'
}
let!
(
:other_user
)
{
create
(
:user
,
username:
username
)
}
before
do
other_user
.
username
=
'bar'
other_user
.
save!
end
it
'is invalid'
do
user
=
build
(
:user
,
username:
username
)
expect
(
user
).
not_to
be_valid
expect
(
user
.
errors
.
messages
[
:"namespace.route.path"
].
first
).
to
eq
(
'foo has been taken before. Please use another one'
)
end
end
end
it
'has a DB-level NOT NULL constraint on projects_limit'
do
...
...
@@ -2623,7 +2640,7 @@ def access_levels(groups)
it
'should raise an ActiveRecord::RecordInvalid exception'
do
user2
=
build
(
:user
,
username:
'foo'
)
expect
{
user2
.
save!
}.
to
raise_error
(
ActiveRecord
::
RecordInvalid
,
/
R
oute path foo has been taken before
. Please use another one, Route is invalid
/
)
expect
{
user2
.
save!
}.
to
raise_error
(
ActiveRecord
::
RecordInvalid
,
/
Namespace r
oute path foo has been taken before/
)
end
end
...
...
spec/services/projects/gitlab_projects_import_service_spec.rb
View file @
56e95007
require
'spec_helper'
describe
Projects
::
GitlabProjectsImportService
do
set
(
:namespace
)
{
build
(
:namespace
)
}
set
(
:namespace
)
{
create
(
:namespace
)
}
let
(
:file
)
{
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/doc_sample.txt'
,
'text/plain'
)
}
subject
{
described_class
.
new
(
namespace
.
owner
,
{
namespace_id:
namespace
.
id
,
path:
path
,
file:
file
})
}
...
...
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