Merge 52ed369 into 521884a

Author: m8rmclaren

.github/workflows/keyfactor-workflow.yml …rkflows/keyfactor-bootstrap-workflow.yml.github/workflows/keyfactor-workflow.yml renamed to .github/workflows/keyfactor-bootstrap-workflow.yml .github/workflows/keyfactor-workflow.yml renamed to .github/workflows/keyfactor-bootstrap-workflow.yml

@@ -1,4 +1,4 @@
-name: Keyfactor Release Workflow
+name: Keyfactor Bootstrap Workflow
 
 on:
   workflow_dispatch:
@@ -11,9 +11,10 @@ on:
 
 jobs:
   call-starter-workflow:
-    uses: keyfactor/actions/.github/workflows/starter.yml@v2
+    uses: keyfactor/actions/.github/workflows/starter.yml@v3
     secrets:
       token: ${{ secrets.V2BUILDTOKEN}}
       APPROVE_README_PUSH: ${{ secrets.APPROVE_README_PUSH}}
       gpg_key: ${{ secrets.KF_GPG_PRIVATE_KEY }}
       gpg_pass: ${{ secrets.KF_GPG_PASSPHRASE }}
+      scan_token: ${{ secrets.SAST_TOKEN }}

.golangci.yml

@@ -0,0 +1,30 @@
+run:
+  # timeout for analysis, e.g. 30s, 5m, default is 1m
+  timeout: 12m
+
+  skip-dirs:
+    - testdata$
+    - test/mock
+
+  skip-files:
+    - ".*\\.pb\\.go"
+
+linters:
+  enable:
+    - bodyclose
+    - errorlint
+    - goimports
+    - revive
+    - gosec
+    - misspell
+    - nakedret
+    - unconvert
+    - unparam
+    - whitespace
+    - gocritic
+    - nolintlint
+
+linters-settings:
+  revive:
+    # minimal confidence for issues, default is 0.8
+    confidence: 0.0

CHANGELOG.md

@@ -1,3 +1,15 @@
+# v1.5.0
+## Fixes
+* Patched bug that required the `allow_any_name` or `allowed_domains=[""]` role parameters to issue/sign certificates with no CN.
+
+## Chores
+* Upgrade from Go `v1.21` to `v1.22`.
+* Implement more strict golangci-lint policy.
+
+## Features
+* If upstream EJBCA API call fails, the HTTP status code is propogated to the Vault user via the Vault API status code.
+* Implement OAuth 2.0 "client credentials" token flow as a supported authentication mechanism to EJBCA.
+
 # v1.4.0
 ## Fixes
 * Paths that need to write to the Storage backend now forward the request to the primary node. This is important in Enterprise HA deployments where Performance Standby Nodes are allowed to handle read requests/paths.

README.md

@@ -1,43 +1,39 @@
+<h1 align="center" style="border-bottom: none">
 
-# EJBCA Vault PKI Secrets Engine
 
-EJBCA PKI Engine and Backend for HashiCorp Vault. Used to issue, sign, and revoke certificates using the EJBCA CA via HashiCorp Vault
+EJBCA Vault PKI Secrets Engine
 
-#### Integration status: Production - Ready for use in production environments.
+<img src="https://img.shields.io/badge/integration_status-production-3D1973?style=flat-square" alt="Integration Status: production" />
+<a href="https://github.com/keyfactor/ejbca-cert-manager-issuer/releases/latest"><img src="https://img.shields.io/github/v/release/keyfactor/ejbca-cert-manager-issuer?style=flat-square" alt="Latest Release"></a>
+<a href="https://ejbca.org"><img src="https://img.shields.io/badge/valid_for-ejbca_community-FF9371" alt="Valid for EJBCA Community"></a>
+<a href="https://www.keyfactor.com/products/ejbca-enterprise/"><img src="https://img.shields.io/badge/valid_for-ejbca_enterprise-5F61FF" alt="Valid for EJBCA Enterprise"></a>
+<a href="https://goreportcard.com/report/github.com/keyfactor/ejbca-cert-manager-issuer"><img src="https://goreportcard.com/badge/github.com/keyfactor/ejbca-cert-manager-issuer" alt="Go Report Card"></a>
+<a href="https://img.shields.io/badge/License-Apache%202.0-blue.svg"><img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg" alt="License Apache 2.0"></a>
 
