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
Léo-Paul Géneau
gitlab-ce
Commits
76bafc00
Commit
76bafc00
authored
Jun 16, 2017
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass Gitaly token on Ruby gRPC requests
parent
a4a5cbf2
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
57 additions
and
37 deletions
+57
-37
config/gitlab.yml.example
config/gitlab.yml.example
+3
-0
lib/gitlab/gitaly_client.rb
lib/gitlab/gitaly_client.rb
+22
-0
lib/gitlab/gitaly_client/commit.rb
lib/gitlab/gitaly_client/commit.rb
+5
-11
lib/gitlab/gitaly_client/notifications.rb
lib/gitlab/gitaly_client/notifications.rb
+7
-5
lib/gitlab/gitaly_client/ref.rb
lib/gitlab/gitaly_client/ref.rb
+10
-11
spec/lib/gitlab/gitaly_client/commit_spec.rb
spec/lib/gitlab/gitaly_client/commit_spec.rb
+4
-4
spec/lib/gitlab/gitaly_client/notifications_spec.rb
spec/lib/gitlab/gitaly_client/notifications_spec.rb
+1
-1
spec/lib/gitlab/gitaly_client/ref_spec.rb
spec/lib/gitlab/gitaly_client/ref_spec.rb
+5
-5
No files found.
config/gitlab.yml.example
View file @
76bafc00
...
...
@@ -454,6 +454,8 @@ production: &base
# introduced in 9.0). Eventually Gitaly use will become mandatory and
# this option will disappear.
enabled: true
# Default Gitaly authentication token. Can be overriden per storage.
token: ""
#
# 4. Advanced settings
...
...
@@ -469,6 +471,7 @@ production: &base
default:
path: /home/git/repositories/
gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port)
# gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
## Backup settings
backup:
...
...
lib/gitlab/gitaly_client.rb
View file @
76bafc00
require
'base64'
require
'gitaly'
module
Gitlab
...
...
@@ -48,6 +50,26 @@ module Gitlab
address
end
# All RPC calls should use GitalyClient.call. This method makes sure
# that per-request authentication headers are set.
def
self
.
call
(
storage
,
service
,
rpc
,
request
)
metadata
=
request_metadata
(
storage
)
metadata
=
yield
(
metadata
)
if
block_given?
stub
(
service
,
storage
).
send
(
rpc
,
request
,
metadata
)
end
def
self
.
request_metadata
(
storage
)
encoded_token
=
Base64
.
strict_encode64
(
token
(
storage
).
to_s
)
{
metadata:
{
'authorization'
=>
"Bearer
#{
encoded_token
}
"
}
}
end
def
self
.
token
(
storage
)
params
=
Gitlab
.
config
.
repositories
.
storages
[
storage
]
raise
"storage not found:
#{
storage
.
inspect
}
"
if
params
.
nil?
params
[
'gitaly_token'
].
presence
||
Gitlab
.
config
.
gitaly
[
'token'
]
end
def
self
.
enabled?
Gitlab
.
config
.
gitaly
.
enabled
end
...
...
lib/gitlab/gitaly_client/commit.rb
View file @
76bafc00
...
...
@@ -11,28 +11,26 @@ module Gitlab
end
def
is_ancestor
(
ancestor_id
,
child_id
)
stub
=
GitalyClient
.
stub
(
:commit
,
@repository
.
storage
)
request
=
Gitaly
::
CommitIsAncestorRequest
.
new
(
repository:
@gitaly_repo
,
ancestor_id:
ancestor_id
,
child_id:
child_id
)
stub
.
commit_is_ancestor
(
request
).
value
GitalyClient
.
call
(
@repository
.
storage
,
:commit
,
:commit_is_ancestor
,
request
).
value
end
def
diff_from_parent
(
commit
,
options
=
{})
request_params
=
commit_diff_request_params
(
commit
,
options
)
request_params
[
:ignore_whitespace_change
]
=
options
.
fetch
(
:ignore_whitespace_change
,
false
)
response
=
diff_service_stub
.
commit_diff
(
Gitaly
::
CommitDiffRequest
.
new
(
request_params
)
)
request
=
Gitaly
::
CommitDiffRequest
.
new
(
request_params
)
response
=
GitalyClient
.
call
(
@repository
.
storage
,
:diff
,
:commit_diff
,
request
)
Gitlab
::
Git
::
DiffCollection
.
new
(
GitalyClient
::
DiffStitcher
.
new
(
response
),
options
)
end
def
commit_deltas
(
commit
)
request_params
=
commit_diff_request_params
(
commit
)
response
=
diff_service_stub
.
commit_delta
(
Gitaly
::
CommitDeltaRequest
.
new
(
request_params
))
request
=
Gitaly
::
CommitDeltaRequest
.
new
(
commit_diff_request_params
(
commit
))
response
=
GitalyClient
.
call
(
@repository
.
storage
,
:diff
,
:commit_delta
,
request
)
response
.
flat_map
do
|
msg
|
msg
.
deltas
.
map
{
|
d
|
Gitlab
::
Git
::
Diff
.
new
(
d
)
}
end
...
...
@@ -50,10 +48,6 @@ module Gitlab
paths:
options
.
fetch
(
:paths
,
[])
}
end
def
diff_service_stub
GitalyClient
.
stub
(
:diff
,
@repository
.
storage
)
end
end
end
end
lib/gitlab/gitaly_client/notifications.rb
View file @
76bafc00
module
Gitlab
module
GitalyClient
class
Notifications
attr_accessor
:stub
# 'repository' is a Gitlab::Git::Repository
def
initialize
(
repository
)
@gitaly_repo
=
repository
.
gitaly_repository
@st
ub
=
GitalyClient
.
stub
(
:notifications
,
repository
.
storage
)
@st
orage
=
repository
.
storage
end
def
post_receive
request
=
Gitaly
::
PostReceiveRequest
.
new
(
repository:
@gitaly_repo
)
@stub
.
post_receive
(
request
)
GitalyClient
.
call
(
@storage
,
:notifications
,
:post_receive
,
Gitaly
::
PostReceiveRequest
.
new
(
repository:
@gitaly_repo
)
)
end
end
end
...
...
lib/gitlab/gitaly_client/ref.rb
View file @
76bafc00
module
Gitlab
module
GitalyClient
class
Ref
attr_accessor
:stub
# 'repository' is a Gitlab::Git::Repository
def
initialize
(
repository
)
@gitaly_repo
=
repository
.
gitaly_repository
@st
ub
=
GitalyClient
.
stub
(
:ref
,
repository
.
storage
)
@st
orage
=
repository
.
storage
end
def
default_branch_name
request
=
Gitaly
::
FindDefaultBranchNameRequest
.
new
(
repository:
@gitaly_repo
)
branch_name
=
stub
.
find_default_branch_name
(
request
).
name
Gitlab
::
Git
.
branch_name
(
branch_name
)
response
=
GitalyClient
.
call
(
@storage
,
:ref
,
:find_default_branch_name
,
request
)
Gitlab
::
Git
.
branch_name
(
response
.
name
)
end
def
branch_names
request
=
Gitaly
::
FindAllBranchNamesRequest
.
new
(
repository:
@gitaly_repo
)
consume_refs_response
(
stub
.
find_all_branch_names
(
request
),
prefix:
'refs/heads/'
)
response
=
GitalyClient
.
call
(
@storage
,
:ref
,
:find_all_branch_names
,
request
)
consume_refs_response
(
response
,
prefix:
'refs/heads/'
)
end
def
tag_names
request
=
Gitaly
::
FindAllTagNamesRequest
.
new
(
repository:
@gitaly_repo
)
consume_refs_response
(
stub
.
find_all_tag_names
(
request
),
prefix:
'refs/tags/'
)
response
=
GitalyClient
.
call
(
@storage
,
:ref
,
:find_all_tag_names
,
request
)
consume_refs_response
(
response
,
prefix:
'refs/tags/'
)
end
def
find_ref_name
(
commit_id
,
ref_prefix
)
...
...
@@ -32,8 +31,7 @@ module Gitlab
commit_id:
commit_id
,
prefix:
ref_prefix
)
stub
.
find_ref_name
(
request
).
name
GitalyClient
.
call
(
@storage
,
:ref
,
:find_ref_name
,
request
).
name
end
def
count_tag_names
...
...
@@ -47,7 +45,8 @@ module Gitlab
def
local_branches
(
sort_by:
nil
)
request
=
Gitaly
::
FindLocalBranchesRequest
.
new
(
repository:
@gitaly_repo
)
request
.
sort_by
=
sort_by_param
(
sort_by
)
if
sort_by
consume_branches_response
(
stub
.
find_local_branches
(
request
))
response
=
GitalyClient
.
call
(
@storage
,
:ref
,
:find_local_branches
,
request
)
consume_branches_response
(
response
)
end
private
...
...
spec/lib/gitlab/gitaly_client/commit_spec.rb
View file @
76bafc00
...
...
@@ -16,7 +16,7 @@ describe Gitlab::GitalyClient::Commit do
right_commit_id:
commit
.
id
)
expect_any_instance_of
(
Gitaly
::
Diff
::
Stub
).
to
receive
(
:commit_diff
).
with
(
request
)
expect_any_instance_of
(
Gitaly
::
Diff
::
Stub
).
to
receive
(
:commit_diff
).
with
(
request
,
kind_of
(
Hash
)
)
described_class
.
new
(
repository
).
diff_from_parent
(
commit
)
end
...
...
@@ -31,7 +31,7 @@ describe Gitlab::GitalyClient::Commit do
right_commit_id:
initial_commit
.
id
)
expect_any_instance_of
(
Gitaly
::
Diff
::
Stub
).
to
receive
(
:commit_diff
).
with
(
request
)
expect_any_instance_of
(
Gitaly
::
Diff
::
Stub
).
to
receive
(
:commit_diff
).
with
(
request
,
kind_of
(
Hash
)
)
described_class
.
new
(
repository
).
diff_from_parent
(
initial_commit
)
end
...
...
@@ -61,7 +61,7 @@ describe Gitlab::GitalyClient::Commit do
right_commit_id:
commit
.
id
)
expect_any_instance_of
(
Gitaly
::
Diff
::
Stub
).
to
receive
(
:commit_delta
).
with
(
request
).
and_return
([])
expect_any_instance_of
(
Gitaly
::
Diff
::
Stub
).
to
receive
(
:commit_delta
).
with
(
request
,
kind_of
(
Hash
)
).
and_return
([])
described_class
.
new
(
repository
).
commit_deltas
(
commit
)
end
...
...
@@ -76,7 +76,7 @@ describe Gitlab::GitalyClient::Commit do
right_commit_id:
initial_commit
.
id
)
expect_any_instance_of
(
Gitaly
::
Diff
::
Stub
).
to
receive
(
:commit_delta
).
with
(
request
).
and_return
([])
expect_any_instance_of
(
Gitaly
::
Diff
::
Stub
).
to
receive
(
:commit_delta
).
with
(
request
,
kind_of
(
Hash
)
).
and_return
([])
described_class
.
new
(
repository
).
commit_deltas
(
initial_commit
)
end
...
...
spec/lib/gitlab/gitaly_client/notifications_spec.rb
View file @
76bafc00
...
...
@@ -9,7 +9,7 @@ describe Gitlab::GitalyClient::Notifications do
it
'sends a post_receive message'
do
expect_any_instance_of
(
Gitaly
::
Notifications
::
Stub
).
to
receive
(
:post_receive
).
with
(
gitaly_request_with_path
(
storage_name
,
relative_path
))
to
receive
(
:post_receive
).
with
(
gitaly_request_with_path
(
storage_name
,
relative_path
)
,
kind_of
(
Hash
)
)
subject
.
post_receive
end
...
...
spec/lib/gitlab/gitaly_client/ref_spec.rb
View file @
76bafc00
...
...
@@ -21,7 +21,7 @@ describe Gitlab::GitalyClient::Ref do
it
'sends a find_all_branch_names message'
do
expect_any_instance_of
(
Gitaly
::
Ref
::
Stub
).
to
receive
(
:find_all_branch_names
).
with
(
gitaly_request_with_path
(
storage_name
,
relative_path
)).
with
(
gitaly_request_with_path
(
storage_name
,
relative_path
)
,
kind_of
(
Hash
)
).
and_return
([])
client
.
branch_names
...
...
@@ -32,7 +32,7 @@ describe Gitlab::GitalyClient::Ref do
it
'sends a find_all_tag_names message'
do
expect_any_instance_of
(
Gitaly
::
Ref
::
Stub
).
to
receive
(
:find_all_tag_names
).
with
(
gitaly_request_with_path
(
storage_name
,
relative_path
)).
with
(
gitaly_request_with_path
(
storage_name
,
relative_path
)
,
kind_of
(
Hash
)
).
and_return
([])
client
.
tag_names
...
...
@@ -43,7 +43,7 @@ describe Gitlab::GitalyClient::Ref do
it
'sends a find_default_branch_name message'
do
expect_any_instance_of
(
Gitaly
::
Ref
::
Stub
).
to
receive
(
:find_default_branch_name
).
with
(
gitaly_request_with_path
(
storage_name
,
relative_path
)).
with
(
gitaly_request_with_path
(
storage_name
,
relative_path
)
,
kind_of
(
Hash
)
).
and_return
(
double
(
name:
'foo'
))
client
.
default_branch_name
...
...
@@ -54,7 +54,7 @@ describe Gitlab::GitalyClient::Ref do
it
'sends a find_local_branches message'
do
expect_any_instance_of
(
Gitaly
::
Ref
::
Stub
).
to
receive
(
:find_local_branches
).
with
(
gitaly_request_with_path
(
storage_name
,
relative_path
)).
with
(
gitaly_request_with_path
(
storage_name
,
relative_path
)
,
kind_of
(
Hash
)
).
and_return
([])
client
.
local_branches
...
...
@@ -63,7 +63,7 @@ describe Gitlab::GitalyClient::Ref do
it
'parses and sends the sort parameter'
do
expect_any_instance_of
(
Gitaly
::
Ref
::
Stub
).
to
receive
(
:find_local_branches
).
with
(
gitaly_request_with_params
(
sort_by: :UPDATED_DESC
)).
with
(
gitaly_request_with_params
(
sort_by: :UPDATED_DESC
)
,
kind_of
(
Hash
)
).
and_return
([])
client
.
local_branches
(
sort_by:
'updated_desc'
)
...
...
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