Merge pull request #578 from openziti/release-next

Release 0.24.4

CHANGELOG.md

@@ -1,3 +1,26 @@
+# Release 0.24.4
+
+## What's New
+
+* Enhancement: Cache sessions for the router/tunneler, to minimize the creation of unnecessary sessions
+* Enhancement: Add send timeouts for route messages
+* Enhancement: Add write timeout configuration for control channel
+* Enhancement: API Session and Session deletes are now separate and eventually consistent
+* Enhancement: API Session synchronization with routers no longer blocks database transactions
+* Bug fix: fix message priority sorting
+
+## Control Channel Timeouts
+
+The controller config file now allows setting a write timeout for control channel connections. If a control channel write times out, because the connection is in a bad state or because a router is in a bad state, the control channel will be closed. This will allow the router to reconnect.
+
+```
+ctrl:
+  listener:             tls:127.0.0.1:6262
+    options:
+      # Sets the control channel write timeout. A write timeout will close the control channel, so the router will reconnect
+      writeTimeout: 15s
+``` 
+
 # Release 0.24.3
 
 ## What's New
@@ -7,16 +30,19 @@
 * Enhancement: New metric `identity.refresh` which counts how often an identity should have to refresh the service list because of a service, config or policy change
 * Enhancement: Edge REST services will now set the content-length on response, which will prevent response from being chunked
 * Enhancement: Edge REST API calls will now show in metrics in the format of <path>.<method>
+* Bug fix: fix controller panic during circuit creation if router is unexpectedly deleted during routing
 
 # Release 0.24.2
 
 ## What's New
 
 * Bug fix: link verification could panic if link was established before control was finished establishing
 * Bug fix: When checking edge terminator validity in the router, check terminator id as well the address
+* Bug fix: xweb uses idleTimeout correctly, was previously using writeTimeout instead
 * Enhancement: Improve logging around links in routers. Ensure we close both channels when closing a split link
 * Enhancement: Add support for inspect in `ziti fabric`. Works the same as `ziti-fabric inspect`
 
+
 # Release 0.24.1
 
 ## What's New

etc/ctrl.with.edge.yml

@@ -20,14 +20,16 @@ identity:
 # the endpoint that routers will connect to the controller over.
 ctrl:
   listener: tls:127.0.0.1:6262
-  #options:
+  # options:
   # (optional) settings
   # set the maximum number of connect requests that are buffered and waiting to be acknowledged (1 to 5000, default 1000)
   #maxQueuedConnects:      50
   # the maximum number of connects that have  begun hello synchronization (1 to 1000, default 16)
   #maxOutstandingConnects: 100
   # the number of milliseconds to wait before a hello synchronization fails and closes the connection (30ms to 60000ms, default: 1000ms)
   #connectTimeoutMs:       3000
+  # Sets the control channel write timeout. A write timeout will close the control channel, so the router will reconnect
+  #writeTimeout: 15s
 
 # the endpoint that management tools connect to the controller over.
 mgmt:

etc/ctrl.yml

@@ -106,6 +106,9 @@ ctrl:
       #maxOutstandingConnects: 100
       # the number of milliseconds to wait before a hello synchronization fails and closes the connection (30ms to 60000ms, default: 1000ms)
       #connectTimeoutMs:       3000
+      # Sets the control channel write timeout. A write timeout will close the control channel, so the router will reconnect
+      #writeTimeout: 15s
+
 
 # Management Channel Configuration
 #

go.mod

