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

Merge pull request #722 from openziti/alters.legacy.client.logic

Browse Source 
assume legacy unless c-sdk
This commit is contained in:
Andrew
2021-07-23 10:10:05 -04:00
committed by GitHub
parent 20017f5a08 329a18af87
commit 6e6ed13896
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/model/posture_check_model_mfa.go
+8 -2
View File
@@ -42,13 +42,19 @@ type PostureCheckMfa struct {
}
func (p *PostureCheckMfa) IsLegacyClient(apiSessionData *ApiSessionPostureData) bool {
if apiSessionData.SdkInfo != nil && apiSessionData.SdkInfo.Type == ZitiSdkTypeC {
if apiSessionData.SdkInfo == nil {
return true // don't know what it is
}
//c-sdk, return true/false based on version
if apiSessionData.SdkInfo.Type == ZitiSdkTypeC {
if ver, err := semver.Parse(apiSessionData.SdkInfo.Version); err == nil {
return ver.LT(minCSdkVersion)
}
}
return false
//else not sure what it is return true
return true
}
func (p *PostureCheckMfa) GetTimeoutSeconds() int64 {
controller/model/posture_check_model_mfa_test.go
+6 -6
View File
@@ -437,7 +437,7 @@ func TestPostureCheckModelMfa(t *testing.T) {
req.True(result)
})
t.Run("returns false for missing type and 0.24.4", func(t *testing.T) {
t.Run("returns true for missing type and 0.24.4", func(t *testing.T) {
mfaCheck, postureData := newMfaCheckAndPostureData()
apiSessionData := postureData.ApiSessions[mfaTestApiSessionId]
apiSessionData.SdkInfo.Version = "0.24.4"
@@ -445,7 +445,7 @@ func TestPostureCheckModelMfa(t *testing.T) {
result := mfaCheck.IsLegacyClient(postureData.ApiSessions[mfaTestApiSessionId])
req := require.New(t)
req.False(result)
req.True(result)
})
t.Run("returns false for ziti-sdk-c and 1.0.0", func(t *testing.T) {
@@ -458,24 +458,24 @@ func TestPostureCheckModelMfa(t *testing.T) {
req.False(result)
})
t.Run("returns false if sdk info is nil", func(t *testing.T) {
t.Run("returns true if sdk info is nil", func(t *testing.T) {
mfaCheck, postureData := newMfaCheckAndPostureData()
apiSessionData := postureData.ApiSessions[mfaTestApiSessionId]
apiSessionData.SdkInfo = nil
result := mfaCheck.IsLegacyClient(postureData.ApiSessions[mfaTestApiSessionId])
req := require.New(t)
req.False(result)
req.True(result)
})
t.Run("returns false if for ziti-sdk-c and an invalid version", func(t *testing.T) {
t.Run("returns true if for ziti-sdk-c and an invalid version", func(t *testing.T) {
mfaCheck, postureData := newMfaCheckAndPostureData()
apiSessionData := postureData.ApiSessions[mfaTestApiSessionId]
apiSessionData.SdkInfo.Version = "weeeeeee"
result := mfaCheck.IsLegacyClient(postureData.ApiSessions[mfaTestApiSessionId])
req := require.New(t)
req.False(result)
req.True(result)
})
})