gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-10-14 08:10:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #246 from openziti/fix-fingerprint-incompatibility

Browse Source 
Allow 0.15+ edge routers to work with older controllers. Fixes GH-245
This commit is contained in:
Paul Lorenz
2020-07-20 15:52:02 -04:00
committed by GitHub
parent 611f28f767 67592a2c47
commit a1cf4c44c7
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gateway/internal/fabric/manager.go
+13
View File
@@ -22,6 +22,7 @@ import (
"github.com/openziti/edge/pb/edge_ctrl_pb"
"github.com/openziti/edge/runner"
"github.com/openziti/foundation/channel2"
"strings"
"sync"
"time"
)
@@ -137,12 +138,24 @@ func (sm *StateManagerImpl) RemoveMissingApiSessions(knownSessions []*edge_ctrl_
}
func (sm *StateManagerImpl) AddSession(ns *edge_ctrl_pb.Session) {
// BACKWARDS_COMPATIBILITY introduced 0.15.2
// support 0.14 (and older) style controller generated fingerprints, as fingerprint format changed from 0.14 to 0.15
for i := 0; i < len(ns.CertFingerprints); i++ {
ns.CertFingerprints[i] = strings.Replace(strings.ToLower(ns.CertFingerprints[i]), ":", "", -1)
}
pfxlog.Logger().Debugf("adding network session [%s] fingerprints [%s] TypeId [%v]", ns.Token, ns.CertFingerprints, ns.Type.String())
sm.networkSessionsByToken.Store(ns.Token, ns)
sm.Emit(EventAddedNetworkSession, ns)
}
func (sm *StateManagerImpl) UpdateSession(ns *edge_ctrl_pb.Session) {
// BACKWARDS_COMPATIBILITY introduced 0.15.2
// support 0.14 (and older) style controller generated fingerprints, as fingerprint format changed from 0.14 to 0.15
for i := 0; i < len(ns.CertFingerprints); i++ {
ns.CertFingerprints[i] = strings.Replace(strings.ToLower(ns.CertFingerprints[i]), ":", "", -1)
}
pfxlog.Logger().Debugf("updating network session [%s] fingerprints [%s]", ns.Token, ns.CertFingerprints)
sm.networkSessionsByToken.Store(ns.Token, ns)
sm.Emit(EventUpdatedNetworkSession, ns)