Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
70b9d8da
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,发现更多精彩内容 >>
提交
70b9d8da
编写于
3月 03, 2017
作者:
P
Pawel Chojnacki
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove unecessary defaults for uniq ip block, cleanup refactoring leftovers
上级
8a9bc24e
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
9 addition
and
11 deletion
+9
-11
db/migrate/20170210131347_add_unique_ips_limit_to_application_settings.rb
...210131347_add_unique_ips_limit_to_application_settings.rb
+2
-2
db/schema.rb
db/schema.rb
+4
-5
lib/gitlab/auth/unique_ips_limiter.rb
lib/gitlab/auth/unique_ips_limiter.rb
+2
-1
lib/gitlab/request_context.rb
lib/gitlab/request_context.rb
+0
-2
spec/lib/gitlab/request_context_spec.rb
spec/lib/gitlab/request_context_spec.rb
+1
-1
未找到文件。
db/migrate/20170210131347_add_unique_ips_limit_to_application_settings.rb
浏览文件 @
70b9d8da
...
...
@@ -4,8 +4,8 @@ class AddUniqueIpsLimitToApplicationSettings < ActiveRecord::Migration
disable_ddl_transaction!
def
up
add_column
_with_default
:application_settings
,
:unique_ips_limit_per_user
,
:integer
,
default:
10
add_column
_with_default
:application_settings
,
:unique_ips_limit_time_window
,
:integer
,
default:
3600
add_column
:application_settings
,
:unique_ips_limit_per_user
,
:integer
add_column
:application_settings
,
:unique_ips_limit_time_window
,
:integer
add_column_with_default
:application_settings
,
:unique_ips_limit_enabled
,
:boolean
,
default:
false
end
...
...
db/schema.rb
浏览文件 @
70b9d8da
...
...
@@ -111,11 +111,10 @@ ActiveRecord::Schema.define(version: 20170305203726) do
t
.
boolean
"plantuml_enabled"
t
.
integer
"max_pages_size"
,
default:
100
,
null:
false
t
.
integer
"terminal_max_session_time"
,
default:
0
,
null:
false
(
??
)
t
.
string
"default_artifacts_expire_in"
,
default:
'0'
,
null:
false
t
.
integer
"unique_ips_limit_per_user"
,
default:
10
,
null:
false
t
.
integer
"unique_ips_limit_time_window"
,
default:
3600
,
null:
false
t
.
boolean
"unique_ips_limit_enabled"
,
default:
false
,
null:
false
t
.
string
"default_artifacts_expire_in"
,
default:
"0"
,
null:
false
t
.
integer
"unique_ips_limit_per_user"
t
.
integer
"unique_ips_limit_time_window"
t
.
boolean
"unique_ips_limit_enabled"
,
default:
false
,
null:
false
end
create_table
"audit_events"
,
force: :cascade
do
|
t
|
...
...
@@ -587,9 +586,9 @@ ActiveRecord::Schema.define(version: 20170305203726) do
end
add_index
"labels"
,
[
"group_id"
,
"project_id"
,
"title"
],
name:
"index_labels_on_group_id_and_project_id_and_title"
,
unique:
true
,
using: :btree
add_index
"labels"
,
[
"type"
,
"project_id"
],
name:
"index_labels_on_type_and_project_id"
,
using: :btree
add_index
"labels"
,
[
"project_id"
],
name:
"index_labels_on_project_id"
,
using: :btree
add_index
"labels"
,
[
"title"
],
name:
"index_labels_on_title"
,
using: :btree
add_index
"labels"
,
[
"type"
,
"project_id"
],
name:
"index_labels_on_type_and_project_id"
,
using: :btree
create_table
"lfs_objects"
,
force: :cascade
do
|
t
|
t
.
string
"oid"
,
null:
false
...
...
lib/gitlab/auth/unique_ips_limiter.rb
浏览文件 @
70b9d8da
...
...
@@ -8,12 +8,13 @@ module Gitlab
if
config
.
unique_ips_limit_enabled
ip
=
RequestContext
.
client_ip
unique_ips
=
update_and_return_ips_count
(
user_id
,
ip
)
raise
TooManyIps
.
new
(
user_id
,
ip
,
unique_ips
)
if
unique_ips
>
config
.
unique_ips_limit_per_user
end
end
def
limit_user!
(
user
=
nil
)
user
=
yield
if
user
.
nil?
&&
block_given?
user
||=
yield
if
block_given?
limit_user_id!
(
user
.
id
)
unless
user
.
nil?
user
end
...
...
lib/gitlab/request_context.rb
浏览文件 @
70b9d8da
module
Gitlab
RequestStoreNotActive
=
Class
.
new
(
StandardError
)
class
RequestContext
class
<<
self
def
client_ip
...
...
spec/lib/gitlab/request_context_spec.rb
浏览文件 @
70b9d8da
...
...
@@ -22,7 +22,7 @@ describe Gitlab::RequestContext, lib: true do
it
{
is_expected
.
to
eq
(
ip
)
}
end
context
'before RequestContext m
w
run'
do
context
'before RequestContext m
iddleware
run'
do
it
{
is_expected
.
to
be_nil
}
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录