From ec2d8651e9458368b14b15f37a351713525959b0 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Thu, 25 Feb 2021 13:21:21 -0500 Subject: [PATCH 01/14] Update upstream dependencies for metrics.ProbeLatency timeout configuration. --- CHANGELOG.md | 19 +++++++++++++++++++ etc/001.yml | 16 +++++++++++++++- go.mod | 10 +++++----- go.sum | 25 ++++++++++++------------- 4 files changed, 51 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78651ccab..4d3c19784 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +# Release 0.19.4 + +## What's New + +* Link latency probe timeout parameter in router configuration. + +## Link Latency Probe Timeout + +Control the link latency probe timeout parameter with the following router configuration syntax: + +``` +forwarder: + # + # After how many milliseconds does the link latency probe timeout? + # (default 10000) + # + latencyProbeTimeout: 10000 +``` + # Release 0.19.3 ## What's New diff --git a/etc/001.yml b/etc/001.yml index fe2f74a10..a8b1f2716 100644 --- a/etc/001.yml +++ b/etc/001.yml @@ -12,21 +12,35 @@ forwarder: # How frequently does the forwarder probe the link latency. This will ultimately determine the resolution of the # responsiveness available to smart routing. This resolution comes at the expense of bandwidth utilization for the # probes, control plane utilization, and CPU utilization processing the results. + # (default 10000) + # + latencyProbeInterval: 10000 + # + # After how many milliseconds does the link latency probe timeout? + # (default 10000) + # + latencyProbeTimeout: 10000 # - latencyProbeInterval: 1000 # How many xgress dials can be queued for processing by the xgress dial workers. An xgress dial occurs # for services that have a terminator egress specified with an xgress binding (e.g. transport) # (minimum 1, max 10000, default 1000) + # xgressDialQueueLength: 1000 + # # The number of xgress dial workers used to process the xgress dial queue. # (minimum 1, max 10000, default 10) + # xgressDialWorkerCount: 10 + # # How many link dials can be queued for processing by the link dial workers. An link dial occurs # when a router is notified of a new router by the controller. # (minimum 1, max 10000, default 1000) + # linkDialQueueLength: 1000 + # # The number of link dial workers used to process the link dial queue. # (minimum 1, max 10000, default 10) + # linkDialWorkerCount: 10 #trace: diff --git a/go.mod b/go.mod index 7e2e9f38b..5bc17df95 100644 --- a/go.mod +++ b/go.mod @@ -24,11 +24,11 @@ require ( github.com/gorilla/mux v1.8.0 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 - github.com/michaelquigley/pfxlog v0.3.6 - github.com/openziti/edge v0.19.3 - github.com/openziti/fabric v0.16.10 - github.com/openziti/foundation v0.15.17 - github.com/openziti/sdk-golang v0.15.15 + github.com/michaelquigley/pfxlog v0.3.7 + github.com/openziti/edge v0.19.5 + github.com/openziti/fabric v0.16.11 + github.com/openziti/foundation v0.15.18 + github.com/openziti/sdk-golang v0.15.16 github.com/pborman/uuid v1.2.0 github.com/pkg/errors v0.9.1 github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 diff --git a/go.sum b/go.sum index 49f09ce0d..59514f2c5 100644 --- a/go.sum +++ b/go.sum @@ -541,13 +541,13 @@ github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyex github.com/michaelquigley/dilithium v0.2.0 h1:JNVb9ckXDTAxYVpPHPzkBuXObh0TYymuZgAhZclcvAo= github.com/michaelquigley/dilithium v0.2.0/go.mod h1:MIqCw2+ObUwmS7G+8N8hWiwNMjItUEBzeTlipmiZqOw= github.com/michaelquigley/pfxlog v0.0.0-20190813191113-2be43bd0dccc/go.mod h1:Z0K0l/NScHvLeGoy4SZTps+ZxGv85ql4AvZqTqOxBY8= -github.com/michaelquigley/pfxlog v0.3.6 h1:M2akmSBenjO4dd/E4lkxUriJ8WKCMsde8ljANfvEOEE= -github.com/michaelquigley/pfxlog v0.3.6/go.mod h1:s4uqqB54PDLSU6JvpizMBJ2VU4cpG3bXsXJvFHqHDLU= +github.com/michaelquigley/pfxlog v0.3.7 h1:itV+da+Kek0GwApI2vOcGhLdMk6eCNfjXoR6/Pezo+k= +github.com/michaelquigley/pfxlog v0.3.7/go.mod h1:s4uqqB54PDLSU6JvpizMBJ2VU4cpG3bXsXJvFHqHDLU= github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= -github.com/miekg/dns v1.1.38 h1:MtIY+fmHUVVgv1AXzmKMWcwdCYxTRPG1EDjpqF4RCEw= -github.com/miekg/dns v1.1.38/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= +github.com/miekg/dns v1.1.39 h1:6dRfDGnHiXOMmTZkwWANy7bBXXlKls5Qu+pn+Ue0TLo= +github.com/miekg/dns v1.1.39/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/miekg/pkcs11 v1.0.3 h1:iMwmD7I5225wv84WxIG/bmxz9AXjWvTWIbM/TYHvWtw= github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= @@ -605,15 +605,14 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openziti/edge v0.19.3 h1:HAmwyiYz2swXvhdqS8p87YlDp60y/aGpdRAze18LZNk= -github.com/openziti/edge v0.19.3/go.mod h1:k4YQ3tHl/+DGpCDHUrc4AR7mtmTBrWebXwbLe93eLrk= -github.com/openziti/fabric v0.16.9/go.mod h1:3q2TUtoLc397j9J1J0moZybGrXfm3aGsTvxyE3+7xhs= -github.com/openziti/fabric v0.16.10 h1:AFcEmkvOEZ919rnjRxO8bJyYpjQDVy3aYNvAaMiEkF4= -github.com/openziti/fabric v0.16.10/go.mod h1:3q2TUtoLc397j9J1J0moZybGrXfm3aGsTvxyE3+7xhs= -github.com/openziti/foundation v0.15.17 h1:bDD7doYIJ3CJNYWwMe9N3NxlhBfSMzuTiHV6lVFZ5X4= -github.com/openziti/foundation v0.15.17/go.mod h1:QBxVS96jSHNyH6zp+YYAgCC/N+Jg5fqfq1menR5U6lo= -github.com/openziti/sdk-golang v0.15.15 h1:+vGr0ib1QREQ1YwxuRM1xcpLD3WJGMpAYwsobMHbbGM= -github.com/openziti/sdk-golang v0.15.15/go.mod h1:iz5m37al/qYveTlhhCmqanOv/ou8R31XFPbPQ5K1tzw= +github.com/openziti/edge v0.19.5 h1:yhgWyZyU6ecTlrq9LGOTHX10AfFDLD9kgYm6K8ioNqE= +github.com/openziti/edge v0.19.5/go.mod h1:M7Im2HrWZlDMW+xAgl16vh46zKO0Y1woTtwkVo8qxug= +github.com/openziti/fabric v0.16.11 h1:Gvqln+sK8JD6KhhWaKRaQMZuSYD+kXCKteqya7OT4b0= +github.com/openziti/fabric v0.16.11/go.mod h1:YOsSTUbiocI3iHFTjWCid1pMdqebJu9Y0VVQKPxGiiY= +github.com/openziti/foundation v0.15.18 h1:LtjJw5kbX0115PZ9R0j9HiMLTKd+BB/wSWTZuR91xz4= +github.com/openziti/foundation v0.15.18/go.mod h1:4IJmKD13EpQfUD2NGbW95ug3D9ets9TgVhU9N5Iabuk= +github.com/openziti/sdk-golang v0.15.16 h1:5szZozunAUjuTbl2pkaNBZQ0aYE6SdeGNOdRPh/9W4I= +github.com/openziti/sdk-golang v0.15.16/go.mod h1:YhC+TlbW0W2g9r0dHmap6YpZ2rNUf60Nr/1uXsltYy4= github.com/oracle/oci-go-sdk v24.2.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888= github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI= github.com/orcaman/concurrent-map v0.0.0-20210106121528-16402b402231 h1:fa50YL1pzKW+1SsBnJDOHppJN9stOEwS+CRWyUtyYGU= From bbc586af502c73719c4f9196a4d86854a57c5249 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Fri, 26 Feb 2021 09:53:42 -0500 Subject: [PATCH 02/14] Update deps and changelog --- CHANGELOG.md | 3 +++ go.mod | 6 +++--- go.sum | 9 ++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d3c19784..655e35ea9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ ## What's New * Link latency probe timeout parameter in router configuration. +* Fix 0.19 regression: updating terminator cost/precedence from the sdk was broken +* Fix 0.19 regression: fabric session client id was incorrectly set to edge session token instead of + id ## Link Latency Probe Timeout diff --git a/go.mod b/go.mod index 5bc17df95..144290254 100644 --- a/go.mod +++ b/go.mod @@ -26,8 +26,8 @@ require ( github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 github.com/michaelquigley/pfxlog v0.3.7 github.com/openziti/edge v0.19.5 - github.com/openziti/fabric v0.16.11 - github.com/openziti/foundation v0.15.18 + github.com/openziti/fabric v0.16.12 + github.com/openziti/foundation v0.15.19 github.com/openziti/sdk-golang v0.15.16 github.com/pborman/uuid v1.2.0 github.com/pkg/errors v0.9.1 @@ -35,7 +35,7 @@ require ( github.com/rs/cors v1.7.0 github.com/russross/blackfriday v1.5.2 github.com/shirou/gopsutil v2.20.9+incompatible - github.com/sirupsen/logrus v1.7.1 + github.com/sirupsen/logrus v1.8.0 github.com/spf13/cobra v1.1.1 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.7.0 diff --git a/go.sum b/go.sum index 59514f2c5..223fd0ebd 100644 --- a/go.sum +++ b/go.sum @@ -607,10 +607,12 @@ github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTm github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/openziti/edge v0.19.5 h1:yhgWyZyU6ecTlrq9LGOTHX10AfFDLD9kgYm6K8ioNqE= github.com/openziti/edge v0.19.5/go.mod h1:M7Im2HrWZlDMW+xAgl16vh46zKO0Y1woTtwkVo8qxug= -github.com/openziti/fabric v0.16.11 h1:Gvqln+sK8JD6KhhWaKRaQMZuSYD+kXCKteqya7OT4b0= github.com/openziti/fabric v0.16.11/go.mod h1:YOsSTUbiocI3iHFTjWCid1pMdqebJu9Y0VVQKPxGiiY= -github.com/openziti/foundation v0.15.18 h1:LtjJw5kbX0115PZ9R0j9HiMLTKd+BB/wSWTZuR91xz4= +github.com/openziti/fabric v0.16.12 h1:JEg2hNasGDnFVUfPv6B52PXm51KIr0DxkF47zoqrkAs= +github.com/openziti/fabric v0.16.12/go.mod h1:Scja7v9rrpH8zK7joUqcNJO2VZyscMHFXI8EZM+et4A= github.com/openziti/foundation v0.15.18/go.mod h1:4IJmKD13EpQfUD2NGbW95ug3D9ets9TgVhU9N5Iabuk= +github.com/openziti/foundation v0.15.19 h1:PhdXN2ObjgLRJ2M3OalN53++oHk7lblokbjalYXbf6M= +github.com/openziti/foundation v0.15.19/go.mod h1:hn08t1O+fLsrk0N6ZQKF76mBQdPvbLDZtM82KT+a0CU= github.com/openziti/sdk-golang v0.15.16 h1:5szZozunAUjuTbl2pkaNBZQ0aYE6SdeGNOdRPh/9W4I= github.com/openziti/sdk-golang v0.15.16/go.mod h1:YhC+TlbW0W2g9r0dHmap6YpZ2rNUf60Nr/1uXsltYy4= github.com/oracle/oci-go-sdk v24.2.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888= @@ -707,8 +709,9 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.7.1 h1:rsizeFmZP+GYwyb4V6t6qpG7ZNWzA2bvgW/yC2xHCcg= github.com/sirupsen/logrus v1.7.1/go.mod h1:4GuYW9TZmE769R5STWrRakJc4UqQ3+QQ95fyz7ENv1A= +github.com/sirupsen/logrus v1.8.0 h1:nfhvjKcUMhBMVqbKHJlk5RPrrfYr/NMo3692g0dwfWU= +github.com/sirupsen/logrus v1.8.0/go.mod h1:4GuYW9TZmE769R5STWrRakJc4UqQ3+QQ95fyz7ENv1A= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M= github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= From 45ed97047ae4d6522770dda01e2a1896ebd4e0e8 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Mon, 1 Mar 2021 23:49:46 -0500 Subject: [PATCH 03/14] Update deps. Fix loop3 listener panic. Use OnContextReady to tidy tunneler startup --- go.mod | 12 ++--- go.sum | 60 ++++++++++++---------- ziti-fabric-test/subcmd/loop3/listener.go | 5 +- ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go | 34 ++++-------- 4 files changed, 53 insertions(+), 58 deletions(-) diff --git a/go.mod b/go.mod index 144290254..b327a49ff 100644 --- a/go.mod +++ b/go.mod @@ -25,10 +25,10 @@ require ( github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 github.com/michaelquigley/pfxlog v0.3.7 - github.com/openziti/edge v0.19.5 - github.com/openziti/fabric v0.16.12 - github.com/openziti/foundation v0.15.19 - github.com/openziti/sdk-golang v0.15.16 + github.com/openziti/edge v0.19.10 + github.com/openziti/fabric v0.16.14 + github.com/openziti/foundation v0.15.22 + github.com/openziti/sdk-golang v0.15.17 github.com/pborman/uuid v1.2.0 github.com/pkg/errors v0.9.1 github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 @@ -36,12 +36,12 @@ require ( github.com/russross/blackfriday v1.5.2 github.com/shirou/gopsutil v2.20.9+incompatible github.com/sirupsen/logrus v1.8.0 - github.com/spf13/cobra v1.1.1 + github.com/spf13/cobra v1.1.3 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.7.0 github.com/stretchr/testify v1.7.0 github.com/urfave/negroni v1.0.0 - golang.org/x/net v0.0.0-20210119194325-5f4716e94777 + golang.org/x/net v0.0.0-20210226101413-39120d07d75e google.golang.org/grpc v1.27.1 gopkg.in/AlecAivazis/survey.v1 v1.8.7 gopkg.in/resty.v1 v1.12.0 diff --git a/go.sum b/go.sum index 223fd0ebd..f929c2dc2 100644 --- a/go.sum +++ b/go.sum @@ -194,8 +194,9 @@ github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9sn github.com/go-openapi/analysis v0.19.4/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU= github.com/go-openapi/analysis v0.19.10/go.mod h1:qmhS3VNFxBlquFJ0RGoDtylO9y4pgTAUNE9AEEMdlJQ= -github.com/go-openapi/analysis v0.19.16 h1:Ub9e++M8sDwtHD+S587TYi+6ANBG1NRYGZDihqk0SaY= github.com/go-openapi/analysis v0.19.16/go.mod h1:GLInF007N83Ad3m8a/CbQ5TPzdnGT7workfHwuVjNVk= +github.com/go-openapi/analysis v0.20.0 h1:UN09o0kNhleunxW7LR+KnltD0YrJ8FF03pSqvAN3Vro= +github.com/go-openapi/analysis v0.20.0/go.mod h1:BMchjvaHDykmRMsK40iPtvyOfFdMMxlOmQr9FBZk+Og= github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= @@ -203,8 +204,9 @@ github.com/go-openapi/errors v0.19.3/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA github.com/go-openapi/errors v0.19.6/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/errors v0.19.7/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= -github.com/go-openapi/errors v0.19.9 h1:9SnKdGhiPZHF3ttwFMiCBEb8jQ4IDdrK+5+a0oTygA4= github.com/go-openapi/errors v0.19.9/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= +github.com/go-openapi/errors v0.20.0 h1:Sxpo9PjEHDzhs3FbnGNonvDgWcMW2U7wGTcDDSFSceM= +github.com/go-openapi/errors v0.20.0/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= @@ -226,8 +228,8 @@ github.com/go-openapi/loads v0.19.5/go.mod h1:dswLCAdonkRufe/gSUC3gN8nTSaB9uaS2e github.com/go-openapi/loads v0.19.6/go.mod h1:brCsvE6j8mnbmGBh103PT/QLHfbyDxA4hsKvYBNEGVc= github.com/go-openapi/loads v0.19.7/go.mod h1:brCsvE6j8mnbmGBh103PT/QLHfbyDxA4hsKvYBNEGVc= github.com/go-openapi/loads v0.20.0/go.mod h1:2LhKquiE513rN5xC6Aan6lYOSddlL8Mp20AW9kpviM4= -github.com/go-openapi/loads v0.20.1 h1:LX55ObGRfG+53/1KRKTvCfqC1U2Htf7KgkPBpIVhuUM= -github.com/go-openapi/loads v0.20.1/go.mod h1:/6LfFL8fDvTSX8ypmYXIq3U9Q7nfniSOStW22m864WM= +github.com/go-openapi/loads v0.20.2 h1:z5p5Xf5wujMxS1y8aP+vxwW5qYT2zdJBbXKmQUG3lcc= +github.com/go-openapi/loads v0.20.2/go.mod h1:hTVUotJ+UonAMMZsvakEgmWKgtulweO9vYP2bQYKA/o= github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4= @@ -245,8 +247,8 @@ github.com/go-openapi/spec v0.19.8/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHK github.com/go-openapi/spec v0.19.15/go.mod h1:+81FIL1JwC5P3/Iuuozq3pPE9dXdIEGxFutcFKaVbmU= github.com/go-openapi/spec v0.20.0/go.mod h1:+81FIL1JwC5P3/Iuuozq3pPE9dXdIEGxFutcFKaVbmU= github.com/go-openapi/spec v0.20.1/go.mod h1:93x7oh+d+FQsmsieroS4cmR3u0p/ywH649a3qwC9OsQ= -github.com/go-openapi/spec v0.20.2 h1:pFPUZsiIbZ20kLUcuCGeuQWG735fPMxW7wHF9BWlnQU= -github.com/go-openapi/spec v0.20.2/go.mod h1:RW6Xcbs6LOyWLU/mXGdzn2Qc+3aj+ASfI7rvSZh1Vls= +github.com/go-openapi/spec v0.20.3 h1:uH9RQ6vdyPSs2pSy9fL8QPspDF2AMIMPtmK5coSSjtQ= +github.com/go-openapi/spec v0.20.3/go.mod h1:gG4F8wdEDN+YPBMVnzE85Rbhf+Th2DTvA9nFPQ5AYEg= github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY= @@ -264,16 +266,18 @@ github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh github.com/go-openapi/swag v0.19.7/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY= github.com/go-openapi/swag v0.19.9/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY= github.com/go-openapi/swag v0.19.12/go.mod h1:eFdyEBkTdoAf/9RXBvj4cr1nH7GD8Kzo5HTt47gr72M= -github.com/go-openapi/swag v0.19.13 h1:233UVgMy1DlmCYYfOiFpta6e2urloh+sEs5id6lyzog= github.com/go-openapi/swag v0.19.13/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng= +github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= github.com/go-openapi/validate v0.19.3/go.mod h1:90Vh6jjkTn+OT1Eefm0ZixWNFjhtOH7vS9k0lo6zwJo= github.com/go-openapi/validate v0.19.10/go.mod h1:RKEZTUWDkxKQxN2jDT7ZnZi2bhZlbNMAuKvKB+IaGx8= github.com/go-openapi/validate v0.19.12/go.mod h1:Rzou8hA/CBw8donlS6WNEUQupNvUZ0waH08tGe6kAQ4= github.com/go-openapi/validate v0.19.15/go.mod h1:tbn/fdOwYHgrhPBzidZfJC2MIVvs9GA7monOmWBbeCI= -github.com/go-openapi/validate v0.20.1 h1:QGQ5CvK74E28t3DkegGweKR+auemUi5IdpMc4x3UW6s= github.com/go-openapi/validate v0.20.1/go.mod h1:b60iJT+xNNLfaQJUqLI7946tYiFEOuE9E4k54HpKcJ0= +github.com/go-openapi/validate v0.20.2 h1:AhqDegYV3J3iQkMPJSXkvzymHKMTw0BST3RK3hTT4ts= +github.com/go-openapi/validate v0.20.2/go.mod h1:e7OJoKNgd0twXZwIn0A43tHbvIcr/rZIVCbJBpTUoY0= github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48/go.mod h1:dZGr0i9PLlaaTD4H/hoZIDjQ+r6xq8mgbRzHZf7f2J8= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= @@ -499,8 +503,9 @@ github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/marten-seemann/qpack v0.1.0/go.mod h1:LFt1NU/Ptjip0C2CPkhimBz5CGE3WGDAUWqna+CNTrI= @@ -546,8 +551,8 @@ github.com/michaelquigley/pfxlog v0.3.7/go.mod h1:s4uqqB54PDLSU6JvpizMBJ2VU4cpG3 github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= -github.com/miekg/dns v1.1.39 h1:6dRfDGnHiXOMmTZkwWANy7bBXXlKls5Qu+pn+Ue0TLo= -github.com/miekg/dns v1.1.39/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= +github.com/miekg/dns v1.1.40 h1:pyyPFfGMnciYUk/mXpKkVmeMQjfXqt3FAJ2hy7tPiLA= +github.com/miekg/dns v1.1.40/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/miekg/pkcs11 v1.0.3 h1:iMwmD7I5225wv84WxIG/bmxz9AXjWvTWIbM/TYHvWtw= github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= @@ -605,16 +610,15 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openziti/edge v0.19.5 h1:yhgWyZyU6ecTlrq9LGOTHX10AfFDLD9kgYm6K8ioNqE= -github.com/openziti/edge v0.19.5/go.mod h1:M7Im2HrWZlDMW+xAgl16vh46zKO0Y1woTtwkVo8qxug= -github.com/openziti/fabric v0.16.11/go.mod h1:YOsSTUbiocI3iHFTjWCid1pMdqebJu9Y0VVQKPxGiiY= -github.com/openziti/fabric v0.16.12 h1:JEg2hNasGDnFVUfPv6B52PXm51KIr0DxkF47zoqrkAs= -github.com/openziti/fabric v0.16.12/go.mod h1:Scja7v9rrpH8zK7joUqcNJO2VZyscMHFXI8EZM+et4A= -github.com/openziti/foundation v0.15.18/go.mod h1:4IJmKD13EpQfUD2NGbW95ug3D9ets9TgVhU9N5Iabuk= -github.com/openziti/foundation v0.15.19 h1:PhdXN2ObjgLRJ2M3OalN53++oHk7lblokbjalYXbf6M= -github.com/openziti/foundation v0.15.19/go.mod h1:hn08t1O+fLsrk0N6ZQKF76mBQdPvbLDZtM82KT+a0CU= -github.com/openziti/sdk-golang v0.15.16 h1:5szZozunAUjuTbl2pkaNBZQ0aYE6SdeGNOdRPh/9W4I= -github.com/openziti/sdk-golang v0.15.16/go.mod h1:YhC+TlbW0W2g9r0dHmap6YpZ2rNUf60Nr/1uXsltYy4= +github.com/openziti/edge v0.19.10 h1:7NASZ0b/L/X+eBycwvZIhD63i4MxNxrvRp8jp6oRq8Q= +github.com/openziti/edge v0.19.10/go.mod h1:IYJ9PTAqA/Xqgp9ZhAfQseCUSJo4q1FhSZtxE9avAr8= +github.com/openziti/fabric v0.16.14 h1:5gD3THd4d0rq+MscJWSzrUKsy6BEuiEbnRU7YDtUUhQ= +github.com/openziti/fabric v0.16.14/go.mod h1:WpPkQ3LV5TeTzM95APPORBhfTxELxvcMVSfuTXpheJU= +github.com/openziti/foundation v0.15.21/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= +github.com/openziti/foundation v0.15.22 h1:t87jxnWHAtvqPZwpaHhKu0pDHGMVaJ2SuJLAA0i55e0= +github.com/openziti/foundation v0.15.22/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= +github.com/openziti/sdk-golang v0.15.17 h1:pwztxkMbZmjyGgsjKHgEzrHf8mXyGIM8JRmeVPlFP1g= +github.com/openziti/sdk-golang v0.15.17/go.mod h1:022SpRRS9cl6AWmS/K0Df34ovurQGqvPJ6VSQrwE5BI= github.com/oracle/oci-go-sdk v24.2.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888= github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI= github.com/orcaman/concurrent-map v0.0.0-20210106121528-16402b402231 h1:fa50YL1pzKW+1SsBnJDOHppJN9stOEwS+CRWyUtyYGU= @@ -709,7 +713,6 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.7.1/go.mod h1:4GuYW9TZmE769R5STWrRakJc4UqQ3+QQ95fyz7ENv1A= github.com/sirupsen/logrus v1.8.0 h1:nfhvjKcUMhBMVqbKHJlk5RPrrfYr/NMo3692g0dwfWU= github.com/sirupsen/logrus v1.8.0/go.mod h1:4GuYW9TZmE769R5STWrRakJc4UqQ3+QQ95fyz7ENv1A= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= @@ -732,8 +735,9 @@ github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.1.1 h1:KfztREH0tPxJJ+geloSLaAkaPkr4ki2Er5quFV1TDo4= github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= +github.com/spf13/cobra v1.1.3 h1:xghbfqPkxzxP3C/f3n5DdpAbdKLj4ZE4BWQI362l53M= +github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= @@ -794,8 +798,8 @@ go.mongodb.org/mongo-driver v1.3.0/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS go.mongodb.org/mongo-driver v1.3.4/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS3gZBapIE= go.mongodb.org/mongo-driver v1.4.3/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc= go.mongodb.org/mongo-driver v1.4.4/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc= -go.mongodb.org/mongo-driver v1.4.5 h1:TLtO+iD8krabXxvY1F1qpBOHgOxhLWR7XsT7kQeRmMY= -go.mongodb.org/mongo-driver v1.4.5/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc= +go.mongodb.org/mongo-driver v1.4.6 h1:rh7GdYmDrb8AQSkF8yteAus8qYOgOASWDOv1BWqBXkU= +go.mongodb.org/mongo-driver v1.4.6/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc= go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1 h1:A/5uWzF44DlIgdm/PQFwfMkW0JX+cIcQi/SwLAmZP5M= go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= @@ -915,8 +919,9 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201216054612-986b41b23924/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226101413-39120d07d75e h1:jIQURUJ9mlLvYwTBtRHm9h58rYhSonLvRvgAnP8Nr7I= +golang.org/x/net v0.0.0-20210226101413-39120d07d75e/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1163,8 +1168,9 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/ziti-fabric-test/subcmd/loop3/listener.go b/ziti-fabric-test/subcmd/loop3/listener.go index 065674573..ff8a94c25 100644 --- a/ziti-fabric-test/subcmd/loop3/listener.go +++ b/ziti-fabric-test/subcmd/loop3/listener.go @@ -26,6 +26,7 @@ import ( "github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti/config" loop3_pb "github.com/openziti/ziti/ziti-fabric-test/subcmd/loop3/pb" + "github.com/sirupsen/logrus" "github.com/spf13/cobra" "net" "strings" @@ -173,7 +174,9 @@ func (cmd *listenerCmd) handle(conn net.Conn, context string) { test = cmd.test } else { if test, err = proto.rxTest(); err != nil { - panic(err) + logrus.WithError(err).Error("failure receiving test parameters, closing") + _ = conn.Close() + return } } diff --git a/ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go b/ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go index 3802b3ed9..892b902a1 100644 --- a/ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go +++ b/ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go @@ -18,13 +18,13 @@ package subcmd import ( "github.com/michaelquigley/pfxlog" + "github.com/openziti/edge/tunnel" "github.com/openziti/edge/tunnel/dns" "github.com/openziti/edge/tunnel/entities" "github.com/openziti/edge/tunnel/intercept" "github.com/openziti/foundation/agent" "github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti/config" - "github.com/openziti/sdk-golang/ziti/edge" "github.com/openziti/ziti/common/enrollment" "github.com/sirupsen/logrus" "github.com/spf13/cobra" @@ -59,7 +59,6 @@ var root = &cobra.Command{ } var interceptor intercept.Interceptor -var resolver dns.Resolver var logFormatter string var cliAgentEnabled bool var cliAgentAddr string @@ -92,11 +91,6 @@ func rootPreRun(cmd *cobra.Command, _ []string) { } } -type serviceChangeEvent struct { - eventType config.ServiceEventType - service *edge.Service -} - func rootPostRun(cmd *cobra.Command, _ []string) { log := pfxlog.Logger() @@ -119,37 +113,29 @@ func rootPostRun(cmd *cobra.Command, _ []string) { entities.ServerConfigV1, } - var serviceListener *intercept.ServiceListener - var serviceEventsC = make(chan *serviceChangeEvent) + resolverConfig := cmd.Flag("resolver").Value.String() + resolver := dns.NewResolver(resolverConfig) + + serviceListener := intercept.NewServiceListener(interceptor, resolver) svcPollRate, _ := cmd.Flags().GetUint(svcPollRateFlag) - options := &config.Options{ + options := &ziti.Options{ RefreshInterval: time.Duration(svcPollRate) * time.Second, - OnServiceUpdate: func(eventType config.ServiceEventType, service *edge.Service) { - serviceEventsC <- &serviceChangeEvent{ - eventType: eventType, - service: service, - } + OnContextReady: func(ctx ziti.Context) { + serviceListener.HandleProviderReady(tunnel.NewContextProvider(ctx)) }, + OnServiceUpdate: serviceListener.HandleServicesChange, } rootPrivateContext := ziti.NewContextWithOpts(zitiCfg, options) - resolverConfig := cmd.Flag("resolver").Value.String() - resolver = dns.NewResolver(resolverConfig) dnsIpRange, _ := cmd.Flags().GetString(dnsSvcIpRangeFlag) if err = intercept.SetDnsInterceptIpRange(dnsIpRange); err != nil { log.Fatalf("invalid dns service IP range %s: %v", dnsIpRange, err) } - interceptor.Start(rootPrivateContext) - serviceListener = intercept.NewServiceListener(rootPrivateContext, interceptor, resolver) + interceptor.Start(tunnel.NewContextProvider(rootPrivateContext)) - go func() { - for event := range serviceEventsC { - serviceListener.HandleServicesChange(event.eventType, event.service) - } - }() if err = rootPrivateContext.Authenticate(); err != nil { log.WithError(err).Fatal("failed to authenticate") } From a1164f11165ce9d931487d2be8179cf74a9c53a8 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Tue, 2 Mar 2021 13:25:47 -0500 Subject: [PATCH 04/14] Support for transport dial timeouts (openziti/fabric#197) --- go.mod | 8 ++++---- go.sum | 2 ++ ziti-fabric-test/subcmd/loop2/dialer.go | 2 +- ziti-fabric-test/subcmd/loop3/dialer.go | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index b327a49ff..fd911e112 100644 --- a/go.mod +++ b/go.mod @@ -2,15 +2,15 @@ module github.com/openziti/ziti go 1.15 -//replace github.com/openziti/foundation => ../foundation +replace github.com/openziti/foundation => ../foundation //replace github.com/michaelquigley/dilithium => ../../q/research/dilithium -//replace github.com/openziti/fabric => ../fabric +replace github.com/openziti/fabric => ../fabric //replace github.com/openziti/sdk-golang => ../sdk-golang -//replace github.com/openziti/edge => ../edge +replace github.com/openziti/edge => ../edge require ( github.com/Jeffail/gabs v1.4.0 @@ -27,7 +27,7 @@ require ( github.com/michaelquigley/pfxlog v0.3.7 github.com/openziti/edge v0.19.10 github.com/openziti/fabric v0.16.14 - github.com/openziti/foundation v0.15.22 + github.com/openziti/foundation v0.15.23 github.com/openziti/sdk-golang v0.15.17 github.com/pborman/uuid v1.2.0 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index f929c2dc2..77bdea3dd 100644 --- a/go.sum +++ b/go.sum @@ -617,6 +617,8 @@ github.com/openziti/fabric v0.16.14/go.mod h1:WpPkQ3LV5TeTzM95APPORBhfTxELxvcMVS github.com/openziti/foundation v0.15.21/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= github.com/openziti/foundation v0.15.22 h1:t87jxnWHAtvqPZwpaHhKu0pDHGMVaJ2SuJLAA0i55e0= github.com/openziti/foundation v0.15.22/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= +github.com/openziti/foundation v0.15.23 h1:ZGVUcktC3HmEaradjwqjLETMysT8FG69GmYbBy6+3UY= +github.com/openziti/foundation v0.15.23/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= github.com/openziti/sdk-golang v0.15.17 h1:pwztxkMbZmjyGgsjKHgEzrHf8mXyGIM8JRmeVPlFP1g= github.com/openziti/sdk-golang v0.15.17/go.mod h1:022SpRRS9cl6AWmS/K0Df34ovurQGqvPJ6VSQrwE5BI= github.com/oracle/oci-go-sdk v24.2.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888= diff --git a/ziti-fabric-test/subcmd/loop2/dialer.go b/ziti-fabric-test/subcmd/loop2/dialer.go index 5e7b90391..62f7541e8 100644 --- a/ziti-fabric-test/subcmd/loop2/dialer.go +++ b/ziti-fabric-test/subcmd/loop2/dialer.go @@ -202,7 +202,7 @@ func (cmd *dialerCmd) connect() net.Conn { } func dialDirect(endpoint transport.Address, id *identity.TokenId) (net.Conn, error) { - peer, err := endpoint.Dial("loop", id, nil) + peer, err := endpoint.Dial("loop", id, 0, nil) if err != nil { return nil, err } diff --git a/ziti-fabric-test/subcmd/loop3/dialer.go b/ziti-fabric-test/subcmd/loop3/dialer.go index f9c4bf156..cfa549763 100644 --- a/ziti-fabric-test/subcmd/loop3/dialer.go +++ b/ziti-fabric-test/subcmd/loop3/dialer.go @@ -202,7 +202,7 @@ func (cmd *dialerCmd) connect() net.Conn { } func dialDirect(endpoint transport.Address, id *identity.TokenId) (net.Conn, error) { - peer, err := endpoint.Dial("loop", id, nil) + peer, err := endpoint.Dial("loop", id, 0, nil) if err != nil { return nil, err } From b6fa98e7d08cc9bed86a019d13ae4218ffe77c1f Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Tue, 2 Mar 2021 13:52:05 -0500 Subject: [PATCH 05/14] Timeout value for testing. (openziti/fabric#197) --- etc/003.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/003.yml b/etc/003.yml index d4c7b515b..e21ee86ea 100644 --- a/etc/003.yml +++ b/etc/003.yml @@ -36,3 +36,4 @@ dialers: retransmission: true randomDrops: false drop1InN: 5000 + connectTimeout: 2s From 8525048717c3e986d82b751a90b8ac168099c3ff Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Tue, 2 Mar 2021 16:30:09 -0500 Subject: [PATCH 06/14] Update dependencies for Xgress dial timeout. (openziti/fabric#197) --- go.mod | 12 ++++++------ go.sum | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index fd911e112..4158b7ae2 100644 --- a/go.mod +++ b/go.mod @@ -2,15 +2,15 @@ module github.com/openziti/ziti go 1.15 -replace github.com/openziti/foundation => ../foundation +//replace github.com/openziti/foundation => ../foundation //replace github.com/michaelquigley/dilithium => ../../q/research/dilithium -replace github.com/openziti/fabric => ../fabric +//replace github.com/openziti/fabric => ../fabric //replace github.com/openziti/sdk-golang => ../sdk-golang -replace github.com/openziti/edge => ../edge +//replace github.com/openziti/edge => ../edge require ( github.com/Jeffail/gabs v1.4.0 @@ -25,9 +25,9 @@ require ( github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 github.com/michaelquigley/pfxlog v0.3.7 - github.com/openziti/edge v0.19.10 - github.com/openziti/fabric v0.16.14 - github.com/openziti/foundation v0.15.23 + github.com/openziti/edge v0.19.13 + github.com/openziti/fabric v0.16.15 + github.com/openziti/foundation v0.15.24 github.com/openziti/sdk-golang v0.15.17 github.com/pborman/uuid v1.2.0 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 77bdea3dd..8eb3de345 100644 --- a/go.sum +++ b/go.sum @@ -447,6 +447,8 @@ github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqo github.com/jsimonetti/rtnetlink v0.0.0-20201216134343-bde56ed16391/go.mod h1:cR77jAZG3Y3bsb8hF6fHJbFoyFukLFOkQ98S0pQz3xw= github.com/jsimonetti/rtnetlink v0.0.0-20201220180245-69540ac93943 h1:REP5ibuxEIcBcG837UAei093pVqmOPm/tw0TbUd18YI= github.com/jsimonetti/rtnetlink v0.0.0-20201220180245-69540ac93943/go.mod h1:z4c53zj6Eex712ROyh8WI0ihysb5j2ROyV42iNogmAs= +github.com/jsimonetti/rtnetlink v0.0.0-20210122163228-8d122574c736/go.mod h1:ZXpIyOK59ZnN7J0BV99cZUPmsqDRZ3eq5X+st7u/oSA= +github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b/go.mod h1:8w9Rh8m+aHZIG69YPGGem1i5VzoyRC8nw2kA8B+ik5U= github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -534,6 +536,8 @@ github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43/go.mod h1:+t7E0lkKfbBsebllff1xdTmyJt8lH37niI6kwFk9OTo= +github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc= github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M= github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY= @@ -541,6 +545,9 @@ github.com/mdlayher/netlink v1.1.1/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZ github.com/mdlayher/netlink v1.2.0/go.mod h1:kwVW1io0AZy9A1E2YYgaD4Cj+C+GPkU6klXCMzIJ9p8= github.com/mdlayher/netlink v1.2.1 h1:Q5xDCtos3xv72vqzjuAh5Ns/IUlFfoy+948yBNSktTc= github.com/mdlayher/netlink v1.2.1/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU= +github.com/mdlayher/netlink v1.2.2-0.20210123213345-5cc92139ae3e/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU= +github.com/mdlayher/netlink v1.3.0/go.mod h1:xK/BssKuwcRXHrtN04UBkwQ6dY9VviGGuriDdoPSWys= +github.com/mdlayher/netlink v1.4.0/go.mod h1:dRJi5IABcZpBD2A3D0Mv/AiX8I9uDEu5oGkAVrekmf8= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/michaelquigley/dilithium v0.2.0 h1:JNVb9ckXDTAxYVpPHPzkBuXObh0TYymuZgAhZclcvAo= @@ -612,13 +619,17 @@ github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTm github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/openziti/edge v0.19.10 h1:7NASZ0b/L/X+eBycwvZIhD63i4MxNxrvRp8jp6oRq8Q= github.com/openziti/edge v0.19.10/go.mod h1:IYJ9PTAqA/Xqgp9ZhAfQseCUSJo4q1FhSZtxE9avAr8= +github.com/openziti/edge v0.19.13 h1:QQYYMoE1Zp6kFY3e2qYcLFx7fFUCaWhLwkWBpEwsQpQ= +github.com/openziti/edge v0.19.13/go.mod h1:oclw2QrJrS3DzXrr9VdfZ9OLIR6IA0BloI177y2CRWE= github.com/openziti/fabric v0.16.14 h1:5gD3THd4d0rq+MscJWSzrUKsy6BEuiEbnRU7YDtUUhQ= github.com/openziti/fabric v0.16.14/go.mod h1:WpPkQ3LV5TeTzM95APPORBhfTxELxvcMVSfuTXpheJU= +github.com/openziti/fabric v0.16.15/go.mod h1:09dVpKk1p45gGEv5GCnIxaQkpqaIyjEfZMZgTWhmM+k= github.com/openziti/foundation v0.15.21/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= github.com/openziti/foundation v0.15.22 h1:t87jxnWHAtvqPZwpaHhKu0pDHGMVaJ2SuJLAA0i55e0= github.com/openziti/foundation v0.15.22/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= github.com/openziti/foundation v0.15.23 h1:ZGVUcktC3HmEaradjwqjLETMysT8FG69GmYbBy6+3UY= github.com/openziti/foundation v0.15.23/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= +github.com/openziti/foundation v0.15.24/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= github.com/openziti/sdk-golang v0.15.17 h1:pwztxkMbZmjyGgsjKHgEzrHf8mXyGIM8JRmeVPlFP1g= github.com/openziti/sdk-golang v0.15.17/go.mod h1:022SpRRS9cl6AWmS/K0Df34ovurQGqvPJ6VSQrwE5BI= github.com/oracle/oci-go-sdk v24.2.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888= @@ -1001,6 +1012,9 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201218084310-7d0127a74742/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061 h1:DQmQoKxQWtyybCtX/3dIuDBcAhFszqq8YiNeS6sNu1c= golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210123111255-9b0068b26619/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1064,6 +1078,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= From e4340d13e93eeace0bb66b2a001e0cf2c359d607 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Tue, 2 Mar 2021 16:31:19 -0500 Subject: [PATCH 07/14] go mod tidy --- go.sum | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/go.sum b/go.sum index 8eb3de345..d97434c23 100644 --- a/go.sum +++ b/go.sum @@ -448,6 +448,7 @@ github.com/jsimonetti/rtnetlink v0.0.0-20201216134343-bde56ed16391/go.mod h1:cR7 github.com/jsimonetti/rtnetlink v0.0.0-20201220180245-69540ac93943 h1:REP5ibuxEIcBcG837UAei093pVqmOPm/tw0TbUd18YI= github.com/jsimonetti/rtnetlink v0.0.0-20201220180245-69540ac93943/go.mod h1:z4c53zj6Eex712ROyh8WI0ihysb5j2ROyV42iNogmAs= github.com/jsimonetti/rtnetlink v0.0.0-20210122163228-8d122574c736/go.mod h1:ZXpIyOK59ZnN7J0BV99cZUPmsqDRZ3eq5X+st7u/oSA= +github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b h1:c3NTyLNozICy8B4mlMXemD3z/gXgQzVXZS/HqT+i3do= github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b/go.mod h1:8w9Rh8m+aHZIG69YPGGem1i5VzoyRC8nw2kA8B+ik5U= github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -536,7 +537,9 @@ github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43 h1:WgyLFv10Ov49JAQI/ZLUkCZ7VJS3r74hwFIGXJsgZlY= github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43/go.mod h1:+t7E0lkKfbBsebllff1xdTmyJt8lH37niI6kwFk9OTo= +github.com/mdlayher/genetlink v1.0.0 h1:OoHN1OdyEIkScEmRgxLEe2M9U8ClMytqA5niynLtfj0= github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc= github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M= @@ -547,6 +550,7 @@ github.com/mdlayher/netlink v1.2.1 h1:Q5xDCtos3xv72vqzjuAh5Ns/IUlFfoy+948yBNSktT github.com/mdlayher/netlink v1.2.1/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU= github.com/mdlayher/netlink v1.2.2-0.20210123213345-5cc92139ae3e/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU= github.com/mdlayher/netlink v1.3.0/go.mod h1:xK/BssKuwcRXHrtN04UBkwQ6dY9VviGGuriDdoPSWys= +github.com/mdlayher/netlink v1.4.0 h1:n3ARR+Fm0dDv37dj5wSWZXDKcy+U0zwcXS3zKMnSiT0= github.com/mdlayher/netlink v1.4.0/go.mod h1:dRJi5IABcZpBD2A3D0Mv/AiX8I9uDEu5oGkAVrekmf8= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= @@ -617,18 +621,12 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openziti/edge v0.19.10 h1:7NASZ0b/L/X+eBycwvZIhD63i4MxNxrvRp8jp6oRq8Q= -github.com/openziti/edge v0.19.10/go.mod h1:IYJ9PTAqA/Xqgp9ZhAfQseCUSJo4q1FhSZtxE9avAr8= github.com/openziti/edge v0.19.13 h1:QQYYMoE1Zp6kFY3e2qYcLFx7fFUCaWhLwkWBpEwsQpQ= github.com/openziti/edge v0.19.13/go.mod h1:oclw2QrJrS3DzXrr9VdfZ9OLIR6IA0BloI177y2CRWE= -github.com/openziti/fabric v0.16.14 h1:5gD3THd4d0rq+MscJWSzrUKsy6BEuiEbnRU7YDtUUhQ= -github.com/openziti/fabric v0.16.14/go.mod h1:WpPkQ3LV5TeTzM95APPORBhfTxELxvcMVSfuTXpheJU= +github.com/openziti/fabric v0.16.15 h1:NKlQF6YjnRD3XL9KZdIcgw0PSo5TzS/JYZrbsDQTaJA= github.com/openziti/fabric v0.16.15/go.mod h1:09dVpKk1p45gGEv5GCnIxaQkpqaIyjEfZMZgTWhmM+k= github.com/openziti/foundation v0.15.21/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= -github.com/openziti/foundation v0.15.22 h1:t87jxnWHAtvqPZwpaHhKu0pDHGMVaJ2SuJLAA0i55e0= -github.com/openziti/foundation v0.15.22/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= -github.com/openziti/foundation v0.15.23 h1:ZGVUcktC3HmEaradjwqjLETMysT8FG69GmYbBy6+3UY= -github.com/openziti/foundation v0.15.23/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= +github.com/openziti/foundation v0.15.24 h1:51+14rNoOnHQA22BWfWVc7ClIFCHNvtEHbPxr96NdBQ= github.com/openziti/foundation v0.15.24/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= github.com/openziti/sdk-golang v0.15.17 h1:pwztxkMbZmjyGgsjKHgEzrHf8mXyGIM8JRmeVPlFP1g= github.com/openziti/sdk-golang v0.15.17/go.mod h1:022SpRRS9cl6AWmS/K0Df34ovurQGqvPJ6VSQrwE5BI= @@ -1014,6 +1012,7 @@ golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061 h1:DQmQoKxQWtyybCtX/3dIuDBcA golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210123111255-9b0068b26619/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65 h1:pTMjDVnP5eVRRlWO76rEWJ8JoC6Lf1CmyjPZXRiy2Sw= golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1078,6 +1077,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= From 4e7e1ea1a469f07b1d8f8c6c69cf3371e9037e58 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Tue, 2 Mar 2021 16:33:39 -0500 Subject: [PATCH 08/14] CHANGELOG. --- CHANGELOG.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 655e35ea9..45e3691bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +# Release 0.19.5 + +## What's New + +* Support configurable timeout on Xgress dial operations. Router terminated services can now specify a short timeout for dial operations. + +## Xgress Dial Timeout + +Specify the dial timeout for Xgress dialers using the following syntax: + +``` +dialers: + - binding: transport + options: + connectTimeout: 2s +``` + +You will need to specify Xgress options for each dialer binding that you want to use with your configuration. + # Release 0.19.4 ## What's New From 1df6104dbab7b246418d9dfa1ae7f8ea0ac06607 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Tue, 2 Mar 2021 16:39:48 -0500 Subject: [PATCH 09/14] ->0.19.4 --- CHANGELOG.md | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45e3691bd..b1e795f4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,27 +1,9 @@ -# Release 0.19.5 - -## What's New - -* Support configurable timeout on Xgress dial operations. Router terminated services can now specify a short timeout for dial operations. - -## Xgress Dial Timeout - -Specify the dial timeout for Xgress dialers using the following syntax: - -``` -dialers: - - binding: transport - options: - connectTimeout: 2s -``` - -You will need to specify Xgress options for each dialer binding that you want to use with your configuration. - # Release 0.19.4 ## What's New * Link latency probe timeout parameter in router configuration. +* Support configurable timeout on Xgress dial operations. Router terminated services can now specify a short timeout for dial operations. * Fix 0.19 regression: updating terminator cost/precedence from the sdk was broken * Fix 0.19 regression: fabric session client id was incorrectly set to edge session token instead of id @@ -39,6 +21,19 @@ forwarder: latencyProbeTimeout: 10000 ``` +## Xgress Dial Timeout + +Specify the dial timeout for Xgress dialers using the following syntax: + +``` +dialers: + - binding: transport + options: + connectTimeout: 2s +``` + +You will need to specify Xgress options for each dialer binding that you want to use with your configuration. + # Release 0.19.3 ## What's New From 6917590d1c514b8ce223fd3adba846c31f75aceb Mon Sep 17 00:00:00 2001 From: Andrew Martinez Date: Fri, 5 Mar 2021 10:21:34 -0500 Subject: [PATCH 10/14] update deps, change log for mfa secret length --- CHANGELOG.md | 1 + go.mod | 4 ++-- go.sum | 11 ++++------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1e795f4d..715f5401e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * Fix 0.19 regression: updating terminator cost/precedence from the sdk was broken * Fix 0.19 regression: fabric session client id was incorrectly set to edge session token instead of id +* Fix MFA secret length, lowered from 80 bytes to 80 bits ## Link Latency Probe Timeout diff --git a/go.mod b/go.mod index 4158b7ae2..c3c1aab13 100644 --- a/go.mod +++ b/go.mod @@ -25,9 +25,9 @@ require ( github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 github.com/michaelquigley/pfxlog v0.3.7 - github.com/openziti/edge v0.19.13 + github.com/openziti/edge v0.19.16 github.com/openziti/fabric v0.16.15 - github.com/openziti/foundation v0.15.24 + github.com/openziti/foundation v0.15.26 github.com/openziti/sdk-golang v0.15.17 github.com/pborman/uuid v1.2.0 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index d97434c23..53a1f66fa 100644 --- a/go.sum +++ b/go.sum @@ -445,7 +445,6 @@ github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+ github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ= github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok= github.com/jsimonetti/rtnetlink v0.0.0-20201216134343-bde56ed16391/go.mod h1:cR77jAZG3Y3bsb8hF6fHJbFoyFukLFOkQ98S0pQz3xw= -github.com/jsimonetti/rtnetlink v0.0.0-20201220180245-69540ac93943 h1:REP5ibuxEIcBcG837UAei093pVqmOPm/tw0TbUd18YI= github.com/jsimonetti/rtnetlink v0.0.0-20201220180245-69540ac93943/go.mod h1:z4c53zj6Eex712ROyh8WI0ihysb5j2ROyV42iNogmAs= github.com/jsimonetti/rtnetlink v0.0.0-20210122163228-8d122574c736/go.mod h1:ZXpIyOK59ZnN7J0BV99cZUPmsqDRZ3eq5X+st7u/oSA= github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b h1:c3NTyLNozICy8B4mlMXemD3z/gXgQzVXZS/HqT+i3do= @@ -546,7 +545,6 @@ github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqc github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY= github.com/mdlayher/netlink v1.1.1/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o= github.com/mdlayher/netlink v1.2.0/go.mod h1:kwVW1io0AZy9A1E2YYgaD4Cj+C+GPkU6klXCMzIJ9p8= -github.com/mdlayher/netlink v1.2.1 h1:Q5xDCtos3xv72vqzjuAh5Ns/IUlFfoy+948yBNSktTc= github.com/mdlayher/netlink v1.2.1/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU= github.com/mdlayher/netlink v1.2.2-0.20210123213345-5cc92139ae3e/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU= github.com/mdlayher/netlink v1.3.0/go.mod h1:xK/BssKuwcRXHrtN04UBkwQ6dY9VviGGuriDdoPSWys= @@ -621,13 +619,14 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openziti/edge v0.19.13 h1:QQYYMoE1Zp6kFY3e2qYcLFx7fFUCaWhLwkWBpEwsQpQ= -github.com/openziti/edge v0.19.13/go.mod h1:oclw2QrJrS3DzXrr9VdfZ9OLIR6IA0BloI177y2CRWE= +github.com/openziti/edge v0.19.16 h1:TP/9ebvp7Cz6W2gIuGuumEg97gkeMrlbheiBTvFn334= +github.com/openziti/edge v0.19.16/go.mod h1:1qoklfHl1qVBvVCOYAJi0P8e2vvcNnfLJWCa3+mzLU8= github.com/openziti/fabric v0.16.15 h1:NKlQF6YjnRD3XL9KZdIcgw0PSo5TzS/JYZrbsDQTaJA= github.com/openziti/fabric v0.16.15/go.mod h1:09dVpKk1p45gGEv5GCnIxaQkpqaIyjEfZMZgTWhmM+k= github.com/openziti/foundation v0.15.21/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= -github.com/openziti/foundation v0.15.24 h1:51+14rNoOnHQA22BWfWVc7ClIFCHNvtEHbPxr96NdBQ= github.com/openziti/foundation v0.15.24/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= +github.com/openziti/foundation v0.15.26 h1:SXIPK+NIT/UgOTxuu4D0eMjJhFo7/Uj1TZ0kJg7UXX8= +github.com/openziti/foundation v0.15.26/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= github.com/openziti/sdk-golang v0.15.17 h1:pwztxkMbZmjyGgsjKHgEzrHf8mXyGIM8JRmeVPlFP1g= github.com/openziti/sdk-golang v0.15.17/go.mod h1:022SpRRS9cl6AWmS/K0Df34ovurQGqvPJ6VSQrwE5BI= github.com/oracle/oci-go-sdk v24.2.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888= @@ -1008,7 +1007,6 @@ golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201118182958-a01c418693c7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201218084310-7d0127a74742/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061 h1:DQmQoKxQWtyybCtX/3dIuDBcAhFszqq8YiNeS6sNu1c= golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210123111255-9b0068b26619/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1075,7 +1073,6 @@ golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 1211ec89ec1603ff748394530b965ab3ddc22bee Mon Sep 17 00:00:00 2001 From: Andrew Martinez Date: Fri, 5 Mar 2021 10:44:32 -0500 Subject: [PATCH 11/14] update to latest edge again --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c3c1aab13..a7e990af2 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 github.com/michaelquigley/pfxlog v0.3.7 - github.com/openziti/edge v0.19.16 + github.com/openziti/edge v0.19.17 github.com/openziti/fabric v0.16.15 github.com/openziti/foundation v0.15.26 github.com/openziti/sdk-golang v0.15.17 diff --git a/go.sum b/go.sum index 53a1f66fa..8757d1f15 100644 --- a/go.sum +++ b/go.sum @@ -619,8 +619,8 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openziti/edge v0.19.16 h1:TP/9ebvp7Cz6W2gIuGuumEg97gkeMrlbheiBTvFn334= -github.com/openziti/edge v0.19.16/go.mod h1:1qoklfHl1qVBvVCOYAJi0P8e2vvcNnfLJWCa3+mzLU8= +github.com/openziti/edge v0.19.17 h1:+UANCCkbYq9+H3m7JftU5Eij/3alWeYbqzVjCbgz+Ec= +github.com/openziti/edge v0.19.17/go.mod h1:1qoklfHl1qVBvVCOYAJi0P8e2vvcNnfLJWCa3+mzLU8= github.com/openziti/fabric v0.16.15 h1:NKlQF6YjnRD3XL9KZdIcgw0PSo5TzS/JYZrbsDQTaJA= github.com/openziti/fabric v0.16.15/go.mod h1:09dVpKk1p45gGEv5GCnIxaQkpqaIyjEfZMZgTWhmM+k= github.com/openziti/foundation v0.15.21/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= From 473a9b653d51020f186cf8edb81471a0e50b3fa6 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Mon, 8 Mar 2021 16:04:50 -0500 Subject: [PATCH 12/14] Update changelog and deps --- CHANGELOG.md | 8 ++++++-- go.mod | 10 +++++----- go.sum | 21 ++++++++++----------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 715f5401e..856006dc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,11 +3,14 @@ ## What's New * Link latency probe timeout parameter in router configuration. -* Support configurable timeout on Xgress dial operations. Router terminated services can now specify a short timeout for dial operations. +* Support configurable timeout on Xgress dial operations. Router terminated services can now specify + a short timeout for dial operations. * Fix 0.19 regression: updating terminator cost/precedence from the sdk was broken * Fix 0.19 regression: fabric session client id was incorrectly set to edge session token instead of id * Fix MFA secret length, lowered from 80 bytes to 80 bits +* Ensure that negative lengths in message headers are properly handled +* Fix panic when updating session activity for removed session ## Link Latency Probe Timeout @@ -33,7 +36,8 @@ dialers: connectTimeout: 2s ``` -You will need to specify Xgress options for each dialer binding that you want to use with your configuration. +You will need to specify Xgress options for each dialer binding that you want to use with your +configuration. # Release 0.19.3 diff --git a/go.mod b/go.mod index a7e990af2..de0e34fef 100644 --- a/go.mod +++ b/go.mod @@ -20,15 +20,15 @@ require ( github.com/go-acme/lego/v4 v4.2.0 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b github.com/golang/protobuf v1.4.3 - github.com/google/go-cmp v0.5.4 + github.com/google/go-cmp v0.5.5 github.com/gorilla/mux v1.8.0 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 github.com/michaelquigley/pfxlog v0.3.7 - github.com/openziti/edge v0.19.17 - github.com/openziti/fabric v0.16.15 - github.com/openziti/foundation v0.15.26 - github.com/openziti/sdk-golang v0.15.17 + github.com/openziti/edge v0.19.19 + github.com/openziti/fabric v0.16.18 + github.com/openziti/foundation v0.15.34 + github.com/openziti/sdk-golang v0.15.20 github.com/pborman/uuid v1.2.0 github.com/pkg/errors v0.9.1 github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 diff --git a/go.sum b/go.sum index 8757d1f15..780038ec2 100644 --- a/go.sum +++ b/go.sum @@ -352,8 +352,9 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -619,16 +620,14 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openziti/edge v0.19.17 h1:+UANCCkbYq9+H3m7JftU5Eij/3alWeYbqzVjCbgz+Ec= -github.com/openziti/edge v0.19.17/go.mod h1:1qoklfHl1qVBvVCOYAJi0P8e2vvcNnfLJWCa3+mzLU8= -github.com/openziti/fabric v0.16.15 h1:NKlQF6YjnRD3XL9KZdIcgw0PSo5TzS/JYZrbsDQTaJA= -github.com/openziti/fabric v0.16.15/go.mod h1:09dVpKk1p45gGEv5GCnIxaQkpqaIyjEfZMZgTWhmM+k= -github.com/openziti/foundation v0.15.21/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= -github.com/openziti/foundation v0.15.24/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= -github.com/openziti/foundation v0.15.26 h1:SXIPK+NIT/UgOTxuu4D0eMjJhFo7/Uj1TZ0kJg7UXX8= -github.com/openziti/foundation v0.15.26/go.mod h1:e5SiDK0Hfz5RJvhEbvWMHMqmVzm8AvFRHC5fqUigoNU= -github.com/openziti/sdk-golang v0.15.17 h1:pwztxkMbZmjyGgsjKHgEzrHf8mXyGIM8JRmeVPlFP1g= -github.com/openziti/sdk-golang v0.15.17/go.mod h1:022SpRRS9cl6AWmS/K0Df34ovurQGqvPJ6VSQrwE5BI= +github.com/openziti/edge v0.19.19 h1:mFC9PWXAYEMAE7/WpDjzWMXn2zZV+ZFuKLG+QwahwLQ= +github.com/openziti/edge v0.19.19/go.mod h1:e5V/ZJV2aMa438xr/S8wA40yS2wJqAfoLGzBk4/0SeM= +github.com/openziti/fabric v0.16.18 h1:TmLj/u/OMyaJBdEMrQKIx47beA1c4pgtmcDlXyHfAxk= +github.com/openziti/fabric v0.16.18/go.mod h1:/g6H+zok0pmEi7/zraKfBs1sONykq4WTlWe9+c+aLhM= +github.com/openziti/foundation v0.15.34 h1:okFeo44my2ZB8Vc2uf/7BkVy63X4b3eRS+IBkklVhow= +github.com/openziti/foundation v0.15.34/go.mod h1:0vyGpNqnK/WuVhUE1Kfq+UvCWIf/rUYViMrCrCZ2cTc= +github.com/openziti/sdk-golang v0.15.20 h1:LxjXJdc13xL0cpWeUZ6KdkjAtxKhGGRC3fOmTwOZu5E= +github.com/openziti/sdk-golang v0.15.20/go.mod h1:0ddE24WVTng/SCOmQTszXvKbzANWQbosJ8pRRarCFLg= github.com/oracle/oci-go-sdk v24.2.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888= github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI= github.com/orcaman/concurrent-map v0.0.0-20210106121528-16402b402231 h1:fa50YL1pzKW+1SsBnJDOHppJN9stOEwS+CRWyUtyYGU= From c332055a8bcec2f851317e69dce67351a21c858e Mon Sep 17 00:00:00 2001 From: Andrew Martinez Date: Mon, 8 Mar 2021 16:44:14 -0500 Subject: [PATCH 13/14] deps and log --- CHANGELOG.md | 1 + go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 856006dc4..f57fb9a45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ * Fix MFA secret length, lowered from 80 bytes to 80 bits * Ensure that negative lengths in message headers are properly handled * Fix panic when updating session activity for removed session +* Fix panic when shared router state is used when a router disconnects or reconnects ## Link Latency Probe Timeout diff --git a/go.mod b/go.mod index de0e34fef..8ed39df3c 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 github.com/michaelquigley/pfxlog v0.3.7 - github.com/openziti/edge v0.19.19 + github.com/openziti/edge v0.19.20 github.com/openziti/fabric v0.16.18 github.com/openziti/foundation v0.15.34 github.com/openziti/sdk-golang v0.15.20 diff --git a/go.sum b/go.sum index 780038ec2..6109af4d1 100644 --- a/go.sum +++ b/go.sum @@ -620,8 +620,8 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openziti/edge v0.19.19 h1:mFC9PWXAYEMAE7/WpDjzWMXn2zZV+ZFuKLG+QwahwLQ= -github.com/openziti/edge v0.19.19/go.mod h1:e5V/ZJV2aMa438xr/S8wA40yS2wJqAfoLGzBk4/0SeM= +github.com/openziti/edge v0.19.20 h1:b8a/rGmhY9Ai2sOv+sOffsGt1j6QSQ9xIMU4X2gGihY= +github.com/openziti/edge v0.19.20/go.mod h1:e5V/ZJV2aMa438xr/S8wA40yS2wJqAfoLGzBk4/0SeM= github.com/openziti/fabric v0.16.18 h1:TmLj/u/OMyaJBdEMrQKIx47beA1c4pgtmcDlXyHfAxk= github.com/openziti/fabric v0.16.18/go.mod h1:/g6H+zok0pmEi7/zraKfBs1sONykq4WTlWe9+c+aLhM= github.com/openziti/foundation v0.15.34 h1:okFeo44my2ZB8Vc2uf/7BkVy63X4b3eRS+IBkklVhow= From a0592c66fece0ace584dab31e05f7f606b50e704 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Mon, 8 Mar 2021 17:18:34 -0500 Subject: [PATCH 14/14] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f57fb9a45..35ceb08fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ * Ensure that negative lengths in message headers are properly handled * Fix panic when updating session activity for removed session * Fix panic when shared router state is used when a router disconnects or reconnects +* Additional garbage collection for parallel route algorithm, removes successful routes created during failed attempts, after final successful attempt. ## Link Latency Probe Timeout