Changeset 705 in code for trunk/config

Timestamp:

Nov 17, 2021, 2:07:58 PM (4 years ago)

Author:

contact

Message:

Add per-user IP addresses

The new upstream-user-ip directive allows bouncer operators to
assign one IP address per user.

File:

• trunk/config/config.go (modified) (2 diffs)

trunk/config/config.go

@@ -53 +53 @@
         MaxUserNetworks int
         MultiUpstream   bool
+        UpstreamUserIPs []*net.IPNet
 }
 
@@ -151 +152 @@
                         }
                         srv.MultiUpstream = v
+                case "upstream-user-ip":
+                        if len(srv.UpstreamUserIPs) > 0 {
+                                return nil, fmt.Errorf("directive %q: can only be specified once", d.Name)
+                        }
+                        var hasIPv4, hasIPv6 bool
+                        for _, s := range d.Params {
+                                _, n, err := net.ParseCIDR(s)
+                                if err != nil {
+                                        return nil, fmt.Errorf("directive %q: failed to parse CIDR: %v", d.Name, err)
+                                }
+                                if n.IP.To4() == nil {
+                                        if hasIPv6 {
+                                                return nil, fmt.Errorf("directive %q: found two IPv6 CIDRs", d.Name)
+                                        }
+                                        hasIPv6 = true
+                                } else {
+                                        if hasIPv4 {
+                                                return nil, fmt.Errorf("directive %q: found two IPv4 CIDRs", d.Name)
+                                        }
+                                        hasIPv4 = true
+                                }
+                                srv.UpstreamUserIPs = append(srv.UpstreamUserIPs, n)
+                        }
                 default:
                         return nil, fmt.Errorf("unknown directive %q", d.Name)