fix(oracle): handle bracketed proxy usernames in go-ora URL

Author: DEVELOPER-DEEVEN

.github/workflows/deploy_versioned_docs.yaml

@@ -35,9 +35,7 @@ jobs:
           ref: ${{ github.event.release.tag_name }}
 
       - name: Get Version from Release Tag
-        run: echo "VERSION=${GITHUB_EVENT_RELEASE_TAG_NAME}" >> $GITHUB_ENV
-        env:
-          GITHUB_EVENT_RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}
+        run: echo "VERSION=${{ github.event.release.tag_name }}" >> $GITHUB_ENV
 
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3

.github/workflows/link_checker_workflow.yaml

@@ -41,6 +41,7 @@ jobs:
             --no-progress
             --cache
             --max-cache-age 1d
+            --accept 200,206,302
             --exclude '^neo4j\+.*' --exclude '^bolt://.*'
             README.md
             docs/

go.mod

@@ -29,7 +29,7 @@ require (
 	github.com/fsnotify/fsnotify v1.9.0
 	github.com/go-chi/chi/v5 v5.2.3
 	github.com/go-chi/cors v1.2.2
-	github.com/go-chi/httplog/v3 v3.3.0
+	github.com/go-chi/httplog/v2 v2.1.1
 	github.com/go-chi/render v1.0.3
 	github.com/go-goquery/goquery v1.0.1
 	github.com/go-playground/validator/v10 v10.28.0

go.sum

@@ -902,8 +902,8 @@ github.com/go-chi/chi/v5 v5.2.3 h1:WQIt9uxdsAbgIYgid+BpYc+liqQZGMHRaUwp0JUcvdE=
 github.com/go-chi/chi/v5 v5.2.3/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
 github.com/go-chi/cors v1.2.2 h1:Jmey33TE+b+rB7fT8MUy1u0I4L+NARQlK6LhzKPSyQE=
 github.com/go-chi/cors v1.2.2/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
-github.com/go-chi/httplog/v3 v3.3.0 h1:Gr6Y7nSzbpyCyRwKPOVKjDH3BH6TH5uvRNDsTZWDpvU=
-github.com/go-chi/httplog/v3 v3.3.0/go.mod h1:N/J1l5l1fozUrqIVuT8Z/HzNeSy8TF2EFyokPLe6y2w=
+github.com/go-chi/httplog/v2 v2.1.1 h1:ojojiu4PIaoeJ/qAO4GWUxJqvYUTobeo7zmuHQJAxRk=
+github.com/go-chi/httplog/v2 v2.1.1/go.mod h1:/XXdxicJsp4BA5fapgIC3VuTD+z0Z/VzukoB3VDc1YE=
 github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
 github.com/go-chi/render v1.0.3/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0=
 github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw=

internal/log/log.go

@@ -59,35 +59,25 @@ func NewStdLogger(outW, errW io.Writer, logLevel string) (Logger, error) {
 }
 
 // DebugContext logs debug messages
-func (sl *StdLogger) DebugContext(ctx context.Context, msg string, keysAndValues ...any) {
+func (sl *StdLogger) DebugContext(ctx context.Context, msg string, keysAndValues ...interface{}) {
 	sl.outLogger.DebugContext(ctx, msg, keysAndValues...)
 }
 
 // InfoContext logs debug messages
-func (sl *StdLogger) InfoContext(ctx context.Context, msg string, keysAndValues ...any) {
+func (sl *StdLogger) InfoContext(ctx context.Context, msg string, keysAndValues ...interface{}) {
 	sl.outLogger.InfoContext(ctx, msg, keysAndValues...)
 }
 
 // WarnContext logs warning messages
-func (sl *StdLogger) WarnContext(ctx context.Context, msg string, keysAndValues ...any) {
+func (sl *StdLogger) WarnContext(ctx context.Context, msg string, keysAndValues ...interface{}) {
 	sl.errLogger.WarnContext(ctx, msg, keysAndValues...)
 }
 
 // ErrorContext logs error messages
-func (sl *StdLogger) ErrorContext(ctx context.Context, msg string, keysAndValues ...any) {
+func (sl *StdLogger) ErrorContext(ctx context.Context, msg string, keysAndValues ...interface{}) {
 	sl.errLogger.ErrorContext(ctx, msg, keysAndValues...)
 }
 
-// SlogLogger returns a single standard *slog.Logger that routes
-// records to the outLogger or errLogger based on the log level.
-func (sl *StdLogger) SlogLogger() *slog.Logger {
-	splitHandler := &SplitHandler{
-		OutHandler: sl.outLogger.Handler(),
-		ErrHandler: sl.errLogger.Handler(),
-	}
-	return slog.New(splitHandler)
-}
-
 const (
 	Debug = "DEBUG"
 	Info  = "INFO"
@@ -187,64 +177,21 @@ func NewStructuredLogger(outW, errW io.Writer, logLevel string) (Logger, error)
 }
 
 // DebugContext logs debug messages
-func (sl *StructuredLogger) DebugContext(ctx context.Context, msg string, keysAndValues ...any) {
+func (sl *StructuredLogger) DebugContext(ctx context.Context, msg string, keysAndValues ...interface{}) {
 	sl.outLogger.DebugContext(ctx, msg, keysAndValues...)
 }
 
 // InfoContext logs info messages
-func (sl *StructuredLogger) InfoContext(ctx context.Context, msg string, keysAndValues ...any) {
+func (sl *StructuredLogger) InfoContext(ctx context.Context, msg string, keysAndValues ...interface{}) {
 	sl.outLogger.InfoContext(ctx, msg, keysAndValues...)
 }
 
 // WarnContext logs warning messages
-func (sl *StructuredLogger) WarnContext(ctx context.Context, msg string, keysAndValues ...any) {
+func (sl *StructuredLogger) WarnContext(ctx context.Context, msg string, keysAndValues ...interface{}) {
 	sl.errLogger.WarnContext(ctx, msg, keysAndValues...)
 }
 
 // ErrorContext logs error messages
-func (sl *StructuredLogger) ErrorContext(ctx context.Context, msg string, keysAndValues ...any) {
+func (sl *StructuredLogger) ErrorContext(ctx context.Context, msg string, keysAndValues ...interface{}) {
 	sl.errLogger.ErrorContext(ctx, msg, keysAndValues...)
 }
-
-// SlogLogger returns a single standard *slog.Logger that routes
-// records to the outLogger or errLogger based on the log level.
-func (sl *StructuredLogger) SlogLogger() *slog.Logger {
-	splitHandler := &SplitHandler{
-		OutHandler: sl.outLogger.Handler(),
-		ErrHandler: sl.errLogger.Handler(),
-	}
-	return slog.New(splitHandler)
-}
-
-type SplitHandler struct {
-	OutHandler slog.Handler
-	ErrHandler slog.Handler
-}
-
-func (h *SplitHandler) Enabled(ctx context.Context, level slog.Level) bool {
-	if level >= slog.LevelWarn {
-		return h.ErrHandler.Enabled(ctx, level)
-	}
-	return h.OutHandler.Enabled(ctx, level)
-}
-
-func (h *SplitHandler) Handle(ctx context.Context, r slog.Record) error {
-	if r.Level >= slog.LevelWarn {
-		return h.ErrHandler.Handle(ctx, r)
-	}
-	return h.OutHandler.Handle(ctx, r)
-}
-
-func (h *SplitHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
-	return &SplitHandler{
-		OutHandler: h.OutHandler.WithAttrs(attrs),
-		ErrHandler: h.ErrHandler.WithAttrs(attrs),
-	}
-}
-
-func (h *SplitHandler) WithGroup(name string) slog.Handler {
-	return &SplitHandler{
-		OutHandler: h.OutHandler.WithGroup(name),
-		ErrHandler: h.ErrHandler.WithGroup(name),
-	}
-}

internal/log/logger.go

@@ -16,20 +16,16 @@ package log
 
 import (
 	"context"
-	"log/slog"
 )
 
 // Logger is the interface used throughout the project for logging.
 type Logger interface {
 	// DebugContext is for reporting additional information about internal operations.
-	DebugContext(ctx context.Context, format string, args ...any)
+	DebugContext(ctx context.Context, format string, args ...interface{})
 	// InfoContext is for reporting informational messages.
-	InfoContext(ctx context.Context, format string, args ...any)
+	InfoContext(ctx context.Context, format string, args ...interface{})
 	// WarnContext is for reporting warning messages.
-	WarnContext(ctx context.Context, format string, args ...any)
+	WarnContext(ctx context.Context, format string, args ...interface{})
 	// ErrorContext is for reporting errors.
-	ErrorContext(ctx context.Context, format string, args ...any)
-	// Single standard slog.Logger that routes records to the outLogger or
-	// errLogger based on log levels
-	SlogLogger() *slog.Logger
+	ErrorContext(ctx context.Context, format string, args ...interface{})
 }

internal/server/server.go

@@ -28,7 +28,7 @@ import (
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 	"github.com/go-chi/cors"
-	"github.com/go-chi/httplog/v3"
+	"github.com/go-chi/httplog/v2"
 	"github.com/googleapis/genai-toolbox/internal/auth"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/log"
@@ -347,16 +347,31 @@ func NewServer(ctx context.Context, cfg ServerConfig) (*Server, error) {
 	if err != nil {
 		return nil, fmt.Errorf("unable to initialize http log: %w", err)
 	}
-
-	schema := *httplog.SchemaGCP
-	schema.Level = cfg.LogLevel.String()
-	schema.Concise(true)
-	httpOpts := &httplog.Options{
-		Level:  logLevel,
-		Schema: &schema,
+	var httpOpts httplog.Options
+	switch cfg.LoggingFormat.String() {
+	case "json":
+		httpOpts = httplog.Options{
+			JSON:             true,
+			LogLevel:         logLevel,
+			Concise:          true,
+			RequestHeaders:   false,
+			MessageFieldName: "message",
+			SourceFieldName:  "logging.googleapis.com/sourceLocation",
+			TimeFieldName:    "timestamp",
+			LevelFieldName:   "severity",
+		}
+	case "standard":
+		httpOpts = httplog.Options{
+			LogLevel:         logLevel,
+			Concise:          true,
+			RequestHeaders:   false,
+			MessageFieldName: "message",
+		}
+	default:
+		return nil, fmt.Errorf("invalid Logging format: %q", cfg.LoggingFormat.String())
 	}
-	logger := l.SlogLogger()
-	r.Use(httplog.RequestLogger(logger, httpOpts))
+	httpLogger := httplog.NewLogger("httplog", httpOpts)
+	r.Use(httplog.RequestLogger(httpLogger))
 
 	sourcesMap, authServicesMap, embeddingModelsMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap, err := InitializeConfigs(ctx, cfg)
 	if err != nil {

internal/sources/oracle/oracle.go

@@ -6,6 +6,7 @@ import (
 	"database/sql"
 	"encoding/json"
 	"fmt"
+	"net/url"
 	"os"
 	"strings"
 
@@ -237,6 +238,32 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 	return out, nil
 }
 
+func buildGoOraConnString(user, password, connectStringBase, walletLocation string) string {
+	userInfo := url.UserPassword(
+		decodePercentEncodedUserInfo(user),
+		decodePercentEncodedUserInfo(password),
+	).String()
+
+	base := fmt.Sprintf("oracle://%s@%s", userInfo, connectStringBase)
+	trimmedWalletLocation := strings.TrimSpace(walletLocation)
+	if trimmedWalletLocation == "" {
+		return base
+	}
+
+	q := url.Values{}
+	q.Set("ssl", "true")
+	q.Set("wallet", trimmedWalletLocation)
+	return fmt.Sprintf("%s?%s", base, q.Encode())
+}
+
+func decodePercentEncodedUserInfo(value string) string {
+	decoded, err := url.PathUnescape(value)
+	if err != nil {
+		return value
+	}
+	return decoded
+}
+
 func initOracleConnection(ctx context.Context, tracer trace.Tracer, config Config) (*sql.DB, error) {
 	//nolint:all // Reassigned ctx
 	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, config.Name)
@@ -289,16 +316,11 @@ func initOracleConnection(ctx context.Context, tracer trace.Tracer, config Confi
 		// Use go-ora driver (pure Go)
 		driverName = "oracle"
 
-		user := config.User
-		password := config.Password
+		finalConnStr = buildGoOraConnString(config.User, config.Password, connectStringBase, config.WalletLocation)
 
 		if hasWallet {
-			finalConnStr = fmt.Sprintf("oracle://%s:%s@%s?ssl=true&wallet=%s",
-				user, password, connectStringBase, config.WalletLocation)
+			logger.DebugContext(ctx, fmt.Sprintf("Using go-ora driver (pure-Go) with wallet and serverString: %s\n", connectStringBase))
 		} else {
-			// Standard go-ora connection
-			finalConnStr = fmt.Sprintf("oracle://%s:%s@%s",
-				config.User, config.Password, connectStringBase)
 			logger.DebugContext(ctx, fmt.Sprintf("Using go-ora driver (pure-Go) with serverString: %s\n", connectStringBase))
 		}
 	}

internal/sources/oracle/oracle_connstring_test.go

@@ -0,0 +1,60 @@
+package oracle
+
+import "testing"
+
+func TestBuildGoOraConnString(t *testing.T) {
+	t.Parallel()
+
+	testCases := []struct {
+		name           string
+		user           string
+		password       string
+		connBase       string
+		walletLocation string
+		want           string
+	}{
+		{
+			name:           "encodes credentials and wallet",
+			user:           "user[client]",
+			password:       "pa:ss@word",
+			connBase:       "dbhost:1521/XEPDB1",
+			walletLocation: "/tmp/my wallet",
+			want:           "oracle://user%5Bclient%5D:pa%3Ass%40word@dbhost:1521/XEPDB1?ssl=true&wallet=%2Ftmp%2Fmy+wallet",
+		},
+		{
+			name:           "no wallet",
+			user:           "scott",
+			password:       "tiger",
+			connBase:       "dbhost:1521/ORCL",
+			walletLocation: "",
+			want:           "oracle://scott:tiger@dbhost:1521/ORCL",
+		},
+		{
+			name:           "does not double encode percent encoded user",
+			user:           "app_user%5BCLIENT_A%5D",
+			password:       "secret",
+			connBase:       "dbhost:1521/ORCL",
+			walletLocation: "",
+			want:           "oracle://app_user%5BCLIENT_A%5D:secret@dbhost:1521/ORCL",
+		},
+		{
+			name:           "uses trimmed wallet location",
+			user:           "scott",
+			password:       "tiger",
+			connBase:       "dbhost:1521/ORCL",
+			walletLocation: "  /tmp/wallet  ",
+			want:           "oracle://scott:tiger@dbhost:1521/ORCL?ssl=true&wallet=%2Ftmp%2Fwallet",
+		},
+	}
+
+	for _, tc := range testCases {
+		tc := tc
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+			got := buildGoOraConnString(tc.user, tc.password, tc.connBase, tc.walletLocation)
+			if got != tc.want {
+				t.Fatalf("buildGoOraConnString() = %q, want %q", got, tc.want)
+			}
+		})
+	}
+}

internal/tools/bigquery/bigqueryexecutesql/bigqueryexecutesql.go

@@ -107,15 +107,24 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 				return nil, fmt.Errorf("expected allowedDataset to have at least 2 parts (project.dataset): %s", datasetFQN)
 			}
 			datasetID := parts[1]
-			fmt.Fprintf(&sqlDescriptionBuilder, " The query must only access the `%s` dataset. "+
-				"To query a table within this dataset (e.g., `my_table`), "+
-				"qualify it with the dataset id (e.g., `%s.my_table`).", datasetFQN, datasetID)
+			fmt.Fprintf(
+				&sqlDescriptionBuilder,
+				" The query must only access the `%s` dataset. "+
+					"To query a table within this dataset (e.g., `my_table`), "+
+					"qualify it with the dataset id (e.g., `%s.my_table`).",
+				datasetFQN,
+				datasetID,
+			)
 		} else {
 			datasetIDs := []string{}
 			for _, ds := range allowedDatasets {
 				datasetIDs = append(datasetIDs, fmt.Sprintf("`%s`", ds))
 			}
-			fmt.Fprintf(&sqlDescriptionBuilder, " The query must only access datasets from the following list: %s.", strings.Join(datasetIDs, ", "))
+			fmt.Fprintf(
+				&sqlDescriptionBuilder,
+				" The query must only access datasets from the following list: %s.",
+				strings.Join(datasetIDs, ", "),
+			)
 		}
 	}