log output : WIP

Author: Snawoot

agent.go

@@ -9,13 +9,14 @@ import (
 	"sync"
 	"time"
 
+	"github.com/Snawoot/rgap/psk"
 	"github.com/hashicorp/go-multierror"
 )
 
 type AgentConfig struct {
 	Group        uint64
 	Address      netip.Addr
-	Key          PSK
+	Key          psk.PSK
 	Interval     time.Duration
 	Destinations []string
 	Dialer       Dialer

announcement.go

@@ -7,6 +7,8 @@ import (
 	"encoding/binary"
 	"fmt"
 	"net"
+
+	"github.com/Snawoot/rgap/psk"
 )
 
 const (
@@ -42,7 +44,7 @@ func (ad *AnnouncementData) UnmarshalBinary(data []byte) error {
 	return nil
 }
 
-func (ad *AnnouncementData) CalculateSignature(key PSK) ([SignatureSize]byte, error) {
+func (ad *AnnouncementData) CalculateSignature(key psk.PSK) ([SignatureSize]byte, error) {
 	h := hmac.New(sha256.New, key.AsSlice())
 	h.Write([]byte(SignaturePrefixBytes))
 	if err := binary.Write(h, binary.BigEndian, ad); err != nil {
@@ -81,7 +83,7 @@ func (a *Announcement) UnmarshalBinary(data []byte) error {
 	return nil
 }
 
-func (a *Announcement) CheckSignature(key PSK) (bool, error) {
+func (a *Announcement) CheckSignature(key psk.PSK) (bool, error) {
 	sig, err := a.Data.CalculateSignature(key)
 	if err != nil {
 		return false, fmt.Errorf("signature verification failed: %w", err)

cmd/rgap/agent.go

@@ -9,6 +9,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/Snawoot/rgap"
+	"github.com/Snawoot/rgap/psk"
 )
 
 const (
@@ -49,26 +50,26 @@ func (a *addressOption) Type() string {
 }
 
 type pskOption struct {
-	psk *rgap.PSK
+	psk *psk.PSK
 }
 
-func (psk *pskOption) String() string {
-	if psk.psk == nil {
+func (pskOpt *pskOption) String() string {
+	if pskOpt.psk == nil {
 		return "<nil>"
 	}
-	return psk.psk.String()
+	return pskOpt.psk.String()
 }
 
-func (psk *pskOption) Set(s string) error {
-	newPSK := new(rgap.PSK)
+func (pskOpt *pskOption) Set(s string) error {
+	newPSK := new(psk.PSK)
 	if err := newPSK.FromHexString(s); err != nil {
 		return err
 	}
-	psk.psk = newPSK
+	pskOpt.psk = newPSK
 	return nil
 }
 
-func (psk *pskOption) Type() string {
+func (_ *pskOption) Type() string {
 	return "hexstring"
 }
 

cmd/rgap/genpsk.go

@@ -3,17 +3,16 @@ package main
 import (
 	"fmt"
 
+	"github.com/Snawoot/rgap/psk"
 	"github.com/spf13/cobra"
-
-	"github.com/Snawoot/rgap"
 )
 
 // genpskCmd represents the genpsk command
 var genpskCmd = &cobra.Command{
 	Use:   "genpsk",
 	Short: "Generate and output hex-encoded pre-shared key",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		psk, err := rgap.GeneratePSK()
+		psk, err := psk.GeneratePSK()
 		if err != nil {
 			return fmt.Errorf("PSK generation failed: %w", err)
 		}

cmd/rgap/listener.go

@@ -8,6 +8,7 @@ import (
 	"gopkg.in/yaml.v3"
 
 	"github.com/Snawoot/rgap"
+	"github.com/Snawoot/rgap/config"
 )
 
 var (
@@ -19,7 +20,7 @@ var listenerCmd = &cobra.Command{
 	Use:   "listener",
 	Short: "Starts listener accepting and processing announcements",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		var cfg rgap.ListenerConfig
+		var cfg config.ListenerConfig
 		cfgF, err := os.Open(configPath)
 		if err != nil {
 			return fmt.Errorf("unable to read configuration file: %w", err)

config/config.go

@@ -0,0 +1,28 @@
+package config
+
+import (
+	"time"
+
+	"gopkg.in/yaml.v3"
+
+	"github.com/Snawoot/rgap/psk"
+)
+
+type GroupConfig struct {
+	ID             uint64
+	PSK            *psk.PSK
+	Expire         time.Duration
+	ClockSkew      time.Duration `yaml:"clock_skew"`
+	ReadinessDelay time.Duration `yaml:"readiness_delay"`
+}
+
+type OutputConfig struct {
+	Kind string
+	Spec yaml.Node
+}
+
+type ListenerConfig struct {
+	Listen  []string
+	Groups  []GroupConfig
+	Outputs []OutputConfig
+}

group.go

@@ -6,25 +6,36 @@ import (
 	"net/netip"
 	"time"
 
+	"github.com/Snawoot/rgap/config"
+	"github.com/Snawoot/rgap/iface"
+	"github.com/Snawoot/rgap/psk"
 	"github.com/jellydator/ttlcache/v3"
 )
 
 type Group struct {
 	id             uint64
-	psk            PSK
+	psk            psk.PSK
 	expire         time.Duration
 	clockSkew      time.Duration
 	readinessDelay time.Duration
 	addrSet        *ttlcache.Cache[netip.Addr, struct{}]
 	readyAt        time.Time
 }
 
-type GroupItem struct {
-	Address   netip.Addr
-	ExpiresAt time.Time
+type groupItem struct {
+	address   netip.Addr
+	expiresAt time.Time
 }
 
-func GroupFromConfig(cfg *GroupConfig) (*Group, error) {
+func (gi groupItem) Address() netip.Addr {
+	return gi.address
+}
+
+func (gi groupItem) ExpiresAt() time.Time {
+	return gi.expiresAt
+}
+
+func GroupFromConfig(cfg *config.GroupConfig) (*Group, error) {
 	if cfg.PSK == nil {
 		return nil, fmt.Errorf("group %d: PSK is not set", cfg.ID)
 	}
@@ -96,17 +107,21 @@ func (g *Group) Ingest(a *Announcement) error {
 	return nil
 }
 
-func (g *Group) List() []GroupItem {
+func (g *Group) List() []iface.GroupItem {
 	items := g.addrSet.Items()
-	res := make([]GroupItem, 0, len(items))
+	res := make([]iface.GroupItem, 0, len(items))
 	for _, item := range items {
 		if item.IsExpired() {
 			continue
 		}
-		res = append(res, GroupItem{
-			Address:   item.Key(),
-			ExpiresAt: item.ExpiresAt(),
+		res = append(res, groupItem{
+			address:   item.Key(),
+			expiresAt: item.ExpiresAt(),
 		})
 	}
 	return res
 }
+
+func (g *Group) Ready() bool {
+	return time.Now().After(g.readyAt)
+}

iface/iface.go

@@ -0,0 +1,22 @@
+package iface
+
+import (
+	"net/netip"
+	"time"
+)
+
+type GroupBridge interface {
+	Groups() []uint64
+	ListGroup(uint64) []GroupItem
+	GroupReady(uint64) bool
+}
+
+type GroupItem interface {
+	Address() netip.Addr
+	ExpiresAt() time.Time
+}
+
+type StartStopper interface {
+	Start() error
+	Stop() error
+}

listener.go

@@ -4,42 +4,19 @@ import (
 	"context"
 	"fmt"
 	"log"
-	"time"
 
-	"gopkg.in/yaml.v3"
+	"github.com/Snawoot/rgap/config"
+	"github.com/Snawoot/rgap/iface"
+	"github.com/Snawoot/rgap/output"
 )
 
-type StartStopper interface {
-	Start() error
-	Stop() error
-}
-
-type GroupConfig struct {
-	ID             uint64
-	PSK            *PSK
-	Expire         time.Duration
-	ClockSkew      time.Duration `yaml:"clock_skew"`
-	ReadinessDelay time.Duration `yaml:"readiness_delay"`
-}
-
-type OutputConfig struct {
-	Kind string
-	Spec yaml.Node
-}
-
-type ListenerConfig struct {
-	Listen  []string
-	Groups  []GroupConfig
-	Outputs []OutputConfig
-}
-
 type Listener struct {
-	sources []StartStopper
+	sources []iface.StartStopper
 	groups  map[uint64]*Group
-	outputs []StartStopper
+	outputs []iface.StartStopper
 }
 
-func NewListener(cfg *ListenerConfig) (*Listener, error) {
+func NewListener(cfg *config.ListenerConfig) (*Listener, error) {
 	l := &Listener{
 		groups: make(map[uint64]*Group),
 	}
@@ -55,7 +32,7 @@ func NewListener(cfg *ListenerConfig) (*Listener, error) {
 		l.sources = append(l.sources, src)
 	}
 	for i, oc := range cfg.Outputs {
-		out, err := OutputFromConfig(&oc, l)
+		out, err := output.OutputFromConfig(&oc, l)
 		if err != nil {
 			return nil, fmt.Errorf("unable to construct new output with index %d: %w", i, err)
 		}
@@ -75,7 +52,7 @@ func (l *Listener) announceCallback(label string, ann *Announcement) {
 }
 
 func (l *Listener) Run(ctx context.Context) error {
-	var primeStack []StartStopper
+	var primeStack []iface.StartStopper
 	defer func() {
 		for i := len(primeStack) - 1; i >= 0; i-- {
 			if err := primeStack[i].Stop(); err != nil {
@@ -115,10 +92,18 @@ func (l *Listener) Groups() []uint64 {
 	return res
 }
 
-func (l *Listener) ListGroup(id uint64) []GroupItem {
+func (l *Listener) ListGroup(id uint64) []iface.GroupItem {
 	g, ok := l.groups[id]
 	if !ok {
 		return nil
 	}
 	return g.List()
 }
+
+func (l *Listener) GroupReady(id uint64) bool {
+	g, ok := l.groups[id]
+	if !ok {
+		return true
+	}
+	return g.Ready()
+}