Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions server/internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,15 @@ func Load(envFile string) (*Config, error) {
return nil, err
}

for i := range cfg.Clients {
c := &cfg.Clients[i]
t, err := c.ResolveToken()
if err != nil {
return nil, fmt.Errorf("config: reading token for client %q: %w", c.ID, err)
}
c.Token = t
}

return cfg, nil
}

Expand Down
7 changes: 1 addition & 6 deletions server/internal/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,7 @@ func (s *Server) authenticate(r *http.Request) *config.Client {
return nil
}
for i := range s.cfg.Clients {
t, err := s.cfg.Clients[i].ResolveToken()
if err != nil {
slog.Warn("cannot read token for client", "client", s.cfg.Clients[i].ID, "error", err)
continue
}
if subtle.ConstantTimeCompare([]byte(t), []byte(token)) == 1 {
if subtle.ConstantTimeCompare([]byte(s.cfg.Clients[i].Token), []byte(token)) == 1 {
return &s.cfg.Clients[i]
}
}
Expand Down
Loading