IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[CLD-7046] Ability to disable self hosted server-side requests to CWS (#26070)

Browse Source 
* Add 'Disable' config to CloudSettings to prevent the CWS backend from making calls to the Customer Portal

* Add custom error when disabled

* Make Disable setting cloud_restrictable

* Return 422 instead of 400

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
This commit is contained in:
Nick Misasi 2024-02-28 11:53:19 -05:00 committed by GitHub
parent 9ffec5eab6
commit 9e99280a40
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/channels/api4/cloud.go
View File

@ -65,10 +65,15 @@ func (api *API) InitCloud() {
func ensureCloudInterface(c *Context, where string) bool { func ensureCloudInterface(c *Context, where string) bool {
cloud := c.App.Cloud() cloud := c.App.Cloud()
disabled := c.App.Config().CloudSettings.Disable != nil && *c.App.Config().CloudSettings.Disable
if cloud == nil { if cloud == nil {
c.Err = model.NewAppError(where, "api.server.cws.needs_enterprise_edition", nil, "", http.StatusBadRequest) c.Err = model.NewAppError(where, "api.server.cws.needs_enterprise_edition", nil, "", http.StatusBadRequest)
return false return false
} }
if disabled {
c.Err = model.NewAppError(where, "api.server.cws.disabled", nil, "", http.StatusUnprocessableEntity)
return false
}
return true return true
} }

4
server/i18n/en.json
View File

@ -2762,6 +2762,10 @@
"id": "api.server.cws.delete_workspace.app_error", "id": "api.server.cws.delete_workspace.app_error",
"translation": "CWS Server failed to delete workspace." "translation": "CWS Server failed to delete workspace."
}, },
{
"id": "api.server.cws.disabled",
"translation": "Interactions with the Mattermost Customer Portal have been disabled by the system admin."
},
{ {
"id": "api.server.cws.health_check.app_error", "id": "api.server.cws.health_check.app_error",
"translation": "CWS Server is not available." "translation": "CWS Server is not available."

5
server/public/model/config.go
View File

@ -3031,6 +3031,7 @@ type CloudSettings struct {
CWSURL *string `access:"write_restrictable"` CWSURL *string `access:"write_restrictable"`
CWSAPIURL *string `access:"write_restrictable"` CWSAPIURL *string `access:"write_restrictable"`
CWSMock *bool `access:"write_restrictable"` CWSMock *bool `access:"write_restrictable"`
Disable *bool `access:"write_restrictable,cloud_restrictable"`
} }
func (s *CloudSettings) SetDefaults() { func (s *CloudSettings) SetDefaults() {
@ -3054,6 +3055,10 @@ func (s *CloudSettings) SetDefaults() {
isMockCws := MockCWS == "true" isMockCws := MockCWS == "true"
s.CWSMock = &isMockCws s.CWSMock = &isMockCws
} }
if s.Disable == nil {
s.Disable = NewBool(false)
}
} }
type ProductSettings struct { type ProductSettings struct {