beenull/crowdsec
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix: Add https to dsn

Browse source
This commit is contained in:
Louis PERDEREAU 2023-06-24 21:50:10 +02:00 committed by lperdereau
parent 810f525531
commit 2017e6b113
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkg/acquisition/modules/loki/loki.go
View file

@ -152,12 +152,10 @@ func (l *LokiSource) ConfigureByDSN(dsn string, labels map[string]string, logger
}
scheme := "http"
l.Config.URL = fmt.Sprintf("%s://%s", scheme, u.Host)
if u.User != nil {
l.Config.Auth.Username = u.User.Username()
l.Config.Auth.Password, _ = u.User.Password()
}
params := u.Query()
if q := params.Get("ssl"); q != "" {
scheme = "https"
}
if q := params.Get("query"); q != "" {
l.Config.Query = q
}
@ -202,6 +200,12 @@ func (l *LokiSource) ConfigureByDSN(dsn string, labels map[string]string, logger
l.logger.Logger.SetLevel(level)
}
l.Config.URL = fmt.Sprintf("%s://%s", scheme, u.Host)
if u.User != nil {
l.Config.Auth.Username = u.User.Username()
l.Config.Auth.Password, _ = u.User.Password()
}
clientConfig := lokiclient.Config{
LokiURL: l.Config.URL,
Headers: l.Config.Headers,

15
pkg/acquisition/modules/loki/loki_test.go
View file

@ -6,6 +6,7 @@ import (
"fmt"
"io/ioutil"
"net/http"
"net/url"
"os"
"strings"
"testing"
@ -82,7 +83,7 @@ query: >
config: `
mode: tail
source: loki
url: http://@localhost:3100/
url: http://localhost:3100/
auth:
username: foo
password: bar
@ -125,6 +126,7 @@ func TestConfigureDSN(t *testing.T) {
expectedErr string
since time.Time
password string
scheme string
waitForReady time.Duration
}{
{
@ -163,6 +165,11 @@ func TestConfigureDSN(t *testing.T) {
expectedErr: "",
waitForReady: 5 * time.Second,
},
{
name: "SSL DSN",
dsn: `loki://localhost:3100/?ssl=true`,
scheme: "https",
},
}
for _, test := range tests {
@ -186,6 +193,12 @@ func TestConfigureDSN(t *testing.T) {
t.Fatalf("Password mismatch : %s != %s", test.password, p)
}
}
if test.scheme != "" {
url, _ := url.Parse(lokiSource.Config.URL)
if test.scheme != url.Scheme {
t.Fatalf("Schema mismatch : %s != %s", test.scheme, url.Scheme)
}
}
if test.waitForReady != 0 {
if lokiSource.Config.WaitForReady != test.waitForReady {
t.Fatalf("Wrong WaitForReady %v != %v", lokiSource.Config.WaitForReady, test.waitForReady)