From f2d8cd1e90ff24a1375e54154062cc38557f8361 Mon Sep 17 00:00:00 2001
From: "Sascha L. Teichmann" <sascha.teichmann@intevation.de>
Date: Wed, 1 Dec 2021 19:35:19 +0100
Subject: [PATCH] Work in bernhardreiter's PR#4.

---
 cmd/csaf_provider/config.go     | 12 ++++++------
 cmd/csaf_provider/controller.go |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cmd/csaf_provider/config.go b/cmd/csaf_provider/config.go
index ac72e86..75b006c 100644
--- a/cmd/csaf_provider/config.go
+++ b/cmd/csaf_provider/config.go
@@ -14,7 +14,7 @@ const (
 	defaultConfigPath = "/usr/lib/casf/config.toml"
 	defaultFolder     = "/var/www/"
 	defaultWeb        = "/var/www/html"
-	defaultPGPURL     = "http://pgp.mit.edu/pks/lookup?search=${KEY}&op=index"
+	defaultOpenPGPURL = "https://openpgp.circl.lu/pks/lookup?search=${KEY}&op=index"
 )
 
 type config struct {
@@ -23,7 +23,7 @@ type config struct {
 	Web             string          `toml:"web"`
 	TLPs            []tlp           `toml:"tlps"`
 	UploadSignature bool            `toml:"upload_signature"`
-	PGPURL          string          `toml:"pgp_url"`
+	OpenPGPURL      string          `toml:"openpgp_url"`
 	Domain          string          `toml:"domain"`
 	NoPassphrase    bool            `toml:"no_passphrase"`
 	Publisher       *csaf.Publisher `toml:"publisher"`
@@ -56,8 +56,8 @@ func (t *tlp) UnmarshalText(text []byte) error {
 	return fmt.Errorf("invalid config TLP value: %v", string(text))
 }
 
-func (cfg *config) GetPGPURL(key string) string {
-	return strings.ReplaceAll(cfg.PGPURL, "${KEY}", key)
+func (cfg *config) GetOpenPGPURL(key string) string {
+	return strings.ReplaceAll(cfg.OpenPGPURL, "${KEY}", key)
 }
 
 func (cfg *config) modelTLPs() []csaf.TLPLabel {
@@ -98,8 +98,8 @@ func loadConfig() (*config, error) {
 		cfg.TLPs = []tlp{tlpCSAF, tlpWhite, tlpGreen, tlpAmber, tlpRed}
 	}
 
-	if cfg.PGPURL == "" {
-		cfg.PGPURL = defaultPGPURL
+	if cfg.OpenPGPURL == "" {
+		cfg.OpenPGPURL = defaultOpenPGPURL
 	}
 
 	return &cfg, nil
diff --git a/cmd/csaf_provider/controller.go b/cmd/csaf_provider/controller.go
index d982334..e693d93 100644
--- a/cmd/csaf_provider/controller.go
+++ b/cmd/csaf_provider/controller.go
@@ -339,7 +339,7 @@ func (c *controller) upload(rw http.ResponseWriter, r *http.Request) {
 			// TODO: Check for conflicts.
 			pmd.Publisher = ex.publisher
 
-			pmd.SetPGP(fingerprint, c.cfg.GetPGPURL(fingerprint))
+			pmd.SetPGP(fingerprint, c.cfg.GetOpenPGPURL(fingerprint))
 
 			return nil
 		}); err != nil {