Leave out a module whose stored manifest has an unknown field, and raise it (hq ADR 0262 review)

A key dropped silently ran a module without what its manifest says, and a key inside a block still
failed the whole catalogue. Judge a key by what it is about, and narrow the listing to one machine.

internal/catalogue/setting_defaults.go

@@ -46,32 +46,54 @@ var meshWords = map[string]bool{
 	PlacesSetting: true, AccessesSetting: true, NetworksSetting: true,
 }
 
-// operatorsOwn are words that, as a whole word of a key's name, say its value is the operator's and
-// never a preference: a default for one would be the literal ADR 0112 removed from definitions. Whole
-// words, split at dashes, underscores and dots, so `max-tokens`, `show-hostname` and `mailbox-size` are
-// preferences and `api-token`, `host` and `mail-domain` are not.
+// operatorsOwn are the words that, as what a key's name is about, say its value is the operator's and
+// never a preference: a default for one would be the literal ADR 0112 removed from definitions.
 var operatorsOwn = map[string]bool{
-	"domain": true, "host": true, "fqdn": true, "zone": true, "realm": true, "tenant": true,
-	"issuer": true, "url": true, "uri": true, "webhook": true, "origin": true, "dsn": true, "ip": true,
+	"domain": true, "host": true, "hostname": true, "servername": true, "fqdn": true, "zone": true,
+	"realm": true, "tenant": true, "site": true, "timezone": true,
+	"issuer": true, "url": true, "uri": true, "webhook": true, "origin": true, "dsn": true,
+	"ip": true, "ipv4": true, "ipv6": true,
 	"email": true, "mail": true, "phone": true, "address": true,
 	"identity": true, "login": true, "user": true, "username": true, "account": true, "owner": true,
 	"uid": true, "gid": true, "puid": true, "pgid": true,
 	"password": true, "pass": true, "passwd": true, "passphrase": true, "secret": true, "token": true,
-	"key": true, "credential": true,
+	"key": true, "apikey": true, "bearer": true, "cert": true, "credential": true,
 }
 
-// operatorsWord is the word of a key's name that says its value is the operator's, or "".
+// operatorsCompounds are names of two words that are the operator's though neither word alone says so
+// at the end of a key: a client's identifier, and a name the world knows a site or server by.
+var operatorsCompounds = map[string]bool{
+	"client-id": true, "site-name": true, "server-name": true, "public-name": true, "smtp-relay": true,
+}
+
+// aboutAnAmount are first words that make a key about how many or whether, never about whom:
+// `max-tokens` is a number, `show-hostname` a switch.
+var aboutAnAmount = map[string]bool{
+	"max": true, "min": true, "num": true, "count": true, "show": true, "hide": true, "enable": true,
+	"disable": true, "use": true, "allow": true,
+}
+
+// operatorsWord is what in a key's name says its value is the operator's, or "". A key is about its
+// last word — `url-timeout` is a timeout, `user-agent` an agent, `mail-domain` a domain — or its last two
+// as one of operatorsCompounds. A plural is read as its singular.
 func operatorsWord(key string) string {
 	words := strings.FieldsFunc(key, func(r rune) bool { return r == '-' || r == '_' || r == '.' })
+	if len(words) == 0 || (len(words) > 1 && aboutAnAmount[words[0]]) {
+		return ""
+	}
 	for i, w := range words {
-		if operatorsOwn[w] {
-			return w
+		if !operatorsOwn[w] && strings.HasSuffix(w, "s") && operatorsOwn[strings.TrimSuffix(w, "s")] {
+			words[i] = strings.TrimSuffix(w, "s")
 		}
-		// An identifier a client is known by: `client-id`, `oauth-client-id`.
-		if w == "client" && i+1 < len(words) && words[i+1] == "id" {
-			return "client-id"
+	}
+	if n := len(words); n > 1 {
+		if pair := words[n-2] + "-" + words[n-1]; operatorsCompounds[pair] {
+			return pair
 		}
 	}
+	if last := words[len(words)-1]; operatorsOwn[last] {
+		return last
+	}
 	return ""
 }