leftyer/SamWaf
1
0
Fork 0
mirror of https://gitee.com/samwaf/SamWaf.git synced 2025-12-06 14:59:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix:修正检测内部修改weblog无效的问题

Browse Source
This commit is contained in:
samwaf
2024-08-09 10:40:14 +08:00
parent 7230a2a925
commit d0ffe56c1b
12 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libinjection-go/scantool.go
View File

@@ -5,7 +5,7 @@ import (
"strings"
)
func IsScan(log innerbean.WebLog) bool {
func IsScan(log *innerbean.WebLog) bool {
url_keywords := []string{"sqlmap", "Appscan", "nessus", "Nessus", "nessus",
"acunetix-wvs-test-for-some-inexistent-file", "acunetix_wvs_security_test",
"acunetix", "acunetix_wvs"}

2
wafenginecore/checkallowip.go
View File

@@ -12,7 +12,7 @@ import (
*
检测白名单 ip
*/
func (waf *WafEngine) CheckAllowIP(weblogbean innerbean.WebLog, formValue url.Values) detection.Result {
func (waf *WafEngine) CheckAllowIP(weblogbean *innerbean.WebLog, formValue url.Values) detection.Result {
result := detection.Result{
JumpGuardResult: false,
IsBlock: false,

2
wafenginecore/checkbot.go
View File

@@ -11,7 +11,7 @@ import (
*
检测爬虫
*/
func (waf *WafEngine) CheckBot(weblogbean innerbean.WebLog, formValue url.Values) detection.Result {
func (waf *WafEngine) CheckBot(weblogbean *innerbean.WebLog, formValue url.Values) detection.Result {
result := detection.Result{
JumpGuardResult: false,
IsBlock: false,

2
wafenginecore/checkcc.go
View File

@@ -11,7 +11,7 @@ import (
*
检测xss
*/
func (waf *WafEngine) CheckCC(weblogbean innerbean.WebLog, formValue url.Values) detection.Result {
func (waf *WafEngine) CheckCC(weblogbean *innerbean.WebLog, formValue url.Values) detection.Result {
result := detection.Result{
JumpGuardResult: false,
IsBlock: false,

2
wafenginecore/checkdenyip.go
View File

@@ -13,7 +13,7 @@ import (
检测不允许访问的 ip
返回是否满足条件
*/
func (waf *WafEngine) CheckDenyIP(weblogbean innerbean.WebLog, formValue url.Values) detection.Result {
func (waf *WafEngine) CheckDenyIP(weblogbean *innerbean.WebLog, formValue url.Values) detection.Result {
result := detection.Result{
JumpGuardResult: false,
IsBlock: false,

2
wafenginecore/checkdenyurl.go
View File

@@ -13,7 +13,7 @@ import (
检测不允许访问的 url
返回是否满足条件
*/
func (waf *WafEngine) CheckDenyURL(weblogbean innerbean.WebLog, formValue url.Values) detection.Result {
func (waf *WafEngine) CheckDenyURL(weblogbean *innerbean.WebLog, formValue url.Values) detection.Result {
result := detection.Result{
JumpGuardResult: false,
IsBlock: false,

2
wafenginecore/checkrce.go
View File

@@ -11,7 +11,7 @@ import (
*
检测Rce
*/
func (waf *WafEngine) CheckRce(weblogbean innerbean.WebLog, formValue url.Values) detection.Result {
func (waf *WafEngine) CheckRce(weblogbean *innerbean.WebLog, formValue url.Values) detection.Result {
result := detection.Result{
JumpGuardResult: false,
IsBlock: false,

6
wafenginecore/checkrule.go
View File

@@ -12,7 +12,7 @@ import (
*
检测rule
*/
func (waf *WafEngine) CheckRule(weblogbean innerbean.WebLog, formValue url.Values) detection.Result {
func (waf *WafEngine) CheckRule(weblogbean *innerbean.WebLog, formValue url.Values) detection.Result {
result := detection.Result{
JumpGuardResult: false,
IsBlock: false,
@@ -22,7 +22,7 @@ func (waf *WafEngine) CheckRule(weblogbean innerbean.WebLog, formValue url.Value
//规则判断 （局部）
if waf.HostTarget[weblogbean.HOST].Rule != nil {
if waf.HostTarget[weblogbean.HOST].Rule.KnowledgeBase != nil {
ruleMatchs, err := waf.HostTarget[weblogbean.HOST].Rule.Match("MF", &weblogbean)
ruleMatchs, err := waf.HostTarget[weblogbean.HOST].Rule.Match("MF", weblogbean)
if err == nil {
if len(ruleMatchs) > 0 {
rulestr := ""
@@ -44,7 +44,7 @@ func (waf *WafEngine) CheckRule(weblogbean innerbean.WebLog, formValue url.Value
//规则判断 （全局网站）
if waf.HostTarget[global.GWAF_GLOBAL_HOST_NAME].Host.GUARD_STATUS == 1 && waf.HostTarget[global.GWAF_GLOBAL_HOST_NAME].Rule != nil {
if waf.HostTarget[global.GWAF_GLOBAL_HOST_NAME].Rule.KnowledgeBase != nil {
ruleMatchs, err := waf.HostTarget[global.GWAF_GLOBAL_HOST_NAME].Rule.Match("MF", &weblogbean)
ruleMatchs, err := waf.HostTarget[global.GWAF_GLOBAL_HOST_NAME].Rule.Match("MF", weblogbean)
if err == nil {
if len(ruleMatchs) > 0 {
rulestr := ""

2
wafenginecore/checkscan.go
View File

@@ -11,7 +11,7 @@ import (
*
检测扫描工具
*/
func (waf *WafEngine) CheckSan(weblogbean innerbean.WebLog, formValue url.Values) detection.Result {
func (waf *WafEngine) CheckSan(weblogbean *innerbean.WebLog, formValue url.Values) detection.Result {
result := detection.Result{
JumpGuardResult: false,
IsBlock: false,

2
wafenginecore/checksql.go
View File

@@ -11,7 +11,7 @@ import (
*
检测sqli
*/
func (waf *WafEngine) CheckSql(weblogbean innerbean.WebLog, formValue url.Values) detection.Result {
func (waf *WafEngine) CheckSql(weblogbean *innerbean.WebLog, formValue url.Values) detection.Result {
result := detection.Result{
JumpGuardResult: false,
IsBlock: false,

2
wafenginecore/checkxss.go
View File

@@ -11,7 +11,7 @@ import (
*
检测xss
*/
func (waf *WafEngine) CheckXss(weblogbean innerbean.WebLog, formValue url.Values) detection.Result {
func (waf *WafEngine) CheckXss(weblogbean *innerbean.WebLog, formValue url.Values) detection.Result {
result := detection.Result{
JumpGuardResult: false,
IsBlock: false,

6
wafenginecore/wafengine.go
View File

@@ -165,15 +165,15 @@ func (waf *WafEngine) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if waf.HostTarget[host].Host.GUARD_STATUS == 1 {
//一系列检测逻辑
handleBlock := func(checkFunc func(innerbean.WebLog, url.Values) detection.Result) bool {
detectionResult := checkFunc(weblogbean, formValues)
handleBlock := func(checkFunc func(*innerbean.WebLog, url.Values) detection.Result) bool {
detectionResult := checkFunc(&weblogbean, formValues)
if detectionResult.IsBlock {
EchoErrorInfo(w, r, weblogbean, detectionResult.Title, detectionResult.Content)
return true
}
return false
}
detectionResult := waf.CheckAllowIP(weblogbean, formValues)
detectionResult := waf.CheckAllowIP(&weblogbean, formValues)
detectionResult = waf.CheckAllowURL(weblogbean, formValues)
if detectionResult.JumpGuardResult == false {