Tweak GPAC to cache DNS lookups to resolve #9

bdwyertech · Apr 12, 2021 · 9339389 · 9339389
1 parent 71ec921
commit 9339389
Show file tree

Hide file tree

Showing 8 changed files with 141 additions and 31 deletions.
diff --git a/go.mod b/go.mod
@@ -4,19 +4,21 @@ go 1.16
 
 replace github.com/elazarl/goproxy => github.com/bdwyertech/goproxy v0.0.0-20200419011457-7aaf118834c9
 
+replace github.com/darren/gpac => github.com/bdwyertech/gpac v0.0.0-20210412191422-5e2441af9ea4
+
 // replace github.com/aus/proxyplease => ../proxyplease
 
 // replace github.com/rapid7/go-get-proxied => ../go-get-proxied
 
 require (
-	github.com/ReneKroon/ttlcache/v2 v2.3.0
+	github.com/ReneKroon/ttlcache/v2 v2.4.0
 	github.com/bdwyertech/go-scutil v0.0.0-20210306002117-b25267f54e45
 	github.com/bdwyertech/proxyplease v0.1.1-0.20210411181055-87b0b23e723b
 	github.com/elazarl/goproxy v0.0.0-00010101000000-000000000000
 	github.com/kardianos/service v1.2.0
 	github.com/mattn/go-colorable v0.1.8
 	github.com/mattn/go-isatty v0.0.12
 	github.com/sirupsen/logrus v1.8.1
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
+	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
 	golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57
 )
diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-github.com/ReneKroon/ttlcache/v2 v2.3.0 h1:qZnUjRKIrbKHH6vF5T7Y9Izn5ObfTZfyYpGhvz2BKPo=
-github.com/ReneKroon/ttlcache/v2 v2.3.0/go.mod h1:zbo6Pv/28e21Z8CzzqgYRArQYGYtjONRxaAKGxzQvG4=
+github.com/ReneKroon/ttlcache/v2 v2.4.0 h1:KywGhjik+ZFTDXMNLiPECSzmdx2yNvAlDNKESCRaVEs=
+github.com/ReneKroon/ttlcache/v2 v2.4.0/go.mod h1:zbo6Pv/28e21Z8CzzqgYRArQYGYtjONRxaAKGxzQvG4=
 github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74 h1:Kk6a4nehpJ3UuJRqlA3JxYxBZEqCeOmATOvrbT4p9RA=
 github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
 github.com/alvaroloes/enumer v1.1.2/go.mod h1:FxrjvuXoDAx9isTJrv4c+T410zFi0DtXIT0m65DJ+Wo=
@@ -9,18 +9,16 @@ github.com/bdwyertech/go-scutil v0.0.0-20210306002117-b25267f54e45 h1:h0VnajBq78
 github.com/bdwyertech/go-scutil v0.0.0-20210306002117-b25267f54e45/go.mod h1:gV303gJocqRNJVrg/n4cB+ZwoHxKKMiAiwe+t627Kjw=
 github.com/bdwyertech/goproxy v0.0.0-20200419011457-7aaf118834c9 h1:Eu3d1Y6dGkfqvQ+S0v5RccH8pBZlzhOTBU+U7NQmlRs=
 github.com/bdwyertech/goproxy v0.0.0-20200419011457-7aaf118834c9/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
+github.com/bdwyertech/gpac v0.0.0-20210412191422-5e2441af9ea4 h1:+plY8be3qXQe+v0VY05699Rl/a6UMVGFnnmVb76s4mE=
+github.com/bdwyertech/gpac v0.0.0-20210412191422-5e2441af9ea4/go.mod h1:KUnbqc2Vu2I7Wkjx4GDt2cdJ786MbVmF0GqtfAfyAMo=
 github.com/bdwyertech/proxyplease v0.1.1-0.20210411181055-87b0b23e723b h1:kV5xBQXTZRDZMC4MQoYCrMszXFUZ/0m0qB783IpyCzs=
 github.com/bdwyertech/proxyplease v0.1.1-0.20210411181055-87b0b23e723b/go.mod h1:HqZQMf8gjtMbAXg+qVD/Abxm5+TNaOValkUfQaCRts8=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/darren/gpac v0.0.0-20201209040425-3300e0622b93 h1:H6CW26kV4Egh6/v0o7Nd33ArRtwfQ9erfrVzOCZ1O6Q=
-github.com/darren/gpac v0.0.0-20201209040425-3300e0622b93/go.mod h1:1Id6bMaG5dQYTt+Pk0msQw4r/+kkuzfuFwoictr5mcU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 h1:Izz0+t1Z5nI16/II7vuEo/nHjodOg0p7+OiDpjX5t1E=
 github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
-github.com/dop251/goja v0.0.0-20200629185240-bfd59704b500/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA=
 github.com/dop251/goja v0.0.0-20210406175830-1b11a6af686d h1:eyoriwRl4YlfXy64RCAiMyo3oX/UtA3eeje+qJk+fQA=
 github.com/dop251/goja v0.0.0-20210406175830-1b11a6af686d/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk=
 github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y=
@@ -77,9 +75,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1 h1:4qWs8cYYH6PoEFy4dfhDFgoMGkwAcETd+MmPdCPMzUc=
 golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

diff --git a/vendor/github.com/ReneKroon/ttlcache/v2/.travis.yml b/vendor/github.com/ReneKroon/ttlcache/v2/.travis.yml
diff --git a/vendor/github.com/ReneKroon/ttlcache/v2/cache.go b/vendor/github.com/ReneKroon/ttlcache/v2/cache.go
diff --git a/vendor/github.com/darren/gpac/builtin_natives.go b/vendor/github.com/darren/gpac/builtin_natives.go
diff --git a/vendor/github.com/darren/gpac/go.mod b/vendor/github.com/darren/gpac/go.mod
diff --git a/vendor/github.com/darren/gpac/go.sum b/vendor/github.com/darren/gpac/go.sum
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1,4 +1,4 @@
-# github.com/ReneKroon/ttlcache/v2 v2.3.0
+# github.com/ReneKroon/ttlcache/v2 v2.4.0
 ## explicit
 github.com/ReneKroon/ttlcache/v2
 # github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74
@@ -15,7 +15,7 @@ github.com/bdwyertech/go-scutil/proxy
 # github.com/bdwyertech/proxyplease v0.1.1-0.20210411181055-87b0b23e723b
 ## explicit
 github.com/bdwyertech/proxyplease
-# github.com/darren/gpac v0.0.0-20201209040425-3300e0622b93
+# github.com/darren/gpac v0.0.0-20201209040425-3300e0622b93 => github.com/bdwyertech/gpac v0.0.0-20210412191422-5e2441af9ea4
 github.com/darren/gpac
 # github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91
 github.com/dlclark/regexp2
@@ -54,7 +54,7 @@ golang.org/x/crypto/md4
 # golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1
 golang.org/x/net/internal/socks
 golang.org/x/net/proxy
-# golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
+# golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
 ## explicit
 golang.org/x/sync/singleflight
 # golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57
@@ -80,3 +80,4 @@ golang.org/x/text/unicode/norm
 # h12.io/socks v1.0.2
 h12.io/socks
 # github.com/elazarl/goproxy => github.com/bdwyertech/goproxy v0.0.0-20200419011457-7aaf118834c9
+# github.com/darren/gpac => github.com/bdwyertech/gpac v0.0.0-20210412191422-5e2441af9ea4