@@ -26,30 +26,30 @@ require (
 	github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa
 	github.com/go-acme/lego/v4 v4.2.0
 	github.com/go-openapi/runtime v0.21.0
-	github.com/go-openapi/strfmt v0.21.0
+	github.com/go-openapi/strfmt v0.21.1
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	github.com/golang/protobuf v1.5.2
 	github.com/google/go-cmp v0.5.6
 	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.6.3
-	github.com/openziti/edge v0.21.31
-	github.com/openziti/fabric v0.17.12
-	github.com/openziti/foundation v0.16.9
-	github.com/openziti/sdk-golang v0.15.125
+	github.com/openziti/edge v0.21.50
+	github.com/openziti/fabric v0.17.19
+	github.com/openziti/foundation v0.16.14
+	github.com/openziti/sdk-golang v0.15.131
 	github.com/pborman/uuid v1.2.0
 	github.com/pkg/errors v0.9.1
 	github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0
 	github.com/russross/blackfriday v1.5.2
-	github.com/shirou/gopsutil v2.20.9+incompatible
+	github.com/shirou/gopsutil v2.21.11+incompatible
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.3.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.10.0
 	github.com/stretchr/testify v1.7.0
 	github.com/valyala/fasttemplate v1.2.1
 	go.etcd.io/bbolt v1.3.5-0.20200615073812-232d8fc87f50
-	golang.org/x/net v0.0.0-20211029224645-99673261e6eb
+	golang.org/x/net v0.0.0-20211209124913-491a49abca63
 	google.golang.org/grpc v1.42.0
 	gopkg.in/AlecAivazis/survey.v1 v1.8.7
 	gopkg.in/resty.v1 v1.12.0
@@ -59,10 +59,10 @@ require (
 
 require (
 	github.com/AppsFlyer/go-sundheit v0.5.0 // indirect
+	github.com/BurntSushi/toml v0.4.1 // indirect
 	github.com/MichaelMure/go-term-text v0.3.1 // indirect
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
-	github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
 	github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20211106181442-e4c1a74c66bd // indirect
 	github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef // indirect
 	github.com/biogo/store v0.0.0-20200525035639-8c94ae1e7c9c // indirect
@@ -80,7 +80,7 @@ require (
 	github.com/emirpasic/gods v1.12.0 // indirect
 	github.com/felixge/httpsnoop v1.0.1 // indirect
 	github.com/fsnotify/fsnotify v1.5.1 // indirect
-	github.com/go-ole/go-ole v1.2.5 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-openapi/analysis v0.20.1 // indirect
 	github.com/go-openapi/errors v0.20.1 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
@@ -97,6 +97,7 @@ require (
 	github.com/gorilla/handlers v1.5.1 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/jessevdk/go-flags v1.5.0 // indirect
@@ -116,11 +117,11 @@ require (
 	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-runewidth v0.0.12 // indirect
-	github.com/mdlayher/netlink v1.4.1 // indirect
-	github.com/mdlayher/socket v0.0.0-20210307095302-262dc9984e00 // indirect
+	github.com/mdlayher/netlink v1.5.0 // indirect
+	github.com/mdlayher/socket v0.1.0 // indirect
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
 	github.com/miekg/dns v1.1.45 // indirect
-	github.com/miekg/pkcs11 v1.0.3 // indirect
+	github.com/miekg/pkcs11 v1.1.1 // indirect
 	github.com/mitchellh/go-ps v1.0.0 // indirect
 	github.com/mitchellh/mapstructure v1.4.3 // indirect
 	github.com/natefinch/lumberjack v2.0.0+incompatible // indirect
@@ -141,27 +142,31 @@ require (
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/subosito/gotenv v1.2.0 // indirect
 	github.com/teris-io/shortid v0.0.0-20201117134242-e59966efd125 // indirect
+	github.com/tklauser/go-sysconf v0.3.9 // indirect
+	github.com/tklauser/numcpus v0.3.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	go.mongodb.org/mongo-driver v1.7.3 // indirect
+	github.com/yusufpapurcu/wmi v1.2.2 // indirect
+	go.mongodb.org/mongo-driver v1.7.5 // indirect
 	go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1 // indirect
 	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
 	golang.org/x/image v0.0.0-20191206065243-da761ea9ff43 // indirect
-	golang.org/x/mod v0.5.0 // indirect
+	golang.org/x/mod v0.5.1 // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
+	golang.org/x/sys v0.0.0-20211210111614-af8b64212486 // indirect
 	golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
 	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2 // indirect
+	golang.org/x/tools v0.1.7 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
 	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/ini.v1 v1.66.2 // indirect
 	gopkg.in/square/go-jose.v2 v2.5.1 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	honnef.co/go/tools v0.2.2 // indirect
 )
 
 require (