QLight

cmd/geth/config.go

@@ -18,6 +18,7 @@ package main
 
 import (
 	"bufio"
+	"crypto/tls"
 	"errors"
 	"fmt"
 	"math/big"
@@ -34,9 +35,13 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/metrics"
 	"github.com/ethereum/go-ethereum/node"
+	"github.com/ethereum/go-ethereum/p2p"
+	"github.com/ethereum/go-ethereum/p2p/enode"
 	"github.com/ethereum/go-ethereum/params"
+	"github.com/ethereum/go-ethereum/permission/core"
 	"github.com/ethereum/go-ethereum/private"
 	"github.com/ethereum/go-ethereum/private/engine"
+	"github.com/ethereum/go-ethereum/qlight"
 	"github.com/naoina/toml"
 	"gopkg.in/urfave/cli.v1"
 )
@@ -135,6 +140,8 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, gethConfig) {
 
 	// Apply flags.
 	utils.SetNodeConfig(ctx, &cfg.Node)
+	utils.SetQLightConfig(ctx, &cfg.Node, &cfg.Eth)
+
 	stack, err := node.New(&cfg.Node)
 	if err != nil {
 		utils.Fatalf("Failed to create the protocol stack: %v", err)
@@ -144,10 +151,74 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, gethConfig) {
 		cfg.Ethstats.URL = ctx.GlobalString(utils.EthStatsURLFlag.Name)
 	}
 	applyMetricConfig(ctx, &cfg)
+	if cfg.Eth.QuorumLightServer {
+		p2p.SetQLightTLSConfig(readQLightServerTLSConfig(ctx))
+		// permissioning for the qlight P2P server
+		stack.QServer().SetNewTransportFunc(p2p.NewQlightServerTransport)
+		if ctx.GlobalIsSet(utils.QuorumLightServerP2PPermissioningFlag.Name) {
+			prefix := "qlight"
+			if ctx.GlobalIsSet(utils.QuorumLightServerP2PPermissioningPrefixFlag.Name) {
+				prefix = ctx.GlobalString(utils.QuorumLightServerP2PPermissioningPrefixFlag.Name)
+			}
+			fbp := core.NewFileBasedPermissoningWithPrefix(prefix)
+			stack.QServer().SetIsNodePermissioned(fbp.IsNodePermissionedEnode)
+		}
+	}
+	if cfg.Eth.QuorumLightClient.Enabled() {
+		p2p.SetQLightTLSConfig(readQLightClientTLSConfig(ctx))
+		stack.Server().SetNewTransportFunc(p2p.NewQlightClientTransport)
+	}
 
 	return stack, cfg
 }
 
+func readQLightClientTLSConfig(ctx *cli.Context) *tls.Config {
+	if !ctx.GlobalIsSet(utils.QuorumLightTLSFlag.Name) {
+		return nil
+	}
+	if !ctx.GlobalIsSet(utils.QuorumLightTLSCACertsFlag.Name) {
+		utils.Fatalf("QLight tls flag is set but no client certificate authorities has been provided")
+	}
+	tlsConfig, err := qlight.ConfigureQLightTLSConfig(&qlight.TLSConfig{
+		CACertFileName: ctx.GlobalString(utils.QuorumLightTLSCACertsFlag.Name),
+		CertFileName:   ctx.GlobalString(utils.QuorumLightTLSCertFlag.Name),
+		KeyFileName:    ctx.GlobalString(utils.QuorumLightTLSKeyFlag.Name),
+		ServerName:     enode.MustParse(ctx.GlobalString(utils.QuorumLightClientServerNodeFlag.Name)).IP().String(),
+		CipherSuites:   ctx.GlobalString(utils.QuorumLightTLSCipherSuitesFlag.Name),
+	})
+
+	if err != nil {
+		utils.Fatalf("Unable to load the specified tls configuration: %v", err)
+	}
+	return tlsConfig
+}
+
+func readQLightServerTLSConfig(ctx *cli.Context) *tls.Config {
+	if !ctx.GlobalIsSet(utils.QuorumLightTLSFlag.Name) {
+		return nil
+	}
+	if !ctx.GlobalIsSet(utils.QuorumLightTLSCertFlag.Name) {
+		utils.Fatalf("QLight tls flag is set but no server certificate has been provided")
+	}
+	if !ctx.GlobalIsSet(utils.QuorumLightTLSKeyFlag.Name) {
+		utils.Fatalf("QLight tls flag is set but no server key has been provided")
+	}
+
+	tlsConfig, err := qlight.ConfigureQLightTLSConfig(&qlight.TLSConfig{
+		CertFileName:         ctx.GlobalString(utils.QuorumLightTLSCertFlag.Name),
+		KeyFileName:          ctx.GlobalString(utils.QuorumLightTLSKeyFlag.Name),
+		ClientCACertFileName: ctx.GlobalString(utils.QuorumLightTLSCACertsFlag.Name),
+		ClientAuth:           ctx.GlobalInt(utils.QuorumLightTLSClientAuthFlag.Name),
+		CipherSuites:         ctx.GlobalString(utils.QuorumLightTLSCipherSuitesFlag.Name),
+	})
+
+	if err != nil {
+		utils.Fatalf("QLight tls - unable to read server tls configuration: %v", err)
+	}
+
+	return tlsConfig
+}
+
 // makeFullNode loads geth configuration and creates the Ethereum backend.
 func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
 	stack, cfg := makeConfigNode(ctx)
