mleku/indra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring rpc

Browse Source
This commit is contained in:
greg stone
2023-03-04 01:14:00 +00:00
parent 678a433ae4
commit 18ca0e492a
10 changed files with 131 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/rpc/device.go
View File

@@ -17,7 +17,7 @@ func configureDevice() {
var err error
dev.SetPrivateKey(tunKey.AsDeviceKey())
dev.IpcSet("listen_port=" + strconv.Itoa(int(tunnelPort)))
dev.IpcSet("listen_port=" + strconv.Itoa(int(o.tunPort)))
for _, peer_whitelist := range tunWhitelist {

46
pkg/rpc/flags.go
View File

@@ -3,39 +3,38 @@ package rpc
import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
"os"
)
var (
unixPathFlag = "rpc-unix-listen"
tunEnableFlag = "rpc-tun-enable"
UnixPathFlag = "rpc-unix-listen"
TunEnableFlag = "rpc-tun-enable"
tunKeyFlag = "rpc-tun-key"
tunPortFlag = "rpc-tun-port"
tunPeersFlag = "rpc-tun-peer"
TunPortFlag = "rpc-tun-port"
TunPeersFlag = "rpc-tun-peer"
)
var (
unixPath string
tunEnabled bool = false
tunKeyRaw string
tunPort int = 0
tunPeersRaw = []string{}
)
func InitFlags(cmd *cobra.Command) {
cobra.OnInitialize(initUnixSockPath)
cmd.PersistentFlags().StringVarP(&unixPath, unixPathFlag, "",
cmd.PersistentFlags().StringVarP(&unixPath, UnixPathFlag, "",
"",
"binds to a unix socket with path (default is $HOME/.indra/indra.sock)",
)
viper.BindPFlag(unixPathFlag, cmd.PersistentFlags().Lookup(unixPathFlag))
viper.BindPFlag(UnixPathFlag, cmd.PersistentFlags().Lookup(UnixPathFlag))
cmd.PersistentFlags().BoolVarP(&isTunnelEnabled, tunEnableFlag, "",
cmd.PersistentFlags().BoolVarP(&tunEnabled, TunEnableFlag, "",
false,
"enables the rpc server tunnel (default false)",
)
viper.BindPFlag(tunEnableFlag, cmd.PersistentFlags().Lookup(tunEnableFlag))
viper.BindPFlag(TunEnableFlag, cmd.PersistentFlags().Lookup(TunEnableFlag))
//cmd.Flags().StringVarP(&tunKeyRaw, tunKeyFlag, "",
// "",
@@ -44,30 +43,17 @@ func InitFlags(cmd *cobra.Command) {
//
//viper.BindPFlag(tunKeyFlag, cmd.Flags().Lookup(tunKeyFlag))
cmd.PersistentFlags().IntVarP(&tunnelPort, tunPortFlag, "",
tunnelPort,
cmd.PersistentFlags().IntVarP(&tunPort, TunPortFlag, "",
tunPort,
"binds the udp server to port (random if not selected)",
)
viper.BindPFlag(tunPortFlag, cmd.PersistentFlags().Lookup(tunPortFlag))
viper.BindPFlag(TunPortFlag, cmd.PersistentFlags().Lookup(TunPortFlag))
cmd.PersistentFlags().StringSliceVarP(&tunPeersRaw, tunPeersFlag, "",
cmd.PersistentFlags().StringSliceVarP(&tunPeersRaw, TunPeersFlag, "",
tunPeersRaw,
"adds a peer id to the whitelist for access",
)
viper.BindPFlag(tunPeersFlag, cmd.PersistentFlags().Lookup(tunPeersFlag))
}
func initUnixSockPath() {
if viper.GetString(unixPathFlag) != "" {
return
}
home, err := os.UserHomeDir()
cobra.CheckErr(err)
viper.Set(unixPathFlag, home+"/.indra/indra.sock")
viper.BindPFlag(TunPeersFlag, cmd.PersistentFlags().Lookup(TunPeersFlag))
}

27
pkg/rpc/server.go
View File

@@ -7,7 +7,7 @@ import (
var (
server *grpc.Server
o *serverOptions
o *ServerOptions
)
var (
@@ -24,22 +24,41 @@ func RunWith(r func(srv *grpc.Server), opts ...ServerOption) {
log.I.Ln("initializing the rpc server")
o = &serverOptions{false, &storeMem{}}
o = &ServerOptions{
&storeMem{},
unixPathDefault,
false,
NullPort,
[]string{},
}
for _, opt := range opts {
opt.apply(o)
}
server = grpc.NewServer()
if o.unixPath != "" {
log.I.Ln("enabling rpc unix listener:")
log.I.F("- [/unix%s]", o.unixPath)
configureUnixSocket()
isUnixSockEnabled = true
}
if o.tunEnable {
configureTunnel()
}
isConfigured <- true
server = grpc.NewServer()
r(server)
go start()
}
func Options() *ServerOptions {
return o
}
func start() {
log.I.Ln("starting rpc server")

37
pkg/rpc/server_options.go
View File

@@ -1,36 +1,55 @@
package rpc
type serverOptions struct {
disableTunnel bool
type ServerOptions struct {
store Store
unixPath string
tunEnable bool
tunPort uint16
tunPeers []string
}
func (s *ServerOptions) GetTunPort() uint16 { return s.tunPort }
type ServerOption interface {
apply(*serverOptions)
apply(*ServerOptions)
}
type funcServerOption struct {
f func(*serverOptions)
f func(*ServerOptions)
}
func (fdo *funcServerOption) apply(do *serverOptions) {
func (fdo *funcServerOption) apply(do *ServerOptions) {
fdo.f(do)
}
func newFuncServerOption(f func(*serverOptions)) *funcServerOption {
func newFuncServerOption(f func(*ServerOptions)) *funcServerOption {
return &funcServerOption{
f: f,
}
}
func WithDisableTunnel() ServerOption {
return newFuncServerOption(func(o *serverOptions) {
o.disableTunnel = true
return newFuncServerOption(func(o *ServerOptions) {
o.tunEnable = false
})
}
func WithStore(store Store) ServerOption {
return newFuncServerOption(func(o *serverOptions) {
return newFuncServerOption(func(o *ServerOptions) {
o.store = store
})
}
func WithUnixPath(path string) ServerOption {
return newFuncServerOption(func(o *ServerOptions) {
o.unixPath = path
})
}
func WithTunOptions(port uint16, peers []string) ServerOption {
return newFuncServerOption(func(o *ServerOptions) {
o.tunEnable = true
o.tunPort = port
o.tunPeers = peers
})
}

5
pkg/rpc/signals.go
View File

@@ -2,6 +2,7 @@ package rpc
var (
startupErrors = make(chan error, 128)
isConfigured = make(chan bool, 1)
isReady = make(chan bool, 1)
)
@@ -9,6 +10,10 @@ func WhenStartFailed() chan error {
return startupErrors
}
func IsConfigured() chan bool {
return isConfigured
}
func IsReady() chan bool {
return isReady
}

7
pkg/rpc/socket_unix.go
View File

@@ -6,10 +6,11 @@ import (
"os"
)
const unixPathDefault = "/tmp/indra.sock"
var (
isUnixSockEnabled bool = false
unixSock net.Listener
unixPath string
)
func startUnixSocket(srv *grpc.Server) (err error) {
@@ -18,7 +19,7 @@ func startUnixSocket(srv *grpc.Server) (err error) {
return
}
if unixSock, err = net.Listen("unix", unixPath); err != nil {
if unixSock, err = net.Listen("unix", o.unixPath); err != nil {
return
}
@@ -39,7 +40,7 @@ func stopUnixSocket() (err error) {
}
}
os.Remove(unixPath)
os.Remove(o.unixPath)
return
}

9
pkg/rpc/tunnel.go
View File

@@ -12,10 +12,6 @@ import (
const NullPort = 0
var (
isTunnelEnabled bool = false
)
var (
network *netstack.Net
tunnel tun.Device
@@ -25,7 +21,6 @@ var (
var (
tunKey *RPCPrivateKey
tunWhitelist []RPCPublicKey
tunnelPort int = 0
tunnelMTU int = 1420
)
@@ -43,7 +38,7 @@ func createTunnel() {
func startTunnel(srv *grpc.Server) (err error) {
if !isTunnelEnabled {
if !o.tunEnable {
return
}
@@ -66,7 +61,7 @@ func startTunnel(srv *grpc.Server) (err error) {
func stopTunnel() (err error) {
if !isTunnelEnabled {
if !o.tunEnable {
return
}

37
pkg/rpc/configure.go → pkg/rpc/tunnel_config.go
View File

@@ -1,28 +1,8 @@
package rpc
import (
"github.com/spf13/viper"
)
func configureUnixSocket() {
unixPath = viper.GetString(unixPathFlag)
if unixPath == "" {
return
}
log.I.Ln("enabling rpc unix listener:")
log.I.F("- [/unix%s]", unixPath)
isUnixSockEnabled = true
}
func configureTunnel() {
isTunnelEnabled = viper.GetBool(tunEnableFlag)
if !isTunnelEnabled {
if !o.tunEnable {
return
}
@@ -31,7 +11,7 @@ func configureTunnel() {
configureTunnelPort()
log.I.Ln("rpc tunnel listeners:")
log.I.F("- [/ip4/0.0.0.0/udp/%d /ip6/:::/udp/%d]", viper.GetUint16(tunPortFlag), viper.GetUint16(tunPortFlag))
log.I.F("- [/ip4/0.0.0.0/udp/%d /ip6/:::/udp/%d]", o.tunPort, o.tunPort)
configureTunnelKey()
configurePeerWhitelist()
@@ -69,29 +49,24 @@ func configureTunnelKey() {
func configureTunnelPort() {
if viper.GetUint16(tunPortFlag) != NullPort {
tunnelPort = int(viper.GetUint16(tunPortFlag))
if o.tunPort != NullPort {
return
}
log.I.Ln("rpc tunnel port not provided, generating a random one.")
viper.Set(tunPortFlag, genRandomPort(10000))
tunnelPort = int(viper.GetUint16(tunPortFlag))
o.tunPort = genRandomPort(10000)
}
func configurePeerWhitelist() {
if len(viper.GetStringSlice(tunPeersFlag)) == 0 {
if len(o.tunPeers) == 0 {
return
}
log.I.Ln("rpc tunnel whitelisted peers:")
for _, peer := range viper.GetStringSlice(tunPeersFlag) {
for _, peer := range o.tunPeers {
var pubKey RPCPublicKey

33
pkg/seed/server.go
View File

@@ -5,6 +5,7 @@ import (
"git-indra.lan/indra-labs/indra/pkg/p2p"
"git-indra.lan/indra-labs/indra/pkg/rpc"
"git-indra.lan/indra-labs/indra/pkg/storage"
"github.com/spf13/viper"
"github.com/tutorialedge/go-grpc-tutorial/chat"
"google.golang.org/grpc"
"sync"
@@ -63,13 +64,34 @@ func Run(ctx context.Context) {
// RPC
//
go rpc.RunWith(func(srv *grpc.Server) {
chat.RegisterChatServiceServer(srv, &chat.Server{})
},
rpc.WithStore(&rpc.BadgerStore{storage.DB()}),
)
opts := []rpc.ServerOption{
rpc.WithUnixPath(
viper.GetString(rpc.UnixPathFlag),
),
rpc.WithStore(
&rpc.BadgerStore{storage.DB()},
),
}
if viper.GetBool(rpc.TunEnableFlag) {
opts = append(opts,
rpc.WithTunOptions(
viper.GetUint16(rpc.TunPortFlag),
viper.GetStringSlice(rpc.TunPeersFlag),
))
}
services := func(srv *grpc.Server) {
chat.RegisterChatServiceServer(srv, &chat.Server{})
}
go rpc.RunWith(services, opts...)
for {
select {
case <-rpc.IsConfigured():
// We need to get the randomly generated port
viper.Set(rpc.TunPortFlag, rpc.Options().GetTunPort())
case err := <-rpc.WhenStartFailed():
log.E.Ln("rpc can't start:", err)
startupErrors <- err
@@ -80,6 +102,7 @@ func Run(ctx context.Context) {
Shutdown()
return
}
}
//
// Ready!

5
pkg/storage/service.go
View File

@@ -3,6 +3,7 @@ package storage
import (
"git-indra.lan/indra-labs/indra/pkg/rpc"
"github.com/dgraph-io/badger/v3"
"github.com/spf13/viper"
"google.golang.org/grpc"
"sync"
)
@@ -65,7 +66,7 @@ signals:
func(srv *grpc.Server) {
RegisterUnlockServiceServer(srv, NewUnlockService())
},
rpc.WithDisableTunnel(),
rpc.WithUnixPath(viper.GetString(rpc.UnixPathFlag)),
)
case <-rpc.IsReady():
log.I.Ln("... awaiting unlock over rpc")
@@ -92,6 +93,8 @@ func Shutdown() (err error) {
log.I.Ln("- storage db closing, it may take a minute...")
db.RunValueLogGC(0.5)
if err = db.Close(); err != nil {
log.W.Ln("- storage shutdown warning: ", err)
}