reduce bug-available area

x-pack/filebeat/input/cel/config_auth.go

@@ -5,11 +5,8 @@
 package cel
 
 import (
-	"bytes"
 	"context"
-	"crypto/x509"
 	"encoding/json"
-	"encoding/pem"
 	"errors"
 	"fmt"
 	"io/fs"
@@ -343,14 +340,7 @@ func (o *oAuth2Config) validateOktaProvider() error {
 	}
 	// jwk_pem
 	if o.OktaJWKPEM != "" {
-		blk, rest := pem.Decode([]byte(o.OktaJWKPEM))
-		if rest := bytes.TrimSpace(rest); len(rest) != 0 {
-			return fmt.Errorf("okta validation error: PEM text has trailing data: %d bytes", len(rest))
-		}
-		if blk == nil {
-			return errors.New("okta validation error: no PEM data")
-		}
-		_, err := x509.ParsePKCS8PrivateKey(blk.Bytes)
+		_, err := pemPKCS8PrivateKey([]byte(o.OktaJWKPEM))
 		if err != nil {
 			return fmt.Errorf("okta validation error: %w", err)
 		}

x-pack/filebeat/input/cel/config_okta_auth.go

@@ -161,20 +161,24 @@ func (i *base64int) UnmarshalJSON(b []byte) error {
 }
 
 func generateOktaJWTPEM(pemdata string, cnf *oauth2.Config) (string, error) {
-	blk, rest := pem.Decode([]byte(pemdata))
-	if rest := bytes.TrimSpace(rest); len(rest) != 0 {
-		return "", fmt.Errorf("PEM text has trailing data: %d bytes", len(rest))
-	}
-	if blk == nil {
-		return "", errors.New("no PEM data")
-	}
-	key, err := x509.ParsePKCS8PrivateKey(blk.Bytes)
+	key, err := pemPKCS8PrivateKey([]byte(pemdata))
 	if err != nil {
 		return "", err
 	}
 	return signJWT(cnf, key)
 }
 
+func pemPKCS8PrivateKey(pemdata []byte) (any, error) {
+	blk, rest := pem.Decode(pemdata)
+	if rest := bytes.TrimSpace(rest); len(rest) != 0 {
+		return nil, fmt.Errorf("PEM text has trailing data: %d bytes", len(rest))
+	}
+	if blk == nil {
+		return nil, errors.New("no PEM data")
+	}
+	return x509.ParsePKCS8PrivateKey(blk.Bytes)
+}
+
 // signJWT creates a JWT token using required claims and sign it with the
 // private key.
 func signJWT(cnf *oauth2.Config, key any) (string, error) {

x-pack/filebeat/input/httpjson/config_auth.go

@@ -5,11 +5,8 @@
 package httpjson
 
 import (
-	"bytes"
 	"context"
-	"crypto/x509"
 	"encoding/json"
-	"encoding/pem"
 	"errors"
 	"fmt"
 	"io/fs"
@@ -311,14 +308,7 @@ func (o *oAuth2Config) validateOktaProvider() error {
 	}
 	// jwk_pem
 	if o.OktaJWKPEM != "" {
-		blk, rest := pem.Decode([]byte(o.OktaJWKPEM))
-		if rest := bytes.TrimSpace(rest); len(rest) != 0 {
-			return fmt.Errorf("okta validation error: PEM text has trailing data: %d bytes", len(rest))
-		}
-		if blk == nil {
-			return errors.New("okta validation error: no PEM data")
-		}
-		_, err := x509.ParsePKCS8PrivateKey(blk.Bytes)
+		_, err := pemPKCS8PrivateKey([]byte(o.OktaJWKPEM))
 		if err != nil {
 			return fmt.Errorf("okta validation error: %w", err)
 		}

x-pack/filebeat/input/httpjson/config_okta_auth.go

@@ -159,20 +159,24 @@ func (i *base64int) UnmarshalJSON(b []byte) error {
 }
 
 func generateOktaJWTPEM(pemdata string, cnf *oauth2.Config) (string, error) {
-	blk, rest := pem.Decode([]byte(pemdata))
-	if rest := bytes.TrimSpace(rest); len(rest) != 0 {
-		return "", fmt.Errorf("PEM text has trailing data: %d bytes", len(rest))
-	}
-	if blk == nil {
-		return "", errors.New("no PEM data")
-	}
-	key, err := x509.ParsePKCS8PrivateKey(blk.Bytes)
+	key, err := pemPKCS8PrivateKey([]byte(pemdata))
 	if err != nil {
 		return "", err
 	}
 	return signJWT(cnf, key)
 }
 
+func pemPKCS8PrivateKey(pemdata []byte) (any, error) {
+	blk, rest := pem.Decode(pemdata)
+	if rest := bytes.TrimSpace(rest); len(rest) != 0 {
+		return nil, fmt.Errorf("PEM text has trailing data: %d bytes", len(rest))
+	}
+	if blk == nil {
+		return nil, errors.New("no PEM data")
+	}
+	return x509.ParsePKCS8PrivateKey(blk.Bytes)
+}
+
 // signJWT creates a JWT token using required claims and sign it with the private key.
 func signJWT(cnf *oauth2.Config, key any) (string, error) {
 	now := time.Now()