checkDnsBl returning its action

prawnsalad · web-flow · commit fb96cfcaf363 · 2020-05-18T20:57:27.000+01:00
diff --git a/pkg/webircgateway/client.go b/pkg/webircgateway/client.go
@@ -171,16 +171,20 @@ func (c *Client) Ready() {
 	}
 }
 
-func (c *Client) checkDnsBl() {
+func (c *Client) checkDnsBl() (tookAction string) {
 	dnsResult := dnsbl.Lookup(c.Gateway.Config.DnsblServers, c.RemoteAddr)
 	if dnsResult.Listed && c.Gateway.Config.DnsblAction == "deny" {
 		c.SendIrcError("Blocked by DNSBL")
 		c.SendClientSignal("state", "closed", "dnsbl_listed")
 		c.StartShutdown("dnsbl")
+		tookAction = "deny"
 	} else if dnsResult.Listed && c.Gateway.Config.DnsblAction == "verify" {
 		c.RequiresVerification = true
 		c.SendClientSignal("data", "CAPTCHA NEEDED")
+		tookAction = "verify"
 	}
+
+	return
 }
 
 func (c *Client) IsShuttingDown() bool {

Original file line number	Diff line number	Diff line change
`@@ -171,16 +171,20 @@ func (c *Client) Ready() {`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`
`174`		`-func (c *Client) checkDnsBl() {`
	`174`	`+func (c *Client) checkDnsBl() (tookAction string) {`
`175`	`175`	`dnsResult := dnsbl.Lookup(c.Gateway.Config.DnsblServers, c.RemoteAddr)`
`176`	`176`	`if dnsResult.Listed && c.Gateway.Config.DnsblAction == "deny" {`
`177`	`177`	`c.SendIrcError("Blocked by DNSBL")`
`178`	`178`	`c.SendClientSignal("state", "closed", "dnsbl_listed")`
`179`	`179`	`c.StartShutdown("dnsbl")`
	`180`	`+ tookAction = "deny"`
`180`	`181`	`} else if dnsResult.Listed && c.Gateway.Config.DnsblAction == "verify" {`
`181`	`182`	`c.RequiresVerification = true`
`182`	`183`	`c.SendClientSignal("data", "CAPTCHA NEEDED")`
	`184`	`+ tookAction = "verify"`
`183`	`185`	`}`
	`186`	`+`
	`187`	`+ return`
`184`	`188`	`}`
`185`	`189`
`186`	`190`	`func (c *Client) IsShuttingDown() bool {`