@@ -174,7 +245,7 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
 		utils.RegisterPermissionService(stack, ctx.Bool(utils.RaftDNSEnabledFlag.Name), backend.ChainConfig().ChainID)
 	}
 
-	if ctx.GlobalBool(utils.RaftModeFlag.Name) {
+	if ctx.GlobalBool(utils.RaftModeFlag.Name) && !cfg.Eth.QuorumLightClient.Enabled() {
 		utils.RegisterRaftService(stack, ctx, &cfg.Node, ethService)
 	}
 
@@ -296,7 +367,7 @@ func quorumInitialisePrivacy(ctx *cli.Context) error {
 		return err
 	}
 
-	err = private.InitialiseConnection(cfg)
+	err = private.InitialiseConnection(cfg, ctx.GlobalIsSet(utils.QuorumLightClientFlag.Name))
 	if err != nil {
 		return err
 	}

cmd/geth/main.go

@@ -190,6 +190,30 @@ var (
 		utils.QuorumPTMTlsClientCertFlag,
 		utils.QuorumPTMTlsClientKeyFlag,
 		utils.QuorumPTMTlsInsecureSkipVerify,
+		utils.QuorumLightServerFlag,
+		utils.QuorumLightServerP2PListenPortFlag,
+		utils.QuorumLightServerP2PMaxPeersFlag,
+		utils.QuorumLightServerP2PNetrestrictFlag,
+		utils.QuorumLightServerP2PPermissioningFlag,
+		utils.QuorumLightServerP2PPermissioningPrefixFlag,
+		utils.QuorumLightClientFlag,
+		utils.QuorumLightClientPSIFlag,
+		utils.QuorumLightClientTokenEnabledFlag,
+		utils.QuorumLightClientTokenValueFlag,
+		utils.QuorumLightClientTokenManagementFlag,
+		utils.QuorumLightClientRPCTLSFlag,
+		utils.QuorumLightClientRPCTLSInsecureSkipVerifyFlag,
+		utils.QuorumLightClientRPCTLSCACertFlag,
+		utils.QuorumLightClientRPCTLSCertFlag,
+		utils.QuorumLightClientRPCTLSKeyFlag,
+		utils.QuorumLightClientServerNodeFlag,
+		utils.QuorumLightClientServerNodeRPCFlag,
+		utils.QuorumLightTLSFlag,
+		utils.QuorumLightTLSCertFlag,
+		utils.QuorumLightTLSKeyFlag,
+		utils.QuorumLightTLSCACertsFlag,
+		utils.QuorumLightTLSClientAuthFlag,
+		utils.QuorumLightTLSCipherSuitesFlag,
 		// End-Quorum
 	}
 

cmd/geth/usage.go

@@ -257,6 +257,35 @@ var AppHelpFlagGroups = []flags.FlagGroup{
 			utils.QuorumEnablePrivacyMarker,
 		},
 	},
+	{
+		Name: "QUORUM LIGHT CLIENT/SERVER",
+		Flags: []cli.Flag{
+			utils.QuorumLightServerFlag,
+			utils.QuorumLightServerP2PListenPortFlag,
+			utils.QuorumLightServerP2PMaxPeersFlag,
+			utils.QuorumLightServerP2PNetrestrictFlag,
+			utils.QuorumLightServerP2PPermissioningFlag,
+			utils.QuorumLightServerP2PPermissioningPrefixFlag,
+			utils.QuorumLightClientFlag,
+			utils.QuorumLightClientPSIFlag,
+			utils.QuorumLightClientTokenEnabledFlag,
+			utils.QuorumLightClientTokenValueFlag,
+			utils.QuorumLightClientTokenManagementFlag,
+			utils.QuorumLightClientRPCTLSFlag,
+			utils.QuorumLightClientRPCTLSInsecureSkipVerifyFlag,
+			utils.QuorumLightClientRPCTLSCACertFlag,
+			utils.QuorumLightClientRPCTLSCertFlag,
+			utils.QuorumLightClientRPCTLSKeyFlag,
+			utils.QuorumLightClientServerNodeFlag,
+			utils.QuorumLightClientServerNodeRPCFlag,
+			utils.QuorumLightTLSFlag,
+			utils.QuorumLightTLSCertFlag,
+			utils.QuorumLightTLSKeyFlag,
+			utils.QuorumLightTLSCACertsFlag,
+			utils.QuorumLightTLSClientAuthFlag,
+			utils.QuorumLightTLSCipherSuitesFlag,
+		},
+	},
 	{
 		Name: "QUORUM PRIVATE TRANSACTION MANAGER",
 		Flags: []cli.Flag{