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
Tatuya Kamada
gitlab-ce
Commits
1c42cc35
Commit
1c42cc35
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-grack-auth' into 'master'
Fix http clone for public project
parents
8ae59330
7dd18a3e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
26 deletions
+38
-26
lib/gitlab/backend/grack_auth.rb
lib/gitlab/backend/grack_auth.rb
+36
-24
lib/gitlab/git_access.rb
lib/gitlab/git_access.rb
+2
-2
No files found.
lib/gitlab/backend/grack_auth.rb
View file @
1c42cc35
...
...
@@ -22,14 +22,16 @@ module Grack
@env
[
'SCRIPT_NAME'
]
=
""
if
project
auth!
else
render_not_found
end
end
private
def
auth!
return
render_not_found
unless
project
if
@auth
.
provided?
return
bad_request
unless
@auth
.
basic?
...
...
@@ -38,36 +40,35 @@ module Grack
# Allow authentication for GitLab CI service
# if valid token passed
if
login
==
"gitlab-ci-token"
&&
project
.
gitlab_ci?
token
=
project
.
gitlab_ci_service
.
token
if
token
.
present?
&&
token
==
password
&&
service_name
==
'git-upload-pack'
if
gitlab_ci_request?
(
login
,
password
)
return
@app
.
call
(
env
)
end
end
@user
=
authenticate_user
(
login
,
password
)
if
@user
Gitlab
::
ShellEnv
.
set_env
(
@user
)
@env
[
'REMOTE_USER'
]
=
@auth
.
username
else
return
unauthorized
end
else
return
unauthorized
unless
project
.
public?
end
if
authorized_
git_
request?
if
authorized_request?
@app
.
call
(
env
)
else
unauthorized
end
end
def
authorized_git_request?
authorize_request
(
service_name
)
def
gitlab_ci_request?
(
login
,
password
)
if
login
==
"gitlab-ci-token"
&&
project
.
gitlab_ci?
token
=
project
.
gitlab_ci_service
.
token
if
token
.
present?
&&
token
==
password
&&
git_cmd
==
'git-upload-pack'
true
end
end
false
end
def
authenticate_user
(
login
,
password
)
...
...
@@ -75,20 +76,31 @@ module Grack
auth
.
find
(
login
,
password
)
end
def
authorize
_request
(
service
)
case
service
def
authorize
d_request?
case
git_cmd
when
*
Gitlab
::
GitAccess
::
DOWNLOAD_COMMANDS
# Serve only upload request.
# Authorization on push will be serverd by update hook in repository
if
user
Gitlab
::
GitAccess
.
new
.
download_allowed?
(
user
,
project
)
elsif
project
.
public?
# Allow clone/fetch for public projects
true
else
false
end
when
*
Gitlab
::
GitAccess
::
PUSH_COMMANDS
if
user
# Skip user authorization on upload request.
# It will be serverd by update hook in repository
true
else
false
end
else
false
end
end
def
service_name
def
git_cmd
if
@request
.
get?
@request
.
params
[
'service'
]
elsif
@request
.
post?
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/git_access.rb
View file @
1c42cc35
...
...
@@ -34,7 +34,7 @@ module Gitlab
end
def
download_allowed?
(
user
,
project
)
if
user_allowed?
(
user
)
if
user
&&
user
_allowed?
(
user
)
user
.
can?
(
:download_code
,
project
)
else
false
...
...
@@ -42,7 +42,7 @@ module Gitlab
end
def
push_allowed?
(
user
,
project
,
ref
,
oldrev
,
newrev
)
if
user_allowed?
(
user
)
if
user
&&
user
_allowed?
(
user
)
action
=
if
project
.
protected_branch?
(
ref
)
:push_code_to_protected_branches
else
...
...
This diff is collapsed.
Click to expand it.
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