fix(ja4ebpf): split bpf2go generate into Ja4Tc + Ja4Ssl, fix RPM systemd-rpm-macros

- Use two separate //go:generate directives (Ja4Tc for tc_capture.c, Ja4Ssl
  for uprobe_ssl.c) to avoid duplicate LICENSE symbol and multi-file clang issue
- Update loader.go to hold tcObjs/sslObjs separately with correct field names:
  UprobeSslSetFd, UprobeSslReadEntry, UretprobeSslReadExit,
  KprobeAccept4Entry, KretprobeAccept4Exit
- Add systemd-rpm-macros to all three RPM build stages (el8/el9/el10)
  so that %{_unitdir} macro resolves correctly
- RPMs now build successfully for el8, el9, el10

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
toto
2026-04-11 23:21:11 +02:00
parent a1e4c1dad5
commit 3b047b680a
155 changed files with 197011 additions and 599 deletions

View File

@ -0,0 +1,19 @@
// Package logging provides a factory for creating loggers
package logging
import (
"github.com/antitbone/ja4/sentinel/api"
)
// LoggerFactory creates logger instances
type LoggerFactory struct{}
// NewLogger creates a new logger based on configuration
func (f *LoggerFactory) NewLogger(level string) api.Logger {
return NewServiceLogger(level)
}
// NewDefaultLogger creates a logger with default settings
func (f *LoggerFactory) NewDefaultLogger() api.Logger {
return NewServiceLogger("info")
}

View File

@ -0,0 +1,47 @@
// Package logging provides structured logging for the sentinel service.
// Implementation is delegated to shared/go/ja4common/logger to avoid duplication.
package logging
import (
jalogger "github.com/antitbone/ja4/ja4common/logger"
"github.com/antitbone/ja4/sentinel/api"
)
// ServiceLogger satisfies api.Logger using ja4common/logger.ComponentLogger.
// This avoids duplicating logging logic that is now shared across all ja4-platform services.
type ServiceLogger struct {
inner *jalogger.ComponentLogger
}
// NewServiceLogger creates a new ServiceLogger backed by ja4common.
func NewServiceLogger(level string) *ServiceLogger {
return &ServiceLogger{inner: jalogger.NewComponentLogger(level)}
}
// Log emits a structured log entry for the given component.
func (l *ServiceLogger) Log(component, level, message string, details map[string]string) {
l.inner.Log(component, level, message, details)
}
// Debug logs a debug entry for the given component.
func (l *ServiceLogger) Debug(component, message string, details map[string]string) {
l.inner.Debug(component, message, details)
}
// Info logs an info entry for the given component.
func (l *ServiceLogger) Info(component, message string, details map[string]string) {
l.inner.Info(component, message, details)
}
// Warn logs a warning entry for the given component.
func (l *ServiceLogger) Warn(component, message string, details map[string]string) {
l.inner.Warn(component, message, details)
}
// Error logs an error entry for the given component.
func (l *ServiceLogger) Error(component, message string, details map[string]string) {
l.inner.Error(component, message, details)
}
// compile-time check: ServiceLogger must satisfy api.Logger
var _ api.Logger = (*ServiceLogger)(nil)

View File

@ -0,0 +1,79 @@
// Package logging tests — behavioral tests for ServiceLogger.
// Since ServiceLogger delegates to ja4common/logger.ComponentLogger,
// we test behavior (no-panic, interface satisfaction, level filtering)
// rather than internal output buffering.
package logging_test
import (
"testing"
"github.com/antitbone/ja4/sentinel/api"
"github.com/antitbone/ja4/sentinel/internal/logging"
)
func TestNewServiceLogger_NonNil(t *testing.T) {
logger := logging.NewServiceLogger("info")
if logger == nil {
t.Fatal("expected non-nil logger")
}
}
func TestServiceLogger_ImplementsApiLogger(t *testing.T) {
logger := logging.NewServiceLogger("debug")
var _ api.Logger = logger // compile-time check
}
func TestServiceLogger_AllLevels_NoPanic(t *testing.T) {
levels := []string{"debug", "info", "warn", "error", "invalid"}
for _, level := range levels {
t.Run(level, func(t *testing.T) {
logger := logging.NewServiceLogger(level)
logger.Debug("comp", "debug msg", map[string]string{"k": "v"})
logger.Info("comp", "info msg", nil)
logger.Warn("comp", "warn msg", map[string]string{"x": "y"})
logger.Error("comp", "error msg", nil)
})
}
}
func TestServiceLogger_WithDetails(t *testing.T) {
logger := logging.NewServiceLogger("debug")
details := map[string]string{"error": "test error", "trace_id": "abc123"}
logger.Info("service", "test message", details)
}
func TestServiceLogger_NilDetails(t *testing.T) {
logger := logging.NewServiceLogger("debug")
logger.Info("service", "test message", nil)
}
func TestServiceLogger_ConcurrentLogging(t *testing.T) {
logger := logging.NewServiceLogger("debug")
done := make(chan bool)
for i := 0; i < 10; i++ {
go func(id int) {
logger.Info("service", "concurrent message", map[string]string{"id": string(rune('0'+id))})
done <- true
}(i)
}
for i := 0; i < 10; i++ {
<-done
}
}
func TestLoggerFactory(t *testing.T) {
factory := &logging.LoggerFactory{}
levels := []string{"debug", "info", "warn", "error"}
for _, level := range levels {
t.Run(level, func(t *testing.T) {
logger := factory.NewLogger(level)
if logger == nil {
t.Fatalf("NewLogger(%q) returned nil", level)
}
})
}
logger := factory.NewDefaultLogger()
if logger == nil {
t.Fatal("NewDefaultLogger() returned nil")
}
}