Find, verify, and analyze leaked credentials
Go credentialsdevsecopsdynamic-analysisprecommitscanningsecretsecret-managementsecretssecuritysecurity-toolstrufflehogverification
JDBC test and parsing improvements (#2516)
Dustin Deckerad9d4e53e1e7
diff --git a/go.mod b/go.modindex b2212c616..e77398d64 100644--- a/go.mod+++ b/go.mod@@ -20,6 +20,7 @@ require (github.com/bill-rich/go-syslog v0.0.0-20220413021637-49edb52a574cgithub.com/bitfinexcom/bitfinex-api-go v0.0.0-20210608095005-9e0b26f200fbgithub.com/bradleyfalzon/ghinstallation/v2 v2.9.0+ github.com/brianvoe/gofakeit/v6 v6.28.0github.com/charmbracelet/bubbles v0.18.0github.com/charmbracelet/bubbletea v0.25.0github.com/charmbracelet/glamour v0.6.0@@ -27,7 +28,6 @@ require (github.com/coinbase/waas-client-library-go v1.0.8github.com/couchbase/gocb/v2 v2.7.2github.com/crewjam/rfc5424 v0.1.0- github.com/denisenkom/go-mssqldb v0.12.3github.com/envoyproxy/protoc-gen-validate v1.0.4github.com/fatih/color v1.16.0github.com/felixge/fgprof v0.9.3@@ -60,8 +60,8 @@ require (github.com/lrstanley/bubblezone v0.0.0-20240125042004-b7bafc493195github.com/marusama/semaphore/v2 v2.5.0github.com/mattn/go-isatty v0.0.20- github.com/mattn/go-sqlite3 v1.14.22github.com/mholt/archiver/v4 v4.0.0-alpha.8+ github.com/microsoft/go-mssqldb v1.7.0github.com/mitchellh/go-ps v1.0.0github.com/muesli/reflow v0.3.0github.com/patrickmn/go-cache v2.1.0+incompatible@@ -74,6 +74,10 @@ require (github.com/snowflakedb/gosnowflake v1.8.0github.com/stretchr/testify v1.8.4github.com/tailscale/depaware v0.0.0-20210622194025-720c4b409502+ github.com/testcontainers/testcontainers-go v0.28.0+ github.com/testcontainers/testcontainers-go/modules/mssql v0.28.0+ github.com/testcontainers/testcontainers-go/modules/mysql v0.28.0+ github.com/testcontainers/testcontainers-go/modules/postgres v0.28.0github.com/trufflesecurity/disk-buffer-reader v0.2.1github.com/wasilibs/go-re2 v1.4.1github.com/xanzy/go-gitlab v0.98.0@@ -102,6 +106,7 @@ require (dario.cat/mergo v1.0.0 // indirectgithub.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirectgithub.com/99designs/keyring v1.2.2 // indirect+ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirectgithub.com/Azure/go-autorest v14.2.0+incompatible // indirectgithub.com/Azure/go-autorest/autorest v0.11.24 // indirectgithub.com/Azure/go-autorest/autorest/adal v0.9.18 // indirect@@ -112,6 +117,7 @@ require (github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirectgithub.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirectgithub.com/Microsoft/go-winio v0.6.1 // indirect+ github.com/Microsoft/hcsshim v0.11.4 // indirectgithub.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirectgithub.com/alecthomas/chroma v0.10.0 // indirectgithub.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect@@ -124,23 +130,30 @@ require (github.com/bodgit/plumbing v1.3.0 // indirectgithub.com/bodgit/sevenzip v1.4.5 // indirectgithub.com/bodgit/windows v1.0.1 // indirect+ github.com/cenkalti/backoff/v4 v4.2.1 // indirectgithub.com/cespare/xxhash/v2 v2.2.0 // indirectgithub.com/cloudflare/circl v1.3.7 // indirectgithub.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect+ github.com/containerd/containerd v1.7.12 // indirect+ github.com/containerd/log v0.1.0 // indirectgithub.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirectgithub.com/couchbase/gocbcore/v10 v10.3.2 // indirectgithub.com/couchbase/gocbcoreps v0.1.2 // indirectgithub.com/couchbase/goprotostellar v1.0.2 // indirectgithub.com/couchbaselabs/gocbconnstr/v2 v2.0.0-20230515165046-68b522a21131 // indirect+ github.com/cpuguy83/dockercfg v0.3.1 // indirectgithub.com/cyphar/filepath-securejoin v0.2.4 // indirectgithub.com/danieljoos/wincred v1.1.2 // indirectgithub.com/davecgh/go-spew v1.1.1 // indirectgithub.com/dimchansky/utfbom v1.1.1 // indirect+ github.com/distribution/reference v0.5.0 // indirectgithub.com/dlclark/regexp2 v1.4.0 // indirectgithub.com/docker/cli v24.0.0+incompatible // indirectgithub.com/docker/distribution v2.8.2+incompatible // indirect- github.com/docker/docker v24.0.7+incompatible // indirect+ github.com/docker/docker v25.0.2+incompatible // indirectgithub.com/docker/docker-credential-helpers v0.7.0 // indirect+ github.com/docker/go-connections v0.5.0 // indirect+ github.com/docker/go-units v0.5.0 // indirectgithub.com/dsnet/compress v0.0.1 // indirectgithub.com/dvsekhvalnov/jose2go v1.6.0 // indirectgithub.com/emirpasic/gods v1.18.1 // indirect@@ -153,7 +166,8 @@ require (github.com/go-ole/go-ole v1.2.6 // indirectgithub.com/goccy/go-json v0.10.2 // indirectgithub.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect- github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect+ github.com/gogo/protobuf v1.3.2 // indirect+ github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirectgithub.com/golang-sql/sqlexp v0.1.0 // indirectgithub.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirectgithub.com/golang/protobuf v1.5.3 // indirect@@ -166,10 +180,10 @@ require (github.com/gorilla/css v1.0.0 // indirectgithub.com/gregjones/httpcache v0.0.0-20171119193500-2bcd89a1743f // indirectgithub.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect- github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 // indirect+ github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirectgithub.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirectgithub.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 // indirect- github.com/hashicorp/errwrap v1.0.0 // indirect+ github.com/hashicorp/errwrap v1.1.0 // indirectgithub.com/hashicorp/go-cleanhttp v0.5.2 // indirectgithub.com/hashicorp/go-multierror v1.1.1 // indirectgithub.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect@@ -188,7 +202,9 @@ require (github.com/launchdarkly/go-semver v1.0.2 // indirectgithub.com/launchdarkly/go-server-sdk-evaluation/v2 v2.0.2 // indirectgithub.com/lucasb-eyer/go-colorful v1.2.0 // indirect+ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirectgithub.com/magefile/mage v1.14.0 // indirect+ github.com/magiconair/properties v1.8.7 // indirectgithub.com/mailru/easyjson v0.7.7 // indirectgithub.com/mattn/go-colorable v0.1.13 // indirectgithub.com/mattn/go-localereader v0.0.1 // indirect@@ -196,7 +212,12 @@ require (github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirectgithub.com/microcosm-cc/bluemonday v1.0.23 // indirectgithub.com/mitchellh/go-homedir v1.1.0 // indirect+ github.com/moby/patternmatcher v0.6.0 // indirect+ github.com/moby/sys/sequential v0.5.0 // indirect+ github.com/moby/sys/user v0.1.0 // indirect+ github.com/moby/term v0.5.0 // indirectgithub.com/montanaflynn/stats v0.7.0 // indirect+ github.com/morikuni/aec v1.0.0 // indirectgithub.com/mtibben/percent v0.2.1 // indirectgithub.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70 // indirectgithub.com/muesli/cancelreader v0.2.2 // indirect@@ -205,20 +226,25 @@ require (github.com/olekukonko/tablewriter v0.0.5 // indirectgithub.com/onsi/ginkgo v1.16.5 // indirectgithub.com/opencontainers/go-digest v1.0.0 // indirect- github.com/opencontainers/image-spec v1.1.0-rc3 // indirect+ github.com/opencontainers/image-spec v1.1.0-rc5 // indirectgithub.com/pierrec/lz4/v4 v4.1.19 // indirectgithub.com/pjbgf/sha1cd v0.3.0 // indirectgithub.com/pkg/diff v0.0.0-20200914180035-5b29258ca4f7 // indirectgithub.com/pmezard/go-difflib v1.0.0 // indirect+ github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirectgithub.com/prometheus/client_model v0.5.0 // indirectgithub.com/prometheus/common v0.45.0 // indirectgithub.com/prometheus/procfs v0.12.0 // indirectgithub.com/rivo/uniseg v0.4.6 // indirectgithub.com/sahilm/fuzzy v0.1.1-0.20230530133925-c48e322e2a8f // indirect- github.com/sirupsen/logrus v1.9.1 // indirect+ github.com/shirou/gopsutil/v3 v3.23.12 // indirect+ github.com/shoenig/go-m1cpu v0.1.6 // indirect+ github.com/sirupsen/logrus v1.9.3 // indirectgithub.com/skeema/knownhosts v1.2.1 // indirectgithub.com/tetratelabs/wazero v1.5.0 // indirectgithub.com/therootcompany/xz v1.0.1 // indirect+ github.com/tklauser/go-sysconf v0.3.12 // indirect+ github.com/tklauser/numcpus v0.6.1 // indirectgithub.com/ulikunitz/xz v0.5.11 // indirectgithub.com/vbatts/tar-split v0.11.3 // indirectgithub.com/xanzy/ssh-agent v0.3.3 // indirect@@ -229,7 +255,7 @@ require (github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirectgithub.com/yuin/goldmark v1.5.2 // indirectgithub.com/yuin/goldmark-emoji v1.0.1 // indirect- github.com/yusufpapurcu/wmi v1.2.2 // indirect+ github.com/yusufpapurcu/wmi v1.2.3 // indirectgithub.com/zeebo/xxh3 v1.0.2 // indirectgo.einride.tech/aip v0.60.0 // indirectgo.opencensus.io v0.24.0 // indirectdiff --git a/go.sum b/go.sumindex aff704e9a..f2055ba83 100644--- a/go.sum+++ b/go.sum@@ -35,9 +35,20 @@ github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbgithub.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4=github.com/99designs/keyring v1.2.2 h1:pZd3neh/EmUzWONb35LxQfvuY7kiSXAq3HQd97+XBn0=github.com/99designs/keyring v1.2.2/go.mod h1:wes/FrByc8j7lFOAGLGSNEg8f/PaI3cgTBqhFkHUrPk=-github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw=-github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0=-github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8=+github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=+github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1 h1:lGlwhPtrX6EVml1hO0ivjkUxsSyl4dsiw9qcA1k/3IQ=+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1/go.mod h1:RKUqNu35KJYcVG/fqTRqmuXJZYNhYkBrnC/hX7yGbTA=+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 h1:sO0/P7g68FrryJzljemN+6GTssUXdANk6aJ7T1ZxnsQ=+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1/go.mod h1:h8hyGFDsU5HMivxiS2iYFZsgDbU9OnnJ163x5UGVKYo=+github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 h1:6oNBlSdi1QqM1PNW7FPA6xOGA5UNsXnkaYZz9vdPGhA=+github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1/go.mod h1:s4kgfzA0covAXNicZHDMN58jExvcng2mC/DepXiF1EI=+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.1 h1:MyVTgWR8qd/Jw1Le0NZebGBUCLbtak3bJ3z1OlqZBpw=+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.1/go.mod h1:GpPjLhVR9dnUoJMyHWSPy71xY9/lcmpzIPZXmF0FCVY=+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0 h1:D3occbWoio4EBLkbkevetNMAVX197GkzbUMtqjGWn80=+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0/go.mod h1:bTSOgj05NGRuHHhQwAdPnYr9TOdNmKlZTgGLL6nyAdI=+github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=+github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=github.com/Azure/go-autorest/autorest v0.11.24 h1:1fIGgHKqVm54KIPT+q8Zmd1QlVsmHqeUGso5qm2BqqE=@@ -70,6 +81,8 @@ github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=+github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8=+github.com/Microsoft/hcsshim v0.11.4/go.mod h1:smjE4dvqPX9Zldna+t5FG3rnoHhaB7QYxPRqGcpAD9w=github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 h1:kkhsdkhsCvIsutKu5zLMgWtgh9YxGCNAw8Ad8hjwfYg=github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=github.com/TheZeroSlave/zapsentry v1.20.2 h1:llgC91ZJdoU/OzGxYpUlEhKinf65mw9hJ2KkZ7+cGIk=@@ -120,7 +133,11 @@ github.com/bodgit/windows v1.0.1 h1:tF7K6KOluPYygXa3Z2594zxlkbKPAOvqr97etrGNIz4=github.com/bodgit/windows v1.0.1/go.mod h1:a6JLwrB4KrTR5hBpp8FI9/9W9jJfeQ2h4XDXU74ZCdM=github.com/bradleyfalzon/ghinstallation/v2 v2.9.0 h1:HmxIYqnxubRYcYGRc5v3wUekmo5Wv2uX3gukmWJ0AFk=github.com/bradleyfalzon/ghinstallation/v2 v2.9.0/go.mod h1:wmkTDJf8CmVypxE8ijIStFnKoTa6solK5QfdmJrP9KI=+github.com/brianvoe/gofakeit/v6 v6.28.0 h1:Xib46XXuQfmlLS2EXRuJpqcw8St6qSZz75OUo0tgAW4=+github.com/brianvoe/gofakeit/v6 v6.28.0/go.mod h1:Xj58BMSnFqcn/fAQeSK+/PLtC5kSb7FJIq4JyGa8vEs=github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=+github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=+github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=@@ -146,6 +163,10 @@ github.com/coinbase/waas-client-library-go v1.0.8 h1:AdbTmBQpsSUx947GZd5/68BhNBwgithub.com/coinbase/waas-client-library-go v1.0.8/go.mod h1:RVKozprfdfMiK92ATZUWHRs0EFGHQj4rbEJjzzZzI1I=github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 h1:q2hJAaP1k2wIvVRd/hEHD7lacgqrCPS+k8g1MndzfWY=github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=+github.com/containerd/containerd v1.7.12 h1:+KQsnv4VnzyxWcfO9mlxxELaoztsDEjOuCMPAuPqgU0=+github.com/containerd/containerd v1.7.12/go.mod h1:/5OMpE1p0ylxtEUGY8kuCYkDRzJm9NO1TFMWjUpdevk=+github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=+github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=github.com/containerd/stargz-snapshotter/estargz v0.14.3 h1:OqlDCK3ZVUO6C3B/5FSkDwbkEETK84kQgEeFwDC+62k=github.com/containerd/stargz-snapshotter/estargz v0.14.3/go.mod h1:KY//uOCIkSuNAHhJogcZtrNHdKrA99/FCCRjE3HD36o=github.com/couchbase/gocb/v2 v2.7.2 h1:muQZoLLnlaGInNIhqgEmDdyGhlVJ269aAIXa8rp14pA=@@ -161,7 +182,11 @@ github.com/couchbaselabs/gocaves/client v0.0.0-20230404095311-05e3ba4f0259 h1:2Tgithub.com/couchbaselabs/gocaves/client v0.0.0-20230404095311-05e3ba4f0259/go.mod h1:AVekAZwIY2stsJOMWLAS/0uA/+qdp7pjO8EHnl61QkY=github.com/couchbaselabs/gocbconnstr/v2 v2.0.0-20230515165046-68b522a21131 h1:2EAfFswAfgYn3a05DVcegiw6DgMgn1Mv5eGz6IHt1Cw=github.com/couchbaselabs/gocbconnstr/v2 v2.0.0-20230515165046-68b522a21131/go.mod h1:o7T431UOfFVHDNvMBUmUxpHnhivwv7BziUao/nMl81E=+github.com/cpuguy83/dockercfg v0.3.1 h1:/FpZ+JaygUR/lZP2NlFI2DVfrOEMAIKP5wWEJdoYe9E=+github.com/cpuguy83/dockercfg v0.3.1/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc=github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=+github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=+github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=github.com/crewjam/rfc5424 v0.1.0 h1:MSeXJm22oKovLzWj44AHwaItjIMUMugYGkEzfa831H8=github.com/crewjam/rfc5424 v0.1.0/go.mod h1:RCi9M3xHVOeerf6ULZzqv2xOGRO/zYaVUeRyPnBW3gQ=github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=@@ -171,21 +196,24 @@ github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGgithub.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=-github.com/denisenkom/go-mssqldb v0.12.3 h1:pBSGx9Tq67pBOTLmxNuirNTeB8Vjmf886Kx+8Y+8shw=-github.com/denisenkom/go-mssqldb v0.12.3/go.mod h1:k0mtMFOnU+AihqFxPMiF05rtiDrorD1Vrm1KEz5hxDo=github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U=github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=+github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=+github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E=github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=-github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=github.com/docker/cli v24.0.0+incompatible h1:0+1VshNwBQzQAx9lOl+OYCTCEAD8fKs/qeXMx3O0wqM=github.com/docker/cli v24.0.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=-github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM=-github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=+github.com/docker/docker v25.0.2+incompatible h1:/OaKeauroa10K4Nqavw4zlhcDq/WBcPMc5DbjOGgozY=+github.com/docker/docker v25.0.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=+github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=+github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=+github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=+github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=github.com/dsnet/compress v0.0.1 h1:PlZu0n3Tuv04TzpfPbrnI0HW/YwodEXDS+oPKahKF0Q=github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5JflhBbQEHo=github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=@@ -210,8 +238,9 @@ github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwgithub.com/form3tech-oss/jwt-go v3.2.5+incompatible h1:/l4kBbb4/vGSsdtB5nUe8L7B9mImVMaBPw9L/0TBHU8=github.com/form3tech-oss/jwt-go v3.2.5+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=+github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=+github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=github.com/getsentry/sentry-go v0.27.0 h1:Pv98CIbtB3LkMWmXi4Joa5OOcwbmnX88sF5qbK3r3Ps=@@ -260,6 +289,7 @@ github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0=github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=@@ -267,8 +297,10 @@ github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwgithub.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=-github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=-github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=+github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw=+github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=+github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=+github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=@@ -313,6 +345,7 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=@@ -353,16 +386,17 @@ github.com/gregjones/httpcache v0.0.0-20171119193500-2bcd89a1743f h1:kOkUP6rcVVqgithub.com/gregjones/httpcache v0.0.0-20171119193500-2bcd89a1743f/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8=-github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 h1:gDLXvp5S9izjldquuoAhDzccbskOL6tDC5jMSyx3zxE=-github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2/go.mod h1:7pdNwVWBBHGiCxa9lAszqCJMbfTISJ7oMftp8+UGV08=+github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=+github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU=github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0=github.com/h2non/filetype v1.1.3 h1:FKkx9QbD7HR/zjK1Ia5XiBsq9zdLi5Kf3zGyFTAFkGg=github.com/h2non/filetype v1.1.3/go.mod h1:319b3zT68BvV+WRj7cwy856M2ehB3HqNOt6sy1HndBY=github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw=github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=-github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=+github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=+github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI=@@ -378,6 +412,12 @@ github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfgithub.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=+github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=+github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=+github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=+github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=+github.com/jackc/pgx/v5 v5.5.3 h1:Ces6/M3wbDXYpM8JyyPD57ivTtJACFZJd885pdIaV2s=+github.com/jackc/pgx/v5 v5.5.3/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A=github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=github.com/jlaffaye/ftp v0.2.0 h1:lXNvW7cBu7R/68bknOX3MrRIIqZ61zELs1P2RAiA3lg=@@ -444,8 +484,12 @@ github.com/lrstanley/bubblezone v0.0.0-20240125042004-b7bafc493195 h1:zcxmFnwisGgithub.com/lrstanley/bubblezone v0.0.0-20240125042004-b7bafc493195/go.mod h1:v5lEwWaguF1o2MW/ucO0ZIA/IZymdBYJJ+2cMRLE7LU=github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=github.com/magefile/mage v1.14.0 h1:6QDX3g6z1YvJ4olPhT1wksUcSa/V0a1B+pJb73fBjyo=github.com/magefile/mage v1.14.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=+github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=+github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=github.com/marusama/semaphore/v2 v2.5.0 h1:o/1QJD9DBYOWRnDhPwDVAXQn6mQYD0gZaS1Tpx6DJGM=@@ -462,8 +506,6 @@ github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCgithub.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=-github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=-github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=github.com/mholt/archiver/v4 v4.0.0-alpha.8 h1:tRGQuDVPh66WCOelqe6LIGh0gwmfwxUrSSDunscGsRM=@@ -471,13 +513,24 @@ github.com/mholt/archiver/v4 v4.0.0-alpha.8/go.mod h1:5f7FUYGXdJWUjESffJaYR4R60Vgithub.com/microcosm-cc/bluemonday v1.0.21/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM=github.com/microcosm-cc/bluemonday v1.0.23 h1:SMZe2IGa0NuHvnVNAZ+6B38gsTbi5e4sViiWJyDDqFY=github.com/microcosm-cc/bluemonday v1.0.23/go.mod h1:mN70sk7UkkF8TUr2IGBpNN0jAgStuPzlK76QuruE/z4=+github.com/microsoft/go-mssqldb v1.7.0 h1:sgMPW0HA6Ihd37Yx0MzHyKD726C2kY/8KJsQtXHNaAs=+github.com/microsoft/go-mssqldb v1.7.0/go.mod h1:kOvZKUdrhhFQmxLZqbwUV0rHkNkZpthMITIb2Ko1IoA=github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=-github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8=+github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=+github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=+github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=+github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo=+github.com/moby/sys/user v0.1.0 h1:WmZ93f5Ux6het5iituh9x2zAG7NFY9Aqi49jjE1PaQg=+github.com/moby/sys/user v0.1.0/go.mod h1:fKJhFOnsCN6xZ5gSfbM6zaHGgDJMrqt9/reuj4T7MmU=+github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=+github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=github.com/montanaflynn/stats v0.7.0 h1:r3y12KyNxj/Sb/iOE46ws+3mS1+MZca1wlHQFPsY/JU=github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=+github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=+github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs=github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns=github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70 h1:kMlmsLSbjkikxQJ1IPwaM+7LJ9ltFu/fi8CRzvSnQmA=@@ -510,8 +563,8 @@ github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evgithub.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=-github.com/opencontainers/image-spec v1.1.0-rc3 h1:fzg1mXZFj8YdPeNkRXMg+zb88BFV0Ys52cJydRwBkb8=-github.com/opencontainers/image-spec v1.1.0-rc3/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=+github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI=+github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=@@ -523,7 +576,8 @@ github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=-github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=+github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=+github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=github.com/pkg/diff v0.0.0-20200914180035-5b29258ca4f7 h1:+/+DxvQaYifJ+grD4klzrS5y+KJXldn/2YTl5JG+vZ8=github.com/pkg/diff v0.0.0-20200914180035-5b29258ca4f7/go.mod h1:zO8QMzTeZd5cpnIkz/Gn6iK0jDfGicM1nynOkkPIl28=github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=@@ -531,6 +585,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=@@ -556,13 +612,19 @@ github.com/sahilm/fuzzy v0.1.1-0.20230530133925-c48e322e2a8f/go.mod h1:VFvziUEIMgithub.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=+github.com/shirou/gopsutil/v3 v3.23.12 h1:z90NtUkp3bMtmICZKpC4+WaknU1eXtp5vtbQ11DgpE4=+github.com/shirou/gopsutil/v3 v3.23.12/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM=+github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=+github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=+github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=+github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=github.com/shuheiktgw/go-travis v0.3.1 h1:SAT16mi77ccqogOslnXxBXzXbpeyChaIYUwi2aJpVZY=github.com/shuheiktgw/go-travis v0.3.1/go.mod h1:avnFFDqJDdRHwlF9tgqvYi3asQCm/HGL8aLxYiKa4Yg=github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=-github.com/sirupsen/logrus v1.9.1 h1:Ou41VVR3nMWWmTiEUnj0OlsgOSCUFgsPAOl6jRIcVtQ=-github.com/sirupsen/logrus v1.9.1/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ=github.com/skeema/knownhosts v1.2.1/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo=github.com/smartystreets/assertions v1.0.1 h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w=@@ -589,10 +651,22 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUgithub.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=github.com/tailscale/depaware v0.0.0-20210622194025-720c4b409502 h1:34icjjmqJ2HPjrSuJYEkdZ+0ItmGQAQ75cRHIiftIyE=github.com/tailscale/depaware v0.0.0-20210622194025-720c4b409502/go.mod h1:p9lPsd+cx33L3H9nNoecRRxPssFKUwwI50I3pZ0yT+8=+github.com/testcontainers/testcontainers-go v0.28.0 h1:1HLm9qm+J5VikzFDYhOd+Zw12NtOl+8drH2E8nTY1r8=+github.com/testcontainers/testcontainers-go v0.28.0/go.mod h1:COlDpUXbwW3owtpMkEB1zo9gwb1CoKVKlyrVPejF4AU=+github.com/testcontainers/testcontainers-go/modules/mssql v0.28.0 h1:81mxfVO68/yyXTVKYNT9P62WVddavEFxxAOyS92i8m0=+github.com/testcontainers/testcontainers-go/modules/mssql v0.28.0/go.mod h1:gknhzhyBdAxqBks5+8WXdVw1ptzogkRa8E8XOfDP4RI=+github.com/testcontainers/testcontainers-go/modules/mysql v0.28.0 h1:pTbaU0syNrQa6pSn8REmSmKXnAqcCw9KqVBX3vACESg=+github.com/testcontainers/testcontainers-go/modules/mysql v0.28.0/go.mod h1:IByRV9g8KJs3XQ5vv9ykfRBlolzXHFmfhXp/OAliHuM=+github.com/testcontainers/testcontainers-go/modules/postgres v0.28.0 h1:ff0s4JdYIdNAVSi/SrpN2Pdt1f+IjIw3AKjbHau8Un4=+github.com/testcontainers/testcontainers-go/modules/postgres v0.28.0/go.mod h1:fXgcYpbyrduNdiz2qRZuYkmvqLnEqsjbQiBNYH1ystI=github.com/tetratelabs/wazero v1.5.0 h1:Yz3fZHivfDiZFUXnWMPUoiW7s8tC1sjdBtlJn08qYa0=github.com/tetratelabs/wazero v1.5.0/go.mod h1:0U0G41+ochRKoPKCJlh0jMg1CHkyfK8kDqiirMmKY8A=github.com/therootcompany/xz v1.0.1 h1:CmOtsn1CbtmyYiusbfmhmkpAAETj0wBIH6kCYaX+xzw=github.com/therootcompany/xz v1.0.1/go.mod h1:3K3UH1yCKgBneZYhuQUvJ9HPD19UEXEI0BWbMn8qNMY=+github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=+github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=+github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=+github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=github.com/trufflesecurity/disk-buffer-reader v0.2.1 h1:K9nNpX3xeWT2E6YRjlcc1X5c1NjgV9JS5T9aw2FjA8Q=github.com/trufflesecurity/disk-buffer-reader v0.2.1/go.mod h1:uYwTCdxzV0o+qaeBMxflOsq4eu2WjrE46qGR2e80O9Y=github.com/trufflesecurity/gosnowflake v0.0.1 h1:sIIpGWG++/KDMH2EIv70ISLK3eCritPe2O2BiU0I8Hk=@@ -632,8 +706,9 @@ github.com/yuin/goldmark v1.5.2 h1:ALmeCk/px5FSm1MAcFBAsVKZjDuMVj8Tm7FFIlMJnqU=github.com/yuin/goldmark v1.5.2/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=github.com/yuin/goldmark-emoji v1.0.1 h1:ctuWEyzGBwiucEqxzwe0SOYDXPAucOrE9NQC18Wa1os=github.com/yuin/goldmark-emoji v1.0.1/go.mod h1:2w1E6FEWLcDQkoTE+7HU6QF1F6SLlNGjRIBbIZQFqkQ=-github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=+github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw=+github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=@@ -654,12 +729,18 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 h1:doUP+Exgo.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0/go.mod h1:rdENBZMT2OE6Ne/KLwpiXudnAsbdrdBaqBvTN8M8BgA=go.opentelemetry.io/otel v1.23.0 h1:Df0pqjqExIywbMCMTxkAwzjLZtRf+bBKLbUcpxO2C9E=go.opentelemetry.io/otel v1.23.0/go.mod h1:YCycw9ZeKhcJFrb34iVSkyT0iczq/zYDtZYFufObyB0=+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U=+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE=+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg=+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU=go.opentelemetry.io/otel/metric v1.23.0 h1:pazkx7ss4LFVVYSxYew7L5I6qvLXHA0Ap2pwV+9Cnpo=go.opentelemetry.io/otel/metric v1.23.0/go.mod h1:MqUW2X2a6Q8RN96E2/nqNoT+z9BSms20Jb7Bbp+HiTo=go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8=go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=go.opentelemetry.io/otel/trace v1.23.0 h1:37Ik5Ib7xfYVb4V1UtnT97T1jI+AoIYkJyPkuL4iJgI=go.opentelemetry.io/otel/trace v1.23.0/go.mod h1:GSGTbIClEsuZrGIzoEHqsVfxgn5UkggkflQwDScNUsk=+go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=+go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=@@ -680,7 +761,6 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8Ugolang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=-golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=@@ -742,7 +822,6 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=-golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=@@ -794,10 +873,12 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wgolang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=+golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=@@ -813,7 +894,9 @@ golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=@@ -975,8 +1058,8 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+Cgopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=-gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=-gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=+gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY=+gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=diff --git a/pkg/detectors/jdbc/jdbc.go b/pkg/detectors/jdbc/jdbc.goindex cc69851d4..82120bd39 100644--- a/pkg/detectors/jdbc/jdbc.go+++ b/pkg/detectors/jdbc/jdbc.go@@ -200,7 +200,6 @@ func tryRedactRegex(conn string) (string, bool) {}var supportedSubprotocols = map[string]func(string) (jdbc, error){- "sqlite": parseSqlite,"mysql": parseMySQL,"postgresql": parsePostgres,"sqlserver": parseSqlServer,diff --git a/pkg/detectors/jdbc/jdbc_integration_test.go b/pkg/detectors/jdbc/jdbc_integration_test.goindex 9ce26d50d..2cc12afbb 100644--- a/pkg/detectors/jdbc/jdbc_integration_test.go+++ b/pkg/detectors/jdbc/jdbc_integration_test.go@@ -7,61 +7,99 @@ import ("context""fmt""os"- "os/exec""strings""testing""time"+ "github.com/brianvoe/gofakeit/v6""github.com/kylelemons/godebug/pretty""github.com/stretchr/testify/assert"+ "github.com/testcontainers/testcontainers-go"+ "github.com/testcontainers/testcontainers-go/modules/mssql"+ "github.com/testcontainers/testcontainers-go/modules/mysql"+ "github.com/testcontainers/testcontainers-go/modules/postgres"+ "github.com/testcontainers/testcontainers-go/wait""github.com/trufflesecurity/trufflehog/v3/pkg/detectors""github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb")-func TestMain(m *testing.M) {- code, err := runMain(m)+func TestJdbcVerified(t *testing.T) {+ ctx := context.Background()++ postgresUser := gofakeit.Username()+ postgresPass := gofakeit.Password(true, true, true, false, false, 10)+ postgresDB := gofakeit.Word()+ postgresContainer, err := postgres.RunContainer(ctx,+ testcontainers.WithImage("postgres:13-alpine"),+ postgres.WithDatabase(postgresDB),+ postgres.WithUsername(postgresUser),+ postgres.WithPassword(postgresPass),+ testcontainers.WithWaitStrategy(+ wait.ForLog("database system is ready to accept connections").+ WithOccurrence(2).+ WithStartupTimeout(5*time.Second)),+ )if err != nil {- panic(err)+ t.Fatal(err)}- os.Exit(code)-}+ defer postgresContainer.Terminate(ctx)-func runMain(m *testing.M) (int, error) {- for _, ctrl := range []struct {- start func() error- stop func()- }{- {startPostgres, stopPostgres},- {startMySQL, stopMySQL},- {startSqlServer, stopSqlServer},- } {- if err := ctrl.start(); err != nil {- return 0, err- }- defer ctrl.stop()+ postgresHost, err := postgresContainer.Host(ctx)+ if err != nil {+ t.Fatal(err)+ }+ postgresPort, err := postgresContainer.MappedPort(ctx, "5432")+ if err != nil {+ t.Fatal(err)}- return m.Run(), nil-}-func dockerLogLine(hash string, needle string) chan struct{} {- ch := make(chan struct{}, 1)- go func() {- for {- out, err := exec.Command("docker", "logs", hash).CombinedOutput()- if err != nil {- panic(err)- }- if strings.Contains(string(out), needle) {- ch <- struct{}{}- return- }- time.Sleep(1 * time.Second)- }- }()- return ch-}+ mysqlUser := gofakeit.Username()+ mysqlPass := gofakeit.Password(true, true, true, false, false, 10)+ mysqlDatabase := gofakeit.Word()+ mysqlC, err := mysql.RunContainer(ctx,+ mysql.WithDatabase(mysqlDatabase),+ mysql.WithUsername(mysqlUser),+ mysql.WithPassword(mysqlPass),+ )+ if err != nil {+ t.Fatal(err)+ }++ defer mysqlC.Terminate(ctx)++ mysqlHost, err := mysqlC.Host(ctx)+ if err != nil {+ t.Fatal(err)+ }+ mysqlPort, err := mysqlC.MappedPort(ctx, "3306")+ if err != nil {+ t.Fatal(err)+ }++ sqlServerPass := gofakeit.Password(true, true, true, false, false, 10)+ sqlServerDatabase := "master"++ mssqlContainer, err := mssql.RunContainer(ctx,+ testcontainers.WithImage("mcr.microsoft.com/mssql/server:2022-RTM-GDR1-ubuntu-20.04"),+ mssql.WithAcceptEULA(),+ mssql.WithPassword(sqlServerPass),+ )+ if err != nil {+ t.Fatal(err)+ }++ defer mssqlContainer.Terminate(ctx)++ sqlServerHost, err := mssqlContainer.Host(ctx)+ if err != nil {+ t.Fatal(err)+ }++ sqlServerPort, err := mssqlContainer.MappedPort(ctx, "1433")+ if err != nil {+ t.Fatal(err)+ }-func TestJdbcVerified(t *testing.T) {type args struct {ctx context.Contextdata []byte@@ -76,15 +114,17 @@ func TestJdbcVerified(t *testing.T) {{name: "postgres verified",args: args{- ctx: context.Background(),- data: []byte(`jdbc connection string: jdbc:postgresql://localhost:5432/foo?sslmode=disable&password=` + postgresPass),+ ctx: context.Background(),+ data: []byte(fmt.Sprintf("jdbc connection string: jdbc:postgresql://%s:%s/%s?sslmode=disable&password=%s&user=%s",+ postgresHost, postgresPort.Port(), postgresDB, postgresPass, postgresUser)),verify: true,},want: []detectors.Result{{DetectorType: detectorspb.DetectorType_JDBC,Verified: true,- Redacted: "jdbc:postgresql://localhost:5432/foo?sslmode=disable&password=" + strings.Repeat("*", len(postgresPass)),+ Redacted: fmt.Sprintf("jdbc:postgresql://%s:%s/%s?sslmode=disable&password=%s&user=%s",+ postgresHost, postgresPort.Port(), postgresDB, strings.Repeat("*", len(postgresPass)), postgresUser),},},wantErr: false,@@ -92,15 +132,17 @@ func TestJdbcVerified(t *testing.T) {{name: "mysql verified",args: args{- ctx: context.Background(),- data: []byte(fmt.Sprintf(`CONN="jdbc:mysql://%s:%s@tcp(127.0.0.1:3306)/%s"`, mysqlUser, mysqlPass, mysqlDatabase)),+ ctx: context.Background(),+ data: []byte(fmt.Sprintf(`CONN="jdbc:mysql://%s:%s@tcp(%s:%s)/%s"`,+ mysqlUser, mysqlPass, mysqlHost, mysqlPort.Port(), mysqlDatabase)),verify: true,},want: []detectors.Result{{DetectorType: detectorspb.DetectorType_JDBC,Verified: true,- Redacted: fmt.Sprintf(`jdbc:mysql://%s:%s@tcp(127.0.0.1:3306)/%s`, mysqlUser, strings.Repeat("*", len(mysqlPass)), mysqlDatabase),+ Redacted: fmt.Sprintf(`jdbc:mysql://%s:%s@tcp(%s:%s)/%s`,+ mysqlUser, strings.Repeat("*", len(mysqlPass)), mysqlHost, mysqlPort.Port(), mysqlDatabase),},},wantErr: false,@@ -108,15 +150,17 @@ func TestJdbcVerified(t *testing.T) {{name: "sql server verified",args: args{- ctx: context.Background(),- data: []byte(fmt.Sprintf("jdbc:sqlserver://odbc:server=localhost;database=%s;password=%s", sqlServerDatabase, sqlServerPass)),+ ctx: context.Background(),+ data: []byte(fmt.Sprintf("jdbc:sqlserver://odbc:server=%s;port=%s;database=%s;password=%s",+ sqlServerHost, sqlServerPort.Port(), sqlServerDatabase, sqlServerPass)),verify: true,},want: []detectors.Result{{DetectorType: detectorspb.DetectorType_JDBC,Verified: true,- Redacted: "jdbc:sqlserver://odbc:server=localhost;database=master;password=**************",+ Redacted: fmt.Sprintf("jdbc:sqlserver://odbc:server=%s;port=%s;database=%s;password=%s",+ sqlServerHost, sqlServerPort.Port(), sqlServerDatabase, strings.Repeat("*", len(sqlServerPass))),},},wantErr: false,diff --git a/pkg/detectors/jdbc/jdbc_test.go b/pkg/detectors/jdbc/jdbc_test.goindex 6739e7b25..bf2e9100e 100644--- a/pkg/detectors/jdbc/jdbc_test.go+++ b/pkg/detectors/jdbc/jdbc_test.go@@ -5,10 +5,11 @@ package jdbcimport ("context"- "github.com/stretchr/testify/assert""os""testing"+ "github.com/stretchr/testify/assert"+"github.com/kylelemons/godebug/pretty""github.com/trufflesecurity/trufflehog/v3/pkg/detectors""github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb"@@ -68,22 +69,6 @@ func TestJdbc_FromChunk(t *testing.T) {want: nil,wantErr: false,},- {- name: "sqlite unverified",- args: args{- ctx: context.Background(),- data: []byte("jdbc:sqlite::memory:"),- verify: true,- },- want: []detectors.Result{- {- DetectorType: detectorspb.DetectorType_JDBC,- Verified: false,- Redacted: "jdbc:sqlite::memory:",- },- },- wantErr: false,- },{name: "found double quoted string, unverified",args: args{diff --git a/pkg/detectors/jdbc/mysql.go b/pkg/detectors/jdbc/mysql.goindex c3a631ebe..a624f41a7 100644--- a/pkg/detectors/jdbc/mysql.go+++ b/pkg/detectors/jdbc/mysql.go@@ -3,6 +3,8 @@ package jdbcimport ("context""errors"+ "fmt"+ "net/url""strings""github.com/go-sql-driver/mysql"@@ -18,7 +20,6 @@ type mysqlJDBC struct {func (s *mysqlJDBC) ping(ctx context.Context) pingResult {return ping(ctx, "mysql", isMySQLErrorDeterminate,- s.conn,buildMySQLConnectionString(s.host, s.database, s.userPass, s.params),buildMySQLConnectionString(s.host, "", s.userPass, s.params))}@@ -50,47 +51,57 @@ func isMySQLErrorDeterminate(err error) bool {return false}-func parseConnStr(connStr string) (hostAndDB, params string, err error) {+func parseMySQL(subname string) (jdbc, error) {// expected form: [subprotocol:]//[user:password@]HOST[/DB][?key=val[&key=val]]- hostAndDB, params, found := strings.Cut(connStr, "?")- if !strings.HasPrefix(hostAndDB, "//") {- return "", "", errors.New("expected host to start with //")- }- if !found {- return hostAndDB, "", nil- }- splitParams := strings.Split(params, "&")- for i, param := range splitParams {- if strings.Contains(strings.ToLower(param), "allowallfiles") {- splitParams[i] = "allowAllFiles=false"- }+ if !strings.HasPrefix(subname, "//") {+ return nil, errors.New("expected host to start with //")}- params = strings.Join(splitParams, "&")- return hostAndDB, params, nil-}+ // need for hostnames that have tcp(host:port) format required by this database driver+ cfg, err := mysql.ParseDSN(strings.TrimPrefix(subname, "//"))+ if err == nil {+ return &mysqlJDBC{+ conn: subname[2:],+ userPass: cfg.User + ":" + cfg.Passwd,+ host: fmt.Sprintf("tcp(%s)", cfg.Addr),+ database: cfg.DBName,+ params: "timeout=5",+ }, nil+ }-func parseMySQL(subname string) (jdbc, error) {- hostAndDB, params, err := parseConnStr(subname)+ // for standard URI format, which is all i've seen for JDBC+ u, err := url.Parse(subname)if err != nil {return nil, err}- userPassAndHostAndDB := strings.TrimPrefix(hostAndDB, "//")- userPass, hostAndDB, found := strings.Cut(userPassAndHostAndDB, "@")- if !found {- hostAndDB = userPass- userPass = ""+ dbName := strings.TrimPrefix(u.Path, "/")++ user := "root"+ pass := ""+ if u.User != nil {+ user = u.User.Username()+ pass, _ = u.User.Password()+ }++ if v := u.Query().Get("user"); v != "" {+ user = v}- host, database, found := strings.Cut(hostAndDB, "/")- if !found {- return nil, errors.New("expected host and database to be separated by /")+ if v := u.Query().Get("password"); v != "" {+ pass = v}++ userAndPass := user+ if pass != "" {+ userAndPass = userAndPass + ":" + pass+ }+return &mysqlJDBC{conn: subname[2:],- userPass: userPass,- host: host,- database: database,- params: params,+ userPass: userAndPass,+ host: fmt.Sprintf("tcp(%s)", u.Host),+ database: dbName,+ params: "timeout=5s",}, nil+}diff --git a/pkg/detectors/jdbc/mysql_integration_test.go b/pkg/detectors/jdbc/mysql_integration_test.goindex cbc642841..96fbbbf62 100644--- a/pkg/detectors/jdbc/mysql_integration_test.go+++ b/pkg/detectors/jdbc/mysql_integration_test.go@@ -4,55 +4,87 @@package jdbcimport (- "bytes""context"- "errors"- "os/exec"+ "fmt""testing"- "time"+ "github.com/brianvoe/gofakeit/v6"+ "github.com/google/go-cmp/cmp""github.com/stretchr/testify/assert"-)--const (- mysqlUser = "coolGuy"- mysqlPass = "23201dabb56ca236f3dc6736c0f9afad"- mysqlDatabase = "stuff"+ "github.com/testcontainers/testcontainers-go/modules/mysql")func TestMySQL(t *testing.T) {+ mysqlUser := gofakeit.Username()+ mysqlPass := gofakeit.Password(true, true, true, false, false, 10)+ mysqlDatabase := gofakeit.Word()++ ctx := context.Background()++ mysqlC, err := mysql.RunContainer(ctx,+ mysql.WithDatabase(mysqlDatabase),+ mysql.WithUsername(mysqlUser),+ mysql.WithPassword(mysqlPass),+ )+ if err != nil {+ t.Fatal(err)+ }++ defer mysqlC.Terminate(ctx)++ host, err := mysqlC.Host(ctx)+ if err != nil {+ t.Fatal(err)+ }+ port, err := mysqlC.MappedPort(ctx, "3306")+ if err != nil {+ t.Fatal(err)+ }+type result struct {- parseErr bool- pingOk bool- pingDeterminate bool+ ParseErr bool+ PingOk bool+ PingDeterminate bool}tests := []struct {+ name stringinput stringwant result}{{+ name: "empty",input: "",- want: result{parseErr: true},+ want: result{ParseErr: true},},{- input: "//" + mysqlUser + ":" + mysqlPass + "@tcp(127.0.0.1:3306)/" + mysqlDatabase,- want: result{pingOk: true, pingDeterminate: true},+ name: "all good",+ input: fmt.Sprintf("//%s:%s@tcp(%s:%s)/%s", mysqlUser, mysqlPass, host, port.Port(), mysqlDatabase),+ want: result{PingOk: true, PingDeterminate: true},},{- input: "//wrongUser:wrongPass@tcp(127.0.0.1:3306)/" + mysqlDatabase,- want: result{pingOk: false, pingDeterminate: true},+ name: "wrong creds",+ input: fmt.Sprintf("//wrongUser:wrongPassword@tcp(%s:%s)/%s", host, port.Port(), mysqlDatabase),+ want: result{PingOk: false, PingDeterminate: true},},{- input: "//" + mysqlUser + ":wrongPass@tcp(127.0.0.1:3306)/" + mysqlDatabase,- want: result{pingOk: false, pingDeterminate: true},+ name: "wrong pass",+ input: fmt.Sprintf("//%s:wrongPass@tcp(%s:%s)/%s", mysqlUser, host, port.Port(), mysqlDatabase),+ want: result{PingOk: false, PingDeterminate: true},},{- input: "//" + mysqlUser + ":" + mysqlPass + "@tcp(127.0.0.1:3306)/",- want: result{pingOk: true, pingDeterminate: true},+ name: "no db",+ input: fmt.Sprintf("//%s:%s@tcp(%s:%s)/", mysqlUser, mysqlPass, host, port.Port()),+ want: result{PingOk: true, PingDeterminate: true},},{- input: "//" + mysqlUser + ":" + mysqlPass + "@tcp(127.0.0.1:3306)/wrongDB",- want: result{pingOk: true, pingDeterminate: true},+ name: "wrong db",+ input: fmt.Sprintf("//%s:%s@tcp(%s:%s)/wrongDB", mysqlUser, mysqlPass, host, port.Port()),+ want: result{PingOk: true, PingDeterminate: true},+ },+ {+ name: "jdbc format",+ input: fmt.Sprintf("//%s:%s@%s:%s/%s", mysqlUser, mysqlPass, host, port.Port(), mysqlDatabase),+ want: result{PingOk: true, PingDeterminate: true},},}for _, tt := range tests {@@ -60,45 +92,19 @@ func TestMySQL(t *testing.T) {j, err := parseMySQL(tt.input)if err != nil {- got := result{parseErr: true}+ got := result{ParseErr: true}assert.Equal(t, tt.want, got)return}pr := j.ping(context.Background())- got := result{pingOk: pr.err == nil, pingDeterminate: pr.determinate}- assert.Equal(t, tt.want, got)- })- }-}--var mysqlDockerHash string+ got := result{PingOk: pr.err == nil, PingDeterminate: pr.determinate}-func startMySQL() error {- cmd := exec.Command(- "docker", "run", "--rm", "-p", "3306:3306",- "-e", "MYSQL_ROOT_PASSWORD=403a96cff2a323f74bfb1c16992895be",- "-e", "MYSQL_USER="+mysqlUser,- "-e", "MYSQL_PASSWORD="+mysqlPass,- "-e", "MYSQL_DATABASE="+mysqlDatabase,- "-e", "MYSQL_ROOT_HOST=%",- "-d", "mysql",- )- out, err := cmd.Output()- if err != nil {- return err- }- mysqlDockerHash = string(bytes.TrimSpace(out))- select {- case <-dockerLogLine(mysqlDockerHash, "socket: '/var/run/mysqld/mysqld.sock' port: 3306"):- return nil- case <-time.After(30 * time.Second):- stopMySQL()- return errors.New("timeout waiting for mysql database to be ready")+ if diff := cmp.Diff(tt.want, got); diff != "" {+ t.Errorf("%s: (-want +got)\n%s", tt.name, diff)+ t.Errorf("error is: %v", pr.err)+ }+ })}}--func stopMySQL() {- exec.Command("docker", "kill", mysqlDockerHash).Run()-}diff --git a/pkg/detectors/jdbc/mysql_test.go b/pkg/detectors/jdbc/mysql_test.godeleted file mode 100644index 44cf4ad47..000000000--- a/pkg/detectors/jdbc/mysql_test.go+++ /dev/null@@ -1,50 +0,0 @@-package jdbc--import "testing"--func Test_parseConnStr(t *testing.T) {- type args struct {- connStr string- }- tests := []struct {- name string- args args- wantHostAndDB string- wantParams string- wantErr bool- }{- {- name: "no params ",- args: args{- "//root:root@tcp(127.0.0.1:3306)/postgres",- },- wantHostAndDB: "//root:root@tcp(127.0.0.1:3306)/postgres",- wantParams: "",- wantErr: false,- },- {- name: "params",- args: args{- "//root:root@tcp(127.0.0.1:3306)/postgres?allowAllFiles=true&clientFoundRows=1",- },- wantHostAndDB: "//root:root@tcp(127.0.0.1:3306)/postgres",- wantParams: "allowAllFiles=false&clientFoundRows=1",- wantErr: false,- },- }- for _, tt := range tests {- t.Run(tt.name, func(t *testing.T) {- gotHostAndDB, gotParams, err := parseConnStr(tt.args.connStr)- if (err != nil) != tt.wantErr {- t.Errorf("parseConnStr() error = %v, wantErr %v", err, tt.wantErr)- return- }- if gotHostAndDB != tt.wantHostAndDB {- t.Errorf("parseConnStr() gotHostAndDB = %v, want %v", gotHostAndDB, tt.wantHostAndDB)- }- if gotParams != tt.wantParams {- t.Errorf("parseConnStr() gotParams = %v, want %v", gotParams, tt.wantParams)- }- })- }-}diff --git a/pkg/detectors/jdbc/postgres.go b/pkg/detectors/jdbc/postgres.goindex 66e86b60d..c9b678bd7 100644--- a/pkg/detectors/jdbc/postgres.go+++ b/pkg/detectors/jdbc/postgres.go@@ -4,6 +4,7 @@ import ("context""errors""fmt"+ "net/url""strings""github.com/lib/pq"@@ -23,8 +24,7 @@ func (s *postgresJDBC) ping(ctx context.Context) pingResult {return ping(ctx, "postgres", isPostgresErrorDeterminate,buildPostgresConnectionString(s.params, true),buildPostgresConnectionString(s.params, false),- s.conn,- "postgres://"+s.conn)+ )}func isPostgresErrorDeterminate(err error) bool {@@ -59,36 +59,50 @@ func joinKeyValues(m map[string]string, sep string) string {func parsePostgres(subname string) (jdbc, error) {// expected form: [subprotocol:]//[user:password@]HOST[/DB][?key=val[&key=val]]- hostAndDB, paramString, _ := strings.Cut(subname, "?")- if !strings.HasPrefix(hostAndDB, "//") {++ if !strings.HasPrefix(subname, "//") {return nil, errors.New("expected host to start with //")}- userPassAndHostAndDB := strings.TrimPrefix(hostAndDB, "//")- userPass, hostAndDB, found := strings.Cut(userPassAndHostAndDB, "@")- var user, pass string- if found {- user, pass, _ = strings.Cut(userPass, ":")- } else {- hostAndDB = userPass++ u, err := url.Parse(subname)+ if err != nil {+ return nil, err}- host, database, found := strings.Cut(hostAndDB, "/")- if !found {- return nil, errors.New("expected host and database to be separated by /")++ dbName := strings.TrimPrefix(u.Path, "/")+ if dbName == "" {+ dbName = "postgres"}params := map[string]string{- "host": host,- "dbname": database,+ "host": u.Host,+ "dbname": dbName,+ "connect_timeout": "5",}- if len(user) > 0 {- params["user"] = user++ if u.User != nil {+ params["user"] = u.User.Username()+ pass, set := u.User.Password()+ if set {+ params["password"] = pass+ }}- if len(pass) > 0 {- params["password"] = pass++ if v := u.Query()["sslmode"]; len(v) > 0 {+ switch v[0] {+ // https://www.postgresql.org/docs/current/libpq-ssl.html#LIBPQ-SSL-PROTECTION+ case "disable", "allow", "prefer",+ "require", "verify-ca", "verify-full":+ params["sslmode"] = v[0]+ }}- for _, param := range strings.Split(paramString, "&") {- key, val, _ := strings.Cut(param, "=")- params[key] = val++ if v := u.Query().Get("user"); v != "" {+ params["user"] = v+ }++ if v := u.Query().Get("password"); v != "" {+ params["password"] = v}return &postgresJDBC{subname[2:], params}, nil@@ -107,11 +121,14 @@ func buildPostgresConnectionString(params map[string]string, includeDbName bool)continue}}- if key == "dbname" && !includeDbName {- continue- }data[key] = val}- return joinKeyValues(data, " ")+ if !includeDbName {+ data["dbname"] = "postgres"+ }++ connStr := joinKeyValues(data, " ")++ return connStr}diff --git a/pkg/detectors/jdbc/postgres_integration_test.go b/pkg/detectors/jdbc/postgres_integration_test.goindex 4c80ff88c..6f42d59ac 100644--- a/pkg/detectors/jdbc/postgres_integration_test.go+++ b/pkg/detectors/jdbc/postgres_integration_test.go@@ -4,114 +4,140 @@package jdbcimport (- "bytes""context"- "errors""fmt"- "os/exec"+ "log""testing""time"- "github.com/stretchr/testify/assert"-)--const (- postgresUser = "postgres"- postgresPass = "23201dabb56ca236f3dc6736c0f9afad"+ "github.com/brianvoe/gofakeit/v6"+ "github.com/google/go-cmp/cmp"+ "github.com/testcontainers/testcontainers-go"+ "github.com/testcontainers/testcontainers-go/modules/postgres"+ "github.com/testcontainers/testcontainers-go/wait")func TestPostgres(t *testing.T) {type result struct {- parseErr bool- pingOk bool- pingDeterminate bool+ ParseErr bool+ PingOk bool+ PingDeterminate bool}++ user := gofakeit.Username()+ pass := gofakeit.Password(true, true, true, false, false, 32)+ dbName := gofakeit.Word()++ t.Log("user: ", user)+ t.Log("dbName: ", dbName)++ ctx := context.Background()+ postgresContainer, err := postgres.RunContainer(ctx,+ testcontainers.WithImage("postgres:13-alpine"),+ postgres.WithDatabase(dbName),+ postgres.WithUsername(user),+ postgres.WithPassword(pass),+ testcontainers.WithWaitStrategy(+ wait.ForLog("database system is ready to accept connections").+ WithOccurrence(2).+ WithStartupTimeout(5*time.Second)),+ )+ if err != nil {+ t.Fatal(err)+ }++ host, err := postgresContainer.Host(ctx)+ if err != nil {+ t.Fatal(err)+ }+ port, err := postgresContainer.MappedPort(ctx, "5432")+ if err != nil {+ t.Fatal(err)+ }++ if err != nil {+ log.Fatalf("failed to start container: %s", err)+ }+ defer postgresContainer.Terminate(ctx)+tests := []struct {+ name stringinput stringwant result}{{- input: "//localhost:5432/foo?sslmode=disable&password=" + postgresPass,- want: result{pingOk: true, pingDeterminate: true},+ name: "invalid password",+ input: fmt.Sprintf("//%s:%s/foo?sslmode=disable&password=foo", host, port.Port()),+ want: result{PingOk: false, PingDeterminate: true},},{- input: fmt.Sprintf("//postgres:%s@localhost:5432/foo?sslmode=disable", postgresPass),- want: result{pingOk: true, pingDeterminate: true},+ name: "valid password - no user name",+ input: fmt.Sprintf("//%s:%s/foo?sslmode=disable&password=%s", host, port.Port(), pass),+ want: result{PingOk: false, PingDeterminate: true},},{- input: "//localhost:5432/foo?sslmode=disable&user=" + postgresUser + "&password=" + postgresPass,- want: result{pingOk: true, pingDeterminate: true},+ name: "exact username and password, wrong db",+ input: fmt.Sprintf("//%s:%s@%s:%s/foo?sslmode=disable", user, pass, host, port.Port()),+ want: result{PingOk: true, PingDeterminate: true},},{- input: fmt.Sprintf("//%s:%s@localhost:5432/foo?sslmode=disable", postgresUser, postgresPass),- want: result{pingOk: true, pingDeterminate: true},+ name: "exact username and password, no db",+ input: fmt.Sprintf("//%s:%s@%s:%s?sslmode=disable", user, pass, host, port.Port()),+ want: result{PingOk: true, PingDeterminate: true},},{- input: "//localhost/foo?sslmode=disable&port=5432&password=" + postgresPass,- want: result{pingOk: true, pingDeterminate: true},+ name: "invalid user name",+ input: fmt.Sprintf("//%s:%s/foo?sslmode=disable&user=foo&password=%s", host, port.Port(), pass),+ want: result{PingOk: false, PingDeterminate: true},},{- input: "//localhost:5432/foo?password=" + postgresPass,- want: result{pingOk: false, pingDeterminate: false},+ name: "invalid hostname",+ input: fmt.Sprintf("//badhost:%s/foo?sslmode=disable&user=foo&password=%s", port.Port(), pass),+ want: result{PingOk: false, PingDeterminate: false},},{- input: "//localhost:5432/foo?sslmode=disable&password=foo",- want: result{pingOk: false, pingDeterminate: true},+ name: "no username, password",+ input: fmt.Sprintf("//%s:%s/foo?password=%s", host, port.Port(), pass),+ want: result{PingOk: false, PingDeterminate: false},},{- input: "//localhost:5432/foo?sslmode=disable&user=foo&password=" + postgresPass,- want: result{pingOk: false, pingDeterminate: true},+ name: "db, password - no username",+ input: fmt.Sprintf("//%s:%s/foo?sslmode=disable&password=%s", host, port.Port(), pass),+ want: result{PingOk: false, PingDeterminate: true},},{- input: "//badhost:5432/foo?sslmode=disable&user=foo&password=" + postgresPass,- want: result{pingOk: false, pingDeterminate: false},+ name: "invalid format",+ input: "invalid",+ want: result{ParseErr: true},},{- input: "invalid",- want: result{parseErr: true},+ name: "normal connect with generated username and password",+ input: fmt.Sprintf("//%s:%s@%s:%s/%s?sslmode=disable", user, pass, host, port.Port(), dbName),+ want: result{PingOk: true, PingDeterminate: true},},}+for _, tt := range tests {- t.Run(tt.input, func(t *testing.T) {+ t.Run(tt.name, func(t *testing.T) {j, err := parsePostgres(tt.input)-if err != nil {- got := result{parseErr: true}- assert.Equal(t, tt.want, got)+ got := result{ParseErr: true}++ if diff := cmp.Diff(tt.want, got); diff != "" {+ t.Errorf("%s: (-want +got)\n%s", tt.name, diff)+ t.Errorf("error is: %v", err)+ }return}- pr := j.ping(context.Background())-- got := result{pingOk: pr.err == nil, pingDeterminate: pr.determinate}- assert.Equal(t, tt.want, got)- })- }-}+ pr := j.ping(ctx)-var postgresDockerHash string+ got := result{PingOk: pr.err == nil, PingDeterminate: pr.determinate}-func startPostgres() error {- cmd := exec.Command(- "docker", "run", "--rm", "-p", "5432:5432",- "-e", "POSTGRES_PASSWORD="+postgresPass,- "-e", "POSTGRES_USER="+postgresUser,- "-d", "postgres",- )- out, err := cmd.Output()- if err != nil {- return err- }- postgresDockerHash = string(bytes.TrimSpace(out))- select {- case <-dockerLogLine(postgresDockerHash, "PostgreSQL init process complete; ready for start up."):- return nil- case <-time.After(30 * time.Second):- stopPostgres()- return errors.New("timeout waiting for postgres database to be ready")+ if diff := cmp.Diff(tt.want, got); diff != "" {+ t.Errorf("%s: (-want +got)\n%s", tt.name, diff)+ t.Errorf("error is: %v", pr.err)+ }+ })}}--func stopPostgres() {- exec.Command("docker", "kill", postgresDockerHash).Run()-}diff --git a/pkg/detectors/jdbc/sqlite.go b/pkg/detectors/jdbc/sqlite.godeleted file mode 100644index 7268888ad..000000000--- a/pkg/detectors/jdbc/sqlite.go+++ /dev/null@@ -1,43 +0,0 @@-package jdbc--import (- "context"- "errors"- "strings"-- _ "github.com/mattn/go-sqlite3"-)--type sqliteJDBC struct {- filename string- params map[string]string- testing bool-}--var cannotVerifySqliteError error = errors.New("sqlite credentials cannot be verified")--func (s *sqliteJDBC) ping(ctx context.Context) pingResult {- if !s.testing {- // sqlite is not a networked database, so we cannot verify- return pingResult{cannotVerifySqliteError, true}- }- return ping(ctx, "sqlite3", isSqliteErrorDeterminate, s.filename)-}--func isSqliteErrorDeterminate(err error) bool {- return true-}--func parseSqlite(subname string) (jdbc, error) {- filename, params, _ := strings.Cut(subname, "?")- if filename == "" {- return nil, errors.New("empty filename")- }- j := &sqliteJDBC{filename: filename, params: map[string]string{}}- for _, keyVal := range strings.Split(params, "&") {- if key, val, found := strings.Cut(keyVal, "="); found {- j.params[key] = val- }- }- return j, nil-}diff --git a/pkg/detectors/jdbc/sqlite_test.go b/pkg/detectors/jdbc/sqlite_test.godeleted file mode 100644index 377808386..000000000--- a/pkg/detectors/jdbc/sqlite_test.go+++ /dev/null@@ -1,46 +0,0 @@-//go:build detectors-// +build detectors--package jdbc--import (- "context"- "testing"-- "github.com/stretchr/testify/assert"-)--func parseSqliteTest(subname string) (jdbc, error) {- j, err := parseSqlite(subname)- if err != nil {- return j, err- }- j.(*sqliteJDBC).testing = true- return j, err-}--func TestParseSqlite(t *testing.T) {- type testStruct struct {- input string- wantErr bool- }- tests := []struct {- input string- wantErr bool- }{- {input: "", wantErr: true},- {input: ":memory:"},- }-- for _, test := range tests {- t.Run(test.input, func(t *testing.T) {- j, err := parseSqliteTest(test.input)- if test.wantErr {- assert.Error(t, err)- } else {- assert.NoError(t, err)- assert.True(t, j.ping(context.Background()).err == nil)- }- })- }-}diff --git a/pkg/detectors/jdbc/sqlserver.go b/pkg/detectors/jdbc/sqlserver.goindex 3a092e5a1..23629c128 100644--- a/pkg/detectors/jdbc/sqlserver.go+++ b/pkg/detectors/jdbc/sqlserver.go@@ -3,20 +3,19 @@ package jdbcimport ("context""errors"- mssql "github.com/denisenkom/go-mssqldb"+ "fmt""strings"++ mssql "github.com/microsoft/go-mssqldb")type sqlServerJDBC struct {- conn string- params map[string]string+ connStr string}func (s *sqlServerJDBC) ping(ctx context.Context) pingResult {return ping(ctx, "mssql", isSqlServerErrorDeterminate,- joinKeyValues(s.params, ";"),- s.conn,- "sqlserver://"+s.conn)+ s.connStr)}func isSqlServerErrorDeterminate(err error) bool {@@ -38,22 +37,35 @@ func parseSqlServer(subname string) (jdbc, error) {return nil, errors.New("expected connection to start with //")}conn := strings.TrimPrefix(subname, "//")- params := map[string]string{- "user id": "sa",- "database": "master",- }- for _, param := range strings.Split(conn, ";") {++ port := "1433"+ var password, host string++ for i, param := range strings.Split(conn, ";") {key, value, found := strings.Cut(param, "=")- if !found {+ if !found && i == 0 {+ // String connectionUrl = "jdbc:sqlserver://<server>:<port>;encrypt=true;databaseName=AdventureWorks;user=<user>;password=<password>";+ if split := strings.Split(param, ":"); len(split) > 1 {+ host = split[0]+ port = split[1]+ } else {+ host = param+ }continue}- params[key] = value- if key != "password" && strings.Contains(strings.ToLower(key), "password") {- params["password"] = value++ switch strings.ToLower(key) {+ case "password":+ password = value+ case "spring.datasource.password":+ password = value+ case "server":+ host = value+ case "port":+ port = value}}return &sqlServerJDBC{- conn: strings.TrimPrefix(subname, "//"),- params: params,+ connStr: fmt.Sprintf("sqlserver://sa:%s@%s:%s?database=master&connection+timeout=5", password, host, port),}, nil}diff --git a/pkg/detectors/jdbc/sqlserver_integration_test.go b/pkg/detectors/jdbc/sqlserver_integration_test.goindex a43d4df09..1952605b6 100644--- a/pkg/detectors/jdbc/sqlserver_integration_test.go+++ b/pkg/detectors/jdbc/sqlserver_integration_test.go@@ -4,23 +4,44 @@package jdbcimport (- "bytes""context"- "errors"- "os/exec"+ "fmt""testing"- "time"+ "github.com/brianvoe/gofakeit/v6""github.com/stretchr/testify/assert"-)--const (- sqlServerPass = "Secr3tP@s5w0rd"- sqlServerUser = "sa"- sqlServerDatabase = "master"+ "github.com/testcontainers/testcontainers-go"+ "github.com/testcontainers/testcontainers-go/modules/mssql")func TestSqlServer(t *testing.T) {+ ctx := context.Background()++ sqlServerUser := "sa"+ sqlServerPass := gofakeit.Password(true, true, true, false, false, 10)+ sqlServerDB := "master"++ mssqlContainer, err := mssql.RunContainer(ctx,+ testcontainers.WithImage("mcr.microsoft.com/mssql/server:2022-RTM-GDR1-ubuntu-20.04"),+ mssql.WithAcceptEULA(),+ mssql.WithPassword(sqlServerPass),+ )+ if err != nil {+ t.Fatal(err)+ }++ defer mssqlContainer.Terminate(ctx)++ mssqlHost, err := mssqlContainer.Host(ctx)+ if err != nil {+ t.Fatal(err)+ }++ mssqlPort, err := mssqlContainer.MappedPort(ctx, "1433")+ if err != nil {+ t.Fatal(err)+ }+type result struct {parseErr boolpingOk bool@@ -35,21 +56,28 @@ func TestSqlServer(t *testing.T) {want: result{parseErr: true},},{- input: "//server=localhost;user id=sa;database=master;password=" + sqlServerPass,- want: result{pingOk: true, pingDeterminate: true},+ input: fmt.Sprintf("//server=%s;port=%s;user id=%s;database=%s;password=%s",+ mssqlHost, mssqlPort.Port(), sqlServerUser, sqlServerDB, sqlServerPass),+ want: result{pingOk: true, pingDeterminate: true},},{- input: "//server=badhost;user id=sa;database=master;password=" + sqlServerPass,+ input: "//server=badhost;user id=sa;database=master;password=",want: result{pingOk: false, pingDeterminate: false},},{- input: "//localhost;database=master;spring.datasource.password=" + sqlServerPass,- want: result{pingOk: true, pingDeterminate: true},+ input: fmt.Sprintf("//%s;database=master;spring.datasource.password=%s;port=%s",+ mssqlHost, sqlServerPass, mssqlPort.Port()),+ want: result{pingOk: true, pingDeterminate: true},},{- input: "//localhost;database=master;spring.datasource.password=badpassword",+ input: fmt.Sprintf("//%s;database=master;spring.datasource.password=badpassword;port=%s", mssqlHost, mssqlPort.Port()),want: result{pingOk: false, pingDeterminate: true},},+ {+ input: fmt.Sprintf("//%s:%s;databaseName=master;user=%s;password=%s",+ mssqlHost, mssqlPort.Port(), sqlServerUser, sqlServerPass),+ want: result{pingOk: true, pingDeterminate: true},+ },}for _, tt := range tests {t.Run(tt.input, func(t *testing.T) {@@ -68,30 +96,3 @@ func TestSqlServer(t *testing.T) {})}}--var sqlServerDockerHash string--func startSqlServer() error {- cmd := exec.Command(- "docker", "run", "--rm", "-p", "1433:1433",- "-e", "ACCEPT_EULA=1",- "-e", "MSSQL_SA_PASSWORD="+sqlServerPass,- "-d", "mcr.microsoft.com/azure-sql-edge",- )- out, err := cmd.Output()- if err != nil {- return err- }- sqlServerDockerHash = string(bytes.TrimSpace(out))- select {- case <-dockerLogLine(sqlServerDockerHash, "EdgeTelemetry starting up"):- return nil- case <-time.After(30 * time.Second):- stopSqlServer()- return errors.New("timeout waiting for sql server database to be ready")- }-}--func stopSqlServer() {- exec.Command("docker", "kill", sqlServerDockerHash).Run()-}diff --git a/pkg/detectors/sqlserver/sqlserver.go b/pkg/detectors/sqlserver/sqlserver.goindex ee8571ff8..a3d377de9 100644--- a/pkg/detectors/sqlserver/sqlserver.go+++ b/pkg/detectors/sqlserver/sqlserver.go@@ -3,10 +3,12 @@ package sqlserverimport ("context""database/sql"+ "time"+regexp "github.com/wasilibs/go-re2"- mssql "github.com/denisenkom/go-mssqldb"- "github.com/denisenkom/go-mssqldb/msdsn"+ mssql "github.com/microsoft/go-mssqldb"+ "github.com/microsoft/go-mssqldb/msdsn""github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb""github.com/trufflesecurity/trufflehog/v3/pkg/detectors"@@ -32,7 +34,7 @@ func (s Scanner) Keywords() []string {func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (results []detectors.Result, err error) {matches := pattern.FindAllStringSubmatch(string(data), -1)for _, match := range matches {- paramsUnsafe, _, err := msdsn.Parse(match[1])+ paramsUnsafe, err := msdsn.Parse(match[1])if err != nil {continue}@@ -69,10 +71,20 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}var ping = func(config msdsn.Config) (bool, error) {- url := config.URL()+ cleanConfig := msdsn.Config{}+ cleanConfig.Host = config.Host+ cleanConfig.User = config.User+ cleanConfig.Password = config.Password+ cleanConfig.Database = config.Database+ cleanConfig.DisableRetry = true+ cleanConfig.Encryption = config.Encryption+ cleanConfig.TLSConfig = config.TLSConfig+ cleanConfig.Instance = config.Instance+ cleanConfig.DialTimeout = time.Second * 3+ cleanConfig.ConnTimeout = time.Second * 3++ url := cleanConfig.URL()query := url.Query()- query.Set("dial timeout", "3")- query.Set("connection timeout", "3")url.RawQuery = query.Encode()conn, err := sql.Open("mssql", url.String())diff --git a/pkg/detectors/sqlserver/sqlserver_test.go b/pkg/detectors/sqlserver/sqlserver_test.goindex cb428f418..7ecfbd3b9 100644--- a/pkg/detectors/sqlserver/sqlserver_test.go+++ b/pkg/detectors/sqlserver/sqlserver_test.go@@ -9,9 +9,9 @@ import ("fmt""testing"- "github.com/denisenkom/go-mssqldb/msdsn""github.com/google/go-cmp/cmp""github.com/google/go-cmp/cmp/cmpopts"+ "github.com/microsoft/go-mssqldb/msdsn""github.com/trufflesecurity/trufflehog/v3/pkg/detectors""github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb"@@ -45,7 +45,7 @@ func TestSQLServer_FromChunk(t *testing.T) {want: []detectors.Result{{DetectorType: detectorspb.DetectorType_SQLServer,- Redacted: "sqlserver://sa:********@localhost?database=Demo&disableRetry=false",+ Redacted: "sqlserver://sa:********@localhost?database=Demo&dial+timeout=15&disableretry=false",Verified: true,},},@@ -67,7 +67,7 @@ func TestSQLServer_FromChunk(t *testing.T) {want: []detectors.Result{{DetectorType: detectorspb.DetectorType_SQLServer,- Redacted: "sqlserver://sa:********@localhost?disableRetry=false",+ Redacted: "sqlserver://sa:********@localhost?dial+timeout=15&disableretry=false",Verified: false,},},@@ -105,7 +105,7 @@ func TestSQLServer_FromChunk(t *testing.T) {want: []detectors.Result{{DetectorType: detectorspb.DetectorType_SQLServer,- Redacted: "sqlserver://username:********@server_name?database=testdb&disableRetry=false",+ Redacted: "sqlserver://username:********@server_name?database=testdb&dial+timeout=15&disableretry=false&encrypt=true",Verified: true,},},@@ -164,9 +164,15 @@ func TestSQLServer_FromChunk(t *testing.T) {}got[i].Raw = nil}- ignoreOpts := cmpopts.IgnoreFields(detectors.Result{}, "RawV2")- if diff := cmp.Diff(tt.want, got, ignoreOpts); diff != "" {+ ignoreOpts := []cmp.Option{+ cmpopts.IgnoreFields(detectors.Result{}, "RawV2"),+ cmpopts.IgnoreUnexported(detectors.Result{}),+ }+ if diff := cmp.Diff(tt.want, got, ignoreOpts...); diff != "" {t.Errorf("SQLServer.FromData() %s diff: (-got +want)\n%s", tt.name, diff)+ for _, g := range got {+ t.Error(g.Redacted)+ }}})}