diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-03-04 08:08:55 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-03-04 08:08:55 -0500 |
commit | d1b1148ea8a0290a66ef7c75d1910c2558fa6186 (patch) | |
tree | 50a696f00700fca4f82459a1a7475d7bba6fcc4c /model | |
parent | 763a477c3f5de5180d5302186e06d740f8834446 (diff) | |
parent | 6b1abb404fc823be1bd0e2eeb21faaec25d03c99 (diff) | |
download | chat-d1b1148ea8a0290a66ef7c75d1910c2558fa6186.tar.gz chat-d1b1148ea8a0290a66ef7c75d1910c2558fa6186.tar.bz2 chat-d1b1148ea8a0290a66ef7c75d1910c2558fa6186.zip |
Merge pull request #2307 from ZBoxApp/PLT-2112
PLT-2112: Allow CORS
Diffstat (limited to 'model')
-rw-r--r-- | model/config.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/model/config.go b/model/config.go index aa3dd3586..82c51224e 100644 --- a/model/config.go +++ b/model/config.go @@ -39,6 +39,7 @@ type ServiceSettings struct { EnableDeveloper *bool EnableSecurityFixAlert *bool EnableInsecureOutgoingConnections *bool + AllowCorsFrom *string SessionLengthWebInDays *int SessionLengthMobileInDays *int SessionLengthSSOInDays *int @@ -377,6 +378,11 @@ func (o *Config) SetDefaults() { o.ServiceSettings.WebsocketSecurePort = new(int) *o.ServiceSettings.WebsocketSecurePort = 443 } + + if o.ServiceSettings.AllowCorsFrom == nil { + o.ServiceSettings.AllowCorsFrom = new(string) + *o.ServiceSettings.AllowCorsFrom = "" + } } func (o *Config) IsValid() *AppError { |