Skip to content
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

feat(bff): load x-forwarded-access-token in cluster setup #558

Merged
merged 1 commit into from
Nov 13, 2024
Merged

feat(bff): load x-forwarded-access-token in cluster setup #558

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
19 changes: 11 additions & 8 deletions clients/ui/bff/internal/api/middleware.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"fmt"
"github.com/julienschmidt/httprouter"
"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
"k8s.io/client-go/rest"
"net/http"
)

type contextKey string

const httpClientKey contextKey = "httpClientKey"
const userAccessToken = "x-forwarded-access-token"

func (app *App) RecoverPanic(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
Expand Down Expand Up @@ -47,7 +47,7 @@ func (app *App) AttachRESTClient(handler func(http.ResponseWriter, *http.Request
return
}
var bearerToken string
bearerToken, err = resolveBearerToken(app.kubernetesClient)
bearerToken, err = resolveBearerToken(app.kubernetesClient, r.Header)
if err != nil {
app.serverErrorResponse(w, r, fmt.Errorf("failed to resolve BearerToken): %v", err))
return
Expand All @@ -63,21 +63,24 @@ func (app *App) AttachRESTClient(handler func(http.ResponseWriter, *http.Request
}
}

func resolveBearerToken(k8s integrations.KubernetesClientInterface) (string, error) {
func resolveBearerToken(k8s integrations.KubernetesClientInterface, header http.Header) (string, error) {
var bearerToken string
_, err := rest.InClusterConfig()
if err == nil {
//check if I'm inside cluster
if k8s.IsInCluster() {
//in cluster
//TODO (eder) load bearerToken probably from x-forwarded-access-bearerToken
return "", fmt.Errorf("failed to create Rest client (not implemented yet - inside cluster): %v", err)
bearerToken = header.Get(userAccessToken)
if bearerToken == "" {
return "", fmt.Errorf("failed to create Rest client (not able to get bearerToken on cluster)")
}
} else {
//off cluster (development)
var err error
bearerToken, err = k8s.BearerToken()
if err != nil {
return "", fmt.Errorf("failed to fetch BearerToken in development mode: %v", err)
}
}
return bearerToken, err
return bearerToken, nil
}

func resolveModelRegistryURL(id string, client integrations.KubernetesClientInterface) (string, error) {
Expand Down
7 changes: 7 additions & 0 deletions clients/ui/bff/internal/integrations/k8s.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package integrations
import (
"context"
"fmt"
"k8s.io/client-go/rest"
"log/slog"
"os"
"time"
Expand All @@ -22,6 +23,7 @@ type KubernetesClientInterface interface {
GetServiceDetails() ([]ServiceDetails, error)
BearerToken() (string, error)
Shutdown(ctx context.Context, logger *slog.Logger) error
IsInCluster() bool
}

type ServiceDetails struct {
Expand Down Expand Up @@ -126,6 +128,11 @@ func (kc *KubernetesClient) Shutdown(ctx context.Context, logger *slog.Logger) e
}
}

func (kc *KubernetesClient) IsInCluster() bool {
_, err := rest.InClusterConfig()
return err == nil
}

func (kc *KubernetesClient) BearerToken() (string, error) {
return kc.Token, nil
}
Expand Down
5 changes: 4 additions & 1 deletion clients/ui/frontend/src/shared/api/apiUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,10 @@ const callRestJSON = <T>(

return fetch(`${host}${path}${searchParams ? `?${searchParams}` : ''}`, {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's generally better to use the URL api to construct this rather than a string template. You get URL encoding / escaping for free that way.

That said this is a nit so I won't hold the PR up for it :)

...otherOptions,
...(contentType && { headers: { 'Content-Type': contentType } }),
headers: {
...otherOptions.headers,
...(contentType && { 'Content-Type': contentType }),
},
method,
body: formData ?? requestData,
}).then((response) =>
Expand Down