Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c161065e
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c161065e
编写于
4月 22, 2016
作者:
J
Jacob Vosmaer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Don't mess up our parent controller
上级
9add3fbb
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
30 deletion
+28
-30
app/controllers/projects/application_controller.rb
app/controllers/projects/application_controller.rb
+7
-19
app/controllers/projects/git_http_controller.rb
app/controllers/projects/git_http_controller.rb
+21
-11
未找到文件。
app/controllers/projects/application_controller.rb
浏览文件 @
c161065e
...
...
@@ -10,6 +10,9 @@ class Projects::ApplicationController < ApplicationController
def
project
unless
@project
namespace
=
params
[
:namespace_id
]
id
=
params
[
:project_id
]
||
params
[
:id
]
# Redirect from
# localhost/group/project.git
# to
...
...
@@ -20,11 +23,12 @@ class Projects::ApplicationController < ApplicationController
return
end
@project
=
find_project
project_path
=
"
#{
namespace
}
/
#{
id
}
"
@project
=
Project
.
find_with_namespace
(
project_path
)
if
@project
&&
can?
(
current_user
,
:read_project
,
@project
)
if
@project
.
path_with_namespace
!=
p
ath_with_namespace
redirect_to
request
.
original_url
.
gsub
(
p
ath_with_namespace
,
@project
.
path_with_namespace
)
if
@project
.
path_with_namespace
!=
p
roject_path
redirect_to
request
.
original_url
.
gsub
(
p
roject_path
,
@project
.
path_with_namespace
)
end
else
@project
=
nil
...
...
@@ -40,22 +44,6 @@ class Projects::ApplicationController < ApplicationController
@project
end
def
id
params
[
:project_id
]
||
params
[
:id
]
end
def
namespace
params
[
:namespace_id
]
end
def
path_with_namespace
"
#{
namespace
}
/
#{
id
}
"
end
def
find_project
Project
.
find_with_namespace
(
path_with_namespace
)
end
def
repository
@repository
||=
project
.
repository
end
...
...
app/controllers/projects/git_http_controller.rb
浏览文件 @
c161065e
...
...
@@ -119,27 +119,37 @@ class Projects::GitHttpController < Projects::ApplicationController
def
project
return
@project
if
defined?
(
@project
)
@project
=
find_project
project_id
,
_
=
project_id_with_suffix
if
project_id
.
blank?
@project
=
nil
else
@project
=
Project
.
find_with_namespace
(
"
#{
params
[
:namespace_id
]
}
/
#{
project_id
}
"
)
end
end
def
id
id
=
params
[
:project_id
]
return
if
id
.
nil?
# This method returns two values so that we can parse
# params[:project_id] (untrusted input!) in exactly one place.
def
project_id_with_suffix
id
=
params
[
:project_id
]
||
''
%w{.wiki.git .git}
.
each
do
|
suffix
|
# Be careful to only remove the suffix from the end of 'id'.
# Accidentally removing it from the middle is how security
# vulnerabilities happen!
return
id
.
slice
(
0
,
id
.
length
-
suffix
.
length
)
if
id
.
end_with?
(
suffix
)
if
id
.
end_with?
(
suffix
)
# Be careful to only remove the suffix from the end of 'id'.
# Accidentally removing it from the middle is how security
# vulnerabilities happen!
return
[
id
.
slice
(
0
,
id
.
length
-
suffix
.
length
),
suffix
]
end
end
#
No valid id was found
.
nil
#
Something is wrong with params[:project_id]; do not pass it on
.
[
nil
,
nil
]
end
def
repository
@repository
||=
begin
if
params
[
:project_id
].
end_with?
(
'.wiki.git'
)
_
,
suffix
=
project_id_with_suffix
if
suffix
==
'.wiki.git'
project
.
wiki
.
repository
else
project
.
repository
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录