mirror of
				https://github.com/TeaOSLab/EdgeNode.git
				synced 2025-11-04 07:40:56 +08:00 
			
		
		
		
	修正自动使用本地防火墙延长封禁时间逻辑
This commit is contained in:
		@@ -42,10 +42,10 @@ func (this *ClientListener) Accept() (net.Conn, error) {
 | 
				
			|||||||
	ip, _, err := net.SplitHostPort(conn.RemoteAddr().String())
 | 
						ip, _, err := net.SplitHostPort(conn.RemoteAddr().String())
 | 
				
			||||||
	if err == nil {
 | 
						if err == nil {
 | 
				
			||||||
		canGoNext, _ := iplibrary.AllowIP(ip, 0)
 | 
							canGoNext, _ := iplibrary.AllowIP(ip, 0)
 | 
				
			||||||
 | 
							var beingDenied = !waf.SharedIPWhiteList.Contains(waf.IPTypeAll, firewallconfigs.FirewallScopeGlobal, 0, ip) &&
 | 
				
			||||||
 | 
								waf.SharedIPBlackList.Contains(waf.IPTypeAll, firewallconfigs.FirewallScopeGlobal, 0, ip)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if !canGoNext ||
 | 
							if !canGoNext || beingDenied {
 | 
				
			||||||
			(!waf.SharedIPWhiteList.Contains(waf.IPTypeAll, firewallconfigs.FirewallScopeGlobal, 0, ip) &&
 | 
					 | 
				
			||||||
				waf.SharedIPBlackList.Contains(waf.IPTypeAll, firewallconfigs.FirewallScopeGlobal, 0, ip)) {
 | 
					 | 
				
			||||||
			tcpConn, ok := conn.(*net.TCPConn)
 | 
								tcpConn, ok := conn.(*net.TCPConn)
 | 
				
			||||||
			if ok {
 | 
								if ok {
 | 
				
			||||||
				_ = tcpConn.SetLinger(0)
 | 
									_ = tcpConn.SetLinger(0)
 | 
				
			||||||
@@ -54,9 +54,11 @@ func (this *ClientListener) Accept() (net.Conn, error) {
 | 
				
			|||||||
			_ = conn.Close()
 | 
								_ = conn.Close()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			// 使用本地防火墙延长封禁
 | 
								// 使用本地防火墙延长封禁
 | 
				
			||||||
			var fw = firewalls.Firewall()
 | 
								if beingDenied {
 | 
				
			||||||
			if fw != nil && !fw.IsMock() {
 | 
									var fw = firewalls.Firewall()
 | 
				
			||||||
				_ = fw.DropSourceIP(ip, 60)
 | 
									if fw != nil && !fw.IsMock() {
 | 
				
			||||||
 | 
										_ = fw.DropSourceIP(ip, 60)
 | 
				
			||||||
 | 
									}
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			return this.Accept()
 | 
								return this.Accept()
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user