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
921d2afc
Commit
921d2afc
authored
Jan 18, 2018
by
Tiago Botelho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds option to push over HTTP to create a new project
parent
b9d547b1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
6 deletions
+44
-6
app/controllers/projects/git_http_controller.rb
app/controllers/projects/git_http_controller.rb
+20
-1
lib/gitlab/git_access.rb
lib/gitlab/git_access.rb
+24
-5
No files found.
app/controllers/projects/git_http_controller.rb
View file @
921d2afc
...
@@ -11,6 +11,12 @@ class Projects::GitHttpController < Projects::GitHttpClientController
...
@@ -11,6 +11,12 @@ class Projects::GitHttpController < Projects::GitHttpClientController
def
info_refs
def
info_refs
log_user_activity
if
upload_pack?
log_user_activity
if
upload_pack?
if
project
.
blank?
&&
params
[
:service
]
==
'git-receive-pack'
@project
=
::
Projects
::
CreateService
.
new
(
access_actor
,
project_params
).
execute
return
render_ok
if
@project
.
saved?
end
render_ok
render_ok
end
end
...
@@ -26,6 +32,15 @@ class Projects::GitHttpController < Projects::GitHttpClientController
...
@@ -26,6 +32,15 @@ class Projects::GitHttpController < Projects::GitHttpClientController
private
private
def
project_params
{
description:
""
,
path:
params
[
:project_id
].
gsub
(
"
\.
git"
,
''
),
namespace_id:
namespace
.
id
.
to_s
,
visibility_level:
Gitlab
::
VisibilityLevel
::
PRIVATE
.
to_s
}
end
def
download_request?
def
download_request?
upload_pack?
upload_pack?
end
end
...
@@ -56,7 +71,11 @@ class Projects::GitHttpController < Projects::GitHttpClientController
...
@@ -56,7 +71,11 @@ class Projects::GitHttpController < Projects::GitHttpClientController
end
end
def
access
def
access
@access
||=
access_klass
.
new
(
access_actor
,
project
,
'http'
,
authentication_abilities:
authentication_abilities
,
redirected_path:
redirected_path
)
@access
||=
access_klass
.
new
(
access_actor
,
project
,
'http'
,
authentication_abilities:
authentication_abilities
,
redirected_path:
redirected_path
,
target_namespace:
namespace
)
end
def
namespace
@namespace
=
Namespace
.
find_by_path_or_name
(
params
[
:namespace_id
])
end
end
def
access_actor
def
access_actor
...
...
lib/gitlab/git_access.rb
View file @
921d2afc
...
@@ -18,21 +18,23 @@ module Gitlab
...
@@ -18,21 +18,23 @@ module Gitlab
upload_pack_disabled_over_http:
'Pulling over HTTP is not allowed.'
,
upload_pack_disabled_over_http:
'Pulling over HTTP is not allowed.'
,
receive_pack_disabled_over_http:
'Pushing over HTTP is not allowed.'
,
receive_pack_disabled_over_http:
'Pushing over HTTP is not allowed.'
,
read_only:
'The repository is temporarily read-only. Please try again later.'
,
read_only:
'The repository is temporarily read-only. Please try again later.'
,
cannot_push_to_read_only:
"You can't push code to a read-only GitLab instance."
cannot_push_to_read_only:
"You can't push code to a read-only GitLab instance."
,
create:
"Creating a repository to that namespace is not allowed."
}.
freeze
}.
freeze
DOWNLOAD_COMMANDS
=
%w{ git-upload-pack git-upload-archive }
.
freeze
DOWNLOAD_COMMANDS
=
%w{ git-upload-pack git-upload-archive }
.
freeze
PUSH_COMMANDS
=
%w{ git-receive-pack }
.
freeze
PUSH_COMMANDS
=
%w{ git-receive-pack }
.
freeze
ALL_COMMANDS
=
DOWNLOAD_COMMANDS
+
PUSH_COMMANDS
ALL_COMMANDS
=
DOWNLOAD_COMMANDS
+
PUSH_COMMANDS
attr_reader
:actor
,
:project
,
:protocol
,
:authentication_abilities
,
:redirected_path
attr_reader
:actor
,
:project
,
:protocol
,
:authentication_abilities
,
:redirected_path
,
:target_namespace
def
initialize
(
actor
,
project
,
protocol
,
authentication_abilities
:,
redirected_path:
nil
)
def
initialize
(
actor
,
project
,
protocol
,
authentication_abilities
:,
redirected_path:
nil
,
target_namespace:
nil
)
@actor
=
actor
@actor
=
actor
@project
=
project
@project
=
project
@protocol
=
protocol
@protocol
=
protocol
@redirected_path
=
redirected_path
@redirected_path
=
redirected_path
@authentication_abilities
=
authentication_abilities
@authentication_abilities
=
authentication_abilities
@target_namespace
=
target_namespace
end
end
def
check
(
cmd
,
changes
)
def
check
(
cmd
,
changes
)
...
@@ -44,6 +46,7 @@ module Gitlab
...
@@ -44,6 +46,7 @@ module Gitlab
check_command_disabled!
(
cmd
)
check_command_disabled!
(
cmd
)
check_command_existence!
(
cmd
)
check_command_existence!
(
cmd
)
check_repository_existence!
check_repository_existence!
check_repository_creation!
case
cmd
case
cmd
when
*
DOWNLOAD_COMMANDS
when
*
DOWNLOAD_COMMANDS
...
@@ -96,7 +99,7 @@ module Gitlab
...
@@ -96,7 +99,7 @@ module Gitlab
end
end
def
check_project_accessibility!
def
check_project_accessibility!
if
project
.
blank?
||
!
can_read_project
?
if
(
project
.
blank?
||
!
can_read_project?
)
&&
!
can_create_project_in_namespace
?
raise
NotFoundError
,
ERROR_MESSAGES
[
:project_not_found
]
raise
NotFoundError
,
ERROR_MESSAGES
[
:project_not_found
]
end
end
end
end
...
@@ -140,11 +143,19 @@ module Gitlab
...
@@ -140,11 +143,19 @@ module Gitlab
end
end
def
check_repository_existence!
def
check_repository_existence!
unless
project
.
repository
.
exists
?
if
(
project
.
blank?
||
!
project
.
repository
.
exists?
)
&&
!
can_create_project_in_namespace
?
raise
UnauthorizedError
,
ERROR_MESSAGES
[
:no_repo
]
raise
UnauthorizedError
,
ERROR_MESSAGES
[
:no_repo
]
end
end
end
end
def
check_repository_creation!
return
unless
target_namespace
unless
can_create_project_in_namespace?
raise
UnauthorizedError
,
ERROR_MESSAGES
[
:create
]
end
end
def
check_download_access!
def
check_download_access!
return
if
deploy_key?
return
if
deploy_key?
...
@@ -158,6 +169,8 @@ module Gitlab
...
@@ -158,6 +169,8 @@ module Gitlab
end
end
def
check_push_access!
(
changes
)
def
check_push_access!
(
changes
)
return
if
can_create_project_in_namespace?
if
project
.
repository_read_only?
if
project
.
repository_read_only?
raise
UnauthorizedError
,
ERROR_MESSAGES
[
:read_only
]
raise
UnauthorizedError
,
ERROR_MESSAGES
[
:read_only
]
end
end
...
@@ -234,6 +247,12 @@ module Gitlab
...
@@ -234,6 +247,12 @@ module Gitlab
end
||
Guest
.
can?
(
:read_project
,
project
)
end
||
Guest
.
can?
(
:read_project
,
project
)
end
end
def
can_create_project_in_namespace?
return
unless
target_namespace
actor
.
can?
(
:create_projects
,
target_namespace
)
end
def
http?
def
http?
protocol
==
'http'
protocol
==
'http'
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