add username to authorized result, so that gitlab-shell can pass it to hooks
This commit is contained in:
parent
dbcf48af8b
commit
01ce58bde4
|
@ -1 +1,2 @@
|
|||
5.9.2
|
||||
5.9.3
|
||||
|
||||
|
|
|
@ -31,6 +31,12 @@ module API
|
|||
protocol = params[:protocol]
|
||||
|
||||
actor.update_last_used_at if actor.is_a?(Key)
|
||||
user =
|
||||
if actor.is_a?(Key)
|
||||
actor.user
|
||||
else
|
||||
actor
|
||||
end
|
||||
|
||||
access_checker_klass = wiki? ? Gitlab::GitAccessWiki : Gitlab::GitAccess
|
||||
access_checker = access_checker_klass
|
||||
|
@ -47,6 +53,7 @@ module API
|
|||
{
|
||||
status: true,
|
||||
gl_repository: gl_repository,
|
||||
gl_username: user&.username,
|
||||
repository_path: repository_path,
|
||||
gitaly: gitaly_payload(params[:action])
|
||||
}
|
||||
|
|
|
@ -83,12 +83,11 @@ module Gitlab
|
|||
|
||||
def call_update_hook(gl_id, gl_username, oldrev, newrev, ref)
|
||||
Dir.chdir(repo_path) do
|
||||
stdout, stderr, status = Open3.capture3(
|
||||
{
|
||||
env = {
|
||||
'GL_ID' => gl_id,
|
||||
'GL_USERNAME' => gl_username
|
||||
},
|
||||
path, ref, oldrev, newrev)
|
||||
}
|
||||
stdout, stderr, status = Open3.capture3(env, path, ref, oldrev, newrev)
|
||||
[status.success?, (stderr.presence || stdout).gsub(/\R/, "<br>").html_safe]
|
||||
end
|
||||
end
|
||||
|
|
|
@ -22,9 +22,9 @@ module Gitlab
|
|||
params = {
|
||||
GL_ID: Gitlab::GlId.gl_id(user),
|
||||
GL_REPOSITORY: Gitlab::GlRepository.gl_repository(project, is_wiki),
|
||||
GL_USERNAME: user&.username,
|
||||
RepoPath: repo_path
|
||||
}
|
||||
|
||||
server = {
|
||||
address: Gitlab::GitalyClient.address(project.repository_storage),
|
||||
token: Gitlab::GitalyClient.token(project.repository_storage)
|
||||
|
|
Loading…
Reference in New Issue