Fix key format of generate rsa private key

PichuChen · Aug 2, 2024 · fcf75a6 · fcf75a6
1 parent 79f6c0a
commit fcf75a6
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 2 deletions.
diff --git a/activitypub/signature/signature.go b/activitypub/signature/signature.go
@@ -156,7 +156,11 @@ func Pubout(privateKeyPem []byte) []byte {
 	}
 
 	// encode to pem
-	keyBytes := x509.MarshalPKCS1PublicKey(&key.(*rsa.PrivateKey).PublicKey)
+	keyBytes, err := x509.MarshalPKIXPublicKey(key.(*rsa.PrivateKey).Public())
+	if err != nil {
+		slog.Error("Failed to marshal public key", "Error", err)
+		return nil
+	}
 
 	return pem.EncodeToMemory(&pem.Block{
 		Type:  "PUBLIC KEY",
@@ -178,7 +182,7 @@ func GeneratePrivateKey() string {
 	}
 
 	return string(pem.EncodeToMemory(&pem.Block{
-		Type:  "RSA PRIVATE KEY",
+		Type:  "PRIVATE KEY",
 		Bytes: keyBytes,
 	}))
 }

diff --git a/activitypub/signature/signature_test.go b/activitypub/signature/signature_test.go
@@ -112,3 +112,51 @@ func TestSignatureHeader(t *testing.T) {
 
 	}
 }
+
+func TestRSAPubout(t *testing.T) {
+	privateKeyPem := `-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC0S0NTogJhUZ56
+3AmWu2BUhxafIVqdG30twyT8zqHsGGPtzITSo23XHZVD9MhEb94dWHv+Io2gXi04
+Dq/w8MSudBiFxP7dkwPvH9BVmkIDAT4CXqqldPeE+gwDX3oGM/k3blbERi26EBJd
+UDXFuGXXyJLzIXzFJ9xgZ9GohjUlKFJlLXhaErm4Du7BHFsnT02HSXstmfSnIwuX
+/DH699FsWGzVDg2Z8ntAuLeVawzfLO6KmxunQLf3U6tX/NrgKrUbUcNuSvTdphFl
+UnJDZiMAHd+xkWHez+s0FH3IJA1AXWbjRzsqh2vpzgtRKEVdCLsNo+dB8fdnOVV9
+JmnKuLgfAgMBAAECggEAIsIBvE1W7SEZjvD9rj/4bcNPUqVQ/UnP47Mj3dMON2Bq
+X21Wy+7y3Y5X+O5nb34rkXe+C7voltqhGBYIyEf6evFpytw0EE5n60E0XlRrVn32
+UOmkN1qp30p/Z2UQNsLtUEjm1Fb9OMohaDju7OvEQonp/pJdpfqtyy4oprcc5skg
+3tpioZ1HgDMbNFsOtVybI7vCw7KSqU4DU53XzYXSGBSOPyy7yUuPBnAV62vFrXO0
+alX3wtCDKMsrO8x+99pV0XtUNPJ5GiAeQiQBFU572fcuAesaOTOzYUG5wtNkgt01
+m//QLa/OmnwWhxsK9qUxHpg6UPKohKVhSXqwDVFIWQKBgQDQ1c6fxhvifZi8mKPt
+FySKDtSmSUb6XOmOtkv3RlC1+Mgy4pVWRfePd8mBhtEf2dWG30kGZwbnCHp/ok2p
+V+NWLq5atbQgmFRDAcX8wCn3b0di28X2wMra1TkUHkP2W5u979KyC1McJaGE6QnS
+vO3lybA6tsO6+1vhF/3bC8OCqQKBgQDdA0tS63o/Wui6jWkKJyh0I1Piu06anYc1
+yjDx98c4WNW1TCQvFf3kn1L+gjjuBPBGL3tVnhLktm6sV/KhTOzgmDlS2k/E+JKl
+mzvAQ06gKhQdcJLarwa0GSyKlpfMSKTBvL/bH0PyrUYlY2/efxMbno5v0zj8Vi/S
+K6Ka4fvphwKBgH53fFG1n11hwgU0StFhmncg1BZ/ecRUT/xk2Uw+ANKyfkqSfO1q
+Ial4WUdfZXVsbarnvUlrSvrOX6C7oVxUJRAj5OJ590Nl/GE3ybZuiPuXIBv2C8SK
+rE4pog9U5MNkZsR3X5kC0qnRACeFGLXORCNMKLTlyVKKtfFyngDw9s1BAoGAJl7W
+CvVa6fjsgsbeP6cAvPkNLUX7pZhHyyzpRnkQG1ZA9BLeDVayF6kZjZoqLBirZmQD
+859YBGEv4bf7JcnnLi7/dMT2KGpHe3zx6LVGx0PG7j2HIXRVo5rjQsRWYl8SS5hr
+bq2E7HLsxLz4xRYmyRrD++Id+KE1+DUfK+ikBa0CgYB9NhLS4bCKlUsGcMfvKe4Y
+IGZM5kyAbOkl0oKPQVT/4lsbwExopj9M4oE4BPJcSRx4JWUghjDyHKBvUnMvnPCe
+C61EeSrlwKTNRojY09kAKF3FaTaoyJDjeFcWbRJ4oX8QNLPGpzRZFrCCe1WgHRhQ
+bgZ5TKo2v+nTWMJq1djPJQ==
+-----END PRIVATE KEY-----
+`
+	expected := `-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtEtDU6ICYVGeetwJlrtg
+VIcWnyFanRt9LcMk/M6h7Bhj7cyE0qNt1x2VQ/TIRG/eHVh7/iKNoF4tOA6v8PDE
+rnQYhcT+3ZMD7x/QVZpCAwE+Al6qpXT3hPoMA196BjP5N25WxEYtuhASXVA1xbhl
+18iS8yF8xSfcYGfRqIY1JShSZS14WhK5uA7uwRxbJ09Nh0l7LZn0pyMLl/wx+vfR
+bFhs1Q4NmfJ7QLi3lWsM3yzuipsbp0C391OrV/za4Cq1G1HDbkr03aYRZVJyQ2Yj
+AB3fsZFh3s/rNBR9yCQNQF1m40c7Kodr6c4LUShFXQi7DaPnQfH3ZzlVfSZpyri4
+HwIDAQAB
+-----END PUBLIC KEY-----
+`
+
+	publicKeyPem := Pubout([]byte(privateKeyPem))
+
+	if string(publicKeyPem) != expected {
+		t.Errorf("Expected %s, got %s", expected, publicKeyPem)
+	}
+}