Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a2bbf004
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,发现更多精彩内容 >>
提交
a2bbf004
编写于
1月 26, 2016
作者:
D
Douglas Barbosa Alexandre
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactor spam filtering on issues API
上级
62cad887
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
10 deletion
+16
-10
lib/api/issues.rb
lib/api/issues.rb
+8
-7
spec/requests/api/issues_spec.rb
spec/requests/api/issues_spec.rb
+8
-3
未找到文件。
lib/api/issues.rb
浏览文件 @
a2bbf004
...
@@ -23,11 +23,13 @@ module API
...
@@ -23,11 +23,13 @@ module API
end
end
def
create_spam_log
(
project
,
current_user
,
attrs
)
def
create_spam_log
(
project
,
current_user
,
attrs
)
params
=
attrs
.
dup
params
=
attrs
.
merge
({
params
[
:source_ip
]
=
env
[
'REMOTE_ADDR'
]
source_ip:
env
[
'REMOTE_ADDR'
],
params
[
:user_agent
]
=
env
[
'HTTP_USER_AGENT'
]
user_agent:
env
[
'HTTP_USER_AGENT'
],
params
[
:noteable_type
]
=
'Issue'
noteable_type:
'Issue'
,
params
[
:via_api
]
=
true
via_api:
true
})
::
CreateSpamLogService
.
new
(
project
,
current_user
,
params
).
execute
::
CreateSpamLogService
.
new
(
project
,
current_user
,
params
).
execute
end
end
end
end
...
@@ -126,8 +128,7 @@ module API
...
@@ -126,8 +128,7 @@ module API
end
end
project
=
user_project
project
=
user_project
text
=
attrs
[
:title
]
text
=
[
attrs
[
:title
],
attrs
[
:description
]].
reject
(
&
:blank?
).
join
(
"
\n
"
)
text
+=
"
\n
#{
attrs
[
:description
]
}
"
if
attrs
[
:description
].
present?
if
check_for_spam?
(
project
,
current_user
)
&&
is_spam?
(
env
,
current_user
,
text
)
if
check_for_spam?
(
project
,
current_user
)
&&
is_spam?
(
env
,
current_user
,
text
)
create_spam_log
(
project
,
current_user
,
attrs
)
create_spam_log
(
project
,
current_user
,
attrs
)
...
...
spec/requests/api/issues_spec.rb
浏览文件 @
a2bbf004
...
@@ -249,14 +249,19 @@ describe API::API, api: true do
...
@@ -249,14 +249,19 @@ describe API::API, api: true do
end
end
end
end
it
"should create a new project issue"
do
it
"should not create a new project issue"
do
post
api
(
"/projects/
#{
project
.
id
}
/issues"
,
user
),
expect
{
title:
'new issue'
,
labels:
'label, label2'
post
api
(
"/projects/
#{
project
.
id
}
/issues"
,
user
),
title:
'new issue'
,
description:
'content here'
,
labels:
'label, label2'
}.
not_to
change
(
Issue
,
:count
)
expect
(
response
.
status
).
to
eq
(
400
)
expect
(
response
.
status
).
to
eq
(
400
)
expect
(
json_response
[
'message'
]).
to
eq
({
"error"
=>
"Spam detected"
})
expect
(
json_response
[
'message'
]).
to
eq
({
"error"
=>
"Spam detected"
})
spam_logs
=
SpamLog
.
all
spam_logs
=
SpamLog
.
all
expect
(
spam_logs
.
count
).
to
eq
(
1
)
expect
(
spam_logs
.
count
).
to
eq
(
1
)
expect
(
spam_logs
[
0
].
title
).
to
eq
(
'new issue'
)
expect
(
spam_logs
[
0
].
title
).
to
eq
(
'new issue'
)
expect
(
spam_logs
[
0
].
description
).
to
eq
(
'content here'
)
expect
(
spam_logs
[
0
].
user
).
to
eq
(
user
)
expect
(
spam_logs
[
0
].
user
).
to
eq
(
user
)
expect
(
spam_logs
[
0
].
noteable_type
).
to
eq
(
'Issue'
)
expect
(
spam_logs
[
0
].
noteable_type
).
to
eq
(
'Issue'
)
expect
(
spam_logs
[
0
].
project_id
).
to
eq
(
project
.
id
)
expect
(
spam_logs
[
0
].
project_id
).
to
eq
(
project
.
id
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录