Rename the program to sww and its deciding daemon to discriminator (closes #218) (#221)

internal/rules/rules.go

@@ -1,5 +1,5 @@
 // Package rules reads the rule files: the plain text files in
-// SWWAF_RULES_DIR, one rule to a line, that each request is checked
+// SWW_RULES_DIR, one rule to a line, that each request is checked
 // against, as the "Rule files" section of SPEC.md describes. They are read
 // at start, and again once the directory has had no change for a short
 // time after one is edited, added or removed.
@@ -40,7 +40,7 @@ const (
 // extension ends the name of every rule file.
 const extension = ".rules"
 
-// quietTime is how long SWWAF_RULES_DIR must go without a change before
+// quietTime is how long SWW_RULES_DIR must go without a change before
 // the rule files are read again, so that a file still being written, such
 // as one saved in place, appended to or copied in with scp, is read only
 // once whole.
@@ -100,19 +100,19 @@ type Rule struct {
 
 // Params are what Load needs.
 type Params struct {
-	// Dir is the directory of the rule files (SWWAF_RULES_DIR).
+	// Dir is the directory of the rule files (SWW_RULES_DIR).
 	Dir string
-	// Enabled is SWWAF_RULES_ENABLED: while it is false, no file is read
+	// Enabled is SWW_RULES_ENABLED: while it is false, no file is read
 	// and no rule loaded.
 	Enabled bool
 	// ProcessLog receives how many rules were read, and the error in a
-	// rule file edited while smallwebwaf runs.
+	// rule file edited while sww runs.
 	ProcessLog *slog.Logger
 	// Alerts receive a file_error alert for that error.
 	Alerts *alerts.Queue
 }
 
-// Files are the rule files of a running smallwebwaf, and the rules read
+// Files are the rule files of a running sww, and the rules read
 // from them. They are safe for concurrent use.
 type Files struct {
 	params Params
@@ -271,7 +271,7 @@ func (f *Files) logRead(count int) {
 func read(dir string) ([]Rule, string, error) {
 	entries, err := os.ReadDir(dir)
 	if err != nil {
-		return nil, dir, fmt.Errorf("SWWAF_RULES_DIR cannot be read: %w", err)
+		return nil, dir, fmt.Errorf("SWW_RULES_DIR cannot be read: %w", err)
 	}
 
 	var rules []Rule
@@ -299,7 +299,7 @@ func read(dir string) ([]Rule, string, error) {
 // readFile appends the rules of the rule file at path to rules. places
 // are where each id read so far is, and gain those of the file.
 func readFile(path string, rules []Rule, places map[string]string) ([]Rule, error) {
-	data, err := os.ReadFile(path) //nolint:gosec // a rule file, in SWWAF_RULES_DIR
+	data, err := os.ReadFile(path) //nolint:gosec // a rule file, in SWW_RULES_DIR
 	if err != nil {
 		return nil, err
 	}

internal/rules/rules_test.go

@@ -298,7 +298,7 @@ func TestDirectoryThatDoesNotExistStopsTheStart(t *testing.T) {
 
 	dir := filepath.Join(t.TempDir(), "rules.d")
 
-	wantRefused(t, dir, "SWWAF_RULES_DIR cannot be read: open "+dir+
+	wantRefused(t, dir, "SWW_RULES_DIR cannot be read: open "+dir+
 		": no such file or directory")
 }
 
@@ -321,7 +321,7 @@ func TestEmptyDirectoryLoadsNoRulesAndSaysSo(t *testing.T) {
 func TestRuleFilesOffReadNothing(t *testing.T) {
 	t.Parallel()
 
-	// SWWAF_RULES_DIR does not exist, which would stop the start.
+	// SWW_RULES_DIR does not exist, which would stop the start.
 	params, _ := newParams(filepath.Join(t.TempDir(), "rules.d"))
 	params.Enabled = false
 
@@ -601,7 +601,7 @@ func wantRefused(t *testing.T, dir, want string) {
 }
 
 // get returns a GET request for target, a path and an optional query, as
-// smallwebwaf's server reads it, without a user agent.
+// sww's server reads it, without a user agent.
 func get(t *testing.T, target string) *http.Request {
 	t.Helper()