Merge pull request #68 from aka-bo/log-wireup

wire-up asherah logger

Author: jgowdy-godaddy

.github/workflows/codeql-analysis.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/publish.yml

@@ -9,7 +9,7 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-latest
     container:
-      image: golang:1.20.12-bullseye
+      image: golang:bookworm
       options: --ulimit core=-1 --ulimit memlock=-1:-1
     steps:
     - uses: actions/checkout@v2
@@ -32,11 +32,12 @@ jobs:
     timeout-minutes: 15
     runs-on: 'macos-latest'
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v5
       with:
-        go-version: 1.20.12
+        go-version: 1.24
+        check-latest: 'true'
     - name: Build for MacOS
       run: scripts/macos-build.sh
     - name: Publish MacOS sha256sums

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-latest
     container:
-      image: golang:1.20.12-bullseye
+      image: golang:bookworm
       options: --ulimit core=-1 --ulimit memlock=-1:-1
     steps:
     - uses: actions/checkout@v2
@@ -28,10 +28,11 @@ jobs:
     timeout-minutes: 15
     runs-on: 'macos-latest'
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v5
       with:
-        go-version: 1.20.12
+        go-version: 1.24
+        check-latest: 'true'
     - name: Build for MacOS
       run: scripts/macos-build.sh

internal/asherah/asherah.go

@@ -11,6 +11,7 @@ import (
 	"github.com/godaddy/asherah/go/appencryption"
 	"github.com/godaddy/asherah/go/appencryption/pkg/crypto/aead"
 	"github.com/godaddy/asherah/go/appencryption/pkg/kms"
+	asherahLog "github.com/godaddy/asherah/go/appencryption/pkg/log"
 	"github.com/godaddy/asherah/go/appencryption/pkg/persistence"
 	"github.com/godaddy/asherah/go/securememory/memguard"
 )
@@ -22,12 +23,22 @@ var ErrAsherahAlreadyInitialized = errors.New("asherah already initialized")
 var ErrAsherahNotInitialized = errors.New("asherah not initialized")
 var ErrAsherahFailedInitialization = errors.New("asherah failed initialization")
 
+type logFunc func(format string, v ...interface{})
+
+func (f logFunc) Debugf(format string, v ...interface{}) {
+	f(format, v...)
+}
+
 func Setup(options *Options) error {
 	if atomic.LoadInt32(&globalInitialized) == 1 {
 		log.ErrorLog("Failed to initialize asherah: already initialized")
 		return ErrAsherahAlreadyInitialized
 	}
 
+	if options.Verbose && log.DebugLogf != nil {
+		asherahLog.SetLogger(logFunc(log.DebugLogf))
+	}
+
 	crypto := aead.NewAES256GCM()
 
 	if options.SessionCacheMaxSize == 0 {

libasherah_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/godaddy/cobhan-go"
 )
 
-var Verbose = true
+var Verbose = false
 
 func setupAsherahForTesting(t *testing.T) {
 	config := &asherah.Options{}