Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions cmd/crowdsec-cli/clicapi/capi.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ func (cli *cliCapi) register(ctx context.Context, capiUserPrefix string, outputF
return fmt.Errorf("unable to parse api url %s: %w", CAPIBaseURL, err)
}

_, err = apiclient.RegisterClient(ctx, &apiclient.Config{
_, err = apiclient.RegisterCAPIClient(ctx, &apiclient.Config{
MachineID: capiUser,
Password: password,
URL: apiurl,
VersionPrefix: "v3",
}, nil)
})
if err != nil {
return fmt.Errorf("api client register ('%s'): %w", CAPIBaseURL, err)
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/crowdsec-cli/cliconsole/console.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func (cli *cliConsole) enroll(ctx context.Context, key string, name string, over
return err
}

c := apiclient.NewClient(&apiclient.Config{
c := apiclient.NewCAPIClient(&apiclient.Config{
MachineID: cli.cfg().API.Server.OnlineClient.Credentials.Login,
Password: password,
URL: apiURL,
Expand Down
2 changes: 1 addition & 1 deletion cmd/crowdsec-cli/core/consolestatus/consolestatus.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func QueryCAPIStatus(ctx context.Context, db *database.Client, hub *cwhub.Hub, c

passwd := strfmt.Password(password)

client := apiclient.NewClient(&apiclient.Config{
client := apiclient.NewCAPIClient(&apiclient.Config{
MachineID: login,
Password: passwd,
URL: apiURL,
Expand Down
74 changes: 51 additions & 23 deletions pkg/apiclient/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,29 @@ func GetLAPIClient() (*ApiClient, error) {
return lapiClient, nil
}

// lapiTLSConfig returns the TLS settings from api.client, which only apply to LAPI.
func lapiTLSConfig() *tls.Config {
tlsconfig := &tls.Config{InsecureSkipVerify: InsecureSkipVerify}
tlsconfig.RootCAs = CaCertPool

if Cert != nil {
tlsconfig.Certificates = []tls.Certificate{*Cert}
}

return tlsconfig
}

// NewClient returns a client for LAPI.
func NewClient(config *Config) *ApiClient {
return newJWTClient(config, lapiTLSConfig())
}

// NewCAPIClient returns a client for CAPI/PAPI, ignoring the LAPI client TLS settings.
func NewCAPIClient(config *Config) *ApiClient {
return newJWTClient(config, &tls.Config{})
}

func newJWTClient(config *Config, tlsconfig *tls.Config) *ApiClient {
userAgent := config.UserAgent
if userAgent == "" {
userAgent = useragent.Default()
Expand Down Expand Up @@ -185,15 +207,8 @@ func NewClient(config *Config) *ApiClient {

t.URL = baseURL

tlsconfig := tls.Config{InsecureSkipVerify: InsecureSkipVerify}
tlsconfig.RootCAs = CaCertPool

if Cert != nil {
tlsconfig.Certificates = []tls.Certificate{*Cert}
}

if t.Transport != nil {
t.Transport.(*http.Transport).TLSClientConfig = &tlsconfig
t.Transport.(*http.Transport).TLSClientConfig = tlsconfig
}

c := &ApiClient{client: t.Client(), BaseURL: baseURL, UserAgent: userAgent, URLPrefix: config.VersionPrefix, PapiURL: config.PapiURL}
Expand All @@ -211,7 +226,17 @@ func NewClient(config *Config) *ApiClient {
return c
}

// NewDefaultClient returns a client for LAPI, without JWT authentication.
func NewDefaultClient(url *url.URL, prefix string, userAgent string, client *http.Client) (*ApiClient, error) {
return newNoAuthClient(url, prefix, userAgent, client, lapiTLSConfig())
}

// NewDefaultCAPIClient returns a client for CAPI without JWT authentication, ignoring the LAPI client TLS settings.
func NewDefaultCAPIClient(url *url.URL) (*ApiClient, error) {
return newNoAuthClient(url, "", "", nil, &tls.Config{})
}

func newNoAuthClient(url *url.URL, prefix string, userAgent string, client *http.Client, tlsconfig *tls.Config) (*ApiClient, error) {
transport, baseURL := createTransport(url)

if client == nil {
Expand All @@ -222,14 +247,7 @@ func NewDefaultClient(url *url.URL, prefix string, userAgent string, client *htt
} else {
if ht, ok := http.DefaultTransport.(*http.Transport); ok {
ht = ht.Clone()
tlsconfig := tls.Config{InsecureSkipVerify: InsecureSkipVerify}
tlsconfig.RootCAs = CaCertPool

if Cert != nil {
tlsconfig.Certificates = []tls.Certificate{*Cert}
}

ht.TLSClientConfig = &tlsconfig
ht.TLSClientConfig = tlsconfig
client.Transport = ht
}
}
Expand All @@ -254,22 +272,32 @@ func NewDefaultClient(url *url.URL, prefix string, userAgent string, client *htt
return c, nil
}

// RegisterClient registers a machine to LAPI.
func RegisterClient(ctx context.Context, config *Config, client *http.Client) (*ApiClient, error) {
tlsconfig := &tls.Config{InsecureSkipVerify: InsecureSkipVerify}
if Cert != nil {
tlsconfig.RootCAs = CaCertPool
tlsconfig.Certificates = []tls.Certificate{*Cert}
}

return registerMachine(ctx, config, client, tlsconfig)
}

// RegisterCAPIClient registers a machine to CAPI, ignoring the LAPI client TLS settings.
func RegisterCAPIClient(ctx context.Context, config *Config) (*ApiClient, error) {
return registerMachine(ctx, config, nil, &tls.Config{})
}

func registerMachine(ctx context.Context, config *Config, client *http.Client, tlsconfig *tls.Config) (*ApiClient, error) {
transport, baseURL := createTransport(config.URL)

if client == nil {
client = &http.Client{}
if transport != nil {
client.Transport = transport
} else {
tlsconfig := tls.Config{InsecureSkipVerify: InsecureSkipVerify}
if Cert != nil {
tlsconfig.RootCAs = CaCertPool
tlsconfig.Certificates = []tls.Certificate{*Cert}
}

client.Transport = http.DefaultTransport.(*http.Transport).Clone()
client.Transport.(*http.Transport).TLSClientConfig = &tlsconfig
client.Transport.(*http.Transport).TLSClientConfig = tlsconfig
}
} else if client.Transport == nil && transport != nil {
client.Transport = transport
Expand Down
6 changes: 3 additions & 3 deletions pkg/apiserver/apic.go
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ func NewAPIC(ctx context.Context, config *csconfig.OnlineApiClientCfg, dbClient
return nil, fmt.Errorf("while parsing '%s': %w", config.Credentials.PapiURL, err)
}

ret.apiClient = apiclient.NewClient(&apiclient.Config{
ret.apiClient = apiclient.NewCAPIClient(&apiclient.Config{
MachineID: config.Credentials.Login,
Password: strfmt.Password(config.Credentials.Password),
URL: apiURL,
Expand Down Expand Up @@ -901,7 +901,7 @@ func (a *apic) UpdateAllowlists(ctx context.Context, allowlistsLinks []*modelsca
return nil
}

client, err := apiclient.NewDefaultClient(a.apiClient.BaseURL, "", "", nil)
client, err := apiclient.NewDefaultCAPIClient(a.apiClient.BaseURL)
if err != nil {
return fmt.Errorf("while creating default client: %w", err)
}
Expand Down Expand Up @@ -1120,7 +1120,7 @@ func (a *apic) UpdateBlocklists(ctx context.Context, blocklists []*modelscapi.Bl

// we must use a different http client than apiClient's because the transport of apiClient is jwtTransport or here we have signed apis that are incompatibles
// we can use the same baseUrl as the urls are absolute and the parse will take care of it
defaultClient, err := apiclient.NewDefaultClient(a.apiClient.BaseURL, "", "", nil)
defaultClient, err := apiclient.NewDefaultCAPIClient(a.apiClient.BaseURL)
if err != nil {
return fmt.Errorf("while creating default client: %w", err)
}
Expand Down
Loading