Allow BCCSP config to be set using environment variables #1900

wlahti · 2020-09-18T00:26:52Z

Type of change

Bug fix

Related issues

jyellick

Overall looks pretty good, not a lot of actual code changes and mostly test which is of course great. Still, a few questions.

jyellick · 2020-09-29T19:19:47Z

bccsp/factory/opts.go

+
+// FactoryOpts holds configuration information used to initialize factory implementations
+type FactoryOpts struct {
+	Default string             `json:"default" yaml:"Default"`


I realize you're just moving this code about, but it's really bothersome that the yaml and json keys are differently cased. I'm not sure who would be depending on this behavior, so perhaps it's safest not to change, but just have to point it out.

jyellick · 2020-09-29T19:31:09Z

bccsp/factory/opts.go

@@ -25,6 +24,10 @@ func GetDefaultOpts() *FactoryOpts {
 			Hash:     "SHA2",
 			Security: 256,
 		},
+		PKCS11: &pkcs11.PKCS11Opts{


I guess it's fine to consolidate these into a single struct regardless of build tag because we never try to interact with the pkcs11 lib unless we follow the path set out in the pkcs11.go file?

Yes, that was the thinking here.

common/viperutil/config_util.go

wlahti · 2020-09-30T15:48:47Z

internal/peer/common/common.go

+	// SW Overrides
+	if swHash, exist := os.LookupEnv("CORE_PEER_BCCSP_SW_HASH"); exist {
+		bccspConfig.SW.Hash = swHash
+	}
+
+	if swSecurity, exist := os.LookupEnv("CORE_PEER_BCCSP_SW_SECURITY"); exist {
+		swSec, err := strconv.Atoi(swSecurity)
+		if err != nil {
+			return errors.Errorf("CORE_PEER_BCCSP_SW_SECURITY set to non-integer value: %s", swSecurity)
+		}
+		bccspConfig.SW.Security = swSec
+	}


We could remove these SW override lookups since BCCSP hardcodes these anyways.

jyellick

I don't love implementing this environment parsing manually, but given the downsides of the implementation through viperutil, it seems like the lesser of the two evils. Did you want to address Will's comment now, or should we merge as is?

FAB-17969 Signed-off-by: Tiffany Harris <tiffany.harris@ibm.com> Signed-off-by: Will Lahti <wtlahti@us.ibm.com>

stephyee · 2020-10-02T13:56:54Z

@jyellick removed the overrides for hardcoded SW values

FAB-17969 Signed-off-by: Tiffany Harris <tiffany.harris@ibm.com> Signed-off-by: Will Lahti <wtlahti@us.ibm.com>

lindluni · 2020-10-20T18:35:49Z

This change had some a pretty well hidden side affect. It pushed PKCS11 code outside of the pkcs11 build tag gating, which now pulls the pkcs11 library in, even when you aren't using pkcs11 factories. This prevents cross-compilation of fabric from one platform to another now unless you have a C cross-platform compiler installed and pass the proper CGO options when building since the miekg package uses CGO

stephyee · 2020-10-21T12:44:01Z

@btl5037 what do you suggest? reverting?

This reverts commit 0a9f766. which pushed the pkcs11 code outside of the pkcs11 build tag. This prevents cross-compilation of Fabric due to the fact the miekg/pkcs11 package contains CGO which requires a cross-compiler for each platform you are cross compiling for. We need to find a better approach to solving this problem that doesn't pull the code out of the build tag. Signed-off-by: Brett Logan <brett.t.logan@ibm.com>

This reverts commit f2e9e6e. which pushed the pkcs11 code outside of the pkcs11 build tag. This prevents cross-compilation of Fabric due to the fact the miekg/pkcs11 package contains CGO which requires a cross-compiler for each platform you are cross compiling for. We need to find a better approach to solving this problem that doesn't pull the code out of the build tag. Signed-off-by: Danny Cao <dcao@us.ibm.com>

denyeart · 2022-10-25T01:10:15Z

Resolved in #3697

wlahti requested a review from a team as a code owner September 18, 2020 00:26

wlahti force-pushed the fab-17969 branch from b663c40 to 436dde9 Compare September 22, 2020 22:56

wlahti changed the title ~~Allow peer BCCSP config to be set using environment variables~~ Allow BCCSP config to be set using environment variables Sep 22, 2020

wlahti force-pushed the fab-17969 branch 6 times, most recently from 8b80483 to 37d0330 Compare September 23, 2020 16:37

jyellick reviewed Sep 29, 2020

View reviewed changes

wlahti force-pushed the fab-17969 branch 2 times, most recently from 48786aa to bfb217b Compare September 29, 2020 20:52

wlahti marked this pull request as draft September 29, 2020 21:57

wlahti force-pushed the fab-17969 branch 3 times, most recently from 574d6aa to 0a4546c Compare September 30, 2020 15:39

wlahti commented Sep 30, 2020

View reviewed changes

wlahti marked this pull request as ready for review September 30, 2020 16:07

jyellick previously approved these changes Oct 2, 2020

View reviewed changes

Allow BCCSP config to be set using env var

bb7839e

FAB-17969 Signed-off-by: Tiffany Harris <tiffany.harris@ibm.com> Signed-off-by: Will Lahti <wtlahti@us.ibm.com>

stephyee dismissed jyellick’s stale review via bb7839e October 2, 2020 13:16

stephyee force-pushed the fab-17969 branch from 0a4546c to bb7839e Compare October 2, 2020 13:16

jyellick approved these changes Oct 2, 2020

View reviewed changes

jyellick merged commit 0a9f766 into hyperledger:master Oct 2, 2020

wlahti added a commit to wlahti/fabric that referenced this pull request Oct 2, 2020

Allow BCCSP config to be set using env var (hyperledger#1900)

da6a5c1

FAB-17969 Signed-off-by: Tiffany Harris <tiffany.harris@ibm.com> Signed-off-by: Will Lahti <wtlahti@us.ibm.com>

ale-linux pushed a commit that referenced this pull request Oct 5, 2020

Allow BCCSP config to be set using env var (#1900)

f2e9e6e

FAB-17969 Signed-off-by: Tiffany Harris <tiffany.harris@ibm.com> Signed-off-by: Will Lahti <wtlahti@us.ibm.com>

wlahti added a commit to wlahti/fabric that referenced this pull request Oct 13, 2020

Allow BCCSP config to be set using env var (hyperledger#1900)

eceaf93

FAB-17969 Signed-off-by: Tiffany Harris <tiffany.harris@ibm.com> Signed-off-by: Will Lahti <wtlahti@us.ibm.com>

jpatchell mentioned this pull request Oct 11, 2022

Use env variables to initialize the PKCS11 BCCSP #3681

Closed

denyeart mentioned this pull request Oct 20, 2022

Use env variables to initialize the PKCS11 BCCSP #3697

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow BCCSP config to be set using environment variables #1900

Allow BCCSP config to be set using environment variables #1900

wlahti commented Sep 18, 2020

jyellick left a comment

jyellick Sep 29, 2020

jyellick Sep 29, 2020

wlahti Sep 30, 2020

wlahti Sep 30, 2020 •

edited

Loading

stephyee Sep 30, 2020

stephyee Oct 2, 2020

jyellick left a comment

stephyee commented Oct 2, 2020

lindluni commented Oct 20, 2020

stephyee commented Oct 21, 2020

denyeart commented Oct 25, 2022

Allow BCCSP config to be set using environment variables #1900

Allow BCCSP config to be set using environment variables #1900

Conversation

wlahti commented Sep 18, 2020

Type of change

Related issues

jyellick left a comment

Choose a reason for hiding this comment

jyellick Sep 29, 2020

Choose a reason for hiding this comment

jyellick Sep 29, 2020

Choose a reason for hiding this comment

wlahti Sep 30, 2020

Choose a reason for hiding this comment

wlahti Sep 30, 2020 • edited Loading

Choose a reason for hiding this comment

stephyee Sep 30, 2020

Choose a reason for hiding this comment

stephyee Oct 2, 2020

Choose a reason for hiding this comment

jyellick left a comment

Choose a reason for hiding this comment

stephyee commented Oct 2, 2020

lindluni commented Oct 20, 2020

stephyee commented Oct 21, 2020

denyeart commented Oct 25, 2022

wlahti Sep 30, 2020 •

edited

Loading