Skip to content

fix!: removed second auth header #6

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 6 commits into from
May 20, 2025
Merged

fix!: removed second auth header #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b292ddc
removed btp-so endpoint
n3rdc4ptn May 6, 2025
afe9588
delete json path option
n3rdc4ptn May 6, 2025
535961b
removed kubeconfig endpoint
n3rdc4ptn May 6, 2025
4411210
fix!: removed second authorization header for MCP and merged it into …
n3rdc4ptn May 6, 2025
f6f6283
Merge branch 'main' into only-one-auth-header
n3rdc4ptn May 6, 2025
d727bf7
Merge branch 'main' into only-one-auth-header
n3rdc4ptn May 7, 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
6 changes: 3 additions & 3 deletions internal/server/handlerCategory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ func _categoryHandler(s *shared, req *http.Request, res *response) (*response, *

var config k8s.KubeConfig
if data.ProjectName != "" && data.WorkspaceName != "" && data.McpName != "" {
config, err = openmcp.GetControlPlaneKubeconfig(s.crateKube, data.ProjectName, data.WorkspaceName, data.McpName, data.CrateAuthorization, crateKubeconfig)
config, err = openmcp.GetControlPlaneKubeconfig(s.crateKube, data.ProjectName, data.WorkspaceName, data.McpName, data.Authorization, crateKubeconfig)
if err != nil {
slog.Error("failed to get control plane api config", "err", err)
return nil, NewInternalServerError("failed to get control plane api config")
}
if data.McpAuthorization != "" {
config.SetUserToken(data.McpAuthorization)
if data.Authorization != "" {
config.SetUserToken(data.Authorization)
}
} else {
slog.Error("either use %s: true or provide %s, %s and %s headers", useCrateClusterHeader, projectNameHeader, workspaceNameHeader, mcpName)
Expand Down
18 changes: 7 additions & 11 deletions internal/server/handlerMain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ const (
projectNameHeader = "X-project"
workspaceNameHeader = "X-workspace"
mcpName = "X-mcp"
mcpAuthHeader = "X-mcp-authorization"
contextHeader = "X-context"
useCrateClusterHeader = "X-use-crate"
authorizationHeader = "Authorization"
Expand All @@ -36,7 +35,6 @@ var prohibitedRequestHeaders = []string{
projectNameHeader,
workspaceNameHeader,
mcpName,
mcpAuthHeader,
contextHeader,
authorizationHeader,
"User-Agent",
Expand All @@ -54,10 +52,9 @@ type ExtractedRequestData struct {
ProjectName string
WorkspaceName string
McpName string
McpAuthorization string
ContextName string
UseCrateCluster bool
CrateAuthorization string
Authorization string
Headers map[string][]string
JQ string
Category string
Expand Down Expand Up @@ -90,15 +87,15 @@ func mainHandler(s *shared, req *http.Request, res *response) (*response, *HttpE
var config k8s.KubeConfig
if data.UseCrateCluster {
config = crateKubeconfig
config.SetUserToken(data.CrateAuthorization)
config.SetUserToken(data.Authorization)
} else if data.ProjectName != "" && data.WorkspaceName != "" && data.McpName != "" {
config, err = openmcp.GetControlPlaneKubeconfig(s.crateKube, data.ProjectName, data.WorkspaceName, data.McpName, data.CrateAuthorization, crateKubeconfig)
config, err = openmcp.GetControlPlaneKubeconfig(s.crateKube, data.ProjectName, data.WorkspaceName, data.McpName, data.Authorization, crateKubeconfig)
if err != nil {
slog.Error("failed to get control plane api config", "err", err)
return nil, NewInternalServerError("failed to get control plane api config")
}
if data.McpAuthorization != "" {
config.SetUserToken(data.McpAuthorization)
if data.Authorization != "" {
config.SetUserToken(data.Authorization)
}
} else {
slog.Error("either use %s: true or provide %s, %s and %s headers", useCrateClusterHeader, projectNameHeader, workspaceNameHeader, mcpName)
Expand Down Expand Up @@ -152,9 +149,8 @@ func extractRequestData(r *http.Request) (ExtractedRequestData, error) {
ProjectName: r.Header.Get(projectNameHeader),
WorkspaceName: r.Header.Get(workspaceNameHeader),
ContextName: r.Header.Get(contextHeader),
McpAuthorization: r.Header.Get(mcpAuthHeader),
McpName: r.Header.Get(mcpName),
CrateAuthorization: r.Header.Get(authorizationHeader),
Authorization: r.Header.Get(authorizationHeader),
JQ: r.Header.Get(jqHeader),
Category: r.Header.Get(categoryHeader),
}
Expand All @@ -170,7 +166,7 @@ func extractRequestData(r *http.Request) (ExtractedRequestData, error) {
rd.UseCrateCluster = useCrateCluster
}

if rd.CrateAuthorization == "" {
if rd.Authorization == "" {
return ExtractedRequestData{}, fmt.Errorf("%s header is required", authorizationHeader)
}

Expand Down
Loading