Skip to content

fix: send auth headers with info requests if missing #392

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 4 commits into from
May 8, 2023
Merged

fix: send auth headers with info requests if missing #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5702651
fix: send auth headers with info requests if missing
kruskall May 3, 2023
20b96a3
refactor: update info handler to be consistent with apmproxy code
kruskall May 5, 2023
c9c38e0
Merge branch 'main' into fix/apm-server-version
kruskall May 8, 2023
fcce946
docs: update authorization header comment
kruskall May 8, 2023
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
7 changes: 7 additions & 0 deletions apmproxy/receiver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,13 @@ func (c *Client) handleInfoRequest() (func(w http.ResponseWriter, r *http.Reques
r.Header.Set("X-Forwarded-Host", r.Header.Get("Host"))
r.Host = parsedApmServerURL.Host

// Override authorization header sent by the APM agents
if c.ServerAPIKey != "" {
r.Header.Add("Authorization", "ApiKey "+c.ServerAPIKey)
} else if c.ServerSecretToken != "" {
r.Header.Add("Authorization", "Bearer "+c.ServerSecretToken)
}

// Forward request to the APM server
reverseProxy.ServeHTTP(w, r)
}, nil
Expand Down
34 changes: 33 additions & 1 deletion apmproxy/receiver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func TestInfoProxy(t *testing.T) {
// Create apm server and handler
apmServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
for key := range headers {
assert.Equal(t, 1, len(r.Header[key]))
assert.Equal(t, 2, len(r.Header[key]))
assert.Equal(t, headers[key], r.Header[key][0])
}
w.Header().Add("test", "header")
Expand Down Expand Up @@ -88,6 +88,38 @@ func TestInfoProxy(t *testing.T) {
require.NoError(t, resp.Body.Close())
}

func TestInfoProxyAuth(t *testing.T) {
// Create apm server and handler
apmServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
assert.Equal(t, "ApiKey bar", r.Header.Get("Authorization"))
w.WriteHeader(http.StatusTeapot)
}))
defer apmServer.Close()

// Create extension config and start the server
apmClient, err := apmproxy.NewClient(
apmproxy.WithURL(apmServer.URL),
apmproxy.WithAPIKey("bar"),
// Use ipv4 to avoid issues in CI
apmproxy.WithReceiverAddress("127.0.0.1:1234"),
apmproxy.WithReceiverTimeout(15*time.Second),
apmproxy.WithLogger(zaptest.NewLogger(t).Sugar()),
)
require.NoError(t, err)

require.NoError(t, apmClient.StartReceiver())
defer func() {
require.NoError(t, apmClient.Shutdown())
}()

url := "http://127.0.0.1:1234"

// Send the request to the extension
resp, err := http.Get(url)
require.NoError(t, err)
require.NoError(t, resp.Body.Close())
}

func TestInfoProxyErrorStatusCode(t *testing.T) {
// Create apm server and handler
apmServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
Expand Down