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

code refactor for filter headers #168

Merged
merged 1 commit into from
Apr 29, 2024
Merged

code refactor for filter headers #168

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
32 changes: 14 additions & 18 deletions infrastructure/persistence/cloudconnector/cloudconnector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,7 @@ func (c *cloudConnectorClientImpl) SendMessage(ctx context.Context, orgID string
resp, err := c.PostV2ConnectionsClientIdMessageWithBody(ctx, recipient, "application/json", bytes.NewReader(data), func(ctx context.Context, req *http.Request) error {
req.Header.Set("x-rh-cloud-connector-org-id", orgID)

sensitiveField := "X-Rh-Cloud-Connector-Psk"
filteredHeaders := make(http.Header)
for key, values := range req.Header {
if key != sensitiveField {
filteredHeaders[key] = values
}
}

logger.Trace().Str("method", req.Method).Str("url", req.URL.String()).Interface("headers", filteredHeaders).Msg("sending HTTP request")
logger.Trace().Str("method", req.Method).Str("url", req.URL.String()).Interface("headers", filteredHeaders(*req, "X-Rh-Cloud-Connector-Psk")).Msg("sending HTTP request")
return nil
})
if err != nil {
Expand Down Expand Up @@ -111,15 +103,7 @@ func (c *cloudConnectorClientImpl) GetConnectionStatus(ctx context.Context, orgI
resp, err := c.V2ConnectionStatusMultiorg(ctx, recipient, func(ctx context.Context, req *http.Request) error {
req.Header.Set("x-rh-cloud-connector-org-id", orgID)

sensitiveField := "X-Rh-Cloud-Connector-Psk"
filteredHeaders := make(http.Header)
for key, values := range req.Header {
if key != sensitiveField {
filteredHeaders[key] = values
}
}

logger = logger.With().Str("method", req.Method).Str("url", req.URL.String()).Interface("headers", req.Header).Logger()
logger = logger.With().Str("method", req.Method).Str("url", req.URL.String()).Interface("headers", filteredHeaders(*req, "X-Rh-Cloud-Connector-Psk")).Logger()
logger.Trace().Msg("sending HTTP request")
return nil
})
Expand Down Expand Up @@ -153,3 +137,15 @@ func (c *cloudConnectorClientImpl) GetConnectionStatus(ctx context.Context, orgI

return "", map[string]interface{}{}, fmt.Errorf("unknown connection status: %v", fmt.Errorf("%v: %v", response.Status(), string(response.Body)))
}

// filteredHeaders removes a specified sensitive field from the request headers.
func filteredHeaders(req http.Request, sensitiveField string) http.Header {
filteredHeaders := make(http.Header)
for key, values := range req.Header {
if key != sensitiveField {
filteredHeaders[key] = values
}
}

return filteredHeaders
}
Loading