Merge pull request #117 from rekby/devel

Add autodetect self public IP from AWS metadata and from external IP detector

cmd/static/default-config.toml

@@ -99,6 +99,22 @@ HTTPSBackendIgnoreCert = true
 # Allow domain if it resolver for one of public IPs of this server.
 IPSelf = true
 
+# How detect public ips of the server.
+# it use if IPSelf is true
+# auto | local | aws  | yandex
+# auto - best effort for detect IP. Algoritm may change from time to time.
+#        it good for default.
+# bind - detect public IP binded to local interfaces
+# aws - detect public IPs by query to AWS EC2 metadata
+# external - detect self ip by request to external server IPSelfExternalDetector
+# yandex - detect public IPs by query to Yandex cloud metadata (now alias for aws)
+IPSelfDetectMethod = "auto"
+
+# Server for use as external detector of server IP (need for detect IP behind NAT
+# Server must response as plain text IP address.
+# For every detect lets-proxy make two requests: by ipv4 and ipv6 networks
+IPSelfExternalDetectorURL="http://ifconfig.io/ip"
+
 # Allow domain if it resolver for one of the ips.
 IPWhiteList = ""
 

go.mod

@@ -4,19 +4,21 @@ go 1.13
 
 require (
 	github.com/BurntSushi/toml v0.3.1
+	github.com/aws/aws-sdk-go v1.29.19
 	github.com/gobuffalo/packr v1.30.1
 	github.com/gojuno/minimock/v3 v3.0.5
 	github.com/kardianos/minwinsvc v0.0.0-20151122163309-cad6b2b879b0
 	github.com/maxatome/go-testdeep v1.1.0
 	github.com/miekg/dns v1.1.22
-	github.com/pkg/errors v0.8.1
+	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.4.1
 	github.com/prometheus/client_model v0.2.0
 	github.com/rekby/zapcontext v0.0.4
 	github.com/satori/go.uuid v1.2.0
+	github.com/sirupsen/logrus v1.4.2
 	go.uber.org/zap v1.11.0
 	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
-	golang.org/x/net v0.0.0-20191027093000-83d349e8ac1a
+	golang.org/x/net v0.0.0-20200202094626-16171245cfb2
 	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 )