Merge pull request #944 from mattermost/PLT-518

PLT-518 check for security bulletins

2 files changed, 58 insertions, 3 deletions

diff --git a/model/config.go b/model/config.go
index c67b36063..086b0d4ee 100644
--- a/model/config.go
+++ b/model/config.go
@@ -110,9 +110,9 @@ type RateLimitSettings struct {
 }
 
 type PrivacySettings struct {
-	ShowEmailAddress bool
-	ShowFullName     bool
-	EnableDiagnostic bool
+	ShowEmailAddress       bool
+	ShowFullName           bool
+	EnableSecurityFixAlert bool
 }
 
 type TeamSettings struct {
diff --git a/model/security_bulletin.go b/model/security_bulletin.go
new file mode 100644
index 000000000..a64e03f6d
--- /dev/null
+++ b/model/security_bulletin.go
@@ -0,0 +1,55 @@
+// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package model
+
+import (
+	"encoding/json"
+	"io"
+)
+
+type SecurityBulletin struct {
+	Id               string `json:"id"`
+	AppliesToVersion string `json:"applies_to_version"`
+}
+
+type SecurityBulletins []SecurityBulletin
+
+func (me *SecurityBulletin) ToJson() string {
+	b, err := json.Marshal(me)
+	if err != nil {
+		return ""
+	} else {
+		return string(b)
+	}
+}
+
+func SecurityBulletinFromJson(data io.Reader) *SecurityBulletin {
+	decoder := json.NewDecoder(data)
+	var o SecurityBulletin
+	err := decoder.Decode(&o)
+	if err == nil {
+		return &o
+	} else {
+		return nil
+	}
+}
+
+func (me SecurityBulletins) ToJson() string {
+	if b, err := json.Marshal(me); err != nil {
+		return "[]"
+	} else {
+		return string(b)
+	}
+}
+
+func SecurityBulletinsFromJson(data io.Reader) SecurityBulletins {
+	decoder := json.NewDecoder(data)
+	var o SecurityBulletins
+	err := decoder.Decode(&o)
+	if err == nil {
+		return o
+	} else {
+		return nil
+	}
+}