X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=main_test.go;h=ffb176f05d5df5dab6b430d75eee9c186eef1226;hb=2f775b91b1871aa2eacdb19ead52f8801ba75b29;hp=181930f29da7034c7bac6d94b16b09ea7f11cd7d;hpb=44a325a9bea5f53c6489cecb3691709306a1814c;p=nsscash%2Fnsscash.git

diff --git a/main_test.go b/main_test.go
index 181930f..ffb176f 100644
--- a/main_test.go
+++ b/main_test.go
@@ -25,6 +25,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"os"
+	"path/filepath"
 	"reflect"
 	"runtime"
 	"strings"
@@ -34,7 +35,7 @@ import (
 
 const (
 	configPath  = "testdata/config.toml"
-	statePath   = "testdata/state.json"
+	statePath   = "testdata/var/state.json"
 	passwdPath  = "testdata/passwd.nsscash"
 	plainPath   = "testdata/plain"
 	groupPath   = "testdata/group.nsscash"
@@ -155,8 +156,8 @@ func mustMakeOld(t *testing.T, paths ...string) {
 	}
 }
 
-// mustMakeOld verifies that all paths have a modification time in the past,
-// as set by mustMakeOld().
+// mustBeOld verifies that all paths have a modification time in the past, as
+// set by mustMakeOld.
 func mustBeOld(t *testing.T, paths ...string) {
 	for _, p := range paths {
 		i, err := os.Stat(p)
@@ -165,8 +166,7 @@ func mustBeOld(t *testing.T, paths ...string) {
 		}
 
 		mtime := i.ModTime()
-		now := time.Now()
-		if now.Sub(mtime) < time.Hour {
+		if time.Since(mtime) < time.Hour {
 			t.Errorf("%q was recently modified", p)
 		}
 	}
@@ -181,8 +181,7 @@ func mustBeNew(t *testing.T, paths ...string) {
 		}
 
 		mtime := i.ModTime()
-		now := time.Now()
-		if now.Sub(mtime) > time.Hour {
+		if time.Since(mtime) > time.Hour {
 			t.Errorf("%q was not recently modified", p)
 		}
 	}
@@ -197,6 +196,7 @@ func TestMainFetch(t *testing.T) {
 		// Perform most tests with passwd for simplicity
 		fetchPasswdCacheFileDoesNotExist,
 		fetchPasswd404,
+		fetchPasswdUnexpected304,
 		fetchPasswdEmpty,
 		fetchPasswdInvalid,
 		fetchPasswdLimits,
@@ -269,6 +269,13 @@ func runMainTest(t *testing.T, f func(args), tls *tls.Config) {
 			// Remove the file at the end of this test run, if it
 			// was created
 			defer os.Remove(p)
+
+			dir := filepath.Dir(p)
+			err = os.MkdirAll(dir, 0755)
+			if err != nil {
+				t.Fatal(err)
+			}
+			defer os.Remove(dir) // remove empty directories
 		}
 
 		var handler func(http.ResponseWriter, *http.Request)
@@ -318,7 +325,25 @@ func fetchPasswd404(a args) {
 		"status code 404")
 
 	mustNotExist(t, statePath, plainPath, groupPath)
-	mustBeOld(a.t, passwdPath)
+	mustBeOld(t, passwdPath)
+}
+
+func fetchPasswdUnexpected304(a args) {
+	t := a.t
+	mustWritePasswdConfig(t, a.url)
+	mustCreate(t, passwdPath)
+
+	*a.handler = func(w http.ResponseWriter, r *http.Request) {
+		// 304
+		w.WriteHeader(http.StatusNotModified)
+	}
+
+	err := mainFetch(configPath)
+	mustBeErrorWithSubstring(t, err,
+		"status code 304 but did not send If-Modified-Since")
+
+	mustNotExist(t, statePath, plainPath, groupPath)
+	mustBeOld(t, passwdPath)
 }
 
 func fetchPasswdEmpty(a args) {
@@ -688,6 +713,7 @@ func fetchStateCannotRead(a args) {
 		statePath+": permission denied")
 
 	mustNotExist(t, passwdPath, plainPath, groupPath)
+	mustBeOld(t, statePath)
 }
 
 func fetchStateInvalid(a args) {
@@ -710,23 +736,27 @@ func fetchStateCannotWrite(a args) {
 	mustHaveHash(t, groupPath, "da39a3ee5e6b4b0d3255bfef95601890afd80709")
 
 	*a.handler = func(w http.ResponseWriter, r *http.Request) {
-		// To prevent mainFetch() from trying to update groupPath
-		// which will also fail
-		w.WriteHeader(http.StatusNotModified)
+		if r.URL.Path != "/group" {
+			return
+		}
+
+		fmt.Fprintln(w, "root:x:0:")
+		fmt.Fprintln(w, "daemon:x:1:andariel,duriel,mephisto,diablo,baal")
 	}
 
-	err := os.Chmod("testdata", 0500)
+	err := os.Chmod(filepath.Dir(statePath), 0500)
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer os.Chmod("testdata", 0755)
+	defer os.Chmod(filepath.Dir(statePath), 0755)
 
 	err = mainFetch(configPath)
 	mustBeErrorWithSubstring(t, err,
 		"permission denied")
 
 	mustNotExist(t, statePath, passwdPath, plainPath)
-	mustBeOld(t, groupPath)
+	mustBeNew(t, groupPath)
+	mustHaveHash(t, groupPath, "8c27a8403278ba2e392b86d98d4dff1fdefcafdd")
 }
 
 func fetchCannotDeploy(a args) {