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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
8b528426
Commit
8b528426
authored
Jun 18, 2020
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Downgrade support bot code to core
One of the tasks to downgrade service desk feature to core
parent
2304a32e
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
82 additions
and
68 deletions
+82
-68
app/models/project.rb
app/models/project.rb
+5
-0
app/models/user.rb
app/models/user.rb
+9
-0
app/policies/base_policy.rb
app/policies/base_policy.rb
+4
-0
app/policies/concerns/policy_actor.rb
app/policies/concerns/policy_actor.rb
+4
-0
app/policies/project_policy.rb
app/policies/project_policy.rb
+10
-0
ee/app/models/ee/project.rb
ee/app/models/ee/project.rb
+2
-1
ee/app/models/ee/user.rb
ee/app/models/ee/user.rb
+0
-9
ee/app/policies/ee/base_policy.rb
ee/app/policies/ee/base_policy.rb
+0
-3
ee/app/policies/ee/policy_actor.rb
ee/app/policies/ee/policy_actor.rb
+0
-4
ee/app/policies/ee/project_policy.rb
ee/app/policies/ee/project_policy.rb
+0
-10
ee/spec/models/user_spec.rb
ee/spec/models/user_spec.rb
+0
-1
ee/spec/policies/project_policy_spec.rb
ee/spec/policies/project_policy_spec.rb
+0
-28
spec/models/user_spec.rb
spec/models/user_spec.rb
+21
-12
spec/policies/project_policy_spec.rb
spec/policies/project_policy_spec.rb
+27
-0
No files found.
app/models/project.rb
View file @
8b528426
...
@@ -2410,6 +2410,11 @@ class Project < ApplicationRecord
...
@@ -2410,6 +2410,11 @@ class Project < ApplicationRecord
super
||
build_metrics_setting
super
||
build_metrics_setting
end
end
def
service_desk_enabled
false
end
alias_method
:service_desk_enabled?
,
:service_desk_enabled
private
private
def
find_service
(
services
,
name
)
def
find_service
(
services
,
name
)
...
...
app/models/user.rb
View file @
8b528426
...
@@ -655,6 +655,15 @@ class User < ApplicationRecord
...
@@ -655,6 +655,15 @@ class User < ApplicationRecord
end
end
end
end
def
support_bot
email_pattern
=
"support%s@
#{
Settings
.
gitlab
.
host
}
"
unique_internal
(
where
(
user_type: :support_bot
),
'support-bot'
,
email_pattern
)
do
|
u
|
u
.
bio
=
'The GitLab support bot used for Service Desk'
u
.
name
=
'GitLab Support Bot'
end
end
# Return true if there is only single non-internal user in the deployment,
# Return true if there is only single non-internal user in the deployment,
# ghost user is ignored.
# ghost user is ignored.
def
single_user?
def
single_user?
...
...
app/policies/base_policy.rb
View file @
8b528426
...
@@ -21,6 +21,10 @@ class BasePolicy < DeclarativePolicy::Base
...
@@ -21,6 +21,10 @@ class BasePolicy < DeclarativePolicy::Base
with_options
scope: :user
,
score:
0
with_options
scope: :user
,
score:
0
condition
(
:deactivated
)
{
@user
&
.
deactivated?
}
condition
(
:deactivated
)
{
@user
&
.
deactivated?
}
desc
"User is support bot"
with_options
scope: :user
,
score:
0
condition
(
:support_bot
)
{
@user
&
.
support_bot?
}
desc
"User email is unconfirmed or user account is locked"
desc
"User email is unconfirmed or user account is locked"
with_options
scope: :user
,
score:
0
with_options
scope: :user
,
score:
0
condition
(
:inactive
)
do
condition
(
:inactive
)
do
...
...
app/policies/concerns/policy_actor.rb
View file @
8b528426
...
@@ -45,6 +45,10 @@ module PolicyActor
...
@@ -45,6 +45,10 @@ module PolicyActor
false
false
end
end
def
support_bot?
false
end
def
deactivated?
def
deactivated?
false
false
end
end
...
...
app/policies/project_policy.rb
View file @
8b528426
...
@@ -123,6 +123,9 @@ class ProjectPolicy < BasePolicy
...
@@ -123,6 +123,9 @@ class ProjectPolicy < BasePolicy
!
@subject
.
design_management_enabled?
!
@subject
.
design_management_enabled?
end
end
with_scope
:subject
condition
(
:service_desk_enabled
)
{
@subject
.
service_desk_enabled?
}
# We aren't checking `:read_issue` or `:read_merge_request` in this case
# We aren't checking `:read_issue` or `:read_merge_request` in this case
# because it could be possible for a user to see an issuable-iid
# because it could be possible for a user to see an issuable-iid
# (`:read_issue_iid` or `:read_merge_request_iid`) but then wouldn't be
# (`:read_issue_iid` or `:read_merge_request_iid`) but then wouldn't be
...
@@ -576,6 +579,12 @@ class ProjectPolicy < BasePolicy
...
@@ -576,6 +579,12 @@ class ProjectPolicy < BasePolicy
enable
:read_build_report_results
enable
:read_build_report_results
end
end
rule
{
support_bot
}.
enable
:guest_access
rule
{
support_bot
&
~
service_desk_enabled
}.
policy
do
prevent
:create_note
prevent
:read_project
end
private
private
def
team_member?
def
team_member?
...
@@ -624,6 +633,7 @@ class ProjectPolicy < BasePolicy
...
@@ -624,6 +633,7 @@ class ProjectPolicy < BasePolicy
def
lookup_access_level!
def
lookup_access_level!
return
::
Gitlab
::
Access
::
REPORTER
if
alert_bot?
return
::
Gitlab
::
Access
::
REPORTER
if
alert_bot?
return
::
Gitlab
::
Access
::
REPORTER
if
support_bot?
&&
service_desk_enabled?
# NOTE: max_member_access has its own cache
# NOTE: max_member_access has its own cache
project
.
team
.
max_member_access
(
@user
.
id
)
project
.
team
.
max_member_access
(
@user
.
id
)
...
...
ee/app/models/ee/project.rb
View file @
8b528426
...
@@ -325,8 +325,9 @@ module EE
...
@@ -325,8 +325,9 @@ module EE
feature_available?
(
:github_project_service_integration
)
feature_available?
(
:github_project_service_integration
)
end
end
override
:service_desk_enabled
def
service_desk_enabled
def
service_desk_enabled
::
EE
::
Gitlab
::
ServiceDesk
.
enabled?
(
project:
self
)
&&
s
uper
::
EE
::
Gitlab
::
ServiceDesk
.
enabled?
(
project:
self
)
&&
s
elf
[
:service_desk_enabled
]
end
end
alias_method
:service_desk_enabled?
,
:service_desk_enabled
alias_method
:service_desk_enabled?
,
:service_desk_enabled
...
...
ee/app/models/ee/user.rb
View file @
8b528426
...
@@ -95,15 +95,6 @@ module EE
...
@@ -95,15 +95,6 @@ module EE
class_methods
do
class_methods
do
extend
::
Gitlab
::
Utils
::
Override
extend
::
Gitlab
::
Utils
::
Override
def
support_bot
email_pattern
=
"support%s@
#{
Settings
.
gitlab
.
host
}
"
unique_internal
(
where
(
user_type: :support_bot
),
'support-bot'
,
email_pattern
)
do
|
u
|
u
.
bio
=
'The GitLab support bot used for Service Desk'
u
.
name
=
'GitLab Support Bot'
end
end
def
visual_review_bot
def
visual_review_bot
email_pattern
=
"visual_review%s@
#{
Settings
.
gitlab
.
host
}
"
email_pattern
=
"visual_review%s@
#{
Settings
.
gitlab
.
host
}
"
...
...
ee/app/policies/ee/base_policy.rb
View file @
8b528426
...
@@ -8,9 +8,6 @@ module EE
...
@@ -8,9 +8,6 @@ module EE
with_scope
:user
with_scope
:user
condition
(
:auditor
,
score:
0
)
{
@user
&
.
auditor?
}
condition
(
:auditor
,
score:
0
)
{
@user
&
.
auditor?
}
with_scope
:user
condition
(
:support_bot
,
score:
0
)
{
@user
&
.
support_bot?
}
with_scope
:user
with_scope
:user
condition
(
:visual_review_bot
,
score:
0
)
{
@user
&
.
visual_review_bot?
}
condition
(
:visual_review_bot
,
score:
0
)
{
@user
&
.
visual_review_bot?
}
...
...
ee/app/policies/ee/policy_actor.rb
View file @
8b528426
...
@@ -6,10 +6,6 @@ module EE
...
@@ -6,10 +6,6 @@ module EE
false
false
end
end
def
support_bot?
false
end
def
visual_review_bot?
def
visual_review_bot?
false
false
end
end
...
...
ee/app/policies/ee/project_policy.rb
View file @
8b528426
...
@@ -18,9 +18,6 @@ module EE
...
@@ -18,9 +18,6 @@ module EE
]
.
freeze
]
.
freeze
prepended
do
prepended
do
with_scope
:subject
condition
(
:service_desk_enabled
)
{
@subject
.
service_desk_enabled?
}
with_scope
:subject
with_scope
:subject
condition
(
:related_issues_disabled
)
{
!
@subject
.
feature_available?
(
:related_issues
)
}
condition
(
:related_issues_disabled
)
{
!
@subject
.
feature_available?
(
:related_issues
)
}
...
@@ -175,12 +172,6 @@ module EE
...
@@ -175,12 +172,6 @@ module EE
@subject
.
feature_available?
(
:group_timelogs
)
@subject
.
feature_available?
(
:group_timelogs
)
end
end
rule
{
support_bot
}.
enable
:guest_access
rule
{
support_bot
&
~
service_desk_enabled
}.
policy
do
prevent
:create_note
prevent
:read_project
end
rule
{
visual_review_bot
}.
policy
do
rule
{
visual_review_bot
}.
policy
do
prevent
:read_note
prevent
:read_note
enable
:create_note
enable
:create_note
...
@@ -412,7 +403,6 @@ module EE
...
@@ -412,7 +403,6 @@ module EE
override
:lookup_access_level!
override
:lookup_access_level!
def
lookup_access_level!
def
lookup_access_level!
return
::
Gitlab
::
Access
::
NO_ACCESS
if
needs_new_sso_session?
return
::
Gitlab
::
Access
::
NO_ACCESS
if
needs_new_sso_session?
return
::
Gitlab
::
Access
::
REPORTER
if
support_bot?
&&
service_desk_enabled?
return
::
Gitlab
::
Access
::
NO_ACCESS
if
visual_review_bot?
return
::
Gitlab
::
Access
::
NO_ACCESS
if
visual_review_bot?
super
super
...
...
ee/spec/models/user_spec.rb
View file @
8b528426
...
@@ -1060,7 +1060,6 @@ RSpec.describe User do
...
@@ -1060,7 +1060,6 @@ RSpec.describe User do
where
(
:user_type
,
:expected_result
)
do
where
(
:user_type
,
:expected_result
)
do
'service_user'
|
true
'service_user'
|
true
'support_bot'
|
false
'visual_review_bot'
|
false
'visual_review_bot'
|
false
end
end
...
...
ee/spec/policies/project_policy_spec.rb
View file @
8b528426
...
@@ -1001,34 +1001,6 @@ RSpec.describe ProjectPolicy do
...
@@ -1001,34 +1001,6 @@ RSpec.describe ProjectPolicy do
end
end
end
end
context
'support bot'
do
let
(
:current_user
)
{
User
.
support_bot
}
context
'with service desk disabled'
do
it
{
expect_allowed
(
:guest_access
)
}
it
{
expect_disallowed
(
:create_note
,
:read_project
)
}
end
context
'with service desk enabled'
do
let
(
:project
)
{
create
(
:project
,
:public
,
service_desk_enabled:
true
)
}
before
do
allow
(
::
EE
::
Gitlab
::
ServiceDesk
).
to
receive
(
:enabled?
).
and_return
(
true
)
allow
(
::
EE
::
Gitlab
::
ServiceDesk
).
to
receive
(
:enabled?
).
with
(
project:
project
).
and_return
(
true
)
end
it
{
expect_allowed
(
:reporter_access
,
:create_note
,
:read_issue
)
}
context
'when issues are protected members only'
do
before
do
project
.
project_feature
.
update!
(
issues_access_level:
ProjectFeature
::
PRIVATE
)
end
it
{
expect_allowed
(
:reporter_access
,
:create_note
,
:read_issue
)
}
end
end
end
context
'visual review bot'
do
context
'visual review bot'
do
let
(
:current_user
)
{
User
.
visual_review_bot
}
let
(
:current_user
)
{
User
.
visual_review_bot
}
...
...
spec/models/user_spec.rb
View file @
8b528426
...
@@ -4634,7 +4634,8 @@ describe User do
...
@@ -4634,7 +4634,8 @@ describe User do
[
[
{
state:
'blocked'
},
{
state:
'blocked'
},
{
user_type: :ghost
},
{
user_type: :ghost
},
{
user_type: :alert_bot
}
{
user_type: :alert_bot
},
{
user_type: :support_bot
}
]
]
end
end
...
@@ -4688,6 +4689,7 @@ describe User do
...
@@ -4688,6 +4689,7 @@ describe User do
where
(
:user_type
,
:expected_result
)
do
where
(
:user_type
,
:expected_result
)
do
'human'
|
true
'human'
|
true
'alert_bot'
|
false
'alert_bot'
|
false
'support_bot'
|
false
end
end
with_them
do
with_them
do
...
@@ -4756,19 +4758,26 @@ describe User do
...
@@ -4756,19 +4758,26 @@ describe User do
end
end
end
end
describe
'#migration_bot'
do
context
'bot users'
do
it
'creates the user if it does not exist'
do
shared_examples
'bot users'
do
|
bot_type
|
expect
do
it
'creates the user if it does not exist'
do
described_class
.
migration_bot
expect
do
end
.
to
change
{
User
.
where
(
user_type: :migration_bot
).
count
}.
by
(
1
)
described_class
.
public_send
(
bot_type
)
end
end
.
to
change
{
User
.
where
(
user_type:
bot_type
).
count
}.
by
(
1
)
end
it
'does not create a new user if it already exists'
do
it
'does not create a new user if it already exists'
do
described_class
.
migration_bot
described_class
.
public_send
(
bot_type
)
expect
do
expect
do
described_class
.
migration_bot
described_class
.
public_send
(
bot_type
)
end
.
not_to
change
{
User
.
count
}
end
.
not_to
change
{
User
.
count
}
end
end
end
it_behaves_like
'bot users'
,
:alert_bot
it_behaves_like
'bot users'
,
:support_bot
it_behaves_like
'bot users'
,
:migration_bot
it_behaves_like
'bot users'
,
:ghost
end
end
end
end
spec/policies/project_policy_spec.rb
View file @
8b528426
...
@@ -496,6 +496,33 @@ describe ProjectPolicy do
...
@@ -496,6 +496,33 @@ describe ProjectPolicy do
end
end
end
end
context
'support bot'
do
let
(
:current_user
)
{
User
.
support_bot
}
subject
{
described_class
.
new
(
current_user
,
project
)
}
context
'with service desk disabled'
do
it
{
expect_allowed
(
:guest_access
)
}
it
{
expect_disallowed
(
:create_note
,
:read_project
)
}
end
context
'with service desk enabled'
do
before
do
allow
(
project
).
to
receive
(
:service_desk_enabled?
).
and_return
(
true
)
end
it
{
expect_allowed
(
:reporter_access
,
:create_note
,
:read_issue
)
}
context
'when issues are protected members only'
do
before
do
project
.
project_feature
.
update!
(
issues_access_level:
ProjectFeature
::
PRIVATE
)
end
it
{
expect_allowed
(
:reporter_access
,
:create_note
,
:read_issue
)
}
end
end
end
describe
'read_prometheus_alerts'
do
describe
'read_prometheus_alerts'
do
subject
{
described_class
.
new
(
current_user
,
project
)
}
subject
{
described_class
.
new
(
current_user
,
project
)
}
...
...
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