Skip to content

fix: Service utilize httputil.SafeHttpClient #1926

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
merged 1 commit into from
Mar 5, 2025
Merged

fix: Service utilize httputil.SafeHttpClient #1926

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
2 changes: 2 additions & 0 deletions sdk/auth/token_adding_interceptor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ const (
JTILength = 14
)

// Deprecated: NewTokenAddingInterceptor is deprecated, use NewTokenAddingInterceptorWithClient instead. A http client
// can be constructed using httputil.SafeHTTPClientWithTLSConfig, but should be reused as much as possible.
func NewTokenAddingInterceptor(t AccessTokenSource, c *tls.Config) TokenAddingInterceptor {
return NewTokenAddingInterceptorWithClient(t, httputil.SafeHTTPClientWithTLSConfig(c))
}
Expand Down
9 changes: 5 additions & 4 deletions sdk/auth/token_adding_interceptor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/lestrrat-go/jwx/v2/jws"
"github.com/lestrrat-go/jwx/v2/jwt"
"github.com/opentdf/platform/protocol/go/kas"
"github.com/opentdf/platform/sdk/httputil"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/grpc"
Expand All @@ -42,9 +43,9 @@ func TestAddingTokensToOutgoingRequest(t *testing.T) {
accessToken: "thisisafakeaccesstoken",
}
server := FakeAccessServiceServer{}
oo := NewTokenAddingInterceptor(&ts, &tls.Config{
oo := NewTokenAddingInterceptorWithClient(&ts, httputil.SafeHTTPClientWithTLSConfig(&tls.Config{
MinVersion: tls.VersionTLS12,
})
}))

client, stop := runServer(&server, oo)
defer stop()
Expand Down Expand Up @@ -97,9 +98,9 @@ func TestAddingTokensToOutgoingRequest(t *testing.T) {
func Test_InvalidCredentials_DoesNotSendMessage(t *testing.T) {
ts := FakeTokenSource{key: nil, accessToken: ""}
server := FakeAccessServiceServer{}
oo := NewTokenAddingInterceptor(&ts, &tls.Config{
oo := NewTokenAddingInterceptorWithClient(&ts, httputil.SafeHTTPClientWithTLSConfig(&tls.Config{
MinVersion: tls.VersionTLS12,
})
}))

client, stop := runServer(&server, oo)
defer stop()
Expand Down
15 changes: 8 additions & 7 deletions service/internal/auth/authn_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"github.com/opentdf/platform/protocol/go/kas"
"github.com/opentdf/platform/protocol/go/kas/kasconnect"
sdkauth "github.com/opentdf/platform/sdk/auth"
"github.com/opentdf/platform/sdk/httputil"
"github.com/opentdf/platform/service/internal/server/memhttp"
"github.com/opentdf/platform/service/logger"
ctxAuth "github.com/opentdf/platform/service/pkg/auth"
Expand Down Expand Up @@ -458,12 +459,12 @@ func (s *AuthSuite) TestDPoPEndToEnd_GRPC() {
server := memhttp.New(mux)
defer server.Close()

addingInterceptor := sdkauth.NewTokenAddingInterceptor(&FakeTokenSource{
addingInterceptor := sdkauth.NewTokenAddingInterceptorWithClient(&FakeTokenSource{
key: dpopKey,
accessToken: string(signedTok),
}, &tls.Config{
}, httputil.SafeHTTPClientWithTLSConfig(&tls.Config{
MinVersion: tls.VersionTLS12,
})
}))

conn, _ := grpc.NewClient("passthrough://bufconn", grpc.WithContextDialer(func(ctx context.Context, _ string) (net.Conn, error) {
return server.Listener.DialContext(ctx, "tcp", "http://localhost:8080")
Expand Down Expand Up @@ -519,19 +520,19 @@ func (s *AuthSuite) TestDPoPEndToEnd_HTTP() {

req, err := http.NewRequest(http.MethodGet, server.URL+"/attributes", nil)

addingInterceptor := sdkauth.NewTokenAddingInterceptor(&FakeTokenSource{
addingInterceptor := sdkauth.NewTokenAddingInterceptorWithClient(&FakeTokenSource{
key: dpopKey,
accessToken: string(signedTok),
}, &tls.Config{
}, httputil.SafeHTTPClientWithTLSConfig(&tls.Config{
MinVersion: tls.VersionTLS12,
})
}))
s.Require().NoError(err)
req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", signedTok))
dpopTok, err := addingInterceptor.GetDPoPToken(server.URL+"/attributes", "GET", string(signedTok))
s.Require().NoError(err)
req.Header.Set("DPoP", dpopTok)

client := http.Client{}
client := httputil.SafeHTTPClient() // use safe client to help validate the client
_, err = client.Do(req)
s.Require().NoError(err)
var dpopKeyFromRequest jwk.Key
Expand Down
4 changes: 3 additions & 1 deletion service/pkg/server/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"github.com/opentdf/platform/sdk"
sdkauth "github.com/opentdf/platform/sdk/auth"
"github.com/opentdf/platform/sdk/auth/oauth"
"github.com/opentdf/platform/sdk/httputil"
"github.com/opentdf/platform/service/internal/auth"
"github.com/opentdf/platform/service/internal/config"
"github.com/opentdf/platform/service/internal/server"
Expand Down Expand Up @@ -231,7 +232,8 @@ func Start(f ...StartOptions) error {
return fmt.Errorf("error creating ERS tokensource: %w", err)
}

interceptor := sdkauth.NewTokenAddingInterceptor(ts, tlsConfig)
interceptor := sdkauth.NewTokenAddingInterceptorWithClient(ts,
httputil.SafeHTTPClientWithTLSConfig(tlsConfig))

ersDialOptions = append(ersDialOptions, grpc.WithChainUnaryInterceptor(interceptor.AddCredentials))
}
Expand Down
Loading