From 04ce8b58e70dd1ea0005f7b8e07cc0cc16bf53bc Mon Sep 17 00:00:00 2001
From: brl <bruce@subgraph.com>
Date: Sat, 19 Dec 2015 17:27:31 +0000
Subject: [PATCH] Save rules in /var/lib rather than user home directory

---
 rules.go | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/rules.go b/rules.go
index 1d262a8..6c378da 100644
--- a/rules.go
+++ b/rules.go
@@ -10,8 +10,8 @@ import (
 	"github.com/subgraph/fw-daemon/nfqueue"
 	"io/ioutil"
 	"os"
-	"path/filepath"
 	"strconv"
+	"path"
 )
 
 const (
@@ -168,24 +168,35 @@ func parseRule(s string) (*Rule, error) {
 	return r, nil
 }
 
-const ruleFile = ".sgfw_rules"
+const ruleFile = "/var/lib/sgfw/sgfw_rules"
 
-func rulesPath() string {
-	home := os.Getenv("HOME")
-	if home != "" {
-		return filepath.Join(home, ruleFile)
+func maybeCreateDir(dir string) error {
+	_,err := os.Stat(dir)
+	if os.IsNotExist(err) {
+		return os.MkdirAll(dir, 0755)
 	}
-	// XXX try something else?
-	return ""
+	return err
+}
+
+func rulesPath() (string, error) {
+	if err := maybeCreateDir(path.Dir(ruleFile)); err != nil {
+		return ruleFile, err
+	}
+	return ruleFile, nil
 }
 
 func (fw *Firewall) saveRules() {
 	fw.lock.Lock()
 	defer fw.lock.Unlock()
 
-	f, err := os.Create(rulesPath())
+	p,err := rulesPath()
 	if err != nil {
-		log.Warning("Failed to open %s for writing: %v", rulesPath(), err)
+		log.Warning("Failed to open %s for writing: %v", p, err)
+		return
+	}
+	f, err := os.Create(p)
+	if err != nil {
+		log.Warning("Failed to open %s for writing: %v", p, err)
 		return
 	}
 	defer f.Close()
@@ -227,10 +238,15 @@ func (fw *Firewall) loadRules() {
 	fw.lock.Lock()
 	defer fw.lock.Unlock()
 
-	bs, err := ioutil.ReadFile(rulesPath())
+	p,err := rulesPath()
+	if err != nil {
+		log.Warning("Failed to open %s for reading: %v", p, err)
+		return
+	}
+	bs, err := ioutil.ReadFile(p)
 	if err != nil {
 		if !os.IsNotExist(err) {
-			log.Warning("Failed to open %s for reading: %v", rulesPath(), err)
+			log.Warning("Failed to open %s for reading: %v", p, err)
 		}
 		return
 	}