allow GRPC signaling server to listen on non-TLS sockets

Signed-off-by: Steffen Vogel <post@steffenvogel.de>
This commit is contained in:
Steffen Vogel
2022-07-29 11:47:10 +02:00
parent ac6b299ad3
commit 72a3ed1597
2 changed files with 14 additions and 4 deletions

View File

@@ -5,8 +5,10 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"go.uber.org/zap" "go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"riasc.eu/wice/pkg" "riasc.eu/wice/pkg"
"riasc.eu/wice/pkg/signaling/grpc" grpcx "riasc.eu/wice/pkg/signaling/grpc"
) )
var ( var (
@@ -18,11 +20,13 @@ var (
} }
listenAddress string listenAddress string
secure = false
) )
func init() { func init() {
pf := signalCmd.PersistentFlags() pf := signalCmd.PersistentFlags()
pf.StringVarP(&listenAddress, "listen", "L", ":443", "listen address") pf.StringVarP(&listenAddress, "listen", "L", ":8080", "listen address")
pf.BoolVarP(&secure, "secure", "S", false, "listen with TLS")
RootCmd.AddCommand(signalCmd) RootCmd.AddCommand(signalCmd)
} }
@@ -33,7 +37,13 @@ func signal(cmd *cobra.Command, args []string) {
logger.Fatal("Failed to listen", zap.Error(err)) logger.Fatal("Failed to listen", zap.Error(err))
} }
svr := grpc.NewServer() // Disable TLS
opts := []grpc.ServerOption{}
if !secure {
opts = append(opts, grpc.Creds(insecure.NewCredentials()))
}
svr := grpcx.NewServer(opts...)
go func() { go func() {
for sig := range pkg.SetupSignals() { for sig := range pkg.SetupSignals() {

View File

@@ -21,7 +21,7 @@ type Server struct {
logger *zap.Logger logger *zap.Logger
} }
func NewServer() *Server { func NewServer(opt ...grpc.ServerOption) *Server {
logger := zap.L().Named("server") logger := zap.L().Named("server")
s := &Server{ s := &Server{