Mirrors/plane
1
0
Fork 0
mirror of https://github.com/makeplane/plane.git synced 2026-02-25 04:35:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: private key parsing with PKCS1 (#1591)

Browse Source
This commit is contained in:
Henit Chobisa
2024-10-23 19:55:01 +05:30
committed by GitHub
parent 438b2f088e
commit fbaf5d34ec
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
monitor/cli/cmd/start.go
View File

@@ -34,11 +34,6 @@ var StartCmd = &cobra.Command{
}
db.Initialize()
_, err = feat_flag.ParsePrivateKey(PRIVATE_KEY)
if err != nil {
return err
}
_, err = feat_flag.ParsePrivateKey(PRIVATE_KEY)
if err != nil {

16
monitor/lib/feat_flag/decryption.go
View File

@@ -6,6 +6,7 @@ import (
"crypto/rand"
"crypto/rsa"
"crypto/sha1"
"crypto/x509"
"encoding/base64"
"encoding/json"
"encoding/pem"
@@ -68,6 +69,7 @@ func decodeBase64Key(base64EncodedKey string) ([]byte, error) {
/* ---------------------- Helper Functions ---------------------------- */
// Parses the private key given to the rsa.PrivateKey type
func ParsePrivateKey(base64EncodedKey string) (*rsa.PrivateKey, error) {
decodedKey, err := decodeBase64Key(base64EncodedKey)
if err != nil {
@@ -78,15 +80,19 @@ func ParsePrivateKey(base64EncodedKey string) (*rsa.PrivateKey, error) {
if block == nil {
return nil, fmt.Errorf("failed to parse PEM block containing the key")
}
privateKey, err := x509.ParsePKCS1PrivateKey(block.Bytes)
privateKey, err := pkcs8.ParsePKCS8PrivateKey(block.Bytes)
if err != nil {
return nil, fmt.Errorf("failed to parse RSA private key: %v", err)
privateKey, err := pkcs8.ParsePKCS8PrivateKey(block.Bytes)
if err != nil {
return nil, fmt.Errorf("failed to parse RSA private key: %v", err)
}
key := privateKey.(*rsa.PrivateKey)
return key, nil
}
key := privateKey.(*rsa.PrivateKey)
return key, nil
return privateKey, nil
}
func decryptWithPrivateKey(data EncryptedData, privateKey *rsa.PrivateKey) ([]byte, error) {