add suspicious_hosts table to signups.sql

external/cmd/signup/main.go

@@ -9,12 +9,12 @@ import (
 	"log"
 	"net"
 	"os"
-	"path"
 	"regexp"
 	"slices"
 	"strings"
 	"time"
 
+	"git.tilde.town/tildetown/town/external/lockingwriter"
 	"git.tilde.town/tildetown/town/models"
 	"git.tilde.town/tildetown/town/signup"
 	"github.com/MakeNowJust/heredoc/v2"
@@ -25,7 +25,6 @@ import (
 
 const (
 	maxInputLength = 10000
-	logDir         = "/town/var/signups/log"
 )
 
 type scene struct {
@@ -114,12 +113,6 @@ func (c *character) Say(msg string) string {
 		strings.TrimSpace(msg))
 }
 
-// TODO: move this into an admin-editable world-unreadable file somewhere
-var suspiciousHosts = []string{
-	"mx1.cock.li",
-	"mx2.cock.li",
-}
-
 var ErrNoSuchDomain = errors.New("no host found for email address")
 var ErrNoSuchMailserver = errors.New("no mail server found for email address")
 
@@ -154,14 +147,8 @@ func DigMX(raw string) (domains []string, err error) {
 }
 
 func main() {
-	logFile := path.Join(logDir, fmt.Sprintf("%d", time.Now().Unix()))
+	lw := lockingwriter.New()
-	logF, err := os.Create(logFile)
+	logger := log.New(lw, "signup: ", log.Ldate|log.Ltime|log.LUTC|log.Lshortfile|log.Lmsgprefix)
-	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-
-	logger := log.New(logF, "", log.Ldate|log.Ltime)
 
 	db, err := signup.ConnectDB()
 	if err != nil {
@@ -246,9 +233,18 @@ func _main(l *log.Logger, db *sql.DB) error {
 			newCharacter("wire guy", "a lil homonculus made of discarded computer cables"),
 			func(s *scene) {
 				su.Email = string(s.Input.Bytes())
-				if records, err := DigMX(su.Email); err != nil {
+				suspiciousHosts, err := models.SuspiciousHosts(db)
+				if err != nil {
+					l.Println("could not connect to suspicious hosts db")
+					return
+				}
+				var shDomains []string
+				for _, host := range suspiciousHosts {
+					shDomains = append(shDomains, host.Domain)
+				}
+				if records, err := DigMX(su.Email); err == nil {
 					for _, record := range records {
-						if slices.Contains(suspiciousHosts, record) {
+						if slices.Contains(shDomains, record) {
 							su.Notes = append(su.Notes, models.SignupNote{
 								Author:   "dns",
 								Content:  fmt.Sprintf("email address has suspicious host %s", record),

models/models.go

@@ -193,3 +193,35 @@ func (s *TownSignup) All(db *sql.DB) ([]*TownSignup, error) {
 
 	return out, nil
 }
+
+type SuspiciousHost struct {
+	ID         int64
+	Domain     string
+	CommonName string
+	Tier       int64
+}
+
+func SuspiciousHosts(db *sql.DB) ([]SuspiciousHost, error) {
+	rows, err := db.Query(`SELECT id, domain, common_name, tier FROM suspicious_hosts`)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	out := []SuspiciousHost{}
+	for rows.Next() {
+		sh := SuspiciousHost{}
+		if err = rows.Scan(
+			&sh.ID,
+			&sh.Domain,
+			&sh.CommonName,
+			&sh.Tier,
+		); err != nil {
+			return nil, err
+		}
+
+		out = append(out, sh)
+	}
+
+	return out, nil
+}

sql/create_signups_db.sql

@@ -24,3 +24,9 @@ CREATE TABLE IF NOT EXISTS notes (
 
   FOREIGN KEY (signupid) REFERENCES signups(signupid)
 );
+
+-- 2025-11-22: bad hosts
+CREATE TABLE IF NOT EXISTS suspicious_hosts (
+  id          INTEGER PRIMARY KEY,
+  domain      TEXT,
+)