Skip to content

daemon: refactor and modularize daemon and pkg/daemon #4868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JordiSubira merged 1 commit into from
Jan 16, 2026
Merged

daemon: refactor and modularize daemon and pkg/daemon #4868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions daemon/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,18 @@ go_library(
importpath = "github.com/scionproto/scion/daemon",
visibility = ["//visibility:public"],
deps = [
"//daemon/drkey:go_default_library",
"//daemon/fetcher:go_default_library",
"//daemon/internal/servers:go_default_library",
"//daemon/grpc:go_default_library",
"//pkg/addr:go_default_library",
"//pkg/daemon:go_default_library",
"//pkg/grpc:go_default_library",
"//pkg/log:go_default_library",
"//pkg/daemon/asinfo:go_default_library",
"//pkg/daemon/fetcher:go_default_library",
"//pkg/daemon/private/engine:go_default_library",
"//pkg/metrics:go_default_library",
"//pkg/private/prom:go_default_library",
"//pkg/private/serrors:go_default_library",
"//private/drkey:go_default_library",
"//private/env:go_default_library",
"//private/revcache:go_default_library",
"//private/trust:go_default_library",
"//private/trust/grpc:go_default_library",
"//private/trust/metrics:go_default_library",
"@com_github_opentracing_opentracing_go//:go_default_library",
"@com_github_prometheus_client_golang//prometheus:go_default_library",
],
Expand Down
10 changes: 4 additions & 6 deletions daemon/cmd/daemon/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,22 @@ go_library(
deps = [
"//daemon:go_default_library",
"//daemon/config:go_default_library",
"//daemon/drkey:go_default_library",
"//daemon/drkey/grpc:go_default_library",
"//daemon/fetcher:go_default_library",
"//daemon/mgmtapi:go_default_library",
"//pkg/addr:go_default_library",
"//pkg/daemon/fetcher:go_default_library",
"//pkg/daemon/private/trust:go_default_library",
"//pkg/experimental/hiddenpath:go_default_library",
"//pkg/experimental/hiddenpath/grpc:go_default_library",
"//pkg/grpc:go_default_library",
"//pkg/log:go_default_library",
"//pkg/metrics:go_default_library",
"//pkg/private/prom:go_default_library",
"//pkg/private/serrors:go_default_library",
"//pkg/proto/crypto:go_default_library",
"//pkg/proto/daemon:go_default_library",
"//pkg/scrypto/cppki:go_default_library",
"//pkg/scrypto/signed:go_default_library",
"//private/app:go_default_library",
"//private/app/launcher:go_default_library",
"//private/drkey:go_default_library",
"//private/drkey/grpc:go_default_library",
"//private/mgmtapi/cppki/api:go_default_library",
"//private/mgmtapi/segments/api:go_default_library",
"//private/pathdb:go_default_library",
Expand Down
75 changes: 27 additions & 48 deletions daemon/cmd/daemon/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,32 +35,30 @@ import (

"github.com/scionproto/scion/daemon"
"github.com/scionproto/scion/daemon/config"
sd_drkey "github.com/scionproto/scion/daemon/drkey"
sd_grpc "github.com/scionproto/scion/daemon/drkey/grpc"
"github.com/scionproto/scion/daemon/fetcher"
api "github.com/scionproto/scion/daemon/mgmtapi"
"github.com/scionproto/scion/pkg/addr"
"github.com/scionproto/scion/pkg/daemon/fetcher"
daemontrust "github.com/scionproto/scion/pkg/daemon/private/trust"
"github.com/scionproto/scion/pkg/experimental/hiddenpath"
hpgrpc "github.com/scionproto/scion/pkg/experimental/hiddenpath/grpc"
libgrpc "github.com/scionproto/scion/pkg/grpc"
"github.com/scionproto/scion/pkg/log"
"github.com/scionproto/scion/pkg/metrics"
"github.com/scionproto/scion/pkg/private/prom"
"github.com/scionproto/scion/pkg/private/serrors"
cryptopb "github.com/scionproto/scion/pkg/proto/crypto"
sdpb "github.com/scionproto/scion/pkg/proto/daemon"
"github.com/scionproto/scion/pkg/scrypto/cppki"
"github.com/scionproto/scion/pkg/scrypto/signed"
"github.com/scionproto/scion/private/app"
"github.com/scionproto/scion/private/app/launcher"
sddrkey "github.com/scionproto/scion/private/drkey"
sdgrpc "github.com/scionproto/scion/private/drkey/grpc"
cppkiapi "github.com/scionproto/scion/private/mgmtapi/cppki/api"
segapi "github.com/scionproto/scion/private/mgmtapi/segments/api"
"github.com/scionproto/scion/private/pathdb"
"github.com/scionproto/scion/private/periodic"
"github.com/scionproto/scion/private/revcache"
"github.com/scionproto/scion/private/segment/segfetcher"
segfetchergrpc "github.com/scionproto/scion/private/segment/segfetcher/grpc"
infra "github.com/scionproto/scion/private/segment/verifier"
segverifier "github.com/scionproto/scion/private/segment/verifier"
"github.com/scionproto/scion/private/service"
"github.com/scionproto/scion/private/storage"
"github.com/scionproto/scion/private/storage/drkey/level2"
Expand Down Expand Up @@ -155,8 +153,9 @@ func realMain(ctx context.Context) error {
[]string{"driver", "operation", prom.LabelResult},
),
})
engine, err := daemon.TrustEngine(
errCtx, globalCfg.General.ConfigDir, topo.IA(), trustDB, dialer,
certsDir := filepath.Join(globalCfg.General.ConfigDir, "certs")
engine, err := daemontrust.NewEngine(
errCtx, certsDir, topo.IA(), trustDB, dialer,
)
if err != nil {
return serrors.Wrap("creating trust engine", err)
Expand All @@ -168,7 +167,7 @@ func realMain(ctx context.Context) error {
MaxCacheExpiration: globalCfg.TrustEngine.Cache.Expiration.Duration,
}
trcLoader := trust.TRCLoader{
Dir: filepath.Join(globalCfg.General.ConfigDir, "certs"),
Dir: certsDir,
DB: trustDB,
}
//nolint:staticcheck // SA1019: fix later (https://github.com/scionproto/scion/issues/4776).
Expand All @@ -186,7 +185,7 @@ func realMain(ctx context.Context) error {
}, 10*time.Second, 10*time.Second)
defer trcLoaderTask.Stop()

var drkeyClientEngine *sd_drkey.ClientEngine
var drkeyClientEngine *sddrkey.ClientEngine
if globalCfg.DRKeyLevel2DB.Connection != "" {
backend, err := storage.NewDRKeyLevel2Storage(globalCfg.DRKeyLevel2DB)
if err != nil {
Expand Down Expand Up @@ -215,10 +214,10 @@ func realMain(ctx context.Context) error {
}
defer level2DB.Close()

drkeyFetcher := &sd_grpc.Fetcher{
drkeyFetcher := &sdgrpc.Fetcher{
Dialer: dialer,
}
drkeyClientEngine = &sd_drkey.ClientEngine{
drkeyClientEngine = &sddrkey.ClientEngine{
IA: topo.IA(),
DB: level2DB,
Fetcher: drkeyFetcher,
Expand Down Expand Up @@ -254,9 +253,9 @@ func realMain(ctx context.Context) error {
}
}

createVerifier := func() infra.Verifier {
createVerifier := func() segverifier.Verifier {
if globalCfg.SD.DisableSegVerification {
return acceptAllVerifier{}
return segverifier.AcceptAllVerifier{}
}
return compat.Verifier{Verifier: trust.Verifier{
Engine: engine,
Expand All @@ -272,21 +271,21 @@ func realMain(ctx context.Context) error {
)
sdpb.RegisterDaemonServiceServer(server, daemon.NewServer(
daemon.ServerConfig{
IA: topo.IA(),
MTU: topo.MTU(),
Topology: topo,
IA: topo.IA(),
MTU: topo.MTU(),
LocalASInfo: topo,
Fetcher: fetcher.NewFetcher(
fetcher.FetcherConfig{
IA: topo.IA(),
MTU: topo.MTU(),
Core: topo.Core(),
NextHopper: topo,
RPC: requester,
PathDB: pathDB,
Inspector: engine,
Verifier: createVerifier(),
RevCache: revCache,
Cfg: globalCfg.SD,
IA: topo.IA(),
MTU: topo.MTU(),
Core: topo.Core(),
NextHopper: topo,
RPC: requester,
PathDB: pathDB,
Inspector: engine,
Verifier: createVerifier(),
RevCache: revCache,
QueryInterval: globalCfg.SD.QueryInterval.Duration,
},
),
Engine: engine,
Expand Down Expand Up @@ -367,26 +366,6 @@ func realMain(ctx context.Context) error {
return g.Wait()
}

type acceptAllVerifier struct{}

func (acceptAllVerifier) Verify(ctx context.Context, signedMsg *cryptopb.SignedMessage,
associatedData ...[]byte,
) (*signed.Message, error) {
return nil, nil
}

func (v acceptAllVerifier) WithServer(net.Addr) infra.Verifier {
return v
}

func (v acceptAllVerifier) WithIA(addr.IA) infra.Verifier {
return v
}

func (v acceptAllVerifier) WithValidity(cppki.Validity) infra.Verifier {
return v
}

func loaderMetrics() topology.LoaderMetrics {
updates := prom.NewCounterVec("", "",
"topology_updates_total",
Expand Down
Loading
Loading