Skip to content

Commit

Permalink
linting fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ingon committed Jan 7, 2025
1 parent 6fd2a7d commit 518bda8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
15 changes: 9 additions & 6 deletions cmd/connet/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -518,14 +518,17 @@ func controlRun(ctx context.Context, cfg ControlConfig, logger *slog.Logger) err
return err
}
if cfg.ClientTokensFile != "" {
tokens, err := loadTokens(cfg.ClientTokensFile)
if err != nil {
return err
tokens, terr := loadTokens(cfg.ClientTokensFile)
if terr != nil {
return terr
}
controlCfg.ClientAuth, err = selfhosted.NewClientAuthenticatorRestricted(tokens, clientRestr)
} else {
controlCfg.ClientAuth, err = selfhosted.NewClientAuthenticatorRestricted(cfg.ClientTokens, clientRestr)
}
if err != nil {
return err
}

if len(cfg.RelayIPRestriction.AllowCIDRs) > 0 || len(cfg.RelayIPRestriction.DenyCIDRs) > 0 {
restr, err := netc.ParseIPRestriction(cfg.RelayIPRestriction.AllowCIDRs, cfg.RelayIPRestriction.DenyCIDRs)
Expand All @@ -540,9 +543,9 @@ func controlRun(ctx context.Context, cfg ControlConfig, logger *slog.Logger) err
return err
}
if cfg.RelayTokensFile != "" {
tokens, err := loadTokens(cfg.RelayTokensFile)
if err != nil {
return err
tokens, terr := loadTokens(cfg.RelayTokensFile)
if terr != nil {
return terr
}
controlCfg.RelayAuth, err = selfhosted.NewRelayAuthenticatorRestricted(tokens, relayRestr)
} else {
Expand Down
1 change: 0 additions & 1 deletion control/clients.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ type clientServer struct {
auth ClientAuthenticator
restr netc.IPRestriction
relays ClientRelays
encode []byte
logger *slog.Logger

clientSecretKey [32]byte
Expand Down
2 changes: 1 addition & 1 deletion notify/value.go
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ func (v *V[T]) Notify(ctx context.Context) <-chan T {
ch := make(chan T, 1)
go func() {
defer close(ch)
v.Listen(ctx, func(t T) error {
_ = v.Listen(ctx, func(t T) error {
ch <- t
return nil
})
Expand Down

0 comments on commit 518bda8

Please sign in to comment.