plugin logs

Author: hummerdmag

.gitignore

@@ -14,6 +14,7 @@
 *.out
 vendor
 db.db
+db_plugin.db
 shared-local-instance.db
 debug
 *__debug_bin

cmd/config-boltdb.yaml

@@ -11,7 +11,12 @@ storage:
     type: boltdb
     boltdb:
       path: ./db.db
-  userStorage: *storage_settings
+  userStorage:
+    type: plugin
+    plugin:
+      cmd: ./plugins/bin/bolt-user-storage
+      params: { "path": "./db_plugin.db" }
+      redirectStd: true
   tokenStorage: *storage_settings
   tokenBlacklist: *storage_settings
   verificationCodeStorage: *storage_settings

go.mod

@@ -16,6 +16,7 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/sessions v1.2.1
+	github.com/hashicorp/go-hclog v0.14.1
 	github.com/hashicorp/go-plugin v1.4.5
 	github.com/hummerd/httpdump v0.9.1
 	github.com/joho/godotenv v1.4.0
@@ -70,7 +71,6 @@ require (
 	github.com/golang/snappy v0.0.1 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/gorilla/securecookie v1.1.1 // indirect
-	github.com/hashicorp/go-hclog v0.14.1 // indirect
 	github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/klauspost/compress v1.13.6 // indirect

impersonation/plugin/provider.go

@@ -5,14 +5,14 @@ import (
 	"os/exec"
 	"time"
 
+	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-plugin"
 	grpcShared "github.com/madappgang/identifo/v2/impersonation/grpc/shared"
 	"github.com/madappgang/identifo/v2/impersonation/plugin/shared"
 	"github.com/madappgang/identifo/v2/model"
 )
 
 func NewImpersonationProvider(settings model.PluginSettings, timeout time.Duration) (model.ImpersonationProvider, error) {
-	var err error
 	params := []string{}
 	for k, v := range settings.Params {
 		params = append(params, "-"+k)
@@ -24,6 +24,10 @@ func NewImpersonationProvider(settings model.PluginSettings, timeout time.Durati
 		Plugins:          shared.PluginMap,
 		Cmd:              exec.Command(settings.Cmd, params...),
 		AllowedProtocols: []plugin.Protocol{plugin.ProtocolGRPC},
+		Logger: hclog.New(&hclog.LoggerOptions{
+			Level:      hclog.Debug,
+			JSONFormat: true,
+		}),
 	}
 
 	if settings.RedirectStd {

plugins/bolt-user-storage/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"flag"
+	"log/slog"
 	"os"
 	"os/signal"
 	"syscall"
@@ -13,7 +14,20 @@ import (
 	"github.com/madappgang/identifo/v2/storage/plugin/shared"
 )
 
+type wproxy struct {
+}
+
+func (w wproxy) Write(p []byte) (n int, err error) {
+	return os.Stderr.Write(p)
+}
+
 func main() {
+	slog.SetDefault(slog.New(slog.NewJSONHandler(
+		wproxy{},
+		&slog.HandlerOptions{
+			Level: slog.LevelDebug,
+		})))
+
 	path := flag.String("path", "", "path to database")
 	flag.Parse()
 
@@ -34,7 +48,6 @@ func main() {
 		Plugins: map[string]plugin.Plugin{
 			"user-storage": &shared.UserStoragePlugin{Impl: s},
 		},
-
 		// A non-nil value here enables gRPC serving for this plugin...
 		GRPCServer: plugin.DefaultGRPCServer,
 	})

storage/plugin/user.go

@@ -4,6 +4,7 @@ import (
 	"os"
 	"os/exec"
 
+	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-plugin"
 	"github.com/madappgang/identifo/v2/model"
 	grpcShared "github.com/madappgang/identifo/v2/storage/grpc/shared"
@@ -12,7 +13,6 @@ import (
 
 // NewUserStorage creates and inits plugin user storage.
 func NewUserStorage(settings model.PluginSettings) (model.UserStorage, error) {
-	var err error
 	params := []string{}
 	for k, v := range settings.Params {
 		params = append(params, "-"+k)
@@ -24,6 +24,10 @@ func NewUserStorage(settings model.PluginSettings) (model.UserStorage, error) {
 		Plugins:          shared.PluginMap,
 		Cmd:              exec.Command(settings.Cmd, params...),
 		AllowedProtocols: []plugin.Protocol{plugin.ProtocolGRPC},
+		Logger: hclog.New(&hclog.LoggerOptions{
+			Level:      hclog.Debug,
+			JSONFormat: true,
+		}),
 	}
 
 	if settings.RedirectStd {

user_payload_provider/plugin/provider.go

@@ -5,6 +5,7 @@ import (
 	"os/exec"
 	"time"
 
+	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-plugin"
 	"github.com/madappgang/identifo/v2/model"
 	grpcShared "github.com/madappgang/identifo/v2/user_payload_provider/grpc/shared"
@@ -13,19 +14,21 @@ import (
 
 // NewTokenPayloadProvider creates and inits plugin for payload provider.
 func NewTokenPayloadProvider(settings model.PluginSettings, timeout time.Duration) (model.TokenPayloadProvider, error) {
-	var err error
 	params := []string{}
 	for k, v := range settings.Params {
 		params = append(params, "-"+k)
 		params = append(params, v)
 	}
 
 	cfg := &plugin.ClientConfig{
-		SyncStdout:       os.Stdout,
 		HandshakeConfig:  shared.Handshake,
 		Plugins:          shared.PluginMap,
 		Cmd:              exec.Command(settings.Cmd, params...),
 		AllowedProtocols: []plugin.Protocol{plugin.ProtocolGRPC},
+		Logger: hclog.New(&hclog.LoggerOptions{
+			Level:      hclog.Debug,
+			JSONFormat: true,
+		}),
 	}
 
 	if settings.RedirectStd {

web/api/hello.go

@@ -34,8 +34,6 @@ func (ar *Router) HandlePing(w http.ResponseWriter, r *http.Request) {
 
 	locale := r.Header.Get("Accept-Language")
 
-	ar.logger.Debug("trace pong handler")
-
 	pong := pongResponse{
 		Message: "Pong!",
 		Date:    time.Now(),

web/api/routes.go

@@ -19,17 +19,19 @@ func (ar *Router) initRoutes(
 		panic("Empty API router")
 	}
 
+	pingHandler := negroni.New(
+		negroni.NewRecovery(),
+		negroni.WrapFunc(ar.HandlePing),
+	)
+	ar.router.Handle("/ping", pingHandler).Methods(http.MethodGet)
+
 	baseMiddleware := buildBaseMiddleware(
 		loggerSettings.DumpRequest,
 		loggerSettings.Format,
 		loggerSettings.API,
 		loggerSettings.LogSensitiveData,
 		ar.cors,
 	)
-
-	ph := with(baseMiddleware, negroni.WrapFunc(ar.HandlePing))
-	ar.router.Handle("/ping", ph).Methods(http.MethodGet)
-
 	apiMiddlewares := ar.buildAPIMiddleware(baseMiddleware)
 
 	// federated oidc