gofmt: minor changes

Author: pyed

README.md

@@ -30,22 +30,22 @@ ipfilter / {
 }
 ```
 `caddy` will block any client IP that appears as a file name in the
-*blacklisted* directory. A relative pathname is relative to the CWD when
+`blacklisted` directory. A relative pathname is relative to the CWD when
 `caddy` is started. When putting the blacklisted directory in the web
 server document tree you should also add an `internal` directive to
 ensure those files are not visible via HTTP GET requests. For example,
 `internal /blacklisted/`. You can also specify an absolute pathname to
 locate the blacklist directory outside the document tree.
 
 You can create the file in the root of the blacklist directory. This is
-known as using a "flat" namespace. For example, *blacklisted/127.0.0.1*
-or *blacklisted/2601:647:4601:fa93:1865:4b6c:d055:3f3*. However,
+known as using a "flat" namespace. For example, `blacklisted/127.0.0.1`
+or `blacklisted/2601:647:4601:fa93:1865:4b6c:d055:3f3`. However,
 putting thousands of files in a single directory may cause
 poor performance of the lookup function. So you can also,
 and should, use a "sharded" namespace. This involves creating
 the file in a subdirectory based on the first two components
-of the address. For example, *blacklisted/127/0/127.0.0.1* or
-*blacklisted/2601/647/2601:647:4601:fa93:1865:4b6c:d055:3f3*.
+of the address. For example, `blacklisted/127/0/127.0.0.1` or
+`blacklisted/2601/647/2601:647:4601:fa93:1865:4b6c:d055:3f3`.
 
 Note that you can also whitelist IP addresses using this mechanism by
 specifying `rule allow`. This may be useful when it follows a more general

ipfilter.go

@@ -197,6 +197,7 @@ func (ipf IPFilter) ShouldAllow(path IPPath, r *http.Request) (bool, string, err
 	return allow, scopeMatched, nil
 }
 
+// PrefixDirBlocked takes an IP and a path and decides to allow or block based on prefix_dir.
 func (ipf IPFilter) PrefixDirBlocked(clientIP net.IP, path IPPath) bool {
 	if path.PrefixDir == "" {
 		return false
@@ -205,8 +206,8 @@ func (ipf IPFilter) PrefixDirBlocked(clientIP net.IP, path IPPath) bool {
 	fname := clientIP.String()
 
 	// Check the "flat" namespace.
-	blacklist_path := filepath.Join(path.PrefixDir, fname)
-	if _, err := os.Stat(blacklist_path); err == nil {
+	blacklistPath := filepath.Join(path.PrefixDir, fname)
+	if _, err := os.Stat(blacklistPath); err == nil {
 		return true
 	}
 
@@ -222,8 +223,8 @@ func (ipf IPFilter) PrefixDirBlocked(clientIP net.IP, path IPPath) bool {
 			return false
 		}
 	}
-	blacklist_path = filepath.Join(path.PrefixDir, c[0], c[1], fname)
-	if _, err := os.Stat(blacklist_path); err == nil {
+	blacklistPath = filepath.Join(path.PrefixDir, c[0], c[1], fname)
+	if _, err := os.Stat(blacklistPath); err == nil {
 		return true
 	}
 
@@ -323,7 +324,7 @@ func parseIP(ip string) ([]*net.IPNet, error) {
 // ipfilterParseSingle parses a single ipfilter {} block from the caddy config.
 func ipfilterParseSingle(config *IPFConfig, c *caddy.Controller) (IPPath, error) {
 	var cPath IPPath
-	rule_type_specified := false
+	ruleTypeSpecified := false
 
 	// Get PathScopes
 	cPath.PathScopes = c.RemainingArgs()
@@ -342,7 +343,7 @@ func ipfilterParseSingle(config *IPFConfig, c *caddy.Controller) (IPPath, error)
 			if !c.NextArg() {
 				return cPath, c.ArgErr()
 			}
-			if rule_type_specified {
+			if ruleTypeSpecified {
 				return cPath, c.Err("ipfilter: Only one 'rule' directive per block allowed")
 			}
 
@@ -352,7 +353,7 @@ func ipfilterParseSingle(config *IPFConfig, c *caddy.Controller) (IPPath, error)
 			} else if rule != "allow" {
 				return cPath, c.Err("ipfilter: Rule should be 'block' or 'allow'")
 			}
-			rule_type_specified = true
+			ruleTypeSpecified = true
 		case "database":
 			if !c.NextArg() {
 				return cPath, c.ArgErr()
@@ -408,16 +409,16 @@ func ipfilterParseSingle(config *IPFConfig, c *caddy.Controller) (IPPath, error)
 			}
 
 			// Verify the blacklist path prefix exists and is a directory.
-			prefix_dir := c.Val()
-			if statb, err := os.Stat(prefix_dir); os.IsNotExist(err) || !statb.IsDir() {
-				return cPath, c.Err("ipfilter: No such blacklist prefix dir: " + prefix_dir)
+			prefixDir := c.Val()
+			if statb, err := os.Stat(prefixDir); os.IsNotExist(err) || !statb.IsDir() {
+				return cPath, c.Err("ipfilter: No such blacklist prefix dir: " + prefixDir)
 			}
 
-			cPath.PrefixDir = prefix_dir
+			cPath.PrefixDir = prefixDir
 		}
 	}
 
-	if !rule_type_specified {
+	if !ruleTypeSpecified {
 		return cPath, c.Err("ipfilter: There must be one 'rule' directive per block")
 	}
 	return cPath, nil