scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-03 12:07:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove failOnError method from cert tests

Browse Source
This commit is contained in:
vishalnayak
2016-06-01 16:01:28 -04:00
parent cf1aad28ce
commit 65de9cb01a
1 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
builtin/credential/cert/backend_test.go
View File

@@ -101,15 +101,6 @@ func connectionState(t *testing.T, serverCAPath, serverCertPath, serverKeyPath,
return connState return connState
} }
func failOnError(t *testing.T, resp *logical.Response, err error) {
if resp != nil && resp.IsError() {
t.Fatalf("error returned in response: %s", resp.Data["error"])
}
if err != nil {
t.Fatal(err)
}
}
func TestBackend_RegisteredNonCA_CRL(t *testing.T) { func TestBackend_RegisteredNonCA_CRL(t *testing.T) {
config := logical.TestBackendConfig() config := logical.TestBackendConfig()
storage := &logical.InmemStorage{} storage := &logical.InmemStorage{}
@@ -140,7 +131,9 @@ func TestBackend_RegisteredNonCA_CRL(t *testing.T) {
} }
resp, err := b.HandleRequest(certReq) resp, err := b.HandleRequest(certReq)
failOnError(t, resp, err) if err != nil || (resp != nil && resp.IsError()) {
t.Fatalf("err:%v resp:%#v", err, resp)
}
// Connection state is presenting the client Non-CA cert and its key. // Connection state is presenting the client Non-CA cert and its key.
// This is exactly what is registered at the backend. // This is exactly what is registered at the backend.
@@ -155,7 +148,9 @@ func TestBackend_RegisteredNonCA_CRL(t *testing.T) {
} }
// Login should succeed. // Login should succeed.
resp, err = b.HandleRequest(loginReq) resp, err = b.HandleRequest(loginReq)
failOnError(t, resp, err) if err != nil || (resp != nil && resp.IsError()) {
t.Fatalf("err:%v resp:%#v", err, resp)
}
// Register a CRL containing the issued client certificate used above. // Register a CRL containing the issued client certificate used above.
issuedCRL, err := ioutil.ReadFile(testIssuedCertCRL) issuedCRL, err := ioutil.ReadFile(testIssuedCertCRL)
@@ -172,7 +167,9 @@ func TestBackend_RegisteredNonCA_CRL(t *testing.T) {
Data: crlData, Data: crlData,
} }
resp, err = b.HandleRequest(crlReq) resp, err = b.HandleRequest(crlReq)
failOnError(t, resp, err) if err != nil || (resp != nil && resp.IsError()) {
t.Fatalf("err:%v resp:%#v", err, resp)
}
// Attempt login with the same connection state but with the CRL registered // Attempt login with the same connection state but with the CRL registered
resp, err = b.HandleRequest(loginReq) resp, err = b.HandleRequest(loginReq)
@@ -214,7 +211,9 @@ func TestBackend_CRLs(t *testing.T) {
} }
resp, err := b.HandleRequest(certReq) resp, err := b.HandleRequest(certReq)
failOnError(t, resp, err) if err != nil || (resp != nil && resp.IsError()) {
t.Fatalf("err:%v resp:%#v", err, resp)
}
// Connection state is presenting the client CA cert and its key. // Connection state is presenting the client CA cert and its key.
// This is exactly what is registered at the backend. // This is exactly what is registered at the backend.
@@ -228,7 +227,9 @@ func TestBackend_CRLs(t *testing.T) {
}, },
} }
resp, err = b.HandleRequest(loginReq) resp, err = b.HandleRequest(loginReq)
failOnError(t, resp, err) if err != nil || (resp != nil && resp.IsError()) {
t.Fatalf("err:%v resp:%#v", err, resp)
}
// Now, without changing the registered client CA cert, present from // Now, without changing the registered client CA cert, present from
// the client side, a cert issued using the registered CA. // the client side, a cert issued using the registered CA.
@@ -237,7 +238,9 @@ func TestBackend_CRLs(t *testing.T) {
// Attempt login with the updated connection // Attempt login with the updated connection
resp, err = b.HandleRequest(loginReq) resp, err = b.HandleRequest(loginReq)
failOnError(t, resp, err) if err != nil || (resp != nil && resp.IsError()) {
t.Fatalf("err:%v resp:%#v", err, resp)
}
// Register a CRL containing the issued client certificate used above. // Register a CRL containing the issued client certificate used above.
issuedCRL, err := ioutil.ReadFile(testIssuedCertCRL) issuedCRL, err := ioutil.ReadFile(testIssuedCertCRL)
@@ -255,7 +258,9 @@ func TestBackend_CRLs(t *testing.T) {
Data: crlData, Data: crlData,
} }
resp, err = b.HandleRequest(crlReq) resp, err = b.HandleRequest(crlReq)
failOnError(t, resp, err) if err != nil || (resp != nil && resp.IsError()) {
t.Fatalf("err:%v resp:%#v", err, resp)
}
// Attempt login with the revoked certificate. // Attempt login with the revoked certificate.
resp, err = b.HandleRequest(loginReq) resp, err = b.HandleRequest(loginReq)
@@ -273,7 +278,9 @@ func TestBackend_CRLs(t *testing.T) {
} }
certData["certificate"] = clientCA2 certData["certificate"] = clientCA2
resp, err = b.HandleRequest(certReq) resp, err = b.HandleRequest(certReq)
failOnError(t, resp, err) if err != nil || (resp != nil && resp.IsError()) {
t.Fatalf("err:%v resp:%#v", err, resp)
}
// Test login using a different client CA cert pair. // Test login using a different client CA cert pair.
connState = connectionState(t, serverCAPath, serverCertPath, serverKeyPath, testRootCACertPath2, testRootCAKeyPath2) connState = connectionState(t, serverCAPath, serverCertPath, serverKeyPath, testRootCACertPath2, testRootCAKeyPath2)
@@ -281,7 +288,9 @@ func TestBackend_CRLs(t *testing.T) {
// Attempt login with the updated connection // Attempt login with the updated connection
resp, err = b.HandleRequest(loginReq) resp, err = b.HandleRequest(loginReq)
failOnError(t, resp, err) if err != nil || (resp != nil && resp.IsError()) {
t.Fatalf("err:%v resp:%#v", err, resp)
}
// Register a CRL containing the root CA certificate used above. // Register a CRL containing the root CA certificate used above.
rootCRL, err := ioutil.ReadFile(testRootCertCRL) rootCRL, err := ioutil.ReadFile(testRootCertCRL)
@@ -290,7 +299,9 @@ func TestBackend_CRLs(t *testing.T) {
} }
crlData["crl"] = rootCRL crlData["crl"] = rootCRL
resp, err = b.HandleRequest(crlReq) resp, err = b.HandleRequest(crlReq)
failOnError(t, resp, err) if err != nil || (resp != nil && resp.IsError()) {
t.Fatalf("err:%v resp:%#v", err, resp)
}
// Attempt login with the same connection state but with the CRL registered // Attempt login with the same connection state but with the CRL registered
resp, err = b.HandleRequest(loginReq) resp, err = b.HandleRequest(loginReq)