f6510e25a1
The API-key connection always presented the key as Authorization: Bearer. Some providers, notably Anthropic, require the key in a custom header such as x-api-key and reject Bearer auth, returning 400 when both headers are present. Add an optional Header field on APIKeyConnection (empty preserves the Bearer default for every existing provider) served by a small transport that omits Authorization, plus a registry-declared APIKeyHeader so the create-connector resolver wires the right scheme per provider. Signed-off-by: Aurélien Sibiril <81782+aureliensibiril@users.noreply.github.com>
112 lines
3.2 KiB
Go
112 lines
3.2 KiB
Go
// Copyright (c) 2026 Probo Inc <hello@getprobo.com>.
|
|
//
|
|
// Permission to use, copy, modify, and/or distribute this software for any
|
|
// purpose with or without fee is hereby granted, provided that the above
|
|
// copyright notice and this permission notice appear in all copies.
|
|
//
|
|
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
|
|
// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
|
// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
|
|
// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
|
// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
// PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
package connector
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"net/http"
|
|
|
|
"go.gearno.de/kit/httpclient"
|
|
)
|
|
|
|
type APIKeyConnection struct {
|
|
APIKey string `json:"api_key"`
|
|
// Header selects how the API key is presented on outbound requests.
|
|
// Empty (the default) sends it as `Authorization: Bearer <key>`,
|
|
// which every OAuth-style and standard API-key connector uses. A
|
|
// non-empty value (e.g. "x-api-key") sends the raw key in that
|
|
// request header instead and omits Authorization entirely —
|
|
// required by providers such as Anthropic that reject Bearer auth
|
|
// and return 400 when both x-api-key and Authorization are present.
|
|
// It is populated from the provider Registration at connector
|
|
// creation time.
|
|
Header string `json:"header,omitempty"`
|
|
}
|
|
|
|
var _ Connection = (*APIKeyConnection)(nil)
|
|
|
|
func (c *APIKeyConnection) Type() ProtocolType {
|
|
return ProtocolAPIKey
|
|
}
|
|
|
|
func (c *APIKeyConnection) Scopes() []string {
|
|
return nil
|
|
}
|
|
|
|
func (c *APIKeyConnection) Client(ctx context.Context) (*http.Client, error) {
|
|
underlying := httpclient.DefaultPooledTransport(httpclient.WithSSRFProtection())
|
|
|
|
if c.Header != "" {
|
|
return &http.Client{
|
|
Transport: &apiKeyHeaderTransport{
|
|
header: c.Header,
|
|
value: c.APIKey,
|
|
underlying: underlying,
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
return &http.Client{
|
|
Transport: &oauth2Transport{
|
|
token: c.APIKey,
|
|
tokenType: "Bearer",
|
|
underlying: underlying,
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
// apiKeyHeaderTransport injects the API key into a custom request header
|
|
// (for example "x-api-key") and, unlike oauth2Transport, never sets
|
|
// Authorization. Providers such as Anthropic require the key in their
|
|
// own header and reject requests that carry both that header and
|
|
// Authorization.
|
|
type apiKeyHeaderTransport struct {
|
|
header string
|
|
value string
|
|
underlying http.RoundTripper
|
|
}
|
|
|
|
func (t *apiKeyHeaderTransport) RoundTrip(req *http.Request) (*http.Response, error) {
|
|
req2 := req.Clone(req.Context())
|
|
req2.Header.Set(t.header, t.value)
|
|
|
|
return t.underlying.RoundTrip(req2)
|
|
}
|
|
|
|
func (c APIKeyConnection) MarshalJSON() ([]byte, error) {
|
|
type Alias APIKeyConnection
|
|
|
|
return json.Marshal(&struct {
|
|
Type string `json:"type"`
|
|
Alias
|
|
}{
|
|
Type: string(ProtocolAPIKey),
|
|
Alias: Alias(c),
|
|
})
|
|
}
|
|
|
|
func (c *APIKeyConnection) UnmarshalJSON(data []byte) error {
|
|
type Alias APIKeyConnection
|
|
|
|
aux := &struct {
|
|
*Alias
|
|
}{
|
|
Alias: (*Alias)(c),
|
|
}
|
|
|
|
return json.Unmarshal(data, &aux)
|
|
}
|