From d3eef146cb286fad536710d30d791b1743deb813 Mon Sep 17 00:00:00 2001
From: Chris Cummer <ccummer@digitalocean.com>
Date: Tue, 16 Apr 2019 02:04:06 -0700
Subject: [PATCH] WTF-400 Security extracted to new config format

---
 main.go                      |  7 ++++---
 modules/security/settings.go | 18 ++++++++++++++++++
 modules/security/widget.go   | 12 +++++++-----
 3 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 modules/security/settings.go

diff --git a/main.go b/main.go
index 343b388d..9b774d3a 100644
--- a/main.go
+++ b/main.go
@@ -270,8 +270,11 @@ func makeWidget(app *tview.Application, pages *tview.Pages, widgetName string) w
 	case "resourceusage":
 		settings := resourceusage.NewSettingsFromYAML(wtf.Config)
 		widget = resourceusage.NewWidget(app, settings)
+	case "rollbar":
+		widget = rollbar.NewWidget(app, pages)
 	case "security":
-		widget = security.NewWidget(app)
+		settings := security.NewSettingsFromYAML(wtf.Config)
+		widget = security.NewWidget(app, settings)
 	case "status":
 		widget = status.NewWidget(app)
 	case "system":
@@ -289,8 +292,6 @@ func makeWidget(app *tview.Application, pages *tview.Pages, widgetName string) w
 		widget = todoist.NewWidget(app, pages)
 	case "travisci":
 		widget = travisci.NewWidget(app, pages)
-	case "rollbar":
-		widget = rollbar.NewWidget(app, pages)
 	case "trello":
 		widget = trello.NewWidget(app)
 	case "twitter":
diff --git a/modules/security/settings.go b/modules/security/settings.go
new file mode 100644
index 00000000..b8c05c90
--- /dev/null
+++ b/modules/security/settings.go
@@ -0,0 +1,18 @@
+package security
+
+import (
+	"github.com/olebedev/config"
+	"github.com/wtfutil/wtf/cfg"
+)
+
+type Settings struct {
+	common *cfg.Common
+}
+
+func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
+	settings := Settings{
+		common: cfg.NewCommonSettingsFromYAML(ymlConfig),
+	}
+
+	return &settings
+}
diff --git a/modules/security/widget.go b/modules/security/widget.go
index 2bd39415..e8e5fed9 100644
--- a/modules/security/widget.go
+++ b/modules/security/widget.go
@@ -10,11 +10,15 @@ import (
 
 type Widget struct {
 	wtf.TextWidget
+
+	settings *Settings
 }
 
-func NewWidget(app *tview.Application) *Widget {
+func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
 		TextWidget: wtf.NewTextWidget(app, "Security", "security", false),
+
+		settings: settings,
 	}
 
 	return &widget
@@ -48,12 +52,10 @@ func (widget *Widget) contentFrom(data *SecurityData) string {
 	str = str + "\n"
 
 	str = str + " [red]Users[white]\n"
-	str = str + fmt.Sprintf("  %s", strings.Join(data.LoggedInUsers, "\n "))
-	str = str + "\n"
+	str = str + fmt.Sprintf("  %s", strings.Join(data.LoggedInUsers, "\n  "))
+	str = str + "\n\n"
 
 	str = str + " [red]DNS[white]\n"
-	//str = str + fmt.Sprintf(" %8s: [%s]%-3s[white]   %-16s\n", "Enabled", widget.labelColor(data.FirewallEnabled), data.FirewallEnabled, data.DnsAt(0))
-	//str = str + fmt.Sprintf(" %8s: [%s]%-3s[white]   %-16s\n", "Stealth", widget.labelColor(data.FirewallStealth), data.FirewallStealth, data.DnsAt(1))
 	str = str + fmt.Sprintf("  %12s\n", data.DnsAt(0))
 	str = str + fmt.Sprintf("  %12s\n", data.DnsAt(1))
 	str = str + "\n"