Reject illegal channel IDs in configtxgen

The orderer already refuses these IDs. configtxgen would still write a genesis block the network cannot join.

Signed-off-by: Hamed Yousefi <hdyousefi@gmail.com>

Author: hmdsefi

cmd/configtxgen/main.go

@@ -19,6 +19,7 @@ import (
 	"github.com/hyperledger/fabric-lib-go/bccsp/factory"
 	"github.com/hyperledger/fabric-lib-go/common/flogging"
 	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
+	"github.com/hyperledger/fabric/common/configtx"
 	"github.com/hyperledger/fabric/internal/configtxgen/encoder"
 	"github.com/hyperledger/fabric/internal/configtxgen/genesisconfig"
 	"github.com/hyperledger/fabric/internal/configtxgen/metadata"
@@ -29,6 +30,9 @@ import (
 var logger = flogging.MustGetLogger("common.tools.configtxgen")
 
 func doOutputBlock(config *genesisconfig.Profile, channelID string, outputBlock string) error {
+	if err := configtx.ValidateChannelID(channelID); err != nil {
+		return errors.WithMessage(err, "invalid channel ID")
+	}
 	pgen, err := encoder.NewBootstrapper(config)
 	if err != nil {
 		return errors.WithMessage(err, "could not create bootstrapper")
@@ -55,6 +59,9 @@ func doOutputBlock(config *genesisconfig.Profile, channelID string, outputBlock
 }
 
 func doOutputChannelCreateTx(conf, baseProfile *genesisconfig.Profile, channelID string, outputChannelCreateTx string) error {
+	if err := configtx.ValidateChannelID(channelID); err != nil {
+		return errors.WithMessage(err, "invalid channel ID")
+	}
 	logger.Info("Generating new channel configtx")
 
 	var configtx *cb.Envelope

cmd/configtxgen/main_test.go

@@ -205,7 +205,7 @@ func TestBftOrdererTypeWithoutV3CapabilitiesShouldRaiseAnError(t *testing.T) {
 	config.Capabilities["V3_0"] = false
 
 	// ### Act & Assert
-	require.EqualError(t, doOutputBlock(config, "testChannelId", blockDest), "could not create bootstrapper: could not create channel group: could not create orderer group: orderer type BFT must be used with V3_0 channel capability: map[V3_0:false]")
+	require.EqualError(t, doOutputBlock(config, "testchannelid", blockDest), "could not create bootstrapper: could not create channel group: could not create orderer group: orderer type BFT must be used with V3_0 channel capability: map[V3_0:false]")
 }
 
 func TestBftOrdererTypeWithV3CapabilitiesShouldNotRaiseAnError(t *testing.T) {
@@ -215,5 +215,17 @@ func TestBftOrdererTypeWithV3CapabilitiesShouldNotRaiseAnError(t *testing.T) {
 	config.Capabilities["V3_0"] = true
 
 	// ### Act & Assert
-	require.NoError(t, doOutputBlock(config, "testChannelId", blockDest))
+	require.NoError(t, doOutputBlock(config, "testchannelid", blockDest))
+}
+
+func TestRejectsIllegalChannelID(t *testing.T) {
+	blockDest := filepath.Join(tmpDir, "block")
+	config := genesisconfig.Load(genesisconfig.SampleAppChannelInsecureSoloProfile, configtest.GetDevConfigDir())
+
+	err := doOutputBlock(config, "Foo", blockDest)
+	require.ErrorContains(t, err, "invalid channel ID")
+
+	configTxDest := filepath.Join(tmpDir, "configtx")
+	err = doOutputChannelCreateTx(config, nil, "1abc", configTxDest)
+	require.ErrorContains(t, err, "invalid channel ID")
 }