Fix tests and add OID test

Author: Ben Buzbee

cli/gencert/gencert_test.go

@@ -3,6 +3,7 @@ package gencert
 import (
 	"io/ioutil"
 	"os"
+	"strings"
 	"testing"
 
 	"github.com/cloudflare/cfssl/cli"
@@ -215,3 +216,17 @@ func TestBadGencertMain(t *testing.T) {
 	}
 
 }
+
+func TestOidMain(t *testing.T) {
+	c := cli.Config{
+		CAFile:    "../testdata/ca.pem",
+		CAKeyFile: "../testdata/ca-key.pem",
+	}
+	err := gencertMain([]string{"../testdata/bad_oid_csr.json"}, c)
+	if err == nil {
+		t.Fatal("Expected error")
+	}
+	if !strings.Contains(err.Error(), "invalid OID part abc") {
+		t.Fatalf("Unexpected error: %s", err.Error())
+	}
+}

cli/testdata/bad_oid_csr.json

@@ -0,0 +1,22 @@
+{
+    "hosts": [
+        "cloudflare.com",
+        "www.cloudflare.com"
+    ],
+    "key": {
+        "algo": "rsa",
+        "size": 2048
+    },
+    "names": [
+        {
+            "C": "US",
+            "L": "San Francisco",
+            "O": "CloudFlare",
+            "OU": "Systems Engineering",
+            "ST": "California",
+            "OID": {
+                "abc": "abc"
+            }
+        }
+    ]
+}

cli/testdata/csr.json

@@ -13,7 +13,10 @@
             "L": "San Francisco",
             "O": "CloudFlare",
             "OU": "Systems Engineering",
-            "ST": "California"
+            "ST": "California",
+            "OID": {
+                "1.2.3.4.5": "abc"
+            }
         }
     ]
-}
+}

csr/csr.go

@@ -160,6 +160,7 @@ func appendIf(s string, a *[]string) {
 	}
 }
 
+// OIDFromString creates an ASN1 ObjectIdentifier from its string representation
 func OIDFromString(s string) (asn1.ObjectIdentifier, error) {
 	var oid []int
 	parts := strings.Split(s, ".")
@@ -260,7 +261,6 @@ func ParseRequest(req *CertificateRequest) (csr, key []byte, err error) {
 // from an existing certificate. For a root certificate, the CA expiry
 // length is calculated as the duration between cert.NotAfter and cert.NotBefore.
 func ExtractCertificateRequest(cert *x509.Certificate) *CertificateRequest {
-	fmt.Printf("ExctractCertificateRequest %+v\n", *cert)
 	req := New()
 	req.CN = cert.Subject.CommonName
 	req.Names = getNames(cert.Subject)

csr/csr_test.go

@@ -72,7 +72,10 @@ func TestPKIXName(t *testing.T) {
 		KeyRequest: NewKeyRequest(),
 	}
 
-	name := cr.Name()
+	name, err := cr.Name()
+	if err != nil {
+		t.Fatalf("Error getting name: %s", err.Error())
+	}
 	if len(name.Country) != 2 {
 		t.Fatal("Expected two countries in SubjInfo.")
 	} else if len(name.Province) != 2 {
@@ -113,7 +116,7 @@ func TestParseRequest(t *testing.T) {
 		KeyRequest: NewKeyRequest(),
 		Extensions: []pkix.Extension{
 			pkix.Extension{
-				Id: asn1.ObjectIdentifier{1, 2, 3, 4, 5},
+				Id:    asn1.ObjectIdentifier{1, 2, 3, 4, 5},
 				Value: []byte("AgEB"),
 			},
 		},
@@ -123,7 +126,7 @@ func TestParseRequest(t *testing.T) {
 	if err != nil {
 		t.Fatalf("%v", err)
 	}
-	
+
 	block, _ := pem.Decode(csrBytes)
 	if block == nil {
 		t.Fatalf("%v", err)