Merge pull request #150 from s7techlab/add-profile-ca-enrollment

add enroll profile

client/ca/http/enroll.go

@@ -33,6 +33,10 @@ func (c *Client) Enroll(ctx context.Context, name, secret string, req *x509.Cert
 		}
 	}
 
+	if options.Profile == "" {
+		options.Profile = ca.EnrollProfileDefault
+	}
+
 	// Add default signature algorithm if not defined
 	if req.SignatureAlgorithm == x509.UnknownSignatureAlgorithm {
 		req.SignatureAlgorithm = c.crypto.GetSignatureAlgorithm()
@@ -45,7 +49,7 @@ func (c *Client) Enroll(ctx context.Context, name, secret string, req *x509.Cert
 
 	pemCsr := pem.EncodeToMemory(&pem.Block{Type: `CERTIFICATE REQUEST`, Bytes: csr})
 
-	reqBytes, err := json.Marshal(signer.SignRequest{Request: string(pemCsr)})
+	reqBytes, err := json.Marshal(signer.SignRequest{Request: string(pemCsr), Profile: string(options.Profile)})
 	if err != nil {
 		return nil, options.PrivateKey, errors.Wrap(err, `failed to marshal CSR request to JSON`)
 	}

client/ca/opts.go

@@ -4,19 +4,38 @@ import (
 	"net/url"
 )
 
+type EnrollProfile string
+
+const (
+	// EnrollProfileDefault asks Fabric CA for certificate used for signing
+	EnrollProfileDefault EnrollProfile = ""
+	// EnrollProfileTls asks Fabric CA for certificate used for TLS communication
+	EnrollProfileTls EnrollProfile = "tls"
+)
+
 type EnrollOpts struct {
 	PrivateKey interface{}
+	Profile    EnrollProfile
 }
 
 type EnrollOpt func(opts *EnrollOpts) error
 
+// WithEnrollPrivateKey allows to use previously created private key
 func WithEnrollPrivateKey(privateKey interface{}) EnrollOpt {
 	return func(opts *EnrollOpts) error {
 		opts.PrivateKey = privateKey
 		return nil
 	}
 }
 
+// WithEnrollProfile allows to require profile of enrolled certificate
+func WithEnrollProfile(profile EnrollProfile) EnrollOpt {
+	return func(opts *EnrollOpts) error {
+		opts.Profile = profile
+		return nil
+	}
+}
+
 type CertificateListOpt func(values *url.Values) error
 
 func WithEnrollId(enrollId string) CertificateListOpt {