Archives/smallstep-certificates
2
0
Fork 0
mirror of https://github.com/smallstep/certificates.git synced 2024-11-15 18:12:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

acme: Fix test compile

Browse Source 
* Add toACME test for the "processing" state.
This commit is contained in:
David Cowden 2020-05-12 08:33:32 -07:00
parent 2514b58f58
commit 84af2ad562
4 changed files with 93 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
acme/authority_test.go
View File

@ -1276,7 +1276,7 @@ func TestAuthorityValidateChallenge(t *testing.T) {
assert.Fatal(t, ok)
_ch.baseChallenge.Status = StatusValid
_ch.baseChallenge.Validated = clock.Now()
_ch.baseChallenge.Retry.Called = 0
_ch.baseChallenge.Retry = nil
b, err := json.Marshal(ch)
assert.FatalError(t, err)
auth, err := NewAuthority(&db.MockNoSQLDB{
@ -1310,7 +1310,7 @@ func TestAuthorityValidateChallenge(t *testing.T) {
if assert.Nil(t, tc.err) {
gotb, err := json.Marshal(acmeCh)
assert.FatalError(t, err)
acmeExp, err := tc.ch.toACME(nil, tc.auth.dir, prov)
acmeExp, err := tc.ch.toACME(tc.auth.dir, prov)
assert.FatalError(t, err)
expb, err := json.Marshal(acmeExp)
assert.FatalError(t, err)

4
acme/authz_test.go
View File

@ -434,9 +434,9 @@ func TestAuthzToACME(t *testing.T) {
assert.Equals(t, acmeAz.Identifier, iden)
assert.Equals(t, acmeAz.Status, StatusPending)
acmeCh1, err := ch1.toACME(nil, dir, prov)
acmeCh1, err := ch1.toACME(dir, prov)
assert.FatalError(t, err)
acmeCh2, err := ch2.toACME(nil, dir, prov)
acmeCh2, err := ch2.toACME(dir, prov)
assert.FatalError(t, err)
assert.Equals(t, acmeAz.Challenges[0], acmeCh1)

2
acme/challenge.go
View File

@ -306,7 +306,7 @@ func (bc *baseChallenge) morph() challenge {
}
}
// Challenge retry information is internally relevant and needs to be stored in the DB, but should not be part
// Retry information for challenges is internally relevant and needs to be stored in the DB, but should not be part
// of the public challenge API apart from the Retry-After header.
type Retry struct {
Owner int `json:"owner"`

110
acme/challenge_test.go
View File

@ -259,28 +259,36 @@ func TestNewDNS01Challenge(t *testing.T) {
}
}
func TestChallengeToACME(t *testing.T) {
func TestChallengeToACME_Valid(t *testing.T) {
dir := newDirectory("ca.smallstep.com", "acme")
httpCh, err := newHTTPCh()
assert.FatalError(t, err)
_httpCh, ok := httpCh.(*http01Challenge)
assert.Fatal(t, ok)
_httpCh.baseChallenge.Validated = clock.Now()
dnsCh, err := newDNSCh()
assert.FatalError(t, err)
tlsALPNCh, err := newTLSALPNCh()
assert.FatalError(t, err)
n := clock.Now()
fns := []func() (challenge, error){
newDNSCh,
newHTTPCh,
newTLSALPNCh,
}
chs := make([]challenge, 3)
for i, f := range fns {
ch, err := f()
assert.FatalError(t, err)
b := ch.clone()
b.Validated = n
chs[i] = b.morph()
}
prov := newProv()
tests := map[string]challenge{
"dns": dnsCh,
"http": httpCh,
"tls-alpn": tlsALPNCh,
"dns": chs[0],
"http": chs[1],
"tls-alpn": chs[2],
}
for name, ch := range tests {
t.Run(name, func(t *testing.T) {
ach, err := ch.toACME(nil, dir, prov)
ach, err := ch.toACME(dir, prov)
assert.FatalError(t, err)
assert.Equals(t, ach.Type, ch.getType())
@ -292,12 +300,70 @@ func TestChallengeToACME(t *testing.T) {
assert.Equals(t, ach.ID, ch.getID())
assert.Equals(t, ach.AuthzID, ch.getAuthzID())
if ach.Type == "http-01" {
v, err := time.Parse(time.RFC3339, ach.Validated)
assert.FatalError(t, err)
assert.Equals(t, v.String(), _httpCh.baseChallenge.Validated.String())
v, err := time.Parse(time.RFC3339, ach.Validated)
assert.FatalError(t, err)
assert.Equals(t, v, ch.getValidated())
assert.Equals(t, ach.RetryAfter, "")
})
}
}
func TestChallengeToACME_Retry(t *testing.T) {
dir := newDirectory("example.com", "acme")
n := clock.Now()
fns := []func() (challenge, error){
newDNSCh,
newHTTPCh,
newTLSALPNCh,
}
states := []*Retry{
nil,
{NextAttempt: n.Format(time.RFC3339)},
}
chs := make([]challenge, len(fns)*len(states))
for i, s := range states {
for j, f := range fns {
ch, err := f()
assert.FatalError(t, err)
b := ch.clone()
b.Status = "processing"
b.Retry = s
chs[j+i*len(fns)] = b.morph()
}
}
prov := newProv()
tests := map[string]challenge{
"dns_no-retry": chs[0+0*len(fns)],
"http_no-retry": chs[1+0*len(fns)],
"tls-alpn_no-retry": chs[2+0*len(fns)],
"dns_retry": chs[0+1*len(fns)],
"http_retry": chs[1+1*len(fns)],
"tls_alpn_retry": chs[2+1*len(fns)],
}
for name, ch := range tests {
t.Run(name, func(t *testing.T) {
ach, err := ch.toACME(dir, prov)
assert.FatalError(t, err)
assert.Equals(t, ach.Type, ch.getType())
assert.Equals(t, ach.Status, ch.getStatus())
assert.Equals(t, ach.Token, ch.getToken())
assert.Equals(t, ach.URL,
fmt.Sprintf("https://example.com/acme/%s/challenge/%s",
URLSafeProvisionerName(prov), ch.getID()))
assert.Equals(t, ach.ID, ch.getID())
assert.Equals(t, ach.AuthzID, ch.getAuthzID())
assert.Equals(t, ach.Validated, "")
if ch.getRetry() != nil {
assert.Equals(t, ach.RetryAfter, ch.getRetry().NextAttempt)
} else {
assert.Equals(t, ach.Validated, "")
assert.Equals(t, ach.RetryAfter, "")
}
})
}
@ -965,7 +1031,7 @@ func TestHTTP01Validate(t *testing.T) {
for name, run := range tests {
t.Run(name, func(t *testing.T) {
tc := run(t)
if ch, err := tc.ch.validate(tc.db, tc.jwk, tc.vo); err != nil {
if ch, err := tc.ch.validate(tc.jwk, tc.vo); err != nil {
if assert.NotNil(t, tc.err) {
ae, ok := err.(*Error)
assert.True(t, ok)
@ -1589,7 +1655,7 @@ func TestTLSALPN01Validate(t *testing.T) {
defer tc.srv.Close()
}
if ch, err := tc.ch.validate(tc.db, tc.jwk, tc.vo); err != nil {
if ch, err := tc.ch.validate(tc.jwk, tc.vo); err != nil {
if assert.NotNil(t, tc.err) {
ae, ok := err.(*Error)
assert.True(t, ok)
@ -1950,7 +2016,7 @@ func TestDNS01Validate(t *testing.T) {
for name, run := range tests {
t.Run(name, func(t *testing.T) {
tc := run(t)
if ch, err := tc.ch.validate(tc.db, tc.jwk, tc.vo); err != nil {
if ch, err := tc.ch.validate(tc.jwk, tc.vo); err != nil {
if assert.NotNil(t, tc.err) {
ae, ok := err.(*Error)
assert.True(t, ok)