require db for contentsignaturepki gnight

database/connect.go

@@ -119,3 +119,10 @@ func GetTestDBHost() string {
 	}
 	return host
 }
+
+// DeleteAllIn removes all the data from the given database. It's meant only
+// for use in the tests.
+func DeleteAllIn(db *Handler) error {
+	_, err := db.DB.Exec("truncate table endentities;")
+	return err
+}

main.go

@@ -156,10 +156,13 @@ func run(conf configuration, listen string, debug bool) {
 	ag = newAutographer(conf.Server.NonceCacheSize)
 	ag.heartbeatConf = &conf.Heartbeat
 
-	if conf.Database.Name != "" {
+	if conf.Database.Name != "" || os.Getenv("AUTOGRAPH_DB_DSN") != "" {
 		// ignore the monitor close chan since it will stop
 		// when the app is stopped
-		_ = ag.addDB(conf.Database)
+		err = ag.addDB(conf.Database)
+		if err != nil {
+			log.Fatalf("main.run failed to add database: %s", err)
+		}
 	}
 
 	// initialize the hsm if a configuration is defined
@@ -361,21 +364,18 @@ func (a *autographer) startCleanupHandler() {
 
 // addDB connects to the DB and starts a gorountine to monitor DB
 // connectivity
-func (a *autographer) addDB(dbConf database.Config) chan bool {
+func (a *autographer) addDB(dbConf database.Config) error {
 	var err error
 	a.db, err = database.Connect(dbConf)
 	if err != nil {
-		log.Fatal(err)
-	}
-	if a.db == nil {
-		log.Fatal("failed to initialize database connection, unknown error")
+		return fmt.Errorf("failed to connect to database: %w", err)
 	}
 	// start a monitoring function that errors if the db
 	// becomes inaccessible
 	closeDBMonitor := make(chan bool, 1)
 	go a.db.Monitor(dbConf.MonitorPollInterval, closeDBMonitor)
 	log.Print("database connection established")
-	return closeDBMonitor
+	return nil
 }
 
 // initHSM sets up the HSM and notifies signers it is available

main_test.go

@@ -25,6 +25,22 @@ func newTestAutographer(t *testing.T) (*autographer, configuration) {
 		log.Fatal(err)
 	}
 	ag := newAutographer(1)
+	// FIXME refactor helper
+	host := database.GetTestDBHost()
+	err = ag.addDB(database.Config{
+		Name:                "autograph",
+		User:                "myautographdbuser",
+		Password:            "myautographdbpassword",
+		Host:                host + ":5432",
+		MonitorPollInterval: 10 * time.Second,
+	})
+	if err != nil {
+		log.Fatalf("newTestAutographer: failed to connect to db: %s", err)
+	}
+	err = database.DeleteAllIn(ag.db)
+	if err != nil {
+		log.Fatalf("newTestAutographer: failed to delete all in db %s", err)
+	}
 	err = ag.addSigners(conf.Signers)
 	if err != nil {
 		log.Fatal(err)
@@ -60,7 +76,7 @@ func newTestAutographer(t *testing.T) (*autographer, configuration) {
 			MonitorPollInterval: 10 * time.Second,
 		})
 		if err == nil {
-			db.Exec("truncate table endentities;")
+			database.DeleteAllIn(db)
 		}
 		close(ag.exit)
 	})

signer/contentsignaturepki/contentsignature.go

@@ -83,6 +83,9 @@ func New(conf signer.Configuration) (s *ContentSigner, err error) {
 	s.chainUploadLocation = conf.ChainUploadLocation
 	s.caCert = conf.CaCert
 	s.db = conf.DB
+	if s.db == nil {
+		return nil, fmt.Errorf("contentsignaturepki %q: a database is required by the contentsignaturepki signer type but none have been configured", s.ID)
+	}
 	s.subdomainOverride = conf.SubdomainOverride
 
 	if conf.Type != Type {