Merge branch 'main' into changelog/update-0.13.1

hashicorp · Oct 14, 2024 · 01492eb · 01492eb
2 parents 225d0da + 90e07b9
commit 01492eb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Unreleased
 
+BUG FIXES:
+
+* fix a panic on static role creation when the config is unset (https://github.com/hashicorp/vault-plugin-secrets-openldap/pull/119)
+
 ## v0.14.1
 
 BUG FIXES:

diff --git a/path_static_roles.go b/path_static_roles.go
@@ -5,7 +5,6 @@ package openldap
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"strings"
 	"time"
@@ -318,8 +317,12 @@ func (b *backend) pathStaticRoleCreateUpdate(ctx context.Context, req *logical.R
 		// otherwise, go get it if this is a create request.
 		c, err := readConfig(ctx, req.Storage)
 		if err != nil {
-			return nil, errors.New("couldn't find configuration for this create operation's endpoint")
+			return nil, err
+		}
+		if c == nil {
+			return logical.ErrorResponse("missing LDAP configuration"), nil
 		}
+
 		skipRotation = c.SkipStaticRoleImportRotation
 	}