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
Boxiang Sun
gitlab-ce
Commits
8f9b64c7
Commit
8f9b64c7
authored
Jun 22, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix internal snippets can be searched by anyone
parent
1d9bbb0b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
62 additions
and
2 deletions
+62
-2
app/models/snippet.rb
app/models/snippet.rb
+4
-1
spec/models/snippet_spec.rb
spec/models/snippet_spec.rb
+21
-1
spec/services/search/snippet_service_spec.rb
spec/services/search/snippet_service_spec.rb
+37
-0
No files found.
app/models/snippet.rb
View file @
8f9b64c7
...
...
@@ -135,7 +135,10 @@ class Snippet < ActiveRecord::Base
end
def
accessible_to
(
user
)
where
(
'visibility_level IN (?) OR author_id = ?'
,
[
Snippet
::
INTERNAL
,
Snippet
::
PUBLIC
],
user
)
visibility_levels
=
[
Snippet
::
PUBLIC
]
visibility_levels
<<
Snippet
::
INTERNAL
if
user
where
(
'visibility_level IN (?) OR author_id = ?'
,
visibility_levels
,
user
)
end
end
end
spec/models/snippet_spec.rb
View file @
8f9b64c7
...
...
@@ -72,7 +72,7 @@ describe Snippet, models: true do
end
end
describe
'
#
search_code'
do
describe
'
.
search_code'
do
let
(
:snippet
)
{
create
(
:snippet
,
content:
'class Foo; end'
)
}
it
'returns snippets with matching content'
do
...
...
@@ -88,6 +88,26 @@ describe Snippet, models: true do
end
end
describe
'.accessible_to'
do
let
(
:author
)
{
create
(
:author
)
}
let
(
:user
)
{
create
(
:user
)
}
let!
(
:public_snippet
)
{
create
(
:snippet
,
:public
)
}
let!
(
:internal_snippet
)
{
create
(
:snippet
,
:internal
)
}
let!
(
:private_snippet
)
{
create
(
:snippet
,
:private
,
author:
author
)
}
it
'returns only public snippets when user is nil'
do
expect
(
described_class
.
accessible_to
(
nil
)).
to
eq
[
public_snippet
]
end
it
'returns only public, and internal snippets when user is not nil'
do
expect
(
described_class
.
accessible_to
(
user
)).
to
match_array
[
public_snippet
,
internal_snippet
]
end
it
'returns snippets where the user is the author'
do
expect
(
described_class
.
accessible_to
(
author
)).
to
match_array
[
public_snippet
,
internal_snippet
,
private_snippet
]
end
end
describe
'#participants'
do
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:snippet
)
{
create
(
:snippet
,
content:
'foo'
,
project:
project
)
}
...
...
spec/services/search/snippet_service_spec.rb
0 → 100644
View file @
8f9b64c7
require
'spec_helper'
describe
Search
::
SnippetService
,
services:
true
do
let
(
:author
)
{
create
(
:author
)
}
let
(
:internal_user
)
{
create
(
:user
)
}
let!
(
:public_snippet
)
{
create
(
:snippet
,
:public
,
content:
'password: XXX'
)
}
let!
(
:internal_snippet
)
{
create
(
:snippet
,
:internal
,
content:
'password: XXX'
)
}
let!
(
:private_snippet
)
{
create
(
:snippet
,
:private
,
content:
'password: XXX'
,
author:
author
)
}
describe
'#execute'
do
context
'unauthenticated'
do
it
'should return public snippets only'
do
search
=
described_class
.
new
(
nil
,
search:
'password'
)
results
=
search
.
execute
expect
(
results
.
objects
(
'snippet_blobs'
)).
to
match_array
[
public_snippet
]
end
end
context
'authenticated'
do
it
'should return only public & internal snippets'
do
search
=
described_class
.
new
(
internal_user
,
search:
'password'
)
results
=
search
.
execute
expect
(
results
.
objects
(
'snippet_blobs'
)).
to
match_array
[
public_snippet
,
internal_snippet
]
end
it
'should return public, internal and private snippets for author'
do
search
=
described_class
.
new
(
author
,
search:
'password'
)
results
=
search
.
execute
expect
(
results
.
objects
(
'snippet_blobs'
)).
to
match_array
[
public_snippet
,
internal_snippet
,
private_snippet
]
end
end
end
end
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