mirror of
https://github.com/TeaOSLab/EdgeAdmin.git
synced 2025-11-06 23:00:25 +08:00
用户使用反向代理访问系统时主动引导用户设置“自定义客户端IP报头“
This commit is contained in:
@@ -0,0 +1,18 @@
|
|||||||
|
// Copyright 2024 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
|
||||||
|
|
||||||
|
package security
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
|
||||||
|
"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
|
||||||
|
)
|
||||||
|
|
||||||
|
type DismissXFFPromptAction struct {
|
||||||
|
actionutils.ParentAction
|
||||||
|
}
|
||||||
|
|
||||||
|
func (this *DismissXFFPromptAction) RunPost(params struct{}) {
|
||||||
|
helpers.DisableXFFPrompt()
|
||||||
|
|
||||||
|
this.Success()
|
||||||
|
}
|
||||||
@@ -19,7 +19,11 @@ func (this *IndexAction) Init() {
|
|||||||
this.Nav("", "", "")
|
this.Nav("", "", "")
|
||||||
}
|
}
|
||||||
|
|
||||||
func (this *IndexAction) RunGet(params struct{}) {
|
func (this *IndexAction) RunGet(params struct {
|
||||||
|
ShowAll bool
|
||||||
|
}) {
|
||||||
|
this.Data["showAll"] = params.ShowAll
|
||||||
|
|
||||||
config, err := configloaders.LoadSecurityConfig()
|
config, err := configloaders.LoadSecurityConfig()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
this.ErrorPage(err)
|
this.ErrorPage(err)
|
||||||
@@ -66,6 +70,7 @@ func (this *IndexAction) RunGet(params struct{}) {
|
|||||||
this.Data["provinces"] = provinceMaps
|
this.Data["provinces"] = provinceMaps
|
||||||
|
|
||||||
this.Data["config"] = config
|
this.Data["config"] = config
|
||||||
|
|
||||||
this.Show()
|
this.Show()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ func init() {
|
|||||||
Helper(settingutils.NewHelper("security")).
|
Helper(settingutils.NewHelper("security")).
|
||||||
Prefix("/settings/security").
|
Prefix("/settings/security").
|
||||||
GetPost("", new(IndexAction)).
|
GetPost("", new(IndexAction)).
|
||||||
|
Post("/dismissXFFPrompt", new(DismissXFFPromptAction)).
|
||||||
EndAll()
|
EndAll()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,6 +49,9 @@ var nodeLogsType = ""
|
|||||||
// IP名单
|
// IP名单
|
||||||
var countUnreadIPItems int64 = 0
|
var countUnreadIPItems int64 = 0
|
||||||
|
|
||||||
|
// 安全相关
|
||||||
|
var securityXFFPromptDisabled = false
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
events.On(events.EventStart, func() {
|
events.On(events.EventStart, func() {
|
||||||
// 节点日志数量
|
// 节点日志数量
|
||||||
@@ -220,6 +223,15 @@ func (this *userMustAuth) BeforeAction(actionPtr actions.ActionWrapper, paramNam
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 是否正在使用反向代理模式
|
||||||
|
action.Data["teaXFFPrompt"] = false
|
||||||
|
if !securityXFFPromptDisabled &&
|
||||||
|
(len(action.Header("X-Forwarded-For")) > 0 || len(action.Header("X-Real-Ip")) > 0 || len(action.Header("Cf-Connecting-Ip")) > 0) &&
|
||||||
|
securityConfig != nil &&
|
||||||
|
len(securityConfig.ClientIPHeaderNames) == 0 {
|
||||||
|
action.Data["teaXFFPrompt"] = true
|
||||||
|
}
|
||||||
|
|
||||||
// 检查用户是否存在
|
// 检查用户是否存在
|
||||||
if !configloaders.CheckAdmin(adminId) {
|
if !configloaders.CheckAdmin(adminId) {
|
||||||
loginutils.UnsetCookie(action)
|
loginutils.UnsetCookie(action)
|
||||||
|
|||||||
@@ -29,6 +29,11 @@ func init() {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DisableXFFPrompt 停用XFF提示
|
||||||
|
func DisableXFFPrompt() {
|
||||||
|
securityXFFPromptDisabled = true
|
||||||
|
}
|
||||||
|
|
||||||
// 检查用户IP并支持缓存
|
// 检查用户IP并支持缓存
|
||||||
func checkIP(config *systemconfigs.SecurityConfig, ipAddr string) bool {
|
func checkIP(config *systemconfigs.SecurityConfig, ipAddr string) bool {
|
||||||
ipCacheLocker.Lock()
|
ipCacheLocker.Lock()
|
||||||
|
|||||||
@@ -8,6 +8,13 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- XFF设置提示 -->
|
||||||
|
<div class="ui message warning" v-if="teaXFFPrompt">
|
||||||
|
检测到你正在使用反向代理访问当前系统,如果你的系统确定在一个反向代理服务的上游,为了系统的正常运行,请在安全设置中设置“自定义客户端IP报头”。
|
||||||
|
<a href="/settings/security?showAll=1#client-header-names">[去设置]</a>
|
||||||
|
<a href="" @click.prevent="dismissXFFPrompt">[关闭提示]</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- 没有节点提醒 -->
|
<!-- 没有节点提醒 -->
|
||||||
<div class="ui icon message warning" v-if="!isLoading && dashboard.defaultClusterId > 0 && dashboard.countNodes == 0">
|
<div class="ui icon message warning" v-if="!isLoading && dashboard.defaultClusterId > 0 && dashboard.countNodes == 0">
|
||||||
<i class="icon warning circle"></i>
|
<i class="icon warning circle"></i>
|
||||||
|
|||||||
@@ -222,4 +222,12 @@ Tea.context(function () {
|
|||||||
this.localLowerVersionAPINode.isRestarting = false
|
this.localLowerVersionAPINode.isRestarting = false
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 关闭XFF提示
|
||||||
|
this.dismissXFFPrompt = function () {
|
||||||
|
this.$post("/settings/security/dismissXFFPrompt")
|
||||||
|
.success(function () {
|
||||||
|
teaweb.reload()
|
||||||
|
})
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -56,12 +56,12 @@
|
|||||||
<more-options-indicator></more-options-indicator>
|
<more-options-indicator></more-options-indicator>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tbody v-show="moreOptionsVisible">
|
<tbody v-show="moreOptionsVisible || showAll">
|
||||||
<tr>
|
<tr>
|
||||||
<td>自定义客户端IP报头</td>
|
<td>自定义客户端IP报头</td>
|
||||||
<td>
|
<td>
|
||||||
<input type="text" name="clientIPHeaderNames" v-model="config.clientIPHeaderNames"/>
|
<input type="text" name="clientIPHeaderNames" v-model="config.clientIPHeaderNames"/>
|
||||||
<p class="comment">可以通过此报头获取客户端IP,类似于<code-label>X-Forwarded-For X-Real-IP True-Client-IP Client-IP</code-label> <a href=""><span class="small" @click.prevent="addDefaultClientIPHeaderNames('X-Forwarded-For X-Real-IP True-Client-IP Client-IP')">[填入]</span></a>,用于使用反向代理访问管理系统的情形;如果有多个报头可以使用空格隔开。</p>
|
<p class="comment"><a id="client-header-names"></a>可以通过此报头获取客户端IP,类似于<code-label>X-Forwarded-For X-Real-IP True-Client-IP Client-IP</code-label> <a href=""><span class="small" @click.prevent="addDefaultClientIPHeaderNames('X-Forwarded-For X-Real-IP True-Client-IP Client-IP')">[填入]</span></a>,用于使用反向代理访问管理系统的情形;如果有多个报头可以使用空格隔开。</p>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
|||||||
Reference in New Issue
Block a user