diff --git a/api.go b/api.go index 5916591e48b292e8267f19f78872dbfdb6ea488a..edff33787c4e24480784ac0860a649c198736ca2 100644 --- a/api.go +++ b/api.go @@ -91,7 +91,7 @@ func webUpdatePost(w http.ResponseWriter, r *http.Request, _ httprouter.Params) updStatus = http.StatusBadRequest upd = jsonError("bad_txt") } else if validSubdomain(a.Subdomain) && validTXT(a.Value) { - err := DB.Update(a) + err := DB.Update(a.ACMETxtPost) if err != nil { log.WithFields(log.Fields{"error": err.Error()}).Debug("Error while trying to update record") updStatus = http.StatusInternalServerError diff --git a/db.go b/db.go index 36b5706305d6f9a1c699cd9259bed0d05a686301..358bde79011df4ccdf52947c5e1f44e39f763a83 100644 --- a/db.go +++ b/db.go @@ -281,7 +281,7 @@ func (d *acmedb) GetTXTForDomain(domain string) ([]string, error) { return txts, nil } -func (d *acmedb) Update(a ACMETxt) error { +func (d *acmedb) Update(a ACMETxtPost) error { d.Lock() defer d.Unlock() var err error diff --git a/db_test.go b/db_test.go index 9e578ffe37edba21b3fc1f3cf693357933f2cfcc..beca9c1b83a8017bbae552d5ecc9cecd609f11e3 100644 --- a/db_test.go +++ b/db_test.go @@ -161,7 +161,7 @@ func TestQueryExecErrors(t *testing.T) { t.Errorf("Expected error from exec in Register, but got none") } reg.Value = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" - err = DB.Update(reg) + err = DB.Update(reg.ACMETxtPost) if err == nil { t.Errorf("Expected error from exec in Update, but got none") } @@ -238,10 +238,10 @@ func TestGetTXTForDomain(t *testing.T) { txtval2 := "___validation_token_received_YEAH_the_ca___" reg.Value = txtval1 - _ = DB.Update(reg) + _ = DB.Update(reg.ACMETxtPost) reg.Value = txtval2 - _ = DB.Update(reg) + _ = DB.Update(reg.ACMETxtPost) regDomainSlice, err := DB.GetTXTForDomain(reg.Subdomain) if err != nil { @@ -294,7 +294,7 @@ func TestUpdate(t *testing.T) { regUser.Password = "nevergonnagiveyouup" regUser.Value = validTXT - err = DB.Update(regUser) + err = DB.Update(regUser.ACMETxtPost) if err != nil { t.Errorf("DB Update failed, got error: [%v]", err) } diff --git a/dns_test.go b/dns_test.go index 83723f85c79fa690825d96c3f239100213bd9ddc..bd6877c3a111e15699ca3a948a6c882ed9ff9610 100644 --- a/dns_test.go +++ b/dns_test.go @@ -168,7 +168,7 @@ func TestResolveTXT(t *testing.T) { return } atxt.Value = validTXT - err = DB.Update(atxt) + err = DB.Update(atxt.ACMETxtPost) if err != nil { t.Errorf("Could not update db record: [%v]", err) return diff --git a/types.go b/types.go index f1efa9c6a63f2d37af709d0981db9b809dba0207..7ad522c219b76ca68911f663764523e1fc3f0b8d 100644 --- a/types.go +++ b/types.go @@ -74,7 +74,7 @@ type database interface { Register(cidrslice) (ACMETxt, error) GetByUsername(uuid.UUID) (ACMETxt, error) GetTXTForDomain(string) ([]string, error) - Update(ACMETxt) error + Update(ACMETxtPost) error GetBackend() *sql.DB SetBackend(*sql.DB) Close()