Skip to content
This repository was archived by the owner on Apr 25, 2025. It is now read-only.

Commit 9eaeaec

Browse files
author
Baha Shaaban
committed
[FAB-10422] Hide print of private keys
 + some use log functions without variadic args when not passing other arguments then 1 string Change-Id: Iedcec3d90a281551c0e82fc1383dfa8ee3521f6b Signed-off-by: Baha Shaaban <baha.shaaban@securekey.com>
1 parent 1663815 commit 9eaeaec

File tree

9 files changed

+21
-27
lines changed

9 files changed

+21
-27
lines changed

‎internal/github.com/hyperledger/fabric-ca/lib/client/credential/x509/credential.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,14 @@ package x509
1212

1313
import (
1414
"encoding/hex"
15-
16-
"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/core"
17-
1815
"net/http"
1916

20-
factory "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/sdkpatch/cryptosuitebridge"
21-
log "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/sdkpatch/logbridge"
17+
"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/core"
2218

2319
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/api"
2420
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/lib/client/credential"
21+
factory "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/sdkpatch/cryptosuitebridge"
22+
log "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/sdkpatch/logbridge"
2523
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/util"
2624
"github.com/pkg/errors"
2725
)

‎internal/github.com/hyperledger/fabric-ca/util/csp.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ func ImportBCCSPKeyFromPEM(keyFile string, myCSP core.CryptoSuite, temporary boo
160160
// ImportBCCSPKeyFromPEMBytes attempts to create a private BCCSP key from a pem byte slice
161161
func ImportBCCSPKeyFromPEMBytes(keyBuff []byte, myCSP core.CryptoSuite, temporary bool) (core.Key, error) {
162162
keyFile := "pem bytes"
163-
164163
key, err := factory.PEMtoPrivateKey(keyBuff, nil)
165164
if err != nil {
166165
return nil, errors.WithMessage(err, fmt.Sprintf("Failed parsing private key from %s", keyFile))
@@ -229,10 +228,10 @@ func LoadX509KeyPair(certFile, keyFile []byte, csp core.CryptoSuite) (*tls.Certi
229228
if err != nil {
230229
if keyFile != nil {
231230
log.Debugf("Could not load TLS certificate with BCCSP: %s", err)
232-
log.Debugf("Attempting fallback with certfile %s and keyfile %s", certFile, keyFile)
231+
log.Debug("Attempting fallback with provided certfile and keyfile")
233232
fallbackCerts, err := tls.X509KeyPair(certFile, keyFile)
234233
if err != nil {
235-
return nil, errors.Wrapf(err, "Could not get the private key %s that matches %s", keyFile, certFile)
234+
return nil, errors.Wrap(err, "Could not get the private key that matches the provided cert")
236235
}
237236
cert = &fallbackCerts
238237
} else {

‎internal/github.com/hyperledger/fabric-ca/util/util.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ import (
3131
"io/ioutil"
3232
"math/big"
3333
mrand "math/rand"
34-
35-
factory "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/sdkpatch/cryptosuitebridge"
36-
"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/core"
37-
3834
"net/http"
3935
"os"
4036
"path/filepath"
@@ -43,6 +39,9 @@ import (
4339
"strings"
4440
"time"
4541

42+
factory "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/sdkpatch/cryptosuitebridge"
43+
"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/core"
44+
4645
"github.com/pkg/errors"
4746

4847
"golang.org/x/crypto/ocsp"

‎internal/github.com/hyperledger/fabric/bccsp/signer/signer.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ package signer
2121

2222
import (
2323
"crypto"
24+
"io"
2425

2526
"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/core"
2627

27-
"io"
28-
2928
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/utils"
3029
"github.com/pkg/errors"
3130
)

‎internal/github.com/hyperledger/fabric/msp/identities.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@ import (
2525
"crypto/rand"
2626
"crypto/x509"
2727
"encoding/hex"
28-
29-
"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/core"
30-
3128
"encoding/pem"
3229
"time"
3330

31+
"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/core"
32+
3433
"github.com/golang/protobuf/proto"
3534
bccsp "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/sdkpatch/cryptosuitebridge"
3635
flogging "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/sdkpatch/logbridge"

‎pkg/msp/getsigid.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ func (mgr *IdentityManager) getEmbeddedPrivateKey(username string) (core.Key, er
179179
// Try as a pem
180180
privateKey, err = fabricCaUtil.ImportBCCSPKeyFromPEMBytes(pemBytes, mgr.cryptoSuite, true)
181181
if err != nil {
182-
return nil, errors.Wrapf(err, "import private key failed %v", keyPem)
182+
return nil, errors.Wrap(err, "import private key failed")
183183
}
184184
}
185185
}

‎pkg/msp/identitymgr.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ func NewIdentityManager(orgName string, userStore msp.UserStore, cryptoSuite cor
5858
}
5959
mspPrivKeyStore, err = NewFileKeyStore(orgCryptoPathTemplate)
6060
if err != nil {
61-
return nil, errors.Wrapf(err, "creating a private key store failed")
61+
return nil, errors.Wrap(err, "creating a private key store failed")
6262
}
6363
mspCertStore, err = NewFileCertStore(orgCryptoPathTemplate)
6464
if err != nil {
65-
return nil, errors.Wrapf(err, "creating a cert store failed")
65+
return nil, errors.Wrap(err, "creating a cert store failed")
6666
}
6767
} else {
6868
logger.Warnf("Cryptopath not provided for organization [%s], MSP stores not created", orgName)

‎pkg/msp/user_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ func TestUserMethods(t *testing.T) {
5454
}
5555
_, err = newUser(userData, cryptoSuite)
5656
if err == nil {
57-
t.Fatalf("Expected newUser to fail when missing enrollment cert")
57+
t.Fatal("Expected newUser to fail when missing enrollment cert")
5858
}
5959

6060
// User not enrolled (have cert, but private key is not in crypto store)
6161
userData.EnrollmentCertificate = generatedCertBytes
6262
_, err = newUser(userData, cryptoSuite)
6363
if err == nil {
64-
t.Fatalf("Expected newUser to fail when user is not enrolled")
64+
t.Fatal("Expected newUser to fail when user is not enrolled")
6565
}
6666

6767
// Import the key into the crypto suite's private key storage.
@@ -85,7 +85,7 @@ func verifyUserIdentity(cryptoSuite core.CryptoSuite, t *testing.T, userData *ms
8585
}
8686
// Check Name
8787
if user.Identifier().ID != testUsername {
88-
t.Fatalf("NewUser create wrong user")
88+
t.Fatal("NewUser create wrong user")
8989
}
9090
// Check EnrolmentCert
9191
verifyBytes(t, user.EnrollmentCertificate(), generatedCertBytes)
@@ -101,11 +101,11 @@ func verifyBytes(t *testing.T, v interface{}, expected []byte) error {
101101
} else {
102102
vbytes, ok = v.([]byte)
103103
if !ok {
104-
t.Fatalf("value is not []byte")
104+
t.Fatal("value is not []byte")
105105
}
106106
}
107107
if !bytes.Equal(vbytes, expected) {
108-
t.Fatalf("value from store comparison failed")
108+
t.Fatal("value from store comparison failed")
109109
}
110110
return nil
111111
}

‎scripts/third_party_pins/fabric-ca/apply_fabric_ca_client_utils.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,8 @@ sed -i'' -e 's/errors.Errorf("Failed to find certificate PEM data in file %s, bu
273273
sed -i'' -e 's/errors.Errorf("Failed to find \"CERTIFICATE\" PEM block in file %s after skipping PEM blocks of the following types: %v", certFile, skippedBlockTypes)/errors.Errorf("Failed to find \"CERTIFICATE\" PEM block in bytes after skipping PEM blocks of the following types: %v", skippedBlockTypes)/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
274274
sed -i'' -e 's/keyFile != ""/keyFile != nil/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
275275
sed -i'' -e 's/tls.LoadX509KeyPair(certFile, keyFile)/tls.X509KeyPair(certFile, keyFile)/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
276-
277-
276+
sed -i'' -e 's/log.Debugf("Attempting fallback with certfile %s and keyfile %s", certFile, keyFile)/log.Debug("Attempting fallback with provided certfile and keyfile")/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
277+
sed -i'' -e 's/return nil, errors.Wrapf(err, "Could not get the private key %s that matches %s", keyFile, certFile)/return nil, errors.Wrap(err, "Could not get the private key that matches the provided cert")/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
278278

279279
FILTER_FILENAME="util/util.go"
280280
FILTER_FN="ReadFile,HTTPRequestToString,HTTPResponseToString"

0 commit comments

Comments
 (0)
⚡