Skip to content

Support AccessKeys in S2S client #40

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
VojtechVitek merged 2 commits into from
Apr 15, 2025
Merged

Support AccessKeys in S2S client #40

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0b41ee
Support AccessKeys in S2S client
VojtechVitek Apr 15, 2025
b39f7ab
Set default service name (binary), if not provided
VojtechVitek Apr 15, 2025
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
26 changes: 20 additions & 6 deletions s2s.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
package authcontrol

import (
"cmp"
"fmt"
"maps"
"net/http"
"os"
"path/filepath"
"time"

"github.com/go-chi/traceid"
Expand All @@ -12,25 +16,35 @@ import (
type S2SClientConfig struct {
Service string
JWTSecret string
AccessKey string
DebugRequests bool
}

// Service-to-service HTTP client for internal communication between Sequence services.
func S2SClient(cfg *S2SClientConfig) *http.Client {
serviceName := cmp.Or(cfg.Service, filepath.Base(os.Args[0]))

httpClient := &http.Client{
Transport: transport.Chain(http.DefaultTransport,
traceid.Transport,
transport.SetHeaderFunc("Authorization", func(req *http.Request) string {
return "BEARER " + S2SToken(cfg.JWTSecret, map[string]any{"service": cfg.Service})
}),
transport.If(cfg.DebugRequests, transport.LogRequests(transport.LogOptions{Concise: true, CURL: true})),
transport.SetHeader("User-Agent", fmt.Sprintf("sequence/%s", serviceName)),
transport.If(cfg.JWTSecret != "",
transport.SetHeaderFunc("Authorization", func(req *http.Request) string {
return "BEARER " + S2SToken(cfg.JWTSecret, map[string]any{"service": serviceName})
}),
),
transport.If(cfg.AccessKey != "",
transport.SetHeader("X-Access-Key", cfg.AccessKey),
),
transport.If(cfg.DebugRequests,
transport.LogRequests(transport.LogOptions{Concise: true, CURL: true}),
),
),
}

return httpClient
}

// Create short-lived service-to-service JWT token for internal communication between Sequence services.
// Create a short-lived service-to-service JWT token for internal communication between Sequence services.
func S2SToken(jwtSecret string, claims map[string]any) string {
jwtAuth, _ := NewAuth(jwtSecret).GetVerifier(nil)
now := time.Now().UTC()
Expand Down