v0.21.0 scram password auth, cred and token management, browser tls-terminating proxy, viewer client
Test / test (push) Canceled after 0s
Test / test (push) Canceled after 0s
This commit is contained in:
1 parent
f192c26fa2
commit
9ab8c356d2
60 files changed
+6791
-747
No files matched your search
@@ -1,16 +1,24 @@
|
||||
package httpchain
|
||||
|
||||
import (
|
||||
"crypto/tls"
|
||||
"net"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
"sync/atomic"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"logwisp/internal/authz"
|
||||
"logwisp/internal/chain"
|
||||
"logwisp/internal/config"
|
||||
"logwisp/internal/core"
|
||||
"logwisp/internal/session"
|
||||
"logwisp/internal/testutil"
|
||||
|
||||
"github.com/lixenwraith/auth"
|
||||
"github.com/lixenwraith/log"
|
||||
)
|
||||
|
||||
@@ -45,3 +53,76 @@ func TestRedirectIsNotFollowed(t *testing.T) {
|
||||
t.Fatal("the batch followed the redirect")
|
||||
}
|
||||
}
|
||||
|
||||
// Under scram a 401 on ingest (an expired token, a reloaded source) logs in
|
||||
// again, and the held batch is delivered exactly once.
|
||||
func TestRefusedTokenLogsInAgainAndDeliversOnce(t *testing.T) {
|
||||
pki := testutil.NewPKI(t, "edge-01")
|
||||
dir := t.TempDir()
|
||||
cred, err := auth.NewCredential("edge-01", "edge-01-secret")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
data, err := (&authz.Credentials{DecoyKey: make([]byte, 32), Users: []*auth.Credential{cred}}).Marshal()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
creds, password := filepath.Join(dir, "users.toml"), filepath.Join(dir, "edge-01.pass")
|
||||
testutil.WriteFile(t, creds, string(data))
|
||||
testutil.WriteFile(t, password, "edge-01-secret\n")
|
||||
|
||||
serverCert, err := tls.LoadX509KeyPair(pki.ServerCert, pki.ServerKey)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
serverTLS := &tls.Config{Certificates: []tls.Certificate{serverCert}}
|
||||
listener, err := authz.New(&config.AuthOptions{Type: authz.MethodSCRAM, CredentialsFile: creds}, serverTLS, authz.RoleChainListener, authz.HTTP)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := listener.Start(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(listener.Close)
|
||||
|
||||
var refused, delivered atomic.Int64
|
||||
mux := http.NewServeMux()
|
||||
mux.HandleFunc("POST "+chain.AuthPath, func(w http.ResponseWriter, r *http.Request) { listener.ServeAuth(w, r) })
|
||||
mux.HandleFunc("POST /ingest", func(w http.ResponseWriter, r *http.Request) {
|
||||
if _, status, err := listener.AuthorizeRequest(r); err != nil {
|
||||
authz.Refuse(w, status)
|
||||
return
|
||||
}
|
||||
if refused.Add(1) == 1 {
|
||||
authz.Refuse(w, http.StatusUnauthorized) // as after a reload
|
||||
return
|
||||
}
|
||||
delivered.Add(1)
|
||||
w.WriteHeader(http.StatusNoContent)
|
||||
})
|
||||
srv := httptest.NewUnstartedServer(mux)
|
||||
srv.TLS = serverTLS
|
||||
srv.StartTLS()
|
||||
t.Cleanup(srv.Close)
|
||||
|
||||
_, port, _ := net.SplitHostPort(srv.Listener.Addr().String())
|
||||
p, _ := strconv.ParseInt(port, 10, 64)
|
||||
manager := session.NewManager(time.Hour)
|
||||
t.Cleanup(manager.Stop)
|
||||
created, err := NewHTTPChainSinkPlugin("fwd", map[string]any{
|
||||
"host": "127.0.0.1", "port": p, "backoff_min_ms": int64(10),
|
||||
"tls": map[string]any{"enabled": true, "ca_file": pki.CA},
|
||||
"auth": map[string]any{"type": "scram", "username": "edge-01", "password_file": password},
|
||||
}, log.NewLogger(), session.NewProxy(manager, "fwd"))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
sink := created.(*HTTPChainSink)
|
||||
sink.append(core.TransportEvent{Time: time.Now(), Payload: []byte("entry")})
|
||||
if !sink.flush(t.Context()) || delivered.Load() != 1 || sink.droppedBatches.Load() != 0 {
|
||||
t.Fatalf("delivered %d, dropped %d", delivered.Load(), sink.droppedBatches.Load())
|
||||
}
|
||||
if logins := listener.Stats()["auth_allowed"]; logins != uint64(2) {
|
||||
t.Fatalf("logins = %v, want 2", logins)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user