Change dnsfilter API

This commit is contained in:
Eugene Bujak 2018-12-03 16:44:17 +03:00
parent 667ef2adb8
commit d75d08fde7

View File

@ -75,7 +75,7 @@ func setupPlugin(c *caddy.Controller) (*plug, error) {
// create new Plugin and copy default values // create new Plugin and copy default values
p := &plug{ p := &plug{
settings: defaultPluginSettings, settings: defaultPluginSettings,
d: dnsfilter.New(), d: dnsfilter.New(nil),
} }
log.Println("Initializing the CoreDNS plugin") log.Println("Initializing the CoreDNS plugin")
@ -86,7 +86,7 @@ func setupPlugin(c *caddy.Controller) (*plug, error) {
switch blockValue { switch blockValue {
case "safebrowsing": case "safebrowsing":
log.Println("Browsing security service is enabled") log.Println("Browsing security service is enabled")
p.d.EnableSafeBrowsing() p.d.SafeBrowsingEnabled = true
if c.NextArg() { if c.NextArg() {
if len(c.Val()) == 0 { if len(c.Val()) == 0 {
return nil, c.ArgErr() return nil, c.ArgErr()
@ -95,7 +95,7 @@ func setupPlugin(c *caddy.Controller) (*plug, error) {
} }
case "safesearch": case "safesearch":
log.Println("Safe search is enabled") log.Println("Safe search is enabled")
p.d.EnableSafeSearch() p.d.SafeSearchEnabled = true
case "parental": case "parental":
if !c.NextArg() { if !c.NextArg() {
return nil, c.ArgErr() return nil, c.ArgErr()
@ -106,10 +106,11 @@ func setupPlugin(c *caddy.Controller) (*plug, error) {
} }
log.Println("Parental control is enabled") log.Println("Parental control is enabled")
err = p.d.EnableParental(sensitivity) if !dnsfilter.IsParentalSensitivityValid(sensitivity) {
if err != nil { return nil, dnsfilter.ErrInvalidParental
return nil, c.ArgErr()
} }
p.d.ParentalEnabled = true
p.d.ParentalSensitivity = sensitivity
if c.NextArg() { if c.NextArg() {
if len(c.Val()) == 0 { if len(c.Val()) == 0 {
return nil, c.ArgErr() return nil, c.ArgErr()