-## About the Keyfactor API Client
 
-This API client allows for programmatic management of Keyfactor resources.
 
-## Support for EJBCA Vault PKI Secrets Engine
+</h1>
 
-EJBCA Vault PKI Secrets Engine is open source and supported on best effort level for this tool/library/client.  This means customers can report Bugs, Feature Requests, Documentation amendment or questions as well as requests for customer information required for setup that needs Keyfactor access to obtain. Such requests do not follow normal SLA commitments for response or resolution. If you have a support issue, please open a support ticket via the Keyfactor Support Portal at https://support.keyfactor.com/
+<p align="center">
+  <!-- TOC -->
+  <a href="#support">
+    <b>Support</b>
+  </a>
+  ·
+  <a href="#get-started">
+    <b>Get Started</b>
+  </a>
+  ·
+  <a href="#license">
+    <b>License</b>
+  </a>
+  ·
+  <a href="https://github.com/orgs/Keyfactor/repositories?q=ejbca">
+    <b>Related Integrations</b>
+  </a>
+</p>
 
-###### To report a problem or suggest a new feature, use the **[Issues](../../issues)** tab. If you want to contribute actual bug fixes or proposed enhancements, use the **[Pull requests](../../pulls)** tab.
-
----
-
-
----
-
-
-
-<!--EJBCA Community logo -->
-<a href="https://ejbca.org">
-    <img src=".github/images/community-ejbca.png?raw=true)" alt="EJBCA logo" title="EJBCA" height="70" />
-</a>
-<!--EJBCA Enterprise logo -->
-<a href="https://www.keyfactor.com/products/ejbca-enterprise/">
-    <img src=".github/images/keyfactor-ejbca-enterprise.png?raw=true)" alt="EJBCA logo" title="EJBCA" height="70" />
-</a>
-
-<!--- Insert the Tool Name in the main heading! --->
-# EJBCA PKI Secrets Engine for HashiCorp Vault
-
-[![Go Report Card](https://goreportcard.com/badge/github.com/Keyfactor/ejbca-vault-pki-engine)](https://goreportcard.com/report/github.com/Keyfactor/ejbca-vault-pki-engine)
-
-<!--- Short intro here! --->
-<!--- Include a description of the project/repository, the purpose of it, what problems it solves, when to use it (and not use it), etc. --->
+## Overview
 
 The EJBCA PKI Secrets Engine for HashiCorp Vault enables DevOps teams to request and retrieve certificates 
 from EJBCA using HashiCorp Vault, while security teams retain control over backend PKI operations.
@@ -48,49 +44,42 @@ The EJBCA PKI Secrets Engine is a Vault plugin that replicates the built-in Vaul
 requests through EJBCA instead of through Vault. The plugin was designed to be swapped for the built-in Vault PKI secrets engine
 with minimal changes to existing Vault configurations.
 
-## Get Started
 
-<!--- Insert links to instructions on how to install, configure, etc. 
-Example from ejbca-cert-manager-issuer below:
 
-* To install the tool, see [Installation](docs/install.md).
-* To configure and use the tool, see: 
-  * [Usage](docs/config_usage.md)
-  * [Customization](docs/annotations.md)
-  * [End Entity Name Selection](docs/endentitynamecustomization.md)
-* To test the tool, see [Testing the Source](docs/testing.md).
---->
+## Support
 
-To get started with EJBCA PKI Secrets Engine for HashiCorp Vault, see [Getting Started](docs/getting-started.md).
+In the [Keyfactor Community](https://www.keyfactor.com/community/), we welcome contributions. Keyfactor Community software is open-source and community-supported, meaning that **no SLA** is applicable. Keyfactor will address issues as resources become available.
 
-### System Requirements
+* To report a problem or suggest a new feature, go to [Issues](../../issues).
+* If you want to contribute bug fixes or proposed enhancements, see the [Contributing Guidelines](CONTRIBUTING.md) and create a [Pull request](../../pulls).
 
-<!--- Insert any requirements in this section. --->
-To run the EJBCA PKI Secrets Engine for HashiCorp Vault, the EJBCA REST API needs to be set up with certain endpoints. There are also requirements on certain versions of Git, Golang, EJBCA, and HashiCorp Vault. 
+> Commercial support is available for [EJBCA Enterprise](https://www.keyfactor.com/products/ejbca-enterprise/) customers, who may request escalation by opening up a support ticket through their Keyfactor representative.
 
-See the complete list in [System Requirements](docs/getting-started.md#requirements). 
+## Requirements
 
-## Community Support
-In the [Keyfactor Community](https://www.keyfactor.com/community/), we welcome contributions. 
+* [EJBCA](https://ejbca.org) (>= 7.10)
+* [Terraform](https://www.terraform.io/downloads) (>= 1.0)
+* [Go](https://go.dev/doc/install) (1.22.3)
+* [GNU Make](https://www.gnu.org/software/make/)
 
-The Community software is open-source and community-supported, meaning that **no SLA** is applicable.
+### To build
+* [Git](https://git-scm.com/)
+* [Golang](https://golang.org/) >= v1.19
 
-* To report a problem or suggest a new feature, go to [Issues](../../issues).
-* If you want to contribute actual bug fixes or proposed enhancements, see the [Contributing Guidelines](CONTRIBUTING.md) and go to [Pull requests](../../pulls).
+### To use
+* [EJBCA](https://www.keyfactor.com/products/ejbca-enterprise/) >= v7.7
+* [HashiCorp Vault](https://www.vaultproject.io/) >= v1.11.0
 
-## Commercial Support
 
-Commercial support is available for [EJBCA Enterprise](https://www.keyfactor.com/products/ejbca-enterprise/).
 
-<!--- For SignServer, update to the following text and link:
-Commercial support is available for [SignServer Enterprise](https://www.keyfactor.com/products/signserver-enterprise/).
---->
+## Getting Started
+
+To get started with EJBCA PKI Secrets Engine for HashiCorp Vault, see [Getting Started](docs/getting-started.md).
 
-## License
-<!--- No updates needed --->
-For License information, see [LICENSE](LICENSE). 
 
-## Related Projects
-See all [Keyfactor EJBCA GitHub projects](https://github.com/orgs/Keyfactor/repositories?q=ejbca). 
 
+## License
+For license information, see [LICENSE](LICENSE). 
 
+## Related Projects
+See all [Keyfactor EJBCA GitHub projects](https://github.com/orgs/Keyfactor/repositories?q=ejbca). 

backend.go

@@ -1,24 +1,35 @@
 /*
-Copyright 2024 Keyfactor
-Licensed under the Apache License, Version 2.0 (the "License"); you may
-not use this file except in compliance with the License.  You may obtain a
-copy of the License at http://www.apache.org/licenses/LICENSE-2.0.  Unless
-required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
-OR CONDITIONS OF ANY KIND, either express or implied. See the License for
-thespecific language governing permissions and limitations under the
-License.
+Copyright © 2024 Keyfactor
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
-package ejbca_vault_pki_engine
+
+package ejbca
 
 import (
 	"context"
-	"math/rand"
+	"crypto/rand"
+	"crypto/tls"
+	"crypto/x509"
+	"fmt"
+	"math/big"
 	"strings"
 	"sync"
 
+	"github.com/Keyfactor/ejbca-go-client-sdk/api/ejbca"
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/helper/consts"
+	"github.com/hashicorp/vault/sdk/helper/errutil"
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
@@ -96,7 +107,7 @@ func (b *ejbcaBackend) reset() {
 
 // invalidate clears an existing client configuration in
 // the backend
-func (b *ejbcaBackend) invalidate(ctx context.Context, key string) {
+func (b *ejbcaBackend) invalidate(_ context.Context, key string) {
 	if key == "config" {
 		b.reset()
 	}
@@ -130,17 +141,104 @@ func (sc *storageContext) getClient() (*ejbcaClient, error) {
 		config = new(ejbcaConfig)
 	}
 
+	logger.Trace("Creating new EJBCA authenticator")
+	authenticator, err := sc.Backend.newAuthenticator(config)
+	if err != nil {
+		return nil, err
+	}
+	if authenticator == nil {
+		logger.Error("Authenticator is nil")
+		return nil, fmt.Errorf("Authenticator is nil")
+	}
+
 	logger.Trace("Creating new EJBCA client")
-	sc.Backend.client, err = newClient(config)
+	sdkConfig := ejbca.NewConfiguration()
+	sdkConfig.Host = config.Hostname
+	sdkConfig.SetAuthenticator(authenticator)
+
+	client, err := ejbca.NewAPIClient(sdkConfig)
 	if err != nil {
 		return nil, err
 	}
+	sc.Backend.client = &ejbcaClient{client}
 
 	return sc.Backend.client, nil
 }
 
+func (b *ejbcaBackend) newAuthenticator(config *ejbcaConfig) (ejbca.Authenticator, error) {
+	var err error
+	logger := b.Logger().Named("ejbcaBackend.newAuthenticator")
+
+	var caChain []*x509.Certificate
+	if config.CaCert != "" {
+		logger.Info("CA chain present - Parsing CA chain from configuration")
+
+		blocks := decodePEMBytes([]byte(config.CaCert))
+		if len(blocks) == 0 {
+			return nil, errutil.UserError{Err: "didn't find pem certificate in ca_cert"}
+		}
+
+		for _, block := range blocks {
+			// Parse the PEM block into an x509 certificate
+			cert, err := x509.ParseCertificate(block.Bytes)
+			if err != nil {
+				return nil, fmt.Errorf("failed to parse CA certificate: %w", err)
+			}
+
+			caChain = append(caChain, cert)
+		}
+
+		logger.Debug("Parsed CA chain", "length", len(caChain))
+	}
+
+	var authenticator ejbca.Authenticator
+	switch {
+	case config.ClientCert != "" && config.ClientKey != "":
+		logger.Info("Creating mTLS authenticator")
+
+		var tlsCert tls.Certificate
+		tlsCert, err := tls.X509KeyPair([]byte(config.ClientCert), []byte(config.ClientKey))
+		if err != nil {
+			return nil, fmt.Errorf("failed to load client certificate: %w", err)
+		}
+
+		authenticator, err = ejbca.NewMTLSAuthenticatorBuilder().
+			WithCaCertificates(caChain).
+			WithClientCertificate(&tlsCert).
+			Build()
+		if err != nil {
+			logger.Error("Failed to build mTLS authenticator")
+			return nil, fmt.Errorf("failed to build MTLS authenticator: %w", err)
+		}
+
+		logger.Info("Created mTLS authenticator")
+	case config.TokenURL != "" && config.ClientID != "" && config.ClientSecret != "":
+		logger.Info("Creating OAuth authenticator")
+
+		authenticator, err = ejbca.NewOAuthAuthenticatorBuilder().
+			WithCaCertificates(caChain).
+			WithTokenUrl(config.TokenURL).
+			WithClientId(config.ClientID).
+			WithClientSecret(config.ClientSecret).
+			WithAudience(config.Audience).
+			WithScopes(config.Scopes).
+			Build()
+		if err != nil {
+			logger.Error("Failed to build OAuth authenticator")
+			return nil, fmt.Errorf("failed to build OAuth authenticator: %w", err)
+		}
+
+		logger.Info("Created OAuth authenticator")
+	default:
+		logger.Error("no authentication method configured")
+		return nil, fmt.Errorf("no authentication method configured")
+	}
+
+	return authenticator, nil
+}
+
 func (b *ejbcaBackend) isRunningOnPerformanceStandby() bool {
-    return b.System().ReplicationState().HasState(consts.ReplicationPerformanceStandby)
+	return b.System().ReplicationState().HasState(consts.ReplicationPerformanceStandby)
 }
 
 // backendHelp should contain help information for the backend
@@ -150,11 +248,15 @@ After mounting this backend, credentials to manage certificates must be configur
 with the "config/" endpoints.
 `
 
-func generateRandomString(length int) string {
+func generateRandomString(length int) (string, error) {
 	letters := []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
 	b := make([]rune, length)
 	for i := range b {
-		b[i] = letters[rand.Intn(len(letters))]
+		num, err := rand.Int(rand.Reader, big.NewInt(int64(len(letters))))
+		if err != nil {
+			return "", err
+		}
+		b[i] = letters[num.Int64()]
 	}
-	return string(b)
+	return string(b), nil
 }