diff --git a/internal/census/census.go b/internal/census/census.go index 921bfb57ca..a5d58049cc 100644 --- a/internal/census/census.go +++ b/internal/census/census.go @@ -6,7 +6,6 @@ package census import ( "context" "fmt" - "io" "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/errors" @@ -15,7 +14,7 @@ import ( ) // RegisterJob registers the census job with the provided scheduler. -func RegisterJob(ctx context.Context, s *scheduler.Scheduler, lurEnabled bool, r db.Reader, w db.Writer, randomReader io.Reader) error { +func RegisterJob(ctx context.Context, s *scheduler.Scheduler, lurEnabled bool, r db.Reader, w db.Writer) error { const op = "census.RegisterJob" if s == nil { return errors.New(ctx, errors.InvalidParameter, "nil scheduler", op, errors.WithoutEvent()) @@ -27,7 +26,7 @@ func RegisterJob(ctx context.Context, s *scheduler.Scheduler, lurEnabled bool, r return errors.New(ctx, errors.Internal, "nil DB writer", op, errors.WithoutEvent()) } - censusJob, err := NewCensusJobFn(ctx, lurEnabled, r, w, randomReader) + censusJob, err := NewCensusJobFn(ctx, lurEnabled, r, w) if err != nil { return fmt.Errorf("error creating census job: %w", err) } diff --git a/internal/census/census_job.go b/internal/census/census_job.go index 233a7eb1aa..1c116cdc54 100644 --- a/internal/census/census_job.go +++ b/internal/census/census_job.go @@ -5,7 +5,6 @@ package census import ( "context" - "io" "time" "github.com/hashicorp/boundary/internal/db" @@ -26,10 +25,9 @@ type censusJob struct { sessionsAgent any activeUsersAgent any eventCtx context.Context - randReader io.Reader } -func newCensusJob(ctx context.Context, lurEnabled bool, r db.Reader, w db.Writer, randomReader io.Reader) (*censusJob, error) { +func newCensusJob(ctx context.Context, lurEnabled bool, r db.Reader, w db.Writer) (*censusJob, error) { const op = "censusJob.newCensusJob" switch { case r == nil: @@ -46,7 +44,6 @@ func newCensusJob(ctx context.Context, lurEnabled bool, r db.Reader, w db.Writer sessionsAgent: nil, activeUsersAgent: nil, eventCtx: ctx, - randReader: randomReader, }, nil } diff --git a/internal/cmd/config/config.go b/internal/cmd/config/config.go index 6793118ba8..46ac502e60 100644 --- a/internal/cmd/config/config.go +++ b/internal/cmd/config/config.go @@ -499,6 +499,7 @@ func DevKeyGeneration(opt ...Option) string { } n, err := randBuf.ReadFrom(&io.LimitedReader{ R: opts.withRandomReader, + N: numBytes, }) if err != nil { diff --git a/internal/daemon/controller/controller.go b/internal/daemon/controller/controller.go index 34e324a90d..4efcc4ab9b 100644 --- a/internal/daemon/controller/controller.go +++ b/internal/daemon/controller/controller.go @@ -445,7 +445,7 @@ func New(ctx context.Context, conf *Config) (*Controller, error) { return host.NewCatalogRepository(ctx, dbase, dbase) } c.ServersRepoFn = func() (*server.Repository, error) { - return server.NewRepository(ctx, dbase, dbase, c.kms, server.WithRandomReader(c.conf.SecureRandomReader)) + return server.NewRepository(ctx, dbase, dbase, c.kms) } c.OidcRepoFn = func() (*oidc.Repository, error) { return oidc.NewRepository(ctx, dbase, dbase, c.kms) @@ -649,7 +649,7 @@ func (c *Controller) registerJobs() error { if err := snapshot.RegisterJob(c.baseContext, c.scheduler, rw, rw); err != nil { return err } - if err := census.RegisterJob(c.baseContext, c.scheduler, c.conf.RawConfig.Reporting.License.Enabled, rw, rw, c.conf.SecureRandomReader); err != nil { + if err := census.RegisterJob(c.baseContext, c.scheduler, c.conf.RawConfig.Reporting.License.Enabled, rw, rw); err != nil { return err } if err := purge.RegisterJobs(c.baseContext, c.scheduler, rw, rw); err != nil { diff --git a/internal/daemon/worker/handler.go b/internal/daemon/worker/handler.go index ad1c79b443..9065e604d6 100644 --- a/internal/daemon/worker/handler.go +++ b/internal/daemon/worker/handler.go @@ -281,7 +281,7 @@ func (w *Worker) handleProxy(listenerCfg *listenerutil.ListenerConfig, sessionMa event.WriteError(ctx, op, err) } - handlerOpts := []proxyHandlers.Option{proxyHandlers.WithLogger(w.logger), proxyHandlers.WithRandomReader(w.conf.SecureRandomReader)} + handlerOpts := []proxyHandlers.Option{proxyHandlers.WithLogger(w.logger)} if cb := w.SshKnownHostsCallback.Load(); cb != nil { handlerOpts = append(handlerOpts, proxyHandlers.WithSshHostKeyCallback(*cb)) } diff --git a/internal/daemon/worker/proxy/options.go b/internal/daemon/worker/proxy/options.go index c45bfebedd..7bdceecafb 100644 --- a/internal/daemon/worker/proxy/options.go +++ b/internal/daemon/worker/proxy/options.go @@ -4,8 +4,6 @@ package proxy import ( - "crypto/rand" - "io" "net" serverpb "github.com/hashicorp/boundary/internal/gen/controller/servers/services" @@ -34,7 +32,6 @@ type Options struct { WithTestKerberosServerHostname string WithLogger hclog.Logger WithSshHostKeyCallback ssh.HostKeyCallback - WithRandomReader io.Reader } func getDefaultOptions() Options { @@ -42,7 +39,6 @@ func getDefaultOptions() Options { WithInjectedApplicationCredentials: nil, WithPostConnectionHook: nil, WithLogger: hclog.NewNullLogger(), - WithRandomReader: rand.Reader, } } @@ -101,10 +97,3 @@ func WithSshHostKeyCallback(with ssh.HostKeyCallback) Option { o.WithSshHostKeyCallback = with } } - -// WithRandomReader provides an option to specify a random reader. -func WithRandomReader(reader io.Reader) Option { - return func(o *Options) { - o.WithRandomReader = reader - } -} diff --git a/internal/daemon/worker/proxy/options_test.go b/internal/daemon/worker/proxy/options_test.go index 402ad4e036..1b20f9e5bd 100644 --- a/internal/daemon/worker/proxy/options_test.go +++ b/internal/daemon/worker/proxy/options_test.go @@ -5,11 +5,9 @@ package proxy import ( "crypto/ed25519" - "io" "net" "reflect" "runtime" - "strings" "testing" serverpb "github.com/hashicorp/boundary/internal/gen/controller/servers/services" @@ -78,11 +76,4 @@ func Test_GetOpts(t *testing.T) { opts = GetOpts(WithSshHostKeyCallback(ssh.FixedHostKey(signer.PublicKey()))) assert.NotNil(opts.WithSshHostKeyCallback) }) - t.Run("WithRandomReader", func(t *testing.T) { - reader := io.Reader(&strings.Reader{}) - opts := GetOpts(WithRandomReader(reader)) - testOpts := getDefaultOptions() - testOpts.WithRandomReader = reader - assert.Equal(t, opts, testOpts) - }) } diff --git a/internal/server/options_test.go b/internal/server/options_test.go index 65d7bc57fe..7f0584cd9f 100644 --- a/internal/server/options_test.go +++ b/internal/server/options_test.go @@ -5,10 +5,8 @@ package server import ( "context" - "io" "reflect" "runtime" - "strings" "testing" "time" @@ -270,13 +268,4 @@ func Test_GetOpts(t *testing.T) { assert.Equal(t, writer, opts.WithWriter) assert.Equal(t, opts, testOpts) }) - t.Run("WithRandomReader", func(t *testing.T) { - reader := io.Reader(&strings.Reader{}) - opts := GetOpts(WithRandomReader(reader)) - testOpts := getDefaultOptions() - testOpts.withRandomReader = reader - opts.withNewIdFunc = nil - testOpts.withNewIdFunc = nil - assert.Equal(t, opts, testOpts) - }) } diff --git a/internal/server/repository.go b/internal/server/repository.go index 3a71034fda..c740783014 100644 --- a/internal/server/repository.go +++ b/internal/server/repository.go @@ -5,7 +5,6 @@ package server import ( "context" - "io" "reflect" "time" @@ -27,7 +26,6 @@ type Repository struct { kms *kms.Kms // defaultLimit provides a default for limiting the number of results returned from the repo defaultLimit int - randomReader io.Reader } // NewRepository creates a new server Repository. Supports the options: WithLimit @@ -54,7 +52,6 @@ func NewRepository(ctx context.Context, r db.Reader, w db.Writer, kms *kms.Kms, writer: w, kms: kms, defaultLimit: opts.withLimit, - randomReader: opts.withRandomReader, }, nil }