Skip to content

WPB-10985 crlProxy attribute missing from mls E2EID team config #4239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
battermann merged 1 commit into from
Sep 16, 2024
Merged

WPB-10985 crlProxy attribute missing from mls E2EID team config #4239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions hack/helm_vars/wire-server/values.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,14 @@ galley:
usersThreshold: 100
clientsThreshold: 50
lockStatus: locked
mlsE2EId:
defaults:
status: disabled
config:
verificationExpiration: 86400
acmeDiscoveryUrl: null
crlProxy: https://crlproxy.example.com
lockStatus: unlocked
limitedEventFanout:
defaults:
status: disabled
Expand Down
15 changes: 11 additions & 4 deletions integration/test/Test/FeatureFlags.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,11 @@ testMlsE2EConfigCrlProxyNotRequiredInV5 = do
resp.status `shouldMatchInt` 200

-- Assert that the feature config got updated correctly
expectedResponse <- configWithoutCrlProxy & setField "lockStatus" "unlocked" & setField "ttl" "unlimited"
expectedResponse <-
configWithoutCrlProxy
& setField "lockStatus" "unlocked"
& setField "ttl" "unlimited"
& setField "config.crlProxy" "https://crlproxy.example.com"
checkFeature "mlsE2EId" owner tid expectedResponse

testSSODisabledByDefault :: HasCallStack => App ()
Expand Down Expand Up @@ -346,7 +350,8 @@ testAllFeatures = do
"config"
.= object
[ "verificationExpiration" .= A.Number 86400,
"useProxyOnMobile" .= False
"useProxyOnMobile" .= False,
"crlProxy" .= "https://crlproxy.example.com"
]
],
"mlsMigration"
Expand Down Expand Up @@ -631,7 +636,8 @@ mlsE2EIdConfig = do
"config"
.= object
[ "verificationExpiration" .= A.Number 86400,
"useProxyOnMobile" .= False
"useProxyOnMobile" .= False,
"crlProxy" .= "https://crlproxy.example.com"
]
]
mlsE2EIdConfig1 :: Value
Expand Down Expand Up @@ -913,7 +919,8 @@ testPatchE2EId = do
"config"
.= object
[ "verificationExpiration" .= A.Number 86400,
"useProxyOnMobile" .= False
"useProxyOnMobile" .= False,
"crlProxy" .= "https://crlproxy.example.com"
]
]
_testPatch "mlsE2EId" True defCfg (object ["lockStatus" .= "locked"])
Expand Down
1 change: 1 addition & 0 deletions services/galley/galley.integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ settings:
config:
verificationExpiration: 86400
acmeDiscoveryUrl: null
crlProxy: https://crlproxy.example.com
lockStatus: unlocked
mlsMigration:
defaults:
Expand Down
4 changes: 2 additions & 2 deletions services/galley/src/Galley/Cassandra/GetAllTeamFeatureConfigs.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,8 +372,8 @@ instance MakeFeature MlsE2EIdConfig where
defCfg
{ verificationExpiration =
maybe defCfg.verificationExpiration fromIntegral gracePeriod,
acmeDiscoveryUrl = acmeDiscoveryUrl,
crlProxy = crlProxy,
acmeDiscoveryUrl = acmeDiscoveryUrl <|> defCfg.acmeDiscoveryUrl,
crlProxy = crlProxy <|> defCfg.crlProxy,
useProxyOnMobile = fromMaybe defCfg.useProxyOnMobile useProxyOnMobile
}
)
Expand Down