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
63687178
Commit
63687178
authored
Dec 07, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'issue_1156'
parents
234f4bf2
f5ec1ebe
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
218 additions
and
29 deletions
+218
-29
CHANGELOG
CHANGELOG
+1
-0
app/models/repository.rb
app/models/repository.rb
+29
-25
app/services/create_branch_service.rb
app/services/create_branch_service.rb
+3
-2
app/services/delete_branch_service.rb
app/services/delete_branch_service.rb
+3
-1
app/services/files/base_service.rb
app/services/files/base_service.rb
+1
-1
app/services/git_hooks_service.rb
app/services/git_hooks_service.rb
+28
-0
spec/models/repository_spec.rb
spec/models/repository_spec.rb
+100
-0
spec/services/git_hooks_service_spec.rb
spec/services/git_hooks_service_spec.rb
+53
-0
No files found.
CHANGELOG
View file @
63687178
...
@@ -14,6 +14,7 @@ v 8.3.0 (unreleased)
...
@@ -14,6 +14,7 @@ v 8.3.0 (unreleased)
v 8.2.3
v 8.2.3
- Fix application settings cache not expiring after changes (Stan Hu)
- Fix application settings cache not expiring after changes (Stan Hu)
- Run custom Git hooks when branch is created or deleted.
v 8.2.2
v 8.2.2
- Fix 404 in redirection after removing a project (Stan Hu)
- Fix 404 in redirection after removing a project (Stan Hu)
...
...
app/models/repository.rb
View file @
63687178
require
'securerandom'
require
'securerandom'
class
Repository
class
Repository
class
PreReceiveError
<
StandardError
;
end
class
CommitError
<
StandardError
;
end
class
CommitError
<
StandardError
;
end
include
Gitlab
::
ShellAdapter
include
Gitlab
::
ShellAdapter
...
@@ -108,10 +107,19 @@ class Repository
...
@@ -108,10 +107,19 @@ class Repository
tags
.
find
{
|
tag
|
tag
.
name
==
name
}
tags
.
find
{
|
tag
|
tag
.
name
==
name
}
end
end
def
add_branch
(
branch_name
,
ref
)
def
add_branch
(
user
,
branch_name
,
target
)
expire_branches_cache
oldrev
=
Gitlab
::
Git
::
BLANK_SHA
ref
=
Gitlab
::
Git
::
BRANCH_REF_PREFIX
+
branch_name
target
=
commit
(
target
).
try
(
:id
)
return
false
unless
target
GitHooksService
.
new
.
execute
(
user
,
path_to_repo
,
oldrev
,
target
,
ref
)
do
rugged
.
branches
.
create
(
branch_name
,
target
)
end
gitlab_shell
.
add_branch
(
path_with_namespace
,
branch_name
,
ref
)
expire_branches_cache
find_branch
(
branch_name
)
end
end
def
add_tag
(
tag_name
,
ref
,
message
=
nil
)
def
add_tag
(
tag_name
,
ref
,
message
=
nil
)
...
@@ -120,10 +128,20 @@ class Repository
...
@@ -120,10 +128,20 @@ class Repository
gitlab_shell
.
add_tag
(
path_with_namespace
,
tag_name
,
ref
,
message
)
gitlab_shell
.
add_tag
(
path_with_namespace
,
tag_name
,
ref
,
message
)
end
end
def
rm_branch
(
branch_name
)
def
rm_branch
(
user
,
branch_name
)
expire_branches_cache
expire_branches_cache
gitlab_shell
.
rm_branch
(
path_with_namespace
,
branch_name
)
branch
=
find_branch
(
branch_name
)
oldrev
=
branch
.
try
(
:target
)
newrev
=
Gitlab
::
Git
::
BLANK_SHA
ref
=
Gitlab
::
Git
::
BRANCH_REF_PREFIX
+
branch_name
GitHooksService
.
new
.
execute
(
user
,
path_to_repo
,
oldrev
,
newrev
,
ref
)
do
rugged
.
branches
.
delete
(
branch_name
)
end
expire_branches_cache
true
end
end
def
rm_tag
(
tag_name
)
def
rm_tag
(
tag_name
)
...
@@ -550,7 +568,6 @@ class Repository
...
@@ -550,7 +568,6 @@ class Repository
def
commit_with_hooks
(
current_user
,
branch
)
def
commit_with_hooks
(
current_user
,
branch
)
oldrev
=
Gitlab
::
Git
::
BLANK_SHA
oldrev
=
Gitlab
::
Git
::
BLANK_SHA
ref
=
Gitlab
::
Git
::
BRANCH_REF_PREFIX
+
branch
ref
=
Gitlab
::
Git
::
BRANCH_REF_PREFIX
+
branch
gl_id
=
Gitlab
::
ShellEnv
.
gl_id
(
current_user
)
was_empty
=
empty?
was_empty
=
empty?
# Create temporary ref
# Create temporary ref
...
@@ -569,15 +586,7 @@ class Repository
...
@@ -569,15 +586,7 @@ class Repository
raise
CommitError
.
new
(
'Failed to create commit'
)
raise
CommitError
.
new
(
'Failed to create commit'
)
end
end
# Run GitLab pre-receive hook
GitHooksService
.
new
.
execute
(
current_user
,
path_to_repo
,
oldrev
,
newrev
,
ref
)
do
pre_receive_hook
=
Gitlab
::
Git
::
Hook
.
new
(
'pre-receive'
,
path_to_repo
)
pre_receive_hook_status
=
pre_receive_hook
.
trigger
(
gl_id
,
oldrev
,
newrev
,
ref
)
# Run GitLab update hook
update_hook
=
Gitlab
::
Git
::
Hook
.
new
(
'update'
,
path_to_repo
)
update_hook_status
=
update_hook
.
trigger
(
gl_id
,
oldrev
,
newrev
,
ref
)
if
pre_receive_hook_status
&&
update_hook_status
if
was_empty
if
was_empty
# Create branch
# Create branch
rugged
.
references
.
create
(
ref
,
newrev
)
rugged
.
references
.
create
(
ref
,
newrev
)
...
@@ -592,16 +601,11 @@ class Repository
...
@@ -592,16 +601,11 @@ class Repository
raise
CommitError
.
new
(
'Commit was rejected because branch received new push'
)
raise
CommitError
.
new
(
'Commit was rejected because branch received new push'
)
end
end
end
end
# Run GitLab post receive hook
post_receive_hook
=
Gitlab
::
Git
::
Hook
.
new
(
'post-receive'
,
path_to_repo
)
post_receive_hook
.
trigger
(
gl_id
,
oldrev
,
newrev
,
ref
)
else
# Remove tmp ref and return error to user
rugged
.
references
.
delete
(
tmp_ref
)
raise
PreReceiveError
.
new
(
'Commit was rejected by git hook'
)
end
end
rescue
GitHooksService
::
PreReceiveError
# Remove tmp ref and return error to user
rugged
.
references
.
delete
(
tmp_ref
)
raise
end
end
private
private
...
...
app/services/create_branch_service.rb
View file @
63687178
...
@@ -13,8 +13,7 @@ class CreateBranchService < BaseService
...
@@ -13,8 +13,7 @@ class CreateBranchService < BaseService
return
error
(
'Branch already exists'
)
return
error
(
'Branch already exists'
)
end
end
repository
.
add_branch
(
branch_name
,
ref
)
new_branch
=
repository
.
add_branch
(
current_user
,
branch_name
,
ref
)
new_branch
=
repository
.
find_branch
(
branch_name
)
if
new_branch
if
new_branch
push_data
=
build_push_data
(
project
,
current_user
,
new_branch
)
push_data
=
build_push_data
(
project
,
current_user
,
new_branch
)
...
@@ -27,6 +26,8 @@ class CreateBranchService < BaseService
...
@@ -27,6 +26,8 @@ class CreateBranchService < BaseService
else
else
error
(
'Invalid reference name'
)
error
(
'Invalid reference name'
)
end
end
rescue
GitHooksService
::
PreReceiveError
error
(
'Branch creation was rejected by Git hook'
)
end
end
def
success
(
branch
)
def
success
(
branch
)
...
...
app/services/delete_branch_service.rb
View file @
63687178
...
@@ -24,7 +24,7 @@ class DeleteBranchService < BaseService
...
@@ -24,7 +24,7 @@ class DeleteBranchService < BaseService
return
error
(
'You dont have push access to repo'
,
405
)
return
error
(
'You dont have push access to repo'
,
405
)
end
end
if
repository
.
rm_branch
(
branch_name
)
if
repository
.
rm_branch
(
current_user
,
branch_name
)
push_data
=
build_push_data
(
branch
)
push_data
=
build_push_data
(
branch
)
EventCreateService
.
new
.
push
(
project
,
current_user
,
push_data
)
EventCreateService
.
new
.
push
(
project
,
current_user
,
push_data
)
...
@@ -35,6 +35,8 @@ class DeleteBranchService < BaseService
...
@@ -35,6 +35,8 @@ class DeleteBranchService < BaseService
else
else
error
(
'Failed to remove branch'
)
error
(
'Failed to remove branch'
)
end
end
rescue
GitHooksService
::
PreReceiveError
error
(
'Branch deletion was rejected by Git hook'
)
end
end
def
error
(
message
,
return_code
=
400
)
def
error
(
message
,
return_code
=
400
)
...
...
app/services/files/base_service.rb
View file @
63687178
...
@@ -26,7 +26,7 @@ module Files
...
@@ -26,7 +26,7 @@ module Files
else
else
error
(
"Something went wrong. Your changes were not committed"
)
error
(
"Something went wrong. Your changes were not committed"
)
end
end
rescue
Repository
::
CommitError
,
Repository
::
PreReceiveError
,
ValidationError
=>
ex
rescue
Repository
::
CommitError
,
GitHooksService
::
PreReceiveError
,
ValidationError
=>
ex
error
(
ex
.
message
)
error
(
ex
.
message
)
end
end
...
...
app/services/git_hooks_service.rb
0 → 100644
View file @
63687178
class
GitHooksService
PreReceiveError
=
Class
.
new
(
StandardError
)
def
execute
(
user
,
repo_path
,
oldrev
,
newrev
,
ref
)
@repo_path
=
repo_path
@user
=
Gitlab
::
ShellEnv
.
gl_id
(
user
)
@oldrev
=
oldrev
@newrev
=
newrev
@ref
=
ref
%w(pre-receive update)
.
each
do
|
hook_name
|
unless
run_hook
(
hook_name
)
raise
PreReceiveError
.
new
(
"Git operation was rejected by
#{
hook_name
}
hook"
)
end
end
yield
run_hook
(
'post-receive'
)
end
private
def
run_hook
(
name
)
hook
=
Gitlab
::
Git
::
Hook
.
new
(
name
,
@repo_path
)
hook
.
trigger
(
@user
,
@oldrev
,
@newrev
,
@ref
)
end
end
spec/models/repository_spec.rb
View file @
63687178
...
@@ -4,6 +4,7 @@ describe Repository do
...
@@ -4,6 +4,7 @@ describe Repository do
include
RepoHelpers
include
RepoHelpers
let
(
:repository
)
{
create
(
:project
).
repository
}
let
(
:repository
)
{
create
(
:project
).
repository
}
let
(
:user
)
{
create
(
:user
)
}
describe
:branch_names_contains
do
describe
:branch_names_contains
do
subject
{
repository
.
branch_names_contains
(
sample_commit
.
id
)
}
subject
{
repository
.
branch_names_contains
(
sample_commit
.
id
)
}
...
@@ -99,5 +100,104 @@ describe Repository do
...
@@ -99,5 +100,104 @@ describe Repository do
it
{
expect
(
subject
.
startline
).
to
eq
(
186
)
}
it
{
expect
(
subject
.
startline
).
to
eq
(
186
)
}
it
{
expect
(
subject
.
data
.
lines
[
2
]).
to
eq
(
" - Feature: Replace teams with group membership
\n
"
)
}
it
{
expect
(
subject
.
data
.
lines
[
2
]).
to
eq
(
" - Feature: Replace teams with group membership
\n
"
)
}
end
end
end
end
describe
:add_branch
do
context
'when pre hooks were successful'
do
it
'should run without errors'
do
hook
=
double
(
trigger:
true
)
expect
(
Gitlab
::
Git
::
Hook
).
to
receive
(
:new
).
exactly
(
3
).
times
.
and_return
(
hook
)
expect
{
repository
.
add_branch
(
user
,
'new_feature'
,
'master'
)
}.
not_to
raise_error
end
it
'should create the branch'
do
allow_any_instance_of
(
Gitlab
::
Git
::
Hook
).
to
receive
(
:trigger
).
and_return
(
true
)
branch
=
repository
.
add_branch
(
user
,
'new_feature'
,
'master'
)
expect
(
branch
.
name
).
to
eq
(
'new_feature'
)
end
end
context
'when pre hooks failed'
do
it
'should get an error'
do
allow_any_instance_of
(
Gitlab
::
Git
::
Hook
).
to
receive
(
:trigger
).
and_return
(
false
)
expect
do
repository
.
add_branch
(
user
,
'new_feature'
,
'master'
)
end
.
to
raise_error
(
GitHooksService
::
PreReceiveError
)
end
it
'should not create the branch'
do
allow_any_instance_of
(
Gitlab
::
Git
::
Hook
).
to
receive
(
:trigger
).
and_return
(
false
)
expect
do
repository
.
add_branch
(
user
,
'new_feature'
,
'master'
)
end
.
to
raise_error
(
GitHooksService
::
PreReceiveError
)
expect
(
repository
.
find_branch
(
'new_feature'
)).
to
be_nil
end
end
end
describe
:rm_branch
do
context
'when pre hooks were successful'
do
it
'should run without errors'
do
allow_any_instance_of
(
Gitlab
::
Git
::
Hook
).
to
receive
(
:trigger
).
and_return
(
true
)
expect
{
repository
.
rm_branch
(
user
,
'feature'
)
}.
not_to
raise_error
end
it
'should delete the branch'
do
allow_any_instance_of
(
Gitlab
::
Git
::
Hook
).
to
receive
(
:trigger
).
and_return
(
true
)
expect
{
repository
.
rm_branch
(
user
,
'feature'
)
}.
not_to
raise_error
expect
(
repository
.
find_branch
(
'feature'
)).
to
be_nil
end
end
context
'when pre hooks failed'
do
it
'should get an error'
do
allow_any_instance_of
(
Gitlab
::
Git
::
Hook
).
to
receive
(
:trigger
).
and_return
(
false
)
expect
do
repository
.
rm_branch
(
user
,
'new_feature'
)
end
.
to
raise_error
(
GitHooksService
::
PreReceiveError
)
end
it
'should not delete the branch'
do
allow_any_instance_of
(
Gitlab
::
Git
::
Hook
).
to
receive
(
:trigger
).
and_return
(
false
)
expect
do
repository
.
rm_branch
(
user
,
'feature'
)
end
.
to
raise_error
(
GitHooksService
::
PreReceiveError
)
expect
(
repository
.
find_branch
(
'feature'
)).
not_to
be_nil
end
end
end
describe
:commit_with_hooks
do
context
'when pre hooks were successful'
do
it
'should run without errors'
do
expect_any_instance_of
(
GitHooksService
).
to
receive
(
:execute
).
and_return
(
true
)
expect
do
repository
.
commit_with_hooks
(
user
,
'feature'
)
{
sample_commit
.
id
}
end
.
not_to
raise_error
end
end
context
'when pre hooks failed'
do
it
'should get an error'
do
allow_any_instance_of
(
Gitlab
::
Git
::
Hook
).
to
receive
(
:trigger
).
and_return
(
false
)
expect
do
repository
.
commit_with_hooks
(
user
,
'feature'
)
{
sample_commit
.
id
}
end
.
to
raise_error
(
GitHooksService
::
PreReceiveError
)
end
end
end
end
end
spec/services/git_hooks_service_spec.rb
0 → 100644
View file @
63687178
require
'spec_helper'
describe
GitHooksService
do
include
RepoHelpers
let
(
:user
)
{
create
:user
}
let
(
:project
)
{
create
:project
}
let
(
:service
)
{
GitHooksService
.
new
}
before
do
@blankrev
=
Gitlab
::
Git
::
BLANK_SHA
@oldrev
=
sample_commit
.
parent_id
@newrev
=
sample_commit
.
id
@ref
=
'refs/heads/feature'
@repo_path
=
project
.
repository
.
path_to_repo
end
describe
'#execute'
do
context
'when receive hooks were successful'
do
it
'should call post-receive hook'
do
hook
=
double
(
trigger:
true
)
expect
(
Gitlab
::
Git
::
Hook
).
to
receive
(
:new
).
exactly
(
3
).
times
.
and_return
(
hook
)
expect
(
service
.
execute
(
user
,
@repo_path
,
@blankrev
,
@newrev
,
@ref
)
{
}).
to
eq
(
true
)
end
end
context
'when pre-receive hook failed'
do
it
'should not call post-receive hook'
do
expect
(
service
).
to
receive
(
:run_hook
).
with
(
'pre-receive'
).
and_return
(
false
)
expect
(
service
).
not_to
receive
(
:run_hook
).
with
(
'post-receive'
)
expect
do
service
.
execute
(
user
,
@repo_path
,
@blankrev
,
@newrev
,
@ref
)
end
.
to
raise_error
(
GitHooksService
::
PreReceiveError
)
end
end
context
'when update hook failed'
do
it
'should not call post-receive hook'
do
expect
(
service
).
to
receive
(
:run_hook
).
with
(
'pre-receive'
).
and_return
(
true
)
expect
(
service
).
to
receive
(
:run_hook
).
with
(
'update'
).
and_return
(
false
)
expect
(
service
).
not_to
receive
(
:run_hook
).
with
(
'post-receive'
)
expect
do
service
.
execute
(
user
,
@repo_path
,
@blankrev
,
@newrev
,
@ref
)
end
.
to
raise_error
(
GitHooksService
::
PreReceiveError
)
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