From 9fc10310533cb619ad21145fb1ace711d3e75ee7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 08:26:32 -0800 Subject: [PATCH 01/35] fix(deps): update module github.com/mattn/go-sqlite3 to v1.14.19 (#2286) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index cb6c9eac3..33327a9a0 100644 --- a/go.mod +++ b/go.mod @@ -57,7 +57,7 @@ require ( github.com/lrstanley/bubblezone v0.0.0-20230911164824-e3824f1adde9 github.com/marusama/semaphore/v2 v2.5.0 github.com/mattn/go-isatty v0.0.20 - github.com/mattn/go-sqlite3 v1.14.18 + github.com/mattn/go-sqlite3 v1.14.19 github.com/mholt/archiver/v4 v4.0.0-alpha.8 github.com/mitchellh/go-ps v1.0.0 github.com/muesli/reflow v0.3.0 diff --git a/go.sum b/go.sum index bd5e82524..0259a8c10 100644 --- a/go.sum +++ b/go.sum @@ -515,6 +515,8 @@ github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZ github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-sqlite3 v1.14.18 h1:JL0eqdCOq6DJVNPSvArO/bIV9/P7fbGrV00LZHc+5aI= github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI= +github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mholt/archiver/v4 v4.0.0-alpha.8 h1:tRGQuDVPh66WCOelqe6LIGh0gwmfwxUrSSDunscGsRM= From 1c01de324efb4b5601e24123cbba5e0662d83a12 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 08:30:52 -0800 Subject: [PATCH 02/35] chore(deps): update alpine docker tag to v3.19 (#2287) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Dockerfile | 2 +- Dockerfile.goreleaser | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1fdfce29e..abfe664d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \ --mount=type=cache,target=/root/.cache/go-build \ GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o trufflehog . -FROM alpine:3.18 +FROM alpine:3.19 RUN apk add --no-cache bash git openssh-client ca-certificates rpm2cpio binutils cpio \ && rm -rf /var/cache/apk/* && update-ca-certificates COPY --from=builder /build/trufflehog /usr/bin/trufflehog diff --git a/Dockerfile.goreleaser b/Dockerfile.goreleaser index bd1b1aad0..59bef10a9 100644 --- a/Dockerfile.goreleaser +++ b/Dockerfile.goreleaser @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM alpine:3.19 RUN apk add --no-cache bash git openssh-client ca-certificates rpm2cpio binutils cpio \ && rm -rf /var/cache/apk/* && update-ca-certificates From fe94986911b63262f3a68b3e1515ce8c23622d09 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 11:25:29 -0800 Subject: [PATCH 03/35] chore(deps): update sigstore/cosign-installer action to v3.3.0 (#2290) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a203e7d09..ef7a58a29 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,7 @@ jobs: with: go-version: '1.21' - name: Cosign install - uses: sigstore/cosign-installer@1fc5bd396d372bee37d608f955b336615edf79c8 # v3.2.0 + uses: sigstore/cosign-installer@9614fae9e5c5eddabb09f90a270fcb487c9f7149 # v3.3.0 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v5 with: From 3608c366e433bd1a6bb8536620be9b08b4886d29 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 11:32:46 -0800 Subject: [PATCH 04/35] fix(deps): update module cloud.google.com/go/storage to v1.36.0 (#2291) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 33327a9a0..8b5a3921f 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ replace github.com/jpillora/overseer => github.com/trufflesecurity/overseer v1.2 require ( cloud.google.com/go/secretmanager v1.11.4 - cloud.google.com/go/storage v1.35.1 + cloud.google.com/go/storage v1.36.0 github.com/Azure/go-autorest/autorest/azure/auth v0.5.12 github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 github.com/BobuSumisu/aho-corasick v1.0.3 diff --git a/go.sum b/go.sum index 0259a8c10..e566e7c5a 100644 --- a/go.sum +++ b/go.sum @@ -28,6 +28,8 @@ cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiy cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.35.1 h1:B59ahL//eDfx2IIKFBeT5Atm9wnNmj3+8xG/W4WB//w= cloud.google.com/go/storage v1.35.1/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8= +cloud.google.com/go/storage v1.36.0 h1:P0mOkAcaJxhCTvAkMhxMfrTKiNcub4YmmPBtlhAyTr8= +cloud.google.com/go/storage v1.36.0/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= From d249316e54010360f5b488b651767762c1b655d9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 11:43:29 -0800 Subject: [PATCH 05/35] fix(deps): update module github.com/aws/aws-sdk-go to v1.49.18 (#2292) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 8b5a3921f..3d79f638d 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/BobuSumisu/aho-corasick v1.0.3 github.com/TheZeroSlave/zapsentry v1.19.0 github.com/alecthomas/kingpin/v2 v2.4.0 - github.com/aws/aws-sdk-go v1.48.12 + github.com/aws/aws-sdk-go v1.49.18 github.com/aymanbagabas/go-osc52 v1.2.2 github.com/bill-rich/go-syslog v0.0.0-20220413021637-49edb52a574c github.com/bitfinexcom/bitfinex-api-go v0.0.0-20210608095005-9e0b26f200fb diff --git a/go.sum b/go.sum index e566e7c5a..5293138a2 100644 --- a/go.sum +++ b/go.sum @@ -108,6 +108,8 @@ github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= github.com/aws/aws-sdk-go v1.48.12 h1:n+eGzflzzvYubu2cOjqpVll7lF+Ci0ThyCpg5kzfzbo= github.com/aws/aws-sdk-go v1.48.12/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.49.18 h1:g/iMXkfXeJQ7MvnLwroxWsTTNkHtdVJGxIgrAIEG62M= +github.com/aws/aws-sdk-go v1.49.18/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-sdk-go-v2 v1.17.7 h1:CLSjnhJSTSogvqUGhIC6LqFKATMRexcxLZ0i/Nzk9Eg= github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs= From f37f2eff68c31620fd88bc37ff2b7d57ea0c700c Mon Sep 17 00:00:00 2001 From: Shubham Hibare <20609766+hibare@users.noreply.github.com> Date: Fri, 12 Jan 2024 01:26:21 +0530 Subject: [PATCH 06/35] feat(installation): Implement checksum signature verification (#2157) * feat(installation): Implement checksum signature verification * Add cosign notes * Use vars * use var --- README.md | 7 +++++++ scripts/install.sh | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 19d9b030e..8507980d9 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,10 @@ cd trufflehog; go install # Using installation script curl -sSfL https://raw.githubusercontent.com/trufflesecurity/trufflehog/main/scripts/install.sh | sh -s -- -b /usr/local/bin + +# Using installation script, verify checksum signature (requires cosign to be installed) +curl -sSfL https://raw.githubusercontent.com/trufflesecurity/trufflehog/main/scripts/install.sh | sh -s -- -v -b /usr/local/bin + # Using installation script to install a specific version curl -sSfL https://raw.githubusercontent.com/trufflesecurity/trufflehog/main/scripts/install.sh | sh -s -- -b /usr/local/bin ``` @@ -103,6 +107,9 @@ Verification steps are as follow: Replace `{version}` with the downloaded files version +Alternatively, if you are using installation script, pass `-v` option to perform signature verification. +This required Cosign binary to be installed prior to running installation script. + # :rocket: Quick Start ## 1: Scan a repo for only verified secrets diff --git a/scripts/install.sh b/scripts/install.sh index 97d6ddc7e..98fc55721 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -9,6 +9,7 @@ $this: download go binaries for trufflesecurity/trufflehog Usage: $this [-b] bindir [-d] [tag] -b sets bindir or installation directory, Defaults to ./bin -d turns on debug logging + -v verify checksum signature. Require cosign binary to be installed. [tag] is a tag from https://github.com/trufflesecurity/trufflehog/releases If tag is missing, then the latest will be used. @@ -22,10 +23,11 @@ parse_args() { # over-ridden by flag below BINDIR=${BINDIR:-./bin} - while getopts "b:dh?x" arg; do + while getopts "b:dvh?x" arg; do case "$arg" in b) BINDIR="$OPTARG" ;; d) log_set_priority 10 ;; + v) VERIFY_SIGN=true;; h | \?) usage "$0" ;; x) set -x ;; esac @@ -41,8 +43,15 @@ parse_args() { execute() { tmpdir=$(mktemp -d) log_debug "downloading files into ${tmpdir}" - http_download "${tmpdir}/${TARBALL}" "${TARBALL_URL}" http_download "${tmpdir}/${CHECKSUM}" "${CHECKSUM_URL}" + + if [ "$VERIFY_SIGN" = true ]; then + http_download "${tmpdir}/${CHECKSUM}.${CERT_FORMAT}" "${CHECKSUM_URL}.${CERT_FORMAT}" + http_download "${tmpdir}/${CHECKSUM}.${SIG_FORMAT}" "${CHECKSUM_URL}.${SIG_FORMAT}" + verify_sign "${tmpdir}/${CHECKSUM}" "${tmpdir}/${CHECKSUM}.${CERT_FORMAT}" "${tmpdir}/${CHECKSUM}.${SIG_FORMAT}" + fi + + http_download "${tmpdir}/${TARBALL}" "${TARBALL_URL}" hash_sha256_verify "${tmpdir}/${TARBALL}" "${tmpdir}/${CHECKSUM}" srcdir="${tmpdir}" (cd "${tmpdir}" && untar "${TARBALL}") @@ -326,6 +335,24 @@ hash_sha256_verify() { fi } +check_cosign_bin() { + if [ "$VERIFY_SIGN" = true ]; then + if [ ! -x "$(command -v "$COSIGN_BINARY")" ]; then + log_err "Cosign binary is not installed. Follow steps from https://docs.sigstore.dev/system_config/installation/ to install it." + return 1 + fi + fi +} + +verify_sign() { + log_debug "Verifying artifact $1" + ${COSIGN_BINARY} verify-blob "$1" \ + --certificate "$2" \ + --signature "$3" \ + --certificate-identity-regexp "https://github\.com/${OWNER}/${REPO}/\.github/workflows/.+" \ + --certificate-oidc-issuer "https://token.actions.githubusercontent.com" +} + cat /dev/null < Date: Thu, 11 Jan 2024 13:45:18 -0800 Subject: [PATCH 07/35] fix(deps): update module github.com/aws/aws-sdk-go to v1.49.19 (#2294) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 3d79f638d..b49644eee 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/BobuSumisu/aho-corasick v1.0.3 github.com/TheZeroSlave/zapsentry v1.19.0 github.com/alecthomas/kingpin/v2 v2.4.0 - github.com/aws/aws-sdk-go v1.49.18 + github.com/aws/aws-sdk-go v1.49.19 github.com/aymanbagabas/go-osc52 v1.2.2 github.com/bill-rich/go-syslog v0.0.0-20220413021637-49edb52a574c github.com/bitfinexcom/bitfinex-api-go v0.0.0-20210608095005-9e0b26f200fb diff --git a/go.sum b/go.sum index 5293138a2..e6d1c0805 100644 --- a/go.sum +++ b/go.sum @@ -110,6 +110,8 @@ github.com/aws/aws-sdk-go v1.48.12 h1:n+eGzflzzvYubu2cOjqpVll7lF+Ci0ThyCpg5kzfzb github.com/aws/aws-sdk-go v1.48.12/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-sdk-go v1.49.18 h1:g/iMXkfXeJQ7MvnLwroxWsTTNkHtdVJGxIgrAIEG62M= github.com/aws/aws-sdk-go v1.49.18/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.49.19 h1:oZryiqeQpeJsIcAmZlp86duMu/s/DJ43qyfwa51qmLg= +github.com/aws/aws-sdk-go v1.49.19/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-sdk-go-v2 v1.17.7 h1:CLSjnhJSTSogvqUGhIC6LqFKATMRexcxLZ0i/Nzk9Eg= github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs= From aa40654aad167610dc9fa9e3870dd63a5c3530ee Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 13:52:50 -0800 Subject: [PATCH 08/35] fix(deps): update module github.com/bradleyfalzon/ghinstallation/v2 to v2.9.0 (#2295) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 3 ++- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index b49644eee..2305c8066 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/aymanbagabas/go-osc52 v1.2.2 github.com/bill-rich/go-syslog v0.0.0-20220413021637-49edb52a574c github.com/bitfinexcom/bitfinex-api-go v0.0.0-20210608095005-9e0b26f200fb - github.com/bradleyfalzon/ghinstallation/v2 v2.8.0 + github.com/bradleyfalzon/ghinstallation/v2 v2.9.0 github.com/charmbracelet/bubbles v0.16.1 github.com/charmbracelet/bubbletea v0.24.2 github.com/charmbracelet/glamour v0.6.0 @@ -172,6 +172,7 @@ require ( github.com/golang/snappy v0.0.4 // indirect github.com/google/flatbuffers v23.1.21+incompatible // indirect github.com/google/go-github/v56 v56.0.0 // indirect + github.com/google/go-github/v57 v57.0.0 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/pprof v0.0.0-20211214055906-6f57359322fd // indirect github.com/google/s2a-go v0.1.7 // indirect diff --git a/go.sum b/go.sum index e6d1c0805..401bd150c 100644 --- a/go.sum +++ b/go.sum @@ -172,6 +172,8 @@ 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.8.0 h1:yUmoVv70H3J4UOqxqsee39+KlXxNEDfTbAp8c/qULKk= github.com/bradleyfalzon/ghinstallation/v2 v2.8.0/go.mod h1:fmPmvCiBWhJla3zDv9ZTQSZc8AbwyRnGW1yg5ep1Pcs= +github.com/bradleyfalzon/ghinstallation/v2 v2.9.0 h1:HmxIYqnxubRYcYGRc5v3wUekmo5Wv2uX3gukmWJ0AFk= +github.com/bradleyfalzon/ghinstallation/v2 v2.9.0/go.mod h1:wmkTDJf8CmVypxE8ijIStFnKoTa6solK5QfdmJrP9KI= github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= @@ -374,6 +376,8 @@ github.com/google/go-github/v42 v42.0.0 h1:YNT0FwjPrEysRkLIiKuEfSvBPCGKphW5aS5Px github.com/google/go-github/v42 v42.0.0/go.mod h1:jgg/jvyI0YlDOM1/ps6XYh04HNQ3vKf0CVko62/EhRg= github.com/google/go-github/v56 v56.0.0 h1:TysL7dMa/r7wsQi44BjqlwaHvwlFlqkK8CtBWCX3gb4= github.com/google/go-github/v56 v56.0.0/go.mod h1:D8cdcX98YWJvi7TLo7zM4/h8ZTx6u6fwGEkCdisopo0= +github.com/google/go-github/v57 v57.0.0 h1:L+Y3UPTY8ALM8x+TV0lg+IEBI+upibemtBD8Q9u7zHs= +github.com/google/go-github/v57 v57.0.0/go.mod h1:s0omdnye0hvK/ecLvpsGfJMiRt85PimQh4oygmLIxHw= github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= From 9408425cc6e177cf632cca06e8ccf87bee122972 Mon Sep 17 00:00:00 2001 From: ahrav Date: Thu, 11 Jan 2024 14:27:10 -0800 Subject: [PATCH 09/35] [chore] - small updates (#2288) * small updates * fix logic * simplify fxn * remove errors * use strings.EqualFold --- pkg/sources/github/github.go | 58 +++++++++++++++++------------------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/pkg/sources/github/github.go b/pkg/sources/github/github.go index f0e03020c..83aa2fb6b 100644 --- a/pkg/sources/github/github.go +++ b/pkg/sources/github/github.go @@ -1,6 +1,7 @@ package github import ( + "errors" "fmt" "net/http" "net/url" @@ -15,7 +16,6 @@ import ( "time" "github.com/bradleyfalzon/ghinstallation/v2" - "github.com/go-errors/errors" gogit "github.com/go-git/go-git/v5" "github.com/go-logr/logr" "github.com/gobwas/glob" @@ -217,7 +217,7 @@ func (s *Source) Init(aCtx context.Context, name string, jobID sources.JobID, so var conn sourcespb.GitHub err := anypb.UnmarshalTo(connection, &conn, proto.UnmarshalOptions{}) if err != nil { - return errors.WrapPrefix(err, "error unmarshalling connection", 0) + return fmt.Errorf("error unmarshalling connection: %w", err) } s.conn = &conn @@ -323,7 +323,7 @@ func (s *Source) Validate(ctx context.Context) []error { errs = append(errs, fmt.Errorf("error creating GitHub client: %+v", err)) } default: - errs = append(errs, errors.Errorf("Invalid configuration given for source. Name: %s, Type: %s", s.name, s.Type())) + errs = append(errs, fmt.Errorf("Invalid configuration given for source. Name: %s, Type: %s", s.name, s.Type())) } // Run a simple query to check if the client is actually valid @@ -419,11 +419,13 @@ func (s *Source) visibilityOf(ctx context.Context, repoURL string) (visibility s return } +const cloudEndpoint = "https://api.github.com" + // Chunks emits chunks of bytes over a channel. func (s *Source) Chunks(ctx context.Context, chunksChan chan *sources.Chunk, targets ...sources.ChunkingTarget) error { apiEndpoint := s.conn.Endpoint if len(apiEndpoint) == 0 || endsWithGithub.MatchString(apiEndpoint) { - apiEndpoint = "https://api.github.com" + apiEndpoint = cloudEndpoint } // If targets are provided, we're only scanning the data in those targets. @@ -469,7 +471,7 @@ func (s *Source) enumerate(ctx context.Context, apiEndpoint string) (*github.Cli } default: // TODO: move this error to Init - return nil, errors.Errorf("Invalid configuration given for source. Name: %s, Type: %s", s.name, s.Type()) + return nil, fmt.Errorf("Invalid configuration given for source. Name: %s, Type: %s", s.name, s.Type()) } s.repos = make([]string, 0, s.filteredRepoCache.Count()) @@ -550,7 +552,6 @@ func (s *Source) enumerateWithToken(ctx context.Context, apiEndpoint, token stri // If we're using public GitHub, make a regular client. // Otherwise, make an enterprise client. - var isGHE bool = apiEndpoint != "https://api.github.com" ghClient, err := createGitHubClient(s.httpClient, apiEndpoint) if err != nil { s.log.Error(err, "error creating GitHub client") @@ -577,7 +578,7 @@ func (s *Source) enumerateWithToken(ctx context.Context, apiEndpoint, token stri continue } if err != nil { - return errors.New(err) + return fmt.Errorf("error getting user: %w", err) } break } @@ -606,6 +607,7 @@ func (s *Source) enumerateWithToken(ctx context.Context, apiEndpoint, token stri s.log.Error(err, "error fetching repos by user") } + isGHE := !strings.EqualFold(apiEndpoint, cloudEndpoint) if isGHE { s.addAllVisibleOrgs(ctx) } else { @@ -653,12 +655,12 @@ func (s *Source) enumerateWithToken(ctx context.Context, apiEndpoint, token stri func (s *Source) enumerateWithApp(ctx context.Context, apiEndpoint string, app *credentialspb.GitHubApp) (installationClient *github.Client, err error) { installationID, err := strconv.ParseInt(app.InstallationId, 10, 64) if err != nil { - return nil, errors.New(err) + return nil, err } appID, err := strconv.ParseInt(app.AppId, 10, 64) if err != nil { - return nil, errors.New(err) + return nil, err } // This client is required to create installation tokens for cloning. @@ -671,16 +673,16 @@ func (s *Source) enumerateWithApp(ctx context.Context, apiEndpoint string, app * appID, []byte(app.PrivateKey)) if err != nil { - return nil, errors.New(err) + return nil, err } appItr.BaseURL = apiEndpoint // Does this need to be separate from |s.httpClient|? - instHttpClient := common.RetryableHttpClientTimeout(60) - instHttpClient.Transport = appItr - installationClient, err = github.NewEnterpriseClient(apiEndpoint, apiEndpoint, instHttpClient) + instHTTPClient := common.RetryableHttpClientTimeout(60) + instHTTPClient.Transport = appItr + installationClient, err = github.NewEnterpriseClient(apiEndpoint, apiEndpoint, instHTTPClient) if err != nil { - return nil, errors.New(err) + return nil, err } // This client is used for most APIs. @@ -690,14 +692,14 @@ func (s *Source) enumerateWithApp(ctx context.Context, apiEndpoint string, app * installationID, []byte(app.PrivateKey)) if err != nil { - return nil, errors.New(err) + return nil, err } itr.BaseURL = apiEndpoint s.httpClient.Transport = itr s.apiClient, err = github.NewEnterpriseClient(apiEndpoint, apiEndpoint, s.httpClient) if err != nil { - return nil, errors.New(err) + return nil, err } // If no repos were provided, enumerate them. @@ -728,19 +730,14 @@ func (s *Source) enumerateWithApp(ctx context.Context, apiEndpoint string, app * return installationClient, nil } -func createGitHubClient(httpClient *http.Client, apiEndpoint string) (ghClient *github.Client, err error) { +func createGitHubClient(httpClient *http.Client, apiEndpoint string) (*github.Client, error) { // If we're using public GitHub, make a regular client. // Otherwise, make an enterprise client. - if apiEndpoint == "https://api.github.com" { - ghClient = github.NewClient(httpClient) - } else { - ghClient, err = github.NewEnterpriseClient(apiEndpoint, apiEndpoint, httpClient) - if err != nil { - return nil, errors.New(err) - } + if strings.EqualFold(apiEndpoint, cloudEndpoint) { + return github.NewClient(httpClient), nil } - return ghClient, err + return github.NewEnterpriseClient(apiEndpoint, apiEndpoint, httpClient) } func (s *Source) scan(ctx context.Context, installationClient *github.Client, chunksChan chan *sources.Chunk) error { @@ -969,7 +966,7 @@ func (s *Source) addAllVisibleOrgs(ctx context.Context) { continue } if err != nil { - s.log.Error(err, "Could not list all organizations") + s.log.Error(err, "could not list all organizations") return } if len(orgs) == 0 { @@ -981,11 +978,12 @@ func (s *Source) addAllVisibleOrgs(ctx context.Context) { for _, org := range orgs { var name string - if org.Name != nil { + switch { + case org.Name != nil: name = *org.Name - } else if org.Login != nil { + case org.Login != nil: name = *org.Login - } else { + default: continue } s.orgsCache.Set(name, name) @@ -1046,7 +1044,7 @@ func (s *Source) addMembersByOrg(ctx context.Context, org string) error { continue } if err != nil || len(members) == 0 { - return errors.New("Could not list organization members: account may not have access to list organization members") + return fmt.Errorf("could not list organization members: account may not have access to list organization members %w", err) } if res == nil { break From 651beff4921638802bd8180c5d1fc33f9507bef2 Mon Sep 17 00:00:00 2001 From: ahrav Date: Thu, 11 Jan 2024 15:41:50 -0800 Subject: [PATCH 10/35] [feat] - Allow for the use of include/exclude path files for filesystem scans (#2297) * Allow for the use of include/exclude path files for filesystem scans * remove oopsie --- main.go | 9 +- pkg/engine/filesystem.go | 5 +- pkg/pb/sourcespb/sources.pb.go | 823 ++++++++++++------------ pkg/pb/sourcespb/sources.pb.validate.go | 4 + pkg/sources/filesystem/filesystem.go | 10 +- pkg/sources/sources.go | 6 +- proto/sources.proto | 2 + 7 files changed, 444 insertions(+), 415 deletions(-) diff --git a/main.go b/main.go index d6a50dcf2..be1f3df96 100644 --- a/main.go +++ b/main.go @@ -470,10 +470,6 @@ func run(state overseer.State) { logFatal(err, "Failed to scan GitLab.") } case filesystemScan.FullCommand(): - filter, err := common.FilterFromFiles(*filesystemScanIncludePaths, *filesystemScanExcludePaths) - if err != nil { - logFatal(err, "could not create filter") - } if len(*filesystemDirectories) > 0 { ctx.Logger().Info("--directory flag is deprecated, please pass directories as arguments") } @@ -481,8 +477,9 @@ func run(state overseer.State) { paths = append(paths, *filesystemPaths...) paths = append(paths, *filesystemDirectories...) cfg := sources.FilesystemConfig{ - Paths: paths, - Filter: filter, + Paths: paths, + IncludePathsFile: *filesystemScanIncludePaths, + ExcludePathsFile: *filesystemScanExcludePaths, } if err = e.ScanFileSystem(ctx, cfg); err != nil { logFatal(err, "Failed to scan filesystem") diff --git a/pkg/engine/filesystem.go b/pkg/engine/filesystem.go index 9b49ae853..169e52c31 100644 --- a/pkg/engine/filesystem.go +++ b/pkg/engine/filesystem.go @@ -15,7 +15,9 @@ import ( // ScanFileSystem scans a given file system. func (e *Engine) ScanFileSystem(ctx context.Context, c sources.FilesystemConfig) error { connection := &sourcespb.Filesystem{ - Paths: c.Paths, + Paths: c.Paths, + IncludePathsFile: c.IncludePathsFile, + ExcludePathsFile: c.ExcludePathsFile, } var conn anypb.Any err := anypb.MarshalFrom(&conn, connection, proto.MarshalOptions{}) @@ -28,7 +30,6 @@ func (e *Engine) ScanFileSystem(ctx context.Context, c sources.FilesystemConfig) sourceID, jobID, _ := e.sourceManager.GetIDs(ctx, sourceName, filesystem.SourceType) fileSystemSource := &filesystem.Source{} - fileSystemSource.WithFilter(c.Filter) if err := fileSystemSource.Init(ctx, sourceName, jobID, sourceID, true, &conn, runtime.NumCPU()); err != nil { return err } diff --git a/pkg/pb/sourcespb/sources.pb.go b/pkg/pb/sourcespb/sources.pb.go index 78c8cb991..95940e678 100644 --- a/pkg/pb/sourcespb/sources.pb.go +++ b/pkg/pb/sourcespb/sources.pb.go @@ -1189,8 +1189,10 @@ type Filesystem struct { // DEPRECATED: directories is deprecated and can be removed / renamed to // paths when we no longer depend on the name in enterprise configs. - Directories []string `protobuf:"bytes,1,rep,name=directories,proto3" json:"directories,omitempty"` - Paths []string `protobuf:"bytes,2,rep,name=paths,proto3" json:"paths,omitempty"` + Directories []string `protobuf:"bytes,1,rep,name=directories,proto3" json:"directories,omitempty"` + Paths []string `protobuf:"bytes,2,rep,name=paths,proto3" json:"paths,omitempty"` + IncludePathsFile string `protobuf:"bytes,3,opt,name=include_paths_file,json=includePathsFile,proto3" json:"include_paths_file,omitempty"` // path to file containing newline separated list of paths + ExcludePathsFile string `protobuf:"bytes,4,opt,name=exclude_paths_file,json=excludePathsFile,proto3" json:"exclude_paths_file,omitempty"` // path to file containing newline separated list of paths } func (x *Filesystem) Reset() { @@ -1239,6 +1241,20 @@ func (x *Filesystem) GetPaths() []string { return nil } +func (x *Filesystem) GetIncludePathsFile() string { + if x != nil { + return x.IncludePathsFile + } + return "" +} + +func (x *Filesystem) GetExcludePathsFile() string { + if x != nil { + return x.ExcludePathsFile + } + return "" +} + type GCS struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -3636,415 +3652,420 @@ var file_sources_proto_rawDesc = []byte{ 0x4b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x69, 0x65, 0x73, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, - 0x6c, 0x22, 0x44, 0x0a, 0x0a, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, - 0x20, 0x0a, 0x0b, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x18, 0x01, - 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x69, 0x65, - 0x73, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x74, 0x68, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, - 0x52, 0x05, 0x70, 0x61, 0x74, 0x68, 0x73, 0x22, 0xab, 0x04, 0x0a, 0x03, 0x47, 0x43, 0x53, 0x12, - 0x32, 0x0a, 0x14, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, - 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, - 0x12, 0x6a, 0x73, 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41, 0x63, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x12, 0x19, 0x0a, 0x07, 0x61, 0x70, 0x69, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x06, 0x61, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x12, 0x48, - 0x0a, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, - 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, - 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x55, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, - 0x63, 0x61, 0x74, 0x65, 0x64, 0x48, 0x00, 0x52, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, - 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x31, 0x0a, 0x03, 0x61, 0x64, 0x63, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, - 0x61, 0x6c, 0x73, 0x2e, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, - 0x6d, 0x65, 0x6e, 0x74, 0x48, 0x00, 0x52, 0x03, 0x61, 0x64, 0x63, 0x12, 0x32, 0x0a, 0x14, 0x73, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x66, - 0x69, 0x6c, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x12, 0x73, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x12, - 0x2b, 0x0a, 0x05, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, - 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x4f, 0x61, 0x75, - 0x74, 0x68, 0x32, 0x48, 0x00, 0x52, 0x05, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x12, 0x1d, 0x0a, 0x0a, - 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x09, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x49, 0x64, 0x12, 0x27, 0x0a, 0x0f, 0x69, - 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x62, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x18, 0x06, - 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x42, 0x75, 0x63, - 0x6b, 0x65, 0x74, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, - 0x62, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x65, - 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x12, 0x27, 0x0a, - 0x0f, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x73, - 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x4f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, - 0x65, 0x5f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, - 0x0e, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x12, - 0x26, 0x0a, 0x0f, 0x6d, 0x61, 0x78, 0x5f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x73, 0x69, - 0x7a, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x6d, 0x61, 0x78, 0x4f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x53, 0x69, 0x7a, 0x65, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, - 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0xc5, 0x04, 0x0a, 0x03, 0x47, 0x69, 0x74, 0x12, 0x37, 0x0a, - 0x0a, 0x62, 0x61, 0x73, 0x69, 0x63, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x16, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, - 0x42, 0x61, 0x73, 0x69, 0x63, 0x41, 0x75, 0x74, 0x68, 0x48, 0x00, 0x52, 0x09, 0x62, 0x61, 0x73, - 0x69, 0x63, 0x41, 0x75, 0x74, 0x68, 0x12, 0x48, 0x0a, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, - 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1c, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x55, 0x6e, - 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x48, 0x00, 0x52, - 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, - 0x12, 0x31, 0x0a, 0x08, 0x73, 0x73, 0x68, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, - 0x2e, 0x53, 0x53, 0x48, 0x41, 0x75, 0x74, 0x68, 0x48, 0x00, 0x52, 0x07, 0x73, 0x73, 0x68, 0x41, - 0x75, 0x74, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x69, - 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, - 0x6f, 0x72, 0x69, 0x65, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x6f, 0x72, 0x69, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x61, - 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x61, 0x64, 0x12, 0x12, 0x0a, - 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x62, 0x61, 0x73, - 0x65, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x61, 0x72, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x04, 0x62, 0x61, 0x72, 0x65, 0x12, 0x2c, 0x0a, 0x12, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, - 0x5f, 0x70, 0x61, 0x74, 0x68, 0x73, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x10, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x50, 0x61, 0x74, 0x68, 0x73, 0x46, - 0x69, 0x6c, 0x65, 0x12, 0x2c, 0x0a, 0x12, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x70, - 0x61, 0x74, 0x68, 0x73, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x10, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x50, 0x61, 0x74, 0x68, 0x73, 0x46, 0x69, 0x6c, - 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x67, 0x6c, 0x6f, - 0x62, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, - 0x65, 0x47, 0x6c, 0x6f, 0x62, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x6d, 0x61, 0x78, 0x5f, 0x64, 0x65, - 0x70, 0x74, 0x68, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x44, 0x65, - 0x70, 0x74, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x69, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x75, 0x72, 0x69, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x62, 0x69, - 0x6e, 0x61, 0x72, 0x69, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x73, 0x6b, - 0x69, 0x70, 0x42, 0x69, 0x6e, 0x61, 0x72, 0x69, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6b, - 0x69, 0x70, 0x5f, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x41, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x73, 0x42, - 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0xcb, 0x02, - 0x0a, 0x06, 0x47, 0x69, 0x74, 0x4c, 0x61, 0x62, 0x12, 0x24, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, - 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x72, - 0x03, 0x90, 0x01, 0x01, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x16, - 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, - 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x2b, 0x0a, 0x05, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, - 0x61, 0x6c, 0x73, 0x2e, 0x4f, 0x61, 0x75, 0x74, 0x68, 0x32, 0x48, 0x00, 0x52, 0x05, 0x6f, 0x61, - 0x75, 0x74, 0x68, 0x12, 0x37, 0x0a, 0x0a, 0x62, 0x61, 0x73, 0x69, 0x63, 0x5f, 0x61, 0x75, 0x74, - 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, - 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x42, 0x61, 0x73, 0x69, 0x63, 0x41, 0x75, 0x74, 0x68, 0x48, - 0x00, 0x52, 0x09, 0x62, 0x61, 0x73, 0x69, 0x63, 0x41, 0x75, 0x74, 0x68, 0x12, 0x22, 0x0a, 0x0c, - 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, - 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, - 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x73, - 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x52, 0x65, - 0x70, 0x6f, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x62, 0x69, 0x6e, 0x61, - 0x72, 0x69, 0x65, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x73, 0x6b, 0x69, 0x70, - 0x42, 0x69, 0x6e, 0x61, 0x72, 0x69, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6b, 0x69, 0x70, - 0x5f, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x41, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x73, 0x42, 0x0c, 0x0a, - 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0x83, 0x06, 0x0a, 0x06, - 0x47, 0x69, 0x74, 0x48, 0x75, 0x62, 0x12, 0x24, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, - 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x90, - 0x01, 0x01, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x37, 0x0a, 0x0a, - 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x5f, 0x61, 0x70, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x16, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x47, - 0x69, 0x74, 0x48, 0x75, 0x62, 0x41, 0x70, 0x70, 0x48, 0x00, 0x52, 0x09, 0x67, 0x69, 0x74, 0x68, - 0x75, 0x62, 0x41, 0x70, 0x70, 0x12, 0x16, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x48, 0x0a, - 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, - 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x55, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, - 0x61, 0x74, 0x65, 0x64, 0x48, 0x00, 0x52, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, - 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x37, 0x0a, 0x0a, 0x62, 0x61, 0x73, 0x69, 0x63, - 0x5f, 0x61, 0x75, 0x74, 0x68, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x63, 0x72, - 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x42, 0x61, 0x73, 0x69, 0x63, 0x41, - 0x75, 0x74, 0x68, 0x48, 0x00, 0x52, 0x09, 0x62, 0x61, 0x73, 0x69, 0x63, 0x41, 0x75, 0x74, 0x68, - 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, - 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, - 0x72, 0x69, 0x65, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x6f, 0x72, 0x67, - 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x63, - 0x61, 0x6e, 0x55, 0x73, 0x65, 0x72, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x73, - 0x63, 0x61, 0x6e, 0x55, 0x73, 0x65, 0x72, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x69, 0x6e, 0x63, 0x6c, - 0x75, 0x64, 0x65, 0x46, 0x6f, 0x72, 0x6b, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, - 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x46, 0x6f, 0x72, 0x6b, 0x73, 0x12, 0x12, 0x0a, 0x04, - 0x68, 0x65, 0x61, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x61, 0x64, - 0x12, 0x12, 0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, - 0x62, 0x61, 0x73, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f, 0x72, - 0x65, 0x70, 0x6f, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x69, 0x67, 0x6e, 0x6f, - 0x72, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75, - 0x64, 0x65, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, - 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x12, 0x41, 0x0a, 0x1d, - 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x70, 0x75, 0x6c, 0x6c, 0x5f, 0x72, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x0e, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x1a, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x50, 0x75, 0x6c, 0x6c, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, - 0x34, 0x0a, 0x16, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x69, 0x73, 0x73, 0x75, 0x65, - 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x14, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x49, 0x73, 0x73, 0x75, 0x65, 0x43, 0x6f, 0x6d, - 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x32, 0x0a, 0x15, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, - 0x5f, 0x67, 0x69, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x10, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x47, 0x69, 0x73, - 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6b, 0x69, - 0x70, 0x5f, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x69, 0x65, 0x73, 0x18, 0x11, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x42, 0x69, 0x6e, 0x61, 0x72, 0x69, 0x65, 0x73, 0x12, 0x23, - 0x0a, 0x0d, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x73, 0x18, - 0x12, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x41, 0x72, 0x63, 0x68, 0x69, - 0x76, 0x65, 0x73, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, - 0x6c, 0x22, 0x42, 0x0a, 0x0b, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x44, 0x72, 0x69, 0x76, 0x65, - 0x12, 0x25, 0x0a, 0x0d, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x5f, 0x74, 0x6f, 0x6b, 0x65, - 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0c, 0x72, 0x65, 0x66, 0x72, 0x65, - 0x73, 0x68, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, - 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0x80, 0x03, 0x0a, 0x04, 0x4a, 0x49, 0x52, 0x41, 0x12, 0x24, - 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x08, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x90, 0x01, 0x01, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, - 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x37, 0x0a, 0x0a, 0x62, 0x61, 0x73, 0x69, 0x63, 0x5f, 0x61, 0x75, - 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, - 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x42, 0x61, 0x73, 0x69, 0x63, 0x41, 0x75, 0x74, 0x68, - 0x48, 0x00, 0x52, 0x09, 0x62, 0x61, 0x73, 0x69, 0x63, 0x41, 0x75, 0x74, 0x68, 0x12, 0x48, 0x0a, - 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, - 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x55, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, - 0x61, 0x74, 0x65, 0x64, 0x48, 0x00, 0x52, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, - 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x2b, 0x0a, 0x05, 0x6f, 0x61, 0x75, 0x74, 0x68, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, - 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x4f, 0x61, 0x75, 0x74, 0x68, 0x32, 0x48, 0x00, 0x52, 0x05, 0x6f, - 0x61, 0x75, 0x74, 0x68, 0x12, 0x16, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1a, 0x0a, 0x08, - 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, - 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x69, 0x67, 0x6e, 0x6f, - 0x72, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, - 0x09, 0x52, 0x0e, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, - 0x73, 0x12, 0x37, 0x0a, 0x18, 0x69, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x5f, 0x73, 0x6b, - 0x69, 0x70, 0x5f, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x5f, 0x74, 0x6c, 0x73, 0x18, 0x08, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x15, 0x69, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x53, 0x6b, 0x69, - 0x70, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x54, 0x6c, 0x73, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, - 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0x73, 0x0a, 0x19, 0x4e, 0x50, 0x4d, 0x55, - 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x50, 0x61, - 0x63, 0x6b, 0x61, 0x67, 0x65, 0x12, 0x48, 0x0a, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, - 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, - 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x55, 0x6e, 0x61, - 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x48, 0x00, 0x52, 0x0f, - 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x42, - 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0x74, 0x0a, - 0x1a, 0x50, 0x79, 0x50, 0x49, 0x55, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, - 0x61, 0x74, 0x65, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x12, 0x48, 0x0a, 0x0f, 0x75, - 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x01, + 0x6c, 0x22, 0xa0, 0x01, 0x0a, 0x0a, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, + 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x69, + 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x74, 0x68, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, + 0x09, 0x52, 0x05, 0x70, 0x61, 0x74, 0x68, 0x73, 0x12, 0x2c, 0x0a, 0x12, 0x69, 0x6e, 0x63, 0x6c, + 0x75, 0x64, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x73, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x50, 0x61, 0x74, + 0x68, 0x73, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x2c, 0x0a, 0x12, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, + 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x73, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x10, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x50, 0x61, 0x74, 0x68, 0x73, + 0x46, 0x69, 0x6c, 0x65, 0x22, 0xab, 0x04, 0x0a, 0x03, 0x47, 0x43, 0x53, 0x12, 0x32, 0x0a, 0x14, + 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x61, 0x63, 0x63, + 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x12, 0x6a, 0x73, + 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, + 0x12, 0x19, 0x0a, 0x07, 0x61, 0x70, 0x69, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x48, 0x00, 0x52, 0x06, 0x61, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x12, 0x48, 0x0a, 0x0f, 0x75, + 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x55, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x48, 0x00, 0x52, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, - 0x63, 0x61, 0x74, 0x65, 0x64, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, - 0x69, 0x61, 0x6c, 0x22, 0x86, 0x03, 0x0a, 0x02, 0x53, 0x33, 0x12, 0x37, 0x0a, 0x0a, 0x61, 0x63, - 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, - 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x4b, 0x65, 0x79, - 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x48, 0x00, 0x52, 0x09, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, - 0x4b, 0x65, 0x79, 0x12, 0x48, 0x0a, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, + 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x31, 0x0a, 0x03, 0x61, 0x64, 0x63, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, + 0x2e, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, + 0x74, 0x48, 0x00, 0x52, 0x03, 0x61, 0x64, 0x63, 0x12, 0x32, 0x0a, 0x14, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x5f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x65, + 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x12, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x2b, 0x0a, 0x05, + 0x6f, 0x61, 0x75, 0x74, 0x68, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x63, 0x72, + 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x4f, 0x61, 0x75, 0x74, 0x68, 0x32, + 0x48, 0x00, 0x52, 0x05, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x72, 0x6f, + 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, + 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x49, 0x64, 0x12, 0x27, 0x0a, 0x0f, 0x69, 0x6e, 0x63, 0x6c, + 0x75, 0x64, 0x65, 0x5f, 0x62, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, + 0x09, 0x52, 0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, + 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x62, 0x75, 0x63, + 0x6b, 0x65, 0x74, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x65, 0x78, 0x63, 0x6c, + 0x75, 0x64, 0x65, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x69, 0x6e, + 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x18, 0x08, 0x20, + 0x03, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x4f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x65, 0x78, + 0x63, 0x6c, 0x75, 0x64, 0x65, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x12, 0x26, 0x0a, 0x0f, + 0x6d, 0x61, 0x78, 0x5f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, + 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x6d, 0x61, 0x78, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x53, 0x69, 0x7a, 0x65, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, + 0x61, 0x6c, 0x22, 0xc5, 0x04, 0x0a, 0x03, 0x47, 0x69, 0x74, 0x12, 0x37, 0x0a, 0x0a, 0x62, 0x61, + 0x73, 0x69, 0x63, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, + 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x42, 0x61, 0x73, + 0x69, 0x63, 0x41, 0x75, 0x74, 0x68, 0x48, 0x00, 0x52, 0x09, 0x62, 0x61, 0x73, 0x69, 0x63, 0x41, + 0x75, 0x74, 0x68, 0x12, 0x48, 0x0a, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x55, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x48, 0x00, 0x52, 0x0f, 0x75, 0x6e, - 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x4c, 0x0a, - 0x11, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x5f, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, - 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, - 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x45, 0x6e, 0x76, 0x69, - 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x48, 0x00, 0x52, 0x10, 0x63, 0x6c, 0x6f, 0x75, 0x64, - 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x49, 0x0a, 0x0d, 0x73, - 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, - 0x2e, 0x41, 0x57, 0x53, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, - 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x48, 0x00, 0x52, 0x0c, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, - 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x63, 0x6b, 0x65, 0x74, - 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x62, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, - 0x12, 0x26, 0x0a, 0x0f, 0x6d, 0x61, 0x78, 0x5f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x73, - 0x69, 0x7a, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x6d, 0x61, 0x78, 0x4f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x6c, 0x65, - 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x42, 0x0c, - 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0xc4, 0x01, 0x0a, - 0x05, 0x53, 0x6c, 0x61, 0x63, 0x6b, 0x12, 0x24, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, - 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x90, - 0x01, 0x01, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x05, - 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x74, - 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x32, 0x0a, 0x06, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, - 0x6c, 0x73, 0x2e, 0x53, 0x6c, 0x61, 0x63, 0x6b, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x48, 0x00, - 0x52, 0x06, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x6e, - 0x6e, 0x65, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x63, 0x68, 0x61, 0x6e, - 0x6e, 0x65, 0x6c, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f, 0x6c, - 0x69, 0x73, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x67, 0x6e, 0x6f, 0x72, - 0x65, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, - 0x69, 0x61, 0x6c, 0x22, 0x06, 0x0a, 0x04, 0x54, 0x65, 0x73, 0x74, 0x22, 0x31, 0x0a, 0x09, 0x42, - 0x75, 0x69, 0x6c, 0x64, 0x6b, 0x69, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, - 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, - 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0xa5, - 0x02, 0x0a, 0x06, 0x47, 0x65, 0x72, 0x72, 0x69, 0x74, 0x12, 0x24, 0x0a, 0x08, 0x65, 0x6e, 0x64, - 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xfa, 0x42, 0x05, - 0x72, 0x03, 0x90, 0x01, 0x01, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, - 0x37, 0x0a, 0x0a, 0x62, 0x61, 0x73, 0x69, 0x63, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, - 0x73, 0x2e, 0x42, 0x61, 0x73, 0x69, 0x63, 0x41, 0x75, 0x74, 0x68, 0x48, 0x00, 0x52, 0x09, 0x62, - 0x61, 0x73, 0x69, 0x63, 0x41, 0x75, 0x74, 0x68, 0x12, 0x48, 0x0a, 0x0f, 0x75, 0x6e, 0x61, 0x75, - 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x31, 0x0a, + 0x08, 0x73, 0x73, 0x68, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x14, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x53, 0x53, + 0x48, 0x41, 0x75, 0x74, 0x68, 0x48, 0x00, 0x52, 0x07, 0x73, 0x73, 0x68, 0x41, 0x75, 0x74, 0x68, + 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x18, + 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x69, + 0x65, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, + 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x61, 0x64, 0x18, 0x06, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x61, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x61, + 0x73, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x62, 0x61, 0x73, 0x65, 0x12, 0x12, + 0x0a, 0x04, 0x62, 0x61, 0x72, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x62, 0x61, + 0x72, 0x65, 0x12, 0x2c, 0x0a, 0x12, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x70, 0x61, + 0x74, 0x68, 0x73, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, + 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x50, 0x61, 0x74, 0x68, 0x73, 0x46, 0x69, 0x6c, 0x65, + 0x12, 0x2c, 0x0a, 0x12, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, + 0x73, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x65, 0x78, + 0x63, 0x6c, 0x75, 0x64, 0x65, 0x50, 0x61, 0x74, 0x68, 0x73, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x23, + 0x0a, 0x0d, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x67, 0x6c, 0x6f, 0x62, 0x73, 0x18, + 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x47, 0x6c, + 0x6f, 0x62, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x6d, 0x61, 0x78, 0x5f, 0x64, 0x65, 0x70, 0x74, 0x68, + 0x18, 0x0c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x44, 0x65, 0x70, 0x74, 0x68, + 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x69, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, + 0x72, 0x69, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x62, 0x69, 0x6e, 0x61, 0x72, + 0x69, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x42, + 0x69, 0x6e, 0x61, 0x72, 0x69, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6b, 0x69, 0x70, 0x5f, + 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, + 0x73, 0x6b, 0x69, 0x70, 0x41, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x73, 0x42, 0x0c, 0x0a, 0x0a, + 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0xcb, 0x02, 0x0a, 0x06, 0x47, + 0x69, 0x74, 0x4c, 0x61, 0x62, 0x12, 0x24, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, + 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x90, 0x01, + 0x01, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x05, 0x74, + 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x74, 0x6f, + 0x6b, 0x65, 0x6e, 0x12, 0x2b, 0x0a, 0x05, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, + 0x2e, 0x4f, 0x61, 0x75, 0x74, 0x68, 0x32, 0x48, 0x00, 0x52, 0x05, 0x6f, 0x61, 0x75, 0x74, 0x68, + 0x12, 0x37, 0x0a, 0x0a, 0x62, 0x61, 0x73, 0x69, 0x63, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, + 0x6c, 0x73, 0x2e, 0x42, 0x61, 0x73, 0x69, 0x63, 0x41, 0x75, 0x74, 0x68, 0x48, 0x00, 0x52, 0x09, + 0x62, 0x61, 0x73, 0x69, 0x63, 0x41, 0x75, 0x74, 0x68, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, + 0x0c, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x12, 0x21, 0x0a, + 0x0c, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x18, 0x06, 0x20, + 0x03, 0x28, 0x09, 0x52, 0x0b, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, + 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x69, 0x65, + 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x42, 0x69, 0x6e, + 0x61, 0x72, 0x69, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x61, 0x72, + 0x63, 0x68, 0x69, 0x76, 0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x73, 0x6b, + 0x69, 0x70, 0x41, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x73, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, + 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0x83, 0x06, 0x0a, 0x06, 0x47, 0x69, 0x74, + 0x48, 0x75, 0x62, 0x12, 0x24, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x90, 0x01, 0x01, 0x52, + 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x37, 0x0a, 0x0a, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x5f, 0x61, 0x70, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, + 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x47, 0x69, 0x74, 0x48, + 0x75, 0x62, 0x41, 0x70, 0x70, 0x48, 0x00, 0x52, 0x09, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x41, + 0x70, 0x70, 0x12, 0x16, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x48, 0x00, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x48, 0x0a, 0x0f, 0x75, 0x6e, + 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, + 0x73, 0x2e, 0x55, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, + 0x64, 0x48, 0x00, 0x52, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, + 0x61, 0x74, 0x65, 0x64, 0x12, 0x37, 0x0a, 0x0a, 0x62, 0x61, 0x73, 0x69, 0x63, 0x5f, 0x61, 0x75, + 0x74, 0x68, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, + 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x42, 0x61, 0x73, 0x69, 0x63, 0x41, 0x75, 0x74, 0x68, + 0x48, 0x00, 0x52, 0x09, 0x62, 0x61, 0x73, 0x69, 0x63, 0x41, 0x75, 0x74, 0x68, 0x12, 0x22, 0x0a, + 0x0c, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x18, 0x05, 0x20, + 0x03, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x65, + 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, + 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x63, 0x61, 0x6e, 0x55, + 0x73, 0x65, 0x72, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x73, 0x63, 0x61, 0x6e, + 0x55, 0x73, 0x65, 0x72, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, + 0x46, 0x6f, 0x72, 0x6b, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69, 0x6e, 0x63, + 0x6c, 0x75, 0x64, 0x65, 0x46, 0x6f, 0x72, 0x6b, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x61, + 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x61, 0x64, 0x12, 0x12, 0x0a, + 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x62, 0x61, 0x73, + 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x70, 0x6f, + 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x52, + 0x65, 0x70, 0x6f, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, + 0x72, 0x65, 0x70, 0x6f, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x63, + 0x6c, 0x75, 0x64, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x12, 0x41, 0x0a, 0x1d, 0x69, 0x6e, 0x63, + 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x70, 0x75, 0x6c, 0x6c, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x1a, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x50, 0x75, 0x6c, 0x6c, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x34, 0x0a, 0x16, + 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x69, 0x73, 0x73, 0x75, 0x65, 0x5f, 0x63, 0x6f, + 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x69, 0x6e, + 0x63, 0x6c, 0x75, 0x64, 0x65, 0x49, 0x73, 0x73, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, + 0x74, 0x73, 0x12, 0x32, 0x0a, 0x15, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x67, 0x69, + 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x10, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x13, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x47, 0x69, 0x73, 0x74, 0x43, 0x6f, + 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x62, + 0x69, 0x6e, 0x61, 0x72, 0x69, 0x65, 0x73, 0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x73, + 0x6b, 0x69, 0x70, 0x42, 0x69, 0x6e, 0x61, 0x72, 0x69, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x73, + 0x6b, 0x69, 0x70, 0x5f, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x73, 0x18, 0x12, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x41, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x73, + 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0x42, + 0x0a, 0x0b, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x44, 0x72, 0x69, 0x76, 0x65, 0x12, 0x25, 0x0a, + 0x0d, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0c, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, + 0x6f, 0x6b, 0x65, 0x6e, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, + 0x61, 0x6c, 0x22, 0x80, 0x03, 0x0a, 0x04, 0x4a, 0x49, 0x52, 0x41, 0x12, 0x24, 0x0a, 0x08, 0x65, + 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xfa, + 0x42, 0x05, 0x72, 0x03, 0x90, 0x01, 0x01, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, + 0x74, 0x12, 0x37, 0x0a, 0x0a, 0x62, 0x61, 0x73, 0x69, 0x63, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, + 0x61, 0x6c, 0x73, 0x2e, 0x42, 0x61, 0x73, 0x69, 0x63, 0x41, 0x75, 0x74, 0x68, 0x48, 0x00, 0x52, + 0x09, 0x62, 0x61, 0x73, 0x69, 0x63, 0x41, 0x75, 0x74, 0x68, 0x12, 0x48, 0x0a, 0x0f, 0x75, 0x6e, + 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, + 0x73, 0x2e, 0x55, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, + 0x64, 0x48, 0x00, 0x52, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, + 0x61, 0x74, 0x65, 0x64, 0x12, 0x2b, 0x0a, 0x05, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, + 0x73, 0x2e, 0x4f, 0x61, 0x75, 0x74, 0x68, 0x32, 0x48, 0x00, 0x52, 0x05, 0x6f, 0x61, 0x75, 0x74, + 0x68, 0x12, 0x16, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, + 0x48, 0x00, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, + 0x6a, 0x65, 0x63, 0x74, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, + 0x6a, 0x65, 0x63, 0x74, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f, + 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, + 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x12, 0x37, + 0x0a, 0x18, 0x69, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x5f, 0x73, 0x6b, 0x69, 0x70, 0x5f, + 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x5f, 0x74, 0x6c, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x15, 0x69, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x53, 0x6b, 0x69, 0x70, 0x56, 0x65, + 0x72, 0x69, 0x66, 0x79, 0x54, 0x6c, 0x73, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, + 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0x73, 0x0a, 0x19, 0x4e, 0x50, 0x4d, 0x55, 0x6e, 0x61, 0x75, + 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x61, + 0x67, 0x65, 0x12, 0x48, 0x0a, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, + 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x72, + 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x55, 0x6e, 0x61, 0x75, 0x74, 0x68, + 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x48, 0x00, 0x52, 0x0f, 0x75, 0x6e, 0x61, + 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x42, 0x0c, 0x0a, 0x0a, + 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0x74, 0x0a, 0x1a, 0x50, 0x79, + 0x50, 0x49, 0x55, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, + 0x64, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x12, 0x48, 0x0a, 0x0f, 0x75, 0x6e, 0x61, 0x75, + 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x55, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x48, 0x00, 0x52, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, - 0x65, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x18, 0x04, - 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x12, 0x23, - 0x0a, 0x0d, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x69, 0x65, 0x73, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x42, 0x69, 0x6e, 0x61, 0x72, - 0x69, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x61, 0x72, 0x63, 0x68, - 0x69, 0x76, 0x65, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x73, 0x6b, 0x69, 0x70, - 0x41, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x73, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, - 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0xde, 0x01, 0x0a, 0x07, 0x4a, 0x65, 0x6e, 0x6b, 0x69, - 0x6e, 0x73, 0x12, 0x24, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x90, 0x01, 0x01, 0x52, 0x08, - 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x37, 0x0a, 0x0a, 0x62, 0x61, 0x73, 0x69, - 0x63, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x63, - 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x42, 0x61, 0x73, 0x69, 0x63, - 0x41, 0x75, 0x74, 0x68, 0x48, 0x00, 0x52, 0x09, 0x62, 0x61, 0x73, 0x69, 0x63, 0x41, 0x75, 0x74, - 0x68, 0x12, 0x2d, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x13, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, - 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, - 0x12, 0x37, 0x0a, 0x18, 0x69, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x5f, 0x73, 0x6b, 0x69, - 0x70, 0x5f, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x5f, 0x74, 0x6c, 0x73, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x15, 0x69, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x53, 0x6b, 0x69, 0x70, - 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x54, 0x6c, 0x73, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, - 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0xa0, 0x02, 0x0a, 0x05, 0x54, 0x65, 0x61, 0x6d, - 0x73, 0x12, 0x24, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x90, 0x01, 0x01, 0x52, 0x08, 0x65, - 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, - 0x46, 0x0a, 0x0d, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, - 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x72, 0x65, 0x64, 0x65, - 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x48, 0x00, 0x52, 0x0d, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, - 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x2b, 0x0a, 0x05, 0x6f, 0x61, 0x75, 0x74, 0x68, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, - 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x4f, 0x61, 0x75, 0x74, 0x68, 0x32, 0x48, 0x00, 0x52, 0x05, 0x6f, - 0x61, 0x75, 0x74, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x73, - 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x73, - 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x18, - 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x4c, 0x69, 0x73, - 0x74, 0x12, 0x19, 0x0a, 0x08, 0x74, 0x65, 0x61, 0x6d, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x06, 0x20, - 0x03, 0x28, 0x09, 0x52, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x49, 0x64, 0x73, 0x42, 0x0c, 0x0a, 0x0a, - 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0x95, 0x01, 0x0a, 0x06, 0x53, - 0x79, 0x73, 0x6c, 0x6f, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, - 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, - 0x6c, 0x12, 0x25, 0x0a, 0x0e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x5f, 0x61, 0x64, 0x64, 0x72, - 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6c, 0x69, 0x73, 0x74, 0x65, - 0x6e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x6c, 0x73, 0x43, - 0x65, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x6c, 0x73, 0x43, 0x65, - 0x72, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x6c, 0x73, 0x4b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x74, 0x6c, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, - 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, - 0x61, 0x74, 0x22, 0xd6, 0x01, 0x0a, 0x15, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x45, 0x76, 0x65, - 0x6e, 0x74, 0x4d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x48, 0x0a, 0x0f, - 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, - 0x61, 0x6c, 0x73, 0x2e, 0x55, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, - 0x74, 0x65, 0x64, 0x48, 0x00, 0x52, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, - 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1b, - 0x0a, 0x09, 0x6d, 0x61, 0x78, 0x5f, 0x64, 0x65, 0x70, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x44, 0x65, 0x70, 0x74, 0x68, 0x12, 0x30, 0x0a, 0x05, 0x73, - 0x69, 0x6e, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, - 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x42, 0x0c, 0x0a, - 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0x51, 0x0a, 0x0d, 0x53, - 0x6c, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x61, 0x6c, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x32, 0x0a, 0x06, - 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, - 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x53, 0x6c, 0x61, 0x63, 0x6b, - 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x48, 0x00, 0x52, 0x06, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, - 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0x62, - 0x0a, 0x0a, 0x53, 0x68, 0x61, 0x72, 0x65, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x2b, 0x0a, 0x05, - 0x6f, 0x61, 0x75, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x63, 0x72, + 0x65, 0x64, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, + 0x22, 0x86, 0x03, 0x0a, 0x02, 0x53, 0x33, 0x12, 0x37, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73, + 0x73, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x63, 0x72, + 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x4b, 0x65, 0x79, 0x53, 0x65, 0x63, + 0x72, 0x65, 0x74, 0x48, 0x00, 0x52, 0x09, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4b, 0x65, 0x79, + 0x12, 0x48, 0x0a, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, + 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x72, 0x65, 0x64, + 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x55, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, + 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x48, 0x00, 0x52, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, + 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x4c, 0x0a, 0x11, 0x63, 0x6c, + 0x6f, 0x75, 0x64, 0x5f, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, + 0x61, 0x6c, 0x73, 0x2e, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, + 0x6d, 0x65, 0x6e, 0x74, 0x48, 0x00, 0x52, 0x10, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x45, 0x6e, 0x76, + 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x49, 0x0a, 0x0d, 0x73, 0x65, 0x73, 0x73, + 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x22, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x41, 0x57, + 0x53, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x53, 0x65, 0x63, + 0x72, 0x65, 0x74, 0x48, 0x00, 0x52, 0x0c, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x6f, + 0x6b, 0x65, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x18, 0x03, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x62, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x12, 0x26, 0x0a, + 0x0f, 0x6d, 0x61, 0x78, 0x5f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x73, 0x69, 0x7a, 0x65, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x6d, 0x61, 0x78, 0x4f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x18, 0x07, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x42, 0x0c, 0x0a, 0x0a, 0x63, + 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0xc4, 0x01, 0x0a, 0x05, 0x53, 0x6c, + 0x61, 0x63, 0x6b, 0x12, 0x24, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x90, 0x01, 0x01, 0x52, + 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x05, 0x74, 0x6f, 0x6b, + 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, + 0x6e, 0x12, 0x32, 0x0a, 0x06, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, + 0x53, 0x6c, 0x61, 0x63, 0x6b, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x48, 0x00, 0x52, 0x06, 0x74, + 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, + 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, + 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f, 0x6c, 0x69, 0x73, 0x74, + 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x4c, 0x69, + 0x73, 0x74, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, + 0x22, 0x06, 0x0a, 0x04, 0x54, 0x65, 0x73, 0x74, 0x22, 0x31, 0x0a, 0x09, 0x42, 0x75, 0x69, 0x6c, + 0x64, 0x6b, 0x69, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x42, 0x0c, 0x0a, + 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0xa5, 0x02, 0x0a, 0x06, + 0x47, 0x65, 0x72, 0x72, 0x69, 0x74, 0x12, 0x24, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, + 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x90, + 0x01, 0x01, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x37, 0x0a, 0x0a, + 0x62, 0x61, 0x73, 0x69, 0x63, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x16, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x42, + 0x61, 0x73, 0x69, 0x63, 0x41, 0x75, 0x74, 0x68, 0x48, 0x00, 0x52, 0x09, 0x62, 0x61, 0x73, 0x69, + 0x63, 0x41, 0x75, 0x74, 0x68, 0x12, 0x48, 0x0a, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, + 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, + 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x55, 0x6e, 0x61, + 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x48, 0x00, 0x52, 0x0f, + 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, + 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, + 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x73, + 0x6b, 0x69, 0x70, 0x5f, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x69, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x42, 0x69, 0x6e, 0x61, 0x72, 0x69, 0x65, 0x73, + 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, + 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x41, 0x72, 0x63, + 0x68, 0x69, 0x76, 0x65, 0x73, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, + 0x69, 0x61, 0x6c, 0x22, 0xde, 0x01, 0x0a, 0x07, 0x4a, 0x65, 0x6e, 0x6b, 0x69, 0x6e, 0x73, 0x12, + 0x24, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x90, 0x01, 0x01, 0x52, 0x08, 0x65, 0x6e, 0x64, + 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x37, 0x0a, 0x0a, 0x62, 0x61, 0x73, 0x69, 0x63, 0x5f, 0x61, + 0x75, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x63, 0x72, 0x65, 0x64, + 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x42, 0x61, 0x73, 0x69, 0x63, 0x41, 0x75, 0x74, + 0x68, 0x48, 0x00, 0x52, 0x09, 0x62, 0x61, 0x73, 0x69, 0x63, 0x41, 0x75, 0x74, 0x68, 0x12, 0x2d, + 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, + 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x48, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x37, 0x0a, + 0x18, 0x69, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x5f, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x76, + 0x65, 0x72, 0x69, 0x66, 0x79, 0x5f, 0x74, 0x6c, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x15, 0x69, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x53, 0x6b, 0x69, 0x70, 0x56, 0x65, 0x72, + 0x69, 0x66, 0x79, 0x54, 0x6c, 0x73, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, + 0x74, 0x69, 0x61, 0x6c, 0x22, 0xa0, 0x02, 0x0a, 0x05, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x12, 0x24, + 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x42, 0x08, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x90, 0x01, 0x01, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, + 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x46, 0x0a, 0x0d, + 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, + 0x73, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, + 0x61, 0x6c, 0x73, 0x48, 0x00, 0x52, 0x0d, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, + 0x61, 0x74, 0x65, 0x64, 0x12, 0x2b, 0x0a, 0x05, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, + 0x73, 0x2e, 0x4f, 0x61, 0x75, 0x74, 0x68, 0x32, 0x48, 0x00, 0x52, 0x05, 0x6f, 0x61, 0x75, 0x74, + 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x73, 0x18, 0x04, 0x20, + 0x03, 0x28, 0x09, 0x52, 0x08, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x73, 0x12, 0x1f, 0x0a, + 0x0b, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x05, 0x20, 0x03, + 0x28, 0x09, 0x52, 0x0a, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x19, + 0x0a, 0x08, 0x74, 0x65, 0x61, 0x6d, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, + 0x52, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x49, 0x64, 0x73, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, + 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0x95, 0x01, 0x0a, 0x06, 0x53, 0x79, 0x73, 0x6c, + 0x6f, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x25, + 0x0a, 0x0e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x41, 0x64, + 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x6c, 0x73, 0x43, 0x65, 0x72, 0x74, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x6c, 0x73, 0x43, 0x65, 0x72, 0x74, 0x12, + 0x16, 0x0a, 0x06, 0x74, 0x6c, 0x73, 0x4b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x06, 0x74, 0x6c, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, + 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, + 0xd6, 0x01, 0x0a, 0x15, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x4d, + 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x48, 0x0a, 0x0f, 0x75, 0x6e, 0x61, + 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, + 0x2e, 0x55, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, + 0x48, 0x00, 0x52, 0x0f, 0x75, 0x6e, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, + 0x74, 0x65, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1b, 0x0a, 0x09, 0x6d, + 0x61, 0x78, 0x5f, 0x64, 0x65, 0x70, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, + 0x6d, 0x61, 0x78, 0x44, 0x65, 0x70, 0x74, 0x68, 0x12, 0x30, 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x63, + 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, + 0x61, 0x6d, 0x70, 0x52, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, + 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0x51, 0x0a, 0x0d, 0x53, 0x6c, 0x61, 0x63, + 0x6b, 0x52, 0x65, 0x61, 0x6c, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x32, 0x0a, 0x06, 0x74, 0x6f, 0x6b, + 0x65, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x72, 0x65, 0x64, + 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x53, 0x6c, 0x61, 0x63, 0x6b, 0x54, 0x6f, 0x6b, + 0x65, 0x6e, 0x73, 0x48, 0x00, 0x52, 0x06, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x42, 0x0c, 0x0a, + 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, 0x62, 0x0a, 0x0a, 0x53, + 0x68, 0x61, 0x72, 0x65, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x2b, 0x0a, 0x05, 0x6f, 0x61, 0x75, + 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, + 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x4f, 0x61, 0x75, 0x74, 0x68, 0x32, 0x48, 0x00, 0x52, + 0x05, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x69, 0x74, 0x65, 0x5f, 0x75, + 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x69, 0x74, 0x65, 0x55, 0x72, + 0x6c, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x22, + 0xf6, 0x03, 0x0a, 0x0a, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x12, 0x24, + 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x42, 0x08, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x90, 0x01, 0x01, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, + 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x2b, 0x0a, 0x05, + 0x6f, 0x61, 0x75, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x4f, 0x61, 0x75, 0x74, 0x68, 0x32, - 0x48, 0x00, 0x52, 0x05, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x69, 0x74, - 0x65, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x69, 0x74, - 0x65, 0x55, 0x72, 0x6c, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, - 0x61, 0x6c, 0x22, 0xf6, 0x03, 0x0a, 0x0a, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x52, 0x65, 0x70, 0x6f, - 0x73, 0x12, 0x24, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x90, 0x01, 0x01, 0x52, 0x08, 0x65, - 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, - 0x2b, 0x0a, 0x05, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, - 0x2e, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x2e, 0x4f, 0x61, 0x75, - 0x74, 0x68, 0x32, 0x48, 0x00, 0x52, 0x05, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x12, 0x22, 0x0a, 0x0c, - 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, - 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, - 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, - 0x74, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, - 0x74, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x66, 0x6f, - 0x72, 0x6b, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69, 0x6e, 0x63, 0x6c, 0x75, - 0x64, 0x65, 0x46, 0x6f, 0x72, 0x6b, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x67, 0x6e, 0x6f, 0x72, - 0x65, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x69, - 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, - 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, - 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x12, - 0x29, 0x0a, 0x10, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x6a, 0x65, - 0x63, 0x74, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0f, 0x69, 0x6e, 0x63, 0x6c, 0x75, - 0x64, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x69, 0x67, - 0x6e, 0x6f, 0x72, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x18, 0x0b, 0x20, - 0x03, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, - 0x63, 0x74, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x62, 0x69, 0x6e, 0x61, - 0x72, 0x69, 0x65, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x73, 0x6b, 0x69, 0x70, - 0x42, 0x69, 0x6e, 0x61, 0x72, 0x69, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6b, 0x69, 0x70, - 0x5f, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x41, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x73, 0x42, 0x0c, 0x0a, - 0x0a, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x2a, 0x9e, 0x07, 0x0a, 0x0a, - 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1d, 0x0a, 0x19, 0x53, 0x4f, - 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x41, 0x5a, 0x55, 0x52, 0x45, 0x5f, - 0x53, 0x54, 0x4f, 0x52, 0x41, 0x47, 0x45, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x53, 0x4f, 0x55, - 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x42, 0x49, 0x54, 0x42, 0x55, 0x43, 0x4b, - 0x45, 0x54, 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, - 0x59, 0x50, 0x45, 0x5f, 0x43, 0x49, 0x52, 0x43, 0x4c, 0x45, 0x43, 0x49, 0x10, 0x02, 0x12, 0x1a, - 0x0a, 0x16, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, 0x4f, - 0x4e, 0x46, 0x4c, 0x55, 0x45, 0x4e, 0x43, 0x45, 0x10, 0x03, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x4f, - 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x4f, 0x43, 0x4b, 0x45, 0x52, - 0x10, 0x04, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, - 0x45, 0x5f, 0x45, 0x43, 0x52, 0x10, 0x05, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x4f, 0x55, 0x52, 0x43, - 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x43, 0x53, 0x10, 0x06, 0x12, 0x16, 0x0a, 0x12, - 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x49, 0x54, 0x48, - 0x55, 0x42, 0x10, 0x07, 0x12, 0x1a, 0x0a, 0x16, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, - 0x59, 0x50, 0x45, 0x5f, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x5f, 0x47, 0x49, 0x54, 0x10, 0x08, - 0x12, 0x16, 0x0a, 0x12, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, - 0x47, 0x49, 0x54, 0x4c, 0x41, 0x42, 0x10, 0x09, 0x12, 0x14, 0x0a, 0x10, 0x53, 0x4f, 0x55, 0x52, - 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4a, 0x49, 0x52, 0x41, 0x10, 0x0a, 0x12, 0x24, - 0x0a, 0x20, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4e, 0x50, - 0x4d, 0x5f, 0x55, 0x4e, 0x41, 0x55, 0x54, 0x48, 0x44, 0x5f, 0x50, 0x41, 0x43, 0x4b, 0x41, 0x47, - 0x45, 0x53, 0x10, 0x0b, 0x12, 0x25, 0x0a, 0x21, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, - 0x59, 0x50, 0x45, 0x5f, 0x50, 0x59, 0x50, 0x49, 0x5f, 0x55, 0x4e, 0x41, 0x55, 0x54, 0x48, 0x44, - 0x5f, 0x50, 0x41, 0x43, 0x4b, 0x41, 0x47, 0x45, 0x53, 0x10, 0x0c, 0x12, 0x12, 0x0a, 0x0e, 0x53, - 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x33, 0x10, 0x0d, 0x12, - 0x15, 0x0a, 0x11, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, - 0x4c, 0x41, 0x43, 0x4b, 0x10, 0x0e, 0x12, 0x1a, 0x0a, 0x16, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, - 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x49, 0x4c, 0x45, 0x53, 0x59, 0x53, 0x54, 0x45, 0x4d, - 0x10, 0x0f, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, - 0x45, 0x5f, 0x47, 0x49, 0x54, 0x10, 0x10, 0x12, 0x14, 0x0a, 0x10, 0x53, 0x4f, 0x55, 0x52, 0x43, - 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x54, 0x45, 0x53, 0x54, 0x10, 0x11, 0x12, 0x1b, 0x0a, - 0x17, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x33, 0x5f, - 0x55, 0x4e, 0x41, 0x55, 0x54, 0x48, 0x45, 0x44, 0x10, 0x12, 0x12, 0x2a, 0x0a, 0x26, 0x53, 0x4f, - 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x49, 0x54, 0x48, 0x55, 0x42, - 0x5f, 0x55, 0x4e, 0x41, 0x55, 0x54, 0x48, 0x45, 0x4e, 0x54, 0x49, 0x43, 0x41, 0x54, 0x45, 0x44, - 0x5f, 0x4f, 0x52, 0x47, 0x10, 0x13, 0x12, 0x19, 0x0a, 0x15, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, - 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x42, 0x55, 0x49, 0x4c, 0x44, 0x4b, 0x49, 0x54, 0x45, 0x10, - 0x14, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, - 0x5f, 0x47, 0x45, 0x52, 0x52, 0x49, 0x54, 0x10, 0x15, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x4f, 0x55, - 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4a, 0x45, 0x4e, 0x4b, 0x49, 0x4e, 0x53, - 0x10, 0x16, 0x12, 0x15, 0x0a, 0x11, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, - 0x45, 0x5f, 0x54, 0x45, 0x41, 0x4d, 0x53, 0x10, 0x17, 0x12, 0x21, 0x0a, 0x1d, 0x53, 0x4f, 0x55, - 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4a, 0x46, 0x52, 0x4f, 0x47, 0x5f, 0x41, - 0x52, 0x54, 0x49, 0x46, 0x41, 0x43, 0x54, 0x4f, 0x52, 0x59, 0x10, 0x18, 0x12, 0x16, 0x0a, 0x12, - 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x59, 0x53, 0x4c, - 0x4f, 0x47, 0x10, 0x19, 0x12, 0x27, 0x0a, 0x23, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, - 0x59, 0x50, 0x45, 0x5f, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, - 0x5f, 0x4d, 0x4f, 0x4e, 0x49, 0x54, 0x4f, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x1a, 0x12, 0x1e, 0x0a, - 0x1a, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x4c, 0x41, - 0x43, 0x4b, 0x5f, 0x52, 0x45, 0x41, 0x4c, 0x54, 0x49, 0x4d, 0x45, 0x10, 0x1b, 0x12, 0x1c, 0x0a, - 0x18, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x4f, 0x4f, - 0x47, 0x4c, 0x45, 0x5f, 0x44, 0x52, 0x49, 0x56, 0x45, 0x10, 0x1c, 0x12, 0x1a, 0x0a, 0x16, 0x53, - 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x48, 0x41, 0x52, 0x45, - 0x50, 0x4f, 0x49, 0x4e, 0x54, 0x10, 0x1d, 0x12, 0x1c, 0x0a, 0x18, 0x53, 0x4f, 0x55, 0x52, 0x43, - 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x43, 0x53, 0x5f, 0x55, 0x4e, 0x41, 0x55, 0x54, - 0x48, 0x45, 0x44, 0x10, 0x1e, 0x12, 0x1b, 0x0a, 0x17, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, - 0x54, 0x59, 0x50, 0x45, 0x5f, 0x41, 0x5a, 0x55, 0x52, 0x45, 0x5f, 0x52, 0x45, 0x50, 0x4f, 0x53, - 0x10, 0x1f, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, - 0x45, 0x5f, 0x54, 0x52, 0x41, 0x56, 0x49, 0x53, 0x43, 0x49, 0x10, 0x20, 0x42, 0x3b, 0x5a, 0x39, - 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x74, 0x72, 0x75, 0x66, 0x66, - 0x6c, 0x65, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2f, 0x74, 0x72, 0x75, 0x66, 0x66, - 0x6c, 0x65, 0x68, 0x6f, 0x67, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x62, 0x2f, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x48, 0x00, 0x52, 0x05, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, + 0x0c, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x12, 0x24, 0x0a, + 0x0d, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x05, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x18, + 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x12, + 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x66, 0x6f, 0x72, 0x6b, 0x73, + 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x46, + 0x6f, 0x72, 0x6b, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f, 0x72, + 0x65, 0x70, 0x6f, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x69, 0x67, 0x6e, 0x6f, + 0x72, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75, + 0x64, 0x65, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, + 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x12, 0x29, 0x0a, 0x10, + 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, + 0x18, 0x0a, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0f, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x50, + 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x69, 0x67, 0x6e, 0x6f, 0x72, + 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x09, + 0x52, 0x0e, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x73, + 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x69, 0x65, + 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x42, 0x69, 0x6e, + 0x61, 0x72, 0x69, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x61, 0x72, + 0x63, 0x68, 0x69, 0x76, 0x65, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x73, 0x6b, + 0x69, 0x70, 0x41, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x73, 0x42, 0x0c, 0x0a, 0x0a, 0x63, 0x72, + 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x2a, 0x9e, 0x07, 0x0a, 0x0a, 0x53, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1d, 0x0a, 0x19, 0x53, 0x4f, 0x55, 0x52, 0x43, + 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x41, 0x5a, 0x55, 0x52, 0x45, 0x5f, 0x53, 0x54, 0x4f, + 0x52, 0x41, 0x47, 0x45, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, + 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x42, 0x49, 0x54, 0x42, 0x55, 0x43, 0x4b, 0x45, 0x54, 0x10, + 0x01, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, + 0x5f, 0x43, 0x49, 0x52, 0x43, 0x4c, 0x45, 0x43, 0x49, 0x10, 0x02, 0x12, 0x1a, 0x0a, 0x16, 0x53, + 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, 0x4f, 0x4e, 0x46, 0x4c, + 0x55, 0x45, 0x4e, 0x43, 0x45, 0x10, 0x03, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x4f, 0x55, 0x52, 0x43, + 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x4f, 0x43, 0x4b, 0x45, 0x52, 0x10, 0x04, 0x12, + 0x13, 0x0a, 0x0f, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, + 0x43, 0x52, 0x10, 0x05, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, + 0x59, 0x50, 0x45, 0x5f, 0x47, 0x43, 0x53, 0x10, 0x06, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x4f, 0x55, + 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x49, 0x54, 0x48, 0x55, 0x42, 0x10, + 0x07, 0x12, 0x1a, 0x0a, 0x16, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, + 0x5f, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x5f, 0x47, 0x49, 0x54, 0x10, 0x08, 0x12, 0x16, 0x0a, + 0x12, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x49, 0x54, + 0x4c, 0x41, 0x42, 0x10, 0x09, 0x12, 0x14, 0x0a, 0x10, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, + 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4a, 0x49, 0x52, 0x41, 0x10, 0x0a, 0x12, 0x24, 0x0a, 0x20, 0x53, + 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4e, 0x50, 0x4d, 0x5f, 0x55, + 0x4e, 0x41, 0x55, 0x54, 0x48, 0x44, 0x5f, 0x50, 0x41, 0x43, 0x4b, 0x41, 0x47, 0x45, 0x53, 0x10, + 0x0b, 0x12, 0x25, 0x0a, 0x21, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, + 0x5f, 0x50, 0x59, 0x50, 0x49, 0x5f, 0x55, 0x4e, 0x41, 0x55, 0x54, 0x48, 0x44, 0x5f, 0x50, 0x41, + 0x43, 0x4b, 0x41, 0x47, 0x45, 0x53, 0x10, 0x0c, 0x12, 0x12, 0x0a, 0x0e, 0x53, 0x4f, 0x55, 0x52, + 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x33, 0x10, 0x0d, 0x12, 0x15, 0x0a, 0x11, + 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x4c, 0x41, 0x43, + 0x4b, 0x10, 0x0e, 0x12, 0x1a, 0x0a, 0x16, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, + 0x50, 0x45, 0x5f, 0x46, 0x49, 0x4c, 0x45, 0x53, 0x59, 0x53, 0x54, 0x45, 0x4d, 0x10, 0x0f, 0x12, + 0x13, 0x0a, 0x0f, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, + 0x49, 0x54, 0x10, 0x10, 0x12, 0x14, 0x0a, 0x10, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, + 0x59, 0x50, 0x45, 0x5f, 0x54, 0x45, 0x53, 0x54, 0x10, 0x11, 0x12, 0x1b, 0x0a, 0x17, 0x53, 0x4f, + 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x33, 0x5f, 0x55, 0x4e, 0x41, + 0x55, 0x54, 0x48, 0x45, 0x44, 0x10, 0x12, 0x12, 0x2a, 0x0a, 0x26, 0x53, 0x4f, 0x55, 0x52, 0x43, + 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x49, 0x54, 0x48, 0x55, 0x42, 0x5f, 0x55, 0x4e, + 0x41, 0x55, 0x54, 0x48, 0x45, 0x4e, 0x54, 0x49, 0x43, 0x41, 0x54, 0x45, 0x44, 0x5f, 0x4f, 0x52, + 0x47, 0x10, 0x13, 0x12, 0x19, 0x0a, 0x15, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, + 0x50, 0x45, 0x5f, 0x42, 0x55, 0x49, 0x4c, 0x44, 0x4b, 0x49, 0x54, 0x45, 0x10, 0x14, 0x12, 0x16, + 0x0a, 0x12, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x45, + 0x52, 0x52, 0x49, 0x54, 0x10, 0x15, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, + 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4a, 0x45, 0x4e, 0x4b, 0x49, 0x4e, 0x53, 0x10, 0x16, 0x12, + 0x15, 0x0a, 0x11, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x54, + 0x45, 0x41, 0x4d, 0x53, 0x10, 0x17, 0x12, 0x21, 0x0a, 0x1d, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, + 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4a, 0x46, 0x52, 0x4f, 0x47, 0x5f, 0x41, 0x52, 0x54, 0x49, + 0x46, 0x41, 0x43, 0x54, 0x4f, 0x52, 0x59, 0x10, 0x18, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x4f, 0x55, + 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x59, 0x53, 0x4c, 0x4f, 0x47, 0x10, + 0x19, 0x12, 0x27, 0x0a, 0x23, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, + 0x5f, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x4d, 0x4f, + 0x4e, 0x49, 0x54, 0x4f, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x1a, 0x12, 0x1e, 0x0a, 0x1a, 0x53, 0x4f, + 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x4c, 0x41, 0x43, 0x4b, 0x5f, + 0x52, 0x45, 0x41, 0x4c, 0x54, 0x49, 0x4d, 0x45, 0x10, 0x1b, 0x12, 0x1c, 0x0a, 0x18, 0x53, 0x4f, + 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x4f, 0x4f, 0x47, 0x4c, 0x45, + 0x5f, 0x44, 0x52, 0x49, 0x56, 0x45, 0x10, 0x1c, 0x12, 0x1a, 0x0a, 0x16, 0x53, 0x4f, 0x55, 0x52, + 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x48, 0x41, 0x52, 0x45, 0x50, 0x4f, 0x49, + 0x4e, 0x54, 0x10, 0x1d, 0x12, 0x1c, 0x0a, 0x18, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, + 0x59, 0x50, 0x45, 0x5f, 0x47, 0x43, 0x53, 0x5f, 0x55, 0x4e, 0x41, 0x55, 0x54, 0x48, 0x45, 0x44, + 0x10, 0x1e, 0x12, 0x1b, 0x0a, 0x17, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, + 0x45, 0x5f, 0x41, 0x5a, 0x55, 0x52, 0x45, 0x5f, 0x52, 0x45, 0x50, 0x4f, 0x53, 0x10, 0x1f, 0x12, + 0x18, 0x0a, 0x14, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x54, + 0x52, 0x41, 0x56, 0x49, 0x53, 0x43, 0x49, 0x10, 0x20, 0x42, 0x3b, 0x5a, 0x39, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x74, 0x72, 0x75, 0x66, 0x66, 0x6c, 0x65, 0x73, + 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2f, 0x74, 0x72, 0x75, 0x66, 0x66, 0x6c, 0x65, 0x68, + 0x6f, 0x67, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x62, 0x2f, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x73, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/pb/sourcespb/sources.pb.validate.go b/pkg/pb/sourcespb/sources.pb.validate.go index 8c67676e2..64dbc6e12 100644 --- a/pkg/pb/sourcespb/sources.pb.validate.go +++ b/pkg/pb/sourcespb/sources.pb.validate.go @@ -1484,6 +1484,10 @@ func (m *Filesystem) validate(all bool) error { var errors []error + // no validation rules for IncludePathsFile + + // no validation rules for ExcludePathsFile + if len(errors) > 0 { return FilesystemMultiError(errors) } diff --git a/pkg/sources/filesystem/filesystem.go b/pkg/sources/filesystem/filesystem.go index 2bb4fc3ef..5f47ffa47 100644 --- a/pkg/sources/filesystem/filesystem.go +++ b/pkg/sources/filesystem/filesystem.go @@ -71,11 +71,13 @@ func (s *Source) Init(aCtx context.Context, name string, jobId sources.JobID, so } s.paths = append(conn.Paths, conn.Directories...) - return nil -} - -func (s *Source) WithFilter(filter *common.Filter) { + filter, err := common.FilterFromFiles(conn.IncludePathsFile, conn.ExcludePathsFile) + if err != nil { + return fmt.Errorf("unable to create filter: %w", err) + } s.filter = filter + + return nil } // Chunks emits chunks of bytes over a channel. diff --git a/pkg/sources/sources.go b/pkg/sources/sources.go index c6ab88f7e..aa1c29341 100644 --- a/pkg/sources/sources.go +++ b/pkg/sources/sources.go @@ -230,8 +230,10 @@ type GitlabConfig struct { type FilesystemConfig struct { // Paths is the list of files and directories to scan. Paths []string - // Filter is the filter to use to scan the source. - Filter *common.Filter + // IncludePathsFile is the path to a file containing a list of regexps to include in the scan. + IncludePathsFile string + // ExcludePathsFile is the path to a file containing a list of regexps to exclude from the scan. + ExcludePathsFile string } // S3Config defines the optional configuration for an S3 source. diff --git a/proto/sources.proto b/proto/sources.proto index de724990e..94fb6a3fc 100644 --- a/proto/sources.proto +++ b/proto/sources.proto @@ -157,6 +157,8 @@ message Filesystem { // paths when we no longer depend on the name in enterprise configs. repeated string directories = 1; repeated string paths = 2; + string include_paths_file = 3; // path to file containing newline separated list of paths + string exclude_paths_file = 4; // path to file containing newline separated list of paths } message GCS { From b03cc302630ead9afbce8c16c74bf2c29123c0c1 Mon Sep 17 00:00:00 2001 From: Cody Rose Date: Fri, 12 Jan 2024 09:39:48 -0500 Subject: [PATCH 11/35] Individuate archive tests #2293 --- pkg/handlers/archive_test.go | 60 +++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/pkg/handlers/archive_test.go b/pkg/handlers/archive_test.go index fce7d138e..de2ed3fbf 100644 --- a/pkg/handlers/archive_test.go +++ b/pkg/handlers/archive_test.go @@ -76,36 +76,38 @@ func TestArchiveHandler(t *testing.T) { } for name, testCase := range tests { - resp, err := http.Get(testCase.archiveURL) - if err != nil || resp.StatusCode != http.StatusOK { - t.Error(err) - } - defer resp.Body.Close() - - archive := Archive{} - archive.New() - - newReader, err := diskbufferreader.New(resp.Body) - if err != nil { - t.Errorf("error creating reusable reader: %s", err) - } - archiveChan := archive.FromFile(logContext.Background(), newReader) - - count := 0 - re := regexp.MustCompile(testCase.matchString) - matched := false - for chunk := range archiveChan { - count++ - if re.Match(chunk) { - matched = true + t.Run(name, func(t *testing.T) { + resp, err := http.Get(testCase.archiveURL) + if err != nil || resp.StatusCode != http.StatusOK { + t.Error(err) } - } - if !matched && len(testCase.matchString) > 0 { - t.Errorf("%s: Expected string not found in archive.", name) - } - if count != testCase.expectedChunks { - t.Errorf("%s: Unexpected number of chunks. Got %d, expected: %d", name, count, testCase.expectedChunks) - } + defer resp.Body.Close() + + archive := Archive{} + archive.New() + + newReader, err := diskbufferreader.New(resp.Body) + if err != nil { + t.Errorf("error creating reusable reader: %s", err) + } + archiveChan := archive.FromFile(logContext.Background(), newReader) + + count := 0 + re := regexp.MustCompile(testCase.matchString) + matched := false + for chunk := range archiveChan { + count++ + if re.Match(chunk) { + matched = true + } + } + if !matched && len(testCase.matchString) > 0 { + t.Errorf("%s: Expected string not found in archive.", name) + } + if count != testCase.expectedChunks { + t.Errorf("%s: Unexpected number of chunks. Got %d, expected: %d", name, count, testCase.expectedChunks) + } + }) } } From d0c0ba43deeb062058973d70a699366dd1852fad Mon Sep 17 00:00:00 2001 From: ahrav Date: Sat, 13 Jan 2024 16:52:41 -0800 Subject: [PATCH 12/35] [feat] - Provide CLI flag to only use custom verifiers (#2299) * Provide CLI flag to only use custom verifiers * address comments --- main.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index be1f3df96..ff1651c78 100644 --- a/main.go +++ b/main.go @@ -57,6 +57,7 @@ var ( noUpdate = cli.Flag("no-update", "Don't check for updates.").Bool() fail = cli.Flag("fail", "Exit with code 183 if results are found.").Bool() verifiers = cli.Flag("verifier", "Set custom verification endpoints.").StringMap() + customVerifiersOnly = cli.Flag("custom-verifiers-only", "Only use custom verification endpoints.").Bool() archiveMaxSize = cli.Flag("archive-max-size", "Maximum size of archive to scan. (Byte units eg. 512B, 2KB, 4MB)").Bytes() archiveMaxDepth = cli.Flag("archive-max-depth", "Maximum depth of archive to scan.").Int() archiveTimeout = cli.Flag("archive-timeout", "Maximum time to spend extracting an archive.").Duration() @@ -365,8 +366,9 @@ func run(state overseer.State) { "detector", id, ) } - // TODO: Add flag to ignore the default endpoint. - urls = append(urls, customizer.DefaultEndpoint()) + if !*customVerifiersOnly || len(urls) == 0 { + urls = append(urls, customizer.DefaultEndpoint()) + } if err := customizer.SetEndpoints(urls...); err != nil { logFatal(err, "failed configuring custom endpoint for detector", "detector", id) } From 2596331bca732e5d8b03bc9a827a5e732e40c457 Mon Sep 17 00:00:00 2001 From: Dustin Decker Date: Sat, 13 Jan 2024 19:52:57 -0800 Subject: [PATCH 13/35] Disable recently added postgres detector because it it too sensitive (#2303) --- pkg/engine/defaults.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/engine/defaults.go b/pkg/engine/defaults.go index 16682b867..0cd901ab9 100644 --- a/pkg/engine/defaults.go +++ b/pkg/engine/defaults.go @@ -524,7 +524,6 @@ import ( "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/positionstack" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/postageapp" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/postbacks" - "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/postgres" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/posthog" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/postman" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/postmark" @@ -1497,7 +1496,8 @@ func DefaultDetectors() []detectors.Detector { speechtextai.Scanner{}, databox.Scanner{}, postbacks.Scanner{}, - postgres.Scanner{}, + // Too noisy, needs attention + // postgres.Scanner{}, collect2.Scanner{}, uclassify.Scanner{}, holistic.Scanner{}, From d6419a8ab2beb5a331473b1cc67f8f7de99cdd92 Mon Sep 17 00:00:00 2001 From: roxanne-tampus <51393035+roxanne-tampus@users.noreply.github.com> Date: Mon, 15 Jan 2024 22:59:47 +0800 Subject: [PATCH 14/35] added azure protos (#2304) --- pkg/pb/detectorspb/detectors.pb.go | 2198 ++++++++++++++-------------- proto/detectors.proto | 11 + 2 files changed, 1137 insertions(+), 1072 deletions(-) diff --git a/pkg/pb/detectorspb/detectors.pb.go b/pkg/pb/detectorspb/detectors.pb.go index 03c132ce0..7cc1dde84 100644 --- a/pkg/pb/detectorspb/detectors.pb.go +++ b/pkg/pb/detectorspb/detectors.pb.go @@ -954,106 +954,117 @@ const ( DetectorType_Besnappy DetectorType = 867 DetectorType_Salesmate DetectorType = 868 // Deprecated: Do not use. - DetectorType_Heatmapapi DetectorType = 869 - DetectorType_Websitepulse DetectorType = 870 - DetectorType_Uclassify DetectorType = 871 - DetectorType_Convert DetectorType = 872 - DetectorType_PDFmyURL DetectorType = 873 - DetectorType_Api2Convert DetectorType = 874 - DetectorType_Opsgenie DetectorType = 875 - DetectorType_Gemini DetectorType = 876 - DetectorType_Honeycomb DetectorType = 877 - DetectorType_KalturaAppToken DetectorType = 878 - DetectorType_KalturaSession DetectorType = 879 - DetectorType_BitGo DetectorType = 880 - DetectorType_Optidash DetectorType = 881 - DetectorType_Imgix DetectorType = 882 - DetectorType_ImageToText DetectorType = 883 - DetectorType_Page2Images DetectorType = 884 - DetectorType_Quickbase DetectorType = 885 - DetectorType_Redbooth DetectorType = 886 - DetectorType_Nubela DetectorType = 887 - DetectorType_Infobip DetectorType = 888 - DetectorType_Uproc DetectorType = 889 - DetectorType_Supportbee DetectorType = 890 - DetectorType_Aftership DetectorType = 891 - DetectorType_Edusign DetectorType = 892 - DetectorType_Teamup DetectorType = 893 - DetectorType_Workday DetectorType = 894 - DetectorType_MongoDB DetectorType = 895 - DetectorType_NGC DetectorType = 896 - DetectorType_DigitalOceanV2 DetectorType = 897 - DetectorType_SQLServer DetectorType = 898 - DetectorType_FTP DetectorType = 899 - DetectorType_Redis DetectorType = 900 - DetectorType_LDAP DetectorType = 901 - DetectorType_Shopify DetectorType = 902 - DetectorType_RabbitMQ DetectorType = 903 - DetectorType_CustomRegex DetectorType = 904 - DetectorType_Etherscan DetectorType = 905 - DetectorType_Infura DetectorType = 906 - DetectorType_Alchemy DetectorType = 907 - DetectorType_BlockNative DetectorType = 908 - DetectorType_Moralis DetectorType = 909 - DetectorType_BscScan DetectorType = 910 - DetectorType_CoinMarketCap DetectorType = 911 - DetectorType_Percy DetectorType = 912 - DetectorType_TinesWebhook DetectorType = 913 - DetectorType_Pulumi DetectorType = 914 - DetectorType_SupabaseToken DetectorType = 915 - DetectorType_NuGetApiKey DetectorType = 916 - DetectorType_Aiven DetectorType = 917 - DetectorType_Prefect DetectorType = 918 - DetectorType_Docusign DetectorType = 919 - DetectorType_Couchbase DetectorType = 920 - DetectorType_Dockerhub DetectorType = 921 - DetectorType_TrufflehogEnterprise DetectorType = 922 - DetectorType_EnvoyApiKey DetectorType = 923 - DetectorType_GitHubOauth2 DetectorType = 924 - DetectorType_Salesforce DetectorType = 925 - DetectorType_HuggingFace DetectorType = 926 - DetectorType_Snowflake DetectorType = 927 - DetectorType_Sourcegraph DetectorType = 928 - DetectorType_Tailscale DetectorType = 929 - DetectorType_Web3Storage DetectorType = 930 - DetectorType_AzureStorage DetectorType = 931 - DetectorType_PlanetScaleDb DetectorType = 932 - DetectorType_Anthropic DetectorType = 933 - DetectorType_Ramp DetectorType = 934 - DetectorType_Klaviyo DetectorType = 935 - DetectorType_SourcegraphCody DetectorType = 936 - DetectorType_Voiceflow DetectorType = 937 - DetectorType_Privacy DetectorType = 938 - DetectorType_IPInfo DetectorType = 939 - DetectorType_Ip2location DetectorType = 940 - DetectorType_Instamojo DetectorType = 941 - DetectorType_Portainer DetectorType = 942 - DetectorType_PortainerToken DetectorType = 943 - DetectorType_Loggly DetectorType = 944 - DetectorType_OpenVpn DetectorType = 945 - DetectorType_VagrantCloudPersonalToken DetectorType = 946 - DetectorType_BetterStack DetectorType = 947 - DetectorType_ZeroTier DetectorType = 948 - DetectorType_AppOptics DetectorType = 949 - DetectorType_Metabase DetectorType = 950 - DetectorType_CoinbaseWaaS DetectorType = 951 - DetectorType_LemonSqueezy DetectorType = 952 - DetectorType_Budibase DetectorType = 953 - DetectorType_DenoDeploy DetectorType = 954 - DetectorType_Stripo DetectorType = 955 - DetectorType_ReplyIO DetectorType = 956 - DetectorType_AzureBatch DetectorType = 957 - DetectorType_AzureContainerRegistry DetectorType = 958 - DetectorType_AWSSessionKey DetectorType = 959 - DetectorType_Coda DetectorType = 960 - DetectorType_LogzIO DetectorType = 961 - DetectorType_Eventbrite DetectorType = 962 - DetectorType_GrafanaServiceAccount DetectorType = 963 - DetectorType_RequestFinance DetectorType = 964 - DetectorType_Overloop DetectorType = 965 - DetectorType_Ngrok DetectorType = 966 - DetectorType_Replicate DetectorType = 967 - DetectorType_Postgres DetectorType = 968 + DetectorType_Heatmapapi DetectorType = 869 + DetectorType_Websitepulse DetectorType = 870 + DetectorType_Uclassify DetectorType = 871 + DetectorType_Convert DetectorType = 872 + DetectorType_PDFmyURL DetectorType = 873 + DetectorType_Api2Convert DetectorType = 874 + DetectorType_Opsgenie DetectorType = 875 + DetectorType_Gemini DetectorType = 876 + DetectorType_Honeycomb DetectorType = 877 + DetectorType_KalturaAppToken DetectorType = 878 + DetectorType_KalturaSession DetectorType = 879 + DetectorType_BitGo DetectorType = 880 + DetectorType_Optidash DetectorType = 881 + DetectorType_Imgix DetectorType = 882 + DetectorType_ImageToText DetectorType = 883 + DetectorType_Page2Images DetectorType = 884 + DetectorType_Quickbase DetectorType = 885 + DetectorType_Redbooth DetectorType = 886 + DetectorType_Nubela DetectorType = 887 + DetectorType_Infobip DetectorType = 888 + DetectorType_Uproc DetectorType = 889 + DetectorType_Supportbee DetectorType = 890 + DetectorType_Aftership DetectorType = 891 + DetectorType_Edusign DetectorType = 892 + DetectorType_Teamup DetectorType = 893 + DetectorType_Workday DetectorType = 894 + DetectorType_MongoDB DetectorType = 895 + DetectorType_NGC DetectorType = 896 + DetectorType_DigitalOceanV2 DetectorType = 897 + DetectorType_SQLServer DetectorType = 898 + DetectorType_FTP DetectorType = 899 + DetectorType_Redis DetectorType = 900 + DetectorType_LDAP DetectorType = 901 + DetectorType_Shopify DetectorType = 902 + DetectorType_RabbitMQ DetectorType = 903 + DetectorType_CustomRegex DetectorType = 904 + DetectorType_Etherscan DetectorType = 905 + DetectorType_Infura DetectorType = 906 + DetectorType_Alchemy DetectorType = 907 + DetectorType_BlockNative DetectorType = 908 + DetectorType_Moralis DetectorType = 909 + DetectorType_BscScan DetectorType = 910 + DetectorType_CoinMarketCap DetectorType = 911 + DetectorType_Percy DetectorType = 912 + DetectorType_TinesWebhook DetectorType = 913 + DetectorType_Pulumi DetectorType = 914 + DetectorType_SupabaseToken DetectorType = 915 + DetectorType_NuGetApiKey DetectorType = 916 + DetectorType_Aiven DetectorType = 917 + DetectorType_Prefect DetectorType = 918 + DetectorType_Docusign DetectorType = 919 + DetectorType_Couchbase DetectorType = 920 + DetectorType_Dockerhub DetectorType = 921 + DetectorType_TrufflehogEnterprise DetectorType = 922 + DetectorType_EnvoyApiKey DetectorType = 923 + DetectorType_GitHubOauth2 DetectorType = 924 + DetectorType_Salesforce DetectorType = 925 + DetectorType_HuggingFace DetectorType = 926 + DetectorType_Snowflake DetectorType = 927 + DetectorType_Sourcegraph DetectorType = 928 + DetectorType_Tailscale DetectorType = 929 + DetectorType_Web3Storage DetectorType = 930 + DetectorType_AzureStorage DetectorType = 931 + DetectorType_PlanetScaleDb DetectorType = 932 + DetectorType_Anthropic DetectorType = 933 + DetectorType_Ramp DetectorType = 934 + DetectorType_Klaviyo DetectorType = 935 + DetectorType_SourcegraphCody DetectorType = 936 + DetectorType_Voiceflow DetectorType = 937 + DetectorType_Privacy DetectorType = 938 + DetectorType_IPInfo DetectorType = 939 + DetectorType_Ip2location DetectorType = 940 + DetectorType_Instamojo DetectorType = 941 + DetectorType_Portainer DetectorType = 942 + DetectorType_PortainerToken DetectorType = 943 + DetectorType_Loggly DetectorType = 944 + DetectorType_OpenVpn DetectorType = 945 + DetectorType_VagrantCloudPersonalToken DetectorType = 946 + DetectorType_BetterStack DetectorType = 947 + DetectorType_ZeroTier DetectorType = 948 + DetectorType_AppOptics DetectorType = 949 + DetectorType_Metabase DetectorType = 950 + DetectorType_CoinbaseWaaS DetectorType = 951 + DetectorType_LemonSqueezy DetectorType = 952 + DetectorType_Budibase DetectorType = 953 + DetectorType_DenoDeploy DetectorType = 954 + DetectorType_Stripo DetectorType = 955 + DetectorType_ReplyIO DetectorType = 956 + DetectorType_AzureBatch DetectorType = 957 + DetectorType_AzureContainerRegistry DetectorType = 958 + DetectorType_AWSSessionKey DetectorType = 959 + DetectorType_Coda DetectorType = 960 + DetectorType_LogzIO DetectorType = 961 + DetectorType_Eventbrite DetectorType = 962 + DetectorType_GrafanaServiceAccount DetectorType = 963 + DetectorType_RequestFinance DetectorType = 964 + DetectorType_Overloop DetectorType = 965 + DetectorType_Ngrok DetectorType = 966 + DetectorType_Replicate DetectorType = 967 + DetectorType_Postgres DetectorType = 968 + DetectorType_AzureActiveDirectoryApplicationSecret DetectorType = 969 + DetectorType_AzureCacheForRedisAccessKey DetectorType = 970 + DetectorType_AzureCosmosDBKeyIdentifiable DetectorType = 971 + DetectorType_AzureDevopsPersonalAccessToken DetectorType = 972 + DetectorType_AzureFunctionKey DetectorType = 973 + DetectorType_AzureMLWebServiceClassicIdentifiableKey DetectorType = 974 + DetectorType_AzureSasToken DetectorType = 975 + DetectorType_AzureSearchAdminKey DetectorType = 976 + DetectorType_AzureSearchQueryKey DetectorType = 977 + DetectorType_AzureManagementCertificate DetectorType = 978 + DetectorType_AzureSQL DetectorType = 979 ) // Enum value maps for DetectorType. @@ -2024,973 +2035,995 @@ var ( 966: "Ngrok", 967: "Replicate", 968: "Postgres", + 969: "AzureActiveDirectoryApplicationSecret", + 970: "AzureCacheForRedisAccessKey", + 971: "AzureCosmosDBKeyIdentifiable", + 972: "AzureDevopsPersonalAccessToken", + 973: "AzureFunctionKey", + 974: "AzureMLWebServiceClassicIdentifiableKey", + 975: "AzureSasToken", + 976: "AzureSearchAdminKey", + 977: "AzureSearchQueryKey", + 978: "AzureManagementCertificate", + 979: "AzureSQL", } DetectorType_value = map[string]int32{ - "Alibaba": 0, - "AMQP": 1, - "AWS": 2, - "Azure": 3, - "Circle": 4, - "Coinbase": 5, - "GCP": 6, - "Generic": 7, - "Github": 8, - "Gitlab": 9, - "JDBC": 10, - "RazorPay": 11, - "SendGrid": 12, - "Slack": 13, - "Square": 14, - "PrivateKey": 15, - "Stripe": 16, - "URI": 17, - "Dropbox": 18, - "Heroku": 19, - "Mailchimp": 20, - "Okta": 21, - "OneLogin": 22, - "PivotalTracker": 23, - "SquareApp": 25, - "Twilio": 26, - "Test": 27, - "TravisCI": 29, - "SlackWebhook": 30, - "PaypalOauth": 31, - "PagerDutyApiKey": 32, - "Firebase": 33, - "Mailgun": 34, - "HubSpot": 35, - "GitHubApp": 36, - "CircleCI": 37, - "WpEngine": 38, - "DatadogToken": 39, - "FacebookOAuth": 40, - "AsanaPersonalAccessToken": 41, - "AmplitudeApiKey": 42, - "BitLyAccessToken": 43, - "CalendlyApiKey": 44, - "ZapierWebhook": 45, - "YoutubeApiKey": 46, - "SalesforceOauth2": 47, - "TwitterApiSecret": 48, - "NpmToken": 49, - "NewRelicPersonalApiKey": 50, - "AirtableApiKey": 51, - "AkamaiToken": 52, - "AmazonMWS": 53, - "KubeConfig": 54, - "Auth0oauth": 55, - "Bitfinex": 56, - "Clarifai": 57, - "CloudflareGlobalApiKey": 58, - "CloudflareCaKey": 59, - "Confluent": 60, - "ContentfulDelivery": 61, - "DatabricksToken": 62, - "DigitalOceanSpaces": 63, - "DigitalOceanToken": 64, - "DiscordBotToken": 65, - "DiscordWebhook": 66, - "EtsyApiKey": 67, - "FastlyPersonalToken": 68, - "GoogleOauth2": 69, - "ReCAPTCHA": 70, - "GoogleApiKey": 71, - "Hunter": 72, - "IbmCloudUserKey": 73, - "Netlify": 74, - "Vonage": 75, - "EquinixOauth": 76, - "Paystack": 77, - "PlaidToken": 78, - "PlaidKey": 79, - "Plivo": 80, - "Postmark": 81, - "PubNubPublishKey": 82, - "PubNubSubscriptionKey": 83, - "PusherChannelKey": 84, - "ScalewayKey": 85, - "SendinBlueV2": 86, - "SentryToken": 87, - "ShodanKey": 88, - "SnykKey": 89, - "SpotifyKey": 90, - "TelegramBotToken": 91, - "TencentCloudKey": 92, - "TerraformCloudPersonalToken": 93, - "TrelloApiKey": 94, - "ZendeskApi": 95, - "MaxMindLicense": 96, - "AirtableMetadataApiKey": 97, - "AsanaOauth": 98, - "RapidApi": 99, - "CloudflareApiToken": 100, - "Webex": 101, - "FirebaseCloudMessaging": 102, - "ContentfulPersonalAccessToken": 103, - "MapBox": 104, - "MailJetBasicAuth": 105, - "MailJetSMS": 106, - "HubSpotApiKey": 107, - "HubSpotOauth": 108, - "SslMate": 109, - "Auth0ManagementApiToken": 110, - "MessageBird": 111, - "ElasticEmail": 112, - "FigmaPersonalAccessToken": 113, - "MicrosoftTeamsWebhook": 114, - "GitHubOld": 115, - "VultrApiKey": 116, - "Pepipost": 117, - "Postman": 118, - "CloudsightKey": 119, - "JiraToken": 120, - "NexmoApiKey": 121, - "SegmentApiKey": 122, - "SumoLogicKey": 123, - "PushBulletApiKey": 124, - "AirbrakeProjectKey": 125, - "AirbrakeUserKey": 126, - "PendoIntegrationKey": 127, - "SplunkOberservabilityToken": 128, - "LokaliseToken": 129, - "Calendarific": 130, - "Jumpcloud": 131, - "IpStack": 133, - "Notion": 134, - "DroneCI": 135, - "AdobeIO": 136, - "TwelveData": 137, - "D7Network": 138, - "ScrapingBee": 139, - "KeenIO": 140, - "Wakatime": 141, - "Buildkite": 142, - "Verimail": 143, - "Zerobounce": 144, - "Mailboxlayer": 145, - "Fastspring": 146, - "Paddle": 147, - "Sellfy": 148, - "FixerIO": 149, - "ButterCMS": 150, - "Taxjar": 151, - "Avalara": 152, - "Helpscout": 153, - "ElasticPath": 154, - "Zeplin": 155, - "Intercom": 156, - "Mailmodo": 157, - "CannyIo": 158, - "Pipedrive": 159, - "Vercel": 160, - "PosthogApp": 161, - "SinchMessage": 162, - "Ayrshare": 163, - "HelpCrunch": 164, - "LiveAgent": 165, - "Beamer": 166, - "WeChatAppKey": 167, - "LineMessaging": 168, - "UberServerToken": 169, - "AlgoliaAdminKey": 170, - "FullContact": 171, - "Mandrill": 172, - "Flutterwave": 173, - "MattermostPersonalToken": 174, - "Cloudant": 175, - "LineNotify": 176, - "LinearAPI": 177, - "Ubidots": 178, - "Anypoint": 179, - "Dwolla": 180, - "ArtifactoryAccessToken": 181, - "Surge": 182, - "Sparkpost": 183, - "GoCardless": 184, - "Codacy": 185, - "Kraken": 186, - "Checkout": 187, - "Kairos": 188, - "ClockworkSMS": 189, - "Atlassian": 190, - "LaunchDarkly": 191, - "Coveralls": 192, - "Linode": 193, - "WePay": 194, - "PlanetScale": 195, - "Doppler": 196, - "Agora": 197, - "Samsara": 198, - "FrameIO": 199, - "RubyGems": 200, - "OpenAI": 201, - "SurveySparrow": 202, - "Simvoly": 203, - "Survicate": 204, - "Omnisend": 205, - "Groovehq": 206, - "Newsapi": 207, - "Chatbot": 208, - "ClickSendsms": 209, - "Getgist": 210, - "CustomerIO": 211, - "ApiDeck": 212, - "Nftport": 213, - "Copper": 214, - "Close": 215, - "Myfreshworks": 216, - "Salesflare": 217, - "Webflow": 218, - "Duda": 219, - "Yext": 220, - "ContentStack": 221, - "Storyblok": 222, - "GraphCMS": 223, - "Checkmarket": 224, - "Convertkit": 225, - "CustomerGuru": 226, - "Kaleyra": 227, - "Mailerlite": 228, - "Qualaroo": 229, - "SatismeterProjectkey": 230, - "SatismeterWritekey": 231, - "Simplesat": 232, - "SurveyAnyplace": 233, - "SurveyBot": 234, - "Webengage": 235, - "ZonkaFeedback": 236, - "Delighted": 237, - "Feedier": 238, - "Abbysale": 239, - "Magnetic": 240, - "Nytimes": 241, - "Polygon": 242, - "Powrbot": 243, - "ProspectIO": 244, - "Skrappio": 245, - "Monday": 246, - "Smartsheets": 247, - "Wrike": 248, - "Float": 249, - "Imagekit": 250, - "Integromat": 251, - "Salesblink": 252, - "Bored": 253, - "Campayn": 254, - "Clinchpad": 255, - "CompanyHub": 256, - "Debounce": 257, - "Dyspatch": 258, - "Guardianapi": 259, - "Harvest": 260, - "Moosend": 261, - "OpenWeather": 262, - "Siteleaf": 263, - "Squarespace": 264, - "FlowFlu": 265, - "Nimble": 266, - "LessAnnoyingCRM": 267, - "Nethunt": 268, - "Apptivo": 269, - "CapsuleCRM": 270, - "Insightly": 271, - "Kylas": 272, - "OnepageCRM": 273, - "User": 274, - "ProspectCRM": 275, - "ReallySimpleSystems": 276, - "Airship": 277, - "Artsy": 278, - "Yandex": 279, - "Clockify": 280, - "Dnscheck": 281, - "EasyInsight": 282, - "Ethplorer": 283, - "Everhour": 284, - "Fulcrum": 285, - "GeoIpifi": 286, - "Jotform": 287, - "Refiner": 288, - "Timezoneapi": 289, - "TogglTrack": 290, - "Vpnapi": 291, - "Workstack": 292, - "Apollo": 293, - "Eversign": 294, - "Juro": 295, - "KarmaCRM": 296, - "Metrilo": 297, - "Pandadoc": 298, - "RevampCRM": 299, - "Salescookie": 300, - "Alconost": 301, - "Blogger": 302, - "Accuweather": 303, - "Opengraphr": 304, - "Rawg": 305, - "Riotgames": 306, - "RoninApp": 307, - "Stormglass": 308, - "Tomtom": 309, - "Twitch": 310, - "Documo": 311, - "Cloudways": 312, - "Veevavault": 313, - "KiteConnect": 314, - "ShopeeOpenPlatform": 315, - "TeamViewer": 316, - "Bulbul": 317, - "CentralStationCRM": 318, - "Teamgate": 319, - "Axonaut": 320, - "Tyntec": 321, - "Appcues": 322, - "Autoklose": 323, - "Cloudplan": 324, - "Dotmailer": 325, - "GetEmail": 326, - "GetEmails": 327, - "Kontent": 328, - "Leadfeeder": 329, - "Raven": 330, - "RocketReach": 331, - "Uplead": 332, - "Brandfetch": 333, - "Clearbit": 334, - "Crowdin": 335, - "Mapquest": 336, - "Noticeable": 337, - "Onbuka": 338, - "Todoist": 339, - "Storychief": 340, - "LinkedIn": 341, - "YouSign": 342, - "Docker": 343, - "Telesign": 344, - "Spoonacular": 345, - "Aerisweather": 346, - "Alphavantage": 347, - "Imgur": 348, - "Imagga": 349, - "SMSApi": 350, - "Distribusion": 351, - "Blablabus": 352, - "WordsApi": 353, - "Currencylayer": 354, - "Html2Pdf": 355, - "IPGeolocation": 356, - "Owlbot": 357, - "Cloudmersive": 358, - "Dynalist": 359, - "ExchangeRateAPI": 360, - "HolidayAPI": 361, - "Ipapi": 362, - "Marketstack": 363, - "Nutritionix": 364, - "Swell": 365, - "ClickupPersonalToken": 366, - "Nitro": 367, - "Rev": 368, - "RunRunIt": 369, - "Typeform": 370, - "Mixpanel": 371, - "Tradier": 372, - "Verifier": 373, - "Vouchery": 374, - "Alegra": 375, - "Audd": 376, - "Baremetrics": 377, - "Coinlib": 378, - "ExchangeRatesAPI": 379, - "CurrencyScoop": 380, - "FXMarket": 381, - "CurrencyCloud": 382, - "GetGeoAPI": 383, - "Abstract": 384, - "Billomat": 385, - "Dovico": 386, - "Bitbar": 387, - "Bugsnag": 388, - "AssemblyAI": 389, - "AdafruitIO": 390, - "Apify": 391, - "CoinGecko": 392, - "CryptoCompare": 393, - "Fullstory": 394, - "HelloSign": 395, - "Loyverse": 396, - "NetCore": 397, - "SauceLabs": 398, - "AlienVault": 399, - "Apiflash": 401, - "Coinlayer": 402, - "CurrentsAPI": 403, - "DataGov": 404, - "Enigma": 405, - "FinancialModelingPrep": 406, - "Geocodio": 407, - "HereAPI": 408, - "Macaddress": 409, - "OOPSpam": 410, - "ProtocolsIO": 411, - "ScraperAPI": 412, - "SecurityTrails": 413, - "TomorrowIO": 414, - "WorldCoinIndex": 415, - "FacePlusPlus": 416, - "Voicegain": 417, - "Deepgram": 418, - "VisualCrossing": 419, - "Finnhub": 420, - "Tiingo": 421, - "RingCentral": 422, - "Finage": 423, - "Edamam": 424, - "HypeAuditor": 425, - "Gengo": 426, - "Front": 427, - "Fleetbase": 428, - "Bubble": 429, - "Bannerbear": 430, - "Adzuna": 431, - "BitcoinAverage": 432, - "CommerceJS": 433, - "DetectLanguage": 434, - "FakeJSON": 435, - "Graphhopper": 436, - "Lexigram": 437, - "LinkPreview": 438, - "Numverify": 439, - "ProxyCrawl": 440, - "ZipCodeAPI": 441, - "Cometchat": 442, - "Keygen": 443, - "Mixcloud": 444, - "TatumIO": 445, - "Tmetric": 446, - "Lastfm": 447, - "Browshot": 448, - "JSONbin": 449, - "LocationIQ": 450, - "ScreenshotAPI": 451, - "WeatherStack": 452, - "Amadeus": 453, - "FourSquare": 454, - "Flickr": 455, - "ClickHelp": 456, - "Ambee": 457, - "Api2Cart": 458, - "Hypertrack": 459, - "KakaoTalk": 460, - "RiteKit": 461, - "Shutterstock": 462, - "Text2Data": 463, - "YouNeedABudget": 464, - "Cricket": 465, - "Filestack": 466, - "Gyazo": 467, - "Mavenlink": 468, - "Sheety": 469, - "Sportsmonk": 470, - "Stockdata": 471, - "Unsplash": 472, - "Allsports": 473, - "CalorieNinja": 474, - "WalkScore": 475, - "Strava": 476, - "Cicero": 477, - "IPQuality": 478, - "ParallelDots": 479, - "Roaring": 480, - "Mailsac": 481, - "Whoxy": 482, - "WorldWeather": 483, - "ApiFonica": 484, - "Aylien": 485, - "Geocode": 486, - "IconFinder": 487, - "Ipify": 488, - "LanguageLayer": 489, - "Lob": 490, - "OnWaterIO": 491, - "Pastebin": 492, - "PdfLayer": 493, - "Pixabay": 494, - "ReadMe": 495, - "VatLayer": 496, - "VirusTotal": 497, - "AirVisual": 498, - "Currencyfreaks": 499, - "Duffel": 500, - "FlatIO": 501, - "M3o": 502, - "Mesibo": 503, - "Openuv": 504, - "Snipcart": 505, - "Besttime": 506, - "Happyscribe": 507, - "Humanity": 508, - "Impala": 509, - "Loginradius": 510, - "AutoPilot": 511, - "Bitmex": 512, - "ClustDoc": 513, - "Messari": 514, - "PdfShift": 515, - "Poloniex": 516, - "RestpackHtmlToPdfAPI": 517, - "RestpackScreenshotAPI": 518, - "ShutterstockOAuth": 519, - "SkyBiometry": 520, - "AbuseIPDB": 521, - "AletheiaApi": 522, - "BlitApp": 523, - "Censys": 524, - "Cloverly": 525, - "CountryLayer": 526, - "FileIO": 527, - "FlightApi": 528, - "Geoapify": 529, - "IPinfoDB": 530, - "MediaStack": 531, - "NasdaqDataLink": 532, - "OpenCageData": 533, - "Paymongo": 534, - "PositionStack": 535, - "Rebrandly": 536, - "ScreenshotLayer": 537, - "Stytch": 538, - "Unplugg": 539, - "UPCDatabase": 540, - "UserStack": 541, - "Geocodify": 542, - "Newscatcher": 543, - "Nicereply": 544, - "Partnerstack": 545, - "Route4me": 546, - "Scrapeowl": 547, - "ScrapingDog": 548, - "Streak": 549, - "Veriphone": 550, - "Webscraping": 551, - "Zenscrape": 552, - "Zenserp": 553, - "CoinApi": 554, - "Gitter": 555, - "Host": 556, - "Iexcloud": 557, - "Restpack": 558, - "ScraperBox": 559, - "ScrapingAnt": 560, - "SerpStack": 561, - "SmartyStreets": 562, - "TicketMaster": 563, - "AviationStack": 564, - "BombBomb": 565, - "Commodities": 566, - "Dfuse": 567, - "EdenAI": 568, - "Glassnode": 569, - "Guru": 570, - "Hive": 571, - "Hiveage": 572, - "Kickbox": 573, - "Passbase": 574, - "PostageApp": 575, - "PureStake": 576, - "Qubole": 577, - "CarbonInterface": 578, - "Intrinio": 579, - "QuickMetrics": 580, - "ScrapeStack": 581, - "TechnicalAnalysisApi": 582, - "Urlscan": 583, - "BaseApiIO": 584, - "DailyCO": 585, - "TLy": 586, - "Shortcut": 587, - "Appfollow": 588, - "Thinkific": 589, - "Feedly": 590, - "Stitchdata": 591, - "Fetchrss": 592, - "Signupgenius": 593, - "Signaturit": 594, - "Optimizely": 595, - "OcrSpace": 596, - "WeatherBit": 597, - "BuddyNS": 598, - "ZipAPI": 599, - "ZipBooks": 600, - "Onedesk": 601, - "Bugherd": 602, - "Blazemeter": 603, - "Autodesk": 604, - "Tru": 605, - "UnifyID": 606, - "Trimble": 607, - "Smooch": 608, - "Semaphore": 609, - "Telnyx": 610, - "Signalwire": 611, - "Textmagic": 612, - "Serphouse": 613, - "Planyo": 614, - "Simplybook": 615, - "Vyte": 616, - "Nylas": 617, - "Squareup": 618, - "Dandelion": 619, - "DataFire": 620, - "DeepAI": 621, - "MeaningCloud": 622, - "NeutrinoApi": 623, - "Storecove": 624, - "Shipday": 625, - "Sentiment": 626, - "StreamChatMessaging": 627, - "TeamworkCRM": 628, - "TeamworkDesk": 629, - "TeamworkSpaces": 630, - "TheOddsApi": 631, - "Apacta": 632, - "GetSandbox": 633, - "Happi": 634, - "Oanda": 635, - "FastForex": 636, - "APIMatic": 637, - "VersionEye": 638, - "EagleEyeNetworks": 639, - "ThousandEyes": 640, - "SelectPDF": 641, - "Flightstats": 642, - "ChecIO": 643, - "Manifest": 644, - "ApiScience": 645, - "AppSynergy": 646, - "Caflou": 647, - "Caspio": 648, - "ChecklyHQ": 649, - "CloudElements": 650, - "DronaHQ": 651, - "Enablex": 652, - "Fmfw": 653, - "GoodDay": 654, - "Luno": 655, - "Meistertask": 656, - "Mindmeister": 657, - "PeopleDataLabs": 658, - "ScraperSite": 659, - "Scrapfly": 660, - "SimplyNoted": 661, - "TravelPayouts": 662, - "WebScraper": 663, - "Convier": 664, - "Courier": 665, - "Ditto": 666, - "Findl": 667, - "Lendflow": 668, - "Moderation": 669, - "Opendatasoft": 670, - "Podio": 671, - "Rockset": 672, - "Rownd": 673, - "Shotstack": 674, - "Swiftype": 675, - "Twitter": 676, - "Honey": 677, - "Freshdesk": 678, - "Upwave": 679, - "Fountain": 680, - "Freshbooks": 681, - "Mite": 682, - "Deputy": 683, - "Beebole": 684, - "Cashboard": 685, - "Kanban": 686, - "Worksnaps": 687, - "MyIntervals": 688, - "InvoiceOcean": 689, - "Sherpadesk": 690, - "Mrticktock": 691, - "Chatfule": 692, - "Aeroworkflow": 693, - "Emailoctopus": 694, - "Fusebill": 695, - "Geckoboard": 696, - "Gosquared": 697, - "Moonclerk": 698, - "Paymoapp": 699, - "Mixmax": 700, - "Processst": 701, - "Repairshopr": 702, - "Goshippo": 703, - "Sigopt": 704, - "Sugester": 705, - "Viewneo": 706, - "BoostNote": 707, - "CaptainData": 708, - "Checkvist": 709, - "Cliengo": 710, - "Cloze": 711, - "FormIO": 712, - "FormBucket": 713, - "GoCanvas": 714, - "MadKudu": 715, - "NozbeTeams": 716, - "Papyrs": 717, - "SuperNotesAPI": 718, - "Tallyfy": 719, - "ZenkitAPI": 720, - "CloudImage": 721, - "UploadCare": 722, - "Borgbase": 723, - "Pipedream": 724, - "Sirv": 725, - "Diffbot": 726, - "EightxEight": 727, - "Sendoso": 728, - "Printfection": 729, - "Authorize": 730, - "PandaScore": 731, - "Paymo": 732, - "AvazaPersonalAccessToken": 733, - "PlanviewLeanKit": 734, - "Livestorm": 735, - "KuCoin": 736, - "MetaAPI": 737, - "NiceHash": 738, - "CexIO": 739, - "Klipfolio": 740, - "Dynatrace": 741, - "MollieAPIKey": 742, - "MollieAccessToken": 743, - "BasisTheory": 744, - "Nordigen": 745, - "FlagsmithEnvironmentKey": 746, - "FlagsmithToken": 747, - "Mux": 748, - "Column": 749, - "Sendbird": 750, - "SendbirdOrganizationAPI": 751, - "Midise": 752, - "Mockaroo": 753, - "Image4": 754, - "Pinata": 755, - "BrowserStack": 756, - "CrossBrowserTesting": 757, - "Loadmill": 758, - "TestingBot": 759, - "KnapsackPro": 760, - "Qase": 761, - "Dareboost": 762, - "GTMetrix": 763, - "Holistic": 764, - "Parsers": 765, - "ScrutinizerCi": 766, - "SonarCloud": 767, - "APITemplate": 768, - "ConversionTools": 769, - "CraftMyPDF": 770, - "ExportSDK": 771, - "GlitterlyAPI": 772, - "Hybiscus": 773, - "Miro": 774, - "Statuspage": 775, - "Statuspal": 776, - "Teletype": 777, - "TimeCamp": 778, - "Userflow": 779, - "Wistia": 780, - "SportRadar": 781, - "UptimeRobot": 782, - "Codequiry": 783, - "ExtractorAPI": 784, - "Signable": 785, - "MagicBell": 786, - "Stormboard": 787, - "Apilayer": 788, - "Disqus": 789, - "Woopra": 790, - "Paperform": 791, - "Gumroad": 792, - "Paydirtapp": 793, - "Detectify": 794, - "Statuscake": 795, - "Jumpseller": 796, - "LunchMoney": 797, - "Rosette": 798, - "Yelp": 799, - "Atera": 800, - "EcoStruxureIT": 801, - "Aha": 802, - "Parsehub": 803, - "PackageCloud": 804, - "Cloudsmith": 805, - "Flowdash": 806, - "Flowdock": 807, - "Fibery": 808, - "Typetalk": 809, - "VoodooSMS": 810, - "ZulipChat": 811, - "Formcraft": 812, - "Iexapis": 813, - "Reachmail": 814, - "Chartmogul": 815, - "Appointedd": 816, - "Wit": 817, - "RechargePayments": 818, - "Diggernaut": 819, - "MonkeyLearn": 820, - "Duply": 821, - "Postbacks": 822, - "Collect2": 823, - "ZenRows": 824, - "Zipcodebase": 825, - "Tefter": 826, - "Twist": 827, - "BraintreePayments": 828, - "CloudConvert": 829, - "Grafana": 830, - "ConvertApi": 831, - "Transferwise": 832, - "Bulksms": 833, - "Databox": 834, - "Onesignal": 835, - "Rentman": 836, - "Parseur": 837, - "Docparser": 838, - "Formsite": 839, - "Tickettailor": 840, - "Lemlist": 841, - "Prodpad": 842, - "Formstack": 843, - "Codeclimate": 844, - "Codemagic": 845, - "Vbout": 846, - "Nightfall": 847, - "FlightLabs": 848, - "SpeechTextAI": 849, - "PollsAPI": 850, - "SimFin": 851, - "Scalr": 852, - "Kanbantool": 853, - "Brightlocal": 854, - "Hotwire": 855, - "Instabot": 856, - "Timekit": 857, - "Interseller": 858, - "Mojohelpdesk": 859, - "Createsend": 860, - "Getresponse": 861, - "Dynadot": 862, - "Demio": 863, - "Tokeet": 864, - "Myexperiment": 865, - "Copyscape": 866, - "Besnappy": 867, - "Salesmate": 868, - "Heatmapapi": 869, - "Websitepulse": 870, - "Uclassify": 871, - "Convert": 872, - "PDFmyURL": 873, - "Api2Convert": 874, - "Opsgenie": 875, - "Gemini": 876, - "Honeycomb": 877, - "KalturaAppToken": 878, - "KalturaSession": 879, - "BitGo": 880, - "Optidash": 881, - "Imgix": 882, - "ImageToText": 883, - "Page2Images": 884, - "Quickbase": 885, - "Redbooth": 886, - "Nubela": 887, - "Infobip": 888, - "Uproc": 889, - "Supportbee": 890, - "Aftership": 891, - "Edusign": 892, - "Teamup": 893, - "Workday": 894, - "MongoDB": 895, - "NGC": 896, - "DigitalOceanV2": 897, - "SQLServer": 898, - "FTP": 899, - "Redis": 900, - "LDAP": 901, - "Shopify": 902, - "RabbitMQ": 903, - "CustomRegex": 904, - "Etherscan": 905, - "Infura": 906, - "Alchemy": 907, - "BlockNative": 908, - "Moralis": 909, - "BscScan": 910, - "CoinMarketCap": 911, - "Percy": 912, - "TinesWebhook": 913, - "Pulumi": 914, - "SupabaseToken": 915, - "NuGetApiKey": 916, - "Aiven": 917, - "Prefect": 918, - "Docusign": 919, - "Couchbase": 920, - "Dockerhub": 921, - "TrufflehogEnterprise": 922, - "EnvoyApiKey": 923, - "GitHubOauth2": 924, - "Salesforce": 925, - "HuggingFace": 926, - "Snowflake": 927, - "Sourcegraph": 928, - "Tailscale": 929, - "Web3Storage": 930, - "AzureStorage": 931, - "PlanetScaleDb": 932, - "Anthropic": 933, - "Ramp": 934, - "Klaviyo": 935, - "SourcegraphCody": 936, - "Voiceflow": 937, - "Privacy": 938, - "IPInfo": 939, - "Ip2location": 940, - "Instamojo": 941, - "Portainer": 942, - "PortainerToken": 943, - "Loggly": 944, - "OpenVpn": 945, - "VagrantCloudPersonalToken": 946, - "BetterStack": 947, - "ZeroTier": 948, - "AppOptics": 949, - "Metabase": 950, - "CoinbaseWaaS": 951, - "LemonSqueezy": 952, - "Budibase": 953, - "DenoDeploy": 954, - "Stripo": 955, - "ReplyIO": 956, - "AzureBatch": 957, - "AzureContainerRegistry": 958, - "AWSSessionKey": 959, - "Coda": 960, - "LogzIO": 961, - "Eventbrite": 962, - "GrafanaServiceAccount": 963, - "RequestFinance": 964, - "Overloop": 965, - "Ngrok": 966, - "Replicate": 967, - "Postgres": 968, + "Alibaba": 0, + "AMQP": 1, + "AWS": 2, + "Azure": 3, + "Circle": 4, + "Coinbase": 5, + "GCP": 6, + "Generic": 7, + "Github": 8, + "Gitlab": 9, + "JDBC": 10, + "RazorPay": 11, + "SendGrid": 12, + "Slack": 13, + "Square": 14, + "PrivateKey": 15, + "Stripe": 16, + "URI": 17, + "Dropbox": 18, + "Heroku": 19, + "Mailchimp": 20, + "Okta": 21, + "OneLogin": 22, + "PivotalTracker": 23, + "SquareApp": 25, + "Twilio": 26, + "Test": 27, + "TravisCI": 29, + "SlackWebhook": 30, + "PaypalOauth": 31, + "PagerDutyApiKey": 32, + "Firebase": 33, + "Mailgun": 34, + "HubSpot": 35, + "GitHubApp": 36, + "CircleCI": 37, + "WpEngine": 38, + "DatadogToken": 39, + "FacebookOAuth": 40, + "AsanaPersonalAccessToken": 41, + "AmplitudeApiKey": 42, + "BitLyAccessToken": 43, + "CalendlyApiKey": 44, + "ZapierWebhook": 45, + "YoutubeApiKey": 46, + "SalesforceOauth2": 47, + "TwitterApiSecret": 48, + "NpmToken": 49, + "NewRelicPersonalApiKey": 50, + "AirtableApiKey": 51, + "AkamaiToken": 52, + "AmazonMWS": 53, + "KubeConfig": 54, + "Auth0oauth": 55, + "Bitfinex": 56, + "Clarifai": 57, + "CloudflareGlobalApiKey": 58, + "CloudflareCaKey": 59, + "Confluent": 60, + "ContentfulDelivery": 61, + "DatabricksToken": 62, + "DigitalOceanSpaces": 63, + "DigitalOceanToken": 64, + "DiscordBotToken": 65, + "DiscordWebhook": 66, + "EtsyApiKey": 67, + "FastlyPersonalToken": 68, + "GoogleOauth2": 69, + "ReCAPTCHA": 70, + "GoogleApiKey": 71, + "Hunter": 72, + "IbmCloudUserKey": 73, + "Netlify": 74, + "Vonage": 75, + "EquinixOauth": 76, + "Paystack": 77, + "PlaidToken": 78, + "PlaidKey": 79, + "Plivo": 80, + "Postmark": 81, + "PubNubPublishKey": 82, + "PubNubSubscriptionKey": 83, + "PusherChannelKey": 84, + "ScalewayKey": 85, + "SendinBlueV2": 86, + "SentryToken": 87, + "ShodanKey": 88, + "SnykKey": 89, + "SpotifyKey": 90, + "TelegramBotToken": 91, + "TencentCloudKey": 92, + "TerraformCloudPersonalToken": 93, + "TrelloApiKey": 94, + "ZendeskApi": 95, + "MaxMindLicense": 96, + "AirtableMetadataApiKey": 97, + "AsanaOauth": 98, + "RapidApi": 99, + "CloudflareApiToken": 100, + "Webex": 101, + "FirebaseCloudMessaging": 102, + "ContentfulPersonalAccessToken": 103, + "MapBox": 104, + "MailJetBasicAuth": 105, + "MailJetSMS": 106, + "HubSpotApiKey": 107, + "HubSpotOauth": 108, + "SslMate": 109, + "Auth0ManagementApiToken": 110, + "MessageBird": 111, + "ElasticEmail": 112, + "FigmaPersonalAccessToken": 113, + "MicrosoftTeamsWebhook": 114, + "GitHubOld": 115, + "VultrApiKey": 116, + "Pepipost": 117, + "Postman": 118, + "CloudsightKey": 119, + "JiraToken": 120, + "NexmoApiKey": 121, + "SegmentApiKey": 122, + "SumoLogicKey": 123, + "PushBulletApiKey": 124, + "AirbrakeProjectKey": 125, + "AirbrakeUserKey": 126, + "PendoIntegrationKey": 127, + "SplunkOberservabilityToken": 128, + "LokaliseToken": 129, + "Calendarific": 130, + "Jumpcloud": 131, + "IpStack": 133, + "Notion": 134, + "DroneCI": 135, + "AdobeIO": 136, + "TwelveData": 137, + "D7Network": 138, + "ScrapingBee": 139, + "KeenIO": 140, + "Wakatime": 141, + "Buildkite": 142, + "Verimail": 143, + "Zerobounce": 144, + "Mailboxlayer": 145, + "Fastspring": 146, + "Paddle": 147, + "Sellfy": 148, + "FixerIO": 149, + "ButterCMS": 150, + "Taxjar": 151, + "Avalara": 152, + "Helpscout": 153, + "ElasticPath": 154, + "Zeplin": 155, + "Intercom": 156, + "Mailmodo": 157, + "CannyIo": 158, + "Pipedrive": 159, + "Vercel": 160, + "PosthogApp": 161, + "SinchMessage": 162, + "Ayrshare": 163, + "HelpCrunch": 164, + "LiveAgent": 165, + "Beamer": 166, + "WeChatAppKey": 167, + "LineMessaging": 168, + "UberServerToken": 169, + "AlgoliaAdminKey": 170, + "FullContact": 171, + "Mandrill": 172, + "Flutterwave": 173, + "MattermostPersonalToken": 174, + "Cloudant": 175, + "LineNotify": 176, + "LinearAPI": 177, + "Ubidots": 178, + "Anypoint": 179, + "Dwolla": 180, + "ArtifactoryAccessToken": 181, + "Surge": 182, + "Sparkpost": 183, + "GoCardless": 184, + "Codacy": 185, + "Kraken": 186, + "Checkout": 187, + "Kairos": 188, + "ClockworkSMS": 189, + "Atlassian": 190, + "LaunchDarkly": 191, + "Coveralls": 192, + "Linode": 193, + "WePay": 194, + "PlanetScale": 195, + "Doppler": 196, + "Agora": 197, + "Samsara": 198, + "FrameIO": 199, + "RubyGems": 200, + "OpenAI": 201, + "SurveySparrow": 202, + "Simvoly": 203, + "Survicate": 204, + "Omnisend": 205, + "Groovehq": 206, + "Newsapi": 207, + "Chatbot": 208, + "ClickSendsms": 209, + "Getgist": 210, + "CustomerIO": 211, + "ApiDeck": 212, + "Nftport": 213, + "Copper": 214, + "Close": 215, + "Myfreshworks": 216, + "Salesflare": 217, + "Webflow": 218, + "Duda": 219, + "Yext": 220, + "ContentStack": 221, + "Storyblok": 222, + "GraphCMS": 223, + "Checkmarket": 224, + "Convertkit": 225, + "CustomerGuru": 226, + "Kaleyra": 227, + "Mailerlite": 228, + "Qualaroo": 229, + "SatismeterProjectkey": 230, + "SatismeterWritekey": 231, + "Simplesat": 232, + "SurveyAnyplace": 233, + "SurveyBot": 234, + "Webengage": 235, + "ZonkaFeedback": 236, + "Delighted": 237, + "Feedier": 238, + "Abbysale": 239, + "Magnetic": 240, + "Nytimes": 241, + "Polygon": 242, + "Powrbot": 243, + "ProspectIO": 244, + "Skrappio": 245, + "Monday": 246, + "Smartsheets": 247, + "Wrike": 248, + "Float": 249, + "Imagekit": 250, + "Integromat": 251, + "Salesblink": 252, + "Bored": 253, + "Campayn": 254, + "Clinchpad": 255, + "CompanyHub": 256, + "Debounce": 257, + "Dyspatch": 258, + "Guardianapi": 259, + "Harvest": 260, + "Moosend": 261, + "OpenWeather": 262, + "Siteleaf": 263, + "Squarespace": 264, + "FlowFlu": 265, + "Nimble": 266, + "LessAnnoyingCRM": 267, + "Nethunt": 268, + "Apptivo": 269, + "CapsuleCRM": 270, + "Insightly": 271, + "Kylas": 272, + "OnepageCRM": 273, + "User": 274, + "ProspectCRM": 275, + "ReallySimpleSystems": 276, + "Airship": 277, + "Artsy": 278, + "Yandex": 279, + "Clockify": 280, + "Dnscheck": 281, + "EasyInsight": 282, + "Ethplorer": 283, + "Everhour": 284, + "Fulcrum": 285, + "GeoIpifi": 286, + "Jotform": 287, + "Refiner": 288, + "Timezoneapi": 289, + "TogglTrack": 290, + "Vpnapi": 291, + "Workstack": 292, + "Apollo": 293, + "Eversign": 294, + "Juro": 295, + "KarmaCRM": 296, + "Metrilo": 297, + "Pandadoc": 298, + "RevampCRM": 299, + "Salescookie": 300, + "Alconost": 301, + "Blogger": 302, + "Accuweather": 303, + "Opengraphr": 304, + "Rawg": 305, + "Riotgames": 306, + "RoninApp": 307, + "Stormglass": 308, + "Tomtom": 309, + "Twitch": 310, + "Documo": 311, + "Cloudways": 312, + "Veevavault": 313, + "KiteConnect": 314, + "ShopeeOpenPlatform": 315, + "TeamViewer": 316, + "Bulbul": 317, + "CentralStationCRM": 318, + "Teamgate": 319, + "Axonaut": 320, + "Tyntec": 321, + "Appcues": 322, + "Autoklose": 323, + "Cloudplan": 324, + "Dotmailer": 325, + "GetEmail": 326, + "GetEmails": 327, + "Kontent": 328, + "Leadfeeder": 329, + "Raven": 330, + "RocketReach": 331, + "Uplead": 332, + "Brandfetch": 333, + "Clearbit": 334, + "Crowdin": 335, + "Mapquest": 336, + "Noticeable": 337, + "Onbuka": 338, + "Todoist": 339, + "Storychief": 340, + "LinkedIn": 341, + "YouSign": 342, + "Docker": 343, + "Telesign": 344, + "Spoonacular": 345, + "Aerisweather": 346, + "Alphavantage": 347, + "Imgur": 348, + "Imagga": 349, + "SMSApi": 350, + "Distribusion": 351, + "Blablabus": 352, + "WordsApi": 353, + "Currencylayer": 354, + "Html2Pdf": 355, + "IPGeolocation": 356, + "Owlbot": 357, + "Cloudmersive": 358, + "Dynalist": 359, + "ExchangeRateAPI": 360, + "HolidayAPI": 361, + "Ipapi": 362, + "Marketstack": 363, + "Nutritionix": 364, + "Swell": 365, + "ClickupPersonalToken": 366, + "Nitro": 367, + "Rev": 368, + "RunRunIt": 369, + "Typeform": 370, + "Mixpanel": 371, + "Tradier": 372, + "Verifier": 373, + "Vouchery": 374, + "Alegra": 375, + "Audd": 376, + "Baremetrics": 377, + "Coinlib": 378, + "ExchangeRatesAPI": 379, + "CurrencyScoop": 380, + "FXMarket": 381, + "CurrencyCloud": 382, + "GetGeoAPI": 383, + "Abstract": 384, + "Billomat": 385, + "Dovico": 386, + "Bitbar": 387, + "Bugsnag": 388, + "AssemblyAI": 389, + "AdafruitIO": 390, + "Apify": 391, + "CoinGecko": 392, + "CryptoCompare": 393, + "Fullstory": 394, + "HelloSign": 395, + "Loyverse": 396, + "NetCore": 397, + "SauceLabs": 398, + "AlienVault": 399, + "Apiflash": 401, + "Coinlayer": 402, + "CurrentsAPI": 403, + "DataGov": 404, + "Enigma": 405, + "FinancialModelingPrep": 406, + "Geocodio": 407, + "HereAPI": 408, + "Macaddress": 409, + "OOPSpam": 410, + "ProtocolsIO": 411, + "ScraperAPI": 412, + "SecurityTrails": 413, + "TomorrowIO": 414, + "WorldCoinIndex": 415, + "FacePlusPlus": 416, + "Voicegain": 417, + "Deepgram": 418, + "VisualCrossing": 419, + "Finnhub": 420, + "Tiingo": 421, + "RingCentral": 422, + "Finage": 423, + "Edamam": 424, + "HypeAuditor": 425, + "Gengo": 426, + "Front": 427, + "Fleetbase": 428, + "Bubble": 429, + "Bannerbear": 430, + "Adzuna": 431, + "BitcoinAverage": 432, + "CommerceJS": 433, + "DetectLanguage": 434, + "FakeJSON": 435, + "Graphhopper": 436, + "Lexigram": 437, + "LinkPreview": 438, + "Numverify": 439, + "ProxyCrawl": 440, + "ZipCodeAPI": 441, + "Cometchat": 442, + "Keygen": 443, + "Mixcloud": 444, + "TatumIO": 445, + "Tmetric": 446, + "Lastfm": 447, + "Browshot": 448, + "JSONbin": 449, + "LocationIQ": 450, + "ScreenshotAPI": 451, + "WeatherStack": 452, + "Amadeus": 453, + "FourSquare": 454, + "Flickr": 455, + "ClickHelp": 456, + "Ambee": 457, + "Api2Cart": 458, + "Hypertrack": 459, + "KakaoTalk": 460, + "RiteKit": 461, + "Shutterstock": 462, + "Text2Data": 463, + "YouNeedABudget": 464, + "Cricket": 465, + "Filestack": 466, + "Gyazo": 467, + "Mavenlink": 468, + "Sheety": 469, + "Sportsmonk": 470, + "Stockdata": 471, + "Unsplash": 472, + "Allsports": 473, + "CalorieNinja": 474, + "WalkScore": 475, + "Strava": 476, + "Cicero": 477, + "IPQuality": 478, + "ParallelDots": 479, + "Roaring": 480, + "Mailsac": 481, + "Whoxy": 482, + "WorldWeather": 483, + "ApiFonica": 484, + "Aylien": 485, + "Geocode": 486, + "IconFinder": 487, + "Ipify": 488, + "LanguageLayer": 489, + "Lob": 490, + "OnWaterIO": 491, + "Pastebin": 492, + "PdfLayer": 493, + "Pixabay": 494, + "ReadMe": 495, + "VatLayer": 496, + "VirusTotal": 497, + "AirVisual": 498, + "Currencyfreaks": 499, + "Duffel": 500, + "FlatIO": 501, + "M3o": 502, + "Mesibo": 503, + "Openuv": 504, + "Snipcart": 505, + "Besttime": 506, + "Happyscribe": 507, + "Humanity": 508, + "Impala": 509, + "Loginradius": 510, + "AutoPilot": 511, + "Bitmex": 512, + "ClustDoc": 513, + "Messari": 514, + "PdfShift": 515, + "Poloniex": 516, + "RestpackHtmlToPdfAPI": 517, + "RestpackScreenshotAPI": 518, + "ShutterstockOAuth": 519, + "SkyBiometry": 520, + "AbuseIPDB": 521, + "AletheiaApi": 522, + "BlitApp": 523, + "Censys": 524, + "Cloverly": 525, + "CountryLayer": 526, + "FileIO": 527, + "FlightApi": 528, + "Geoapify": 529, + "IPinfoDB": 530, + "MediaStack": 531, + "NasdaqDataLink": 532, + "OpenCageData": 533, + "Paymongo": 534, + "PositionStack": 535, + "Rebrandly": 536, + "ScreenshotLayer": 537, + "Stytch": 538, + "Unplugg": 539, + "UPCDatabase": 540, + "UserStack": 541, + "Geocodify": 542, + "Newscatcher": 543, + "Nicereply": 544, + "Partnerstack": 545, + "Route4me": 546, + "Scrapeowl": 547, + "ScrapingDog": 548, + "Streak": 549, + "Veriphone": 550, + "Webscraping": 551, + "Zenscrape": 552, + "Zenserp": 553, + "CoinApi": 554, + "Gitter": 555, + "Host": 556, + "Iexcloud": 557, + "Restpack": 558, + "ScraperBox": 559, + "ScrapingAnt": 560, + "SerpStack": 561, + "SmartyStreets": 562, + "TicketMaster": 563, + "AviationStack": 564, + "BombBomb": 565, + "Commodities": 566, + "Dfuse": 567, + "EdenAI": 568, + "Glassnode": 569, + "Guru": 570, + "Hive": 571, + "Hiveage": 572, + "Kickbox": 573, + "Passbase": 574, + "PostageApp": 575, + "PureStake": 576, + "Qubole": 577, + "CarbonInterface": 578, + "Intrinio": 579, + "QuickMetrics": 580, + "ScrapeStack": 581, + "TechnicalAnalysisApi": 582, + "Urlscan": 583, + "BaseApiIO": 584, + "DailyCO": 585, + "TLy": 586, + "Shortcut": 587, + "Appfollow": 588, + "Thinkific": 589, + "Feedly": 590, + "Stitchdata": 591, + "Fetchrss": 592, + "Signupgenius": 593, + "Signaturit": 594, + "Optimizely": 595, + "OcrSpace": 596, + "WeatherBit": 597, + "BuddyNS": 598, + "ZipAPI": 599, + "ZipBooks": 600, + "Onedesk": 601, + "Bugherd": 602, + "Blazemeter": 603, + "Autodesk": 604, + "Tru": 605, + "UnifyID": 606, + "Trimble": 607, + "Smooch": 608, + "Semaphore": 609, + "Telnyx": 610, + "Signalwire": 611, + "Textmagic": 612, + "Serphouse": 613, + "Planyo": 614, + "Simplybook": 615, + "Vyte": 616, + "Nylas": 617, + "Squareup": 618, + "Dandelion": 619, + "DataFire": 620, + "DeepAI": 621, + "MeaningCloud": 622, + "NeutrinoApi": 623, + "Storecove": 624, + "Shipday": 625, + "Sentiment": 626, + "StreamChatMessaging": 627, + "TeamworkCRM": 628, + "TeamworkDesk": 629, + "TeamworkSpaces": 630, + "TheOddsApi": 631, + "Apacta": 632, + "GetSandbox": 633, + "Happi": 634, + "Oanda": 635, + "FastForex": 636, + "APIMatic": 637, + "VersionEye": 638, + "EagleEyeNetworks": 639, + "ThousandEyes": 640, + "SelectPDF": 641, + "Flightstats": 642, + "ChecIO": 643, + "Manifest": 644, + "ApiScience": 645, + "AppSynergy": 646, + "Caflou": 647, + "Caspio": 648, + "ChecklyHQ": 649, + "CloudElements": 650, + "DronaHQ": 651, + "Enablex": 652, + "Fmfw": 653, + "GoodDay": 654, + "Luno": 655, + "Meistertask": 656, + "Mindmeister": 657, + "PeopleDataLabs": 658, + "ScraperSite": 659, + "Scrapfly": 660, + "SimplyNoted": 661, + "TravelPayouts": 662, + "WebScraper": 663, + "Convier": 664, + "Courier": 665, + "Ditto": 666, + "Findl": 667, + "Lendflow": 668, + "Moderation": 669, + "Opendatasoft": 670, + "Podio": 671, + "Rockset": 672, + "Rownd": 673, + "Shotstack": 674, + "Swiftype": 675, + "Twitter": 676, + "Honey": 677, + "Freshdesk": 678, + "Upwave": 679, + "Fountain": 680, + "Freshbooks": 681, + "Mite": 682, + "Deputy": 683, + "Beebole": 684, + "Cashboard": 685, + "Kanban": 686, + "Worksnaps": 687, + "MyIntervals": 688, + "InvoiceOcean": 689, + "Sherpadesk": 690, + "Mrticktock": 691, + "Chatfule": 692, + "Aeroworkflow": 693, + "Emailoctopus": 694, + "Fusebill": 695, + "Geckoboard": 696, + "Gosquared": 697, + "Moonclerk": 698, + "Paymoapp": 699, + "Mixmax": 700, + "Processst": 701, + "Repairshopr": 702, + "Goshippo": 703, + "Sigopt": 704, + "Sugester": 705, + "Viewneo": 706, + "BoostNote": 707, + "CaptainData": 708, + "Checkvist": 709, + "Cliengo": 710, + "Cloze": 711, + "FormIO": 712, + "FormBucket": 713, + "GoCanvas": 714, + "MadKudu": 715, + "NozbeTeams": 716, + "Papyrs": 717, + "SuperNotesAPI": 718, + "Tallyfy": 719, + "ZenkitAPI": 720, + "CloudImage": 721, + "UploadCare": 722, + "Borgbase": 723, + "Pipedream": 724, + "Sirv": 725, + "Diffbot": 726, + "EightxEight": 727, + "Sendoso": 728, + "Printfection": 729, + "Authorize": 730, + "PandaScore": 731, + "Paymo": 732, + "AvazaPersonalAccessToken": 733, + "PlanviewLeanKit": 734, + "Livestorm": 735, + "KuCoin": 736, + "MetaAPI": 737, + "NiceHash": 738, + "CexIO": 739, + "Klipfolio": 740, + "Dynatrace": 741, + "MollieAPIKey": 742, + "MollieAccessToken": 743, + "BasisTheory": 744, + "Nordigen": 745, + "FlagsmithEnvironmentKey": 746, + "FlagsmithToken": 747, + "Mux": 748, + "Column": 749, + "Sendbird": 750, + "SendbirdOrganizationAPI": 751, + "Midise": 752, + "Mockaroo": 753, + "Image4": 754, + "Pinata": 755, + "BrowserStack": 756, + "CrossBrowserTesting": 757, + "Loadmill": 758, + "TestingBot": 759, + "KnapsackPro": 760, + "Qase": 761, + "Dareboost": 762, + "GTMetrix": 763, + "Holistic": 764, + "Parsers": 765, + "ScrutinizerCi": 766, + "SonarCloud": 767, + "APITemplate": 768, + "ConversionTools": 769, + "CraftMyPDF": 770, + "ExportSDK": 771, + "GlitterlyAPI": 772, + "Hybiscus": 773, + "Miro": 774, + "Statuspage": 775, + "Statuspal": 776, + "Teletype": 777, + "TimeCamp": 778, + "Userflow": 779, + "Wistia": 780, + "SportRadar": 781, + "UptimeRobot": 782, + "Codequiry": 783, + "ExtractorAPI": 784, + "Signable": 785, + "MagicBell": 786, + "Stormboard": 787, + "Apilayer": 788, + "Disqus": 789, + "Woopra": 790, + "Paperform": 791, + "Gumroad": 792, + "Paydirtapp": 793, + "Detectify": 794, + "Statuscake": 795, + "Jumpseller": 796, + "LunchMoney": 797, + "Rosette": 798, + "Yelp": 799, + "Atera": 800, + "EcoStruxureIT": 801, + "Aha": 802, + "Parsehub": 803, + "PackageCloud": 804, + "Cloudsmith": 805, + "Flowdash": 806, + "Flowdock": 807, + "Fibery": 808, + "Typetalk": 809, + "VoodooSMS": 810, + "ZulipChat": 811, + "Formcraft": 812, + "Iexapis": 813, + "Reachmail": 814, + "Chartmogul": 815, + "Appointedd": 816, + "Wit": 817, + "RechargePayments": 818, + "Diggernaut": 819, + "MonkeyLearn": 820, + "Duply": 821, + "Postbacks": 822, + "Collect2": 823, + "ZenRows": 824, + "Zipcodebase": 825, + "Tefter": 826, + "Twist": 827, + "BraintreePayments": 828, + "CloudConvert": 829, + "Grafana": 830, + "ConvertApi": 831, + "Transferwise": 832, + "Bulksms": 833, + "Databox": 834, + "Onesignal": 835, + "Rentman": 836, + "Parseur": 837, + "Docparser": 838, + "Formsite": 839, + "Tickettailor": 840, + "Lemlist": 841, + "Prodpad": 842, + "Formstack": 843, + "Codeclimate": 844, + "Codemagic": 845, + "Vbout": 846, + "Nightfall": 847, + "FlightLabs": 848, + "SpeechTextAI": 849, + "PollsAPI": 850, + "SimFin": 851, + "Scalr": 852, + "Kanbantool": 853, + "Brightlocal": 854, + "Hotwire": 855, + "Instabot": 856, + "Timekit": 857, + "Interseller": 858, + "Mojohelpdesk": 859, + "Createsend": 860, + "Getresponse": 861, + "Dynadot": 862, + "Demio": 863, + "Tokeet": 864, + "Myexperiment": 865, + "Copyscape": 866, + "Besnappy": 867, + "Salesmate": 868, + "Heatmapapi": 869, + "Websitepulse": 870, + "Uclassify": 871, + "Convert": 872, + "PDFmyURL": 873, + "Api2Convert": 874, + "Opsgenie": 875, + "Gemini": 876, + "Honeycomb": 877, + "KalturaAppToken": 878, + "KalturaSession": 879, + "BitGo": 880, + "Optidash": 881, + "Imgix": 882, + "ImageToText": 883, + "Page2Images": 884, + "Quickbase": 885, + "Redbooth": 886, + "Nubela": 887, + "Infobip": 888, + "Uproc": 889, + "Supportbee": 890, + "Aftership": 891, + "Edusign": 892, + "Teamup": 893, + "Workday": 894, + "MongoDB": 895, + "NGC": 896, + "DigitalOceanV2": 897, + "SQLServer": 898, + "FTP": 899, + "Redis": 900, + "LDAP": 901, + "Shopify": 902, + "RabbitMQ": 903, + "CustomRegex": 904, + "Etherscan": 905, + "Infura": 906, + "Alchemy": 907, + "BlockNative": 908, + "Moralis": 909, + "BscScan": 910, + "CoinMarketCap": 911, + "Percy": 912, + "TinesWebhook": 913, + "Pulumi": 914, + "SupabaseToken": 915, + "NuGetApiKey": 916, + "Aiven": 917, + "Prefect": 918, + "Docusign": 919, + "Couchbase": 920, + "Dockerhub": 921, + "TrufflehogEnterprise": 922, + "EnvoyApiKey": 923, + "GitHubOauth2": 924, + "Salesforce": 925, + "HuggingFace": 926, + "Snowflake": 927, + "Sourcegraph": 928, + "Tailscale": 929, + "Web3Storage": 930, + "AzureStorage": 931, + "PlanetScaleDb": 932, + "Anthropic": 933, + "Ramp": 934, + "Klaviyo": 935, + "SourcegraphCody": 936, + "Voiceflow": 937, + "Privacy": 938, + "IPInfo": 939, + "Ip2location": 940, + "Instamojo": 941, + "Portainer": 942, + "PortainerToken": 943, + "Loggly": 944, + "OpenVpn": 945, + "VagrantCloudPersonalToken": 946, + "BetterStack": 947, + "ZeroTier": 948, + "AppOptics": 949, + "Metabase": 950, + "CoinbaseWaaS": 951, + "LemonSqueezy": 952, + "Budibase": 953, + "DenoDeploy": 954, + "Stripo": 955, + "ReplyIO": 956, + "AzureBatch": 957, + "AzureContainerRegistry": 958, + "AWSSessionKey": 959, + "Coda": 960, + "LogzIO": 961, + "Eventbrite": 962, + "GrafanaServiceAccount": 963, + "RequestFinance": 964, + "Overloop": 965, + "Ngrok": 966, + "Replicate": 967, + "Postgres": 968, + "AzureActiveDirectoryApplicationSecret": 969, + "AzureCacheForRedisAccessKey": 970, + "AzureCosmosDBKeyIdentifiable": 971, + "AzureDevopsPersonalAccessToken": 972, + "AzureFunctionKey": 973, + "AzureMLWebServiceClassicIdentifiableKey": 974, + "AzureSasToken": 975, + "AzureSearchAdminKey": 976, + "AzureSearchQueryKey": 977, + "AzureManagementCertificate": 978, + "AzureSQL": 979, } ) @@ -3369,7 +3402,7 @@ var file_detectors_proto_rawDesc = []byte{ 0x44, 0x65, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x50, 0x4c, 0x41, 0x49, 0x4e, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x42, 0x41, 0x53, 0x45, 0x36, 0x34, 0x10, 0x02, 0x12, - 0x09, 0x0a, 0x05, 0x55, 0x54, 0x46, 0x31, 0x36, 0x10, 0x03, 0x2a, 0x82, 0x7a, 0x0a, 0x0c, 0x44, + 0x09, 0x0a, 0x05, 0x55, 0x54, 0x46, 0x31, 0x36, 0x10, 0x03, 0x2a, 0xd5, 0x7c, 0x0a, 0x0c, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x41, 0x6c, 0x69, 0x62, 0x61, 0x62, 0x61, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x41, 0x4d, 0x51, 0x50, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x57, 0x53, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x41, @@ -4345,12 +4378,33 @@ var file_detectors_proto_rawDesc = []byte{ 0x63, 0x65, 0x10, 0xc4, 0x07, 0x12, 0x0d, 0x0a, 0x08, 0x4f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x6f, 0x70, 0x10, 0xc5, 0x07, 0x12, 0x0a, 0x0a, 0x05, 0x4e, 0x67, 0x72, 0x6f, 0x6b, 0x10, 0xc6, 0x07, 0x12, 0x0e, 0x0a, 0x09, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x10, 0xc7, 0x07, - 0x12, 0x0d, 0x0a, 0x08, 0x50, 0x6f, 0x73, 0x74, 0x67, 0x72, 0x65, 0x73, 0x10, 0xc8, 0x07, 0x42, - 0x3d, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x74, 0x72, - 0x75, 0x66, 0x66, 0x6c, 0x65, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2f, 0x74, 0x72, - 0x75, 0x66, 0x66, 0x6c, 0x65, 0x68, 0x6f, 0x67, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x6b, 0x67, 0x2f, - 0x70, 0x62, 0x2f, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x70, 0x62, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x12, 0x0d, 0x0a, 0x08, 0x50, 0x6f, 0x73, 0x74, 0x67, 0x72, 0x65, 0x73, 0x10, 0xc8, 0x07, 0x12, + 0x2a, 0x0a, 0x25, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x44, 0x69, + 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x10, 0xc9, 0x07, 0x12, 0x20, 0x0a, 0x1b, 0x41, + 0x7a, 0x75, 0x72, 0x65, 0x43, 0x61, 0x63, 0x68, 0x65, 0x46, 0x6f, 0x72, 0x52, 0x65, 0x64, 0x69, + 0x73, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4b, 0x65, 0x79, 0x10, 0xca, 0x07, 0x12, 0x21, 0x0a, + 0x1c, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x44, 0x42, 0x4b, 0x65, + 0x79, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x10, 0xcb, 0x07, + 0x12, 0x23, 0x0a, 0x1e, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x44, 0x65, 0x76, 0x6f, 0x70, 0x73, 0x50, + 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x54, 0x6f, 0x6b, + 0x65, 0x6e, 0x10, 0xcc, 0x07, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x46, 0x75, + 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0x10, 0xcd, 0x07, 0x12, 0x2c, 0x0a, 0x27, + 0x41, 0x7a, 0x75, 0x72, 0x65, 0x4d, 0x4c, 0x57, 0x65, 0x62, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x69, 0x63, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, + 0x61, 0x62, 0x6c, 0x65, 0x4b, 0x65, 0x79, 0x10, 0xce, 0x07, 0x12, 0x12, 0x0a, 0x0d, 0x41, 0x7a, + 0x75, 0x72, 0x65, 0x53, 0x61, 0x73, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x10, 0xcf, 0x07, 0x12, 0x18, + 0x0a, 0x13, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x41, 0x64, 0x6d, + 0x69, 0x6e, 0x4b, 0x65, 0x79, 0x10, 0xd0, 0x07, 0x12, 0x18, 0x0a, 0x13, 0x41, 0x7a, 0x75, 0x72, + 0x65, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4b, 0x65, 0x79, 0x10, + 0xd1, 0x07, 0x12, 0x1f, 0x0a, 0x1a, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x4d, 0x61, 0x6e, 0x61, 0x67, + 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, + 0x10, 0xd2, 0x07, 0x12, 0x0d, 0x0a, 0x08, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x53, 0x51, 0x4c, 0x10, + 0xd3, 0x07, 0x42, 0x3d, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, + 0x2f, 0x74, 0x72, 0x75, 0x66, 0x66, 0x6c, 0x65, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, + 0x2f, 0x74, 0x72, 0x75, 0x66, 0x66, 0x6c, 0x65, 0x68, 0x6f, 0x67, 0x2f, 0x76, 0x33, 0x2f, 0x70, + 0x6b, 0x67, 0x2f, 0x70, 0x62, 0x2f, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x70, + 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/detectors.proto b/proto/detectors.proto index e73f68767..074322507 100644 --- a/proto/detectors.proto +++ b/proto/detectors.proto @@ -977,6 +977,17 @@ enum DetectorType { Ngrok = 966; Replicate = 967; Postgres = 968; + AzureActiveDirectoryApplicationSecret = 969; + AzureCacheForRedisAccessKey = 970; + AzureCosmosDBKeyIdentifiable = 971; + AzureDevopsPersonalAccessToken = 972; + AzureFunctionKey = 973; + AzureMLWebServiceClassicIdentifiableKey = 974; + AzureSasToken = 975; + AzureSearchAdminKey = 976; + AzureSearchQueryKey = 977; + AzureManagementCertificate = 978; + AzureSQL = 979; } message Result { From a1dc660f41350e4696b1fc5f691c7ef48e858a54 Mon Sep 17 00:00:00 2001 From: ahrav Date: Tue, 16 Jan 2024 11:55:17 -0800 Subject: [PATCH 15/35] [fixup ] - Allow ssh cloning with AWS Code Commit (#2307) --- pkg/sources/git/git.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/sources/git/git.go b/pkg/sources/git/git.go index 1237c904b..978a8352e 100644 --- a/pkg/sources/git/git.go +++ b/pkg/sources/git/git.go @@ -9,6 +9,7 @@ import ( "os" "os/exec" "path/filepath" + "regexp" "runtime" "strings" "sync/atomic" @@ -451,11 +452,18 @@ func CloneRepoUsingUnauthenticated(ctx context.Context, url string, args ...stri } // CloneRepoUsingSSH clones a repo using SSH. -func CloneRepoUsingSSH(ctx context.Context, gitUrl string, args ...string) (string, *git.Repository, error) { +func CloneRepoUsingSSH(ctx context.Context, gitURL string, args ...string) (string, *git.Repository, error) { + if isCodeCommitURL(gitURL) { + return CloneRepo(ctx, nil, gitURL, args...) + } userInfo := url.User("git") - return CloneRepo(ctx, userInfo, gitUrl, args...) + return CloneRepo(ctx, userInfo, gitURL, args...) } +var codeCommitRE = regexp.MustCompile(`ssh://git-codecommit\.[\w-]+\.amazonaws\.com`) + +func isCodeCommitURL(gitURL string) bool { return codeCommitRE.MatchString(gitURL) } + func (s *Git) CommitsScanned() uint64 { return atomic.LoadUint64(&s.metrics.commitsScanned) } From c5af979aeeefaab32ee1c92004af555041d58c6b Mon Sep 17 00:00:00 2001 From: Miccah Date: Tue, 16 Jan 2024 14:57:06 -0800 Subject: [PATCH 16/35] Assume unauthenticated github scans have public visibility (#2308) --- pkg/sources/github/github.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkg/sources/github/github.go b/pkg/sources/github/github.go index 83aa2fb6b..1035c34d3 100644 --- a/pkg/sources/github/github.go +++ b/pkg/sources/github/github.go @@ -357,6 +357,10 @@ func (s *Source) visibilityOf(ctx context.Context, repoURL string) (visibility s s.mu.Unlock() }() logger := s.log.WithValues("repo", repoURL) + if _, unauthenticated := s.conn.GetCredential().(*sourcespb.GitHub_Unauthenticated); unauthenticated { + logger.V(3).Info("assuming unauthenticated scan has public visibility") + return source_metadatapb.Visibility_public + } logger.V(2).Info("Checking public status") u, err := url.Parse(repoURL) if err != nil { @@ -379,10 +383,6 @@ func (s *Source) visibilityOf(ctx context.Context, repoURL string) (visibility s } } if err != nil || gist == nil { - if _, unauthenticated := s.conn.GetCredential().(*sourcespb.GitHub_Unauthenticated); unauthenticated { - logger.Info("Unauthenticated scans cannot determine if a repository is private.") - visibility = source_metadatapb.Visibility_private - } logger.Error(err, "Could not get Github repository") return } @@ -402,10 +402,6 @@ func (s *Source) visibilityOf(ctx context.Context, repoURL string) (visibility s } if err != nil || repo == nil { logger.Error(err, "Could not get Github repository") - if _, unauthenticated := s.conn.GetCredential().(*sourcespb.GitHub_Unauthenticated); unauthenticated { - logger.Info("Unauthenticated scans cannot determine if a repository is private.") - visibility = source_metadatapb.Visibility_private - } return } if *repo.Private { From b0fd951652a50ffb1911073f0bfb6a8ade7afc37 Mon Sep 17 00:00:00 2001 From: ahrav Date: Tue, 16 Jan 2024 15:25:26 -0800 Subject: [PATCH 17/35] [chore] - Add regex and keyword for api_org tokens (#2240) * Add regex and keyword for api_org tokens. * handle org token auth struct * update keywords --- pkg/detectors/huggingface/huggingface.go | 31 ++++++++++++++++++------ 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/pkg/detectors/huggingface/huggingface.go b/pkg/detectors/huggingface/huggingface.go index 725c3678c..4bdf14c9a 100644 --- a/pkg/detectors/huggingface/huggingface.go +++ b/pkg/detectors/huggingface/huggingface.go @@ -23,13 +23,13 @@ var _ detectors.Detector = (*Scanner)(nil) var ( defaultClient = common.SaneHttpClient() // Make sure that your group is surrounded in boundary characters such as below to reduce false positives. - keyPat = regexp.MustCompile(`\bhf_[a-zA-Z0-9]{34}\b`) + keyPat = regexp.MustCompile(`\b(?:hf_|api_org_)[a-zA-Z0-9]{34}\b`) ) // Keywords are used for efficiently pre-filtering chunks. // Use identifiers in the secret preferably, or the provider name. func (s Scanner) Keywords() []string { - return []string{"huggingface", "hugging_face", "hf"} // Huggingface docs occasionally use "hf" instead of "huggingface" + return []string{"hf_", "api_org_"} // Huggingface docs occasionally use "hf" instead of "huggingface" } // FromData will find and optionally verify Huggingface secrets in a given set of bytes. @@ -92,15 +92,29 @@ func (s Scanner) verifyResult(ctx context.Context, apiKey string) (bool, map[str return true, nil, err } - t := whoamiRes.Auth.AccessToken + var tokenInfo string + switch { + case whoamiRes.Auth.AccessToken.DisplayName != "" || whoamiRes.Auth.AccessToken.Role != "": + // hf_xxxx token + t := whoamiRes.Auth.AccessToken + tokenInfo = fmt.Sprintf("%s (%s)", t.DisplayName, t.Role) + + case whoamiRes.Auth.Type != "": + // api_org_xxxx token + tokenInfo = whoamiRes.Auth.Type + + default: + tokenInfo = "Unknown Token Type" + } + extraData := map[string]string{ "Username": whoamiRes.Name, "Email": whoamiRes.Email, - "Token": fmt.Sprintf("%s (%s)", t.DisplayName, t.Role), + "Token": tokenInfo, } // Condense a list of organizations + roles. - var orgs []string + orgs := make([]string, 0, len(whoamiRes.Organizations)) for _, org := range whoamiRes.Organizations { orgs = append(orgs, fmt.Sprintf("%s:%s", org.Name, org.Role)) } @@ -136,7 +150,8 @@ type organization struct { type auth struct { AccessToken struct { - DisplayName string `json:"displayName"` - Role string `json:"role"` - } `json:"accessToken"` + DisplayName string `json:"displayName,omitempty"` + Role string `json:"role,omitempty"` + } `json:"accessToken,omitempty"` + Type string `json:"type,omitempty"` } From 8380e1713ea5d3fc21c2f1256ab703f2af30b0de Mon Sep 17 00:00:00 2001 From: ahrav Date: Thu, 18 Jan 2024 13:20:06 -0800 Subject: [PATCH 18/35] save 8 bytes per chunk (#2310) --- pkg/sources/sources.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/sources/sources.go b/pkg/sources/sources.go index aa1c29341..dca8ed939 100644 --- a/pkg/sources/sources.go +++ b/pkg/sources/sources.go @@ -18,6 +18,9 @@ type ( // Chunk contains data to be decoded and scanned along with context on where it came from. type Chunk struct { + // Data is the data to decode and scan. + Data []byte + // SourceName is the name of the Source that produced the chunk. SourceName string // SourceID is the ID of the source that the Chunk originated from. @@ -27,13 +30,12 @@ type Chunk struct { // SecretID is the ID of the secret, if it exists. // Only secrets that are being reverified will have a SecretID. SecretID int64 - // SourceType is the type of Source that produced the chunk. - SourceType sourcespb.SourceType + // SourceMetadata holds the context of where the Chunk was found. SourceMetadata *source_metadatapb.MetaData + // SourceType is the type of Source that produced the chunk. + SourceType sourcespb.SourceType - // Data is the data to decode and scan. - Data []byte // Verify specifies whether any secrets in the Chunk should be verified. Verify bool } From 8e9bf8aa6d51b53d7af7a95e0779244b41c7988b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 Jan 2024 13:31:09 -0800 Subject: [PATCH 19/35] fix(deps): update module github.com/hashicorp/golang-lru to v2 (#2054) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Dustin Decker --- go.mod | 2 +- go.sum | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 2305c8066..f59530c64 100644 --- a/go.mod +++ b/go.mod @@ -46,7 +46,7 @@ require ( github.com/googleapis/gax-go/v2 v2.12.0 github.com/h2non/filetype v1.1.3 github.com/hashicorp/go-retryablehttp v0.7.5 - github.com/hashicorp/golang-lru v0.6.0 + github.com/hashicorp/golang-lru v0.5.1 github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/jlaffaye/ftp v0.2.0 github.com/joho/godotenv v1.5.1 diff --git a/go.sum b/go.sum index 401bd150c..b30bff0ba 100644 --- a/go.sum +++ b/go.sum @@ -430,6 +430,7 @@ github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9 github.com/hashicorp/go-retryablehttp v0.7.5 h1:bJj+Pj19UZMIweq/iie+1u5YCdGrnxCT9yvm0e+Nd5M= github.com/hashicorp/go-retryablehttp v0.7.5/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.6.0 h1:uL2shRDx7RTrOrTCUZEGP/wJUFiUI8QT6E7z5o8jga4= github.com/hashicorp/golang-lru v0.6.0/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= From d3d551d24eb9200f3c7586354ec2eb3e8aacda77 Mon Sep 17 00:00:00 2001 From: ahrav Date: Sat, 20 Jan 2024 13:31:27 -0800 Subject: [PATCH 20/35] [chore] - Update Chunk struct comment (#2317) * update comment to include information on the importance of struct ordering * more cute tricks * remove cute tricks --- pkg/sources/sources.go | 5 +++++ pkg/sources/sources_test.go | 14 ++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkg/sources/sources_test.go diff --git a/pkg/sources/sources.go b/pkg/sources/sources.go index dca8ed939..c0cc03fbf 100644 --- a/pkg/sources/sources.go +++ b/pkg/sources/sources.go @@ -17,6 +17,11 @@ type ( ) // Chunk contains data to be decoded and scanned along with context on where it came from. +// +// **Important:** The order of the fields in this struct is specifically designed to optimize +// struct alignment and minimize memory usage. Do not change the field order without carefully considering +// the potential impact on memory consumption. +// Ex: https://go.dev/play/p/Azf4a7O-DhC type Chunk struct { // Data is the data to decode and scan. Data []byte diff --git a/pkg/sources/sources_test.go b/pkg/sources/sources_test.go new file mode 100644 index 000000000..49fd853fb --- /dev/null +++ b/pkg/sources/sources_test.go @@ -0,0 +1,14 @@ +package sources + +import ( + "testing" + "unsafe" + + "github.com/stretchr/testify/assert" +) + +// TestChunkSize ensures that the Chunk struct does not exceed 80 bytes. +func TestChunkSize(t *testing.T) { + t.Parallel() + assert.Equal(t, unsafe.Sizeof(Chunk{}), uintptr(80), "Chunk struct size exceeds 80 bytes") +} From 1e3f179f73336daa5f50906c4d45eff37c8eee51 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 Jan 2024 14:14:18 -0800 Subject: [PATCH 21/35] fix(deps): update golang.org/x/exp digest to 1b97071 (#2318) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 14 +++++++------- go.sum | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index f59530c64..512eea956 100644 --- a/go.mod +++ b/go.mod @@ -76,11 +76,11 @@ require ( go.mongodb.org/mongo-driver v1.12.1 go.uber.org/mock v0.3.0 go.uber.org/zap v1.26.0 - golang.org/x/crypto v0.17.0 - golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e - golang.org/x/net v0.19.0 + golang.org/x/crypto v0.18.0 + golang.org/x/exp v0.0.0-20240119083558-1b970713d09a + golang.org/x/net v0.20.0 golang.org/x/oauth2 v0.15.0 - golang.org/x/sync v0.5.0 + golang.org/x/sync v0.6.0 golang.org/x/text v0.14.0 google.golang.org/api v0.152.0 google.golang.org/protobuf v1.31.0 @@ -252,10 +252,10 @@ require ( go.uber.org/multierr v1.11.0 // indirect go4.org v0.0.0-20200411211856-f5505b9728dd // indirect golang.org/x/mod v0.14.0 // indirect - golang.org/x/sys v0.15.0 // indirect - golang.org/x/term v0.15.0 // indirect + golang.org/x/sys v0.16.0 // indirect + golang.org/x/term v0.16.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.16.0 // indirect + golang.org/x/tools v0.17.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect diff --git a/go.sum b/go.sum index b30bff0ba..9a931d13d 100644 --- a/go.sum +++ b/go.sum @@ -741,6 +741,8 @@ golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= +golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -755,6 +757,8 @@ golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcH golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e h1:723BNChdd0c2Wk6WOE320qGBiPtYx0F0Bbm1kriShfE= golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= +golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA= +golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -808,6 +812,8 @@ golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -826,6 +832,8 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -874,6 +882,8 @@ golang.org/x/sys v0.8.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 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= @@ -883,6 +893,8 @@ golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= +golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= +golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -935,6 +947,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM= golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= +golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= +golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 4afc224c635d10e732119f715f93788af1502ce4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 21 Jan 2024 13:04:07 -0800 Subject: [PATCH 22/35] fix(deps): update module github.com/couchbase/gocb/v2 to v2.7.1 (#2320) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 28 ++++++++++++++++------------ go.sum | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 512eea956..e9aef90b1 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/charmbracelet/glamour v0.6.0 github.com/charmbracelet/lipgloss v0.9.1 github.com/coinbase/waas-client-library-go v1.0.8 - github.com/couchbase/gocb/v2 v2.7.0 + github.com/couchbase/gocb/v2 v2.7.1 github.com/crewjam/rfc5424 v0.1.0 github.com/denisenkom/go-mssqldb v0.12.3 github.com/envoyproxy/protoc-gen-validate v1.0.2 @@ -42,7 +42,7 @@ require ( github.com/google/go-cmp v0.6.0 github.com/google/go-containerregistry v0.17.0 github.com/google/go-github/v42 v42.0.0 - github.com/google/uuid v1.4.0 + github.com/google/uuid v1.5.0 github.com/googleapis/gax-go/v2 v2.12.0 github.com/h2non/filetype v1.1.3 github.com/hashicorp/go-retryablehttp v0.7.5 @@ -83,14 +83,14 @@ require ( golang.org/x/sync v0.6.0 golang.org/x/text v0.14.0 google.golang.org/api v0.152.0 - google.golang.org/protobuf v1.31.0 + google.golang.org/protobuf v1.32.0 gopkg.in/h2non/gock.v1 v1.1.2 pgregory.net/rapid v1.1.0 sigs.k8s.io/yaml v1.4.0 ) require ( - cloud.google.com/go v0.110.10 // indirect + cloud.google.com/go v0.111.0 // indirect cloud.google.com/go/compute v1.23.3 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v1.1.5 // indirect @@ -141,9 +141,9 @@ require ( github.com/cloudflare/circl v1.3.7 // indirect github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect - github.com/couchbase/gocbcore/v10 v10.3.0 // indirect - github.com/couchbase/gocbcoreps v0.1.0 // indirect - github.com/couchbase/goprotostellar v1.0.0 // indirect + github.com/couchbase/gocbcore/v10 v10.3.1 // indirect + github.com/couchbase/gocbcoreps v0.1.1 // indirect + github.com/couchbase/goprotostellar v1.0.1 // indirect github.com/couchbaselabs/gocbconnstr/v2 v2.0.0-20230515165046-68b522a21131 // indirect github.com/cyphar/filepath-securejoin v0.2.4 // indirect github.com/danieljoos/wincred v1.1.2 // indirect @@ -161,6 +161,7 @@ require ( github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-git/go-billy/v5 v5.5.0 // indirect + github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/goccy/go-json v0.10.0 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect @@ -249,6 +250,9 @@ require ( github.com/zeebo/xxh3 v1.0.2 // indirect go.einride.tech/aip v0.60.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/otel v1.19.0 // indirect + go.opentelemetry.io/otel/metric v1.19.0 // indirect + go.opentelemetry.io/otel/trace v1.19.0 // indirect go.uber.org/multierr v1.11.0 // indirect go4.org v0.0.0-20200411211856-f5505b9728dd // indirect golang.org/x/mod v0.14.0 // indirect @@ -257,11 +261,11 @@ require ( golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.17.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect - google.golang.org/grpc v1.59.0 // indirect + google.golang.org/appengine v1.6.8 // indirect + google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect + google.golang.org/grpc v1.60.1 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 9a931d13d..9eefcaf36 100644 --- a/go.sum +++ b/go.sum @@ -9,6 +9,8 @@ cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6T cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= cloud.google.com/go v0.110.10 h1:LXy9GEO+timppncPIAZoOj3l58LIU9k+kn48AN7IO3Y= cloud.google.com/go v0.110.10/go.mod h1:v1OoFqYxiBkUrruItNM3eT4lLByNjxmJSV/xDKJNnic= +cloud.google.com/go v0.111.0 h1:YHLKNupSD1KqjDbQ3+LVdQ81h/UJbJyZG203cEfnQgM= +cloud.google.com/go v0.111.0/go.mod h1:0mibmpKP1TyOOFYQY5izo0LnT+ecvOQ0Sg3OdmMiNRU= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= @@ -202,12 +204,20 @@ github.com/containerd/stargz-snapshotter/estargz v0.14.3 h1:OqlDCK3ZVUO6C3B/5FSk github.com/containerd/stargz-snapshotter/estargz v0.14.3/go.mod h1:KY//uOCIkSuNAHhJogcZtrNHdKrA99/FCCRjE3HD36o= github.com/couchbase/gocb/v2 v2.7.0 h1:zU/Eh9+RIS1TvQFiEF4JBajMm9VTjkeQssE9ov7F87c= github.com/couchbase/gocb/v2 v2.7.0/go.mod h1:IHq/c3cnrqKq9scFQJ8OyD/xhqZ0b4mHYVH6VEMnsnw= +github.com/couchbase/gocb/v2 v2.7.1 h1:Wy5IufpGWDStErhe9bNxXdiHpXf4LIhEpWnR7gJcme0= +github.com/couchbase/gocb/v2 v2.7.1/go.mod h1:tn/jNMSMGwEB2Dd1uHW/aTwScx1lXZqb9oM0zyWeEUg= github.com/couchbase/gocbcore/v10 v10.3.0 h1:cu5KWP5Yq9cANw0UitpKWmb8mv9NDhC0ApIf9rMrVq8= github.com/couchbase/gocbcore/v10 v10.3.0/go.mod h1:lYQIIk+tzoMcwtwU5GzPbDdqEkwkH3isI2rkSpfL0oM= +github.com/couchbase/gocbcore/v10 v10.3.1 h1:dx+lub02eDYiQXavtF0EwYMppVUcbjCxAAqa6/nQldg= +github.com/couchbase/gocbcore/v10 v10.3.1/go.mod h1:lYQIIk+tzoMcwtwU5GzPbDdqEkwkH3isI2rkSpfL0oM= github.com/couchbase/gocbcoreps v0.1.0 h1:9+Qq+H/YXYn+H6f5A5MndUv40qdCwPwoJjinHolxq2g= github.com/couchbase/gocbcoreps v0.1.0/go.mod h1:LjH33s/LNVBAwVU1Ka/YU3cLkuAyFC2dzGGiValJ5oY= +github.com/couchbase/gocbcoreps v0.1.1 h1:H5Q/TVmRqEpcdTDlepwAmLW7cemP9Di6Lp91Qa9oz1A= +github.com/couchbase/gocbcoreps v0.1.1/go.mod h1:tpbHglpBO7DZZmr8XhHe7INj5VJcJ3i+41Ktep9lejI= github.com/couchbase/goprotostellar v1.0.0 h1:umfH4hOxrUS/0QY1AkdoVcpp9rg7Jl+UNWzNJ3KxIHc= github.com/couchbase/goprotostellar v1.0.0/go.mod h1:gs1eioLVOHETTFWxDY4v7Q/kRPMgqmX6t/TPcI429ls= +github.com/couchbase/goprotostellar v1.0.1 h1:mtDVYTgnnDSQ3t7mQRG6jl/tOXKOuuFM9PakqC1qhCY= +github.com/couchbase/goprotostellar v1.0.1/go.mod h1:gs1eioLVOHETTFWxDY4v7Q/kRPMgqmX6t/TPcI429ls= github.com/couchbaselabs/gocaves/client v0.0.0-20230307083111-cc3960c624b1/go.mod h1:AVekAZwIY2stsJOMWLAS/0uA/+qdp7pjO8EHnl61QkY= github.com/couchbaselabs/gocaves/client v0.0.0-20230404095311-05e3ba4f0259 h1:2TXy68EGEzIMHOx9UvczR5ApVecwCfQZ0LjkmwMI6g4= github.com/couchbaselabs/gocaves/client v0.0.0-20230404095311-05e3ba4f0259/go.mod h1:AVekAZwIY2stsJOMWLAS/0uA/+qdp7pjO8EHnl61QkY= @@ -289,8 +299,11 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb github.com/go-ldap/ldap/v3 v3.4.6 h1:ert95MdbiG7aWo/oPYp9btL3KJlMPKnP58r09rI8T+A= github.com/go-ldap/ldap/v3 v3.4.6/go.mod h1:IGMQANNtxpsOzj7uUAMjpGBaOVTC4DYyIy8VsTdxmtc= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= @@ -349,6 +362,7 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -398,6 +412,8 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= +github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= @@ -713,6 +729,12 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= +go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= +go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE= +go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8= +go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg= +go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= 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 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= @@ -974,6 +996,8 @@ google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -991,10 +1015,16 @@ google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 h1:wpZ8pe2x1Q3f2KyT5f8oP/fa9rHAKgFPr/HZdNuS+PQ= google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:J7XzRzVy1+IPwWHZUzoD0IccYZIrXILAQpc+Qy9CMhY= +google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 h1:nz5NESFLZbJGPFxDT/HCn+V1mZ8JGNoY4nUpmW/Y2eg= +google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917/go.mod h1:pZqR+glSb11aJ+JQcczCvgf47+duRuzNSKqE8YAQnV0= google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo= google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4= +google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 h1:s1w3X6gQxwrLEpxnLd/qXTVLgQE2yXwaOaoa6IlY/+o= +google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0/go.mod h1:CAny0tYF+0/9rmDB9fahA9YLzX3+AEVl1qXbv5hhj6c= google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I= google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 h1:gphdwh0npgs8elJ4T6J+DQJHPVF7RsuJHCfwztUb4J4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1/go.mod h1:daQN87bsDqDoe316QbbvX60nMoJQa4r6Ds0ZuoAe5yA= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -1007,6 +1037,8 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= +google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU= +google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1020,6 +1052,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 09feb906f585080e9392521f4806c42b9955ef9b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 21 Jan 2024 19:55:32 -0800 Subject: [PATCH 23/35] fix(deps): update module github.com/envoyproxy/protoc-gen-validate to v1.0.4 (#2322) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index e9aef90b1..d02cbca78 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/couchbase/gocb/v2 v2.7.1 github.com/crewjam/rfc5424 v0.1.0 github.com/denisenkom/go-mssqldb v0.12.3 - github.com/envoyproxy/protoc-gen-validate v1.0.2 + github.com/envoyproxy/protoc-gen-validate v1.0.4 github.com/fatih/color v1.16.0 github.com/felixge/fgprof v0.9.3 github.com/gabriel-vasile/mimetype v1.4.3 diff --git a/go.sum b/go.sum index 9eefcaf36..9e4ea8f76 100644 --- a/go.sum +++ b/go.sum @@ -264,6 +264,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA= github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE= +github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= +github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g= From e803e689c1e3f2b5c01dc5e7d2a082a3b4b69c61 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 21 Jan 2024 20:30:17 -0800 Subject: [PATCH 24/35] fix(deps): update module github.com/aws/aws-sdk-go to v1.50.0 (#2325) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index d02cbca78..374eafb40 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/BobuSumisu/aho-corasick v1.0.3 github.com/TheZeroSlave/zapsentry v1.19.0 github.com/alecthomas/kingpin/v2 v2.4.0 - github.com/aws/aws-sdk-go v1.49.19 + github.com/aws/aws-sdk-go v1.50.0 github.com/aymanbagabas/go-osc52 v1.2.2 github.com/bill-rich/go-syslog v0.0.0-20220413021637-49edb52a574c github.com/bitfinexcom/bitfinex-api-go v0.0.0-20210608095005-9e0b26f200fb diff --git a/go.sum b/go.sum index 9e4ea8f76..3a2baed76 100644 --- a/go.sum +++ b/go.sum @@ -114,6 +114,8 @@ github.com/aws/aws-sdk-go v1.49.18 h1:g/iMXkfXeJQ7MvnLwroxWsTTNkHtdVJGxIgrAIEG62 github.com/aws/aws-sdk-go v1.49.18/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-sdk-go v1.49.19 h1:oZryiqeQpeJsIcAmZlp86duMu/s/DJ43qyfwa51qmLg= github.com/aws/aws-sdk-go v1.49.19/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.50.0 h1:HBtrLeO+QyDKnc3t1+5DR1RxodOHCGr8ZcrHudpv7jI= +github.com/aws/aws-sdk-go v1.50.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-sdk-go-v2 v1.17.7 h1:CLSjnhJSTSogvqUGhIC6LqFKATMRexcxLZ0i/Nzk9Eg= github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs= From 383f8a1f67c7172ab0606ef1605631e33408f4d3 Mon Sep 17 00:00:00 2001 From: ahrav Date: Mon, 22 Jan 2024 09:40:32 -0800 Subject: [PATCH 25/35] [chore] - reduce test time (#2321) * reduce test time * remove commented out code --- pkg/gitparse/gitparse_test.go | 60 +++++++++++------------------------ 1 file changed, 18 insertions(+), 42 deletions(-) diff --git a/pkg/gitparse/gitparse_test.go b/pkg/gitparse/gitparse_test.go index f343aead0..fa35ebf71 100644 --- a/pkg/gitparse/gitparse_test.go +++ b/pkg/gitparse/gitparse_test.go @@ -741,16 +741,6 @@ func TestIndividualCommitParsing(t *testing.T) { } j++ } - //for _, pass := range test.passes { - // if !test.function(false, pass.latestState, pass.line) { - // t.Errorf("%s: Parser did not recognize correct line. (%s)", name, string(pass.line)) - // } - //} - //for _, fail := range test.fails { - // if test.function(false, fail.latestState, fail.line) { - // t.Errorf("%s: Parser did not recognize incorrect line. (%s)", name, string(fail.line)) - // } - //} } } @@ -802,24 +792,6 @@ func TestStagedDiffParsing(t *testing.T) { Content: *bytes.NewBuffer([]byte("The Nameless is the origin of Heaven and Earth;\nThe named is the mother of all things.\n\nTherefore let there always be non-being,\n so we may see their subtlety,\nAnd let there always be being,\n so we may see their outcome.\nThe two are the same,\nBut after they are produced,\n they have different names.\nThey both may be called deep and profound.\nDeeper and more profound,\nThe door of all subtleties!\n")), IsBinary: false, }, - //{ - // PathB: "", - // LineStart: 0, - // Content: *bytes.NewBuffer([]byte("\n")), - // IsBinary: false, - //}, - //{ - // PathB: "", - // LineStart: 0, - // Content: *bytes.NewBuffer([]byte("\n")), - // IsBinary: false, - //}, - //{ - // PathB: "", - // LineStart: 0, - // Content: *bytes.NewBuffer([]byte("\n")), - // IsBinary: false, - //}, }, }, } @@ -1112,27 +1084,31 @@ index 0000000..5af88a8 func TestMaxDiffSize(t *testing.T) { parser := NewParser() - bigBytes := bytes.Buffer{} - bigBytes.WriteString(singleCommitSingleDiff) + builder := strings.Builder{} + builder.WriteString(singleCommitSingleDiff) + + // Generate a diff that is larger than the maxDiffSize. for i := 0; i <= parser.maxDiffSize/1024+10; i++ { - bigBytes.WriteString("+") - for n := 0; n < 1024; n++ { - bigBytes.Write([]byte("0")) - } - bigBytes.WriteString("\n") + builder.WriteString("+" + strings.Repeat("0", 1024) + "\n") } - bigReader := bytes.NewReader(bigBytes.Bytes()) + bigReader := strings.NewReader(builder.String()) + + commitChan := make(chan Commit, 1) // Buffer to prevent blocking + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) // Timeout to prevent long wait + defer cancel() - commitChan := make(chan Commit) go func() { - parser.FromReader(context.Background(), bigReader, commitChan, false) + parser.FromReader(ctx, bigReader, commitChan, false) }() - commit := <-commitChan - if commit.Diffs[0].Content.Len() > parser.maxDiffSize+1024 { - t.Errorf("diff did not match MaxDiffSize. Got: %d, expected (max): %d", commit.Diffs[0].Content.Len(), parser.maxDiffSize+1024) + select { + case commit := <-commitChan: + if commit.Diffs[0].Content.Len() > parser.maxDiffSize+1024 { + t.Errorf("diff did not match MaxDiffSize. Got: %d, expected (max): %d", commit.Diffs[0].Content.Len(), parser.maxDiffSize+1024) + } + case <-ctx.Done(): + t.Fatal("Test timed out") } - } func TestMaxCommitSize(t *testing.T) { From 2d96b895548c7c701c2c568126e75e0acb387a33 Mon Sep 17 00:00:00 2001 From: Miccah Date: Mon, 22 Jan 2024 11:47:45 -0800 Subject: [PATCH 26/35] Add prometheus metrics to measure hook execution time (#2312) * Add prometheus metrics to measure hook execution time * Move metrics to separate file and reduce buckets --- pkg/sources/job_progress.go | 4 ++++ pkg/sources/metrics.go | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 pkg/sources/metrics.go diff --git a/pkg/sources/job_progress.go b/pkg/sources/job_progress.go index d7bbc5b83..029e758fa 100644 --- a/pkg/sources/job_progress.go +++ b/pkg/sources/job_progress.go @@ -183,6 +183,10 @@ func (jp *JobProgress) TrackProgress(progress *Progress) { // executeHooks is a helper method to execute all the hooks for the given // closure. func (jp *JobProgress) executeHooks(todo func(hook JobProgressHook)) { + defer func(start time.Time) { + elapsed := time.Since(start).Milliseconds() + hooksExecTime.WithLabelValues().Observe(float64(elapsed)) + }(time.Now()) for _, hook := range jp.hooks { // TODO: Non-blocking? todo(hook) diff --git a/pkg/sources/metrics.go b/pkg/sources/metrics.go new file mode 100644 index 000000000..158059da7 --- /dev/null +++ b/pkg/sources/metrics.go @@ -0,0 +1,17 @@ +package sources + +import ( + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promauto" + "github.com/trufflesecurity/trufflehog/v3/pkg/common" +) + +var ( + hooksExecTime = promauto.NewHistogramVec(prometheus.HistogramOpts{ + Namespace: common.MetricsNamespace, + Subsystem: common.MetricsSubsystem, + Name: "hooks_exec_time_ms", + Help: "Time spent executing hooks (ms)", + Buckets: []float64{5, 50, 500, 1000}, + }, nil) +) From 443ef98e41badaef2f17f1bed80aac9fd8fc2b91 Mon Sep 17 00:00:00 2001 From: joeleonjr <20135619+joeleonjr@users.noreply.github.com> Date: Mon, 22 Jan 2024 16:57:51 -0500 Subject: [PATCH 27/35] updating detector logic for zenscrape (#2316) * updating detector logic for zenscrape * updating to use status endpoint --- pkg/detectors/zenscrape/zenscrape.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkg/detectors/zenscrape/zenscrape.go b/pkg/detectors/zenscrape/zenscrape.go index 1ec246c1f..08b93f7cd 100644 --- a/pkg/detectors/zenscrape/zenscrape.go +++ b/pkg/detectors/zenscrape/zenscrape.go @@ -2,7 +2,6 @@ package zenscrape import ( "context" - "io" "net/http" "regexp" "strings" @@ -48,7 +47,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result } if verify { - req, err := http.NewRequestWithContext(ctx, "GET", "https://app.zenscrape.com/api/v1/get?url=http://www.google.com", nil) + req, err := http.NewRequestWithContext(ctx, "GET", "https://app.zenscrape.com/api/v1/status", nil) if err != nil { continue } @@ -56,20 +55,13 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result res, err := client.Do(req) if err == nil { defer res.Body.Close() - bodyBytes, err := io.ReadAll(res.Body) - if err != nil { - continue - } - body := string(bodyBytes) - - if !strings.Contains(body, "Not enough requests.") { + if (res.StatusCode >= 200 && res.StatusCode < 300) || res.StatusCode == 429 { s1.Verified = true } else { if detectors.IsKnownFalsePositive(resMatch, detectors.DefaultFalsePositives, true) { continue } } - } } From 05d189c9772ec706529e318c47eecf5baf38318c Mon Sep 17 00:00:00 2001 From: joeleonjr <20135619+joeleonjr@users.noreply.github.com> Date: Tue, 23 Jan 2024 13:27:50 -0500 Subject: [PATCH 28/35] fixing incorrect acct num id for some aws keys (#2332) --- pkg/common/utils.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/common/utils.go b/pkg/common/utils.go index 2e2a2ff0f..e82de96a8 100644 --- a/pkg/common/utils.go +++ b/pkg/common/utils.go @@ -61,6 +61,9 @@ func GetAccountNumFromAWSID(AWSID string) (string, error) { if len(AWSID) < 4 { return "", fmt.Errorf("AWSID is too short") } + if AWSID[4] == 'I' || AWSID[4] == 'J' { + return "", fmt.Errorf("Can't get account number from AKIAJ/ASIAJ or AKIAI/ASIAI keys") + } trimmedAWSID := AWSID[4:] decodedBytes, err := base32.StdEncoding.WithPadding(base32.NoPadding).DecodeString(strings.ToUpper(trimmedAWSID)) if err != nil { From e0a1b11a8e4c29f0748f540c127f0bab0331ebdc Mon Sep 17 00:00:00 2001 From: Cody Rose Date: Tue, 23 Jan 2024 14:42:31 -0500 Subject: [PATCH 29/35] Narrow Postgres detector to only look for URIs (#2314) --- pkg/detectors/postgres/postgres.go | 318 +++++++++++------------- pkg/detectors/postgres/postgres_test.go | 282 +++++++++++++-------- pkg/engine/defaults.go | 4 +- 3 files changed, 321 insertions(+), 283 deletions(-) diff --git a/pkg/detectors/postgres/postgres.go b/pkg/detectors/postgres/postgres.go index cb22536cd..183b37d4c 100644 --- a/pkg/detectors/postgres/postgres.go +++ b/pkg/detectors/postgres/postgres.go @@ -3,63 +3,133 @@ package postgres import ( "context" "database/sql" + "errors" "fmt" - "net/url" + "net" "regexp" + "strconv" "strings" "time" - _ "github.com/lib/pq" // PostgreSQL driver + "github.com/lib/pq" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" "github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb" ) const ( defaultPort = "5432" - defaultHost = "localhost" + + pg_connect_timeout = "connect_timeout" + pg_dbname = "dbname" + pg_host = "host" + pg_password = "password" + pg_port = "port" + pg_requiressl = "requiressl" + pg_sslmode = "sslmode" + pg_sslmode_allow = "allow" + pg_sslmode_disable = "disable" + pg_sslmode_prefer = "prefer" + pg_sslmode_require = "require" + pg_user = "user" ) +// This detector currently only finds Postgres connection string URIs +// (https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING-URIS) When it finds one, it uses +// pq.ParseURI to normalize this into space-separated key-value pair Postgres connection string, and then uses a regular +// expression to transform this connection string into a parameters map. This parameters map is manipulated prior to +// verification, which operates by transforming the map back into a space-separated kvp connection string. This is kind +// of clunky overall, but it has the benefit of preserving the connection string as a map when it needs to be modified, +// which is much nicer than having to patch a space-separated string of kvps. + +// Multi-host connection string URIs are currently not supported because pq.ParseURI doesn't parse them correctly. If we +// happen to run into a case where this matters we can address it then. var ( - _ detectors.Detector = (*Scanner)(nil) - uriPattern = regexp.MustCompile(`\b(?i)postgresql://[\S]+\b`) - hostnamePattern = regexp.MustCompile(`(?i)(?:host|server|address).{0,40}?(\b[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*\b)`) - portPattern = regexp.MustCompile(`(?i)(?:port|p).{0,40}?(\b[0-9]{1,5}\b)`) - usernamePattern = regexp.MustCompile(`(?im)(?:user|usr)\S{0,40}?[:=\s]{1,3}[ '"=]{0,1}([^:'"\s]{4,40})`) - passwordPattern = regexp.MustCompile(`(?im)(?:pass)\S{0,40}?[:=\s]{1,3}[ '"=]{0,1}([^:'"\s]{4,40})`) + _ detectors.Detector = (*Scanner)(nil) + uriPattern = regexp.MustCompile(`\b(?i)postgres(?:ql)?://\S+\b`) + connStrPartPattern = regexp.MustCompile(`([[:alpha:]]+)='(.+?)' ?`) ) -type Scanner struct{} +type Scanner struct { + detectLoopback bool // Automated tests run against localhost, but we want to ignore those results in the wild +} func (s Scanner) Keywords() []string { - return []string{"postgres", "psql", "pghost"} + return []string{"postgres"} } func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) ([]detectors.Result, error) { var results []detectors.Result - var pgURLs []url.URL - pgURLs = append(pgURLs, findUriMatches(string(data))) - pgURLs = append(pgURLs, findComponentMatches(verify, string(data))...) + candidateParamSets := findUriMatches(data) - for _, pgURL := range pgURLs { - if pgURL.User == nil { + for _, params := range candidateParamSets { + user, ok := params[pg_user] + if !ok { continue } - username := pgURL.User.Username() - password, _ := pgURL.User.Password() - hostport := pgURL.Host + + password, ok := params[pg_password] + if !ok { + continue + } + + host, ok := params[pg_host] + if !ok { + continue + } + if !s.detectLoopback { + if host == "localhost" { + continue + } + if ip := net.ParseIP(host); ip != nil && ip.IsLoopback() { + continue + } + } + + port, ok := params[pg_port] + if !ok { + port = defaultPort + params[pg_port] = port + } + + raw := []byte(fmt.Sprintf("postgresql://%s:%s@%s:%s", user, password, host, port)) + result := detectors.Result{ DetectorType: detectorspb.DetectorType_Postgres, - Raw: []byte(hostport + username + password), - RawV2: []byte(hostport + username + password), + Raw: raw, + RawV2: raw, + } + + // We don't need to normalize the (deprecated) requiressl option into the (up-to-date) sslmode option - pq can + // do it for us - but we will do it anyway here so that when we later capture sslmode into ExtraData we will + // capture it post-normalization. (The detector's behavior is undefined for candidate secrets that have both + // requiressl and sslmode set.) + if requiressl := params[pg_requiressl]; requiressl == "0" { + params[pg_sslmode] = pg_sslmode_prefer + } else if requiressl == "1" { + params[pg_sslmode] = pg_sslmode_require } if verify { - timeoutInSeconds := getDeadlineInSeconds(ctx) - isVerified, verificationErr := verifyPostgres(&pgURL, timeoutInSeconds) + // pq appears to ignore the context deadline, so we copy any timeout that's been set into the connection + // parameters themselves. + if timeout := getDeadlineInSeconds(ctx); timeout != 0 { + params[pg_connect_timeout] = strconv.Itoa(timeout) + } + + isVerified, verificationErr := verifyPostgres(params) result.Verified = isVerified result.SetVerificationError(verificationErr, password) } + // We gather SSL information into ExtraData in case it's useful for later reporting. + sslmode := params[pg_sslmode] + if sslmode == "" { + sslmode = "" + } + result.ExtraData = map[string]string{ + pg_sslmode: sslmode, + } + if !result.Verified && detectors.IsKnownFalsePositive(password, detectors.DefaultFalsePositives, true) { continue } @@ -69,6 +139,25 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) ([]dete return results, nil } +func findUriMatches(data []byte) []map[string]string { + var matches []map[string]string + for _, uri := range uriPattern.FindAll(data, -1) { + connStr, err := pq.ParseURL(string(uri)) + if err != nil { + continue + } + + parts := connStrPartPattern.FindAllStringSubmatch(connStr, -1) + params := make(map[string]string, len(parts)) + for _, part := range parts { + params[part[1]] = part[2] + } + + matches = append(matches, params) + } + return matches +} + func getDeadlineInSeconds(ctx context.Context) int { deadline, ok := ctx.Deadline() if !ok { @@ -80,173 +169,56 @@ func getDeadlineInSeconds(ctx context.Context) int { return int(duration.Seconds()) } -func findUriMatches(dataStr string) url.URL { - var pgURL url.URL - for _, uri := range uriPattern.FindAllString(dataStr, -1) { - pgURL, err := url.Parse(uri) - if err != nil { - continue - } - if pgURL.User != nil { - return *pgURL - } +func isErrorDatabaseNotFound(err error, dbName string) bool { + if dbName == "" { + dbName = "postgres" } - return pgURL + missingDbErrorText := fmt.Sprintf("database \"%s\" does not exist", dbName) + + return strings.Contains(err.Error(), missingDbErrorText) } -// check if postgres is running -func postgresRunning(hostname, port string) bool { - connStr := fmt.Sprintf("host=%s port=%s sslmode=disable", hostname, port) - db, err := sql.Open("postgres", connStr) - if err != nil { - return false - } - defer db.Close() - return true -} +func verifyPostgres(params map[string]string) (bool, error) { + if sslmode := params[pg_sslmode]; sslmode == pg_sslmode_allow || sslmode == pg_sslmode_prefer { + // pq doesn't support 'allow' or 'prefer'. If we find either of them, we'll just ignore it. This will trigger + // the same logic that is run if no sslmode is set at all (which mimics 'prefer', which is the default). + delete(params, pg_sslmode) -func findComponentMatches(verify bool, dataStr string) []url.URL { - usernameMatches := usernamePattern.FindAllStringSubmatch(dataStr, -1) - passwordMatches := passwordPattern.FindAllStringSubmatch(dataStr, -1) - hostnameMatches := hostnamePattern.FindAllStringSubmatch(dataStr, -1) - portMatches := portPattern.FindAllStringSubmatch(dataStr, -1) - - var pgURLs []url.URL - - hosts := findHosts(verify, hostnameMatches, portMatches) - - for _, username := range dedupMatches(usernameMatches) { - for _, password := range dedupMatches(passwordMatches) { - for _, host := range hosts { - hostname, port := strings.Split(host, ":")[0], strings.Split(host, ":")[1] - if combinedLength := len(username) + len(password) + len(hostname); combinedLength > 255 { - continue - } - postgresURL := url.URL{ - Scheme: "postgresql", - User: url.UserPassword(username, password), - Host: fmt.Sprintf("%s:%s", hostname, port), - } - pgURLs = append(pgURLs, postgresURL) - } - } - } - return pgURLs -} - -// if verification is turned on, and we can confirm that postgres is running on at least one host, -// return only hosts where it's running. otherwise return all hosts. -func findHosts(verify bool, hostnameMatches, portMatches [][]string) []string { - hostnames := dedupMatches(hostnameMatches) - ports := dedupMatches(portMatches) - var hosts []string - - if len(hostnames) < 1 { - hostnames = append(hostnames, defaultHost) + // We still want to save the original sslmode in ExtraData, so we'll re-add it before returning. + defer func() { + params[pg_sslmode] = sslmode + }() } - if len(ports) < 1 { - ports = append(ports, defaultPort) - } - - for _, hostname := range hostnames { - for _, port := range ports { - hosts = append(hosts, fmt.Sprintf("%s:%s", hostname, port)) - } - } - - if verify { - var verifiedHosts []string - for _, host := range hosts { - parts := strings.Split(host, ":") - hostname, port := parts[0], parts[1] - if postgresRunning(hostname, port) { - verifiedHosts = append(verifiedHosts, host) - } - } - if len(verifiedHosts) > 0 { - return verifiedHosts - } - } - - return hosts -} - -// deduplicate matches in order to reduce the number of verification requests -func dedupMatches(matches [][]string) []string { - setOfMatches := make(map[string]struct{}) - for _, match := range matches { - if len(match) > 1 { - setOfMatches[match[1]] = struct{}{} - } - } - var results []string - for match := range setOfMatches { - results = append(results, match) - } - return results -} - -func verifyPostgres(pgURL *url.URL, timeoutInSeconds int) (bool, error) { - if pgURL.User == nil { - return false, nil - } - username := pgURL.User.Username() - password, _ := pgURL.User.Password() - - hostname, port := pgURL.Hostname(), pgURL.Port() - if hostname == "" { - hostname = defaultHost - } - if port == "" { - port = defaultPort - } - - sslmode := determineSSLMode(pgURL) - - connStr := fmt.Sprintf("user=%s password=%s host=%s port=%s sslmode=%s", username, password, hostname, port, sslmode) - if timeoutInSeconds > 0 { - connStr = fmt.Sprintf("%s connect_timeout=%d", connStr, timeoutInSeconds) + var connStr string + for key, value := range params { + connStr += fmt.Sprintf("%s='%s'", key, value) } db, err := sql.Open("postgres", connStr) if err != nil { - if strings.Contains(err.Error(), "connection refused") { - // inactive host - return false, nil - } return false, err } defer db.Close() - ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second) - defer cancel() - - err = db.PingContext(ctx) - if err == nil { + err = db.Ping() + switch { + case err == nil: return true, nil - } else if strings.Contains(err.Error(), "password authentication failed") || // incorrect username or password - strings.Contains(err.Error(), "connection refused") { // inactive host + case strings.Contains(err.Error(), "password authentication failed"): return false, nil + case errors.Is(err, pq.ErrSSLNotSupported) && params[pg_sslmode] == "": + // If the sslmode is unset, then either it was unset in the candidate secret, or we've intentionally unset it + // because it was specified as 'allow' or 'prefer', neither of which pq supports. In all of these cases, non-SSL + // connections are acceptable, so now we try a connection without SSL. + params[pg_sslmode] = pg_sslmode_disable + defer delete(params, pg_sslmode) // We want to return with the original params map intact (for ExtraData) + return verifyPostgres(params) + case isErrorDatabaseNotFound(err, params[pg_dbname]): + return true, nil // If we know this, we were able to authenticate + default: + return false, err } - - // if ssl is not enabled, manually fall-back to sslmode=disable - if strings.Contains(err.Error(), "SSL is not enabled on the server") { - pgURL.RawQuery = fmt.Sprintf("sslmode=%s", "disable") - return verifyPostgres(pgURL, timeoutInSeconds) - } - return false, err -} - -func determineSSLMode(pgURL *url.URL) string { - // default ssl mode is "prefer" per https://www.postgresql.org/docs/current/libpq-ssl.html - // but is currently not implemented in the driver per https://github.com/lib/pq/issues/1006 - // default for the driver is "require". ideally we would use "allow" but that is also not supported by the driver. - sslmode := "require" - if sslQuery, ok := pgURL.Query()["sslmode"]; ok && len(sslQuery) > 0 { - sslmode = sslQuery[0] - } - return sslmode } func (s Scanner) Type() detectorspb.DetectorType { diff --git a/pkg/detectors/postgres/postgres_test.go b/pkg/detectors/postgres/postgres_test.go index 08da6dd2f..90c460b0a 100644 --- a/pkg/detectors/postgres/postgres_test.go +++ b/pkg/detectors/postgres/postgres_test.go @@ -15,6 +15,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" + "github.com/lib/pq" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" "github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb" @@ -24,20 +25,35 @@ var postgresDockerHash string const ( postgresUser = "postgres" - postgresPass = "23201dabb56ca236f3dc6736c0f9afad" + postgresPass = "23201da=b56ca236f3dc6736c0f9afad" postgresHost = "localhost" - postgresPort = "5433" + postgresPort = "5434" // Do not use 5433, as local dev environments can use it for other things - inactiveUser = "inactive" inactivePass = "inactive" - inactivePort = "61000" inactiveHost = "192.0.2.0" ) func TestPostgres_FromChunk(t *testing.T) { - startPostgres() + if err := startPostgres(); err != nil { + if exitErr, ok := err.(*exec.ExitError); ok { + t.Fatalf("could not start local postgres: %v w/stderr:\n%s", err, string(exitErr.Stderr)) + } else { + t.Fatalf("could not start local postgres: %v", err) + } + } defer stopPostgres() + // The detector is written to connect to the database 'postgres' if no explicit database is found in the candidate + // secret (because pq uses 'postgres' as a default if no database is specified). If the target cluster doesn't + // actually have a database with this name, but our credentials are good, then Postgres will give us a "missing + // database" error message instead of an authentication failure. + // + // Unfortunately, directly validating this in the automated tests is awkward because the docker image's POSTGRES_DB + // environment variable doesn't appear to work: The database created is always named 'postgres', no matter what + // POSTGRES_DB is set to. This means that we can't replicate a cluster that has no database named 'postgres', so we + // can't directly test what happens if we see one. To work around this, all the automated tests try to connect to + // the nonexistent database 'postgres2'. In this way, we test the logic of attempting to connect to a non-existent + // database, even though the test cases are the inverse of what we'd see in the wild. type args struct { ctx context.Context data []byte @@ -62,177 +78,150 @@ func TestPostgres_FromChunk(t *testing.T) { wantErr: false, }, { - name: "found with seperated credentials, verified", - s: Scanner{}, + name: "found connection URI with ssl mode unset, verified", + s: Scanner{detectLoopback: true}, args: args{ - ctx: context.Background(), - data: []byte(fmt.Sprintf(` - POSTGRES_USER=%s - POSTGRES_PASSWORD=%s - POSTGRES_ADDRESS=%s - POSTGRES_PORT=%s - `, postgresUser, postgresPass, postgresHost, postgresPort)), + ctx: context.Background(), + data: []byte(fmt.Sprintf(`postgresql://%s:%s@%s:%s/postgres2`, postgresUser, postgresPass, postgresHost, postgresPort)), verify: true, }, want: []detectors.Result{ { DetectorType: detectorspb.DetectorType_Postgres, Verified: true, + Raw: []byte("postgresql://postgres:23201da=b56ca236f3dc6736c0f9afad@localhost:5434"), + RawV2: []byte("postgresql://postgres:23201da=b56ca236f3dc6736c0f9afad@localhost:5434"), + ExtraData: map[string]string{"sslmode": ""}, }, }, wantErr: false, }, { - name: "found with single line credentials, verified", - s: Scanner{}, + name: "found connection URI with ssl mode 'prefer', verified", + s: Scanner{detectLoopback: true}, args: args{ ctx: context.Background(), - data: []byte(fmt.Sprintf(`postgresql://%s:%s@%s:%s/postgres`, postgresUser, postgresPass, postgresHost, postgresPort)), + data: []byte(fmt.Sprintf(`postgresql://%s:%s@%s:%s/postgres2?sslmode=prefer`, postgresUser, postgresPass, postgresHost, postgresPort)), verify: true, }, want: []detectors.Result{ { DetectorType: detectorspb.DetectorType_Postgres, Verified: true, + Raw: []byte("postgresql://postgres:23201da=b56ca236f3dc6736c0f9afad@localhost:5434"), + RawV2: []byte("postgresql://postgres:23201da=b56ca236f3dc6736c0f9afad@localhost:5434"), + ExtraData: map[string]string{"sslmode": "prefer"}, }, }, wantErr: false, }, { - name: "found with json credentials, verified", - s: Scanner{}, + name: "found connection URI with ssl mode 'allow', verified", + s: Scanner{detectLoopback: true}, args: args{ - ctx: context.Background(), - data: []byte(fmt.Sprintf( - `DB_CONFIG={"user": "%s", "password": "%s", "host": "%s", "port": "%s", "database": "postgres"}`, postgresUser, postgresPass, postgresHost, postgresPort)), + ctx: context.Background(), + data: []byte(fmt.Sprintf(`postgresql://%s:%s@%s:%s/postgres2?sslmode=allow`, postgresUser, postgresPass, postgresHost, postgresPort)), verify: true, }, want: []detectors.Result{ { DetectorType: detectorspb.DetectorType_Postgres, Verified: true, + Raw: []byte("postgresql://postgres:23201da=b56ca236f3dc6736c0f9afad@localhost:5434"), + RawV2: []byte("postgresql://postgres:23201da=b56ca236f3dc6736c0f9afad@localhost:5434"), + ExtraData: map[string]string{"sslmode": "allow"}, }, }, wantErr: false, }, { - name: "found with seperated credentials, unverified", - s: Scanner{}, + name: "found connection URI with requiressl=0, verified", + s: Scanner{detectLoopback: true}, args: args{ - ctx: context.Background(), - data: []byte(fmt.Sprintf(` - POSTGRES_USER=%s - POSTGRES_PASSWORD=%s - POSTGRES_ADDRESS=%s - POSTGRES_PORT=%s - `, postgresUser, inactivePass, postgresHost, postgresPort)), + ctx: context.Background(), + data: []byte(fmt.Sprintf(`postgresql://%s:%s@%s:%s/postgres2?requiressl=0`, postgresUser, postgresPass, postgresHost, postgresPort)), + verify: true, + }, + want: []detectors.Result{ + { + DetectorType: detectorspb.DetectorType_Postgres, + Verified: true, + Raw: []byte("postgresql://postgres:23201da=b56ca236f3dc6736c0f9afad@localhost:5434"), + RawV2: []byte("postgresql://postgres:23201da=b56ca236f3dc6736c0f9afad@localhost:5434"), + ExtraData: map[string]string{"sslmode": "prefer"}, + }, + }, + wantErr: false, + }, + { + name: "found connection URI without database, verified", + s: Scanner{detectLoopback: true}, + args: args{ + ctx: context.Background(), + data: []byte(fmt.Sprintf(`postgresql://%s:%s@%s:%s/`, postgresUser, postgresPass, postgresHost, postgresPort)), + verify: true, + }, + want: []detectors.Result{ + { + DetectorType: detectorspb.DetectorType_Postgres, + Verified: true, + Raw: []byte("postgresql://postgres:23201da=b56ca236f3dc6736c0f9afad@localhost:5434"), + RawV2: []byte("postgresql://postgres:23201da=b56ca236f3dc6736c0f9afad@localhost:5434"), + ExtraData: map[string]string{"sslmode": ""}, + }, + }, + wantErr: false, + }, + { + name: "found connection URI, unverified", + s: Scanner{detectLoopback: true}, + args: args{ + ctx: context.Background(), + data: []byte(fmt.Sprintf(`postgresql://%s:%s@%s:%s/postgres2`, postgresUser, inactivePass, postgresHost, postgresPort)), verify: true, }, want: []detectors.Result{ { DetectorType: detectorspb.DetectorType_Postgres, Verified: false, + Raw: []byte("postgresql://postgres:inactive@localhost:5434"), + RawV2: []byte("postgresql://postgres:inactive@localhost:5434"), + ExtraData: map[string]string{"sslmode": ""}, }, }, wantErr: false, }, { - name: "found with seperated credentials - no port, unverified", - s: Scanner{}, - args: args{ - ctx: context.Background(), - data: []byte(fmt.Sprintf(` - POSTGRES_USER=%s - POSTGRES_PASSWORD=%s - POSTGRES_ADDRESS=%s - `, postgresUser, inactivePass, postgresHost)), - verify: true, - }, - want: []detectors.Result{ - { - DetectorType: detectorspb.DetectorType_Postgres, - Verified: false, - }, - }, - wantErr: false, - }, - { - name: "found with single line credentials, unverified", + name: "ignored localhost", s: Scanner{}, args: args{ ctx: context.Background(), - data: []byte(fmt.Sprintf(`postgresql://%s:%s@%s:%s/postgres`, postgresUser, inactivePass, postgresHost, postgresPort)), + data: []byte(fmt.Sprintf(`postgresql://%s:%s@%s:%s/postgres2`, postgresUser, postgresPass, "localhost", postgresPort)), verify: true, }, - want: []detectors.Result{ - { - DetectorType: detectorspb.DetectorType_Postgres, - Verified: false, - }, - }, + want: nil, wantErr: false, }, { - name: "found with json credentials, unverified - inactive password", - s: Scanner{}, - args: args{ - ctx: context.Background(), - data: []byte(fmt.Sprintf( - `DB_CONFIG={"user": "%s", "password": "%s", "host": "%s", "port": "%s", "database": "postgres"}`, postgresUser, inactivePass, postgresHost, postgresPort)), - verify: true, - }, - want: []detectors.Result{ - { - DetectorType: detectorspb.DetectorType_Postgres, - Verified: false, - }, - }, - wantErr: false, - }, - { - name: "found with json credentials, unverified - inactive user", - s: Scanner{}, - args: args{ - ctx: context.Background(), - data: []byte(fmt.Sprintf( - `DB_CONFIG={"user": "%s", "password": "%s", "host": "%s", "port": "%s", "database": "postgres"}`, inactiveUser, postgresPass, postgresHost, postgresPort)), - verify: true, - }, - want: []detectors.Result{ - { - DetectorType: detectorspb.DetectorType_Postgres, - Verified: false, - }, - }, - wantErr: false, - }, - { - name: "found, unverified due to error - inactive port", + name: "ignored 127.0.0.1", s: Scanner{}, args: args{ ctx: context.Background(), - data: []byte(fmt.Sprintf(`postgresql://%s:%s@%s:%s/postgres`, postgresUser, postgresPass, postgresHost, inactivePort)), + data: []byte(fmt.Sprintf(`postgresql://%s:%s@%s:%s/postgres2`, postgresUser, postgresPass, "127.0.0.1", postgresPort)), verify: true, }, - want: func() []detectors.Result { - r := detectors.Result{ - DetectorType: detectorspb.DetectorType_Postgres, - Verified: false, - } - return []detectors.Result{r} - }(), + want: nil, wantErr: false, }, - // This test seems take a long time to run (70s+) even with the timeout set to 1s. It's not clear why. { - name: "found, unverified due to error - inactive host", + name: "found connection URI, unverified due to error - inactive host", s: Scanner{}, args: func() args { ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() return args{ ctx: ctx, - data: []byte(fmt.Sprintf(`postgresql://%s:%s@%s:%s/postgres`, postgresUser, postgresPass, inactiveHost, postgresPort)), + data: []byte(fmt.Sprintf(`postgresql://%s:%s@%s:%s/postgres2`, postgresUser, postgresPass, inactiveHost, postgresPort)), verify: true, } }(), @@ -240,17 +229,94 @@ func TestPostgres_FromChunk(t *testing.T) { r := detectors.Result{ DetectorType: detectorspb.DetectorType_Postgres, Verified: false, + Raw: []byte("postgresql://postgres:23201da=b56ca236f3dc6736c0f9afad@192.0.2.0:5434"), + RawV2: []byte("postgresql://postgres:23201da=b56ca236f3dc6736c0f9afad@192.0.2.0:5434"), + ExtraData: map[string]string{"sslmode": ""}, } r.SetVerificationError(errors.New("i/o timeout")) return []detectors.Result{r} }(), wantErr: false, }, + { + name: "found connection URI, unverified due to error - wrong port", + s: Scanner{detectLoopback: true}, + args: func() args { + ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) + defer cancel() + return args{ + ctx: ctx, + data: []byte(fmt.Sprintf(`postgresql://%s:%s@%s/postgres2`, postgresUser, postgresPass, postgresHost)), + verify: true, + } + }(), + want: func() []detectors.Result { + r := detectors.Result{ + DetectorType: detectorspb.DetectorType_Postgres, + Verified: false, + Raw: []byte("postgresql://postgres:23201da=b56ca236f3dc6736c0f9afad@localhost:5432"), + RawV2: []byte("postgresql://postgres:23201da=b56ca236f3dc6736c0f9afad@localhost:5432"), + ExtraData: map[string]string{"sslmode": ""}, + } + r.SetVerificationError(errors.New("connection refused")) + return []detectors.Result{r} + }(), + wantErr: false, + }, + { + name: "found connection URI, unverified due to error - ssl not supported (using sslmode)", + s: Scanner{detectLoopback: true}, + args: func() args { + ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) + defer cancel() + return args{ + ctx: ctx, + data: []byte(fmt.Sprintf(`postgresql://%s:%s@%s:%s/postgres2?sslmode=require`, postgresUser, postgresPass, postgresHost, postgresPort)), + verify: true, + } + }(), + want: func() []detectors.Result { + r := detectors.Result{ + DetectorType: detectorspb.DetectorType_Postgres, + Verified: false, + Raw: []byte("postgresql://postgres:23201da=b56ca236f3dc6736c0f9afad@localhost:5434"), + RawV2: []byte("postgresql://postgres:23201da=b56ca236f3dc6736c0f9afad@localhost:5434"), + ExtraData: map[string]string{"sslmode": "require"}, + } + r.SetVerificationError(pq.ErrSSLNotSupported) + return []detectors.Result{r} + }(), + wantErr: false, + }, + { + name: "found connection URI, unverified due to error - ssl not supported (using requiressl)", + s: Scanner{detectLoopback: true}, + args: func() args { + ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) + defer cancel() + return args{ + ctx: ctx, + data: []byte(fmt.Sprintf(`postgresql://%s:%s@%s:%s/postgres2?requiressl=1`, postgresUser, postgresPass, postgresHost, postgresPort)), + verify: true, + } + }(), + want: func() []detectors.Result { + r := detectors.Result{ + DetectorType: detectorspb.DetectorType_Postgres, + Verified: false, + Raw: []byte("postgresql://postgres:23201da=b56ca236f3dc6736c0f9afad@localhost:5434"), + RawV2: []byte("postgresql://postgres:23201da=b56ca236f3dc6736c0f9afad@localhost:5434"), + ExtraData: map[string]string{"sslmode": "require"}, + } + r.SetVerificationError(pq.ErrSSLNotSupported) + return []detectors.Result{r} + }(), + wantErr: false, + }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - s := Scanner{} - got, err := s.FromData(tt.args.ctx, tt.args.verify, tt.args.data) + got, err := tt.s.FromData(tt.args.ctx, tt.args.verify, tt.args.data) if (err != nil) != tt.wantErr { t.Errorf("postgres.FromData() error = %v, wantErr %v", err, tt.wantErr) return @@ -271,7 +337,7 @@ func TestPostgres_FromChunk(t *testing.T) { t.Fatalf("wantVerificationError = %v, verification error = %v", tt.want[i].VerificationError(), got[i].VerificationError()) } } - ignoreOpts := cmpopts.IgnoreFields(detectors.Result{}, "Raw", "RawV2", "verificationError") + ignoreOpts := cmpopts.IgnoreFields(detectors.Result{}, "verificationError") if diff := cmp.Diff(got, tt.want, ignoreOpts); diff != "" { t.Errorf("Postgres.FromData() %s diff: (-got +want)\n%s", tt.name, diff) } diff --git a/pkg/engine/defaults.go b/pkg/engine/defaults.go index 0cd901ab9..16682b867 100644 --- a/pkg/engine/defaults.go +++ b/pkg/engine/defaults.go @@ -524,6 +524,7 @@ import ( "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/positionstack" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/postageapp" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/postbacks" + "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/postgres" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/posthog" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/postman" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/postmark" @@ -1496,8 +1497,7 @@ func DefaultDetectors() []detectors.Detector { speechtextai.Scanner{}, databox.Scanner{}, postbacks.Scanner{}, - // Too noisy, needs attention - // postgres.Scanner{}, + postgres.Scanner{}, collect2.Scanner{}, uclassify.Scanner{}, holistic.Scanner{}, From 80f2696ae00034790bdbb4f6fe067dbaf015572d Mon Sep 17 00:00:00 2001 From: Cody Rose Date: Tue, 23 Jan 2024 15:04:11 -0500 Subject: [PATCH 30/35] Update Gitlab repo count in tests #2333 --- pkg/sources/gitlab/gitlab_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/sources/gitlab/gitlab_test.go b/pkg/sources/gitlab/gitlab_test.go index fb1a64eb9..78b6a5ec4 100644 --- a/pkg/sources/gitlab/gitlab_test.go +++ b/pkg/sources/gitlab/gitlab_test.go @@ -57,7 +57,7 @@ func TestSource_Scan(t *testing.T) { SourceType: sourcespb.SourceType_SOURCE_TYPE_GITLAB, SourceName: "test source", }, - wantReposScanned: 4, + wantReposScanned: 5, }, { name: "token auth, enumerate repo, with glob ignore", @@ -74,7 +74,7 @@ func TestSource_Scan(t *testing.T) { SourceType: sourcespb.SourceType_SOURCE_TYPE_GITLAB, SourceName: "test source", }, - wantReposScanned: 4, + wantReposScanned: 5, }, { name: "token auth, scoped repo", From e44802a31db93e670cec194ebc2e0c163335b20f Mon Sep 17 00:00:00 2001 From: ahrav Date: Tue, 23 Jan 2024 13:16:22 -0800 Subject: [PATCH 31/35] [feat] - Replace regexp pkg w/ go-re2 in detectors (#2324) * update detectors to use go-re regex library replacement * update go mod and sum * add tests with invalid utf-8 * revert --- go.mod | 3 + go.sum | 6 ++ pkg/detectors/abbysale/abbysale.go | 2 +- pkg/detectors/abstract/abstract.go | 2 +- pkg/detectors/abuseipdb/abuseipdb.go | 2 +- pkg/detectors/accuweather/accuweather.go | 2 +- pkg/detectors/adafruitio/adafruitio.go | 2 +- pkg/detectors/adobeio/adobeio.go | 2 +- pkg/detectors/adzuna/adzuna.go | 2 +- pkg/detectors/aeroworkflow/aeroworkflow.go | 2 +- pkg/detectors/agora/agora.go | 2 +- pkg/detectors/aha/aha.go | 2 +- .../airbrakeprojectkey/airbrakeprojectkey.go | 2 +- .../airbrakeuserkey/airbrakeuserkey.go | 2 +- pkg/detectors/airship/airship.go | 2 +- .../airtableapikey/airtableapikey.go | 2 +- pkg/detectors/airvisual/airvisual.go | 2 +- pkg/detectors/aiven/aiven.go | 2 +- pkg/detectors/alchemy/alchemy.go | 2 +- pkg/detectors/alconost/alconost.go | 2 +- pkg/detectors/alegra/alegra.go | 2 +- pkg/detectors/aletheiaapi/aletheiaapi.go | 2 +- .../algoliaadminkey/algoliaadminkey.go | 2 +- pkg/detectors/alibaba/alibaba.go | 2 +- pkg/detectors/alienvault/alienvault.go | 2 +- pkg/detectors/allsports/allsports.go | 2 +- pkg/detectors/amadeus/amadeus.go | 2 +- pkg/detectors/ambee/ambee.go | 2 +- .../amplitudeapikey/amplitudeapikey.go | 2 +- pkg/detectors/anthropic/anthropic.go | 2 +- pkg/detectors/anypoint/anypoint.go | 2 +- pkg/detectors/apacta/apacta.go | 2 +- pkg/detectors/api2cart/api2cart.go | 2 +- pkg/detectors/apideck/apideck.go | 2 +- pkg/detectors/apiflash/apiflash.go | 2 +- pkg/detectors/apifonica/apifonica.go | 2 +- pkg/detectors/apify/apify.go | 2 +- pkg/detectors/apilayer/apilayer.go | 2 +- pkg/detectors/apimatic/apimatic.go | 2 +- pkg/detectors/apiscience/apiscience.go | 2 +- pkg/detectors/apitemplate/apitemplate.go | 2 +- pkg/detectors/apollo/apollo.go | 2 +- pkg/detectors/appcues/appcues.go | 2 +- pkg/detectors/appfollow/appfollow.go | 2 +- pkg/detectors/appointedd/appointedd.go | 2 +- pkg/detectors/appoptics/appoptics.go | 2 +- pkg/detectors/appsynergy/appsynergy.go | 2 +- pkg/detectors/apptivo/apptivo.go | 2 +- pkg/detectors/artifactory/artifactory.go | 2 +- pkg/detectors/artsy/artsy.go | 2 +- pkg/detectors/asanaoauth/asanaoauth.go | 2 +- .../asanapersonalaccesstoken.go | 2 +- pkg/detectors/assemblyai/assemblyai.go | 2 +- pkg/detectors/atera/atera.go | 2 +- pkg/detectors/audd/audd.go | 2 +- .../auth0managementapitoken.go | 2 +- pkg/detectors/auth0oauth/auth0oauth.go | 2 +- pkg/detectors/autodesk/autodesk.go | 2 +- pkg/detectors/autoklose/autoklose.go | 2 +- pkg/detectors/autopilot/autopilot.go | 2 +- .../avazapersonalaccesstoken.go | 2 +- pkg/detectors/aviationstack/aviationstack.go | 2 +- pkg/detectors/aws/aws.go | 3 +- pkg/detectors/awssessionkeys/awssessionkey.go | 2 +- pkg/detectors/axonaut/axonaut.go | 2 +- pkg/detectors/aylien/aylien.go | 2 +- pkg/detectors/ayrshare/ayrshare.go | 2 +- pkg/detectors/azure/azure.go | 2 +- pkg/detectors/azurebatch/azurebatch.go | 2 +- .../azurecontainerregistry.go | 2 +- pkg/detectors/azurestorage/azurestorage.go | 2 +- .../azurestorage/azurestorage_test.go | 2 +- pkg/detectors/bannerbear/bannerbear.go | 2 +- pkg/detectors/baremetrics/baremetrics.go | 2 +- pkg/detectors/beamer/beamer.go | 2 +- pkg/detectors/beebole/beebole.go | 2 +- pkg/detectors/besnappy/besnappy.go | 2 +- pkg/detectors/besttime/besttime.go | 2 +- pkg/detectors/betterstack/betterstack.go | 2 +- pkg/detectors/billomat/billomat.go | 2 +- pkg/detectors/bitbar/bitbar.go | 2 +- .../bitcoinaverage/bitcoinaverage.go | 2 +- pkg/detectors/bitfinex/bitfinex.go | 2 +- .../bitlyaccesstoken/bitlyaccesstoken.go | 2 +- pkg/detectors/bitmex/bitmex.go | 2 +- pkg/detectors/blazemeter/blazemeter.go | 2 +- pkg/detectors/blitapp/blitapp.go | 2 +- pkg/detectors/blocknative/blocknative.go | 2 +- pkg/detectors/blogger/blogger.go | 2 +- pkg/detectors/bombbomb/bombbomb.go | 2 +- pkg/detectors/boostnote/boostnote.go | 2 +- pkg/detectors/borgbase/borgbase.go | 2 +- .../braintreepayments/braintreepayments.go | 2 +- pkg/detectors/brandfetch/brandfetch.go | 2 +- pkg/detectors/browserstack/browserstack.go | 2 +- pkg/detectors/browshot/browshot.go | 2 +- pkg/detectors/bscscan/bscscan.go | 32 +++++------ pkg/detectors/buddyns/buddyns.go | 2 +- pkg/detectors/budibase/budibase.go | 2 +- pkg/detectors/bugherd/bugherd.go | 2 +- pkg/detectors/bugsnag/bugsnag.go | 2 +- pkg/detectors/buildkite/buildkite.go | 2 +- pkg/detectors/buildkitev2/buildkite.go | 2 +- pkg/detectors/bulbul/bulbul.go | 2 +- pkg/detectors/bulksms/bulksms.go | 2 +- pkg/detectors/buttercms/buttercms.go | 2 +- pkg/detectors/caflou/caflou.go | 2 +- pkg/detectors/calendarific/calendarific.go | 2 +- .../calendlyapikey/calendlyapikey.go | 2 +- pkg/detectors/calorieninja/calorieninja.go | 2 +- pkg/detectors/campayn/campayn.go | 2 +- pkg/detectors/cannyio/cannyio.go | 2 +- pkg/detectors/capsulecrm/capsulecrm.go | 2 +- pkg/detectors/captaindata/captaindata.go | 2 +- .../carboninterface/carboninterface.go | 2 +- pkg/detectors/cashboard/cashboard.go | 2 +- pkg/detectors/caspio/caspio.go | 2 +- pkg/detectors/censys/censys.go | 2 +- .../centralstationcrm/centralstationcrm.go | 2 +- pkg/detectors/cexio/cexio.go | 2 +- pkg/detectors/chartmogul/chartmogul.go | 2 +- pkg/detectors/chatbot/chatbot.go | 2 +- pkg/detectors/chatfule/chatfule.go | 2 +- pkg/detectors/checio/checio.go | 2 +- pkg/detectors/checklyhq/checklyhq.go | 2 +- pkg/detectors/checkout/checkout.go | 2 +- pkg/detectors/checkvist/checkvist.go | 2 +- pkg/detectors/cicero/cicero.go | 2 +- pkg/detectors/circleci/circleci.go | 2 +- pkg/detectors/clarifai/clarifai.go | 2 +- pkg/detectors/clearbit/clearbit.go | 2 +- pkg/detectors/clickhelp/clickhelp.go | 2 +- pkg/detectors/clicksendsms/clicksendsms.go | 2 +- .../clickuppersonaltoken.go | 2 +- pkg/detectors/cliengo/cliengo.go | 2 +- pkg/detectors/clinchpad/clinchpad.go | 2 +- pkg/detectors/clockify/clockify.go | 2 +- pkg/detectors/clockworksms/clockworksms.go | 2 +- pkg/detectors/closecrm/close.go | 2 +- pkg/detectors/cloudconvert/cloudconvert.go | 2 +- pkg/detectors/cloudelements/cloudelements.go | 2 +- .../cloudflareapitoken/cloudflareapitoken.go | 2 +- .../cloudflarecakey/cloudflarecakey.go | 2 +- .../cloudflareglobalapikey.go | 2 +- pkg/detectors/cloudimage/cloudimage.go | 2 +- pkg/detectors/cloudmersive/cloudmersive.go | 2 +- pkg/detectors/cloudplan/cloudplan.go | 2 +- pkg/detectors/cloudsmith/cloudsmith.go | 2 +- pkg/detectors/cloverly/cloverly.go | 2 +- pkg/detectors/cloze/cloze.go | 2 +- pkg/detectors/clustdoc/clustdoc.go | 2 +- pkg/detectors/coda/coda.go | 2 +- pkg/detectors/codacy/codacy.go | 2 +- pkg/detectors/codeclimate/codeclimate.go | 2 +- pkg/detectors/codemagic/codemagic.go | 2 +- pkg/detectors/codequiry/codequiry.go | 2 +- pkg/detectors/coinapi/coinapi.go | 2 +- pkg/detectors/coinbase/coinbase.go | 2 +- pkg/detectors/coinbase_waas/coinbase_waas.go | 2 +- pkg/detectors/coinlayer/coinlayer.go | 2 +- pkg/detectors/coinlib/coinlib.go | 2 +- pkg/detectors/coinmarketcap/coinmarketcap.go | 2 +- pkg/detectors/collect2/collect2.go | 2 +- pkg/detectors/column/column.go | 2 +- pkg/detectors/commercejs/commercejs.go | 2 +- pkg/detectors/commodities/commodities.go | 2 +- pkg/detectors/companyhub/companyhub.go | 2 +- pkg/detectors/confluent/confluent.go | 2 +- .../contentfulpersonalaccesstoken.go | 2 +- .../conversiontools/conversiontools.go | 2 +- pkg/detectors/convertapi/convertapi.go | 2 +- pkg/detectors/convertkit/convertkit.go | 2 +- pkg/detectors/convier/convier.go | 2 +- pkg/detectors/copper/copper.go | 2 +- pkg/detectors/couchbase/couchbase.go | 4 +- pkg/detectors/countrylayer/countrylayer.go | 2 +- pkg/detectors/courier/courier.go | 2 +- pkg/detectors/coveralls/coveralls.go | 2 +- pkg/detectors/craftmypdf/craftmypdf.go | 3 +- .../crossbrowsertesting.go | 2 +- pkg/detectors/crowdin/crowdin.go | 2 +- pkg/detectors/cryptocompare/cryptocompare.go | 2 +- pkg/detectors/currencycloud/currencycloud.go | 2 +- .../currencyfreaks/currencyfreaks.go | 2 +- pkg/detectors/currencylayer/currencylayer.go | 2 +- pkg/detectors/currencyscoop/currencyscoop.go | 2 +- pkg/detectors/currentsapi/currentsapi.go | 2 +- pkg/detectors/customerguru/customerguru.go | 2 +- pkg/detectors/customerio/customerio.go | 2 +- pkg/detectors/d7network/d7network.go | 2 +- pkg/detectors/dailyco/dailyco.go | 2 +- pkg/detectors/dandelion/dandelion.go | 2 +- pkg/detectors/dareboost/dareboost.go | 2 +- pkg/detectors/databox/databox.go | 2 +- .../databrickstoken/databrickstoken.go | 2 +- pkg/detectors/datadogtoken/datadogtoken.go | 2 +- pkg/detectors/datagov/datagov.go | 2 +- pkg/detectors/debounce/debounce.go | 2 +- pkg/detectors/deepai/deepai.go | 2 +- pkg/detectors/deepgram/deepgram.go | 2 +- pkg/detectors/delighted/delighted.go | 2 +- pkg/detectors/demio/demio.go | 2 +- pkg/detectors/deno/denodeploy.go | 2 +- pkg/detectors/deputy/deputy.go | 2 +- pkg/detectors/detectify/detectify.go | 2 +- .../detectlanguage/detectlanguage.go | 2 +- pkg/detectors/dfuse/dfuse.go | 2 +- pkg/detectors/diffbot/diffbot.go | 2 +- pkg/detectors/diggernaut/diggernaut.go | 2 +- .../digitaloceantoken/digitaloceantoken.go | 2 +- .../digitaloceanv2/digitaloceanv2.go | 2 +- .../discordbottoken/discordbottoken.go | 2 +- .../discordwebhook/discordwebhook.go | 2 +- pkg/detectors/disqus/disqus.go | 2 +- pkg/detectors/ditto/ditto.go | 2 +- pkg/detectors/dnscheck/dnscheck.go | 2 +- pkg/detectors/dockerhub/dockerhub.go | 2 +- pkg/detectors/docparser/docparser.go | 2 +- pkg/detectors/documo/documo.go | 2 +- pkg/detectors/docusign/docusign.go | 2 +- pkg/detectors/doppler/doppler.go | 2 +- pkg/detectors/dotmailer/dotmailer.go | 2 +- pkg/detectors/dovico/dovico.go | 2 +- pkg/detectors/dronahq/dronahq.go | 2 +- pkg/detectors/droneci/droneci.go | 2 +- pkg/detectors/dropbox/dropbox.go | 2 +- pkg/detectors/duply/duply.go | 2 +- pkg/detectors/dwolla/dwolla.go | 2 +- pkg/detectors/dynalist/dynalist.go | 2 +- pkg/detectors/dyspatch/dyspatch.go | 2 +- .../eagleeyenetworks/eagleeyenetworks.go | 2 +- pkg/detectors/easyinsight/easyinsight.go | 2 +- pkg/detectors/ecostruxureit/ecostruxureit.go | 2 +- pkg/detectors/edamam/edamam.go | 2 +- pkg/detectors/edenai/edenai.go | 2 +- pkg/detectors/eightxeight/eightxeight.go | 2 +- pkg/detectors/elasticemail/elasticemail.go | 2 +- pkg/detectors/enablex/enablex.go | 2 +- pkg/detectors/enigma/enigma.go | 2 +- pkg/detectors/envoyapikey/envoyapikey.go | 2 +- pkg/detectors/etherscan/etherscan.go | 2 +- pkg/detectors/ethplorer/ethplorer.go | 2 +- pkg/detectors/etsyapikey/etsyapikey.go | 2 +- pkg/detectors/eventbrite/eventbrite.go | 2 +- pkg/detectors/everhour/everhour.go | 2 +- .../exchangerateapi/exchangerateapi.go | 2 +- .../exchangeratesapi/exchangeratesapi.go | 2 +- pkg/detectors/exportsdk/exportsdk.go | 2 +- pkg/detectors/extractorapi/extractorapi.go | 2 +- pkg/detectors/facebookoauth/facebookoauth.go | 2 +- pkg/detectors/faceplusplus/faceplusplus.go | 2 +- pkg/detectors/fastforex/fastforex.go | 2 +- .../fastlypersonaltoken.go | 2 +- pkg/detectors/feedier/feedier.go | 2 +- pkg/detectors/fetchrss/fetchrss.go | 2 +- pkg/detectors/fibery/fibery.go | 2 +- .../v1/figmapersonalaccesstoken.go | 2 +- .../v2/figmapersonalaccesstoken_v2.go | 2 +- pkg/detectors/fileio/fileio.go | 2 +- pkg/detectors/finage/finage.go | 2 +- .../financialmodelingprep.go | 2 +- pkg/detectors/findl/findl.go | 2 +- pkg/detectors/finnhub/finnhub.go | 2 +- pkg/detectors/fixerio/fixerio.go | 2 +- pkg/detectors/flatio/flatio.go | 2 +- pkg/detectors/fleetbase/fleetbase.go | 2 +- pkg/detectors/flickr/flickr.go | 2 +- pkg/detectors/flightapi/flightapi.go | 2 +- pkg/detectors/flightlabs/flightlabs.go | 2 +- pkg/detectors/flightstats/flightstats.go | 2 +- pkg/detectors/float/float.go | 2 +- pkg/detectors/flowdash/flowdash.go | 2 +- pkg/detectors/flowflu/flowflu.go | 2 +- pkg/detectors/flutterwave/flutterwave.go | 2 +- pkg/detectors/fmfw/fmfw.go | 2 +- pkg/detectors/formbucket/formbucket.go | 2 +- pkg/detectors/formcraft/formcraft.go | 2 +- pkg/detectors/formio/formio.go | 2 +- pkg/detectors/formsite/formsite.go | 2 +- pkg/detectors/foursquare/foursquare.go | 2 +- pkg/detectors/frameio/frameio.go | 2 +- pkg/detectors/freshbooks/freshbooks.go | 2 +- pkg/detectors/freshdesk/freshdesk.go | 2 +- pkg/detectors/front/front.go | 2 +- pkg/detectors/ftp/ftp.go | 2 +- pkg/detectors/fulcrum/fulcrum.go | 2 +- pkg/detectors/fullstory/fullstory.go | 2 +- pkg/detectors/fullstory_v2/fullstory_v2.go | 2 +- pkg/detectors/fusebill/fusebill.go | 2 +- pkg/detectors/fxmarket/fxmarket.go | 2 +- pkg/detectors/gcp/gcp.go | 2 +- pkg/detectors/geckoboard/geckoboard.go | 2 +- pkg/detectors/gemini/gemini.go | 2 +- pkg/detectors/generic/generic.go | 2 +- pkg/detectors/gengo/gengo.go | 2 +- pkg/detectors/geoapify/geoapify.go | 2 +- pkg/detectors/geocode/geocode.go | 2 +- pkg/detectors/geocodify/geocodify.go | 2 +- pkg/detectors/geocodio/geocodio.go | 2 +- pkg/detectors/geoipifi/geoipifi.go | 2 +- pkg/detectors/getemail/getemail.go | 2 +- pkg/detectors/getemails/getemails.go | 2 +- pkg/detectors/getgeoapi/getgeoapi.go | 2 +- pkg/detectors/getgist/getgist.go | 2 +- pkg/detectors/getresponse/getresponse.go | 2 +- pkg/detectors/getsandbox/getsandbox.go | 2 +- pkg/detectors/github/github.go | 2 +- pkg/detectors/github_oauth2/github_oauth2.go | 2 +- pkg/detectors/github_old/github_old.go | 2 +- pkg/detectors/githubapp/githubapp.go | 2 +- pkg/detectors/gitlab/gitlab.go | 2 +- pkg/detectors/gitlabv2/gitlab_v2.go | 2 +- pkg/detectors/gitter/gitter.go | 2 +- pkg/detectors/glassnode/glassnode.go | 2 +- pkg/detectors/gocanvas/gocanvas.go | 2 +- pkg/detectors/gocardless/gocardless.go | 2 +- pkg/detectors/goodday/goodday.go | 2 +- pkg/detectors/grafana/grafana.go | 2 +- .../grafanaserviceaccount.go | 2 +- pkg/detectors/graphcms/graphcms.go | 2 +- pkg/detectors/graphhopper/graphhopper.go | 2 +- pkg/detectors/groovehq/groovehq.go | 2 +- pkg/detectors/gtmetrix/gtmetrix.go | 2 +- pkg/detectors/guardianapi/guardianapi.go | 2 +- pkg/detectors/gumroad/gumroad.go | 2 +- pkg/detectors/guru/guru.go | 2 +- pkg/detectors/gyazo/gyazo.go | 2 +- pkg/detectors/happyscribe/happyscribe.go | 2 +- pkg/detectors/harvest/harvest.go | 2 +- pkg/detectors/hellosign/hellosign.go | 2 +- pkg/detectors/helpcrunch/helpcrunch.go | 2 +- pkg/detectors/helpscout/helpscout.go | 2 +- pkg/detectors/hereapi/hereapi.go | 2 +- pkg/detectors/heroku/heroku.go | 2 +- pkg/detectors/hive/hive.go | 2 +- pkg/detectors/hiveage/hiveage.go | 2 +- pkg/detectors/holidayapi/holidayapi.go | 2 +- pkg/detectors/holistic/holistic.go | 2 +- pkg/detectors/honeycomb/honeycomb.go | 2 +- pkg/detectors/host/host.go | 2 +- pkg/detectors/html2pdf/html2pdf.go | 2 +- pkg/detectors/hubspotapikey/hubspotapikey.go | 2 +- pkg/detectors/huggingface/huggingface.go | 2 +- pkg/detectors/huggingface/huggingface_test.go | 55 +++++++++++++++++++ pkg/detectors/humanity/humanity.go | 2 +- pkg/detectors/hunter/hunter.go | 2 +- pkg/detectors/hybiscus/hybiscus.go | 2 +- pkg/detectors/hypertrack/hypertrack.go | 2 +- .../ibmclouduserkey/ibmclouduserkey.go | 2 +- pkg/detectors/iconfinder/iconfinder.go | 2 +- pkg/detectors/iexapis/iexapis.go | 2 +- pkg/detectors/iexcloud/iexcloud.go | 2 +- pkg/detectors/imagekit/imagekit.go | 2 +- pkg/detectors/imagga/imagga.go | 2 +- pkg/detectors/impala/impala.go | 2 +- pkg/detectors/infura/infura.go | 2 +- pkg/detectors/insightly/insightly.go | 2 +- pkg/detectors/instabot/instabot.go | 2 +- pkg/detectors/instamojo/instamojo.go | 6 +- pkg/detectors/integromat/integromat.go | 2 +- pkg/detectors/intercom/intercom.go | 2 +- pkg/detectors/interseller/interseller.go | 2 +- pkg/detectors/intrinio/intrinio.go | 2 +- pkg/detectors/invoiceocean/invoiceocean.go | 2 +- pkg/detectors/ip2location/ip2location.go | 2 +- pkg/detectors/ipapi/ipapi.go | 2 +- pkg/detectors/ipgeolocation/ipgeolocation.go | 2 +- pkg/detectors/ipify/ipify.go | 2 +- pkg/detectors/ipinfo/ipinfo.go | 2 +- pkg/detectors/ipinfodb/ipinfodb.go | 2 +- pkg/detectors/ipquality/ipquality.go | 2 +- pkg/detectors/ipstack/ipstack.go | 2 +- pkg/detectors/jiratoken/jiratoken.go | 2 +- pkg/detectors/jiratoken_v2/jiratoken_v2.go | 2 +- pkg/detectors/jotform/jotform.go | 2 +- pkg/detectors/jumpcloud/jumpcloud.go | 2 +- pkg/detectors/juro/juro.go | 2 +- pkg/detectors/kanban/kanban.go | 2 +- pkg/detectors/kanbantool/kanbantool.go | 2 +- pkg/detectors/karmacrm/karmacrm.go | 2 +- pkg/detectors/keenio/keenio.go | 2 +- pkg/detectors/kickbox/kickbox.go | 2 +- pkg/detectors/klaviyo/klaviyo.go | 2 +- pkg/detectors/klipfolio/klipfolio.go | 2 +- pkg/detectors/knapsackpro/knapsackpro.go | 2 +- pkg/detectors/kontent/kontent.go | 2 +- pkg/detectors/kraken/kraken.go | 2 +- pkg/detectors/kucoin/kucoin.go | 2 +- pkg/detectors/kylas/kylas.go | 2 +- pkg/detectors/languagelayer/languagelayer.go | 2 +- pkg/detectors/lastfm/lastfm.go | 2 +- pkg/detectors/launchdarkly/launchdarkly.go | 2 +- pkg/detectors/ldap/ldap.go | 2 +- pkg/detectors/leadfeeder/leadfeeder.go | 2 +- pkg/detectors/lemlist/lemlist.go | 2 +- pkg/detectors/lemonsqueezy/lemonsqueezy.go | 2 +- pkg/detectors/lendflow/lendflow.go | 2 +- .../lessannoyingcrm/lessannoyingcrm.go | 2 +- pkg/detectors/lexigram/lexigram.go | 2 +- pkg/detectors/linearapi/linearapi.go | 2 +- pkg/detectors/linemessaging/linemessaging.go | 2 +- pkg/detectors/linenotify/linenotify.go | 2 +- pkg/detectors/linkpreview/linkpreview.go | 2 +- pkg/detectors/liveagent/liveagent.go | 2 +- pkg/detectors/livestorm/livestorm.go | 2 +- pkg/detectors/loadmill/loadmill.go | 2 +- pkg/detectors/lob/lob.go | 2 +- pkg/detectors/locationiq/locationiq.go | 2 +- pkg/detectors/loggly/loggly.go | 2 +- pkg/detectors/loginradius/loginradius.go | 2 +- pkg/detectors/logzio/logzio.go | 2 +- pkg/detectors/lokalisetoken/lokalisetoken.go | 2 +- pkg/detectors/loyverse/loyverse.go | 2 +- pkg/detectors/lunchmoney/lunchmoney.go | 2 +- pkg/detectors/luno/luno.go | 2 +- pkg/detectors/m3o/m3o.go | 2 +- pkg/detectors/macaddress/macaddress.go | 2 +- pkg/detectors/madkudu/madkudu.go | 2 +- pkg/detectors/magicbell/magicbell.go | 2 +- pkg/detectors/magnetic/magnetic.go | 2 +- pkg/detectors/mailboxlayer/mailboxlayer.go | 2 +- pkg/detectors/mailchimp/mailchimp.go | 4 +- pkg/detectors/mailerlite/mailerlite.go | 2 +- pkg/detectors/mailgun/mailgun.go | 4 +- .../mailjetbasicauth/mailjetbasicauth.go | 2 +- pkg/detectors/mailjetsms/mailjetsms.go | 2 +- pkg/detectors/mailmodo/mailmodo.go | 2 +- pkg/detectors/mailsac/mailsac.go | 2 +- pkg/detectors/mandrill/mandrill.go | 2 +- pkg/detectors/manifest/manifest.go | 2 +- pkg/detectors/mapbox/mapbox.go | 2 +- pkg/detectors/mapquest/mapquest.go | 2 +- pkg/detectors/marketstack/marketstack.go | 2 +- .../mattermostpersonaltoken.go | 2 +- pkg/detectors/mavenlink/mavenlink.go | 2 +- .../maxmindlicense/maxmindlicense.go | 2 +- pkg/detectors/meaningcloud/meaningcloud.go | 2 +- pkg/detectors/mediastack/mediastack.go | 2 +- pkg/detectors/meistertask/meistertask.go | 2 +- pkg/detectors/mesibo/mesibo.go | 3 +- pkg/detectors/messagebird/messagebird.go | 2 +- pkg/detectors/metaapi/metaapi.go | 2 +- pkg/detectors/metabase/metabase.go | 2 +- pkg/detectors/metrilo/metrilo.go | 2 +- .../microsoftteamswebhook.go | 2 +- pkg/detectors/mindmeister/mindmeister.go | 2 +- pkg/detectors/miro/miro.go | 2 +- pkg/detectors/mite/mite.go | 2 +- pkg/detectors/mixmax/mixmax.go | 2 +- pkg/detectors/mixpanel/mixpanel.go | 2 +- pkg/detectors/mockaroo/mockaroo.go | 2 +- pkg/detectors/moderation/moderation.go | 2 +- pkg/detectors/monday/monday.go | 2 +- pkg/detectors/mongodb/mongodb.go | 2 +- pkg/detectors/monkeylearn/monkeylearn.go | 2 +- pkg/detectors/moonclerk/moonclerk.go | 2 +- pkg/detectors/moosend/moosend.go | 2 +- pkg/detectors/moralis/moralis.go | 2 +- pkg/detectors/mrticktock/mrticktock.go | 2 +- pkg/detectors/mux/mux.go | 2 +- pkg/detectors/myfreshworks/myfreshworks.go | 2 +- pkg/detectors/myintervals/myintervals.go | 2 +- .../nasdaqdatalink/nasdaqdatalink.go | 2 +- pkg/detectors/nethunt/nethunt.go | 2 +- pkg/detectors/netlify/netlify.go | 2 +- pkg/detectors/neutrinoapi/neutrinoapi.go | 2 +- .../newrelicpersonalapikey.go | 4 +- pkg/detectors/newsapi/newsapi.go | 2 +- pkg/detectors/newscatcher/newscatcher.go | 2 +- pkg/detectors/nexmoapikey/nexmoapikey.go | 2 +- pkg/detectors/nftport/nftport.go | 2 +- pkg/detectors/ngc/ngc.go | 2 +- pkg/detectors/ngrok/ngrok.go | 2 +- pkg/detectors/nicereply/nicereply.go | 2 +- pkg/detectors/nightfall/nightfall.go | 2 +- pkg/detectors/nimble/nimble.go | 2 +- pkg/detectors/nitro/nitro.go | 2 +- pkg/detectors/noticeable/noticeable.go | 2 +- pkg/detectors/notion/notion.go | 2 +- pkg/detectors/nozbeteams/nozbeteams.go | 2 +- pkg/detectors/npmtoken/npmtoken.go | 2 +- pkg/detectors/npmtokenv2/npmtokenv2.go | 2 +- pkg/detectors/nugetapikey/nugetapikey.go | 4 +- pkg/detectors/numverify/numverify.go | 2 +- pkg/detectors/nutritionix/nutritionix.go | 2 +- pkg/detectors/nylas/nylas.go | 2 +- pkg/detectors/nytimes/nytimes.go | 2 +- pkg/detectors/oanda/oanda.go | 2 +- pkg/detectors/okta/okta.go | 2 +- pkg/detectors/omnisend/omnisend.go | 2 +- pkg/detectors/onedesk/onedesk.go | 2 +- pkg/detectors/onelogin/onelogin.go | 2 +- pkg/detectors/onepagecrm/onepagecrm.go | 2 +- pkg/detectors/onesignal/onesignal.go | 2 +- pkg/detectors/onwaterio/onwaterio.go | 2 +- pkg/detectors/oopspam/oopspam.go | 2 +- pkg/detectors/openai/openai.go | 2 +- pkg/detectors/opencagedata/opencagedata.go | 2 +- pkg/detectors/opengraphr/opengraphr.go | 2 +- pkg/detectors/openuv/openuv.go | 2 +- pkg/detectors/openvpn/openvpn.go | 2 +- pkg/detectors/openweather/openweather.go | 2 +- pkg/detectors/opsgenie/opsgenie.go | 2 +- pkg/detectors/optimizely/optimizely.go | 2 +- pkg/detectors/overloop/overloop.go | 2 +- pkg/detectors/owlbot/owlbot.go | 2 +- pkg/detectors/packagecloud/packagecloud.go | 2 +- .../pagerdutyapikey/pagerdutyapikey.go | 2 +- pkg/detectors/pandadoc/pandadoc.go | 2 +- pkg/detectors/pandascore/pandascore.go | 2 +- pkg/detectors/paperform/paperform.go | 2 +- pkg/detectors/paralleldots/paralleldots.go | 2 +- pkg/detectors/parsehub/parsehub.go | 2 +- pkg/detectors/parsers/parsers.go | 2 +- pkg/detectors/parseur/parseur.go | 2 +- pkg/detectors/partnerstack/partnerstack.go | 2 +- pkg/detectors/pastebin/pastebin.go | 2 +- pkg/detectors/paydirtapp/paydirtapp.go | 2 +- pkg/detectors/paymoapp/paymoapp.go | 2 +- pkg/detectors/paymongo/paymongo.go | 2 +- pkg/detectors/paypaloauth/paypaloauth.go | 2 +- pkg/detectors/paystack/paystack.go | 2 +- pkg/detectors/pdflayer/pdflayer.go | 2 +- pkg/detectors/pdfshift/pdfshift.go | 2 +- .../peopledatalabs/peopledatalabs.go | 2 +- pkg/detectors/pepipost/pepipost.go | 2 +- pkg/detectors/percy/percy.go | 2 +- pkg/detectors/pinata/pinata.go | 2 +- pkg/detectors/pipedream/pipedream.go | 2 +- pkg/detectors/pipedrive/pipedrive.go | 2 +- .../pivotaltracker/pivotaltracker.go | 2 +- pkg/detectors/pixabay/pixabay.go | 2 +- pkg/detectors/plaidkey/plaidkey.go | 2 +- pkg/detectors/planetscale/planetscale.go | 2 +- pkg/detectors/planetscaledb/planetscaledb.go | 2 +- .../planviewleankit/planviewleankit.go | 2 +- pkg/detectors/planyo/planyo.go | 2 +- pkg/detectors/plivo/plivo.go | 2 +- pkg/detectors/podio/podio.go | 2 +- pkg/detectors/pollsapi/pollsapi.go | 2 +- pkg/detectors/poloniex/poloniex.go | 2 +- pkg/detectors/polygon/polygon.go | 2 +- pkg/detectors/portainer/portainer.go | 2 +- .../portainertoken/portainertoken.go | 2 +- pkg/detectors/positionstack/positionstack.go | 2 +- pkg/detectors/postageapp/postageapp.go | 2 +- pkg/detectors/postbacks/postbacks.go | 2 +- pkg/detectors/postgres/postgres.go | 3 +- pkg/detectors/posthog/posthog.go | 4 +- pkg/detectors/postman/postman.go | 2 +- pkg/detectors/postmark/postmark.go | 2 +- pkg/detectors/powrbot/powrbot.go | 2 +- pkg/detectors/prefect/prefect.go | 2 +- pkg/detectors/privacy/privacy.go | 2 +- pkg/detectors/privatekey/privatekey.go | 2 +- pkg/detectors/prodpad/prodpad.go | 2 +- pkg/detectors/prospectcrm/prospectcrm.go | 2 +- pkg/detectors/protocolsio/protocolsio.go | 2 +- pkg/detectors/proxycrawl/proxycrawl.go | 2 +- .../pubnubpublishkey/pubnubpublishkey.go | 2 +- .../pubnubsubscriptionkey.go | 2 +- pkg/detectors/pulumi/pulumi.go | 2 +- pkg/detectors/purestake/purestake.go | 2 +- .../pushbulletapikey/pushbulletapikey.go | 2 +- .../pusherchannelkey/pusherchannelkey.go | 2 +- pkg/detectors/qase/qase.go | 2 +- pkg/detectors/qualaroo/qualaroo.go | 2 +- pkg/detectors/qubole/qubole.go | 2 +- pkg/detectors/rabbitmq/rabbitmq.go | 2 +- pkg/detectors/ramp/ramp.go | 2 +- pkg/detectors/rapidapi/rapidapi.go | 2 +- pkg/detectors/raven/raven.go | 2 +- pkg/detectors/rawg/rawg.go | 2 +- pkg/detectors/razorpay/razorpay.go | 2 +- pkg/detectors/reachmail/reachmail.go | 2 +- pkg/detectors/readme/readme.go | 2 +- .../reallysimplesystems.go | 2 +- pkg/detectors/rebrandly/rebrandly.go | 2 +- .../rechargepayments/rechargepayments.go | 2 +- pkg/detectors/redis/redis.go | 2 +- pkg/detectors/refiner/refiner.go | 2 +- pkg/detectors/rentman/rentman.go | 2 +- pkg/detectors/repairshopr/repairshopr.go | 2 +- pkg/detectors/replicate/replicate.go | 2 +- pkg/detectors/replyio/replyio.go | 2 +- .../requestfinance/requestfinance.go | 2 +- pkg/detectors/restpack/restpack.go | 2 +- .../restpackhtmltopdfapi.go | 2 +- .../restpackscreenshotapi.go | 2 +- pkg/detectors/rev/rev.go | 2 +- pkg/detectors/revampcrm/revampcrm.go | 2 +- pkg/detectors/ringcentral/ringcentral.go | 2 +- pkg/detectors/ritekit/ritekit.go | 2 +- pkg/detectors/roaring/roaring.go | 2 +- pkg/detectors/rocketreach/rocketreach.go | 2 +- pkg/detectors/rockset/rockset.go | 2 +- pkg/detectors/roninapp/roninapp.go | 2 +- pkg/detectors/route4me/route4me.go | 2 +- pkg/detectors/rownd/rownd.go | 2 +- pkg/detectors/rubygems/rubygems.go | 2 +- pkg/detectors/runrunit/runrunit.go | 2 +- pkg/detectors/salesblink/salesblink.go | 2 +- pkg/detectors/salescookie/salescookie.go | 2 +- pkg/detectors/salesflare/salesflare.go | 2 +- pkg/detectors/salesforce/salesforce.go | 2 +- pkg/detectors/salesmate/salesmate.go | 2 +- .../satismeterprojectkey.go | 2 +- .../satismeterwritekey/satismeterwritekey.go | 2 +- pkg/detectors/saucelabs/saucelabs.go | 2 +- pkg/detectors/scalewaykey/scalewaykey.go | 2 +- pkg/detectors/scalr/scalr.go | 2 +- pkg/detectors/scrapeowl/scrapeowl.go | 2 +- pkg/detectors/scraperapi/scraperapi.go | 2 +- pkg/detectors/scraperbox/scraperbox.go | 2 +- pkg/detectors/scrapestack/scrapestack.go | 2 +- pkg/detectors/scrapfly/scrapfly.go | 2 +- pkg/detectors/scrapingant/scrapingant.go | 2 +- pkg/detectors/scrapingbee/scrapingbee.go | 2 +- pkg/detectors/screenshotapi/screenshotapi.go | 2 +- .../screenshotlayer/screenshotlayer.go | 2 +- pkg/detectors/scrutinizerci/scrutinizerci.go | 2 +- .../securitytrails/securitytrails.go | 2 +- pkg/detectors/segmentapikey/segmentapikey.go | 2 +- pkg/detectors/selectpdf/selectpdf.go | 2 +- pkg/detectors/semaphore/semaphore.go | 2 +- pkg/detectors/sendbird/sendbird.go | 2 +- .../sendbirdorganizationapi.go | 2 +- pkg/detectors/sendgrid/sendgrid.go | 2 +- pkg/detectors/sendinbluev2/sendinbluev2.go | 2 +- pkg/detectors/sentrytoken/sentrytoken.go | 2 +- pkg/detectors/serphouse/serphouse.go | 2 +- pkg/detectors/serpstack/serpstack.go | 2 +- pkg/detectors/sheety/sheety.go | 2 +- pkg/detectors/sherpadesk/sherpadesk.go | 2 +- pkg/detectors/shipday/shipday.go | 2 +- pkg/detectors/shodankey/shodankey.go | 2 +- pkg/detectors/shopify/shopify.go | 2 +- pkg/detectors/shortcut/shortcut.go | 2 +- pkg/detectors/shotstack/shotstack.go | 2 +- pkg/detectors/shutterstock/shutterstock.go | 2 +- .../shutterstockoauth/shutterstockoauth.go | 2 +- pkg/detectors/signable/signable.go | 2 +- pkg/detectors/signalwire/signalwire.go | 2 +- pkg/detectors/signaturit/signaturit.go | 2 +- pkg/detectors/signupgenius/signupgenius.go | 2 +- pkg/detectors/sigopt/sigopt.go | 2 +- pkg/detectors/simfin/simfin.go | 2 +- pkg/detectors/simplesat/simplesat.go | 2 +- pkg/detectors/simplynoted/simplynoted.go | 2 +- pkg/detectors/simvoly/simvoly.go | 2 +- pkg/detectors/sinchmessage/sinchmessage.go | 2 +- pkg/detectors/sirv/sirv.go | 2 +- pkg/detectors/siteleaf/siteleaf.go | 2 +- pkg/detectors/skrappio/skrappio.go | 2 +- pkg/detectors/skybiometry/skybiometry.go | 2 +- pkg/detectors/slack/slack.go | 2 +- pkg/detectors/slackwebhook/slackwebhook.go | 2 +- pkg/detectors/smartsheets/smartsheets.go | 2 +- pkg/detectors/smartystreets/smartystreets.go | 2 +- pkg/detectors/smooch/smooch.go | 2 +- pkg/detectors/snipcart/snipcart.go | 2 +- pkg/detectors/snowflake/snowflake.go | 2 +- pkg/detectors/snykkey/snykkey.go | 2 +- pkg/detectors/sonarcloud/sonarcloud.go | 2 +- pkg/detectors/sourcegraph/sourcegraph.go | 2 +- .../sourcegraphcody/sourcegraphcody.go | 2 +- pkg/detectors/sparkpost/sparkpost.go | 2 +- pkg/detectors/speechtextai/speechtextai.go | 2 +- .../splunkobservabilitytoken.go | 2 +- pkg/detectors/spoonacular/spoonacular.go | 2 +- pkg/detectors/sportsmonk/sportsmonk.go | 2 +- pkg/detectors/spotifykey/spotifykey.go | 2 +- pkg/detectors/sqlserver/sqlserver.go | 2 +- pkg/detectors/square/square.go | 4 +- pkg/detectors/squareapp/squareapp.go | 2 +- pkg/detectors/squarespace/squarespace.go | 2 +- pkg/detectors/squareup/squareup.go | 2 +- pkg/detectors/sslmate/sslmate.go | 2 +- pkg/detectors/statuscake/statuscake.go | 2 +- pkg/detectors/statuspage/statuspage.go | 2 +- pkg/detectors/statuspal/statuspal.go | 2 +- pkg/detectors/stitchdata/stitchdata.go | 2 +- pkg/detectors/stockdata/stockdata.go | 2 +- pkg/detectors/storecove/storecove.go | 2 +- pkg/detectors/stormboard/stormboard.go | 2 +- pkg/detectors/stormglass/stormglass.go | 2 +- pkg/detectors/storyblok/storyblok.go | 2 +- pkg/detectors/storychief/storychief.go | 2 +- pkg/detectors/strava/strava.go | 2 +- pkg/detectors/streak/streak.go | 2 +- pkg/detectors/stripe/stripe.go | 4 +- pkg/detectors/stripo/stripo.go | 2 +- pkg/detectors/stytch/stytch.go | 2 +- pkg/detectors/sugester/sugester.go | 2 +- pkg/detectors/sumologickey/sumologickey.go | 2 +- pkg/detectors/supabasetoken/supabasetoken.go | 2 +- pkg/detectors/supernotesapi/supernotesapi.go | 2 +- .../surveyanyplace/surveyanyplace.go | 2 +- pkg/detectors/surveybot/surveybot.go | 2 +- pkg/detectors/surveysparrow/surveysparrow.go | 2 +- pkg/detectors/survicate/survicate.go | 2 +- pkg/detectors/swell/swell.go | 2 +- pkg/detectors/swiftype/swiftype.go | 2 +- pkg/detectors/tailscale/tailscale.go | 2 +- pkg/detectors/tallyfy/tallyfy.go | 2 +- pkg/detectors/tatumio/tatumio.go | 2 +- pkg/detectors/taxjar/taxjar.go | 2 +- pkg/detectors/teamgate/teamgate.go | 2 +- pkg/detectors/teamworkcrm/teamworkcrm.go | 2 +- pkg/detectors/teamworkdesk/teamworkdesk.go | 2 +- .../teamworkspaces/teamworkspaces.go | 2 +- .../technicalanalysisapi.go | 2 +- pkg/detectors/tefter/tefter.go | 2 +- .../telegrambottoken/telegrambottoken.go | 2 +- pkg/detectors/teletype/teletype.go | 2 +- pkg/detectors/telnyx/telnyx.go | 2 +- .../terraformcloudpersonaltoken.go | 2 +- pkg/detectors/testingbot/testingbot.go | 2 +- pkg/detectors/textmagic/textmagic.go | 2 +- pkg/detectors/theoddsapi/theoddsapi.go | 2 +- pkg/detectors/thinkific/thinkific.go | 2 +- pkg/detectors/thousandeyes/thousandeyes.go | 2 +- pkg/detectors/ticketmaster/ticketmaster.go | 2 +- pkg/detectors/tickettailor/tickettailor.go | 2 +- pkg/detectors/tiingo/tiingo.go | 2 +- pkg/detectors/timecamp/timecamp.go | 2 +- pkg/detectors/timezoneapi/timezoneapi.go | 2 +- pkg/detectors/tineswebhook/tineswebhook.go | 2 +- pkg/detectors/tly/tly.go | 2 +- pkg/detectors/tmetric/tmetric.go | 2 +- pkg/detectors/todoist/todoist.go | 2 +- pkg/detectors/toggltrack/toggltrack.go | 2 +- pkg/detectors/tokeet/tokeet.go | 2 +- pkg/detectors/tomorrowio/tomorrowio.go | 2 +- pkg/detectors/tomtom/tomtom.go | 2 +- pkg/detectors/tradier/tradier.go | 2 +- pkg/detectors/transferwise/transferwise.go | 2 +- pkg/detectors/travelpayouts/travelpayouts.go | 2 +- pkg/detectors/travisci/travisci.go | 2 +- pkg/detectors/trelloapikey/trelloapikey.go | 2 +- pkg/detectors/tru/tru.go | 2 +- .../trufflehogenterprise.go | 2 +- pkg/detectors/twelvedata/twelvedata.go | 2 +- pkg/detectors/twilio/twilio.go | 2 +- pkg/detectors/twist/twist.go | 2 +- pkg/detectors/twitch/twitch.go | 2 +- pkg/detectors/twitter/twitter.go | 2 +- pkg/detectors/tyntec/tyntec.go | 2 +- pkg/detectors/typeform/typeform.go | 2 +- pkg/detectors/typetalk/typetalk.go | 2 +- pkg/detectors/ubidots/ubidots.go | 2 +- pkg/detectors/uclassify/uclassify.go | 2 +- pkg/detectors/unifyid/unifyid.go | 2 +- pkg/detectors/unplugg/unplugg.go | 2 +- pkg/detectors/unsplash/unsplash.go | 2 +- pkg/detectors/upcdatabase/upcdatabase.go | 2 +- pkg/detectors/uplead/uplead.go | 2 +- pkg/detectors/uploadcare/uploadcare.go | 2 +- pkg/detectors/uptimerobot/uptimerobot.go | 2 +- pkg/detectors/upwave/upwave.go | 2 +- pkg/detectors/uri/uri.go | 2 +- pkg/detectors/urlscan/urlscan.go | 2 +- pkg/detectors/user/user.go | 2 +- pkg/detectors/userflow/userflow.go | 2 +- pkg/detectors/userstack/userstack.go | 2 +- .../vagrantcloudpersonaltoken.go | 2 +- pkg/detectors/vatlayer/vatlayer.go | 2 +- pkg/detectors/vbout/vbout.go | 2 +- pkg/detectors/vercel/vercel.go | 2 +- pkg/detectors/verifier/verifier.go | 2 +- pkg/detectors/verimail/verimail.go | 2 +- pkg/detectors/veriphone/veriphone.go | 2 +- pkg/detectors/versioneye/versioneye.go | 2 +- pkg/detectors/viewneo/viewneo.go | 2 +- pkg/detectors/virustotal/virustotal.go | 2 +- .../visualcrossing/visualcrossing.go | 2 +- pkg/detectors/voiceflow/voiceflow.go | 4 +- pkg/detectors/voicegain/voicegain.go | 2 +- pkg/detectors/voodoosms/voodoosms.go | 2 +- pkg/detectors/vouchery/vouchery.go | 2 +- pkg/detectors/vpnapi/vpnapi.go | 2 +- pkg/detectors/vultrapikey/vultrapikey.go | 2 +- pkg/detectors/vyte/vyte.go | 2 +- pkg/detectors/walkscore/walkscore.go | 2 +- pkg/detectors/weatherbit/weatherbit.go | 2 +- pkg/detectors/weatherstack/weatherstack.go | 2 +- pkg/detectors/web3storage/web3storage.go | 2 +- pkg/detectors/webex/webex.go | 2 +- pkg/detectors/webflow/webflow.go | 2 +- pkg/detectors/webscraper/webscraper.go | 2 +- pkg/detectors/webscraping/webscraping.go | 2 +- pkg/detectors/websitepulse/websitepulse.go | 2 +- pkg/detectors/wepay/wepay.go | 2 +- pkg/detectors/whoxy/whoxy.go | 2 +- pkg/detectors/wistia/wistia.go | 2 +- pkg/detectors/wit/wit.go | 2 +- pkg/detectors/worksnaps/worksnaps.go | 2 +- pkg/detectors/workstack/workstack.go | 2 +- .../worldcoinindex/worldcoinindex.go | 2 +- pkg/detectors/worldweather/worldweather.go | 2 +- pkg/detectors/wrike/wrike.go | 2 +- pkg/detectors/yandex/yandex.go | 2 +- pkg/detectors/yelp/yelp.go | 2 +- .../youneedabudget/youneedabudget.go | 2 +- pkg/detectors/yousign/yousign.go | 2 +- pkg/detectors/youtubeapikey/youtubeapikey.go | 2 +- pkg/detectors/zapierwebhook/zapierwebhook.go | 2 +- pkg/detectors/zendeskapi/zendeskapi.go | 2 +- pkg/detectors/zenkitapi/zenkitapi.go | 2 +- pkg/detectors/zenrows/zenrows.go | 2 +- pkg/detectors/zenscrape/zenscrape.go | 3 +- pkg/detectors/zenserp/zenserp.go | 2 +- pkg/detectors/zeplin/zeplin.go | 2 +- pkg/detectors/zerobounce/zerobounce.go | 2 +- pkg/detectors/zerotier/zerotier.go | 2 +- pkg/detectors/zipapi/zipapi.go | 2 +- pkg/detectors/zipbooks/zipbooks.go | 2 +- pkg/detectors/zipcodeapi/zipcodeapi.go | 2 +- pkg/detectors/zipcodebase/zipcodebase.go | 2 +- pkg/detectors/zonkafeedback/zonkafeedback.go | 2 +- pkg/detectors/zulipchat/zulipchat.go | 2 +- 821 files changed, 913 insertions(+), 844 deletions(-) diff --git a/go.mod b/go.mod index 374eafb40..0d260f798 100644 --- a/go.mod +++ b/go.mod @@ -204,6 +204,7 @@ require ( github.com/launchdarkly/go-semver v1.0.2 // indirect github.com/launchdarkly/go-server-sdk-evaluation/v2 v2.0.2 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect + github.com/magefile/mage v1.14.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-localereader v0.0.1 // indirect @@ -235,9 +236,11 @@ require ( github.com/sahilm/fuzzy v0.1.0 // indirect github.com/sirupsen/logrus v1.9.1 // indirect github.com/skeema/knownhosts v1.2.1 // indirect + github.com/tetratelabs/wazero v1.5.0 // indirect github.com/therootcompany/xz v1.0.1 // indirect github.com/ulikunitz/xz v0.5.11 // indirect github.com/vbatts/tar-split v0.11.3 // indirect + github.com/wasilibs/go-re2 v1.4.1 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect diff --git a/go.sum b/go.sum index 3a2baed76..5b0e993de 100644 --- a/go.sum +++ b/go.sum @@ -528,6 +528,8 @@ github.com/lrstanley/bubblezone v0.0.0-20230911164824-e3824f1adde9 h1:+7bxeCzFs4 github.com/lrstanley/bubblezone v0.0.0-20230911164824-e3824f1adde9/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/magefile/mage v1.14.0 h1:6QDX3g6z1YvJ4olPhT1wksUcSa/V0a1B+pJb73fBjyo= +github.com/magefile/mage v1.14.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= 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= @@ -682,6 +684,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.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/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/trufflesecurity/disk-buffer-reader v0.2.1 h1:K9nNpX3xeWT2E6YRjlcc1X5c1NjgV9JS5T9aw2FjA8Q= @@ -694,6 +698,8 @@ github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0o github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8= github.com/vbatts/tar-split v0.11.3 h1:hLFqsOLQ1SsppQNTMpkpPXClLDfC2A3Zgy9OUU+RVck= github.com/vbatts/tar-split v0.11.3/go.mod h1:9QlHN18E+fEH7RdG+QAJJcuya3rqT7eXSTY7wGrAokY= +github.com/wasilibs/go-re2 v1.4.1 h1:E5+9O1M8UoGeqLB2A9omeoaWImqpuYDs9cKwvTJq/Oo= +github.com/wasilibs/go-re2 v1.4.1/go.mod h1:ynB8eCwd9JsqUnsk8WlPDk6cEeme8BguZmnqOSURE4Y= github.com/wsxiaoys/terminal v0.0.0-20160513160801-0940f3fc43a0 h1:3UeQBvD0TFrlVjOeLOBz+CPAI8dnbqNSVwUwRrkp7vQ= github.com/wsxiaoys/terminal v0.0.0-20160513160801-0940f3fc43a0/go.mod h1:IXCdmsXIht47RaVFLEdVnh1t+pgYtTAhQGj73kz+2DM= github.com/xanzy/go-gitlab v0.94.0 h1:GmBl2T5zqUHqyjkxFSvsT7CbelGdAH/dmBqUBqS+4BE= diff --git a/pkg/detectors/abbysale/abbysale.go b/pkg/detectors/abbysale/abbysale.go index f71dfd76b..7f816d40f 100644 --- a/pkg/detectors/abbysale/abbysale.go +++ b/pkg/detectors/abbysale/abbysale.go @@ -2,8 +2,8 @@ package abbysale import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/abstract/abstract.go b/pkg/detectors/abstract/abstract.go index 5cdba22bb..0005e6326 100644 --- a/pkg/detectors/abstract/abstract.go +++ b/pkg/detectors/abstract/abstract.go @@ -3,8 +3,8 @@ package abstract import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/abuseipdb/abuseipdb.go b/pkg/detectors/abuseipdb/abuseipdb.go index bcfda4826..dfb40ec6e 100644 --- a/pkg/detectors/abuseipdb/abuseipdb.go +++ b/pkg/detectors/abuseipdb/abuseipdb.go @@ -5,7 +5,7 @@ import ( "io" "net/http" // "log" - "regexp" + regexp "github.com/wasilibs/go-re2" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/accuweather/accuweather.go b/pkg/detectors/accuweather/accuweather.go index bf15c6d12..77ad25430 100644 --- a/pkg/detectors/accuweather/accuweather.go +++ b/pkg/detectors/accuweather/accuweather.go @@ -2,8 +2,8 @@ package accuweather import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/adafruitio/adafruitio.go b/pkg/detectors/adafruitio/adafruitio.go index f0c3271b3..b699af6bd 100644 --- a/pkg/detectors/adafruitio/adafruitio.go +++ b/pkg/detectors/adafruitio/adafruitio.go @@ -2,8 +2,8 @@ package adafruitio import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/adobeio/adobeio.go b/pkg/detectors/adobeio/adobeio.go index 2d9e24f1c..fae2111f7 100644 --- a/pkg/detectors/adobeio/adobeio.go +++ b/pkg/detectors/adobeio/adobeio.go @@ -2,8 +2,8 @@ package adobeio import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/adzuna/adzuna.go b/pkg/detectors/adzuna/adzuna.go index b95862fc6..adf07c597 100644 --- a/pkg/detectors/adzuna/adzuna.go +++ b/pkg/detectors/adzuna/adzuna.go @@ -3,8 +3,8 @@ package adzuna import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/aeroworkflow/aeroworkflow.go b/pkg/detectors/aeroworkflow/aeroworkflow.go index 7b905d760..ef534924a 100644 --- a/pkg/detectors/aeroworkflow/aeroworkflow.go +++ b/pkg/detectors/aeroworkflow/aeroworkflow.go @@ -2,8 +2,8 @@ package aeroworkflow import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/agora/agora.go b/pkg/detectors/agora/agora.go index 07bb106e6..132274a17 100644 --- a/pkg/detectors/agora/agora.go +++ b/pkg/detectors/agora/agora.go @@ -2,8 +2,8 @@ package agora import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/aha/aha.go b/pkg/detectors/aha/aha.go index 3007853d1..27659d21a 100644 --- a/pkg/detectors/aha/aha.go +++ b/pkg/detectors/aha/aha.go @@ -3,8 +3,8 @@ package aha import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/airbrakeprojectkey/airbrakeprojectkey.go b/pkg/detectors/airbrakeprojectkey/airbrakeprojectkey.go index 97342081c..4fdd1bca7 100644 --- a/pkg/detectors/airbrakeprojectkey/airbrakeprojectkey.go +++ b/pkg/detectors/airbrakeprojectkey/airbrakeprojectkey.go @@ -2,8 +2,8 @@ package airbrakeprojectkey import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/airbrakeuserkey/airbrakeuserkey.go b/pkg/detectors/airbrakeuserkey/airbrakeuserkey.go index 06e260696..fc9b13f35 100644 --- a/pkg/detectors/airbrakeuserkey/airbrakeuserkey.go +++ b/pkg/detectors/airbrakeuserkey/airbrakeuserkey.go @@ -2,8 +2,8 @@ package airbrakeuserkey import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/airship/airship.go b/pkg/detectors/airship/airship.go index 4ee0d00b1..70c32d54b 100644 --- a/pkg/detectors/airship/airship.go +++ b/pkg/detectors/airship/airship.go @@ -3,8 +3,8 @@ package airship import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/airtableapikey/airtableapikey.go b/pkg/detectors/airtableapikey/airtableapikey.go index fea0d844c..1eaaf2032 100644 --- a/pkg/detectors/airtableapikey/airtableapikey.go +++ b/pkg/detectors/airtableapikey/airtableapikey.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/airvisual/airvisual.go b/pkg/detectors/airvisual/airvisual.go index 4a4ccf46b..72d09348f 100644 --- a/pkg/detectors/airvisual/airvisual.go +++ b/pkg/detectors/airvisual/airvisual.go @@ -3,8 +3,8 @@ package airvisual import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/aiven/aiven.go b/pkg/detectors/aiven/aiven.go index 9ed94729b..451ed8ad0 100644 --- a/pkg/detectors/aiven/aiven.go +++ b/pkg/detectors/aiven/aiven.go @@ -3,8 +3,8 @@ package aiven import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/alchemy/alchemy.go b/pkg/detectors/alchemy/alchemy.go index 2e806bdbc..d9699dc0b 100644 --- a/pkg/detectors/alchemy/alchemy.go +++ b/pkg/detectors/alchemy/alchemy.go @@ -3,8 +3,8 @@ package alchemy import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/alconost/alconost.go b/pkg/detectors/alconost/alconost.go index 9ce7746cd..99699c9f0 100644 --- a/pkg/detectors/alconost/alconost.go +++ b/pkg/detectors/alconost/alconost.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/alegra/alegra.go b/pkg/detectors/alegra/alegra.go index 681677f4c..8ef7c0b9c 100644 --- a/pkg/detectors/alegra/alegra.go +++ b/pkg/detectors/alegra/alegra.go @@ -2,8 +2,8 @@ package alegra import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/aletheiaapi/aletheiaapi.go b/pkg/detectors/aletheiaapi/aletheiaapi.go index 7e3e987c7..c22eee4c8 100644 --- a/pkg/detectors/aletheiaapi/aletheiaapi.go +++ b/pkg/detectors/aletheiaapi/aletheiaapi.go @@ -2,8 +2,8 @@ package aletheiaapi import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/algoliaadminkey/algoliaadminkey.go b/pkg/detectors/algoliaadminkey/algoliaadminkey.go index bd5c43507..49c15b3e3 100644 --- a/pkg/detectors/algoliaadminkey/algoliaadminkey.go +++ b/pkg/detectors/algoliaadminkey/algoliaadminkey.go @@ -2,8 +2,8 @@ package algoliaadminkey import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/alibaba/alibaba.go b/pkg/detectors/alibaba/alibaba.go index 3dd5ce0ef..2e03009aa 100644 --- a/pkg/detectors/alibaba/alibaba.go +++ b/pkg/detectors/alibaba/alibaba.go @@ -6,9 +6,9 @@ import ( "crypto/rand" "crypto/sha1" "encoding/base64" + regexp "github.com/wasilibs/go-re2" "net/http" "net/url" - "regexp" "strconv" "strings" "time" diff --git a/pkg/detectors/alienvault/alienvault.go b/pkg/detectors/alienvault/alienvault.go index b1c434328..61a38ced5 100644 --- a/pkg/detectors/alienvault/alienvault.go +++ b/pkg/detectors/alienvault/alienvault.go @@ -2,8 +2,8 @@ package alienvault import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/allsports/allsports.go b/pkg/detectors/allsports/allsports.go index 2250e7690..2fef074fb 100644 --- a/pkg/detectors/allsports/allsports.go +++ b/pkg/detectors/allsports/allsports.go @@ -5,7 +5,7 @@ import ( "io" "net/http" // "log" - "regexp" + regexp "github.com/wasilibs/go-re2" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/amadeus/amadeus.go b/pkg/detectors/amadeus/amadeus.go index 2682f154f..561dba6fa 100644 --- a/pkg/detectors/amadeus/amadeus.go +++ b/pkg/detectors/amadeus/amadeus.go @@ -2,9 +2,9 @@ package amadeus import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/ambee/ambee.go b/pkg/detectors/ambee/ambee.go index d35ee2d55..1441e6eb4 100644 --- a/pkg/detectors/ambee/ambee.go +++ b/pkg/detectors/ambee/ambee.go @@ -2,8 +2,8 @@ package ambee import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/amplitudeapikey/amplitudeapikey.go b/pkg/detectors/amplitudeapikey/amplitudeapikey.go index c39de0da0..9cfcb725d 100644 --- a/pkg/detectors/amplitudeapikey/amplitudeapikey.go +++ b/pkg/detectors/amplitudeapikey/amplitudeapikey.go @@ -2,8 +2,8 @@ package amplitudeapikey import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/anthropic/anthropic.go b/pkg/detectors/anthropic/anthropic.go index bf4d74d57..53319dbed 100644 --- a/pkg/detectors/anthropic/anthropic.go +++ b/pkg/detectors/anthropic/anthropic.go @@ -5,8 +5,8 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/anypoint/anypoint.go b/pkg/detectors/anypoint/anypoint.go index b501da673..826a15f5e 100644 --- a/pkg/detectors/anypoint/anypoint.go +++ b/pkg/detectors/anypoint/anypoint.go @@ -3,8 +3,8 @@ package anypoint import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/apacta/apacta.go b/pkg/detectors/apacta/apacta.go index fea8c0ad2..7789c2044 100644 --- a/pkg/detectors/apacta/apacta.go +++ b/pkg/detectors/apacta/apacta.go @@ -3,8 +3,8 @@ package apacta import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/api2cart/api2cart.go b/pkg/detectors/api2cart/api2cart.go index 013b830dc..dd3080963 100644 --- a/pkg/detectors/api2cart/api2cart.go +++ b/pkg/detectors/api2cart/api2cart.go @@ -4,9 +4,9 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/apideck/apideck.go b/pkg/detectors/apideck/apideck.go index 5bac10c5d..03a6eb10f 100644 --- a/pkg/detectors/apideck/apideck.go +++ b/pkg/detectors/apideck/apideck.go @@ -3,8 +3,8 @@ package apideck import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/apiflash/apiflash.go b/pkg/detectors/apiflash/apiflash.go index 65209b7c8..ed07a722a 100644 --- a/pkg/detectors/apiflash/apiflash.go +++ b/pkg/detectors/apiflash/apiflash.go @@ -3,8 +3,8 @@ package apiflash import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/apifonica/apifonica.go b/pkg/detectors/apifonica/apifonica.go index e47e24b56..dbe1dcd55 100644 --- a/pkg/detectors/apifonica/apifonica.go +++ b/pkg/detectors/apifonica/apifonica.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/apify/apify.go b/pkg/detectors/apify/apify.go index e1e4361b4..d75b19800 100644 --- a/pkg/detectors/apify/apify.go +++ b/pkg/detectors/apify/apify.go @@ -2,8 +2,8 @@ package apify import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/apilayer/apilayer.go b/pkg/detectors/apilayer/apilayer.go index a0c92f537..144510bb7 100644 --- a/pkg/detectors/apilayer/apilayer.go +++ b/pkg/detectors/apilayer/apilayer.go @@ -2,8 +2,8 @@ package apilayer import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/apimatic/apimatic.go b/pkg/detectors/apimatic/apimatic.go index 2ea2e070c..ca37f0e2a 100644 --- a/pkg/detectors/apimatic/apimatic.go +++ b/pkg/detectors/apimatic/apimatic.go @@ -2,8 +2,8 @@ package apimatic import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/apiscience/apiscience.go b/pkg/detectors/apiscience/apiscience.go index e26e2fd3f..c7308f8e5 100644 --- a/pkg/detectors/apiscience/apiscience.go +++ b/pkg/detectors/apiscience/apiscience.go @@ -3,8 +3,8 @@ package apiscience import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/apitemplate/apitemplate.go b/pkg/detectors/apitemplate/apitemplate.go index d7e403edc..554f2fffb 100644 --- a/pkg/detectors/apitemplate/apitemplate.go +++ b/pkg/detectors/apitemplate/apitemplate.go @@ -2,8 +2,8 @@ package apitemplate import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/apollo/apollo.go b/pkg/detectors/apollo/apollo.go index ef9664943..30ff0f0b1 100644 --- a/pkg/detectors/apollo/apollo.go +++ b/pkg/detectors/apollo/apollo.go @@ -3,8 +3,8 @@ package apollo import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/appcues/appcues.go b/pkg/detectors/appcues/appcues.go index f3d168a54..687e1f0f5 100644 --- a/pkg/detectors/appcues/appcues.go +++ b/pkg/detectors/appcues/appcues.go @@ -3,8 +3,8 @@ package appcues import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/appfollow/appfollow.go b/pkg/detectors/appfollow/appfollow.go index 7e3e37abf..d0bf67166 100644 --- a/pkg/detectors/appfollow/appfollow.go +++ b/pkg/detectors/appfollow/appfollow.go @@ -2,8 +2,8 @@ package appfollow import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/appointedd/appointedd.go b/pkg/detectors/appointedd/appointedd.go index 2ce2c0378..6c6e3fe38 100644 --- a/pkg/detectors/appointedd/appointedd.go +++ b/pkg/detectors/appointedd/appointedd.go @@ -2,9 +2,9 @@ package appointedd import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/appoptics/appoptics.go b/pkg/detectors/appoptics/appoptics.go index 90229a97c..3b623ffbf 100644 --- a/pkg/detectors/appoptics/appoptics.go +++ b/pkg/detectors/appoptics/appoptics.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/appsynergy/appsynergy.go b/pkg/detectors/appsynergy/appsynergy.go index 57284e241..210732e8a 100644 --- a/pkg/detectors/appsynergy/appsynergy.go +++ b/pkg/detectors/appsynergy/appsynergy.go @@ -3,8 +3,8 @@ package appsynergy import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/apptivo/apptivo.go b/pkg/detectors/apptivo/apptivo.go index 0763e06a9..5a4362c0b 100644 --- a/pkg/detectors/apptivo/apptivo.go +++ b/pkg/detectors/apptivo/apptivo.go @@ -3,9 +3,9 @@ package apptivo import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/artifactory/artifactory.go b/pkg/detectors/artifactory/artifactory.go index e0af41f4d..a5bf88994 100644 --- a/pkg/detectors/artifactory/artifactory.go +++ b/pkg/detectors/artifactory/artifactory.go @@ -2,8 +2,8 @@ package artifactory import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/artsy/artsy.go b/pkg/detectors/artsy/artsy.go index 2cd90e019..d99a8a5c6 100644 --- a/pkg/detectors/artsy/artsy.go +++ b/pkg/detectors/artsy/artsy.go @@ -2,8 +2,8 @@ package artsy import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/asanaoauth/asanaoauth.go b/pkg/detectors/asanaoauth/asanaoauth.go index e20c07f28..f6bb6dd17 100644 --- a/pkg/detectors/asanaoauth/asanaoauth.go +++ b/pkg/detectors/asanaoauth/asanaoauth.go @@ -3,8 +3,8 @@ package asanaoauth import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/asanapersonalaccesstoken/asanapersonalaccesstoken.go b/pkg/detectors/asanapersonalaccesstoken/asanapersonalaccesstoken.go index de5a83d7f..0f220fbff 100644 --- a/pkg/detectors/asanapersonalaccesstoken/asanapersonalaccesstoken.go +++ b/pkg/detectors/asanapersonalaccesstoken/asanapersonalaccesstoken.go @@ -3,8 +3,8 @@ package asanapersonalaccesstoken import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/assemblyai/assemblyai.go b/pkg/detectors/assemblyai/assemblyai.go index 0a55dc376..56715eea1 100644 --- a/pkg/detectors/assemblyai/assemblyai.go +++ b/pkg/detectors/assemblyai/assemblyai.go @@ -2,8 +2,8 @@ package assemblyai import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/atera/atera.go b/pkg/detectors/atera/atera.go index 8b5d89da1..44f9b5c8b 100644 --- a/pkg/detectors/atera/atera.go +++ b/pkg/detectors/atera/atera.go @@ -2,8 +2,8 @@ package atera import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/audd/audd.go b/pkg/detectors/audd/audd.go index 439ff4c17..a73673d79 100644 --- a/pkg/detectors/audd/audd.go +++ b/pkg/detectors/audd/audd.go @@ -3,9 +3,9 @@ package audd import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/auth0managementapitoken/auth0managementapitoken.go b/pkg/detectors/auth0managementapitoken/auth0managementapitoken.go index 358ed1aea..657033025 100644 --- a/pkg/detectors/auth0managementapitoken/auth0managementapitoken.go +++ b/pkg/detectors/auth0managementapitoken/auth0managementapitoken.go @@ -3,8 +3,8 @@ package auth0managementapitoken import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/auth0oauth/auth0oauth.go b/pkg/detectors/auth0oauth/auth0oauth.go index d5db3ad6f..5694fb9f5 100644 --- a/pkg/detectors/auth0oauth/auth0oauth.go +++ b/pkg/detectors/auth0oauth/auth0oauth.go @@ -2,10 +2,10 @@ package auth0oauth import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" "net/url" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/autodesk/autodesk.go b/pkg/detectors/autodesk/autodesk.go index a02ccbf8d..f40c75f23 100644 --- a/pkg/detectors/autodesk/autodesk.go +++ b/pkg/detectors/autodesk/autodesk.go @@ -3,8 +3,8 @@ package autodesk import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/autoklose/autoklose.go b/pkg/detectors/autoklose/autoklose.go index 77f3f2ac2..cadbb030f 100644 --- a/pkg/detectors/autoklose/autoklose.go +++ b/pkg/detectors/autoklose/autoklose.go @@ -4,9 +4,9 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/autopilot/autopilot.go b/pkg/detectors/autopilot/autopilot.go index bf14824e6..fca023681 100644 --- a/pkg/detectors/autopilot/autopilot.go +++ b/pkg/detectors/autopilot/autopilot.go @@ -2,8 +2,8 @@ package autopilot import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/avazapersonalaccesstoken/avazapersonalaccesstoken.go b/pkg/detectors/avazapersonalaccesstoken/avazapersonalaccesstoken.go index 9bcda4010..60a8d77ce 100644 --- a/pkg/detectors/avazapersonalaccesstoken/avazapersonalaccesstoken.go +++ b/pkg/detectors/avazapersonalaccesstoken/avazapersonalaccesstoken.go @@ -3,8 +3,8 @@ package avazapersonalaccesstoken import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/aviationstack/aviationstack.go b/pkg/detectors/aviationstack/aviationstack.go index f2f251bca..bf4aabbe4 100644 --- a/pkg/detectors/aviationstack/aviationstack.go +++ b/pkg/detectors/aviationstack/aviationstack.go @@ -3,8 +3,8 @@ package aviationstack import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/aws/aws.go b/pkg/detectors/aws/aws.go index b29cd8380..cd17dd249 100644 --- a/pkg/detectors/aws/aws.go +++ b/pkg/detectors/aws/aws.go @@ -8,10 +8,11 @@ import ( "encoding/json" "fmt" "net/http" - "regexp" "strings" "time" + regexp "github.com/wasilibs/go-re2" + "github.com/trufflesecurity/trufflehog/v3/pkg/common" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" "github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb" diff --git a/pkg/detectors/awssessionkeys/awssessionkey.go b/pkg/detectors/awssessionkeys/awssessionkey.go index 16e87bc7a..8d68e548a 100644 --- a/pkg/detectors/awssessionkeys/awssessionkey.go +++ b/pkg/detectors/awssessionkeys/awssessionkey.go @@ -7,8 +7,8 @@ import ( "encoding/hex" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/axonaut/axonaut.go b/pkg/detectors/axonaut/axonaut.go index 4464f5982..4b6424eeb 100644 --- a/pkg/detectors/axonaut/axonaut.go +++ b/pkg/detectors/axonaut/axonaut.go @@ -2,8 +2,8 @@ package axonaut import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/aylien/aylien.go b/pkg/detectors/aylien/aylien.go index cfa4407c9..af413b8d1 100644 --- a/pkg/detectors/aylien/aylien.go +++ b/pkg/detectors/aylien/aylien.go @@ -2,8 +2,8 @@ package aylien import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/ayrshare/ayrshare.go b/pkg/detectors/ayrshare/ayrshare.go index 2c013a232..b5e2a2c8a 100644 --- a/pkg/detectors/ayrshare/ayrshare.go +++ b/pkg/detectors/ayrshare/ayrshare.go @@ -3,8 +3,8 @@ package ayrshare import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/azure/azure.go b/pkg/detectors/azure/azure.go index 67a54e371..c20a2f882 100644 --- a/pkg/detectors/azure/azure.go +++ b/pkg/detectors/azure/azure.go @@ -3,7 +3,7 @@ package azure import ( "context" "fmt" - "regexp" + regexp "github.com/wasilibs/go-re2" "strings" "github.com/Azure/go-autorest/autorest/azure/auth" diff --git a/pkg/detectors/azurebatch/azurebatch.go b/pkg/detectors/azurebatch/azurebatch.go index 576fcd43a..5297ae693 100644 --- a/pkg/detectors/azurebatch/azurebatch.go +++ b/pkg/detectors/azurebatch/azurebatch.go @@ -6,8 +6,8 @@ import ( "crypto/sha256" "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/azurecontainerregistry/azurecontainerregistry.go b/pkg/detectors/azurecontainerregistry/azurecontainerregistry.go index d29e81572..ae831c7f1 100644 --- a/pkg/detectors/azurecontainerregistry/azurecontainerregistry.go +++ b/pkg/detectors/azurecontainerregistry/azurecontainerregistry.go @@ -4,8 +4,8 @@ import ( "context" "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "github.com/trufflesecurity/trufflehog/v3/pkg/common" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" diff --git a/pkg/detectors/azurestorage/azurestorage.go b/pkg/detectors/azurestorage/azurestorage.go index b43be3d18..362fffd84 100644 --- a/pkg/detectors/azurestorage/azurestorage.go +++ b/pkg/detectors/azurestorage/azurestorage.go @@ -6,8 +6,8 @@ import ( "crypto/sha256" "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/azurestorage/azurestorage_test.go b/pkg/detectors/azurestorage/azurestorage_test.go index b48844266..343f65390 100644 --- a/pkg/detectors/azurestorage/azurestorage_test.go +++ b/pkg/detectors/azurestorage/azurestorage_test.go @@ -6,7 +6,7 @@ package azurestorage import ( "context" "fmt" - "regexp" + regexp "github.com/wasilibs/go-re2" "strings" "testing" "time" diff --git a/pkg/detectors/bannerbear/bannerbear.go b/pkg/detectors/bannerbear/bannerbear.go index 3ab0ae88d..3c4e9a66f 100644 --- a/pkg/detectors/bannerbear/bannerbear.go +++ b/pkg/detectors/bannerbear/bannerbear.go @@ -3,8 +3,8 @@ package bannerbear import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/baremetrics/baremetrics.go b/pkg/detectors/baremetrics/baremetrics.go index 9d29b6722..f30568096 100644 --- a/pkg/detectors/baremetrics/baremetrics.go +++ b/pkg/detectors/baremetrics/baremetrics.go @@ -3,8 +3,8 @@ package baremetrics import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/beamer/beamer.go b/pkg/detectors/beamer/beamer.go index 30f7333d1..f6b8d5fa5 100644 --- a/pkg/detectors/beamer/beamer.go +++ b/pkg/detectors/beamer/beamer.go @@ -2,8 +2,8 @@ package beamer import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/beebole/beebole.go b/pkg/detectors/beebole/beebole.go index f74642310..23936d10e 100644 --- a/pkg/detectors/beebole/beebole.go +++ b/pkg/detectors/beebole/beebole.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/besnappy/besnappy.go b/pkg/detectors/besnappy/besnappy.go index d51d93f4c..4ccedbc1b 100644 --- a/pkg/detectors/besnappy/besnappy.go +++ b/pkg/detectors/besnappy/besnappy.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/besttime/besttime.go b/pkg/detectors/besttime/besttime.go index e251de7c8..9afd781f7 100644 --- a/pkg/detectors/besttime/besttime.go +++ b/pkg/detectors/besttime/besttime.go @@ -2,9 +2,9 @@ package besttime import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/betterstack/betterstack.go b/pkg/detectors/betterstack/betterstack.go index a95552b03..c38b6b67a 100644 --- a/pkg/detectors/betterstack/betterstack.go +++ b/pkg/detectors/betterstack/betterstack.go @@ -3,8 +3,8 @@ package betterstack import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/billomat/billomat.go b/pkg/detectors/billomat/billomat.go index 8eb775620..5dd10e87f 100644 --- a/pkg/detectors/billomat/billomat.go +++ b/pkg/detectors/billomat/billomat.go @@ -3,8 +3,8 @@ package billomat import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/bitbar/bitbar.go b/pkg/detectors/bitbar/bitbar.go index 4463fe035..1a93dded5 100644 --- a/pkg/detectors/bitbar/bitbar.go +++ b/pkg/detectors/bitbar/bitbar.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/bitcoinaverage/bitcoinaverage.go b/pkg/detectors/bitcoinaverage/bitcoinaverage.go index c278292a7..079f5a8bf 100644 --- a/pkg/detectors/bitcoinaverage/bitcoinaverage.go +++ b/pkg/detectors/bitcoinaverage/bitcoinaverage.go @@ -3,8 +3,8 @@ package bitcoinaverage import ( "context" "encoding/json" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/bitfinex/bitfinex.go b/pkg/detectors/bitfinex/bitfinex.go index c53c9f07e..1c1145ffb 100644 --- a/pkg/detectors/bitfinex/bitfinex.go +++ b/pkg/detectors/bitfinex/bitfinex.go @@ -3,8 +3,8 @@ package bitfinex import ( "context" "flag" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/bitfinexcom/bitfinex-api-go/v2/rest" diff --git a/pkg/detectors/bitlyaccesstoken/bitlyaccesstoken.go b/pkg/detectors/bitlyaccesstoken/bitlyaccesstoken.go index 30ce2d1f2..136ce30e0 100644 --- a/pkg/detectors/bitlyaccesstoken/bitlyaccesstoken.go +++ b/pkg/detectors/bitlyaccesstoken/bitlyaccesstoken.go @@ -3,8 +3,8 @@ package bitlyaccesstoken import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/bitmex/bitmex.go b/pkg/detectors/bitmex/bitmex.go index d83e8f4d4..a2fa65a6b 100644 --- a/pkg/detectors/bitmex/bitmex.go +++ b/pkg/detectors/bitmex/bitmex.go @@ -5,9 +5,9 @@ import ( "crypto/hmac" "crypto/sha256" "encoding/hex" + regexp "github.com/wasilibs/go-re2" "net/http" "net/url" - "regexp" "strconv" "strings" "time" diff --git a/pkg/detectors/blazemeter/blazemeter.go b/pkg/detectors/blazemeter/blazemeter.go index de794b75f..8245e2b8f 100644 --- a/pkg/detectors/blazemeter/blazemeter.go +++ b/pkg/detectors/blazemeter/blazemeter.go @@ -3,8 +3,8 @@ package blazemeter import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/blitapp/blitapp.go b/pkg/detectors/blitapp/blitapp.go index 430945870..f390a2587 100644 --- a/pkg/detectors/blitapp/blitapp.go +++ b/pkg/detectors/blitapp/blitapp.go @@ -2,8 +2,8 @@ package blitapp import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/blocknative/blocknative.go b/pkg/detectors/blocknative/blocknative.go index 2da32a623..3da23aa8b 100644 --- a/pkg/detectors/blocknative/blocknative.go +++ b/pkg/detectors/blocknative/blocknative.go @@ -2,9 +2,9 @@ package blocknative import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/blogger/blogger.go b/pkg/detectors/blogger/blogger.go index 7070b619b..2f3db1dfe 100644 --- a/pkg/detectors/blogger/blogger.go +++ b/pkg/detectors/blogger/blogger.go @@ -2,8 +2,8 @@ package blogger import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/bombbomb/bombbomb.go b/pkg/detectors/bombbomb/bombbomb.go index e241e5433..cfee96adf 100644 --- a/pkg/detectors/bombbomb/bombbomb.go +++ b/pkg/detectors/bombbomb/bombbomb.go @@ -2,8 +2,8 @@ package bombbomb import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/boostnote/boostnote.go b/pkg/detectors/boostnote/boostnote.go index 83fa99d05..b3a026f05 100644 --- a/pkg/detectors/boostnote/boostnote.go +++ b/pkg/detectors/boostnote/boostnote.go @@ -3,8 +3,8 @@ package boostnote import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/borgbase/borgbase.go b/pkg/detectors/borgbase/borgbase.go index 8a0267409..eeb90c3cb 100644 --- a/pkg/detectors/borgbase/borgbase.go +++ b/pkg/detectors/borgbase/borgbase.go @@ -3,9 +3,9 @@ package borgbase import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/braintreepayments/braintreepayments.go b/pkg/detectors/braintreepayments/braintreepayments.go index 8c79d4284..ffbb433c6 100644 --- a/pkg/detectors/braintreepayments/braintreepayments.go +++ b/pkg/detectors/braintreepayments/braintreepayments.go @@ -3,9 +3,9 @@ package braintreepayments import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/brandfetch/brandfetch.go b/pkg/detectors/brandfetch/brandfetch.go index 606e7153c..fbcfb5705 100644 --- a/pkg/detectors/brandfetch/brandfetch.go +++ b/pkg/detectors/brandfetch/brandfetch.go @@ -2,8 +2,8 @@ package brandfetch import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/browserstack/browserstack.go b/pkg/detectors/browserstack/browserstack.go index d0f1f52a4..7d31d0ebe 100644 --- a/pkg/detectors/browserstack/browserstack.go +++ b/pkg/detectors/browserstack/browserstack.go @@ -3,10 +3,10 @@ package browserstack import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" "net/http/cookiejar" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" diff --git a/pkg/detectors/browshot/browshot.go b/pkg/detectors/browshot/browshot.go index 4bd7266ec..b58595a66 100644 --- a/pkg/detectors/browshot/browshot.go +++ b/pkg/detectors/browshot/browshot.go @@ -2,8 +2,8 @@ package browshot import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/bscscan/bscscan.go b/pkg/detectors/bscscan/bscscan.go index ebd2718f9..83bc89b0a 100644 --- a/pkg/detectors/bscscan/bscscan.go +++ b/pkg/detectors/bscscan/bscscan.go @@ -2,9 +2,9 @@ package bscscan import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" @@ -55,22 +55,22 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result res, err := client.Do(req) if err == nil { defer res.Body.Close() - bodyBytes, err := io.ReadAll(res.Body) - if err != nil { - continue - } - body := string(bodyBytes) + bodyBytes, err := io.ReadAll(res.Body) + if err != nil { + continue + } + body := string(bodyBytes) - if !strings.Contains(body, "NOTOK") { - s1.Verified = true - } else { - // This function will check false positives for common test words, but also it will make sur> - if detectors.IsKnownFalsePositive(resMatch, detectors.DefaultFalsePositives, true) { - continue - } - } - } - } + if !strings.Contains(body, "NOTOK") { + s1.Verified = true + } else { + // This function will check false positives for common test words, but also it will make sur> + if detectors.IsKnownFalsePositive(resMatch, detectors.DefaultFalsePositives, true) { + continue + } + } + } + } results = append(results, s1) } diff --git a/pkg/detectors/buddyns/buddyns.go b/pkg/detectors/buddyns/buddyns.go index fbf4d206c..c3ff73ff9 100644 --- a/pkg/detectors/buddyns/buddyns.go +++ b/pkg/detectors/buddyns/buddyns.go @@ -3,8 +3,8 @@ package buddyns import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/budibase/budibase.go b/pkg/detectors/budibase/budibase.go index 22186b03e..d5d7edb30 100644 --- a/pkg/detectors/budibase/budibase.go +++ b/pkg/detectors/budibase/budibase.go @@ -3,8 +3,8 @@ package budibase import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/bugherd/bugherd.go b/pkg/detectors/bugherd/bugherd.go index f7c789cad..94b5e302a 100644 --- a/pkg/detectors/bugherd/bugherd.go +++ b/pkg/detectors/bugherd/bugherd.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/bugsnag/bugsnag.go b/pkg/detectors/bugsnag/bugsnag.go index 1c4f7a33d..4d1fba369 100644 --- a/pkg/detectors/bugsnag/bugsnag.go +++ b/pkg/detectors/bugsnag/bugsnag.go @@ -3,8 +3,8 @@ package bugsnag import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/buildkite/buildkite.go b/pkg/detectors/buildkite/buildkite.go index d04c4c753..a8f0c3a9b 100644 --- a/pkg/detectors/buildkite/buildkite.go +++ b/pkg/detectors/buildkite/buildkite.go @@ -3,8 +3,8 @@ package buildkite import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/buildkitev2/buildkite.go b/pkg/detectors/buildkitev2/buildkite.go index 8e5d4a783..4c97e7b7e 100644 --- a/pkg/detectors/buildkitev2/buildkite.go +++ b/pkg/detectors/buildkitev2/buildkite.go @@ -3,8 +3,8 @@ package buildkitev2 import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/bulbul/bulbul.go b/pkg/detectors/bulbul/bulbul.go index 81e37ca04..2a2d6c809 100644 --- a/pkg/detectors/bulbul/bulbul.go +++ b/pkg/detectors/bulbul/bulbul.go @@ -3,9 +3,9 @@ package bulbul import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/bulksms/bulksms.go b/pkg/detectors/bulksms/bulksms.go index faf202736..7240b1da3 100644 --- a/pkg/detectors/bulksms/bulksms.go +++ b/pkg/detectors/bulksms/bulksms.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/buttercms/buttercms.go b/pkg/detectors/buttercms/buttercms.go index f6d83c2cc..abd813fb3 100644 --- a/pkg/detectors/buttercms/buttercms.go +++ b/pkg/detectors/buttercms/buttercms.go @@ -2,8 +2,8 @@ package buttercms import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/caflou/caflou.go b/pkg/detectors/caflou/caflou.go index 8ff5c5e86..ccd28ccb4 100644 --- a/pkg/detectors/caflou/caflou.go +++ b/pkg/detectors/caflou/caflou.go @@ -3,8 +3,8 @@ package caflou import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/calendarific/calendarific.go b/pkg/detectors/calendarific/calendarific.go index 26e704a0b..774685bb0 100644 --- a/pkg/detectors/calendarific/calendarific.go +++ b/pkg/detectors/calendarific/calendarific.go @@ -2,8 +2,8 @@ package calendarific import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/calendlyapikey/calendlyapikey.go b/pkg/detectors/calendlyapikey/calendlyapikey.go index bdd92123d..730c24f9c 100644 --- a/pkg/detectors/calendlyapikey/calendlyapikey.go +++ b/pkg/detectors/calendlyapikey/calendlyapikey.go @@ -3,8 +3,8 @@ package calendlyapikey import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/calorieninja/calorieninja.go b/pkg/detectors/calorieninja/calorieninja.go index 41f160823..d6bc61c10 100644 --- a/pkg/detectors/calorieninja/calorieninja.go +++ b/pkg/detectors/calorieninja/calorieninja.go @@ -2,8 +2,8 @@ package calorieninja import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/campayn/campayn.go b/pkg/detectors/campayn/campayn.go index 3625a3078..1f66cc3bb 100644 --- a/pkg/detectors/campayn/campayn.go +++ b/pkg/detectors/campayn/campayn.go @@ -2,8 +2,8 @@ package campayn import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/cannyio/cannyio.go b/pkg/detectors/cannyio/cannyio.go index e1bfd845c..8abc2ea02 100644 --- a/pkg/detectors/cannyio/cannyio.go +++ b/pkg/detectors/cannyio/cannyio.go @@ -2,8 +2,8 @@ package cannyio import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/capsulecrm/capsulecrm.go b/pkg/detectors/capsulecrm/capsulecrm.go index cb2e176c5..4a2a14b21 100644 --- a/pkg/detectors/capsulecrm/capsulecrm.go +++ b/pkg/detectors/capsulecrm/capsulecrm.go @@ -3,8 +3,8 @@ package capsulecrm import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/captaindata/captaindata.go b/pkg/detectors/captaindata/captaindata.go index 308ddeeb2..d43012534 100644 --- a/pkg/detectors/captaindata/captaindata.go +++ b/pkg/detectors/captaindata/captaindata.go @@ -2,8 +2,8 @@ package captaindata import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/carboninterface/carboninterface.go b/pkg/detectors/carboninterface/carboninterface.go index eb29a4ab4..cd70bc5bc 100644 --- a/pkg/detectors/carboninterface/carboninterface.go +++ b/pkg/detectors/carboninterface/carboninterface.go @@ -3,8 +3,8 @@ package carboninterface import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/cashboard/cashboard.go b/pkg/detectors/cashboard/cashboard.go index df7110d82..bc48620f8 100644 --- a/pkg/detectors/cashboard/cashboard.go +++ b/pkg/detectors/cashboard/cashboard.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/caspio/caspio.go b/pkg/detectors/caspio/caspio.go index 6be190135..c5d115e01 100644 --- a/pkg/detectors/caspio/caspio.go +++ b/pkg/detectors/caspio/caspio.go @@ -3,8 +3,8 @@ package caspio import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/censys/censys.go b/pkg/detectors/censys/censys.go index f9a0234d6..766184f9b 100644 --- a/pkg/detectors/censys/censys.go +++ b/pkg/detectors/censys/censys.go @@ -2,8 +2,8 @@ package censys import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/centralstationcrm/centralstationcrm.go b/pkg/detectors/centralstationcrm/centralstationcrm.go index 89b6b1f4f..4d033163a 100644 --- a/pkg/detectors/centralstationcrm/centralstationcrm.go +++ b/pkg/detectors/centralstationcrm/centralstationcrm.go @@ -2,8 +2,8 @@ package centralstationcrm import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/cexio/cexio.go b/pkg/detectors/cexio/cexio.go index baf4f29c1..bb4ec51e7 100644 --- a/pkg/detectors/cexio/cexio.go +++ b/pkg/detectors/cexio/cexio.go @@ -6,10 +6,10 @@ import ( "crypto/sha256" "encoding/hex" "encoding/json" + regexp "github.com/wasilibs/go-re2" "io" "net/http" "net/url" - "regexp" "strconv" "strings" "time" diff --git a/pkg/detectors/chartmogul/chartmogul.go b/pkg/detectors/chartmogul/chartmogul.go index 03baa481f..fd65f52cd 100644 --- a/pkg/detectors/chartmogul/chartmogul.go +++ b/pkg/detectors/chartmogul/chartmogul.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/chatbot/chatbot.go b/pkg/detectors/chatbot/chatbot.go index 458810e6d..fb3ceeb93 100644 --- a/pkg/detectors/chatbot/chatbot.go +++ b/pkg/detectors/chatbot/chatbot.go @@ -3,8 +3,8 @@ package chatbot import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/chatfule/chatfule.go b/pkg/detectors/chatfule/chatfule.go index 1fc150119..15d18b01e 100644 --- a/pkg/detectors/chatfule/chatfule.go +++ b/pkg/detectors/chatfule/chatfule.go @@ -3,8 +3,8 @@ package chatfule import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/checio/checio.go b/pkg/detectors/checio/checio.go index 690c88831..0b3a1823b 100644 --- a/pkg/detectors/checio/checio.go +++ b/pkg/detectors/checio/checio.go @@ -3,8 +3,8 @@ package checio import ( "context" // "log" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/checklyhq/checklyhq.go b/pkg/detectors/checklyhq/checklyhq.go index ec89e87b6..e36e73537 100644 --- a/pkg/detectors/checklyhq/checklyhq.go +++ b/pkg/detectors/checklyhq/checklyhq.go @@ -3,8 +3,8 @@ package checklyhq import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/checkout/checkout.go b/pkg/detectors/checkout/checkout.go index c845e2654..daa4eef90 100644 --- a/pkg/detectors/checkout/checkout.go +++ b/pkg/detectors/checkout/checkout.go @@ -2,8 +2,8 @@ package checkout import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/checkvist/checkvist.go b/pkg/detectors/checkvist/checkvist.go index b2a4887be..8affe43e5 100644 --- a/pkg/detectors/checkvist/checkvist.go +++ b/pkg/detectors/checkvist/checkvist.go @@ -2,9 +2,9 @@ package checkvist import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" "net/url" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/cicero/cicero.go b/pkg/detectors/cicero/cicero.go index 6e317bf8a..8461aab26 100644 --- a/pkg/detectors/cicero/cicero.go +++ b/pkg/detectors/cicero/cicero.go @@ -3,8 +3,8 @@ package cicero import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/circleci/circleci.go b/pkg/detectors/circleci/circleci.go index 8c8d77da7..22ab9cdce 100644 --- a/pkg/detectors/circleci/circleci.go +++ b/pkg/detectors/circleci/circleci.go @@ -2,8 +2,8 @@ package circleci import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" "github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb" diff --git a/pkg/detectors/clarifai/clarifai.go b/pkg/detectors/clarifai/clarifai.go index 14ba35456..d019d8744 100644 --- a/pkg/detectors/clarifai/clarifai.go +++ b/pkg/detectors/clarifai/clarifai.go @@ -3,8 +3,8 @@ package clarifai import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/clearbit/clearbit.go b/pkg/detectors/clearbit/clearbit.go index 6fcb7e8db..376f96cb0 100644 --- a/pkg/detectors/clearbit/clearbit.go +++ b/pkg/detectors/clearbit/clearbit.go @@ -3,8 +3,8 @@ package clearbit import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/clickhelp/clickhelp.go b/pkg/detectors/clickhelp/clickhelp.go index 97f356175..6a92ae929 100644 --- a/pkg/detectors/clickhelp/clickhelp.go +++ b/pkg/detectors/clickhelp/clickhelp.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/clicksendsms/clicksendsms.go b/pkg/detectors/clicksendsms/clicksendsms.go index 45c050f43..365eaa154 100644 --- a/pkg/detectors/clicksendsms/clicksendsms.go +++ b/pkg/detectors/clicksendsms/clicksendsms.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/clickuppersonaltoken/clickuppersonaltoken.go b/pkg/detectors/clickuppersonaltoken/clickuppersonaltoken.go index 4ceed898d..156ee5f31 100644 --- a/pkg/detectors/clickuppersonaltoken/clickuppersonaltoken.go +++ b/pkg/detectors/clickuppersonaltoken/clickuppersonaltoken.go @@ -2,8 +2,8 @@ package clickuppersonaltoken import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/cliengo/cliengo.go b/pkg/detectors/cliengo/cliengo.go index 86ef11e80..2b43d6c27 100644 --- a/pkg/detectors/cliengo/cliengo.go +++ b/pkg/detectors/cliengo/cliengo.go @@ -2,8 +2,8 @@ package cliengo import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/clinchpad/clinchpad.go b/pkg/detectors/clinchpad/clinchpad.go index 27c4c7552..a92b89537 100644 --- a/pkg/detectors/clinchpad/clinchpad.go +++ b/pkg/detectors/clinchpad/clinchpad.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/clockify/clockify.go b/pkg/detectors/clockify/clockify.go index bb7d21584..75a9bdb6d 100644 --- a/pkg/detectors/clockify/clockify.go +++ b/pkg/detectors/clockify/clockify.go @@ -2,8 +2,8 @@ package clockify import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/clockworksms/clockworksms.go b/pkg/detectors/clockworksms/clockworksms.go index 643ab8511..c3a494607 100644 --- a/pkg/detectors/clockworksms/clockworksms.go +++ b/pkg/detectors/clockworksms/clockworksms.go @@ -2,8 +2,8 @@ package clockworksms import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/closecrm/close.go b/pkg/detectors/closecrm/close.go index e55c56d5b..ee6c0ffda 100644 --- a/pkg/detectors/closecrm/close.go +++ b/pkg/detectors/closecrm/close.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/cloudconvert/cloudconvert.go b/pkg/detectors/cloudconvert/cloudconvert.go index f454543c4..21121d7d0 100644 --- a/pkg/detectors/cloudconvert/cloudconvert.go +++ b/pkg/detectors/cloudconvert/cloudconvert.go @@ -3,8 +3,8 @@ package cloudconvert import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/cloudelements/cloudelements.go b/pkg/detectors/cloudelements/cloudelements.go index 4413783f5..e9f3dc960 100644 --- a/pkg/detectors/cloudelements/cloudelements.go +++ b/pkg/detectors/cloudelements/cloudelements.go @@ -3,8 +3,8 @@ package cloudelements import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/cloudflareapitoken/cloudflareapitoken.go b/pkg/detectors/cloudflareapitoken/cloudflareapitoken.go index 3557ba86d..8eb2cb3d9 100644 --- a/pkg/detectors/cloudflareapitoken/cloudflareapitoken.go +++ b/pkg/detectors/cloudflareapitoken/cloudflareapitoken.go @@ -3,8 +3,8 @@ package cloudflareapitoken import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/cloudflarecakey/cloudflarecakey.go b/pkg/detectors/cloudflarecakey/cloudflarecakey.go index f2d7783fd..bfd70ef56 100644 --- a/pkg/detectors/cloudflarecakey/cloudflarecakey.go +++ b/pkg/detectors/cloudflarecakey/cloudflarecakey.go @@ -4,8 +4,8 @@ import ( "context" // "fmt" // "log" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/cloudflareglobalapikey/cloudflareglobalapikey.go b/pkg/detectors/cloudflareglobalapikey/cloudflareglobalapikey.go index c1798fc90..b0d6b46bd 100644 --- a/pkg/detectors/cloudflareglobalapikey/cloudflareglobalapikey.go +++ b/pkg/detectors/cloudflareglobalapikey/cloudflareglobalapikey.go @@ -2,8 +2,8 @@ package cloudflareglobalapikey import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/cloudimage/cloudimage.go b/pkg/detectors/cloudimage/cloudimage.go index c097f0b58..7d48687f4 100644 --- a/pkg/detectors/cloudimage/cloudimage.go +++ b/pkg/detectors/cloudimage/cloudimage.go @@ -2,8 +2,8 @@ package cloudimage import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/cloudmersive/cloudmersive.go b/pkg/detectors/cloudmersive/cloudmersive.go index 768b3c39e..6bfd4bc32 100644 --- a/pkg/detectors/cloudmersive/cloudmersive.go +++ b/pkg/detectors/cloudmersive/cloudmersive.go @@ -2,8 +2,8 @@ package cloudmersive import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/cloudplan/cloudplan.go b/pkg/detectors/cloudplan/cloudplan.go index df0db1769..3d0116658 100644 --- a/pkg/detectors/cloudplan/cloudplan.go +++ b/pkg/detectors/cloudplan/cloudplan.go @@ -2,8 +2,8 @@ package cloudplan import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/cloudsmith/cloudsmith.go b/pkg/detectors/cloudsmith/cloudsmith.go index 44d012555..efe2a0f9b 100644 --- a/pkg/detectors/cloudsmith/cloudsmith.go +++ b/pkg/detectors/cloudsmith/cloudsmith.go @@ -3,8 +3,8 @@ package cloudsmith import ( "context" "encoding/json" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/cloverly/cloverly.go b/pkg/detectors/cloverly/cloverly.go index 6736948e0..72ecab95c 100644 --- a/pkg/detectors/cloverly/cloverly.go +++ b/pkg/detectors/cloverly/cloverly.go @@ -3,8 +3,8 @@ package cloverly import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/cloze/cloze.go b/pkg/detectors/cloze/cloze.go index 06f18ed51..2fe6f62b0 100644 --- a/pkg/detectors/cloze/cloze.go +++ b/pkg/detectors/cloze/cloze.go @@ -2,9 +2,9 @@ package cloze import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" "net/url" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/clustdoc/clustdoc.go b/pkg/detectors/clustdoc/clustdoc.go index 17bc35bab..8f9195cb4 100644 --- a/pkg/detectors/clustdoc/clustdoc.go +++ b/pkg/detectors/clustdoc/clustdoc.go @@ -3,8 +3,8 @@ package clustdoc import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/coda/coda.go b/pkg/detectors/coda/coda.go index 109e7f56d..1ea12bcfc 100644 --- a/pkg/detectors/coda/coda.go +++ b/pkg/detectors/coda/coda.go @@ -3,8 +3,8 @@ package coda import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/codacy/codacy.go b/pkg/detectors/codacy/codacy.go index d33f22bc8..4a2e7a469 100644 --- a/pkg/detectors/codacy/codacy.go +++ b/pkg/detectors/codacy/codacy.go @@ -2,8 +2,8 @@ package codacy import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/codeclimate/codeclimate.go b/pkg/detectors/codeclimate/codeclimate.go index f5ee30fc5..d29c4d9e9 100644 --- a/pkg/detectors/codeclimate/codeclimate.go +++ b/pkg/detectors/codeclimate/codeclimate.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/codemagic/codemagic.go b/pkg/detectors/codemagic/codemagic.go index bef4692f0..494ec04a9 100644 --- a/pkg/detectors/codemagic/codemagic.go +++ b/pkg/detectors/codemagic/codemagic.go @@ -2,8 +2,8 @@ package codemagic import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/codequiry/codequiry.go b/pkg/detectors/codequiry/codequiry.go index 17ba6a076..c41587da7 100644 --- a/pkg/detectors/codequiry/codequiry.go +++ b/pkg/detectors/codequiry/codequiry.go @@ -2,8 +2,8 @@ package codequiry import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/coinapi/coinapi.go b/pkg/detectors/coinapi/coinapi.go index 016652aca..8d192aec7 100644 --- a/pkg/detectors/coinapi/coinapi.go +++ b/pkg/detectors/coinapi/coinapi.go @@ -2,8 +2,8 @@ package coinapi import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/coinbase/coinbase.go b/pkg/detectors/coinbase/coinbase.go index ab13f820a..d84482f55 100644 --- a/pkg/detectors/coinbase/coinbase.go +++ b/pkg/detectors/coinbase/coinbase.go @@ -3,8 +3,8 @@ package coinbase import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/coinbase_waas/coinbase_waas.go b/pkg/detectors/coinbase_waas/coinbase_waas.go index 383ed8325..ac7ab6ddf 100644 --- a/pkg/detectors/coinbase_waas/coinbase_waas.go +++ b/pkg/detectors/coinbase_waas/coinbase_waas.go @@ -6,8 +6,8 @@ import ( "crypto/x509" "encoding/pem" "errors" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/coinbase/waas-client-library-go/auth" diff --git a/pkg/detectors/coinlayer/coinlayer.go b/pkg/detectors/coinlayer/coinlayer.go index 161f57144..e8316f3a5 100644 --- a/pkg/detectors/coinlayer/coinlayer.go +++ b/pkg/detectors/coinlayer/coinlayer.go @@ -3,9 +3,9 @@ package coinlayer import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/coinlib/coinlib.go b/pkg/detectors/coinlib/coinlib.go index 6f8d33041..820f1aeb6 100644 --- a/pkg/detectors/coinlib/coinlib.go +++ b/pkg/detectors/coinlib/coinlib.go @@ -3,8 +3,8 @@ package coinlib import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/coinmarketcap/coinmarketcap.go b/pkg/detectors/coinmarketcap/coinmarketcap.go index bb75a27b0..b79744852 100644 --- a/pkg/detectors/coinmarketcap/coinmarketcap.go +++ b/pkg/detectors/coinmarketcap/coinmarketcap.go @@ -2,8 +2,8 @@ package coinmarketcap import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/collect2/collect2.go b/pkg/detectors/collect2/collect2.go index 79bcb0b38..6091e981c 100644 --- a/pkg/detectors/collect2/collect2.go +++ b/pkg/detectors/collect2/collect2.go @@ -3,8 +3,8 @@ package collect2 import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/column/column.go b/pkg/detectors/column/column.go index 4c2ea8403..044a0c13d 100644 --- a/pkg/detectors/column/column.go +++ b/pkg/detectors/column/column.go @@ -4,9 +4,9 @@ import ( "context" "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "log" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/commercejs/commercejs.go b/pkg/detectors/commercejs/commercejs.go index e1347cfa2..edeb67af2 100644 --- a/pkg/detectors/commercejs/commercejs.go +++ b/pkg/detectors/commercejs/commercejs.go @@ -2,8 +2,8 @@ package commercejs import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/commodities/commodities.go b/pkg/detectors/commodities/commodities.go index 527e19063..1b3e597c9 100644 --- a/pkg/detectors/commodities/commodities.go +++ b/pkg/detectors/commodities/commodities.go @@ -2,9 +2,9 @@ package commodities import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/companyhub/companyhub.go b/pkg/detectors/companyhub/companyhub.go index b7621bc8c..97ce50a76 100644 --- a/pkg/detectors/companyhub/companyhub.go +++ b/pkg/detectors/companyhub/companyhub.go @@ -3,8 +3,8 @@ package companyhub import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/confluent/confluent.go b/pkg/detectors/confluent/confluent.go index 0257c506c..ac460bd86 100644 --- a/pkg/detectors/confluent/confluent.go +++ b/pkg/detectors/confluent/confluent.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/contentfulpersonalaccesstoken/contentfulpersonalaccesstoken.go b/pkg/detectors/contentfulpersonalaccesstoken/contentfulpersonalaccesstoken.go index b15574738..8f12c530d 100644 --- a/pkg/detectors/contentfulpersonalaccesstoken/contentfulpersonalaccesstoken.go +++ b/pkg/detectors/contentfulpersonalaccesstoken/contentfulpersonalaccesstoken.go @@ -3,8 +3,8 @@ package contentfulpersonalaccesstoken import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/conversiontools/conversiontools.go b/pkg/detectors/conversiontools/conversiontools.go index 64adf6ffe..87420df39 100644 --- a/pkg/detectors/conversiontools/conversiontools.go +++ b/pkg/detectors/conversiontools/conversiontools.go @@ -3,8 +3,8 @@ package conversiontools import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/convertapi/convertapi.go b/pkg/detectors/convertapi/convertapi.go index 9513b6d62..1ead72a3b 100644 --- a/pkg/detectors/convertapi/convertapi.go +++ b/pkg/detectors/convertapi/convertapi.go @@ -3,8 +3,8 @@ package convertapi import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/convertkit/convertkit.go b/pkg/detectors/convertkit/convertkit.go index 9f9dbbf2f..f22a89e20 100644 --- a/pkg/detectors/convertkit/convertkit.go +++ b/pkg/detectors/convertkit/convertkit.go @@ -2,8 +2,8 @@ package convertkit import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/convier/convier.go b/pkg/detectors/convier/convier.go index a0d2732ce..e8dbb3b20 100644 --- a/pkg/detectors/convier/convier.go +++ b/pkg/detectors/convier/convier.go @@ -3,9 +3,9 @@ package convier import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/copper/copper.go b/pkg/detectors/copper/copper.go index b25b23a0d..daa047f58 100644 --- a/pkg/detectors/copper/copper.go +++ b/pkg/detectors/copper/copper.go @@ -2,8 +2,8 @@ package copper import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/couchbase/couchbase.go b/pkg/detectors/couchbase/couchbase.go index 09a1a4379..971876f9d 100644 --- a/pkg/detectors/couchbase/couchbase.go +++ b/pkg/detectors/couchbase/couchbase.go @@ -3,8 +3,8 @@ package couchbase import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "log" - "regexp" "strings" "time" "unicode" @@ -26,7 +26,7 @@ var ( connectionStringPat = regexp.MustCompile(`\bcb\.[a-z0-9]+\.cloud\.couchbase\.com\b`) usernamePat = `?()/\+=\s\n` passwordPat = `^<>;.*&|£\n\s` - //passwordPat = regexp.MustCompile(`(?i)(?:pass|pwd)(?:.|[\n\r]){0,15}(\b[^<>;.*&|£\n\s]{8,100}$)`) + // passwordPat = regexp.MustCompile(`(?i)(?:pass|pwd)(?:.|[\n\r]){0,15}(\b[^<>;.*&|£\n\s]{8,100}$)`) // passwordPat = regexp.MustCompile(`(?im)(?:pass|pwd)\S{0,40}?[:=\s]{1,3}[ '"=]{0,1}([^:?()/\+=\s\n]{4,40})\b`) ) diff --git a/pkg/detectors/countrylayer/countrylayer.go b/pkg/detectors/countrylayer/countrylayer.go index 6726c0536..56efad482 100644 --- a/pkg/detectors/countrylayer/countrylayer.go +++ b/pkg/detectors/countrylayer/countrylayer.go @@ -3,8 +3,8 @@ package countrylayer import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/courier/courier.go b/pkg/detectors/courier/courier.go index 84419ddf8..0519a0334 100644 --- a/pkg/detectors/courier/courier.go +++ b/pkg/detectors/courier/courier.go @@ -3,8 +3,8 @@ package courier import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/coveralls/coveralls.go b/pkg/detectors/coveralls/coveralls.go index c03bfe6ed..05125b594 100644 --- a/pkg/detectors/coveralls/coveralls.go +++ b/pkg/detectors/coveralls/coveralls.go @@ -3,8 +3,8 @@ package coveralls import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/craftmypdf/craftmypdf.go b/pkg/detectors/craftmypdf/craftmypdf.go index 894d40bb8..578ef865c 100644 --- a/pkg/detectors/craftmypdf/craftmypdf.go +++ b/pkg/detectors/craftmypdf/craftmypdf.go @@ -3,9 +3,10 @@ package craftmypdf import ( "context" "net/http" - "regexp" "strings" + regexp "github.com/wasilibs/go-re2" + "github.com/trufflesecurity/trufflehog/v3/pkg/common" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" "github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb" diff --git a/pkg/detectors/crossbrowsertesting/crossbrowsertesting.go b/pkg/detectors/crossbrowsertesting/crossbrowsertesting.go index 46ca3d55e..2ac78f4c9 100644 --- a/pkg/detectors/crossbrowsertesting/crossbrowsertesting.go +++ b/pkg/detectors/crossbrowsertesting/crossbrowsertesting.go @@ -2,8 +2,8 @@ package crossbrowsertesting import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/crowdin/crowdin.go b/pkg/detectors/crowdin/crowdin.go index 1a742241d..57725aa05 100644 --- a/pkg/detectors/crowdin/crowdin.go +++ b/pkg/detectors/crowdin/crowdin.go @@ -3,8 +3,8 @@ package crowdin import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/cryptocompare/cryptocompare.go b/pkg/detectors/cryptocompare/cryptocompare.go index b10bc5eb0..594fa661e 100644 --- a/pkg/detectors/cryptocompare/cryptocompare.go +++ b/pkg/detectors/cryptocompare/cryptocompare.go @@ -2,9 +2,9 @@ package cryptocompare import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/currencycloud/currencycloud.go b/pkg/detectors/currencycloud/currencycloud.go index 66c0d433a..15f08f9cc 100644 --- a/pkg/detectors/currencycloud/currencycloud.go +++ b/pkg/detectors/currencycloud/currencycloud.go @@ -3,9 +3,9 @@ package currencycloud import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/currencyfreaks/currencyfreaks.go b/pkg/detectors/currencyfreaks/currencyfreaks.go index d796d4ab4..7a3fead42 100644 --- a/pkg/detectors/currencyfreaks/currencyfreaks.go +++ b/pkg/detectors/currencyfreaks/currencyfreaks.go @@ -2,8 +2,8 @@ package currencyfreaks import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/currencylayer/currencylayer.go b/pkg/detectors/currencylayer/currencylayer.go index 215dd737c..bf2ea0b50 100644 --- a/pkg/detectors/currencylayer/currencylayer.go +++ b/pkg/detectors/currencylayer/currencylayer.go @@ -3,9 +3,9 @@ package currencylayer import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/currencyscoop/currencyscoop.go b/pkg/detectors/currencyscoop/currencyscoop.go index 8071d45c8..1ca905877 100644 --- a/pkg/detectors/currencyscoop/currencyscoop.go +++ b/pkg/detectors/currencyscoop/currencyscoop.go @@ -3,8 +3,8 @@ package currencyscoop import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/currentsapi/currentsapi.go b/pkg/detectors/currentsapi/currentsapi.go index c3129989b..ae19160ae 100644 --- a/pkg/detectors/currentsapi/currentsapi.go +++ b/pkg/detectors/currentsapi/currentsapi.go @@ -2,8 +2,8 @@ package currentsapi import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/customerguru/customerguru.go b/pkg/detectors/customerguru/customerguru.go index 4347b9a85..d27825643 100644 --- a/pkg/detectors/customerguru/customerguru.go +++ b/pkg/detectors/customerguru/customerguru.go @@ -2,8 +2,8 @@ package customerguru import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/customerio/customerio.go b/pkg/detectors/customerio/customerio.go index 771d1260c..450ac8a70 100644 --- a/pkg/detectors/customerio/customerio.go +++ b/pkg/detectors/customerio/customerio.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/d7network/d7network.go b/pkg/detectors/d7network/d7network.go index a8d4608c9..722ab4981 100644 --- a/pkg/detectors/d7network/d7network.go +++ b/pkg/detectors/d7network/d7network.go @@ -2,8 +2,8 @@ package d7network import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" diff --git a/pkg/detectors/dailyco/dailyco.go b/pkg/detectors/dailyco/dailyco.go index 77de08308..83cb3aebc 100644 --- a/pkg/detectors/dailyco/dailyco.go +++ b/pkg/detectors/dailyco/dailyco.go @@ -3,8 +3,8 @@ package dailyco import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/dandelion/dandelion.go b/pkg/detectors/dandelion/dandelion.go index 973db3013..88ca74f4a 100644 --- a/pkg/detectors/dandelion/dandelion.go +++ b/pkg/detectors/dandelion/dandelion.go @@ -3,8 +3,8 @@ package dandelion import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/dareboost/dareboost.go b/pkg/detectors/dareboost/dareboost.go index fbb130933..353cabb0a 100644 --- a/pkg/detectors/dareboost/dareboost.go +++ b/pkg/detectors/dareboost/dareboost.go @@ -2,9 +2,9 @@ package dareboost import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/databox/databox.go b/pkg/detectors/databox/databox.go index 4c36b7644..5cc563771 100644 --- a/pkg/detectors/databox/databox.go +++ b/pkg/detectors/databox/databox.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/databrickstoken/databrickstoken.go b/pkg/detectors/databrickstoken/databrickstoken.go index 0429bdc74..a50c667b2 100644 --- a/pkg/detectors/databrickstoken/databrickstoken.go +++ b/pkg/detectors/databrickstoken/databrickstoken.go @@ -3,8 +3,8 @@ package databrickstoken import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/datadogtoken/datadogtoken.go b/pkg/detectors/datadogtoken/datadogtoken.go index eeda41ae3..c588864a4 100644 --- a/pkg/detectors/datadogtoken/datadogtoken.go +++ b/pkg/detectors/datadogtoken/datadogtoken.go @@ -2,8 +2,8 @@ package datadogtoken import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/datagov/datagov.go b/pkg/detectors/datagov/datagov.go index 2bc2c06cb..10bb08919 100644 --- a/pkg/detectors/datagov/datagov.go +++ b/pkg/detectors/datagov/datagov.go @@ -3,8 +3,8 @@ package datagov import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/debounce/debounce.go b/pkg/detectors/debounce/debounce.go index f63e200ce..18100138c 100644 --- a/pkg/detectors/debounce/debounce.go +++ b/pkg/detectors/debounce/debounce.go @@ -2,8 +2,8 @@ package debounce import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/deepai/deepai.go b/pkg/detectors/deepai/deepai.go index 390ddb451..39ba01597 100644 --- a/pkg/detectors/deepai/deepai.go +++ b/pkg/detectors/deepai/deepai.go @@ -3,10 +3,10 @@ package deepai import ( "bytes" "context" + regexp "github.com/wasilibs/go-re2" "io" "mime/multipart" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/deepgram/deepgram.go b/pkg/detectors/deepgram/deepgram.go index bdab52a9b..f7e3e5c7d 100644 --- a/pkg/detectors/deepgram/deepgram.go +++ b/pkg/detectors/deepgram/deepgram.go @@ -3,8 +3,8 @@ package deepgram import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/delighted/delighted.go b/pkg/detectors/delighted/delighted.go index 5aad8cf9e..9a1444ba0 100644 --- a/pkg/detectors/delighted/delighted.go +++ b/pkg/detectors/delighted/delighted.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/demio/demio.go b/pkg/detectors/demio/demio.go index 22fce3ca2..e686ed77e 100644 --- a/pkg/detectors/demio/demio.go +++ b/pkg/detectors/demio/demio.go @@ -3,8 +3,8 @@ package demio import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/deno/denodeploy.go b/pkg/detectors/deno/denodeploy.go index 5fc20bb45..8f8dd032a 100644 --- a/pkg/detectors/deno/denodeploy.go +++ b/pkg/detectors/deno/denodeploy.go @@ -4,9 +4,9 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "github.com/trufflesecurity/trufflehog/v3/pkg/common" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" diff --git a/pkg/detectors/deputy/deputy.go b/pkg/detectors/deputy/deputy.go index e9033c9cb..996c695a9 100644 --- a/pkg/detectors/deputy/deputy.go +++ b/pkg/detectors/deputy/deputy.go @@ -3,8 +3,8 @@ package deputy import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/detectify/detectify.go b/pkg/detectors/detectify/detectify.go index d7896fdd8..23c25ca2a 100644 --- a/pkg/detectors/detectify/detectify.go +++ b/pkg/detectors/detectify/detectify.go @@ -2,8 +2,8 @@ package detectify import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/detectlanguage/detectlanguage.go b/pkg/detectors/detectlanguage/detectlanguage.go index 881e8336a..06880fea6 100644 --- a/pkg/detectors/detectlanguage/detectlanguage.go +++ b/pkg/detectors/detectlanguage/detectlanguage.go @@ -3,8 +3,8 @@ package detectlanguage import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/dfuse/dfuse.go b/pkg/detectors/dfuse/dfuse.go index 8b170f8ba..e19b8ced7 100644 --- a/pkg/detectors/dfuse/dfuse.go +++ b/pkg/detectors/dfuse/dfuse.go @@ -2,8 +2,8 @@ package dfuse import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/diffbot/diffbot.go b/pkg/detectors/diffbot/diffbot.go index 47fb787f9..8fda47e5c 100644 --- a/pkg/detectors/diffbot/diffbot.go +++ b/pkg/detectors/diffbot/diffbot.go @@ -3,9 +3,9 @@ package diffbot import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/diggernaut/diggernaut.go b/pkg/detectors/diggernaut/diggernaut.go index 4b48f029d..ae025a1e1 100644 --- a/pkg/detectors/diggernaut/diggernaut.go +++ b/pkg/detectors/diggernaut/diggernaut.go @@ -3,8 +3,8 @@ package diggernaut import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/digitaloceantoken/digitaloceantoken.go b/pkg/detectors/digitaloceantoken/digitaloceantoken.go index 869bdd3e5..e5faca4b5 100644 --- a/pkg/detectors/digitaloceantoken/digitaloceantoken.go +++ b/pkg/detectors/digitaloceantoken/digitaloceantoken.go @@ -3,8 +3,8 @@ package digitaloceantoken import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/digitaloceanv2/digitaloceanv2.go b/pkg/detectors/digitaloceanv2/digitaloceanv2.go index bc0dd5c10..152f938ab 100644 --- a/pkg/detectors/digitaloceanv2/digitaloceanv2.go +++ b/pkg/detectors/digitaloceanv2/digitaloceanv2.go @@ -3,9 +3,9 @@ package digitaloceanv2 import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/discordbottoken/discordbottoken.go b/pkg/detectors/discordbottoken/discordbottoken.go index d126e384c..1e85c5865 100644 --- a/pkg/detectors/discordbottoken/discordbottoken.go +++ b/pkg/detectors/discordbottoken/discordbottoken.go @@ -3,8 +3,8 @@ package discordbottoken import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/discordwebhook/discordwebhook.go b/pkg/detectors/discordwebhook/discordwebhook.go index 2db4f57d3..899436324 100644 --- a/pkg/detectors/discordwebhook/discordwebhook.go +++ b/pkg/detectors/discordwebhook/discordwebhook.go @@ -2,8 +2,8 @@ package discordwebhook import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/disqus/disqus.go b/pkg/detectors/disqus/disqus.go index 565753fed..70cda3e90 100644 --- a/pkg/detectors/disqus/disqus.go +++ b/pkg/detectors/disqus/disqus.go @@ -2,8 +2,8 @@ package disqus import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/ditto/ditto.go b/pkg/detectors/ditto/ditto.go index 5ade311d5..afdad473b 100644 --- a/pkg/detectors/ditto/ditto.go +++ b/pkg/detectors/ditto/ditto.go @@ -3,8 +3,8 @@ package ditto import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/dnscheck/dnscheck.go b/pkg/detectors/dnscheck/dnscheck.go index 9abb45405..ed1161dfd 100644 --- a/pkg/detectors/dnscheck/dnscheck.go +++ b/pkg/detectors/dnscheck/dnscheck.go @@ -2,8 +2,8 @@ package dnscheck import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/dockerhub/dockerhub.go b/pkg/detectors/dockerhub/dockerhub.go index d304e3d3d..7dd4713f9 100644 --- a/pkg/detectors/dockerhub/dockerhub.go +++ b/pkg/detectors/dockerhub/dockerhub.go @@ -3,9 +3,9 @@ package dockerhub import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/docparser/docparser.go b/pkg/detectors/docparser/docparser.go index ce9a16fd5..bb8fc2860 100644 --- a/pkg/detectors/docparser/docparser.go +++ b/pkg/detectors/docparser/docparser.go @@ -3,8 +3,8 @@ package docparser import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/documo/documo.go b/pkg/detectors/documo/documo.go index 7f0d0986b..3f98cca08 100644 --- a/pkg/detectors/documo/documo.go +++ b/pkg/detectors/documo/documo.go @@ -3,8 +3,8 @@ package documo import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/docusign/docusign.go b/pkg/detectors/docusign/docusign.go index 92008dee4..78c4774e8 100644 --- a/pkg/detectors/docusign/docusign.go +++ b/pkg/detectors/docusign/docusign.go @@ -5,8 +5,8 @@ import ( "encoding/base64" "fmt" "github.com/go-errors/errors" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/doppler/doppler.go b/pkg/detectors/doppler/doppler.go index 654a12322..1e27f1566 100644 --- a/pkg/detectors/doppler/doppler.go +++ b/pkg/detectors/doppler/doppler.go @@ -2,8 +2,8 @@ package doppler import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/dotmailer/dotmailer.go b/pkg/detectors/dotmailer/dotmailer.go index 77c9bd0b9..205cea1aa 100644 --- a/pkg/detectors/dotmailer/dotmailer.go +++ b/pkg/detectors/dotmailer/dotmailer.go @@ -2,8 +2,8 @@ package dotmailer import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/dovico/dovico.go b/pkg/detectors/dovico/dovico.go index 76d96816f..766c76db3 100644 --- a/pkg/detectors/dovico/dovico.go +++ b/pkg/detectors/dovico/dovico.go @@ -3,8 +3,8 @@ package dovico import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/dronahq/dronahq.go b/pkg/detectors/dronahq/dronahq.go index dff7a25ff..0665aa4ed 100644 --- a/pkg/detectors/dronahq/dronahq.go +++ b/pkg/detectors/dronahq/dronahq.go @@ -3,8 +3,8 @@ package dronahq import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/droneci/droneci.go b/pkg/detectors/droneci/droneci.go index 4bbcc18e6..3cd976c30 100644 --- a/pkg/detectors/droneci/droneci.go +++ b/pkg/detectors/droneci/droneci.go @@ -3,8 +3,8 @@ package droneci import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/dropbox/dropbox.go b/pkg/detectors/dropbox/dropbox.go index 6bd92a494..6bdd2a0b3 100644 --- a/pkg/detectors/dropbox/dropbox.go +++ b/pkg/detectors/dropbox/dropbox.go @@ -3,8 +3,8 @@ package dropbox import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "github.com/trufflesecurity/trufflehog/v3/pkg/common" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" diff --git a/pkg/detectors/duply/duply.go b/pkg/detectors/duply/duply.go index 23ee96710..3ffd81a94 100644 --- a/pkg/detectors/duply/duply.go +++ b/pkg/detectors/duply/duply.go @@ -2,8 +2,8 @@ package duply import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/dwolla/dwolla.go b/pkg/detectors/dwolla/dwolla.go index fb738289f..d67c74f1d 100644 --- a/pkg/detectors/dwolla/dwolla.go +++ b/pkg/detectors/dwolla/dwolla.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/dynalist/dynalist.go b/pkg/detectors/dynalist/dynalist.go index 1ba986802..7a2203774 100644 --- a/pkg/detectors/dynalist/dynalist.go +++ b/pkg/detectors/dynalist/dynalist.go @@ -3,9 +3,9 @@ package dynalist import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/dyspatch/dyspatch.go b/pkg/detectors/dyspatch/dyspatch.go index 8f0783451..5547d2f44 100644 --- a/pkg/detectors/dyspatch/dyspatch.go +++ b/pkg/detectors/dyspatch/dyspatch.go @@ -3,9 +3,9 @@ package dyspatch import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/eagleeyenetworks/eagleeyenetworks.go b/pkg/detectors/eagleeyenetworks/eagleeyenetworks.go index 3c3fd4e7b..47d1f5677 100644 --- a/pkg/detectors/eagleeyenetworks/eagleeyenetworks.go +++ b/pkg/detectors/eagleeyenetworks/eagleeyenetworks.go @@ -3,8 +3,8 @@ package eagleeyenetworks import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/easyinsight/easyinsight.go b/pkg/detectors/easyinsight/easyinsight.go index 7011dacd6..12ba7de62 100644 --- a/pkg/detectors/easyinsight/easyinsight.go +++ b/pkg/detectors/easyinsight/easyinsight.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/ecostruxureit/ecostruxureit.go b/pkg/detectors/ecostruxureit/ecostruxureit.go index b4762cf53..2fa477667 100644 --- a/pkg/detectors/ecostruxureit/ecostruxureit.go +++ b/pkg/detectors/ecostruxureit/ecostruxureit.go @@ -3,8 +3,8 @@ package ecostruxureit import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/edamam/edamam.go b/pkg/detectors/edamam/edamam.go index 65773b158..f1a30ad16 100644 --- a/pkg/detectors/edamam/edamam.go +++ b/pkg/detectors/edamam/edamam.go @@ -3,8 +3,8 @@ package edamam import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/edenai/edenai.go b/pkg/detectors/edenai/edenai.go index 9301fe6c6..471514dfd 100644 --- a/pkg/detectors/edenai/edenai.go +++ b/pkg/detectors/edenai/edenai.go @@ -3,8 +3,8 @@ package edenai import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/eightxeight/eightxeight.go b/pkg/detectors/eightxeight/eightxeight.go index 3e62e51f1..628942c4b 100644 --- a/pkg/detectors/eightxeight/eightxeight.go +++ b/pkg/detectors/eightxeight/eightxeight.go @@ -3,8 +3,8 @@ package eightxeight import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/elasticemail/elasticemail.go b/pkg/detectors/elasticemail/elasticemail.go index 39289c95d..436cd94e7 100644 --- a/pkg/detectors/elasticemail/elasticemail.go +++ b/pkg/detectors/elasticemail/elasticemail.go @@ -3,9 +3,9 @@ package elasticemail import ( "context" "encoding/json" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/enablex/enablex.go b/pkg/detectors/enablex/enablex.go index 324245079..13c8c2409 100644 --- a/pkg/detectors/enablex/enablex.go +++ b/pkg/detectors/enablex/enablex.go @@ -2,8 +2,8 @@ package enablex import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/enigma/enigma.go b/pkg/detectors/enigma/enigma.go index b201d355d..729b44f48 100644 --- a/pkg/detectors/enigma/enigma.go +++ b/pkg/detectors/enigma/enigma.go @@ -2,8 +2,8 @@ package enigma import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/envoyapikey/envoyapikey.go b/pkg/detectors/envoyapikey/envoyapikey.go index 263fb4427..b34d3493d 100644 --- a/pkg/detectors/envoyapikey/envoyapikey.go +++ b/pkg/detectors/envoyapikey/envoyapikey.go @@ -2,9 +2,9 @@ package envoyapikey import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/etherscan/etherscan.go b/pkg/detectors/etherscan/etherscan.go index b34a6fa9d..585d5bf69 100644 --- a/pkg/detectors/etherscan/etherscan.go +++ b/pkg/detectors/etherscan/etherscan.go @@ -2,9 +2,9 @@ package etherscan import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/ethplorer/ethplorer.go b/pkg/detectors/ethplorer/ethplorer.go index 93f3853c0..3c101d5b6 100644 --- a/pkg/detectors/ethplorer/ethplorer.go +++ b/pkg/detectors/ethplorer/ethplorer.go @@ -2,8 +2,8 @@ package ethplorer import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/etsyapikey/etsyapikey.go b/pkg/detectors/etsyapikey/etsyapikey.go index f1a4d6e93..e71d82b50 100644 --- a/pkg/detectors/etsyapikey/etsyapikey.go +++ b/pkg/detectors/etsyapikey/etsyapikey.go @@ -2,8 +2,8 @@ package etsyapikey import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/eventbrite/eventbrite.go b/pkg/detectors/eventbrite/eventbrite.go index 43f2decc1..d81fe7e44 100644 --- a/pkg/detectors/eventbrite/eventbrite.go +++ b/pkg/detectors/eventbrite/eventbrite.go @@ -3,8 +3,8 @@ package eventbrite import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/everhour/everhour.go b/pkg/detectors/everhour/everhour.go index 8d7876bad..1bb2f1461 100644 --- a/pkg/detectors/everhour/everhour.go +++ b/pkg/detectors/everhour/everhour.go @@ -2,8 +2,8 @@ package everhour import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/exchangerateapi/exchangerateapi.go b/pkg/detectors/exchangerateapi/exchangerateapi.go index 39e7c1b68..b033c90af 100644 --- a/pkg/detectors/exchangerateapi/exchangerateapi.go +++ b/pkg/detectors/exchangerateapi/exchangerateapi.go @@ -3,8 +3,8 @@ package exchangerateapi import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/exchangeratesapi/exchangeratesapi.go b/pkg/detectors/exchangeratesapi/exchangeratesapi.go index 3d8113779..2316b94dc 100644 --- a/pkg/detectors/exchangeratesapi/exchangeratesapi.go +++ b/pkg/detectors/exchangeratesapi/exchangeratesapi.go @@ -3,8 +3,8 @@ package exchangeratesapi import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/exportsdk/exportsdk.go b/pkg/detectors/exportsdk/exportsdk.go index 024184f65..62ac8ddfa 100644 --- a/pkg/detectors/exportsdk/exportsdk.go +++ b/pkg/detectors/exportsdk/exportsdk.go @@ -2,8 +2,8 @@ package exportsdk import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/extractorapi/extractorapi.go b/pkg/detectors/extractorapi/extractorapi.go index 922e0a98f..95e15c608 100644 --- a/pkg/detectors/extractorapi/extractorapi.go +++ b/pkg/detectors/extractorapi/extractorapi.go @@ -2,8 +2,8 @@ package extractorapi import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/facebookoauth/facebookoauth.go b/pkg/detectors/facebookoauth/facebookoauth.go index 6fe5d2e80..194aa7d7f 100644 --- a/pkg/detectors/facebookoauth/facebookoauth.go +++ b/pkg/detectors/facebookoauth/facebookoauth.go @@ -3,8 +3,8 @@ package facebookoauth import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/faceplusplus/faceplusplus.go b/pkg/detectors/faceplusplus/faceplusplus.go index d0163eaf5..24914f083 100644 --- a/pkg/detectors/faceplusplus/faceplusplus.go +++ b/pkg/detectors/faceplusplus/faceplusplus.go @@ -3,8 +3,8 @@ package faceplusplus import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/fastforex/fastforex.go b/pkg/detectors/fastforex/fastforex.go index 6d05255b9..0c8b772f4 100644 --- a/pkg/detectors/fastforex/fastforex.go +++ b/pkg/detectors/fastforex/fastforex.go @@ -3,8 +3,8 @@ package fastforex import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/fastlypersonaltoken/fastlypersonaltoken.go b/pkg/detectors/fastlypersonaltoken/fastlypersonaltoken.go index 9a2416a06..27a6da02c 100644 --- a/pkg/detectors/fastlypersonaltoken/fastlypersonaltoken.go +++ b/pkg/detectors/fastlypersonaltoken/fastlypersonaltoken.go @@ -4,9 +4,9 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/feedier/feedier.go b/pkg/detectors/feedier/feedier.go index 94b41d598..099caea94 100644 --- a/pkg/detectors/feedier/feedier.go +++ b/pkg/detectors/feedier/feedier.go @@ -3,8 +3,8 @@ package feedier import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/fetchrss/fetchrss.go b/pkg/detectors/fetchrss/fetchrss.go index 19490cfe2..8c3b3690f 100644 --- a/pkg/detectors/fetchrss/fetchrss.go +++ b/pkg/detectors/fetchrss/fetchrss.go @@ -2,9 +2,9 @@ package fetchrss import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/fibery/fibery.go b/pkg/detectors/fibery/fibery.go index 11f11eb31..ce23a1d1a 100644 --- a/pkg/detectors/fibery/fibery.go +++ b/pkg/detectors/fibery/fibery.go @@ -3,8 +3,8 @@ package fibery import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/figmapersonalaccesstoken/v1/figmapersonalaccesstoken.go b/pkg/detectors/figmapersonalaccesstoken/v1/figmapersonalaccesstoken.go index 4968b1e1e..73ed18385 100644 --- a/pkg/detectors/figmapersonalaccesstoken/v1/figmapersonalaccesstoken.go +++ b/pkg/detectors/figmapersonalaccesstoken/v1/figmapersonalaccesstoken.go @@ -3,8 +3,8 @@ package figmapersonalaccesstoken import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/figmapersonalaccesstoken/v2/figmapersonalaccesstoken_v2.go b/pkg/detectors/figmapersonalaccesstoken/v2/figmapersonalaccesstoken_v2.go index 0fa7b4ecc..b2d40991a 100644 --- a/pkg/detectors/figmapersonalaccesstoken/v2/figmapersonalaccesstoken_v2.go +++ b/pkg/detectors/figmapersonalaccesstoken/v2/figmapersonalaccesstoken_v2.go @@ -3,8 +3,8 @@ package figmapersonalaccesstoken import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/fileio/fileio.go b/pkg/detectors/fileio/fileio.go index 4bb6cdb8b..136a96762 100644 --- a/pkg/detectors/fileio/fileio.go +++ b/pkg/detectors/fileio/fileio.go @@ -4,9 +4,9 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/finage/finage.go b/pkg/detectors/finage/finage.go index 1901ed601..fc43ec4a5 100644 --- a/pkg/detectors/finage/finage.go +++ b/pkg/detectors/finage/finage.go @@ -3,8 +3,8 @@ package finage import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/financialmodelingprep/financialmodelingprep.go b/pkg/detectors/financialmodelingprep/financialmodelingprep.go index cf7d7a17f..6f3d20194 100644 --- a/pkg/detectors/financialmodelingprep/financialmodelingprep.go +++ b/pkg/detectors/financialmodelingprep/financialmodelingprep.go @@ -3,9 +3,9 @@ package financialmodelingprep import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/findl/findl.go b/pkg/detectors/findl/findl.go index 323cd90c9..0f6150957 100644 --- a/pkg/detectors/findl/findl.go +++ b/pkg/detectors/findl/findl.go @@ -2,8 +2,8 @@ package findl import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/finnhub/finnhub.go b/pkg/detectors/finnhub/finnhub.go index 57e0caaf7..442e908c6 100644 --- a/pkg/detectors/finnhub/finnhub.go +++ b/pkg/detectors/finnhub/finnhub.go @@ -3,8 +3,8 @@ package finnhub import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/fixerio/fixerio.go b/pkg/detectors/fixerio/fixerio.go index 17df2ef99..070a8ca2c 100644 --- a/pkg/detectors/fixerio/fixerio.go +++ b/pkg/detectors/fixerio/fixerio.go @@ -2,9 +2,9 @@ package fixerio import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/flatio/flatio.go b/pkg/detectors/flatio/flatio.go index bffb97a9f..20a39d0c1 100644 --- a/pkg/detectors/flatio/flatio.go +++ b/pkg/detectors/flatio/flatio.go @@ -3,8 +3,8 @@ package flatio import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/fleetbase/fleetbase.go b/pkg/detectors/fleetbase/fleetbase.go index 0b5746efe..fd5c4e385 100644 --- a/pkg/detectors/fleetbase/fleetbase.go +++ b/pkg/detectors/fleetbase/fleetbase.go @@ -3,8 +3,8 @@ package fleetbase import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/flickr/flickr.go b/pkg/detectors/flickr/flickr.go index 2eabda609..1df3abf16 100644 --- a/pkg/detectors/flickr/flickr.go +++ b/pkg/detectors/flickr/flickr.go @@ -3,9 +3,9 @@ package flickr import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/flightapi/flightapi.go b/pkg/detectors/flightapi/flightapi.go index a6249c300..049947ac7 100644 --- a/pkg/detectors/flightapi/flightapi.go +++ b/pkg/detectors/flightapi/flightapi.go @@ -3,8 +3,8 @@ package flightapi import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/flightlabs/flightlabs.go b/pkg/detectors/flightlabs/flightlabs.go index 18a3e390d..516c56fdc 100644 --- a/pkg/detectors/flightlabs/flightlabs.go +++ b/pkg/detectors/flightlabs/flightlabs.go @@ -3,9 +3,9 @@ package flightlabs import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/flightstats/flightstats.go b/pkg/detectors/flightstats/flightstats.go index 2d6253c90..9a898ec7e 100644 --- a/pkg/detectors/flightstats/flightstats.go +++ b/pkg/detectors/flightstats/flightstats.go @@ -3,9 +3,9 @@ package flightstats import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/float/float.go b/pkg/detectors/float/float.go index 211911932..fd5c09415 100644 --- a/pkg/detectors/float/float.go +++ b/pkg/detectors/float/float.go @@ -3,8 +3,8 @@ package float import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/flowdash/flowdash.go b/pkg/detectors/flowdash/flowdash.go index 2cc5d72fa..83b2bc68d 100644 --- a/pkg/detectors/flowdash/flowdash.go +++ b/pkg/detectors/flowdash/flowdash.go @@ -3,8 +3,8 @@ package flowdash import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/flowflu/flowflu.go b/pkg/detectors/flowflu/flowflu.go index bc5807982..6848c9848 100644 --- a/pkg/detectors/flowflu/flowflu.go +++ b/pkg/detectors/flowflu/flowflu.go @@ -3,9 +3,9 @@ package flowflu import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/flutterwave/flutterwave.go b/pkg/detectors/flutterwave/flutterwave.go index bad763f7c..aee9fcc19 100644 --- a/pkg/detectors/flutterwave/flutterwave.go +++ b/pkg/detectors/flutterwave/flutterwave.go @@ -3,8 +3,8 @@ package flutterwave import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/fmfw/fmfw.go b/pkg/detectors/fmfw/fmfw.go index f406be138..1ff4f3286 100644 --- a/pkg/detectors/fmfw/fmfw.go +++ b/pkg/detectors/fmfw/fmfw.go @@ -2,8 +2,8 @@ package fmfw import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/formbucket/formbucket.go b/pkg/detectors/formbucket/formbucket.go index 62ab3fd92..8ace8aca6 100644 --- a/pkg/detectors/formbucket/formbucket.go +++ b/pkg/detectors/formbucket/formbucket.go @@ -3,9 +3,9 @@ package formbucket import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/formcraft/formcraft.go b/pkg/detectors/formcraft/formcraft.go index 1b040a17c..5e417914f 100644 --- a/pkg/detectors/formcraft/formcraft.go +++ b/pkg/detectors/formcraft/formcraft.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/formio/formio.go b/pkg/detectors/formio/formio.go index f843d6e9b..3c9aba537 100644 --- a/pkg/detectors/formio/formio.go +++ b/pkg/detectors/formio/formio.go @@ -2,8 +2,8 @@ package formio import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/formsite/formsite.go b/pkg/detectors/formsite/formsite.go index 38addb63a..53cc44009 100644 --- a/pkg/detectors/formsite/formsite.go +++ b/pkg/detectors/formsite/formsite.go @@ -3,8 +3,8 @@ package formsite import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/foursquare/foursquare.go b/pkg/detectors/foursquare/foursquare.go index 6fbc66e03..12c0a3e94 100644 --- a/pkg/detectors/foursquare/foursquare.go +++ b/pkg/detectors/foursquare/foursquare.go @@ -3,8 +3,8 @@ package foursquare import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/frameio/frameio.go b/pkg/detectors/frameio/frameio.go index 5c0d47d6e..a257a5214 100644 --- a/pkg/detectors/frameio/frameio.go +++ b/pkg/detectors/frameio/frameio.go @@ -3,8 +3,8 @@ package frameio import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/freshbooks/freshbooks.go b/pkg/detectors/freshbooks/freshbooks.go index 271ec9072..e5a6b5311 100644 --- a/pkg/detectors/freshbooks/freshbooks.go +++ b/pkg/detectors/freshbooks/freshbooks.go @@ -3,9 +3,9 @@ package freshbooks import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/freshdesk/freshdesk.go b/pkg/detectors/freshdesk/freshdesk.go index a0f425b9a..f46f601d4 100644 --- a/pkg/detectors/freshdesk/freshdesk.go +++ b/pkg/detectors/freshdesk/freshdesk.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/front/front.go b/pkg/detectors/front/front.go index f059f41ba..40de6007d 100644 --- a/pkg/detectors/front/front.go +++ b/pkg/detectors/front/front.go @@ -3,8 +3,8 @@ package front import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/ftp/ftp.go b/pkg/detectors/ftp/ftp.go index 8d77f12f1..58c0d01eb 100644 --- a/pkg/detectors/ftp/ftp.go +++ b/pkg/detectors/ftp/ftp.go @@ -3,9 +3,9 @@ package ftp import ( "context" "errors" + regexp "github.com/wasilibs/go-re2" "net/textproto" "net/url" - "regexp" "strings" "time" diff --git a/pkg/detectors/fulcrum/fulcrum.go b/pkg/detectors/fulcrum/fulcrum.go index eae2e4463..8503dfa4a 100644 --- a/pkg/detectors/fulcrum/fulcrum.go +++ b/pkg/detectors/fulcrum/fulcrum.go @@ -2,8 +2,8 @@ package fulcrum import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/fullstory/fullstory.go b/pkg/detectors/fullstory/fullstory.go index 641080516..9325b7883 100644 --- a/pkg/detectors/fullstory/fullstory.go +++ b/pkg/detectors/fullstory/fullstory.go @@ -3,8 +3,8 @@ package fullstory import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/fullstory_v2/fullstory_v2.go b/pkg/detectors/fullstory_v2/fullstory_v2.go index 196d80d2c..0783a45c2 100644 --- a/pkg/detectors/fullstory_v2/fullstory_v2.go +++ b/pkg/detectors/fullstory_v2/fullstory_v2.go @@ -3,8 +3,8 @@ package fullstory_v2 import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/fusebill/fusebill.go b/pkg/detectors/fusebill/fusebill.go index 689db0269..2df1eb36b 100644 --- a/pkg/detectors/fusebill/fusebill.go +++ b/pkg/detectors/fusebill/fusebill.go @@ -3,8 +3,8 @@ package fusebill import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/fxmarket/fxmarket.go b/pkg/detectors/fxmarket/fxmarket.go index 5a229f994..12713622b 100644 --- a/pkg/detectors/fxmarket/fxmarket.go +++ b/pkg/detectors/fxmarket/fxmarket.go @@ -3,8 +3,8 @@ package fxmarket import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/gcp/gcp.go b/pkg/detectors/gcp/gcp.go index 8771fc252..dc5836833 100644 --- a/pkg/detectors/gcp/gcp.go +++ b/pkg/detectors/gcp/gcp.go @@ -3,7 +3,7 @@ package gcp import ( "context" "encoding/json" - "regexp" + regexp "github.com/wasilibs/go-re2" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" diff --git a/pkg/detectors/geckoboard/geckoboard.go b/pkg/detectors/geckoboard/geckoboard.go index eda0bd430..39caa8c6d 100644 --- a/pkg/detectors/geckoboard/geckoboard.go +++ b/pkg/detectors/geckoboard/geckoboard.go @@ -3,8 +3,8 @@ package geckoboard import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/gemini/gemini.go b/pkg/detectors/gemini/gemini.go index 7e47f10a5..668763e6a 100644 --- a/pkg/detectors/gemini/gemini.go +++ b/pkg/detectors/gemini/gemini.go @@ -8,8 +8,8 @@ import ( "encoding/base64" "encoding/hex" "encoding/json" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/generic/generic.go b/pkg/detectors/generic/generic.go index 371e17878..9ef51da4c 100644 --- a/pkg/detectors/generic/generic.go +++ b/pkg/detectors/generic/generic.go @@ -6,7 +6,7 @@ import ( "context" "encoding/base64" "fmt" - "regexp" + regexp "github.com/wasilibs/go-re2" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" diff --git a/pkg/detectors/gengo/gengo.go b/pkg/detectors/gengo/gengo.go index e90e14fac..e3c908b64 100644 --- a/pkg/detectors/gengo/gengo.go +++ b/pkg/detectors/gengo/gengo.go @@ -7,9 +7,9 @@ import ( "encoding/hex" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strconv" "strings" "time" diff --git a/pkg/detectors/geoapify/geoapify.go b/pkg/detectors/geoapify/geoapify.go index d20c890b8..8dc27f81e 100644 --- a/pkg/detectors/geoapify/geoapify.go +++ b/pkg/detectors/geoapify/geoapify.go @@ -3,8 +3,8 @@ package geoapify import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/geocode/geocode.go b/pkg/detectors/geocode/geocode.go index 9b6bce1a4..ee5dabbc4 100644 --- a/pkg/detectors/geocode/geocode.go +++ b/pkg/detectors/geocode/geocode.go @@ -3,9 +3,9 @@ package geocode import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/geocodify/geocodify.go b/pkg/detectors/geocodify/geocodify.go index e93dc2962..ff01b7aef 100644 --- a/pkg/detectors/geocodify/geocodify.go +++ b/pkg/detectors/geocodify/geocodify.go @@ -2,8 +2,8 @@ package geocodify import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/geocodio/geocodio.go b/pkg/detectors/geocodio/geocodio.go index 21cbdb2f1..917847e4a 100644 --- a/pkg/detectors/geocodio/geocodio.go +++ b/pkg/detectors/geocodio/geocodio.go @@ -3,8 +3,8 @@ package geocodio import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/geoipifi/geoipifi.go b/pkg/detectors/geoipifi/geoipifi.go index 3a0d31464..1ffebd086 100644 --- a/pkg/detectors/geoipifi/geoipifi.go +++ b/pkg/detectors/geoipifi/geoipifi.go @@ -2,8 +2,8 @@ package geoipifi import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/getemail/getemail.go b/pkg/detectors/getemail/getemail.go index 4bf56ee19..5a4c0bf23 100644 --- a/pkg/detectors/getemail/getemail.go +++ b/pkg/detectors/getemail/getemail.go @@ -3,9 +3,9 @@ package getemail import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/getemails/getemails.go b/pkg/detectors/getemails/getemails.go index 4d33a59cc..ca40e0501 100644 --- a/pkg/detectors/getemails/getemails.go +++ b/pkg/detectors/getemails/getemails.go @@ -2,8 +2,8 @@ package getemails import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/getgeoapi/getgeoapi.go b/pkg/detectors/getgeoapi/getgeoapi.go index c3784f36b..eae4b465c 100644 --- a/pkg/detectors/getgeoapi/getgeoapi.go +++ b/pkg/detectors/getgeoapi/getgeoapi.go @@ -3,8 +3,8 @@ package getgeoapi import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/getgist/getgist.go b/pkg/detectors/getgist/getgist.go index 3a0158bb3..b3a985217 100644 --- a/pkg/detectors/getgist/getgist.go +++ b/pkg/detectors/getgist/getgist.go @@ -3,8 +3,8 @@ package getgist import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/getresponse/getresponse.go b/pkg/detectors/getresponse/getresponse.go index 9e77cf0b7..f58b13444 100644 --- a/pkg/detectors/getresponse/getresponse.go +++ b/pkg/detectors/getresponse/getresponse.go @@ -3,8 +3,8 @@ package getresponse import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/getsandbox/getsandbox.go b/pkg/detectors/getsandbox/getsandbox.go index a45cc70c2..f2eeff849 100644 --- a/pkg/detectors/getsandbox/getsandbox.go +++ b/pkg/detectors/getsandbox/getsandbox.go @@ -3,8 +3,8 @@ package getsandbox import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/github/github.go b/pkg/detectors/github/github.go index 192f3d97a..038cd08c2 100644 --- a/pkg/detectors/github/github.go +++ b/pkg/detectors/github/github.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" "github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb" diff --git a/pkg/detectors/github_oauth2/github_oauth2.go b/pkg/detectors/github_oauth2/github_oauth2.go index a3678a397..ea70de7da 100644 --- a/pkg/detectors/github_oauth2/github_oauth2.go +++ b/pkg/detectors/github_oauth2/github_oauth2.go @@ -2,7 +2,7 @@ package github_oauth2 import ( "context" - "regexp" + regexp "github.com/wasilibs/go-re2" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" diff --git a/pkg/detectors/github_old/github_old.go b/pkg/detectors/github_old/github_old.go index 45724309c..26d056801 100644 --- a/pkg/detectors/github_old/github_old.go +++ b/pkg/detectors/github_old/github_old.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "github.com/trufflesecurity/trufflehog/v3/pkg/common" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" diff --git a/pkg/detectors/githubapp/githubapp.go b/pkg/detectors/githubapp/githubapp.go index ec1c07588..ed27fdd92 100644 --- a/pkg/detectors/githubapp/githubapp.go +++ b/pkg/detectors/githubapp/githubapp.go @@ -5,8 +5,8 @@ import ( // b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/gitlab/gitlab.go b/pkg/detectors/gitlab/gitlab.go index 33ac756b7..90f8fa02e 100644 --- a/pkg/detectors/gitlab/gitlab.go +++ b/pkg/detectors/gitlab/gitlab.go @@ -4,9 +4,9 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/gitlabv2/gitlab_v2.go b/pkg/detectors/gitlabv2/gitlab_v2.go index 4c8c26150..24f0f1e75 100644 --- a/pkg/detectors/gitlabv2/gitlab_v2.go +++ b/pkg/detectors/gitlabv2/gitlab_v2.go @@ -3,8 +3,8 @@ package gitlabv2 import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/gitter/gitter.go b/pkg/detectors/gitter/gitter.go index f190118e0..21c7d113a 100644 --- a/pkg/detectors/gitter/gitter.go +++ b/pkg/detectors/gitter/gitter.go @@ -3,8 +3,8 @@ package gitter import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/glassnode/glassnode.go b/pkg/detectors/glassnode/glassnode.go index b09e84870..ec1c42778 100644 --- a/pkg/detectors/glassnode/glassnode.go +++ b/pkg/detectors/glassnode/glassnode.go @@ -2,8 +2,8 @@ package glassnode import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/gocanvas/gocanvas.go b/pkg/detectors/gocanvas/gocanvas.go index 00854e62a..e05336b26 100644 --- a/pkg/detectors/gocanvas/gocanvas.go +++ b/pkg/detectors/gocanvas/gocanvas.go @@ -4,10 +4,10 @@ import ( "context" "encoding/xml" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" "net/url" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/gocardless/gocardless.go b/pkg/detectors/gocardless/gocardless.go index 693911adb..d98498622 100644 --- a/pkg/detectors/gocardless/gocardless.go +++ b/pkg/detectors/gocardless/gocardless.go @@ -3,8 +3,8 @@ package gocardless import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/goodday/goodday.go b/pkg/detectors/goodday/goodday.go index 7523e3a0a..1b637bc7a 100644 --- a/pkg/detectors/goodday/goodday.go +++ b/pkg/detectors/goodday/goodday.go @@ -2,8 +2,8 @@ package goodday import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/grafana/grafana.go b/pkg/detectors/grafana/grafana.go index 5bd7676ba..9ca0431b2 100644 --- a/pkg/detectors/grafana/grafana.go +++ b/pkg/detectors/grafana/grafana.go @@ -3,8 +3,8 @@ package grafana import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/grafanaserviceaccount/grafanaserviceaccount.go b/pkg/detectors/grafanaserviceaccount/grafanaserviceaccount.go index 94c1771cf..61d02c8c4 100644 --- a/pkg/detectors/grafanaserviceaccount/grafanaserviceaccount.go +++ b/pkg/detectors/grafanaserviceaccount/grafanaserviceaccount.go @@ -3,8 +3,8 @@ package grafanaserviceaccount import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/graphcms/graphcms.go b/pkg/detectors/graphcms/graphcms.go index 1059b7d3b..63c17507a 100644 --- a/pkg/detectors/graphcms/graphcms.go +++ b/pkg/detectors/graphcms/graphcms.go @@ -3,8 +3,8 @@ package graphcms import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/graphhopper/graphhopper.go b/pkg/detectors/graphhopper/graphhopper.go index b3e249613..84c25ff88 100644 --- a/pkg/detectors/graphhopper/graphhopper.go +++ b/pkg/detectors/graphhopper/graphhopper.go @@ -3,8 +3,8 @@ package graphhopper import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/groovehq/groovehq.go b/pkg/detectors/groovehq/groovehq.go index ca5c7b7b8..c1bfa8dad 100644 --- a/pkg/detectors/groovehq/groovehq.go +++ b/pkg/detectors/groovehq/groovehq.go @@ -3,8 +3,8 @@ package groovehq import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/gtmetrix/gtmetrix.go b/pkg/detectors/gtmetrix/gtmetrix.go index 7decbba12..e1a06782b 100644 --- a/pkg/detectors/gtmetrix/gtmetrix.go +++ b/pkg/detectors/gtmetrix/gtmetrix.go @@ -2,8 +2,8 @@ package gtmetrix import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/guardianapi/guardianapi.go b/pkg/detectors/guardianapi/guardianapi.go index 0630f582d..549492e9a 100644 --- a/pkg/detectors/guardianapi/guardianapi.go +++ b/pkg/detectors/guardianapi/guardianapi.go @@ -2,8 +2,8 @@ package guardianapi import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/gumroad/gumroad.go b/pkg/detectors/gumroad/gumroad.go index 5725574c5..cd341d3b9 100644 --- a/pkg/detectors/gumroad/gumroad.go +++ b/pkg/detectors/gumroad/gumroad.go @@ -2,8 +2,8 @@ package gumroad import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/guru/guru.go b/pkg/detectors/guru/guru.go index 563a1fc9d..8622faec9 100644 --- a/pkg/detectors/guru/guru.go +++ b/pkg/detectors/guru/guru.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/gyazo/gyazo.go b/pkg/detectors/gyazo/gyazo.go index b52555071..5c908ebaf 100644 --- a/pkg/detectors/gyazo/gyazo.go +++ b/pkg/detectors/gyazo/gyazo.go @@ -2,8 +2,8 @@ package gyazo import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/happyscribe/happyscribe.go b/pkg/detectors/happyscribe/happyscribe.go index 354206563..7cf67309b 100644 --- a/pkg/detectors/happyscribe/happyscribe.go +++ b/pkg/detectors/happyscribe/happyscribe.go @@ -3,8 +3,8 @@ package happyscribe import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/harvest/harvest.go b/pkg/detectors/harvest/harvest.go index 10a38f739..425205332 100644 --- a/pkg/detectors/harvest/harvest.go +++ b/pkg/detectors/harvest/harvest.go @@ -2,8 +2,8 @@ package harvest import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/hellosign/hellosign.go b/pkg/detectors/hellosign/hellosign.go index 9b43595be..63c52e3c0 100644 --- a/pkg/detectors/hellosign/hellosign.go +++ b/pkg/detectors/hellosign/hellosign.go @@ -2,8 +2,8 @@ package hellosign import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/helpcrunch/helpcrunch.go b/pkg/detectors/helpcrunch/helpcrunch.go index 55a82a37a..93eaa7ef6 100644 --- a/pkg/detectors/helpcrunch/helpcrunch.go +++ b/pkg/detectors/helpcrunch/helpcrunch.go @@ -3,8 +3,8 @@ package helpcrunch import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/helpscout/helpscout.go b/pkg/detectors/helpscout/helpscout.go index ed139de33..1139c0030 100644 --- a/pkg/detectors/helpscout/helpscout.go +++ b/pkg/detectors/helpscout/helpscout.go @@ -2,8 +2,8 @@ package helpscout import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/hereapi/hereapi.go b/pkg/detectors/hereapi/hereapi.go index c6362a7b4..530f2d60e 100644 --- a/pkg/detectors/hereapi/hereapi.go +++ b/pkg/detectors/hereapi/hereapi.go @@ -3,8 +3,8 @@ package hereapi import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/heroku/heroku.go b/pkg/detectors/heroku/heroku.go index 2821fc7cb..d08cab603 100644 --- a/pkg/detectors/heroku/heroku.go +++ b/pkg/detectors/heroku/heroku.go @@ -3,8 +3,8 @@ package heroku import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/hive/hive.go b/pkg/detectors/hive/hive.go index eecb74c86..f0e1bb0e8 100644 --- a/pkg/detectors/hive/hive.go +++ b/pkg/detectors/hive/hive.go @@ -2,8 +2,8 @@ package hive import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/hiveage/hiveage.go b/pkg/detectors/hiveage/hiveage.go index 1f84e97ea..c206e8c60 100644 --- a/pkg/detectors/hiveage/hiveage.go +++ b/pkg/detectors/hiveage/hiveage.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/holidayapi/holidayapi.go b/pkg/detectors/holidayapi/holidayapi.go index f22ee728f..3ceac5b09 100644 --- a/pkg/detectors/holidayapi/holidayapi.go +++ b/pkg/detectors/holidayapi/holidayapi.go @@ -3,8 +3,8 @@ package holidayapi import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/holistic/holistic.go b/pkg/detectors/holistic/holistic.go index 71160576a..5f08c5956 100644 --- a/pkg/detectors/holistic/holistic.go +++ b/pkg/detectors/holistic/holistic.go @@ -2,9 +2,9 @@ package holistic import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/honeycomb/honeycomb.go b/pkg/detectors/honeycomb/honeycomb.go index 08af012f4..ca9dcbd71 100644 --- a/pkg/detectors/honeycomb/honeycomb.go +++ b/pkg/detectors/honeycomb/honeycomb.go @@ -2,8 +2,8 @@ package honeycomb import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/host/host.go b/pkg/detectors/host/host.go index 0ed0db805..eb627e742 100644 --- a/pkg/detectors/host/host.go +++ b/pkg/detectors/host/host.go @@ -3,8 +3,8 @@ package host import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/html2pdf/html2pdf.go b/pkg/detectors/html2pdf/html2pdf.go index 5b0594af5..93a95843a 100644 --- a/pkg/detectors/html2pdf/html2pdf.go +++ b/pkg/detectors/html2pdf/html2pdf.go @@ -4,8 +4,8 @@ import ( "bytes" "context" "encoding/json" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" diff --git a/pkg/detectors/hubspotapikey/hubspotapikey.go b/pkg/detectors/hubspotapikey/hubspotapikey.go index 4adb62c76..74a7cd8c6 100644 --- a/pkg/detectors/hubspotapikey/hubspotapikey.go +++ b/pkg/detectors/hubspotapikey/hubspotapikey.go @@ -3,8 +3,8 @@ package hubspotapikey import ( "context" // "log" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/huggingface/huggingface.go b/pkg/detectors/huggingface/huggingface.go index 4bdf14c9a..a6fa0a855 100644 --- a/pkg/detectors/huggingface/huggingface.go +++ b/pkg/detectors/huggingface/huggingface.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/huggingface/huggingface_test.go b/pkg/detectors/huggingface/huggingface_test.go index 08bcf1f31..eba2decd1 100644 --- a/pkg/detectors/huggingface/huggingface_test.go +++ b/pkg/detectors/huggingface/huggingface_test.go @@ -53,6 +53,11 @@ func TestHuggingface_FromChunk(t *testing.T) { { DetectorType: detectorspb.DetectorType_HuggingFace, Verified: true, + ExtraData: map[string]string{ + "Email": "zubair.khan@trufflesec.com", + "Token": "another_one (read)", + "Username": "zubairkhan", + }, }, }, wantErr: false, @@ -122,6 +127,56 @@ func TestHuggingface_FromChunk(t *testing.T) { wantVerificationErr: true, }, } + + // Add tests for invalid UTF-8 sequences. + invalidUTF8Sequences := [][]byte{ + {0x80}, + {0xC0, 0xAF}, + {0xFE}, + {0xE2, 0x82}, + {0xED, 0xA0, 0x80}, + {0xF0, 0x28}, + } + + for _, invalidSeq := range invalidUTF8Sequences { + // Inject invalid sequence into the test string + testData := fmt.Sprintf("you can find a huggingface secret %s%s%s more valid text", + string(invalidSeq), + secret, + string(invalidSeq)) + + tests = append(tests, struct { + name string + s Scanner + args args + want []detectors.Result + wantErr bool + wantVerificationErr bool + }{ + name: fmt.Sprintf("Test with invalid UTF-8 sequence: %v", invalidSeq), + s: Scanner{}, + args: args{ + ctx: context.Background(), + data: []byte(testData), + verify: true, // or true based on your test scenario + }, + + want: []detectors.Result{ + { + DetectorType: detectorspb.DetectorType_HuggingFace, + Verified: true, + ExtraData: map[string]string{ + "Email": "zubair.khan@trufflesec.com", + "Token": "another_one (read)", + "Username": "zubairkhan", + }, + }, + }, + wantErr: false, + wantVerificationErr: false, + }) + } + for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { got, err := tt.s.FromData(tt.args.ctx, tt.args.verify, tt.args.data) diff --git a/pkg/detectors/humanity/humanity.go b/pkg/detectors/humanity/humanity.go index 879948606..e258b5671 100644 --- a/pkg/detectors/humanity/humanity.go +++ b/pkg/detectors/humanity/humanity.go @@ -2,9 +2,9 @@ package humanity import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/hunter/hunter.go b/pkg/detectors/hunter/hunter.go index c53fda8ab..ec7beba33 100644 --- a/pkg/detectors/hunter/hunter.go +++ b/pkg/detectors/hunter/hunter.go @@ -4,8 +4,8 @@ import ( "context" // "fmt" // "log" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/hybiscus/hybiscus.go b/pkg/detectors/hybiscus/hybiscus.go index 61c173bf3..6e0e8f040 100644 --- a/pkg/detectors/hybiscus/hybiscus.go +++ b/pkg/detectors/hybiscus/hybiscus.go @@ -2,8 +2,8 @@ package hybiscus import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/hypertrack/hypertrack.go b/pkg/detectors/hypertrack/hypertrack.go index 318bed544..c70821196 100644 --- a/pkg/detectors/hypertrack/hypertrack.go +++ b/pkg/detectors/hypertrack/hypertrack.go @@ -2,8 +2,8 @@ package hypertrack import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/ibmclouduserkey/ibmclouduserkey.go b/pkg/detectors/ibmclouduserkey/ibmclouduserkey.go index d94f8942d..551453dfd 100644 --- a/pkg/detectors/ibmclouduserkey/ibmclouduserkey.go +++ b/pkg/detectors/ibmclouduserkey/ibmclouduserkey.go @@ -2,8 +2,8 @@ package ibmclouduserkey import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/iconfinder/iconfinder.go b/pkg/detectors/iconfinder/iconfinder.go index 60f27d796..c98e8acb6 100644 --- a/pkg/detectors/iconfinder/iconfinder.go +++ b/pkg/detectors/iconfinder/iconfinder.go @@ -3,8 +3,8 @@ package iconfinder import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/iexapis/iexapis.go b/pkg/detectors/iexapis/iexapis.go index dcc25865b..da15de37c 100644 --- a/pkg/detectors/iexapis/iexapis.go +++ b/pkg/detectors/iexapis/iexapis.go @@ -2,8 +2,8 @@ package iexapis import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/iexcloud/iexcloud.go b/pkg/detectors/iexcloud/iexcloud.go index 53ceff3d8..6da807d4f 100644 --- a/pkg/detectors/iexcloud/iexcloud.go +++ b/pkg/detectors/iexcloud/iexcloud.go @@ -3,8 +3,8 @@ package iexcloud import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/imagekit/imagekit.go b/pkg/detectors/imagekit/imagekit.go index b0f224d28..cb36a8614 100644 --- a/pkg/detectors/imagekit/imagekit.go +++ b/pkg/detectors/imagekit/imagekit.go @@ -2,8 +2,8 @@ package imagekit import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/imagga/imagga.go b/pkg/detectors/imagga/imagga.go index 7ba883e2f..f63241bad 100644 --- a/pkg/detectors/imagga/imagga.go +++ b/pkg/detectors/imagga/imagga.go @@ -3,8 +3,8 @@ package imagga import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/impala/impala.go b/pkg/detectors/impala/impala.go index e7dceeace..dde3ca5c0 100644 --- a/pkg/detectors/impala/impala.go +++ b/pkg/detectors/impala/impala.go @@ -2,8 +2,8 @@ package impala import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/infura/infura.go b/pkg/detectors/infura/infura.go index 4ee17c7d9..1e54c7a48 100644 --- a/pkg/detectors/infura/infura.go +++ b/pkg/detectors/infura/infura.go @@ -2,9 +2,9 @@ package infura import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/insightly/insightly.go b/pkg/detectors/insightly/insightly.go index faaad14af..e77798045 100644 --- a/pkg/detectors/insightly/insightly.go +++ b/pkg/detectors/insightly/insightly.go @@ -2,8 +2,8 @@ package insightly import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/instabot/instabot.go b/pkg/detectors/instabot/instabot.go index 0aa468e63..6ba73ac28 100644 --- a/pkg/detectors/instabot/instabot.go +++ b/pkg/detectors/instabot/instabot.go @@ -2,8 +2,8 @@ package instabot import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/instamojo/instamojo.go b/pkg/detectors/instamojo/instamojo.go index 42ba954b5..de281a18c 100644 --- a/pkg/detectors/instamojo/instamojo.go +++ b/pkg/detectors/instamojo/instamojo.go @@ -3,9 +3,9 @@ package instamojo import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" @@ -23,9 +23,9 @@ var _ detectors.Detector = (*Scanner)(nil) var ( defaultClient = common.SaneHttpClient() // Make sure that your group is surrounded in boundary characters such as below to reduce false positives. - //KeyPat is client_id + // KeyPat is client_id keyPat = regexp.MustCompile(detectors.PrefixRegex([]string{"instamojo"}) + `\b([0-9a-zA-Z]{40})\b`) - //Secretpat is Client_secret + // Secretpat is Client_secret secretPat = regexp.MustCompile(detectors.PrefixRegex([]string{"instamojo"}) + `\b([0-9a-zA-Z]{128})\b`) ) diff --git a/pkg/detectors/integromat/integromat.go b/pkg/detectors/integromat/integromat.go index a7476113b..562e6d090 100644 --- a/pkg/detectors/integromat/integromat.go +++ b/pkg/detectors/integromat/integromat.go @@ -3,8 +3,8 @@ package integromat import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/intercom/intercom.go b/pkg/detectors/intercom/intercom.go index ae4185f70..b4b7a0420 100644 --- a/pkg/detectors/intercom/intercom.go +++ b/pkg/detectors/intercom/intercom.go @@ -3,8 +3,8 @@ package intercom import ( "context" "encoding/base64" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/interseller/interseller.go b/pkg/detectors/interseller/interseller.go index cf2e5c77b..fe96b67db 100644 --- a/pkg/detectors/interseller/interseller.go +++ b/pkg/detectors/interseller/interseller.go @@ -2,8 +2,8 @@ package interseller import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/intrinio/intrinio.go b/pkg/detectors/intrinio/intrinio.go index 7792e5f1a..c881fe3a1 100644 --- a/pkg/detectors/intrinio/intrinio.go +++ b/pkg/detectors/intrinio/intrinio.go @@ -3,8 +3,8 @@ package intrinio import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/invoiceocean/invoiceocean.go b/pkg/detectors/invoiceocean/invoiceocean.go index c2a10462f..b77a385dd 100644 --- a/pkg/detectors/invoiceocean/invoiceocean.go +++ b/pkg/detectors/invoiceocean/invoiceocean.go @@ -3,8 +3,8 @@ package invoiceocean import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/ip2location/ip2location.go b/pkg/detectors/ip2location/ip2location.go index 04537e43a..c2fac406c 100644 --- a/pkg/detectors/ip2location/ip2location.go +++ b/pkg/detectors/ip2location/ip2location.go @@ -3,8 +3,8 @@ package ip2location import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/ipapi/ipapi.go b/pkg/detectors/ipapi/ipapi.go index 3205b2706..3f686ea97 100644 --- a/pkg/detectors/ipapi/ipapi.go +++ b/pkg/detectors/ipapi/ipapi.go @@ -3,9 +3,9 @@ package ipapi import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/ipgeolocation/ipgeolocation.go b/pkg/detectors/ipgeolocation/ipgeolocation.go index 29cadae88..cc77f9000 100644 --- a/pkg/detectors/ipgeolocation/ipgeolocation.go +++ b/pkg/detectors/ipgeolocation/ipgeolocation.go @@ -3,8 +3,8 @@ package ipgeolocation import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/ipify/ipify.go b/pkg/detectors/ipify/ipify.go index 3f2880752..ed70b6506 100644 --- a/pkg/detectors/ipify/ipify.go +++ b/pkg/detectors/ipify/ipify.go @@ -3,8 +3,8 @@ package ipify import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/ipinfo/ipinfo.go b/pkg/detectors/ipinfo/ipinfo.go index 3b1761c9c..cbc96431b 100644 --- a/pkg/detectors/ipinfo/ipinfo.go +++ b/pkg/detectors/ipinfo/ipinfo.go @@ -3,8 +3,8 @@ package ipinfo import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/ipinfodb/ipinfodb.go b/pkg/detectors/ipinfodb/ipinfodb.go index 1ec4bd72d..35f78246c 100644 --- a/pkg/detectors/ipinfodb/ipinfodb.go +++ b/pkg/detectors/ipinfodb/ipinfodb.go @@ -3,9 +3,9 @@ package ipinfodb import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/ipquality/ipquality.go b/pkg/detectors/ipquality/ipquality.go index 6288e6f5b..d6546f742 100644 --- a/pkg/detectors/ipquality/ipquality.go +++ b/pkg/detectors/ipquality/ipquality.go @@ -3,9 +3,9 @@ package ipquality import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/ipstack/ipstack.go b/pkg/detectors/ipstack/ipstack.go index bfc9a3e5f..726c42eae 100644 --- a/pkg/detectors/ipstack/ipstack.go +++ b/pkg/detectors/ipstack/ipstack.go @@ -2,9 +2,9 @@ package ipstack import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/jiratoken/jiratoken.go b/pkg/detectors/jiratoken/jiratoken.go index ddae96f46..9abc58c00 100644 --- a/pkg/detectors/jiratoken/jiratoken.go +++ b/pkg/detectors/jiratoken/jiratoken.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/jiratoken_v2/jiratoken_v2.go b/pkg/detectors/jiratoken_v2/jiratoken_v2.go index 5753dc10a..9cdfc688d 100644 --- a/pkg/detectors/jiratoken_v2/jiratoken_v2.go +++ b/pkg/detectors/jiratoken_v2/jiratoken_v2.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/jotform/jotform.go b/pkg/detectors/jotform/jotform.go index 513b4ac09..1504e1181 100644 --- a/pkg/detectors/jotform/jotform.go +++ b/pkg/detectors/jotform/jotform.go @@ -2,8 +2,8 @@ package jotform import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/jumpcloud/jumpcloud.go b/pkg/detectors/jumpcloud/jumpcloud.go index 35b9af0d7..0f8186097 100644 --- a/pkg/detectors/jumpcloud/jumpcloud.go +++ b/pkg/detectors/jumpcloud/jumpcloud.go @@ -2,8 +2,8 @@ package jumpcloud import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/juro/juro.go b/pkg/detectors/juro/juro.go index 09357911c..7ccd9adfd 100644 --- a/pkg/detectors/juro/juro.go +++ b/pkg/detectors/juro/juro.go @@ -2,8 +2,8 @@ package juro import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/kanban/kanban.go b/pkg/detectors/kanban/kanban.go index f05a3a8c5..96a695e21 100644 --- a/pkg/detectors/kanban/kanban.go +++ b/pkg/detectors/kanban/kanban.go @@ -3,8 +3,8 @@ package kanban import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/kanbantool/kanbantool.go b/pkg/detectors/kanbantool/kanbantool.go index 36a49c746..3385e45df 100644 --- a/pkg/detectors/kanbantool/kanbantool.go +++ b/pkg/detectors/kanbantool/kanbantool.go @@ -3,8 +3,8 @@ package kanbantool import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/karmacrm/karmacrm.go b/pkg/detectors/karmacrm/karmacrm.go index 5a3e61543..7b93983ce 100644 --- a/pkg/detectors/karmacrm/karmacrm.go +++ b/pkg/detectors/karmacrm/karmacrm.go @@ -3,8 +3,8 @@ package karmacrm import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/keenio/keenio.go b/pkg/detectors/keenio/keenio.go index 0637cb692..e0b89deb4 100644 --- a/pkg/detectors/keenio/keenio.go +++ b/pkg/detectors/keenio/keenio.go @@ -2,8 +2,8 @@ package keenio import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/kickbox/kickbox.go b/pkg/detectors/kickbox/kickbox.go index 4578bad57..a2c3df79b 100644 --- a/pkg/detectors/kickbox/kickbox.go +++ b/pkg/detectors/kickbox/kickbox.go @@ -2,8 +2,8 @@ package kickbox import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/klaviyo/klaviyo.go b/pkg/detectors/klaviyo/klaviyo.go index 51f17fc03..6019d775c 100644 --- a/pkg/detectors/klaviyo/klaviyo.go +++ b/pkg/detectors/klaviyo/klaviyo.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/klipfolio/klipfolio.go b/pkg/detectors/klipfolio/klipfolio.go index 478d1dfa6..5824f1764 100644 --- a/pkg/detectors/klipfolio/klipfolio.go +++ b/pkg/detectors/klipfolio/klipfolio.go @@ -2,8 +2,8 @@ package klipfolio import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/knapsackpro/knapsackpro.go b/pkg/detectors/knapsackpro/knapsackpro.go index 721d81f97..ba68a522e 100644 --- a/pkg/detectors/knapsackpro/knapsackpro.go +++ b/pkg/detectors/knapsackpro/knapsackpro.go @@ -2,8 +2,8 @@ package knapsackpro import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/kontent/kontent.go b/pkg/detectors/kontent/kontent.go index ec1316ed7..7166835ee 100644 --- a/pkg/detectors/kontent/kontent.go +++ b/pkg/detectors/kontent/kontent.go @@ -3,8 +3,8 @@ package kontent import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/kraken/kraken.go b/pkg/detectors/kraken/kraken.go index 000c9811c..0a0693d14 100644 --- a/pkg/detectors/kraken/kraken.go +++ b/pkg/detectors/kraken/kraken.go @@ -6,10 +6,10 @@ import ( "crypto/sha256" "crypto/sha512" "encoding/base64" + regexp "github.com/wasilibs/go-re2" "io" "net/http" "net/url" - "regexp" "strconv" "strings" "time" diff --git a/pkg/detectors/kucoin/kucoin.go b/pkg/detectors/kucoin/kucoin.go index a97bc6594..0f68a3946 100644 --- a/pkg/detectors/kucoin/kucoin.go +++ b/pkg/detectors/kucoin/kucoin.go @@ -5,8 +5,8 @@ import ( "crypto/hmac" "crypto/sha256" "encoding/base64" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strconv" "strings" "time" diff --git a/pkg/detectors/kylas/kylas.go b/pkg/detectors/kylas/kylas.go index 3a01c15a9..815ea5256 100644 --- a/pkg/detectors/kylas/kylas.go +++ b/pkg/detectors/kylas/kylas.go @@ -2,8 +2,8 @@ package kylas import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/languagelayer/languagelayer.go b/pkg/detectors/languagelayer/languagelayer.go index 7368a28b4..68e5e8e14 100644 --- a/pkg/detectors/languagelayer/languagelayer.go +++ b/pkg/detectors/languagelayer/languagelayer.go @@ -3,9 +3,9 @@ package languagelayer import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/lastfm/lastfm.go b/pkg/detectors/lastfm/lastfm.go index 7b71caef5..f1d5f6ab4 100644 --- a/pkg/detectors/lastfm/lastfm.go +++ b/pkg/detectors/lastfm/lastfm.go @@ -2,8 +2,8 @@ package lastfm import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/launchdarkly/launchdarkly.go b/pkg/detectors/launchdarkly/launchdarkly.go index bcb2c95f9..90e8eb398 100644 --- a/pkg/detectors/launchdarkly/launchdarkly.go +++ b/pkg/detectors/launchdarkly/launchdarkly.go @@ -4,8 +4,8 @@ import ( "context" "errors" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/ldap/ldap.go b/pkg/detectors/ldap/ldap.go index 996ed0532..b4619fa4c 100644 --- a/pkg/detectors/ldap/ldap.go +++ b/pkg/detectors/ldap/ldap.go @@ -4,9 +4,9 @@ import ( "context" "crypto/tls" "fmt" + regexp "github.com/wasilibs/go-re2" "net" "net/url" - "regexp" "strings" "time" diff --git a/pkg/detectors/leadfeeder/leadfeeder.go b/pkg/detectors/leadfeeder/leadfeeder.go index 0b073b34c..b643a070d 100644 --- a/pkg/detectors/leadfeeder/leadfeeder.go +++ b/pkg/detectors/leadfeeder/leadfeeder.go @@ -3,8 +3,8 @@ package leadfeeder import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/lemlist/lemlist.go b/pkg/detectors/lemlist/lemlist.go index 37954f4df..d76a1b5ea 100644 --- a/pkg/detectors/lemlist/lemlist.go +++ b/pkg/detectors/lemlist/lemlist.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/lemonsqueezy/lemonsqueezy.go b/pkg/detectors/lemonsqueezy/lemonsqueezy.go index c6914ffa9..ee04f1ab3 100644 --- a/pkg/detectors/lemonsqueezy/lemonsqueezy.go +++ b/pkg/detectors/lemonsqueezy/lemonsqueezy.go @@ -3,8 +3,8 @@ package lemonsqueezy import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/lendflow/lendflow.go b/pkg/detectors/lendflow/lendflow.go index 9503f6eb6..c8777cc85 100644 --- a/pkg/detectors/lendflow/lendflow.go +++ b/pkg/detectors/lendflow/lendflow.go @@ -3,8 +3,8 @@ package lendflow import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/lessannoyingcrm/lessannoyingcrm.go b/pkg/detectors/lessannoyingcrm/lessannoyingcrm.go index 06ec4ff2e..f894acedc 100644 --- a/pkg/detectors/lessannoyingcrm/lessannoyingcrm.go +++ b/pkg/detectors/lessannoyingcrm/lessannoyingcrm.go @@ -3,8 +3,8 @@ package lessannoyingcrm import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/lexigram/lexigram.go b/pkg/detectors/lexigram/lexigram.go index b807ac8c5..1f4209ce8 100644 --- a/pkg/detectors/lexigram/lexigram.go +++ b/pkg/detectors/lexigram/lexigram.go @@ -3,8 +3,8 @@ package lexigram import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/linearapi/linearapi.go b/pkg/detectors/linearapi/linearapi.go index c441c9277..69d29747c 100644 --- a/pkg/detectors/linearapi/linearapi.go +++ b/pkg/detectors/linearapi/linearapi.go @@ -2,9 +2,9 @@ package linearapi import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/linemessaging/linemessaging.go b/pkg/detectors/linemessaging/linemessaging.go index 477d2b320..2f0ca3b6a 100644 --- a/pkg/detectors/linemessaging/linemessaging.go +++ b/pkg/detectors/linemessaging/linemessaging.go @@ -3,8 +3,8 @@ package linemessaging import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/linenotify/linenotify.go b/pkg/detectors/linenotify/linenotify.go index 74c42255a..4669865d7 100644 --- a/pkg/detectors/linenotify/linenotify.go +++ b/pkg/detectors/linenotify/linenotify.go @@ -3,8 +3,8 @@ package linenotify import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/linkpreview/linkpreview.go b/pkg/detectors/linkpreview/linkpreview.go index 9e8aeca43..66d00ac13 100644 --- a/pkg/detectors/linkpreview/linkpreview.go +++ b/pkg/detectors/linkpreview/linkpreview.go @@ -3,8 +3,8 @@ package linkpreview import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/liveagent/liveagent.go b/pkg/detectors/liveagent/liveagent.go index e12ca56a3..c81ad2d89 100644 --- a/pkg/detectors/liveagent/liveagent.go +++ b/pkg/detectors/liveagent/liveagent.go @@ -3,8 +3,8 @@ package liveagent import ( "context" "encoding/json" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/livestorm/livestorm.go b/pkg/detectors/livestorm/livestorm.go index c00e60233..f1767d03f 100644 --- a/pkg/detectors/livestorm/livestorm.go +++ b/pkg/detectors/livestorm/livestorm.go @@ -2,8 +2,8 @@ package livestorm import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/loadmill/loadmill.go b/pkg/detectors/loadmill/loadmill.go index 7052e3215..61ccc54d2 100644 --- a/pkg/detectors/loadmill/loadmill.go +++ b/pkg/detectors/loadmill/loadmill.go @@ -3,8 +3,8 @@ package loadmill import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/lob/lob.go b/pkg/detectors/lob/lob.go index a482c13ef..0a27c0e8b 100644 --- a/pkg/detectors/lob/lob.go +++ b/pkg/detectors/lob/lob.go @@ -2,8 +2,8 @@ package lob import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/locationiq/locationiq.go b/pkg/detectors/locationiq/locationiq.go index 918a1a426..750cd168e 100644 --- a/pkg/detectors/locationiq/locationiq.go +++ b/pkg/detectors/locationiq/locationiq.go @@ -2,8 +2,8 @@ package locationiq import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/loggly/loggly.go b/pkg/detectors/loggly/loggly.go index 3ef5bf012..453bc3aa2 100644 --- a/pkg/detectors/loggly/loggly.go +++ b/pkg/detectors/loggly/loggly.go @@ -3,8 +3,8 @@ package loggly import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/loginradius/loginradius.go b/pkg/detectors/loginradius/loginradius.go index e50b3b021..05c2f425e 100644 --- a/pkg/detectors/loginradius/loginradius.go +++ b/pkg/detectors/loginradius/loginradius.go @@ -2,8 +2,8 @@ package loginradius import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/logzio/logzio.go b/pkg/detectors/logzio/logzio.go index cc77dd4cf..1addc3b5e 100644 --- a/pkg/detectors/logzio/logzio.go +++ b/pkg/detectors/logzio/logzio.go @@ -3,8 +3,8 @@ package logzio import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/lokalisetoken/lokalisetoken.go b/pkg/detectors/lokalisetoken/lokalisetoken.go index 7b9ca3baa..b109e4059 100644 --- a/pkg/detectors/lokalisetoken/lokalisetoken.go +++ b/pkg/detectors/lokalisetoken/lokalisetoken.go @@ -2,8 +2,8 @@ package lokalisetoken import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/loyverse/loyverse.go b/pkg/detectors/loyverse/loyverse.go index 7654ffebb..4fa28b51e 100644 --- a/pkg/detectors/loyverse/loyverse.go +++ b/pkg/detectors/loyverse/loyverse.go @@ -3,8 +3,8 @@ package loyverse import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/lunchmoney/lunchmoney.go b/pkg/detectors/lunchmoney/lunchmoney.go index 778801793..98a53b291 100644 --- a/pkg/detectors/lunchmoney/lunchmoney.go +++ b/pkg/detectors/lunchmoney/lunchmoney.go @@ -3,8 +3,8 @@ package lunchmoney import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/luno/luno.go b/pkg/detectors/luno/luno.go index be80eb81b..d8af86bad 100644 --- a/pkg/detectors/luno/luno.go +++ b/pkg/detectors/luno/luno.go @@ -2,8 +2,8 @@ package luno import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/m3o/m3o.go b/pkg/detectors/m3o/m3o.go index 5c5c78f01..f55a65d81 100644 --- a/pkg/detectors/m3o/m3o.go +++ b/pkg/detectors/m3o/m3o.go @@ -3,8 +3,8 @@ package m3o import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/macaddress/macaddress.go b/pkg/detectors/macaddress/macaddress.go index 74d26b1dd..ba1b9f60b 100644 --- a/pkg/detectors/macaddress/macaddress.go +++ b/pkg/detectors/macaddress/macaddress.go @@ -3,8 +3,8 @@ package macaddress import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/madkudu/madkudu.go b/pkg/detectors/madkudu/madkudu.go index 1256ecd0b..b0f80424d 100644 --- a/pkg/detectors/madkudu/madkudu.go +++ b/pkg/detectors/madkudu/madkudu.go @@ -2,8 +2,8 @@ package madkudu import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/magicbell/magicbell.go b/pkg/detectors/magicbell/magicbell.go index 84d2666dc..730b59b27 100644 --- a/pkg/detectors/magicbell/magicbell.go +++ b/pkg/detectors/magicbell/magicbell.go @@ -2,8 +2,8 @@ package magicbell import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/magnetic/magnetic.go b/pkg/detectors/magnetic/magnetic.go index 40b7f21a5..aa2867c00 100644 --- a/pkg/detectors/magnetic/magnetic.go +++ b/pkg/detectors/magnetic/magnetic.go @@ -2,8 +2,8 @@ package magnetic import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/mailboxlayer/mailboxlayer.go b/pkg/detectors/mailboxlayer/mailboxlayer.go index c882dbaa8..57d1ea402 100644 --- a/pkg/detectors/mailboxlayer/mailboxlayer.go +++ b/pkg/detectors/mailboxlayer/mailboxlayer.go @@ -2,9 +2,9 @@ package mailboxlayer import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/mailchimp/mailchimp.go b/pkg/detectors/mailchimp/mailchimp.go index a206b070a..852062f17 100644 --- a/pkg/detectors/mailchimp/mailchimp.go +++ b/pkg/detectors/mailchimp/mailchimp.go @@ -3,8 +3,8 @@ package mailchimp import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" @@ -33,7 +33,7 @@ func (s Scanner) Keywords() []string { func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (results []detectors.Result, err error) { dataStr := string(data) - //pretty standard regex match + // pretty standard regex match matches := keyPat.FindAllString(dataStr, -1) for _, match := range matches { diff --git a/pkg/detectors/mailerlite/mailerlite.go b/pkg/detectors/mailerlite/mailerlite.go index 1e33df8e2..cac7e1428 100644 --- a/pkg/detectors/mailerlite/mailerlite.go +++ b/pkg/detectors/mailerlite/mailerlite.go @@ -2,8 +2,8 @@ package mailerlite import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/mailgun/mailgun.go b/pkg/detectors/mailgun/mailgun.go index dd9556617..7f129cd58 100644 --- a/pkg/detectors/mailgun/mailgun.go +++ b/pkg/detectors/mailgun/mailgun.go @@ -3,8 +3,8 @@ package mailgun import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" @@ -55,7 +55,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result if err != nil { continue } - + // If resMatch has "key" prefix, use it as the username for basic auth. if strings.HasPrefix(resMatch, "key-") { req.SetBasicAuth("api", resMatch) diff --git a/pkg/detectors/mailjetbasicauth/mailjetbasicauth.go b/pkg/detectors/mailjetbasicauth/mailjetbasicauth.go index 0030e5e63..6faabbb34 100644 --- a/pkg/detectors/mailjetbasicauth/mailjetbasicauth.go +++ b/pkg/detectors/mailjetbasicauth/mailjetbasicauth.go @@ -3,8 +3,8 @@ package mailjetbasicauth import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/mailjetsms/mailjetsms.go b/pkg/detectors/mailjetsms/mailjetsms.go index 43388ef9f..82bdc3c27 100644 --- a/pkg/detectors/mailjetsms/mailjetsms.go +++ b/pkg/detectors/mailjetsms/mailjetsms.go @@ -3,8 +3,8 @@ package mailjetsms import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/mailmodo/mailmodo.go b/pkg/detectors/mailmodo/mailmodo.go index 2c3b093cb..0fdf69feb 100644 --- a/pkg/detectors/mailmodo/mailmodo.go +++ b/pkg/detectors/mailmodo/mailmodo.go @@ -2,8 +2,8 @@ package mailmodo import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/mailsac/mailsac.go b/pkg/detectors/mailsac/mailsac.go index 5504ba8db..97ee69af6 100644 --- a/pkg/detectors/mailsac/mailsac.go +++ b/pkg/detectors/mailsac/mailsac.go @@ -2,8 +2,8 @@ package mailsac import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/mandrill/mandrill.go b/pkg/detectors/mandrill/mandrill.go index c1d928d8b..be0a496bf 100644 --- a/pkg/detectors/mandrill/mandrill.go +++ b/pkg/detectors/mandrill/mandrill.go @@ -3,8 +3,8 @@ package mandrill import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/manifest/manifest.go b/pkg/detectors/manifest/manifest.go index 9521dddb6..e74cbf3fc 100644 --- a/pkg/detectors/manifest/manifest.go +++ b/pkg/detectors/manifest/manifest.go @@ -2,8 +2,8 @@ package manifest import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/mapbox/mapbox.go b/pkg/detectors/mapbox/mapbox.go index 951de013e..bbeb059e8 100644 --- a/pkg/detectors/mapbox/mapbox.go +++ b/pkg/detectors/mapbox/mapbox.go @@ -3,8 +3,8 @@ package mapbox import ( "context" // "log" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/mapquest/mapquest.go b/pkg/detectors/mapquest/mapquest.go index 31f52b086..640896264 100644 --- a/pkg/detectors/mapquest/mapquest.go +++ b/pkg/detectors/mapquest/mapquest.go @@ -2,8 +2,8 @@ package mapquest import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/marketstack/marketstack.go b/pkg/detectors/marketstack/marketstack.go index 531d7594a..e3eb5ac76 100644 --- a/pkg/detectors/marketstack/marketstack.go +++ b/pkg/detectors/marketstack/marketstack.go @@ -3,8 +3,8 @@ package marketstack import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/mattermostpersonaltoken/mattermostpersonaltoken.go b/pkg/detectors/mattermostpersonaltoken/mattermostpersonaltoken.go index cc64e07fe..ca5c65ba2 100644 --- a/pkg/detectors/mattermostpersonaltoken/mattermostpersonaltoken.go +++ b/pkg/detectors/mattermostpersonaltoken/mattermostpersonaltoken.go @@ -3,8 +3,8 @@ package mattermostpersonaltoken import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/mavenlink/mavenlink.go b/pkg/detectors/mavenlink/mavenlink.go index 953b6041d..6897cc1de 100644 --- a/pkg/detectors/mavenlink/mavenlink.go +++ b/pkg/detectors/mavenlink/mavenlink.go @@ -3,8 +3,8 @@ package mavenlink import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/maxmindlicense/maxmindlicense.go b/pkg/detectors/maxmindlicense/maxmindlicense.go index 1e694e423..98b396bdd 100644 --- a/pkg/detectors/maxmindlicense/maxmindlicense.go +++ b/pkg/detectors/maxmindlicense/maxmindlicense.go @@ -2,8 +2,8 @@ package maxmindlicense import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/meaningcloud/meaningcloud.go b/pkg/detectors/meaningcloud/meaningcloud.go index a9eb84e4a..5d4eb584c 100644 --- a/pkg/detectors/meaningcloud/meaningcloud.go +++ b/pkg/detectors/meaningcloud/meaningcloud.go @@ -4,10 +4,10 @@ import ( "bytes" "context" "encoding/json" + regexp "github.com/wasilibs/go-re2" "io" "mime/multipart" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/mediastack/mediastack.go b/pkg/detectors/mediastack/mediastack.go index ab61cbc64..0cd9ab3cc 100644 --- a/pkg/detectors/mediastack/mediastack.go +++ b/pkg/detectors/mediastack/mediastack.go @@ -3,8 +3,8 @@ package mediastack import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/meistertask/meistertask.go b/pkg/detectors/meistertask/meistertask.go index 2a1b2b8d3..3219747b0 100644 --- a/pkg/detectors/meistertask/meistertask.go +++ b/pkg/detectors/meistertask/meistertask.go @@ -3,8 +3,8 @@ package meistertask import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/mesibo/mesibo.go b/pkg/detectors/mesibo/mesibo.go index 1edb719ae..81a5c9ae5 100644 --- a/pkg/detectors/mesibo/mesibo.go +++ b/pkg/detectors/mesibo/mesibo.go @@ -2,9 +2,9 @@ package mesibo import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" @@ -13,6 +13,7 @@ import ( ) type Scanner struct{} + // Ensure the Scanner satisfies the interface at compile time. var _ detectors.Detector = (*Scanner)(nil) diff --git a/pkg/detectors/messagebird/messagebird.go b/pkg/detectors/messagebird/messagebird.go index 73caffba8..56e42cc06 100644 --- a/pkg/detectors/messagebird/messagebird.go +++ b/pkg/detectors/messagebird/messagebird.go @@ -3,8 +3,8 @@ package messagebird import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/metaapi/metaapi.go b/pkg/detectors/metaapi/metaapi.go index a59e33106..e5ee72722 100644 --- a/pkg/detectors/metaapi/metaapi.go +++ b/pkg/detectors/metaapi/metaapi.go @@ -3,9 +3,9 @@ package metaapi import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/metabase/metabase.go b/pkg/detectors/metabase/metabase.go index 804ec978b..53f11c9f3 100644 --- a/pkg/detectors/metabase/metabase.go +++ b/pkg/detectors/metabase/metabase.go @@ -3,9 +3,9 @@ package metabase import ( "context" "encoding/json" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/metrilo/metrilo.go b/pkg/detectors/metrilo/metrilo.go index f3dfac537..a25a16875 100644 --- a/pkg/detectors/metrilo/metrilo.go +++ b/pkg/detectors/metrilo/metrilo.go @@ -2,8 +2,8 @@ package metrilo import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/microsoftteamswebhook/microsoftteamswebhook.go b/pkg/detectors/microsoftteamswebhook/microsoftteamswebhook.go index f5b9a0ece..cda30abda 100644 --- a/pkg/detectors/microsoftteamswebhook/microsoftteamswebhook.go +++ b/pkg/detectors/microsoftteamswebhook/microsoftteamswebhook.go @@ -3,9 +3,9 @@ package microsoftteamswebhook import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/mindmeister/mindmeister.go b/pkg/detectors/mindmeister/mindmeister.go index 3440b873c..28c5b8453 100644 --- a/pkg/detectors/mindmeister/mindmeister.go +++ b/pkg/detectors/mindmeister/mindmeister.go @@ -3,9 +3,9 @@ package mindmeister import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/miro/miro.go b/pkg/detectors/miro/miro.go index 451e9b84b..aad280cab 100644 --- a/pkg/detectors/miro/miro.go +++ b/pkg/detectors/miro/miro.go @@ -3,8 +3,8 @@ package miro import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/mite/mite.go b/pkg/detectors/mite/mite.go index 5fe3bf7b0..2a027b257 100644 --- a/pkg/detectors/mite/mite.go +++ b/pkg/detectors/mite/mite.go @@ -3,8 +3,8 @@ package mite import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/mixmax/mixmax.go b/pkg/detectors/mixmax/mixmax.go index 9bebb2a67..d2c733989 100644 --- a/pkg/detectors/mixmax/mixmax.go +++ b/pkg/detectors/mixmax/mixmax.go @@ -2,8 +2,8 @@ package mixmax import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/mixpanel/mixpanel.go b/pkg/detectors/mixpanel/mixpanel.go index 028ed97ce..a28c4c626 100644 --- a/pkg/detectors/mixpanel/mixpanel.go +++ b/pkg/detectors/mixpanel/mixpanel.go @@ -2,8 +2,8 @@ package mixpanel import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/mockaroo/mockaroo.go b/pkg/detectors/mockaroo/mockaroo.go index 0a5127415..7c18ace57 100644 --- a/pkg/detectors/mockaroo/mockaroo.go +++ b/pkg/detectors/mockaroo/mockaroo.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/moderation/moderation.go b/pkg/detectors/moderation/moderation.go index 288bd3688..1a54841f8 100644 --- a/pkg/detectors/moderation/moderation.go +++ b/pkg/detectors/moderation/moderation.go @@ -3,8 +3,8 @@ package moderation import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/monday/monday.go b/pkg/detectors/monday/monday.go index 9848e2bae..fe57e2c0f 100644 --- a/pkg/detectors/monday/monday.go +++ b/pkg/detectors/monday/monday.go @@ -2,8 +2,8 @@ package monday import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/mongodb/mongodb.go b/pkg/detectors/mongodb/mongodb.go index 346db1998..cc989ec9f 100644 --- a/pkg/detectors/mongodb/mongodb.go +++ b/pkg/detectors/mongodb/mongodb.go @@ -2,7 +2,7 @@ package mongodb import ( "context" - "regexp" + regexp "github.com/wasilibs/go-re2" "strings" "time" diff --git a/pkg/detectors/monkeylearn/monkeylearn.go b/pkg/detectors/monkeylearn/monkeylearn.go index 3c54537fb..4a1c52f73 100644 --- a/pkg/detectors/monkeylearn/monkeylearn.go +++ b/pkg/detectors/monkeylearn/monkeylearn.go @@ -3,8 +3,8 @@ package monkeylearn import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/moonclerk/moonclerk.go b/pkg/detectors/moonclerk/moonclerk.go index ff721cbe1..e04384d66 100644 --- a/pkg/detectors/moonclerk/moonclerk.go +++ b/pkg/detectors/moonclerk/moonclerk.go @@ -2,8 +2,8 @@ package moonclerk import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/moosend/moosend.go b/pkg/detectors/moosend/moosend.go index 4cdf7ce1a..8ac552832 100644 --- a/pkg/detectors/moosend/moosend.go +++ b/pkg/detectors/moosend/moosend.go @@ -2,9 +2,9 @@ package moosend import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/moralis/moralis.go b/pkg/detectors/moralis/moralis.go index cf70f73ae..5c6c2d176 100644 --- a/pkg/detectors/moralis/moralis.go +++ b/pkg/detectors/moralis/moralis.go @@ -2,8 +2,8 @@ package moralis import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/mrticktock/mrticktock.go b/pkg/detectors/mrticktock/mrticktock.go index 5b226b04f..75edeb164 100644 --- a/pkg/detectors/mrticktock/mrticktock.go +++ b/pkg/detectors/mrticktock/mrticktock.go @@ -3,9 +3,9 @@ package mrticktock import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/mux/mux.go b/pkg/detectors/mux/mux.go index 7fcb6a4db..98c5159fa 100644 --- a/pkg/detectors/mux/mux.go +++ b/pkg/detectors/mux/mux.go @@ -2,8 +2,8 @@ package mux import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/myfreshworks/myfreshworks.go b/pkg/detectors/myfreshworks/myfreshworks.go index ee6a08d85..db93da3aa 100644 --- a/pkg/detectors/myfreshworks/myfreshworks.go +++ b/pkg/detectors/myfreshworks/myfreshworks.go @@ -4,9 +4,9 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/myintervals/myintervals.go b/pkg/detectors/myintervals/myintervals.go index 9486811d3..00c6dec4c 100644 --- a/pkg/detectors/myintervals/myintervals.go +++ b/pkg/detectors/myintervals/myintervals.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/nasdaqdatalink/nasdaqdatalink.go b/pkg/detectors/nasdaqdatalink/nasdaqdatalink.go index 18a29d13f..db1fdc828 100644 --- a/pkg/detectors/nasdaqdatalink/nasdaqdatalink.go +++ b/pkg/detectors/nasdaqdatalink/nasdaqdatalink.go @@ -3,8 +3,8 @@ package nasdaqdatalink import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/nethunt/nethunt.go b/pkg/detectors/nethunt/nethunt.go index a91abb4e7..ff23d922e 100644 --- a/pkg/detectors/nethunt/nethunt.go +++ b/pkg/detectors/nethunt/nethunt.go @@ -2,8 +2,8 @@ package nethunt import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/netlify/netlify.go b/pkg/detectors/netlify/netlify.go index a0c75a465..b6ad55f4a 100644 --- a/pkg/detectors/netlify/netlify.go +++ b/pkg/detectors/netlify/netlify.go @@ -3,8 +3,8 @@ package netlify import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/neutrinoapi/neutrinoapi.go b/pkg/detectors/neutrinoapi/neutrinoapi.go index c4bbf5eee..1ddf6f001 100644 --- a/pkg/detectors/neutrinoapi/neutrinoapi.go +++ b/pkg/detectors/neutrinoapi/neutrinoapi.go @@ -4,10 +4,10 @@ import ( "bytes" "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "mime/multipart" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/newrelicpersonalapikey/newrelicpersonalapikey.go b/pkg/detectors/newrelicpersonalapikey/newrelicpersonalapikey.go index 2f954faa6..a024d2d95 100644 --- a/pkg/detectors/newrelicpersonalapikey/newrelicpersonalapikey.go +++ b/pkg/detectors/newrelicpersonalapikey/newrelicpersonalapikey.go @@ -2,8 +2,8 @@ package newrelicpersonalapikey import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" @@ -54,7 +54,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result } req.Header.Add("X-Api-Key", resMatch) reqEU.Header.Add("X-Api-Key", resMatch) - + res, err := client.Do(req) resEU, errEU := client.Do(reqEU) diff --git a/pkg/detectors/newsapi/newsapi.go b/pkg/detectors/newsapi/newsapi.go index 99fada386..e344e34a1 100644 --- a/pkg/detectors/newsapi/newsapi.go +++ b/pkg/detectors/newsapi/newsapi.go @@ -2,8 +2,8 @@ package newsapi import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/newscatcher/newscatcher.go b/pkg/detectors/newscatcher/newscatcher.go index bfd1bca4f..8d0f49b6d 100644 --- a/pkg/detectors/newscatcher/newscatcher.go +++ b/pkg/detectors/newscatcher/newscatcher.go @@ -2,8 +2,8 @@ package newscatcher import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/nexmoapikey/nexmoapikey.go b/pkg/detectors/nexmoapikey/nexmoapikey.go index 892ae6651..3012be318 100644 --- a/pkg/detectors/nexmoapikey/nexmoapikey.go +++ b/pkg/detectors/nexmoapikey/nexmoapikey.go @@ -2,8 +2,8 @@ package nexmoapikey import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/nftport/nftport.go b/pkg/detectors/nftport/nftport.go index 6bc019268..3241d11a2 100644 --- a/pkg/detectors/nftport/nftport.go +++ b/pkg/detectors/nftport/nftport.go @@ -2,8 +2,8 @@ package nftport import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/ngc/ngc.go b/pkg/detectors/ngc/ngc.go index 6d7c273a1..ffd4bd3ec 100644 --- a/pkg/detectors/ngc/ngc.go +++ b/pkg/detectors/ngc/ngc.go @@ -3,8 +3,8 @@ package ngc import ( "context" "encoding/base64" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/ngrok/ngrok.go b/pkg/detectors/ngrok/ngrok.go index 5cd3941d3..52523ce6a 100644 --- a/pkg/detectors/ngrok/ngrok.go +++ b/pkg/detectors/ngrok/ngrok.go @@ -3,8 +3,8 @@ package ngrok import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/nicereply/nicereply.go b/pkg/detectors/nicereply/nicereply.go index 6d9865507..aa8de838e 100644 --- a/pkg/detectors/nicereply/nicereply.go +++ b/pkg/detectors/nicereply/nicereply.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/nightfall/nightfall.go b/pkg/detectors/nightfall/nightfall.go index ab7a853bf..105eed1fd 100644 --- a/pkg/detectors/nightfall/nightfall.go +++ b/pkg/detectors/nightfall/nightfall.go @@ -3,8 +3,8 @@ package nightfall import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/nimble/nimble.go b/pkg/detectors/nimble/nimble.go index 5e2eff731..6f3fc1a0b 100644 --- a/pkg/detectors/nimble/nimble.go +++ b/pkg/detectors/nimble/nimble.go @@ -3,8 +3,8 @@ package nimble import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/nitro/nitro.go b/pkg/detectors/nitro/nitro.go index d5b6ea07f..45636cd54 100644 --- a/pkg/detectors/nitro/nitro.go +++ b/pkg/detectors/nitro/nitro.go @@ -2,8 +2,8 @@ package nitro import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/noticeable/noticeable.go b/pkg/detectors/noticeable/noticeable.go index 63858d741..13331ab12 100644 --- a/pkg/detectors/noticeable/noticeable.go +++ b/pkg/detectors/noticeable/noticeable.go @@ -3,8 +3,8 @@ package noticeable import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/notion/notion.go b/pkg/detectors/notion/notion.go index 2496c55ac..2d599f50f 100644 --- a/pkg/detectors/notion/notion.go +++ b/pkg/detectors/notion/notion.go @@ -3,8 +3,8 @@ package notion import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/nozbeteams/nozbeteams.go b/pkg/detectors/nozbeteams/nozbeteams.go index 9b1d54029..d2e230ba9 100644 --- a/pkg/detectors/nozbeteams/nozbeteams.go +++ b/pkg/detectors/nozbeteams/nozbeteams.go @@ -2,8 +2,8 @@ package nozbeteams import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/npmtoken/npmtoken.go b/pkg/detectors/npmtoken/npmtoken.go index 2a624045f..06b5fb709 100644 --- a/pkg/detectors/npmtoken/npmtoken.go +++ b/pkg/detectors/npmtoken/npmtoken.go @@ -3,8 +3,8 @@ package npmtoken import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/npmtokenv2/npmtokenv2.go b/pkg/detectors/npmtokenv2/npmtokenv2.go index 56b2ef036..e7eda9b96 100644 --- a/pkg/detectors/npmtokenv2/npmtokenv2.go +++ b/pkg/detectors/npmtokenv2/npmtokenv2.go @@ -3,8 +3,8 @@ package npmtokenv2 import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "github.com/trufflesecurity/trufflehog/v3/pkg/common" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" diff --git a/pkg/detectors/nugetapikey/nugetapikey.go b/pkg/detectors/nugetapikey/nugetapikey.go index e598b0db4..f7d071063 100644 --- a/pkg/detectors/nugetapikey/nugetapikey.go +++ b/pkg/detectors/nugetapikey/nugetapikey.go @@ -2,8 +2,8 @@ package nugetapikey import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" @@ -56,7 +56,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result res, err := client.Do(req) if err == nil { defer res.Body.Close() - // we can either match on response code "400" or "Bad Request" response + // we can either match on response code "400" or "Bad Request" response if res.StatusCode == 400 { s1.Verified = true } else { diff --git a/pkg/detectors/numverify/numverify.go b/pkg/detectors/numverify/numverify.go index 2eb1f3319..cb13b7093 100644 --- a/pkg/detectors/numverify/numverify.go +++ b/pkg/detectors/numverify/numverify.go @@ -3,9 +3,9 @@ package numverify import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/nutritionix/nutritionix.go b/pkg/detectors/nutritionix/nutritionix.go index 0c3a9c772..9e038353d 100644 --- a/pkg/detectors/nutritionix/nutritionix.go +++ b/pkg/detectors/nutritionix/nutritionix.go @@ -2,8 +2,8 @@ package nutritionix import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/nylas/nylas.go b/pkg/detectors/nylas/nylas.go index ec564b446..323eef573 100644 --- a/pkg/detectors/nylas/nylas.go +++ b/pkg/detectors/nylas/nylas.go @@ -3,8 +3,8 @@ package nylas import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/nytimes/nytimes.go b/pkg/detectors/nytimes/nytimes.go index e992ce304..b0398bc94 100644 --- a/pkg/detectors/nytimes/nytimes.go +++ b/pkg/detectors/nytimes/nytimes.go @@ -2,8 +2,8 @@ package nytimes import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/oanda/oanda.go b/pkg/detectors/oanda/oanda.go index 051208189..c2f47a582 100644 --- a/pkg/detectors/oanda/oanda.go +++ b/pkg/detectors/oanda/oanda.go @@ -3,8 +3,8 @@ package oanda import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/okta/okta.go b/pkg/detectors/okta/okta.go index 074acbbaf..e9a7212a9 100644 --- a/pkg/detectors/okta/okta.go +++ b/pkg/detectors/okta/okta.go @@ -3,9 +3,9 @@ package okta import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/omnisend/omnisend.go b/pkg/detectors/omnisend/omnisend.go index 7bd2dcf80..8654d5523 100644 --- a/pkg/detectors/omnisend/omnisend.go +++ b/pkg/detectors/omnisend/omnisend.go @@ -2,8 +2,8 @@ package omnisend import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/onedesk/onedesk.go b/pkg/detectors/onedesk/onedesk.go index 92ab30387..4c71b6132 100644 --- a/pkg/detectors/onedesk/onedesk.go +++ b/pkg/detectors/onedesk/onedesk.go @@ -3,9 +3,9 @@ package onedesk import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/onelogin/onelogin.go b/pkg/detectors/onelogin/onelogin.go index 0212a0681..f280a0481 100644 --- a/pkg/detectors/onelogin/onelogin.go +++ b/pkg/detectors/onelogin/onelogin.go @@ -3,8 +3,8 @@ package onelogin import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/onepagecrm/onepagecrm.go b/pkg/detectors/onepagecrm/onepagecrm.go index 61f57f097..ee3df783e 100644 --- a/pkg/detectors/onepagecrm/onepagecrm.go +++ b/pkg/detectors/onepagecrm/onepagecrm.go @@ -2,8 +2,8 @@ package onepagecrm import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/onesignal/onesignal.go b/pkg/detectors/onesignal/onesignal.go index d9ebefa66..259558167 100644 --- a/pkg/detectors/onesignal/onesignal.go +++ b/pkg/detectors/onesignal/onesignal.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/onwaterio/onwaterio.go b/pkg/detectors/onwaterio/onwaterio.go index 53182c184..2c12fa389 100644 --- a/pkg/detectors/onwaterio/onwaterio.go +++ b/pkg/detectors/onwaterio/onwaterio.go @@ -3,8 +3,8 @@ package onwaterio import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/oopspam/oopspam.go b/pkg/detectors/oopspam/oopspam.go index 3cbf45060..b3bebe57e 100644 --- a/pkg/detectors/oopspam/oopspam.go +++ b/pkg/detectors/oopspam/oopspam.go @@ -2,8 +2,8 @@ package oopspam import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/openai/openai.go b/pkg/detectors/openai/openai.go index c658f6f84..7b28b05b6 100644 --- a/pkg/detectors/openai/openai.go +++ b/pkg/detectors/openai/openai.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strconv" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" diff --git a/pkg/detectors/opencagedata/opencagedata.go b/pkg/detectors/opencagedata/opencagedata.go index 763189149..110886d93 100644 --- a/pkg/detectors/opencagedata/opencagedata.go +++ b/pkg/detectors/opencagedata/opencagedata.go @@ -3,8 +3,8 @@ package opencagedata import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/opengraphr/opengraphr.go b/pkg/detectors/opengraphr/opengraphr.go index fabd0b8a8..227a7af0c 100644 --- a/pkg/detectors/opengraphr/opengraphr.go +++ b/pkg/detectors/opengraphr/opengraphr.go @@ -2,8 +2,8 @@ package opengraphr import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/openuv/openuv.go b/pkg/detectors/openuv/openuv.go index 02981b0a3..1d0a0b512 100644 --- a/pkg/detectors/openuv/openuv.go +++ b/pkg/detectors/openuv/openuv.go @@ -2,8 +2,8 @@ package openuv import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/openvpn/openvpn.go b/pkg/detectors/openvpn/openvpn.go index ecb602af2..1bec5b2ff 100644 --- a/pkg/detectors/openvpn/openvpn.go +++ b/pkg/detectors/openvpn/openvpn.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/openweather/openweather.go b/pkg/detectors/openweather/openweather.go index 172e0eac0..34d82de4c 100644 --- a/pkg/detectors/openweather/openweather.go +++ b/pkg/detectors/openweather/openweather.go @@ -2,8 +2,8 @@ package openweather import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/opsgenie/opsgenie.go b/pkg/detectors/opsgenie/opsgenie.go index 2911a5357..527d15335 100644 --- a/pkg/detectors/opsgenie/opsgenie.go +++ b/pkg/detectors/opsgenie/opsgenie.go @@ -3,8 +3,8 @@ package opsgenie import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/optimizely/optimizely.go b/pkg/detectors/optimizely/optimizely.go index f5abf131b..7601db444 100644 --- a/pkg/detectors/optimizely/optimizely.go +++ b/pkg/detectors/optimizely/optimizely.go @@ -3,8 +3,8 @@ package optimizely import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/overloop/overloop.go b/pkg/detectors/overloop/overloop.go index e7b82a2c6..fcb583dca 100644 --- a/pkg/detectors/overloop/overloop.go +++ b/pkg/detectors/overloop/overloop.go @@ -3,8 +3,8 @@ package overloop import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/owlbot/owlbot.go b/pkg/detectors/owlbot/owlbot.go index d6cad3e84..abba80bba 100644 --- a/pkg/detectors/owlbot/owlbot.go +++ b/pkg/detectors/owlbot/owlbot.go @@ -3,8 +3,8 @@ package owlbot import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/packagecloud/packagecloud.go b/pkg/detectors/packagecloud/packagecloud.go index d5f1b496a..a03e27ccf 100644 --- a/pkg/detectors/packagecloud/packagecloud.go +++ b/pkg/detectors/packagecloud/packagecloud.go @@ -2,8 +2,8 @@ package packagecloud import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/pagerdutyapikey/pagerdutyapikey.go b/pkg/detectors/pagerdutyapikey/pagerdutyapikey.go index 2b5c2b709..7b0c7b5ce 100644 --- a/pkg/detectors/pagerdutyapikey/pagerdutyapikey.go +++ b/pkg/detectors/pagerdutyapikey/pagerdutyapikey.go @@ -3,8 +3,8 @@ package pagerdutyapikey import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/pandadoc/pandadoc.go b/pkg/detectors/pandadoc/pandadoc.go index 06ca1c7f9..ef8b1ff21 100644 --- a/pkg/detectors/pandadoc/pandadoc.go +++ b/pkg/detectors/pandadoc/pandadoc.go @@ -3,8 +3,8 @@ package pandadoc import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/pandascore/pandascore.go b/pkg/detectors/pandascore/pandascore.go index d9eec6a7a..03e36f7cd 100644 --- a/pkg/detectors/pandascore/pandascore.go +++ b/pkg/detectors/pandascore/pandascore.go @@ -3,8 +3,8 @@ package pandascore import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/paperform/paperform.go b/pkg/detectors/paperform/paperform.go index 2bf4fc5da..558d14459 100644 --- a/pkg/detectors/paperform/paperform.go +++ b/pkg/detectors/paperform/paperform.go @@ -3,8 +3,8 @@ package paperform import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/paralleldots/paralleldots.go b/pkg/detectors/paralleldots/paralleldots.go index 74e79626b..c0e5cd17d 100644 --- a/pkg/detectors/paralleldots/paralleldots.go +++ b/pkg/detectors/paralleldots/paralleldots.go @@ -3,10 +3,10 @@ package paralleldots import ( "bytes" "context" + regexp "github.com/wasilibs/go-re2" "io" "mime/multipart" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/parsehub/parsehub.go b/pkg/detectors/parsehub/parsehub.go index e82ec148f..886497fd7 100644 --- a/pkg/detectors/parsehub/parsehub.go +++ b/pkg/detectors/parsehub/parsehub.go @@ -3,8 +3,8 @@ package parsehub import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/parsers/parsers.go b/pkg/detectors/parsers/parsers.go index 9d890a8be..2885610e6 100644 --- a/pkg/detectors/parsers/parsers.go +++ b/pkg/detectors/parsers/parsers.go @@ -2,8 +2,8 @@ package parsers import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/parseur/parseur.go b/pkg/detectors/parseur/parseur.go index 5f389edae..206cc5617 100644 --- a/pkg/detectors/parseur/parseur.go +++ b/pkg/detectors/parseur/parseur.go @@ -3,8 +3,8 @@ package parseur import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/partnerstack/partnerstack.go b/pkg/detectors/partnerstack/partnerstack.go index ba84258a9..6d15c8850 100644 --- a/pkg/detectors/partnerstack/partnerstack.go +++ b/pkg/detectors/partnerstack/partnerstack.go @@ -3,8 +3,8 @@ package partnerstack import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/pastebin/pastebin.go b/pkg/detectors/pastebin/pastebin.go index 2911c8719..70723d807 100644 --- a/pkg/detectors/pastebin/pastebin.go +++ b/pkg/detectors/pastebin/pastebin.go @@ -3,10 +3,10 @@ package pastebin import ( "bytes" "context" + regexp "github.com/wasilibs/go-re2" "io" "mime/multipart" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/paydirtapp/paydirtapp.go b/pkg/detectors/paydirtapp/paydirtapp.go index 361054591..ade5e315a 100644 --- a/pkg/detectors/paydirtapp/paydirtapp.go +++ b/pkg/detectors/paydirtapp/paydirtapp.go @@ -2,8 +2,8 @@ package paydirtapp import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/paymoapp/paymoapp.go b/pkg/detectors/paymoapp/paymoapp.go index 28ba45d9e..b59397ae9 100644 --- a/pkg/detectors/paymoapp/paymoapp.go +++ b/pkg/detectors/paymoapp/paymoapp.go @@ -3,8 +3,8 @@ package paymoapp import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/paymongo/paymongo.go b/pkg/detectors/paymongo/paymongo.go index 5d5d4fd12..f3c54f806 100644 --- a/pkg/detectors/paymongo/paymongo.go +++ b/pkg/detectors/paymongo/paymongo.go @@ -2,8 +2,8 @@ package paymongo import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/paypaloauth/paypaloauth.go b/pkg/detectors/paypaloauth/paypaloauth.go index 774d4fba0..1a9c58bf5 100644 --- a/pkg/detectors/paypaloauth/paypaloauth.go +++ b/pkg/detectors/paypaloauth/paypaloauth.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/paystack/paystack.go b/pkg/detectors/paystack/paystack.go index 0f338b4bd..c470093a9 100644 --- a/pkg/detectors/paystack/paystack.go +++ b/pkg/detectors/paystack/paystack.go @@ -3,8 +3,8 @@ package paystack import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/pdflayer/pdflayer.go b/pkg/detectors/pdflayer/pdflayer.go index e82fc0c35..3caf35c36 100644 --- a/pkg/detectors/pdflayer/pdflayer.go +++ b/pkg/detectors/pdflayer/pdflayer.go @@ -3,9 +3,9 @@ package pdflayer import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/pdfshift/pdfshift.go b/pkg/detectors/pdfshift/pdfshift.go index 902a36b00..218c5d764 100644 --- a/pkg/detectors/pdfshift/pdfshift.go +++ b/pkg/detectors/pdfshift/pdfshift.go @@ -2,8 +2,8 @@ package pdfshift import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/peopledatalabs/peopledatalabs.go b/pkg/detectors/peopledatalabs/peopledatalabs.go index b5153dc0c..6b8bf1a6f 100644 --- a/pkg/detectors/peopledatalabs/peopledatalabs.go +++ b/pkg/detectors/peopledatalabs/peopledatalabs.go @@ -2,8 +2,8 @@ package peopledatalabs import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/pepipost/pepipost.go b/pkg/detectors/pepipost/pepipost.go index b7b7983fb..3ecc2caa0 100644 --- a/pkg/detectors/pepipost/pepipost.go +++ b/pkg/detectors/pepipost/pepipost.go @@ -2,8 +2,8 @@ package pepipost import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/percy/percy.go b/pkg/detectors/percy/percy.go index 748f31c65..5c5c26a5d 100644 --- a/pkg/detectors/percy/percy.go +++ b/pkg/detectors/percy/percy.go @@ -3,8 +3,8 @@ package percy import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/pinata/pinata.go b/pkg/detectors/pinata/pinata.go index de457d452..f67c4924c 100644 --- a/pkg/detectors/pinata/pinata.go +++ b/pkg/detectors/pinata/pinata.go @@ -2,8 +2,8 @@ package pinata import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/pipedream/pipedream.go b/pkg/detectors/pipedream/pipedream.go index 19a469fef..f299366d0 100644 --- a/pkg/detectors/pipedream/pipedream.go +++ b/pkg/detectors/pipedream/pipedream.go @@ -3,8 +3,8 @@ package pipedream import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/pipedrive/pipedrive.go b/pkg/detectors/pipedrive/pipedrive.go index 878f7791c..d78f66f4f 100644 --- a/pkg/detectors/pipedrive/pipedrive.go +++ b/pkg/detectors/pipedrive/pipedrive.go @@ -3,8 +3,8 @@ package pipedrive import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/pivotaltracker/pivotaltracker.go b/pkg/detectors/pivotaltracker/pivotaltracker.go index 970e9d04f..efe177d66 100644 --- a/pkg/detectors/pivotaltracker/pivotaltracker.go +++ b/pkg/detectors/pivotaltracker/pivotaltracker.go @@ -2,8 +2,8 @@ package pivotaltracker import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "github.com/trufflesecurity/trufflehog/v3/pkg/common" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" diff --git a/pkg/detectors/pixabay/pixabay.go b/pkg/detectors/pixabay/pixabay.go index 297cbde81..df7c38a59 100644 --- a/pkg/detectors/pixabay/pixabay.go +++ b/pkg/detectors/pixabay/pixabay.go @@ -3,8 +3,8 @@ package pixabay import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/plaidkey/plaidkey.go b/pkg/detectors/plaidkey/plaidkey.go index e969b7992..1158145fc 100644 --- a/pkg/detectors/plaidkey/plaidkey.go +++ b/pkg/detectors/plaidkey/plaidkey.go @@ -3,8 +3,8 @@ package plaidkey import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/planetscale/planetscale.go b/pkg/detectors/planetscale/planetscale.go index 9de06a114..0fa0184a4 100644 --- a/pkg/detectors/planetscale/planetscale.go +++ b/pkg/detectors/planetscale/planetscale.go @@ -3,8 +3,8 @@ package planetscale import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "github.com/trufflesecurity/trufflehog/v3/pkg/common" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" diff --git a/pkg/detectors/planetscaledb/planetscaledb.go b/pkg/detectors/planetscaledb/planetscaledb.go index 57b86828a..648ab9f4f 100644 --- a/pkg/detectors/planetscaledb/planetscaledb.go +++ b/pkg/detectors/planetscaledb/planetscaledb.go @@ -3,7 +3,7 @@ package planetscaledb import ( "context" "database/sql" - "regexp" + regexp "github.com/wasilibs/go-re2" "strings" "github.com/go-sql-driver/mysql" diff --git a/pkg/detectors/planviewleankit/planviewleankit.go b/pkg/detectors/planviewleankit/planviewleankit.go index 4901a342a..82b52b871 100644 --- a/pkg/detectors/planviewleankit/planviewleankit.go +++ b/pkg/detectors/planviewleankit/planviewleankit.go @@ -3,8 +3,8 @@ package planviewleankit import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/planyo/planyo.go b/pkg/detectors/planyo/planyo.go index 6eba2c098..447a0c132 100644 --- a/pkg/detectors/planyo/planyo.go +++ b/pkg/detectors/planyo/planyo.go @@ -3,9 +3,9 @@ package planyo import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/plivo/plivo.go b/pkg/detectors/plivo/plivo.go index d04a996a7..827a5129e 100644 --- a/pkg/detectors/plivo/plivo.go +++ b/pkg/detectors/plivo/plivo.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/podio/podio.go b/pkg/detectors/podio/podio.go index d66baa8ec..2225f47ac 100644 --- a/pkg/detectors/podio/podio.go +++ b/pkg/detectors/podio/podio.go @@ -3,8 +3,8 @@ package podio import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/pollsapi/pollsapi.go b/pkg/detectors/pollsapi/pollsapi.go index f2d28e616..3152f3332 100644 --- a/pkg/detectors/pollsapi/pollsapi.go +++ b/pkg/detectors/pollsapi/pollsapi.go @@ -2,8 +2,8 @@ package pollsapi import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/poloniex/poloniex.go b/pkg/detectors/poloniex/poloniex.go index bf4358e11..f79d706e3 100644 --- a/pkg/detectors/poloniex/poloniex.go +++ b/pkg/detectors/poloniex/poloniex.go @@ -5,9 +5,9 @@ import ( "crypto/hmac" "crypto/sha512" "encoding/hex" + regexp "github.com/wasilibs/go-re2" "net/http" "net/url" - "regexp" "strconv" "strings" "time" diff --git a/pkg/detectors/polygon/polygon.go b/pkg/detectors/polygon/polygon.go index 5f439f370..670a9440c 100644 --- a/pkg/detectors/polygon/polygon.go +++ b/pkg/detectors/polygon/polygon.go @@ -2,8 +2,8 @@ package polygon import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/portainer/portainer.go b/pkg/detectors/portainer/portainer.go index ec769fe14..6cf41f46a 100644 --- a/pkg/detectors/portainer/portainer.go +++ b/pkg/detectors/portainer/portainer.go @@ -3,8 +3,8 @@ package portainer import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/portainertoken/portainertoken.go b/pkg/detectors/portainertoken/portainertoken.go index c2f8e7402..74edd57e9 100644 --- a/pkg/detectors/portainertoken/portainertoken.go +++ b/pkg/detectors/portainertoken/portainertoken.go @@ -3,8 +3,8 @@ package portainertoken import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/positionstack/positionstack.go b/pkg/detectors/positionstack/positionstack.go index 628a86a65..4e7c79425 100644 --- a/pkg/detectors/positionstack/positionstack.go +++ b/pkg/detectors/positionstack/positionstack.go @@ -3,8 +3,8 @@ package positionstack import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/postageapp/postageapp.go b/pkg/detectors/postageapp/postageapp.go index f47eb2bf1..af37f42d0 100644 --- a/pkg/detectors/postageapp/postageapp.go +++ b/pkg/detectors/postageapp/postageapp.go @@ -2,8 +2,8 @@ package postageapp import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/postbacks/postbacks.go b/pkg/detectors/postbacks/postbacks.go index e25a53c80..dff601eb4 100644 --- a/pkg/detectors/postbacks/postbacks.go +++ b/pkg/detectors/postbacks/postbacks.go @@ -2,8 +2,8 @@ package postbacks import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/postgres/postgres.go b/pkg/detectors/postgres/postgres.go index 183b37d4c..235e2e4dd 100644 --- a/pkg/detectors/postgres/postgres.go +++ b/pkg/detectors/postgres/postgres.go @@ -6,12 +6,13 @@ import ( "errors" "fmt" "net" - "regexp" "strconv" "strings" "time" "github.com/lib/pq" + regexp "github.com/wasilibs/go-re2" + "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" "github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb" ) diff --git a/pkg/detectors/posthog/posthog.go b/pkg/detectors/posthog/posthog.go index 853321d6a..0ca7970d0 100644 --- a/pkg/detectors/posthog/posthog.go +++ b/pkg/detectors/posthog/posthog.go @@ -2,8 +2,8 @@ package posthog import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" @@ -62,7 +62,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result if res.StatusCode >= 200 && res.StatusCode < 300 { s1.Verified = true } else if res.StatusCode == 401 { - //Try EU Endpoint only if other one fails. + // Try EU Endpoint only if other one fails. res, err := client.Do(reqEU) if err == nil { defer res.Body.Close() diff --git a/pkg/detectors/postman/postman.go b/pkg/detectors/postman/postman.go index 79276ff9e..068458259 100644 --- a/pkg/detectors/postman/postman.go +++ b/pkg/detectors/postman/postman.go @@ -3,8 +3,8 @@ package postman import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/postmark/postmark.go b/pkg/detectors/postmark/postmark.go index 16b64224f..82a0c0c5e 100644 --- a/pkg/detectors/postmark/postmark.go +++ b/pkg/detectors/postmark/postmark.go @@ -2,8 +2,8 @@ package postmark import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/powrbot/powrbot.go b/pkg/detectors/powrbot/powrbot.go index f4f90ec1b..fcc713cab 100644 --- a/pkg/detectors/powrbot/powrbot.go +++ b/pkg/detectors/powrbot/powrbot.go @@ -3,8 +3,8 @@ package powrbot import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/prefect/prefect.go b/pkg/detectors/prefect/prefect.go index cd7eaad91..6e8f099b6 100644 --- a/pkg/detectors/prefect/prefect.go +++ b/pkg/detectors/prefect/prefect.go @@ -3,8 +3,8 @@ package prefect import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/privacy/privacy.go b/pkg/detectors/privacy/privacy.go index 38df12247..0818e9544 100644 --- a/pkg/detectors/privacy/privacy.go +++ b/pkg/detectors/privacy/privacy.go @@ -3,8 +3,8 @@ package privacy import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/privatekey/privatekey.go b/pkg/detectors/privatekey/privatekey.go index cf7b3b213..dce627cdc 100644 --- a/pkg/detectors/privatekey/privatekey.go +++ b/pkg/detectors/privatekey/privatekey.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "sync" "time" diff --git a/pkg/detectors/prodpad/prodpad.go b/pkg/detectors/prodpad/prodpad.go index eaa10d1e4..72768713b 100644 --- a/pkg/detectors/prodpad/prodpad.go +++ b/pkg/detectors/prodpad/prodpad.go @@ -3,8 +3,8 @@ package prodpad import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/prospectcrm/prospectcrm.go b/pkg/detectors/prospectcrm/prospectcrm.go index 46245f5e5..fd86a61f3 100644 --- a/pkg/detectors/prospectcrm/prospectcrm.go +++ b/pkg/detectors/prospectcrm/prospectcrm.go @@ -3,8 +3,8 @@ package prospectcrm import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/protocolsio/protocolsio.go b/pkg/detectors/protocolsio/protocolsio.go index 60ebe2857..590770e96 100644 --- a/pkg/detectors/protocolsio/protocolsio.go +++ b/pkg/detectors/protocolsio/protocolsio.go @@ -3,8 +3,8 @@ package protocolsio import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/proxycrawl/proxycrawl.go b/pkg/detectors/proxycrawl/proxycrawl.go index 9cd7b522c..30ab7d8ac 100644 --- a/pkg/detectors/proxycrawl/proxycrawl.go +++ b/pkg/detectors/proxycrawl/proxycrawl.go @@ -3,8 +3,8 @@ package proxycrawl import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/pubnubpublishkey/pubnubpublishkey.go b/pkg/detectors/pubnubpublishkey/pubnubpublishkey.go index 99a16acd0..a672dc132 100644 --- a/pkg/detectors/pubnubpublishkey/pubnubpublishkey.go +++ b/pkg/detectors/pubnubpublishkey/pubnubpublishkey.go @@ -3,8 +3,8 @@ package pubnubpublishkey import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/pubnubsubscriptionkey/pubnubsubscriptionkey.go b/pkg/detectors/pubnubsubscriptionkey/pubnubsubscriptionkey.go index 2229bb524..72f80ff73 100644 --- a/pkg/detectors/pubnubsubscriptionkey/pubnubsubscriptionkey.go +++ b/pkg/detectors/pubnubsubscriptionkey/pubnubsubscriptionkey.go @@ -2,8 +2,8 @@ package pubnubsubscriptionkey import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/pulumi/pulumi.go b/pkg/detectors/pulumi/pulumi.go index ce098fb2b..ebaa574fc 100644 --- a/pkg/detectors/pulumi/pulumi.go +++ b/pkg/detectors/pulumi/pulumi.go @@ -3,8 +3,8 @@ package pulumi import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/purestake/purestake.go b/pkg/detectors/purestake/purestake.go index c38db8f30..5e35637a1 100644 --- a/pkg/detectors/purestake/purestake.go +++ b/pkg/detectors/purestake/purestake.go @@ -2,8 +2,8 @@ package purestake import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/pushbulletapikey/pushbulletapikey.go b/pkg/detectors/pushbulletapikey/pushbulletapikey.go index e5e30f870..6aec6262f 100644 --- a/pkg/detectors/pushbulletapikey/pushbulletapikey.go +++ b/pkg/detectors/pushbulletapikey/pushbulletapikey.go @@ -2,8 +2,8 @@ package pushbulletapikey import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/pusherchannelkey/pusherchannelkey.go b/pkg/detectors/pusherchannelkey/pusherchannelkey.go index e98764af3..b97506c99 100644 --- a/pkg/detectors/pusherchannelkey/pusherchannelkey.go +++ b/pkg/detectors/pusherchannelkey/pusherchannelkey.go @@ -6,9 +6,9 @@ import ( "crypto/md5" "crypto/sha256" "encoding/hex" + regexp "github.com/wasilibs/go-re2" "net/http" "net/url" - "regexp" "strconv" "strings" "time" diff --git a/pkg/detectors/qase/qase.go b/pkg/detectors/qase/qase.go index 23a2b3450..64d17dfbb 100644 --- a/pkg/detectors/qase/qase.go +++ b/pkg/detectors/qase/qase.go @@ -2,8 +2,8 @@ package qase import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/qualaroo/qualaroo.go b/pkg/detectors/qualaroo/qualaroo.go index e67a26246..c92d6bb40 100644 --- a/pkg/detectors/qualaroo/qualaroo.go +++ b/pkg/detectors/qualaroo/qualaroo.go @@ -3,8 +3,8 @@ package qualaroo import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/qubole/qubole.go b/pkg/detectors/qubole/qubole.go index 855f091ff..6725cd6de 100644 --- a/pkg/detectors/qubole/qubole.go +++ b/pkg/detectors/qubole/qubole.go @@ -2,8 +2,8 @@ package qubole import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/rabbitmq/rabbitmq.go b/pkg/detectors/rabbitmq/rabbitmq.go index 436e14e05..9e6bfb032 100644 --- a/pkg/detectors/rabbitmq/rabbitmq.go +++ b/pkg/detectors/rabbitmq/rabbitmq.go @@ -2,8 +2,8 @@ package rabbitmq import ( "context" + regexp "github.com/wasilibs/go-re2" "net/url" - "regexp" "strings" amqp "github.com/rabbitmq/amqp091-go" diff --git a/pkg/detectors/ramp/ramp.go b/pkg/detectors/ramp/ramp.go index d41a869aa..2437abb23 100644 --- a/pkg/detectors/ramp/ramp.go +++ b/pkg/detectors/ramp/ramp.go @@ -3,9 +3,9 @@ package ramp import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" "net/url" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/rapidapi/rapidapi.go b/pkg/detectors/rapidapi/rapidapi.go index ff3102f31..19a0e8f96 100644 --- a/pkg/detectors/rapidapi/rapidapi.go +++ b/pkg/detectors/rapidapi/rapidapi.go @@ -2,8 +2,8 @@ package rapidapi import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/raven/raven.go b/pkg/detectors/raven/raven.go index e7845e93b..3b6fadebf 100644 --- a/pkg/detectors/raven/raven.go +++ b/pkg/detectors/raven/raven.go @@ -4,9 +4,9 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/rawg/rawg.go b/pkg/detectors/rawg/rawg.go index 526a9431f..5311b4c5c 100644 --- a/pkg/detectors/rawg/rawg.go +++ b/pkg/detectors/rawg/rawg.go @@ -2,8 +2,8 @@ package rawg import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/razorpay/razorpay.go b/pkg/detectors/razorpay/razorpay.go index 4071ddc73..441609f41 100644 --- a/pkg/detectors/razorpay/razorpay.go +++ b/pkg/detectors/razorpay/razorpay.go @@ -3,9 +3,9 @@ package razorpay import ( "context" "encoding/json" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "github.com/trufflesecurity/trufflehog/v3/pkg/common" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" diff --git a/pkg/detectors/reachmail/reachmail.go b/pkg/detectors/reachmail/reachmail.go index 204a11443..ebf2c3c07 100644 --- a/pkg/detectors/reachmail/reachmail.go +++ b/pkg/detectors/reachmail/reachmail.go @@ -3,8 +3,8 @@ package reachmail import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/readme/readme.go b/pkg/detectors/readme/readme.go index 80ff3c94d..4d40c89fd 100644 --- a/pkg/detectors/readme/readme.go +++ b/pkg/detectors/readme/readme.go @@ -2,8 +2,8 @@ package readme import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" diff --git a/pkg/detectors/reallysimplesystems/reallysimplesystems.go b/pkg/detectors/reallysimplesystems/reallysimplesystems.go index dc01ec28d..ab66106ce 100644 --- a/pkg/detectors/reallysimplesystems/reallysimplesystems.go +++ b/pkg/detectors/reallysimplesystems/reallysimplesystems.go @@ -4,9 +4,9 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/rebrandly/rebrandly.go b/pkg/detectors/rebrandly/rebrandly.go index 8c9543109..61a4232e4 100644 --- a/pkg/detectors/rebrandly/rebrandly.go +++ b/pkg/detectors/rebrandly/rebrandly.go @@ -2,8 +2,8 @@ package rebrandly import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/rechargepayments/rechargepayments.go b/pkg/detectors/rechargepayments/rechargepayments.go index 773a84f9f..c55351096 100644 --- a/pkg/detectors/rechargepayments/rechargepayments.go +++ b/pkg/detectors/rechargepayments/rechargepayments.go @@ -2,8 +2,8 @@ package rechargepayments import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "github.com/trufflesecurity/trufflehog/v3/pkg/common" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" diff --git a/pkg/detectors/redis/redis.go b/pkg/detectors/redis/redis.go index 5aa4efdd8..810da6849 100644 --- a/pkg/detectors/redis/redis.go +++ b/pkg/detectors/redis/redis.go @@ -3,8 +3,8 @@ package redis import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/url" - "regexp" "strings" "github.com/go-redis/redis" diff --git a/pkg/detectors/refiner/refiner.go b/pkg/detectors/refiner/refiner.go index e3da1e3c6..6736f689a 100644 --- a/pkg/detectors/refiner/refiner.go +++ b/pkg/detectors/refiner/refiner.go @@ -3,8 +3,8 @@ package refiner import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/rentman/rentman.go b/pkg/detectors/rentman/rentman.go index d952b74d5..adabbc285 100644 --- a/pkg/detectors/rentman/rentman.go +++ b/pkg/detectors/rentman/rentman.go @@ -3,8 +3,8 @@ package rentman import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/repairshopr/repairshopr.go b/pkg/detectors/repairshopr/repairshopr.go index e5ef9695b..34e3516ac 100644 --- a/pkg/detectors/repairshopr/repairshopr.go +++ b/pkg/detectors/repairshopr/repairshopr.go @@ -3,8 +3,8 @@ package repairshopr import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/replicate/replicate.go b/pkg/detectors/replicate/replicate.go index e8bf5c40d..893b56867 100644 --- a/pkg/detectors/replicate/replicate.go +++ b/pkg/detectors/replicate/replicate.go @@ -3,8 +3,8 @@ package replicate import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/replyio/replyio.go b/pkg/detectors/replyio/replyio.go index 241405348..9583529fe 100644 --- a/pkg/detectors/replyio/replyio.go +++ b/pkg/detectors/replyio/replyio.go @@ -3,8 +3,8 @@ package replyio import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/requestfinance/requestfinance.go b/pkg/detectors/requestfinance/requestfinance.go index 35d8710d7..462112c29 100644 --- a/pkg/detectors/requestfinance/requestfinance.go +++ b/pkg/detectors/requestfinance/requestfinance.go @@ -3,8 +3,8 @@ package requestfinance import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/restpack/restpack.go b/pkg/detectors/restpack/restpack.go index ddc09c3f6..e53bb862c 100644 --- a/pkg/detectors/restpack/restpack.go +++ b/pkg/detectors/restpack/restpack.go @@ -3,8 +3,8 @@ package restpack import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/restpackhtmltopdfapi/restpackhtmltopdfapi.go b/pkg/detectors/restpackhtmltopdfapi/restpackhtmltopdfapi.go index d39cbc068..00683d584 100644 --- a/pkg/detectors/restpackhtmltopdfapi/restpackhtmltopdfapi.go +++ b/pkg/detectors/restpackhtmltopdfapi/restpackhtmltopdfapi.go @@ -2,8 +2,8 @@ package restpackhtmltopdfapi import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/restpackscreenshotapi/restpackscreenshotapi.go b/pkg/detectors/restpackscreenshotapi/restpackscreenshotapi.go index ed052c5cd..63d0eaa55 100644 --- a/pkg/detectors/restpackscreenshotapi/restpackscreenshotapi.go +++ b/pkg/detectors/restpackscreenshotapi/restpackscreenshotapi.go @@ -2,8 +2,8 @@ package restpackscreenshotapi import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/rev/rev.go b/pkg/detectors/rev/rev.go index af8de9321..708c4ebc2 100644 --- a/pkg/detectors/rev/rev.go +++ b/pkg/detectors/rev/rev.go @@ -3,8 +3,8 @@ package rev import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/revampcrm/revampcrm.go b/pkg/detectors/revampcrm/revampcrm.go index 8c8d3ae05..fc5ee627d 100644 --- a/pkg/detectors/revampcrm/revampcrm.go +++ b/pkg/detectors/revampcrm/revampcrm.go @@ -2,8 +2,8 @@ package revampcrm import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/ringcentral/ringcentral.go b/pkg/detectors/ringcentral/ringcentral.go index a57daf212..97522725b 100644 --- a/pkg/detectors/ringcentral/ringcentral.go +++ b/pkg/detectors/ringcentral/ringcentral.go @@ -3,8 +3,8 @@ package ringcentral import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/ritekit/ritekit.go b/pkg/detectors/ritekit/ritekit.go index 7aaab9cc1..0bd17af69 100644 --- a/pkg/detectors/ritekit/ritekit.go +++ b/pkg/detectors/ritekit/ritekit.go @@ -3,8 +3,8 @@ package ritekit import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/roaring/roaring.go b/pkg/detectors/roaring/roaring.go index dee74da36..ca25056f3 100644 --- a/pkg/detectors/roaring/roaring.go +++ b/pkg/detectors/roaring/roaring.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/rocketreach/rocketreach.go b/pkg/detectors/rocketreach/rocketreach.go index c44411159..19cff56c5 100644 --- a/pkg/detectors/rocketreach/rocketreach.go +++ b/pkg/detectors/rocketreach/rocketreach.go @@ -2,8 +2,8 @@ package rocketreach import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/rockset/rockset.go b/pkg/detectors/rockset/rockset.go index f79d6e005..459b19a0c 100644 --- a/pkg/detectors/rockset/rockset.go +++ b/pkg/detectors/rockset/rockset.go @@ -3,8 +3,8 @@ package rockset import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/roninapp/roninapp.go b/pkg/detectors/roninapp/roninapp.go index 8e22e80de..44c30e05b 100644 --- a/pkg/detectors/roninapp/roninapp.go +++ b/pkg/detectors/roninapp/roninapp.go @@ -3,7 +3,7 @@ package roninapp import ( "context" "fmt" - "regexp" + regexp "github.com/wasilibs/go-re2" "strings" b64 "encoding/base64" diff --git a/pkg/detectors/route4me/route4me.go b/pkg/detectors/route4me/route4me.go index 0428e4504..3668f7d48 100644 --- a/pkg/detectors/route4me/route4me.go +++ b/pkg/detectors/route4me/route4me.go @@ -2,8 +2,8 @@ package route4me import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/rownd/rownd.go b/pkg/detectors/rownd/rownd.go index 1d2d86434..ec71e141d 100644 --- a/pkg/detectors/rownd/rownd.go +++ b/pkg/detectors/rownd/rownd.go @@ -2,8 +2,8 @@ package rownd import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/rubygems/rubygems.go b/pkg/detectors/rubygems/rubygems.go index 0f3e9d0f9..56f8702a0 100644 --- a/pkg/detectors/rubygems/rubygems.go +++ b/pkg/detectors/rubygems/rubygems.go @@ -2,8 +2,8 @@ package rubygems import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/runrunit/runrunit.go b/pkg/detectors/runrunit/runrunit.go index 5ac22e2df..5587d2fd7 100644 --- a/pkg/detectors/runrunit/runrunit.go +++ b/pkg/detectors/runrunit/runrunit.go @@ -2,8 +2,8 @@ package runrunit import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/salesblink/salesblink.go b/pkg/detectors/salesblink/salesblink.go index d2b4e880b..86786c7f9 100644 --- a/pkg/detectors/salesblink/salesblink.go +++ b/pkg/detectors/salesblink/salesblink.go @@ -2,8 +2,8 @@ package salesblink import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/salescookie/salescookie.go b/pkg/detectors/salescookie/salescookie.go index 43073adef..aadf992ec 100644 --- a/pkg/detectors/salescookie/salescookie.go +++ b/pkg/detectors/salescookie/salescookie.go @@ -2,8 +2,8 @@ package salescookie import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/salesflare/salesflare.go b/pkg/detectors/salesflare/salesflare.go index faa1c1752..6c3f9bbd2 100644 --- a/pkg/detectors/salesflare/salesflare.go +++ b/pkg/detectors/salesflare/salesflare.go @@ -3,8 +3,8 @@ package salesflare import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/salesforce/salesforce.go b/pkg/detectors/salesforce/salesforce.go index f886e1334..de2bb365b 100644 --- a/pkg/detectors/salesforce/salesforce.go +++ b/pkg/detectors/salesforce/salesforce.go @@ -3,8 +3,8 @@ package salesforce import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/salesmate/salesmate.go b/pkg/detectors/salesmate/salesmate.go index f68336079..1c5a17e8a 100644 --- a/pkg/detectors/salesmate/salesmate.go +++ b/pkg/detectors/salesmate/salesmate.go @@ -3,8 +3,8 @@ package salesmate import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/satismeterprojectkey/satismeterprojectkey.go b/pkg/detectors/satismeterprojectkey/satismeterprojectkey.go index 88c85b575..c9a7ae4a7 100644 --- a/pkg/detectors/satismeterprojectkey/satismeterprojectkey.go +++ b/pkg/detectors/satismeterprojectkey/satismeterprojectkey.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/satismeterwritekey/satismeterwritekey.go b/pkg/detectors/satismeterwritekey/satismeterwritekey.go index 143f5645d..0435ee7e6 100644 --- a/pkg/detectors/satismeterwritekey/satismeterwritekey.go +++ b/pkg/detectors/satismeterwritekey/satismeterwritekey.go @@ -2,8 +2,8 @@ package satismeterwritekey import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/saucelabs/saucelabs.go b/pkg/detectors/saucelabs/saucelabs.go index 24ad11649..40114bfcf 100644 --- a/pkg/detectors/saucelabs/saucelabs.go +++ b/pkg/detectors/saucelabs/saucelabs.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/scalewaykey/scalewaykey.go b/pkg/detectors/scalewaykey/scalewaykey.go index c82b4a0d0..6946c690c 100644 --- a/pkg/detectors/scalewaykey/scalewaykey.go +++ b/pkg/detectors/scalewaykey/scalewaykey.go @@ -2,8 +2,8 @@ package scalewaykey import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/scalr/scalr.go b/pkg/detectors/scalr/scalr.go index 77b750a3f..76e53cd9b 100644 --- a/pkg/detectors/scalr/scalr.go +++ b/pkg/detectors/scalr/scalr.go @@ -3,8 +3,8 @@ package scalr import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/scrapeowl/scrapeowl.go b/pkg/detectors/scrapeowl/scrapeowl.go index 70707e81c..ad9d0dfe2 100644 --- a/pkg/detectors/scrapeowl/scrapeowl.go +++ b/pkg/detectors/scrapeowl/scrapeowl.go @@ -2,8 +2,8 @@ package scrapeowl import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/scraperapi/scraperapi.go b/pkg/detectors/scraperapi/scraperapi.go index d6283a64e..75add0eae 100644 --- a/pkg/detectors/scraperapi/scraperapi.go +++ b/pkg/detectors/scraperapi/scraperapi.go @@ -3,8 +3,8 @@ package scraperapi import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/scraperbox/scraperbox.go b/pkg/detectors/scraperbox/scraperbox.go index 89fd40397..0f3b9de81 100644 --- a/pkg/detectors/scraperbox/scraperbox.go +++ b/pkg/detectors/scraperbox/scraperbox.go @@ -3,8 +3,8 @@ package scraperbox import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/scrapestack/scrapestack.go b/pkg/detectors/scrapestack/scrapestack.go index 119d915ed..2407d8806 100644 --- a/pkg/detectors/scrapestack/scrapestack.go +++ b/pkg/detectors/scrapestack/scrapestack.go @@ -3,9 +3,9 @@ package scrapestack import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/scrapfly/scrapfly.go b/pkg/detectors/scrapfly/scrapfly.go index fb6db5edc..cd0059b0f 100644 --- a/pkg/detectors/scrapfly/scrapfly.go +++ b/pkg/detectors/scrapfly/scrapfly.go @@ -3,8 +3,8 @@ package scrapfly import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/scrapingant/scrapingant.go b/pkg/detectors/scrapingant/scrapingant.go index ab5c4b6c1..f838affe5 100644 --- a/pkg/detectors/scrapingant/scrapingant.go +++ b/pkg/detectors/scrapingant/scrapingant.go @@ -2,8 +2,8 @@ package scrapingant import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/scrapingbee/scrapingbee.go b/pkg/detectors/scrapingbee/scrapingbee.go index 628c1d691..1aa17c65a 100644 --- a/pkg/detectors/scrapingbee/scrapingbee.go +++ b/pkg/detectors/scrapingbee/scrapingbee.go @@ -2,8 +2,8 @@ package scrapingbee import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/screenshotapi/screenshotapi.go b/pkg/detectors/screenshotapi/screenshotapi.go index 6f2f91b58..b330ea55e 100644 --- a/pkg/detectors/screenshotapi/screenshotapi.go +++ b/pkg/detectors/screenshotapi/screenshotapi.go @@ -3,8 +3,8 @@ package screenshotapi import ( "context" "encoding/json" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/screenshotlayer/screenshotlayer.go b/pkg/detectors/screenshotlayer/screenshotlayer.go index e06f7291f..e04d645d6 100644 --- a/pkg/detectors/screenshotlayer/screenshotlayer.go +++ b/pkg/detectors/screenshotlayer/screenshotlayer.go @@ -3,9 +3,9 @@ package screenshotlayer import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/scrutinizerci/scrutinizerci.go b/pkg/detectors/scrutinizerci/scrutinizerci.go index 9399992cf..7f832df3c 100644 --- a/pkg/detectors/scrutinizerci/scrutinizerci.go +++ b/pkg/detectors/scrutinizerci/scrutinizerci.go @@ -2,8 +2,8 @@ package scrutinizerci import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/securitytrails/securitytrails.go b/pkg/detectors/securitytrails/securitytrails.go index c0b79e0bf..401a14391 100644 --- a/pkg/detectors/securitytrails/securitytrails.go +++ b/pkg/detectors/securitytrails/securitytrails.go @@ -2,8 +2,8 @@ package securitytrails import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/segmentapikey/segmentapikey.go b/pkg/detectors/segmentapikey/segmentapikey.go index d55a0d897..3f0ff5d3d 100644 --- a/pkg/detectors/segmentapikey/segmentapikey.go +++ b/pkg/detectors/segmentapikey/segmentapikey.go @@ -3,8 +3,8 @@ package segmentapikey import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/selectpdf/selectpdf.go b/pkg/detectors/selectpdf/selectpdf.go index 2a80d4c3b..a4b8cc807 100644 --- a/pkg/detectors/selectpdf/selectpdf.go +++ b/pkg/detectors/selectpdf/selectpdf.go @@ -3,8 +3,8 @@ package selectpdf import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/semaphore/semaphore.go b/pkg/detectors/semaphore/semaphore.go index 073abb867..1dbe1d68a 100644 --- a/pkg/detectors/semaphore/semaphore.go +++ b/pkg/detectors/semaphore/semaphore.go @@ -3,9 +3,9 @@ package semaphore import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/sendbird/sendbird.go b/pkg/detectors/sendbird/sendbird.go index ee5c253ac..dce9dd082 100644 --- a/pkg/detectors/sendbird/sendbird.go +++ b/pkg/detectors/sendbird/sendbird.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/sendbirdorganizationapi/sendbirdorganizationapi.go b/pkg/detectors/sendbirdorganizationapi/sendbirdorganizationapi.go index aa927cadb..74f846f20 100644 --- a/pkg/detectors/sendbirdorganizationapi/sendbirdorganizationapi.go +++ b/pkg/detectors/sendbirdorganizationapi/sendbirdorganizationapi.go @@ -3,8 +3,8 @@ package sendbirdorganizationapi import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/sendgrid/sendgrid.go b/pkg/detectors/sendgrid/sendgrid.go index eb6fbc5d1..661e9053f 100644 --- a/pkg/detectors/sendgrid/sendgrid.go +++ b/pkg/detectors/sendgrid/sendgrid.go @@ -3,8 +3,8 @@ package sendgrid import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" diff --git a/pkg/detectors/sendinbluev2/sendinbluev2.go b/pkg/detectors/sendinbluev2/sendinbluev2.go index 694737438..b7c6aa41d 100644 --- a/pkg/detectors/sendinbluev2/sendinbluev2.go +++ b/pkg/detectors/sendinbluev2/sendinbluev2.go @@ -2,8 +2,8 @@ package sendinbluev2 import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/sentrytoken/sentrytoken.go b/pkg/detectors/sentrytoken/sentrytoken.go index 97ac3a153..0e32137af 100644 --- a/pkg/detectors/sentrytoken/sentrytoken.go +++ b/pkg/detectors/sentrytoken/sentrytoken.go @@ -5,9 +5,9 @@ import ( "encoding/json" "errors" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/serphouse/serphouse.go b/pkg/detectors/serphouse/serphouse.go index 09a330a8b..b3fb4ed37 100644 --- a/pkg/detectors/serphouse/serphouse.go +++ b/pkg/detectors/serphouse/serphouse.go @@ -3,8 +3,8 @@ package serphouse import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/serpstack/serpstack.go b/pkg/detectors/serpstack/serpstack.go index 7b643b1aa..b1a048c4d 100644 --- a/pkg/detectors/serpstack/serpstack.go +++ b/pkg/detectors/serpstack/serpstack.go @@ -3,9 +3,9 @@ package serpstack import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/sheety/sheety.go b/pkg/detectors/sheety/sheety.go index c2c12e0e1..bd32c4521 100644 --- a/pkg/detectors/sheety/sheety.go +++ b/pkg/detectors/sheety/sheety.go @@ -3,8 +3,8 @@ package sheety import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/sherpadesk/sherpadesk.go b/pkg/detectors/sherpadesk/sherpadesk.go index fa9039a4f..b4d5215cc 100644 --- a/pkg/detectors/sherpadesk/sherpadesk.go +++ b/pkg/detectors/sherpadesk/sherpadesk.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/shipday/shipday.go b/pkg/detectors/shipday/shipday.go index 278f87b10..cbdf31374 100644 --- a/pkg/detectors/shipday/shipday.go +++ b/pkg/detectors/shipday/shipday.go @@ -3,8 +3,8 @@ package shipday import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/shodankey/shodankey.go b/pkg/detectors/shodankey/shodankey.go index c6600151c..eefb364c7 100644 --- a/pkg/detectors/shodankey/shodankey.go +++ b/pkg/detectors/shodankey/shodankey.go @@ -3,9 +3,9 @@ package shodankey import ( "context" "encoding/json" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/shopify/shopify.go b/pkg/detectors/shopify/shopify.go index bca4636ce..a86151e15 100644 --- a/pkg/detectors/shopify/shopify.go +++ b/pkg/detectors/shopify/shopify.go @@ -3,8 +3,8 @@ package shopify import ( "context" "encoding/json" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/shortcut/shortcut.go b/pkg/detectors/shortcut/shortcut.go index 4ecd5c184..33ea6e3f9 100644 --- a/pkg/detectors/shortcut/shortcut.go +++ b/pkg/detectors/shortcut/shortcut.go @@ -2,8 +2,8 @@ package shortcut import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/shotstack/shotstack.go b/pkg/detectors/shotstack/shotstack.go index 2cd96dd6e..daf5420ec 100644 --- a/pkg/detectors/shotstack/shotstack.go +++ b/pkg/detectors/shotstack/shotstack.go @@ -2,8 +2,8 @@ package shotstack import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/shutterstock/shutterstock.go b/pkg/detectors/shutterstock/shutterstock.go index d657c209e..e128b8d74 100644 --- a/pkg/detectors/shutterstock/shutterstock.go +++ b/pkg/detectors/shutterstock/shutterstock.go @@ -2,8 +2,8 @@ package shutterstock import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/shutterstockoauth/shutterstockoauth.go b/pkg/detectors/shutterstockoauth/shutterstockoauth.go index 53e0a5fc4..88721a82d 100644 --- a/pkg/detectors/shutterstockoauth/shutterstockoauth.go +++ b/pkg/detectors/shutterstockoauth/shutterstockoauth.go @@ -3,8 +3,8 @@ package shutterstockoauth import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/signable/signable.go b/pkg/detectors/signable/signable.go index cb583c6a4..42f582602 100644 --- a/pkg/detectors/signable/signable.go +++ b/pkg/detectors/signable/signable.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/signalwire/signalwire.go b/pkg/detectors/signalwire/signalwire.go index 95e6c756c..4b4d571c9 100644 --- a/pkg/detectors/signalwire/signalwire.go +++ b/pkg/detectors/signalwire/signalwire.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/signaturit/signaturit.go b/pkg/detectors/signaturit/signaturit.go index 626139a09..fe47d46f4 100644 --- a/pkg/detectors/signaturit/signaturit.go +++ b/pkg/detectors/signaturit/signaturit.go @@ -3,8 +3,8 @@ package signaturit import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/signupgenius/signupgenius.go b/pkg/detectors/signupgenius/signupgenius.go index ae9b40428..cfd8ee21b 100644 --- a/pkg/detectors/signupgenius/signupgenius.go +++ b/pkg/detectors/signupgenius/signupgenius.go @@ -2,8 +2,8 @@ package signupgenius import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/sigopt/sigopt.go b/pkg/detectors/sigopt/sigopt.go index 5fa5cf807..0bcb2a257 100644 --- a/pkg/detectors/sigopt/sigopt.go +++ b/pkg/detectors/sigopt/sigopt.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/simfin/simfin.go b/pkg/detectors/simfin/simfin.go index 139b6a595..9a0191444 100644 --- a/pkg/detectors/simfin/simfin.go +++ b/pkg/detectors/simfin/simfin.go @@ -3,9 +3,9 @@ package simfin import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/simplesat/simplesat.go b/pkg/detectors/simplesat/simplesat.go index ec8aa9a25..c032191c1 100644 --- a/pkg/detectors/simplesat/simplesat.go +++ b/pkg/detectors/simplesat/simplesat.go @@ -2,8 +2,8 @@ package simplesat import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/simplynoted/simplynoted.go b/pkg/detectors/simplynoted/simplynoted.go index 8ad3b0bca..6bfef10f9 100644 --- a/pkg/detectors/simplynoted/simplynoted.go +++ b/pkg/detectors/simplynoted/simplynoted.go @@ -3,8 +3,8 @@ package simplynoted import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/simvoly/simvoly.go b/pkg/detectors/simvoly/simvoly.go index 791644448..b9ab8d04c 100644 --- a/pkg/detectors/simvoly/simvoly.go +++ b/pkg/detectors/simvoly/simvoly.go @@ -3,8 +3,8 @@ package simvoly import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/sinchmessage/sinchmessage.go b/pkg/detectors/sinchmessage/sinchmessage.go index 82571f21a..4e8f154e1 100644 --- a/pkg/detectors/sinchmessage/sinchmessage.go +++ b/pkg/detectors/sinchmessage/sinchmessage.go @@ -3,8 +3,8 @@ package sinchmessage import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/sirv/sirv.go b/pkg/detectors/sirv/sirv.go index f0a8f7812..0615c0bf1 100644 --- a/pkg/detectors/sirv/sirv.go +++ b/pkg/detectors/sirv/sirv.go @@ -3,8 +3,8 @@ package sirv import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/siteleaf/siteleaf.go b/pkg/detectors/siteleaf/siteleaf.go index 6c8cea8df..57a0ee379 100644 --- a/pkg/detectors/siteleaf/siteleaf.go +++ b/pkg/detectors/siteleaf/siteleaf.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/skrappio/skrappio.go b/pkg/detectors/skrappio/skrappio.go index 0634170dd..b3d2d172d 100644 --- a/pkg/detectors/skrappio/skrappio.go +++ b/pkg/detectors/skrappio/skrappio.go @@ -2,8 +2,8 @@ package skrappio import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/skybiometry/skybiometry.go b/pkg/detectors/skybiometry/skybiometry.go index ce1d7a11d..18ae10862 100644 --- a/pkg/detectors/skybiometry/skybiometry.go +++ b/pkg/detectors/skybiometry/skybiometry.go @@ -2,9 +2,9 @@ package skybiometry import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" "net/url" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/slack/slack.go b/pkg/detectors/slack/slack.go index 064c1309b..63e44fba3 100644 --- a/pkg/detectors/slack/slack.go +++ b/pkg/detectors/slack/slack.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" "github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb" diff --git a/pkg/detectors/slackwebhook/slackwebhook.go b/pkg/detectors/slackwebhook/slackwebhook.go index c895c46d9..ba0892292 100644 --- a/pkg/detectors/slackwebhook/slackwebhook.go +++ b/pkg/detectors/slackwebhook/slackwebhook.go @@ -4,9 +4,9 @@ import ( "bytes" "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/smartsheets/smartsheets.go b/pkg/detectors/smartsheets/smartsheets.go index efbc5c256..e3d606570 100644 --- a/pkg/detectors/smartsheets/smartsheets.go +++ b/pkg/detectors/smartsheets/smartsheets.go @@ -3,8 +3,8 @@ package smartsheets import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/smartystreets/smartystreets.go b/pkg/detectors/smartystreets/smartystreets.go index ad70f3d69..9fced972e 100644 --- a/pkg/detectors/smartystreets/smartystreets.go +++ b/pkg/detectors/smartystreets/smartystreets.go @@ -3,8 +3,8 @@ package smartystreets import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/smooch/smooch.go b/pkg/detectors/smooch/smooch.go index b967f2e5c..9b0bdef2a 100644 --- a/pkg/detectors/smooch/smooch.go +++ b/pkg/detectors/smooch/smooch.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/snipcart/snipcart.go b/pkg/detectors/snipcart/snipcart.go index 748116fb5..f47f030d3 100644 --- a/pkg/detectors/snipcart/snipcart.go +++ b/pkg/detectors/snipcart/snipcart.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/snowflake/snowflake.go b/pkg/detectors/snowflake/snowflake.go index 7ec16ef32..27a8e9ad9 100644 --- a/pkg/detectors/snowflake/snowflake.go +++ b/pkg/detectors/snowflake/snowflake.go @@ -4,7 +4,7 @@ import ( "context" "database/sql" "fmt" - "regexp" + regexp "github.com/wasilibs/go-re2" "strings" "time" "unicode" diff --git a/pkg/detectors/snykkey/snykkey.go b/pkg/detectors/snykkey/snykkey.go index 3a7b49830..8e1f09ef1 100644 --- a/pkg/detectors/snykkey/snykkey.go +++ b/pkg/detectors/snykkey/snykkey.go @@ -3,8 +3,8 @@ package snykkey import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/sonarcloud/sonarcloud.go b/pkg/detectors/sonarcloud/sonarcloud.go index 1b45f18a7..8f9ec5671 100644 --- a/pkg/detectors/sonarcloud/sonarcloud.go +++ b/pkg/detectors/sonarcloud/sonarcloud.go @@ -2,9 +2,9 @@ package sonarcloud import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/sourcegraph/sourcegraph.go b/pkg/detectors/sourcegraph/sourcegraph.go index 46d3767e9..2018e7b89 100644 --- a/pkg/detectors/sourcegraph/sourcegraph.go +++ b/pkg/detectors/sourcegraph/sourcegraph.go @@ -3,8 +3,8 @@ package sourcegraph import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/sourcegraphcody/sourcegraphcody.go b/pkg/detectors/sourcegraphcody/sourcegraphcody.go index 08052cc0f..bb00e01a0 100644 --- a/pkg/detectors/sourcegraphcody/sourcegraphcody.go +++ b/pkg/detectors/sourcegraphcody/sourcegraphcody.go @@ -3,8 +3,8 @@ package sourcegraphcody import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/sparkpost/sparkpost.go b/pkg/detectors/sparkpost/sparkpost.go index ded611d20..d02e58bf8 100644 --- a/pkg/detectors/sparkpost/sparkpost.go +++ b/pkg/detectors/sparkpost/sparkpost.go @@ -2,8 +2,8 @@ package sparkpost import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/speechtextai/speechtextai.go b/pkg/detectors/speechtextai/speechtextai.go index 2703fb0c8..53a2ce8e6 100644 --- a/pkg/detectors/speechtextai/speechtextai.go +++ b/pkg/detectors/speechtextai/speechtextai.go @@ -3,8 +3,8 @@ package speechtextai import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/splunkobservabilitytoken/splunkobservabilitytoken.go b/pkg/detectors/splunkobservabilitytoken/splunkobservabilitytoken.go index d9b2f56b3..5bb39ed19 100644 --- a/pkg/detectors/splunkobservabilitytoken/splunkobservabilitytoken.go +++ b/pkg/detectors/splunkobservabilitytoken/splunkobservabilitytoken.go @@ -2,8 +2,8 @@ package splunkobservabilitytoken import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/spoonacular/spoonacular.go b/pkg/detectors/spoonacular/spoonacular.go index 0dcf9caa3..a7f5ae9cd 100644 --- a/pkg/detectors/spoonacular/spoonacular.go +++ b/pkg/detectors/spoonacular/spoonacular.go @@ -3,8 +3,8 @@ package spoonacular import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/sportsmonk/sportsmonk.go b/pkg/detectors/sportsmonk/sportsmonk.go index 2ea8030a5..c22b1e1e8 100644 --- a/pkg/detectors/sportsmonk/sportsmonk.go +++ b/pkg/detectors/sportsmonk/sportsmonk.go @@ -2,8 +2,8 @@ package sportsmonk import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/spotifykey/spotifykey.go b/pkg/detectors/spotifykey/spotifykey.go index e123c3adb..c219de884 100644 --- a/pkg/detectors/spotifykey/spotifykey.go +++ b/pkg/detectors/spotifykey/spotifykey.go @@ -4,7 +4,7 @@ import ( "context" "golang.org/x/oauth2" - "regexp" + regexp "github.com/wasilibs/go-re2" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/sqlserver/sqlserver.go b/pkg/detectors/sqlserver/sqlserver.go index 02c2ebaa7..ee8571ff8 100644 --- a/pkg/detectors/sqlserver/sqlserver.go +++ b/pkg/detectors/sqlserver/sqlserver.go @@ -3,7 +3,7 @@ package sqlserver import ( "context" "database/sql" - "regexp" + regexp "github.com/wasilibs/go-re2" mssql "github.com/denisenkom/go-mssqldb" "github.com/denisenkom/go-mssqldb/msdsn" diff --git a/pkg/detectors/square/square.go b/pkg/detectors/square/square.go index 481ddb9ff..e27e5f372 100644 --- a/pkg/detectors/square/square.go +++ b/pkg/detectors/square/square.go @@ -3,8 +3,8 @@ package square import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" @@ -68,7 +68,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", res)) req.Header.Add("Content-Type", "application/json") // unclear if this version needs to be set or matters, seems to work without, but docs want it - //req.Header.Add("Square-Version", "2020-08-12") + // req.Header.Add("Square-Version", "2020-08-12") res, err := client.Do(req) if err == nil { res.Body.Close() // The request body is unused. diff --git a/pkg/detectors/squareapp/squareapp.go b/pkg/detectors/squareapp/squareapp.go index 6b388fbc2..dfe6a4e10 100644 --- a/pkg/detectors/squareapp/squareapp.go +++ b/pkg/detectors/squareapp/squareapp.go @@ -5,8 +5,8 @@ import ( "context" "encoding/json" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/squarespace/squarespace.go b/pkg/detectors/squarespace/squarespace.go index 174e66a44..0a87bb872 100644 --- a/pkg/detectors/squarespace/squarespace.go +++ b/pkg/detectors/squarespace/squarespace.go @@ -3,8 +3,8 @@ package squarespace import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/squareup/squareup.go b/pkg/detectors/squareup/squareup.go index 62497ed3f..731328b4f 100644 --- a/pkg/detectors/squareup/squareup.go +++ b/pkg/detectors/squareup/squareup.go @@ -3,8 +3,8 @@ package squareup import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/sslmate/sslmate.go b/pkg/detectors/sslmate/sslmate.go index 276e1ce34..0fcc26dd5 100644 --- a/pkg/detectors/sslmate/sslmate.go +++ b/pkg/detectors/sslmate/sslmate.go @@ -3,8 +3,8 @@ package sslmate import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/statuscake/statuscake.go b/pkg/detectors/statuscake/statuscake.go index 92640ca58..a12d4b815 100644 --- a/pkg/detectors/statuscake/statuscake.go +++ b/pkg/detectors/statuscake/statuscake.go @@ -3,8 +3,8 @@ package statuscake import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/statuspage/statuspage.go b/pkg/detectors/statuspage/statuspage.go index acc01afb8..12cfe603d 100644 --- a/pkg/detectors/statuspage/statuspage.go +++ b/pkg/detectors/statuspage/statuspage.go @@ -2,8 +2,8 @@ package statuspage import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/statuspal/statuspal.go b/pkg/detectors/statuspal/statuspal.go index 36d9b737d..e74610422 100644 --- a/pkg/detectors/statuspal/statuspal.go +++ b/pkg/detectors/statuspal/statuspal.go @@ -2,8 +2,8 @@ package statuspal import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/stitchdata/stitchdata.go b/pkg/detectors/stitchdata/stitchdata.go index c66ef7a08..a51a591b0 100644 --- a/pkg/detectors/stitchdata/stitchdata.go +++ b/pkg/detectors/stitchdata/stitchdata.go @@ -3,8 +3,8 @@ package stitchdata import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/stockdata/stockdata.go b/pkg/detectors/stockdata/stockdata.go index d105d3528..19b407654 100644 --- a/pkg/detectors/stockdata/stockdata.go +++ b/pkg/detectors/stockdata/stockdata.go @@ -2,8 +2,8 @@ package stockdata import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/storecove/storecove.go b/pkg/detectors/storecove/storecove.go index 0ea29d40f..327d82d08 100644 --- a/pkg/detectors/storecove/storecove.go +++ b/pkg/detectors/storecove/storecove.go @@ -3,8 +3,8 @@ package storecove import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/stormboard/stormboard.go b/pkg/detectors/stormboard/stormboard.go index 96996dfe2..0cc9933c7 100644 --- a/pkg/detectors/stormboard/stormboard.go +++ b/pkg/detectors/stormboard/stormboard.go @@ -2,8 +2,8 @@ package stormboard import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/stormglass/stormglass.go b/pkg/detectors/stormglass/stormglass.go index cc21564fb..89669d556 100644 --- a/pkg/detectors/stormglass/stormglass.go +++ b/pkg/detectors/stormglass/stormglass.go @@ -2,8 +2,8 @@ package stormglass import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/storyblok/storyblok.go b/pkg/detectors/storyblok/storyblok.go index 938cf24e8..ceb524182 100644 --- a/pkg/detectors/storyblok/storyblok.go +++ b/pkg/detectors/storyblok/storyblok.go @@ -2,8 +2,8 @@ package storyblok import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/storychief/storychief.go b/pkg/detectors/storychief/storychief.go index dbc8b2dd8..776058633 100644 --- a/pkg/detectors/storychief/storychief.go +++ b/pkg/detectors/storychief/storychief.go @@ -3,8 +3,8 @@ package storychief import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/strava/strava.go b/pkg/detectors/strava/strava.go index 50e934015..701a02232 100644 --- a/pkg/detectors/strava/strava.go +++ b/pkg/detectors/strava/strava.go @@ -2,8 +2,8 @@ package strava import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/streak/streak.go b/pkg/detectors/streak/streak.go index d473e405d..99364b97b 100644 --- a/pkg/detectors/streak/streak.go +++ b/pkg/detectors/streak/streak.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/stripe/stripe.go b/pkg/detectors/stripe/stripe.go index 498904f85..188180454 100644 --- a/pkg/detectors/stripe/stripe.go +++ b/pkg/detectors/stripe/stripe.go @@ -3,8 +3,8 @@ package stripe import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "github.com/trufflesecurity/trufflehog/v3/pkg/common" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" @@ -17,7 +17,7 @@ type Scanner struct{} var _ detectors.Detector = (*Scanner)(nil) var ( - //doesn't include test keys with "sk_test" + // doesn't include test keys with "sk_test" secretKey = regexp.MustCompile(`[rs]k_live_[a-zA-Z0-9]{20,247}`) ) diff --git a/pkg/detectors/stripo/stripo.go b/pkg/detectors/stripo/stripo.go index 165f9993b..41bb77f34 100644 --- a/pkg/detectors/stripo/stripo.go +++ b/pkg/detectors/stripo/stripo.go @@ -3,8 +3,8 @@ package stripo import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/stytch/stytch.go b/pkg/detectors/stytch/stytch.go index 0d907609a..c17fd9a7d 100644 --- a/pkg/detectors/stytch/stytch.go +++ b/pkg/detectors/stytch/stytch.go @@ -2,8 +2,8 @@ package stytch import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/sugester/sugester.go b/pkg/detectors/sugester/sugester.go index 80681dd6c..6e2151dd0 100644 --- a/pkg/detectors/sugester/sugester.go +++ b/pkg/detectors/sugester/sugester.go @@ -2,8 +2,8 @@ package sugester import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/sumologickey/sumologickey.go b/pkg/detectors/sumologickey/sumologickey.go index 8f7312bc9..b8f5f1b6e 100644 --- a/pkg/detectors/sumologickey/sumologickey.go +++ b/pkg/detectors/sumologickey/sumologickey.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/supabasetoken/supabasetoken.go b/pkg/detectors/supabasetoken/supabasetoken.go index 7f5b3cb94..07018a869 100644 --- a/pkg/detectors/supabasetoken/supabasetoken.go +++ b/pkg/detectors/supabasetoken/supabasetoken.go @@ -3,8 +3,8 @@ package supabasetoken import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/supernotesapi/supernotesapi.go b/pkg/detectors/supernotesapi/supernotesapi.go index 98b2c5eb0..9a520fc3b 100644 --- a/pkg/detectors/supernotesapi/supernotesapi.go +++ b/pkg/detectors/supernotesapi/supernotesapi.go @@ -2,8 +2,8 @@ package supernotesapi import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/surveyanyplace/surveyanyplace.go b/pkg/detectors/surveyanyplace/surveyanyplace.go index dd143ecb6..f6773935b 100644 --- a/pkg/detectors/surveyanyplace/surveyanyplace.go +++ b/pkg/detectors/surveyanyplace/surveyanyplace.go @@ -3,8 +3,8 @@ package surveyanyplace import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/surveybot/surveybot.go b/pkg/detectors/surveybot/surveybot.go index 8ecdf7c69..25bf4fa6d 100644 --- a/pkg/detectors/surveybot/surveybot.go +++ b/pkg/detectors/surveybot/surveybot.go @@ -3,8 +3,8 @@ package surveybot import ( "context" "encoding/json" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/surveysparrow/surveysparrow.go b/pkg/detectors/surveysparrow/surveysparrow.go index cf7e998df..d61256c10 100644 --- a/pkg/detectors/surveysparrow/surveysparrow.go +++ b/pkg/detectors/surveysparrow/surveysparrow.go @@ -3,8 +3,8 @@ package surveysparrow import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/survicate/survicate.go b/pkg/detectors/survicate/survicate.go index c1848ca2f..9c2340475 100644 --- a/pkg/detectors/survicate/survicate.go +++ b/pkg/detectors/survicate/survicate.go @@ -3,8 +3,8 @@ package survicate import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/swell/swell.go b/pkg/detectors/swell/swell.go index 9830266dc..ba1384ecf 100644 --- a/pkg/detectors/swell/swell.go +++ b/pkg/detectors/swell/swell.go @@ -2,8 +2,8 @@ package swell import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/swiftype/swiftype.go b/pkg/detectors/swiftype/swiftype.go index d6066fb74..1ec300fec 100644 --- a/pkg/detectors/swiftype/swiftype.go +++ b/pkg/detectors/swiftype/swiftype.go @@ -2,8 +2,8 @@ package swiftype import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/tailscale/tailscale.go b/pkg/detectors/tailscale/tailscale.go index ab585f9ca..20a8c12a2 100644 --- a/pkg/detectors/tailscale/tailscale.go +++ b/pkg/detectors/tailscale/tailscale.go @@ -3,9 +3,9 @@ package tailscale import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" "net/url" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/tallyfy/tallyfy.go b/pkg/detectors/tallyfy/tallyfy.go index bb48e0392..2a32fafae 100644 --- a/pkg/detectors/tallyfy/tallyfy.go +++ b/pkg/detectors/tallyfy/tallyfy.go @@ -3,8 +3,8 @@ package tallyfy import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/tatumio/tatumio.go b/pkg/detectors/tatumio/tatumio.go index f98c4fb49..dd45e4979 100644 --- a/pkg/detectors/tatumio/tatumio.go +++ b/pkg/detectors/tatumio/tatumio.go @@ -2,8 +2,8 @@ package tatumio import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/taxjar/taxjar.go b/pkg/detectors/taxjar/taxjar.go index ead1aedf3..337bc43d1 100644 --- a/pkg/detectors/taxjar/taxjar.go +++ b/pkg/detectors/taxjar/taxjar.go @@ -3,8 +3,8 @@ package taxjar import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/teamgate/teamgate.go b/pkg/detectors/teamgate/teamgate.go index 9ed1f861b..5ee093bc2 100644 --- a/pkg/detectors/teamgate/teamgate.go +++ b/pkg/detectors/teamgate/teamgate.go @@ -2,8 +2,8 @@ package teamgate import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/teamworkcrm/teamworkcrm.go b/pkg/detectors/teamworkcrm/teamworkcrm.go index 5c324addd..293ac6f20 100644 --- a/pkg/detectors/teamworkcrm/teamworkcrm.go +++ b/pkg/detectors/teamworkcrm/teamworkcrm.go @@ -3,8 +3,8 @@ package teamworkcrm import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/teamworkdesk/teamworkdesk.go b/pkg/detectors/teamworkdesk/teamworkdesk.go index 0f4dbe089..9a9a06e11 100644 --- a/pkg/detectors/teamworkdesk/teamworkdesk.go +++ b/pkg/detectors/teamworkdesk/teamworkdesk.go @@ -3,8 +3,8 @@ package teamworkdesk import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/teamworkspaces/teamworkspaces.go b/pkg/detectors/teamworkspaces/teamworkspaces.go index c142753d8..281daa422 100644 --- a/pkg/detectors/teamworkspaces/teamworkspaces.go +++ b/pkg/detectors/teamworkspaces/teamworkspaces.go @@ -3,8 +3,8 @@ package teamworkspaces import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/technicalanalysisapi/technicalanalysisapi.go b/pkg/detectors/technicalanalysisapi/technicalanalysisapi.go index d23bab7ad..c0e79fa6e 100644 --- a/pkg/detectors/technicalanalysisapi/technicalanalysisapi.go +++ b/pkg/detectors/technicalanalysisapi/technicalanalysisapi.go @@ -3,8 +3,8 @@ package technicalanalysisapi import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/tefter/tefter.go b/pkg/detectors/tefter/tefter.go index ad2bef1a8..a5707e537 100644 --- a/pkg/detectors/tefter/tefter.go +++ b/pkg/detectors/tefter/tefter.go @@ -3,9 +3,9 @@ package tefter import ( "context" "encoding/json" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/telegrambottoken/telegrambottoken.go b/pkg/detectors/telegrambottoken/telegrambottoken.go index a42b9cd60..22985ebe4 100644 --- a/pkg/detectors/telegrambottoken/telegrambottoken.go +++ b/pkg/detectors/telegrambottoken/telegrambottoken.go @@ -5,8 +5,8 @@ import ( "encoding/json" // "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/teletype/teletype.go b/pkg/detectors/teletype/teletype.go index c01c77e93..b994b5ec1 100644 --- a/pkg/detectors/teletype/teletype.go +++ b/pkg/detectors/teletype/teletype.go @@ -2,9 +2,9 @@ package teletype import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/telnyx/telnyx.go b/pkg/detectors/telnyx/telnyx.go index a044993c1..5aba48b2d 100644 --- a/pkg/detectors/telnyx/telnyx.go +++ b/pkg/detectors/telnyx/telnyx.go @@ -3,8 +3,8 @@ package telnyx import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/terraformcloudpersonaltoken/terraformcloudpersonaltoken.go b/pkg/detectors/terraformcloudpersonaltoken/terraformcloudpersonaltoken.go index dbb54c7a1..40cff8b8f 100644 --- a/pkg/detectors/terraformcloudpersonaltoken/terraformcloudpersonaltoken.go +++ b/pkg/detectors/terraformcloudpersonaltoken/terraformcloudpersonaltoken.go @@ -3,8 +3,8 @@ package terraformcloudpersonaltoken import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/testingbot/testingbot.go b/pkg/detectors/testingbot/testingbot.go index 93240bd56..91d26248b 100644 --- a/pkg/detectors/testingbot/testingbot.go +++ b/pkg/detectors/testingbot/testingbot.go @@ -2,8 +2,8 @@ package testingbot import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/textmagic/textmagic.go b/pkg/detectors/textmagic/textmagic.go index 641f712b0..8c53ca5b6 100644 --- a/pkg/detectors/textmagic/textmagic.go +++ b/pkg/detectors/textmagic/textmagic.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/theoddsapi/theoddsapi.go b/pkg/detectors/theoddsapi/theoddsapi.go index 5161a81ee..9cbeb96b9 100644 --- a/pkg/detectors/theoddsapi/theoddsapi.go +++ b/pkg/detectors/theoddsapi/theoddsapi.go @@ -2,8 +2,8 @@ package theoddsapi import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/thinkific/thinkific.go b/pkg/detectors/thinkific/thinkific.go index b34c442b6..86f8ed882 100644 --- a/pkg/detectors/thinkific/thinkific.go +++ b/pkg/detectors/thinkific/thinkific.go @@ -3,9 +3,9 @@ package thinkific import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/thousandeyes/thousandeyes.go b/pkg/detectors/thousandeyes/thousandeyes.go index 14fcb0c28..83a0a2e7d 100644 --- a/pkg/detectors/thousandeyes/thousandeyes.go +++ b/pkg/detectors/thousandeyes/thousandeyes.go @@ -2,8 +2,8 @@ package thousandeyes import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/ticketmaster/ticketmaster.go b/pkg/detectors/ticketmaster/ticketmaster.go index 0d8864423..7f1026f9f 100644 --- a/pkg/detectors/ticketmaster/ticketmaster.go +++ b/pkg/detectors/ticketmaster/ticketmaster.go @@ -3,8 +3,8 @@ package ticketmaster import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/tickettailor/tickettailor.go b/pkg/detectors/tickettailor/tickettailor.go index 8c363ca3a..e8160c401 100644 --- a/pkg/detectors/tickettailor/tickettailor.go +++ b/pkg/detectors/tickettailor/tickettailor.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/tiingo/tiingo.go b/pkg/detectors/tiingo/tiingo.go index 54af3a52b..419367910 100644 --- a/pkg/detectors/tiingo/tiingo.go +++ b/pkg/detectors/tiingo/tiingo.go @@ -3,8 +3,8 @@ package tiingo import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/timecamp/timecamp.go b/pkg/detectors/timecamp/timecamp.go index 53d833f01..fd019a2f3 100644 --- a/pkg/detectors/timecamp/timecamp.go +++ b/pkg/detectors/timecamp/timecamp.go @@ -2,8 +2,8 @@ package timecamp import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/timezoneapi/timezoneapi.go b/pkg/detectors/timezoneapi/timezoneapi.go index 7f6ab3cc4..c9a094024 100644 --- a/pkg/detectors/timezoneapi/timezoneapi.go +++ b/pkg/detectors/timezoneapi/timezoneapi.go @@ -2,8 +2,8 @@ package timezoneapi import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/tineswebhook/tineswebhook.go b/pkg/detectors/tineswebhook/tineswebhook.go index 78aa4e64d..a5e08e9b3 100644 --- a/pkg/detectors/tineswebhook/tineswebhook.go +++ b/pkg/detectors/tineswebhook/tineswebhook.go @@ -2,8 +2,8 @@ package tineswebhook import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/tly/tly.go b/pkg/detectors/tly/tly.go index 220ca34af..ca9ba4a25 100644 --- a/pkg/detectors/tly/tly.go +++ b/pkg/detectors/tly/tly.go @@ -2,8 +2,8 @@ package tly import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/tmetric/tmetric.go b/pkg/detectors/tmetric/tmetric.go index d14387504..640146d65 100644 --- a/pkg/detectors/tmetric/tmetric.go +++ b/pkg/detectors/tmetric/tmetric.go @@ -3,8 +3,8 @@ package tmetric import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/todoist/todoist.go b/pkg/detectors/todoist/todoist.go index 0681bf2a7..f1c238fa5 100644 --- a/pkg/detectors/todoist/todoist.go +++ b/pkg/detectors/todoist/todoist.go @@ -3,8 +3,8 @@ package todoist import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/toggltrack/toggltrack.go b/pkg/detectors/toggltrack/toggltrack.go index 0baeec3a0..2c35e6b26 100644 --- a/pkg/detectors/toggltrack/toggltrack.go +++ b/pkg/detectors/toggltrack/toggltrack.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/tokeet/tokeet.go b/pkg/detectors/tokeet/tokeet.go index 20b1d9935..b361b3192 100644 --- a/pkg/detectors/tokeet/tokeet.go +++ b/pkg/detectors/tokeet/tokeet.go @@ -3,8 +3,8 @@ package tokeet import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/tomorrowio/tomorrowio.go b/pkg/detectors/tomorrowio/tomorrowio.go index a8d48cdf9..82076c5be 100644 --- a/pkg/detectors/tomorrowio/tomorrowio.go +++ b/pkg/detectors/tomorrowio/tomorrowio.go @@ -3,8 +3,8 @@ package tomorrowio import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/tomtom/tomtom.go b/pkg/detectors/tomtom/tomtom.go index 1d5f82e0b..46f1e51b3 100644 --- a/pkg/detectors/tomtom/tomtom.go +++ b/pkg/detectors/tomtom/tomtom.go @@ -2,8 +2,8 @@ package tomtom import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/tradier/tradier.go b/pkg/detectors/tradier/tradier.go index d25529357..36cdebd8a 100644 --- a/pkg/detectors/tradier/tradier.go +++ b/pkg/detectors/tradier/tradier.go @@ -3,8 +3,8 @@ package tradier import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/transferwise/transferwise.go b/pkg/detectors/transferwise/transferwise.go index 10165f27e..1cebe38f3 100644 --- a/pkg/detectors/transferwise/transferwise.go +++ b/pkg/detectors/transferwise/transferwise.go @@ -3,8 +3,8 @@ package transferwise import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/travelpayouts/travelpayouts.go b/pkg/detectors/travelpayouts/travelpayouts.go index a2464087f..651c63a5c 100644 --- a/pkg/detectors/travelpayouts/travelpayouts.go +++ b/pkg/detectors/travelpayouts/travelpayouts.go @@ -3,8 +3,8 @@ package travelpayouts import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/travisci/travisci.go b/pkg/detectors/travisci/travisci.go index 07d607c4a..af73e2388 100644 --- a/pkg/detectors/travisci/travisci.go +++ b/pkg/detectors/travisci/travisci.go @@ -3,8 +3,8 @@ package travisci import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/trelloapikey/trelloapikey.go b/pkg/detectors/trelloapikey/trelloapikey.go index be78c210c..26e8e810f 100644 --- a/pkg/detectors/trelloapikey/trelloapikey.go +++ b/pkg/detectors/trelloapikey/trelloapikey.go @@ -3,8 +3,8 @@ package trelloapikey import ( "context" // "log" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/tru/tru.go b/pkg/detectors/tru/tru.go index 2a40812f9..25dee7b48 100644 --- a/pkg/detectors/tru/tru.go +++ b/pkg/detectors/tru/tru.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/trufflehogenterprise/trufflehogenterprise.go b/pkg/detectors/trufflehogenterprise/trufflehogenterprise.go index d9880bde1..7af19a12d 100644 --- a/pkg/detectors/trufflehogenterprise/trufflehogenterprise.go +++ b/pkg/detectors/trufflehogenterprise/trufflehogenterprise.go @@ -3,8 +3,8 @@ package trufflehogenterprise import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/twelvedata/twelvedata.go b/pkg/detectors/twelvedata/twelvedata.go index 8cb6f1092..8a2230671 100644 --- a/pkg/detectors/twelvedata/twelvedata.go +++ b/pkg/detectors/twelvedata/twelvedata.go @@ -2,9 +2,9 @@ package twelvedata import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/twilio/twilio.go b/pkg/detectors/twilio/twilio.go index caac3751d..4c61cec9a 100644 --- a/pkg/detectors/twilio/twilio.go +++ b/pkg/detectors/twilio/twilio.go @@ -3,8 +3,8 @@ package twilio import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "github.com/trufflesecurity/trufflehog/v3/pkg/common" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" diff --git a/pkg/detectors/twist/twist.go b/pkg/detectors/twist/twist.go index 0b59b6c4b..898d53f05 100644 --- a/pkg/detectors/twist/twist.go +++ b/pkg/detectors/twist/twist.go @@ -3,8 +3,8 @@ package twist import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/twitch/twitch.go b/pkg/detectors/twitch/twitch.go index d0c5b52fb..9898d4f5e 100644 --- a/pkg/detectors/twitch/twitch.go +++ b/pkg/detectors/twitch/twitch.go @@ -3,9 +3,9 @@ package twitch import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" "net/url" - "regexp" "strconv" "strings" diff --git a/pkg/detectors/twitter/twitter.go b/pkg/detectors/twitter/twitter.go index 9d4d9c121..a043e7517 100644 --- a/pkg/detectors/twitter/twitter.go +++ b/pkg/detectors/twitter/twitter.go @@ -3,8 +3,8 @@ package twitter import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/tyntec/tyntec.go b/pkg/detectors/tyntec/tyntec.go index 7fde801e6..85c6ccebd 100644 --- a/pkg/detectors/tyntec/tyntec.go +++ b/pkg/detectors/tyntec/tyntec.go @@ -2,8 +2,8 @@ package tyntec import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/typeform/typeform.go b/pkg/detectors/typeform/typeform.go index 41767e345..404137427 100644 --- a/pkg/detectors/typeform/typeform.go +++ b/pkg/detectors/typeform/typeform.go @@ -3,8 +3,8 @@ package typeform import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/typetalk/typetalk.go b/pkg/detectors/typetalk/typetalk.go index 493cc3fc6..9f455c5a1 100644 --- a/pkg/detectors/typetalk/typetalk.go +++ b/pkg/detectors/typetalk/typetalk.go @@ -3,8 +3,8 @@ package typetalk import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/ubidots/ubidots.go b/pkg/detectors/ubidots/ubidots.go index bbc0e2bee..73d3b680e 100644 --- a/pkg/detectors/ubidots/ubidots.go +++ b/pkg/detectors/ubidots/ubidots.go @@ -2,8 +2,8 @@ package ubidots import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/uclassify/uclassify.go b/pkg/detectors/uclassify/uclassify.go index 757fa2a02..64483ade4 100644 --- a/pkg/detectors/uclassify/uclassify.go +++ b/pkg/detectors/uclassify/uclassify.go @@ -3,8 +3,8 @@ package uclassify import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/unifyid/unifyid.go b/pkg/detectors/unifyid/unifyid.go index 8b83a7834..f75999a2f 100644 --- a/pkg/detectors/unifyid/unifyid.go +++ b/pkg/detectors/unifyid/unifyid.go @@ -2,9 +2,9 @@ package unifyid import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/unplugg/unplugg.go b/pkg/detectors/unplugg/unplugg.go index a7081bd46..298737a0b 100644 --- a/pkg/detectors/unplugg/unplugg.go +++ b/pkg/detectors/unplugg/unplugg.go @@ -2,8 +2,8 @@ package unplugg import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/unsplash/unsplash.go b/pkg/detectors/unsplash/unsplash.go index b8856c96a..e15383c25 100644 --- a/pkg/detectors/unsplash/unsplash.go +++ b/pkg/detectors/unsplash/unsplash.go @@ -2,8 +2,8 @@ package unsplash import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/upcdatabase/upcdatabase.go b/pkg/detectors/upcdatabase/upcdatabase.go index 015d4b547..f86d3eb23 100644 --- a/pkg/detectors/upcdatabase/upcdatabase.go +++ b/pkg/detectors/upcdatabase/upcdatabase.go @@ -3,9 +3,9 @@ package upcdatabase import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/uplead/uplead.go b/pkg/detectors/uplead/uplead.go index c2b882438..d49367772 100644 --- a/pkg/detectors/uplead/uplead.go +++ b/pkg/detectors/uplead/uplead.go @@ -2,8 +2,8 @@ package uplead import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/uploadcare/uploadcare.go b/pkg/detectors/uploadcare/uploadcare.go index 825f6164b..70830b3ba 100644 --- a/pkg/detectors/uploadcare/uploadcare.go +++ b/pkg/detectors/uploadcare/uploadcare.go @@ -3,8 +3,8 @@ package uploadcare import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/uptimerobot/uptimerobot.go b/pkg/detectors/uptimerobot/uptimerobot.go index cc6e6c242..9adfea392 100644 --- a/pkg/detectors/uptimerobot/uptimerobot.go +++ b/pkg/detectors/uptimerobot/uptimerobot.go @@ -2,9 +2,9 @@ package uptimerobot import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/upwave/upwave.go b/pkg/detectors/upwave/upwave.go index fbb5498f1..1cbc174bb 100644 --- a/pkg/detectors/upwave/upwave.go +++ b/pkg/detectors/upwave/upwave.go @@ -3,8 +3,8 @@ package upwave import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/uri/uri.go b/pkg/detectors/uri/uri.go index 52b3f0144..0ab918466 100644 --- a/pkg/detectors/uri/uri.go +++ b/pkg/detectors/uri/uri.go @@ -2,9 +2,9 @@ package uri import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" "net/url" - "regexp" "strings" "time" diff --git a/pkg/detectors/urlscan/urlscan.go b/pkg/detectors/urlscan/urlscan.go index 0dc90d0e0..aae63b2c1 100644 --- a/pkg/detectors/urlscan/urlscan.go +++ b/pkg/detectors/urlscan/urlscan.go @@ -2,8 +2,8 @@ package urlscan import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/user/user.go b/pkg/detectors/user/user.go index 2cbfe116b..a1549423e 100644 --- a/pkg/detectors/user/user.go +++ b/pkg/detectors/user/user.go @@ -3,8 +3,8 @@ package user import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/userflow/userflow.go b/pkg/detectors/userflow/userflow.go index b0ba91114..f43d3dd97 100644 --- a/pkg/detectors/userflow/userflow.go +++ b/pkg/detectors/userflow/userflow.go @@ -3,8 +3,8 @@ package userflow import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/userstack/userstack.go b/pkg/detectors/userstack/userstack.go index d8662ee3e..05dacac14 100644 --- a/pkg/detectors/userstack/userstack.go +++ b/pkg/detectors/userstack/userstack.go @@ -3,9 +3,9 @@ package userstack import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/vagrantcloudpersonaltoken/vagrantcloudpersonaltoken.go b/pkg/detectors/vagrantcloudpersonaltoken/vagrantcloudpersonaltoken.go index e49aedc05..c517169c8 100644 --- a/pkg/detectors/vagrantcloudpersonaltoken/vagrantcloudpersonaltoken.go +++ b/pkg/detectors/vagrantcloudpersonaltoken/vagrantcloudpersonaltoken.go @@ -3,8 +3,8 @@ package vagrantcloudpersonaltoken import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/vatlayer/vatlayer.go b/pkg/detectors/vatlayer/vatlayer.go index bd0155c5a..be0bbf525 100644 --- a/pkg/detectors/vatlayer/vatlayer.go +++ b/pkg/detectors/vatlayer/vatlayer.go @@ -3,9 +3,9 @@ package vatlayer import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/vbout/vbout.go b/pkg/detectors/vbout/vbout.go index 04df49499..f9cfd4a1b 100644 --- a/pkg/detectors/vbout/vbout.go +++ b/pkg/detectors/vbout/vbout.go @@ -3,8 +3,8 @@ package vbout import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/vercel/vercel.go b/pkg/detectors/vercel/vercel.go index 55d6f23e4..87b398675 100644 --- a/pkg/detectors/vercel/vercel.go +++ b/pkg/detectors/vercel/vercel.go @@ -3,8 +3,8 @@ package vercel import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/verifier/verifier.go b/pkg/detectors/verifier/verifier.go index 324f76a1d..eb8180a77 100644 --- a/pkg/detectors/verifier/verifier.go +++ b/pkg/detectors/verifier/verifier.go @@ -3,8 +3,8 @@ package verifier import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/verimail/verimail.go b/pkg/detectors/verimail/verimail.go index 19345aedf..f449b088a 100644 --- a/pkg/detectors/verimail/verimail.go +++ b/pkg/detectors/verimail/verimail.go @@ -2,8 +2,8 @@ package verimail import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/veriphone/veriphone.go b/pkg/detectors/veriphone/veriphone.go index 6b4f43006..46902ba66 100644 --- a/pkg/detectors/veriphone/veriphone.go +++ b/pkg/detectors/veriphone/veriphone.go @@ -2,8 +2,8 @@ package veriphone import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/versioneye/versioneye.go b/pkg/detectors/versioneye/versioneye.go index 5148a99d4..9752e6fd0 100644 --- a/pkg/detectors/versioneye/versioneye.go +++ b/pkg/detectors/versioneye/versioneye.go @@ -2,8 +2,8 @@ package versioneye import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/viewneo/viewneo.go b/pkg/detectors/viewneo/viewneo.go index fa35a0631..3465f61cb 100644 --- a/pkg/detectors/viewneo/viewneo.go +++ b/pkg/detectors/viewneo/viewneo.go @@ -3,8 +3,8 @@ package viewneo import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/virustotal/virustotal.go b/pkg/detectors/virustotal/virustotal.go index 465b1c060..f57024017 100644 --- a/pkg/detectors/virustotal/virustotal.go +++ b/pkg/detectors/virustotal/virustotal.go @@ -2,8 +2,8 @@ package virustotal import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/visualcrossing/visualcrossing.go b/pkg/detectors/visualcrossing/visualcrossing.go index ea9dd2491..54b5e7606 100644 --- a/pkg/detectors/visualcrossing/visualcrossing.go +++ b/pkg/detectors/visualcrossing/visualcrossing.go @@ -3,8 +3,8 @@ package visualcrossing import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/voiceflow/voiceflow.go b/pkg/detectors/voiceflow/voiceflow.go index 3513be3e9..1ffb1b11d 100644 --- a/pkg/detectors/voiceflow/voiceflow.go +++ b/pkg/detectors/voiceflow/voiceflow.go @@ -4,9 +4,9 @@ import ( "bytes" "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" @@ -25,7 +25,7 @@ var ( defaultClient = common.SaneHttpClient() // Reference: https://developer.voiceflow.com/reference/project#dialog-manager-api-keys // - //TODO: This includes Workspace and Legacy Workspace API keys; I haven't validated whether these actually work. + // TODO: This includes Workspace and Legacy Workspace API keys; I haven't validated whether these actually work. // https://github.com/voiceflow/general-runtime/blob/master/tests/runtime/lib/DataAPI/utils.unit.ts keyPat = regexp.MustCompile(`\b(VF\.(?:(?:DM|WS)\.)?[a-fA-F0-9]{24}\.[a-zA-Z0-9]{16})\b`) ) diff --git a/pkg/detectors/voicegain/voicegain.go b/pkg/detectors/voicegain/voicegain.go index 67741e25b..72bbb3532 100644 --- a/pkg/detectors/voicegain/voicegain.go +++ b/pkg/detectors/voicegain/voicegain.go @@ -3,8 +3,8 @@ package voicegain import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/voodoosms/voodoosms.go b/pkg/detectors/voodoosms/voodoosms.go index c382d0933..0a8ab9884 100644 --- a/pkg/detectors/voodoosms/voodoosms.go +++ b/pkg/detectors/voodoosms/voodoosms.go @@ -3,8 +3,8 @@ package voodoosms import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/vouchery/vouchery.go b/pkg/detectors/vouchery/vouchery.go index ec917e564..28b064081 100644 --- a/pkg/detectors/vouchery/vouchery.go +++ b/pkg/detectors/vouchery/vouchery.go @@ -3,8 +3,8 @@ package vouchery import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/vpnapi/vpnapi.go b/pkg/detectors/vpnapi/vpnapi.go index 5593e0d4e..5ea820bb6 100644 --- a/pkg/detectors/vpnapi/vpnapi.go +++ b/pkg/detectors/vpnapi/vpnapi.go @@ -2,8 +2,8 @@ package vpnapi import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/vultrapikey/vultrapikey.go b/pkg/detectors/vultrapikey/vultrapikey.go index 536a27c92..a229f4be6 100644 --- a/pkg/detectors/vultrapikey/vultrapikey.go +++ b/pkg/detectors/vultrapikey/vultrapikey.go @@ -3,8 +3,8 @@ package vultrapikey import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/vyte/vyte.go b/pkg/detectors/vyte/vyte.go index 0671be79f..47685a67d 100644 --- a/pkg/detectors/vyte/vyte.go +++ b/pkg/detectors/vyte/vyte.go @@ -2,8 +2,8 @@ package vyte import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/walkscore/walkscore.go b/pkg/detectors/walkscore/walkscore.go index 4400afaa4..28eaea891 100644 --- a/pkg/detectors/walkscore/walkscore.go +++ b/pkg/detectors/walkscore/walkscore.go @@ -3,9 +3,9 @@ package walkscore import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/weatherbit/weatherbit.go b/pkg/detectors/weatherbit/weatherbit.go index 04a8ebad7..9b6eb90f1 100644 --- a/pkg/detectors/weatherbit/weatherbit.go +++ b/pkg/detectors/weatherbit/weatherbit.go @@ -3,8 +3,8 @@ package weatherbit import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/weatherstack/weatherstack.go b/pkg/detectors/weatherstack/weatherstack.go index d5255a209..6e42ec8b1 100644 --- a/pkg/detectors/weatherstack/weatherstack.go +++ b/pkg/detectors/weatherstack/weatherstack.go @@ -3,9 +3,9 @@ package weatherstack import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/web3storage/web3storage.go b/pkg/detectors/web3storage/web3storage.go index 346547447..00ca87108 100644 --- a/pkg/detectors/web3storage/web3storage.go +++ b/pkg/detectors/web3storage/web3storage.go @@ -3,8 +3,8 @@ package web3storage import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/webex/webex.go b/pkg/detectors/webex/webex.go index 38c732ca1..d00ad14e6 100644 --- a/pkg/detectors/webex/webex.go +++ b/pkg/detectors/webex/webex.go @@ -3,9 +3,9 @@ package webex import ( "context" "encoding/json" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/webflow/webflow.go b/pkg/detectors/webflow/webflow.go index 25ab7c84b..ed42a9124 100644 --- a/pkg/detectors/webflow/webflow.go +++ b/pkg/detectors/webflow/webflow.go @@ -3,8 +3,8 @@ package webflow import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/webscraper/webscraper.go b/pkg/detectors/webscraper/webscraper.go index 9b374f6df..c5aa1e424 100644 --- a/pkg/detectors/webscraper/webscraper.go +++ b/pkg/detectors/webscraper/webscraper.go @@ -3,8 +3,8 @@ package webscraper import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/webscraping/webscraping.go b/pkg/detectors/webscraping/webscraping.go index 5d5118ab7..6cd63258a 100644 --- a/pkg/detectors/webscraping/webscraping.go +++ b/pkg/detectors/webscraping/webscraping.go @@ -2,9 +2,9 @@ package webscraping import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/websitepulse/websitepulse.go b/pkg/detectors/websitepulse/websitepulse.go index e8eef8764..b952c9e2e 100644 --- a/pkg/detectors/websitepulse/websitepulse.go +++ b/pkg/detectors/websitepulse/websitepulse.go @@ -3,9 +3,9 @@ package websitepulse import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/wepay/wepay.go b/pkg/detectors/wepay/wepay.go index 856e94d48..0bb07752e 100644 --- a/pkg/detectors/wepay/wepay.go +++ b/pkg/detectors/wepay/wepay.go @@ -2,8 +2,8 @@ package wepay import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/whoxy/whoxy.go b/pkg/detectors/whoxy/whoxy.go index 90478b875..d85683228 100644 --- a/pkg/detectors/whoxy/whoxy.go +++ b/pkg/detectors/whoxy/whoxy.go @@ -3,9 +3,9 @@ package whoxy import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/wistia/wistia.go b/pkg/detectors/wistia/wistia.go index 5a611ae5b..e05f6dff7 100644 --- a/pkg/detectors/wistia/wistia.go +++ b/pkg/detectors/wistia/wistia.go @@ -2,8 +2,8 @@ package wistia import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/wit/wit.go b/pkg/detectors/wit/wit.go index 239250b21..67ea8417a 100644 --- a/pkg/detectors/wit/wit.go +++ b/pkg/detectors/wit/wit.go @@ -3,8 +3,8 @@ package wit import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/worksnaps/worksnaps.go b/pkg/detectors/worksnaps/worksnaps.go index e2e8b8e30..78ecf768b 100644 --- a/pkg/detectors/worksnaps/worksnaps.go +++ b/pkg/detectors/worksnaps/worksnaps.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/workstack/workstack.go b/pkg/detectors/workstack/workstack.go index 5cc825923..488f6ae88 100644 --- a/pkg/detectors/workstack/workstack.go +++ b/pkg/detectors/workstack/workstack.go @@ -2,8 +2,8 @@ package workstack import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/worldcoinindex/worldcoinindex.go b/pkg/detectors/worldcoinindex/worldcoinindex.go index 76cac67f4..0d5ac48ba 100644 --- a/pkg/detectors/worldcoinindex/worldcoinindex.go +++ b/pkg/detectors/worldcoinindex/worldcoinindex.go @@ -3,9 +3,9 @@ package worldcoinindex import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/worldweather/worldweather.go b/pkg/detectors/worldweather/worldweather.go index f6d74b752..3edc5bc53 100644 --- a/pkg/detectors/worldweather/worldweather.go +++ b/pkg/detectors/worldweather/worldweather.go @@ -3,8 +3,8 @@ package worldweather import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/wrike/wrike.go b/pkg/detectors/wrike/wrike.go index 158764167..c71962b03 100644 --- a/pkg/detectors/wrike/wrike.go +++ b/pkg/detectors/wrike/wrike.go @@ -3,8 +3,8 @@ package wrike import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/yandex/yandex.go b/pkg/detectors/yandex/yandex.go index 142e2ce7c..61faddde5 100644 --- a/pkg/detectors/yandex/yandex.go +++ b/pkg/detectors/yandex/yandex.go @@ -2,8 +2,8 @@ package yandex import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/yelp/yelp.go b/pkg/detectors/yelp/yelp.go index 5278b6d3e..e71682c6e 100644 --- a/pkg/detectors/yelp/yelp.go +++ b/pkg/detectors/yelp/yelp.go @@ -3,8 +3,8 @@ package yelp import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/youneedabudget/youneedabudget.go b/pkg/detectors/youneedabudget/youneedabudget.go index a95e1003f..1bab39c6f 100644 --- a/pkg/detectors/youneedabudget/youneedabudget.go +++ b/pkg/detectors/youneedabudget/youneedabudget.go @@ -3,8 +3,8 @@ package youneedabudget import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/yousign/yousign.go b/pkg/detectors/yousign/yousign.go index 36cfe6e9f..032fdbc25 100644 --- a/pkg/detectors/yousign/yousign.go +++ b/pkg/detectors/yousign/yousign.go @@ -3,8 +3,8 @@ package yousign import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/youtubeapikey/youtubeapikey.go b/pkg/detectors/youtubeapikey/youtubeapikey.go index c4d98ef1b..92597c31b 100644 --- a/pkg/detectors/youtubeapikey/youtubeapikey.go +++ b/pkg/detectors/youtubeapikey/youtubeapikey.go @@ -2,8 +2,8 @@ package youtubeapikey import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/zapierwebhook/zapierwebhook.go b/pkg/detectors/zapierwebhook/zapierwebhook.go index 620c027f8..9f1d45ffe 100644 --- a/pkg/detectors/zapierwebhook/zapierwebhook.go +++ b/pkg/detectors/zapierwebhook/zapierwebhook.go @@ -2,8 +2,8 @@ package zapierwebhook import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/zendeskapi/zendeskapi.go b/pkg/detectors/zendeskapi/zendeskapi.go index 9438ea38d..abaa94a04 100644 --- a/pkg/detectors/zendeskapi/zendeskapi.go +++ b/pkg/detectors/zendeskapi/zendeskapi.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/zenkitapi/zenkitapi.go b/pkg/detectors/zenkitapi/zenkitapi.go index 17bb385ab..a45aa60af 100644 --- a/pkg/detectors/zenkitapi/zenkitapi.go +++ b/pkg/detectors/zenkitapi/zenkitapi.go @@ -2,8 +2,8 @@ package zenkitapi import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/zenrows/zenrows.go b/pkg/detectors/zenrows/zenrows.go index 561919b45..4f71bd371 100644 --- a/pkg/detectors/zenrows/zenrows.go +++ b/pkg/detectors/zenrows/zenrows.go @@ -3,8 +3,8 @@ package zenrows import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/zenscrape/zenscrape.go b/pkg/detectors/zenscrape/zenscrape.go index 08b93f7cd..651a8099f 100644 --- a/pkg/detectors/zenscrape/zenscrape.go +++ b/pkg/detectors/zenscrape/zenscrape.go @@ -3,9 +3,10 @@ package zenscrape import ( "context" "net/http" - "regexp" "strings" + regexp "github.com/wasilibs/go-re2" + "github.com/trufflesecurity/trufflehog/v3/pkg/common" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" "github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb" diff --git a/pkg/detectors/zenserp/zenserp.go b/pkg/detectors/zenserp/zenserp.go index 5ae78e945..a5f9b3b31 100644 --- a/pkg/detectors/zenserp/zenserp.go +++ b/pkg/detectors/zenserp/zenserp.go @@ -2,9 +2,9 @@ package zenserp import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "time" diff --git a/pkg/detectors/zeplin/zeplin.go b/pkg/detectors/zeplin/zeplin.go index fe41d8d98..84e3c14f1 100644 --- a/pkg/detectors/zeplin/zeplin.go +++ b/pkg/detectors/zeplin/zeplin.go @@ -3,8 +3,8 @@ package zeplin import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/zerobounce/zerobounce.go b/pkg/detectors/zerobounce/zerobounce.go index 936b1431a..3ecaa1a8f 100644 --- a/pkg/detectors/zerobounce/zerobounce.go +++ b/pkg/detectors/zerobounce/zerobounce.go @@ -2,9 +2,9 @@ package zerobounce import ( "context" + regexp "github.com/wasilibs/go-re2" "io" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/zerotier/zerotier.go b/pkg/detectors/zerotier/zerotier.go index 5c094a1cf..15462eabf 100644 --- a/pkg/detectors/zerotier/zerotier.go +++ b/pkg/detectors/zerotier/zerotier.go @@ -3,8 +3,8 @@ package zerotier import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/zipapi/zipapi.go b/pkg/detectors/zipapi/zipapi.go index 2f25c2e8a..9ad753f9e 100644 --- a/pkg/detectors/zipapi/zipapi.go +++ b/pkg/detectors/zipapi/zipapi.go @@ -4,8 +4,8 @@ import ( "context" b64 "encoding/base64" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/zipbooks/zipbooks.go b/pkg/detectors/zipbooks/zipbooks.go index ba7d5801f..07078135a 100644 --- a/pkg/detectors/zipbooks/zipbooks.go +++ b/pkg/detectors/zipbooks/zipbooks.go @@ -3,8 +3,8 @@ package zipbooks import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/zipcodeapi/zipcodeapi.go b/pkg/detectors/zipcodeapi/zipcodeapi.go index a4949f1c1..f42dcf781 100644 --- a/pkg/detectors/zipcodeapi/zipcodeapi.go +++ b/pkg/detectors/zipcodeapi/zipcodeapi.go @@ -3,8 +3,8 @@ package zipcodeapi import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/zipcodebase/zipcodebase.go b/pkg/detectors/zipcodebase/zipcodebase.go index f153a8a2f..354ed3448 100644 --- a/pkg/detectors/zipcodebase/zipcodebase.go +++ b/pkg/detectors/zipcodebase/zipcodebase.go @@ -2,8 +2,8 @@ package zipcodebase import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/zonkafeedback/zonkafeedback.go b/pkg/detectors/zonkafeedback/zonkafeedback.go index 90160fc78..7d480daec 100644 --- a/pkg/detectors/zonkafeedback/zonkafeedback.go +++ b/pkg/detectors/zonkafeedback/zonkafeedback.go @@ -2,8 +2,8 @@ package zonkafeedback import ( "context" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" diff --git a/pkg/detectors/zulipchat/zulipchat.go b/pkg/detectors/zulipchat/zulipchat.go index 89f926690..02030d2ed 100644 --- a/pkg/detectors/zulipchat/zulipchat.go +++ b/pkg/detectors/zulipchat/zulipchat.go @@ -3,8 +3,8 @@ package zulipchat import ( "context" "fmt" + regexp "github.com/wasilibs/go-re2" "net/http" - "regexp" "strings" "github.com/trufflesecurity/trufflehog/v3/pkg/common" From 4c698fc1e8e65b9da6d0b468bb0f97a47d353456 Mon Sep 17 00:00:00 2001 From: Miccah Date: Tue, 23 Jan 2024 14:57:38 -0800 Subject: [PATCH 32/35] Walk directories in filesystem source enumeration (#2313) * Walk directories in filesystem source enumeration * Ignore all directories instead of just the root * Fix bug with multiple directories * Skip filesystem TestEnumerate * Update filesystem enumeration test to create files and folders --- pkg/sources/filesystem/filesystem.go | 39 +++++++++++++++++------ pkg/sources/filesystem/filesystem_test.go | 23 +++++++++++++ 2 files changed, 53 insertions(+), 9 deletions(-) diff --git a/pkg/sources/filesystem/filesystem.go b/pkg/sources/filesystem/filesystem.go index 5f47ffa47..9a1c4ceb9 100644 --- a/pkg/sources/filesystem/filesystem.go +++ b/pkg/sources/filesystem/filesystem.go @@ -119,12 +119,7 @@ func (s *Source) scanDir(ctx context.Context, path string, chunksChan chan *sour // Skip over non-regular files. We do this check here to suppress noisy // logs for trying to scan directories and other non-regular files in // our traversal. - fileStat, err := os.Stat(fullPath) - if err != nil { - ctx.Logger().Info("unable to stat file", "path", fullPath, "error", err) - return nil - } - if !fileStat.Mode().IsRegular() { + if !d.Type().IsRegular() { return nil } if s.filter != nil && !s.filter.Pass(fullPath) { @@ -223,9 +218,35 @@ func (s *Source) scanFile(ctx context.Context, path string, chunksChan chan *sou // filepath or a directory. func (s *Source) Enumerate(ctx context.Context, reporter sources.UnitReporter) error { for _, path := range s.paths { - item := sources.CommonSourceUnit{ID: path} - if err := reporter.UnitOk(ctx, item); err != nil { - return err + fileInfo, err := os.Stat(filepath.Clean(path)) + if err != nil { + if err := reporter.UnitErr(ctx, err); err != nil { + return err + } + continue + } + if !fileInfo.IsDir() { + item := sources.CommonSourceUnit{ID: path} + if err := reporter.UnitOk(ctx, item); err != nil { + return err + } + continue + } + err = fs.WalkDir(os.DirFS(path), ".", func(relativePath string, d fs.DirEntry, err error) error { + if err != nil { + return reporter.UnitErr(ctx, err) + } + if d.IsDir() { + return nil + } + fullPath := filepath.Join(path, relativePath) + item := sources.CommonSourceUnit{ID: fullPath} + return reporter.UnitOk(ctx, item) + }) + if err != nil { + if err := reporter.UnitErr(ctx, err); err != nil { + return err + } } } return nil diff --git a/pkg/sources/filesystem/filesystem_test.go b/pkg/sources/filesystem/filesystem_test.go index e6925fafe..0dccb3ee5 100644 --- a/pkg/sources/filesystem/filesystem_test.go +++ b/pkg/sources/filesystem/filesystem_test.go @@ -2,6 +2,7 @@ package filesystem import ( "os" + "path/filepath" "strings" "testing" "time" @@ -115,14 +116,36 @@ func TestScanFile(t *testing.T) { } func TestEnumerate(t *testing.T) { + // TODO: refactor to allow a virtual filesystem. t.Parallel() ctx := context.Background() // Setup the connection to test enumeration. + dir, err := os.MkdirTemp("", "trufflehog-test-enumerate") + assert.NoError(t, err) + defer os.RemoveAll(dir) + units := []string{ "/one", "/two", "/three", "/path/to/dir/", "/path/to/another/dir/", } + // Prefix the units with the tempdir and create files on disk. + for i, unit := range units { + fullPath := filepath.Join(dir, unit) + units[i] = fullPath + if i < 3 { + f, err := os.Create(fullPath) + assert.NoError(t, err) + f.Close() + } else { + assert.NoError(t, os.MkdirAll(fullPath, 0755)) + // Create a file in the directory for enumeration to find. + f, err := os.CreateTemp(fullPath, "file") + assert.NoError(t, err) + units[i] = f.Name() + f.Close() + } + } conn, err := anypb.New(&sourcespb.Filesystem{ Paths: units[0:3], Directories: units[3:], From 47c6539a419e697e99b8def5ebdd29e8141c04b5 Mon Sep 17 00:00:00 2001 From: roxanne-tampus <51393035+roxanne-tampus@users.noreply.github.com> Date: Wed, 24 Jan 2024 12:46:51 +0800 Subject: [PATCH 33/35] added azuredevopspersonalaccesstoken detector (#2315) * added azuredevopspersonalaccesstoken detector * fix comment * update raw field to include all parts of the credential --------- Co-authored-by: Dustin Decker --- go.mod | 1 - go.sum | 20 --- .../azuredevopspersonalaccesstoken.go | 98 +++++++++++ .../azuredevopspersonalaccesstoken_test.go | 163 ++++++++++++++++++ 4 files changed, 261 insertions(+), 21 deletions(-) create mode 100644 pkg/detectors/azuredevopspersonalaccesstoken/azuredevopspersonalaccesstoken.go create mode 100644 pkg/detectors/azuredevopspersonalaccesstoken/azuredevopspersonalaccesstoken_test.go diff --git a/go.mod b/go.mod index 0d260f798..fc4a9b3bf 100644 --- a/go.mod +++ b/go.mod @@ -172,7 +172,6 @@ require ( github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/flatbuffers v23.1.21+incompatible // indirect - github.com/google/go-github/v56 v56.0.0 // indirect github.com/google/go-github/v57 v57.0.0 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/pprof v0.0.0-20211214055906-6f57359322fd // indirect diff --git a/go.sum b/go.sum index 5b0e993de..0f344b33d 100644 --- a/go.sum +++ b/go.sum @@ -28,8 +28,6 @@ cloud.google.com/go/secretmanager v1.11.4 h1:krnX9qpG2kR2fJ+u+uNyNo+ACVhplIAS4Pu cloud.google.com/go/secretmanager v1.11.4/go.mod h1:wreJlbS9Zdq21lMzWmJ0XhWW2ZxgPeahsqeV/vZoJ3w= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.35.1 h1:B59ahL//eDfx2IIKFBeT5Atm9wnNmj3+8xG/W4WB//w= -cloud.google.com/go/storage v1.35.1/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8= cloud.google.com/go/storage v1.36.0 h1:P0mOkAcaJxhCTvAkMhxMfrTKiNcub4YmmPBtlhAyTr8= cloud.google.com/go/storage v1.36.0/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= @@ -70,8 +68,6 @@ github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUM github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8= github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= -github.com/AzureAD/microsoft-authentication-library-for-go v1.2.0 h1:hVeq+yCyUi+MsoO/CU95yqCIcdzra5ovzk8Q2BBpV2M= -github.com/AzureAD/microsoft-authentication-library-for-go v1.2.0/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 h1:DzHpqpoJVaCgOUdVHxE8QB52S6NiVdDQvGlny1qvPqA= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/BobuSumisu/aho-corasick v1.0.3 h1:uuf+JHwU9CHP2Vx+wAy6jcksJThhJS9ehR8a+4nPE9g= @@ -108,10 +104,6 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= -github.com/aws/aws-sdk-go v1.48.12 h1:n+eGzflzzvYubu2cOjqpVll7lF+Ci0ThyCpg5kzfzbo= -github.com/aws/aws-sdk-go v1.48.12/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= -github.com/aws/aws-sdk-go v1.49.18 h1:g/iMXkfXeJQ7MvnLwroxWsTTNkHtdVJGxIgrAIEG62M= -github.com/aws/aws-sdk-go v1.49.18/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-sdk-go v1.49.19 h1:oZryiqeQpeJsIcAmZlp86duMu/s/DJ43qyfwa51qmLg= github.com/aws/aws-sdk-go v1.49.19/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-sdk-go v1.50.0 h1:HBtrLeO+QyDKnc3t1+5DR1RxodOHCGr8ZcrHudpv7jI= @@ -174,8 +166,6 @@ github.com/bodgit/sevenzip v1.4.5 h1:HFJQ+nbjppfyf2xbQEJBbmVo+o2kTg1FXV4i7YOx87s github.com/bodgit/sevenzip v1.4.5/go.mod h1:LAcAg/UQzyjzCQSGBPZFYzoiHMfT6Gk+3tMSjUk3foY= 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.8.0 h1:yUmoVv70H3J4UOqxqsee39+KlXxNEDfTbAp8c/qULKk= -github.com/bradleyfalzon/ghinstallation/v2 v2.8.0/go.mod h1:fmPmvCiBWhJla3zDv9ZTQSZc8AbwyRnGW1yg5ep1Pcs= github.com/bradleyfalzon/ghinstallation/v2 v2.9.0 h1:HmxIYqnxubRYcYGRc5v3wUekmo5Wv2uX3gukmWJ0AFk= github.com/bradleyfalzon/ghinstallation/v2 v2.9.0/go.mod h1:wmkTDJf8CmVypxE8ijIStFnKoTa6solK5QfdmJrP9KI= github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= @@ -277,8 +267,6 @@ github.com/form3tech-oss/jwt-go v3.2.5+incompatible/go.mod h1:pbq4aXjuKjdthFRnoD 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/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= -github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= 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.25.0 h1:q6Eo+hS+yoJlTO3uu/azhQadsD8V+jQn2D8VvX1eOyI= @@ -392,8 +380,6 @@ github.com/google/go-containerregistry v0.17.0 h1:5p+zYs/R4VGHkhyvgWurWrpJ2hW4Vv github.com/google/go-containerregistry v0.17.0/go.mod h1:u0qB2l7mvtWVR5kNcbFIhFY1hLbf8eeGapA+vbFDCtQ= github.com/google/go-github/v42 v42.0.0 h1:YNT0FwjPrEysRkLIiKuEfSvBPCGKphW5aS5PxwaoLec= github.com/google/go-github/v42 v42.0.0/go.mod h1:jgg/jvyI0YlDOM1/ps6XYh04HNQ3vKf0CVko62/EhRg= -github.com/google/go-github/v56 v56.0.0 h1:TysL7dMa/r7wsQi44BjqlwaHvwlFlqkK8CtBWCX3gb4= -github.com/google/go-github/v56 v56.0.0/go.mod h1:D8cdcX98YWJvi7TLo7zM4/h8ZTx6u6fwGEkCdisopo0= github.com/google/go-github/v57 v57.0.0 h1:L+Y3UPTY8ALM8x+TV0lg+IEBI+upibemtBD8Q9u7zHs= github.com/google/go-github/v57 v57.0.0/go.mod h1:s0omdnye0hvK/ecLvpsGfJMiRt85PimQh4oygmLIxHw= github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= @@ -546,8 +532,6 @@ github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRC github.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.18 h1:JL0eqdCOq6DJVNPSvArO/bIV9/P7fbGrV00LZHc+5aI= -github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI= github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= @@ -783,10 +767,6 @@ golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20231127185646-65229373498e h1:Gvh4YaCaXNs6dKTlfgismwWZKyjVZXwOPfIyUaqU3No= -golang.org/x/exp v0.0.0-20231127185646-65229373498e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= -golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM= -golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e h1:723BNChdd0c2Wk6WOE320qGBiPtYx0F0Bbm1kriShfE= golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA= diff --git a/pkg/detectors/azuredevopspersonalaccesstoken/azuredevopspersonalaccesstoken.go b/pkg/detectors/azuredevopspersonalaccesstoken/azuredevopspersonalaccesstoken.go new file mode 100644 index 000000000..05d33403c --- /dev/null +++ b/pkg/detectors/azuredevopspersonalaccesstoken/azuredevopspersonalaccesstoken.go @@ -0,0 +1,98 @@ +package azuredevopspersonalaccesstoken + +import ( + "context" + "fmt" + "net/http" + "regexp" + "strings" + + "github.com/trufflesecurity/trufflehog/v3/pkg/common" + "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" + "github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb" +) + +type Scanner struct { + client *http.Client +} + +// Ensure the Scanner satisfies the interface at compile time. +var _ detectors.Detector = (*Scanner)(nil) + +var ( + defaultClient = common.SaneHttpClient() + // Make sure that your group is surrounded in boundary characters such as below to reduce false positives. + keyPat = regexp.MustCompile(detectors.PrefixRegex([]string{"azure"}) + `\b([0-9a-z]{52})\b`) + orgPat = regexp.MustCompile(detectors.PrefixRegex([]string{"azure"}) + `\b([0-9a-z]{7,40})\b`) +) + +// Keywords are used for efficiently pre-filtering chunks. +// Use identifiers in the secret preferably, or the provider name. +func (s Scanner) Keywords() []string { + return []string{"azure"} +} + +// FromData will find and optionally verify AzureDevopsPersonalAccessToken secrets in a given set of bytes. +func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (results []detectors.Result, err error) { + dataStr := string(data) + + matches := keyPat.FindAllStringSubmatch(dataStr, -1) + orgMatches := orgPat.FindAllStringSubmatch(dataStr, -1) + + for _, match := range matches { + if len(match) != 2 { + continue + } + resMatch := strings.TrimSpace(match[1]) + for _, orgMatch := range orgMatches { + if len(orgMatch) != 2 { + continue + } + resOrgMatch := strings.TrimSpace(orgMatch[1]) + + s1 := detectors.Result{ + DetectorType: detectorspb.DetectorType_AzureDevopsPersonalAccessToken, + Raw: []byte(resMatch + resOrgMatch), + } + + if verify { + client := s.client + if client == nil { + client = defaultClient + } + req, err := http.NewRequestWithContext(ctx, "GET", "https://dev.azure.com/"+resOrgMatch+"/_apis/projects", nil) + if err != nil { + continue + } + req.SetBasicAuth("", resMatch) + res, err := client.Do(req) + if err == nil { + defer res.Body.Close() + if res.StatusCode >= 200 && res.StatusCode < 300 { + s1.Verified = true + } else if res.StatusCode == 401 { + // The secret is determinately not verified (nothing to do) + } else { + err = fmt.Errorf("unexpected HTTP response status %d", res.StatusCode) + s1.SetVerificationError(err, resMatch) + } + } else { + s1.SetVerificationError(err, resMatch) + } + } + + // This function will check false positives for common test words, but also it will make sure the key appears 'random' enough to be a real key. + if !s1.Verified && detectors.IsKnownFalsePositive(resMatch, detectors.DefaultFalsePositives, true) { + continue + } + + results = append(results, s1) + } + } + + return results, nil +} + +func (s Scanner) Type() detectorspb.DetectorType { + return detectorspb.DetectorType_AzureDevopsPersonalAccessToken +} diff --git a/pkg/detectors/azuredevopspersonalaccesstoken/azuredevopspersonalaccesstoken_test.go b/pkg/detectors/azuredevopspersonalaccesstoken/azuredevopspersonalaccesstoken_test.go new file mode 100644 index 000000000..f4c82babe --- /dev/null +++ b/pkg/detectors/azuredevopspersonalaccesstoken/azuredevopspersonalaccesstoken_test.go @@ -0,0 +1,163 @@ +//go:build detectors +// +build detectors + +package azuredevopspersonalaccesstoken + +import ( + "context" + "fmt" + "testing" + "time" + + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" + + "github.com/trufflesecurity/trufflehog/v3/pkg/detectors" + + "github.com/trufflesecurity/trufflehog/v3/pkg/common" + "github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb" +) + +func TestAzureDevopsPersonalAccessToken_FromChunk(t *testing.T) { + ctx, cancel := context.WithTimeout(context.Background(), time.Second*5) + defer cancel() + testSecrets, err := common.GetSecret(ctx, "trufflehog-testing", "detectors5") + if err != nil { + t.Fatalf("could not get test secrets from GCP: %s", err) + } + secret := testSecrets.MustGetField("AZURE_DEVOPS_PAT") + inactiveSecret := testSecrets.MustGetField("AZURE_DEVOPS_PAT_INACTIVE") + org := testSecrets.MustGetField("AZURE_DEVOPS_PAT_ORG") + + type args struct { + ctx context.Context + data []byte + verify bool + } + tests := []struct { + name string + s Scanner + args args + want []detectors.Result + wantErr bool + wantVerificationErr bool + }{ + { + name: "found, verified", + s: Scanner{}, + args: args{ + ctx: context.Background(), + data: []byte(fmt.Sprintf("You can find a azure secret %s azure organization %s within", secret, org)), + verify: true, + }, + want: []detectors.Result{ + { + DetectorType: detectorspb.DetectorType_AzureDevopsPersonalAccessToken, + Verified: true, + }, + }, + wantErr: false, + wantVerificationErr: false, + }, + { + name: "found, unverified", + s: Scanner{}, + args: args{ + ctx: context.Background(), + data: []byte(fmt.Sprintf("You can find a azure secret %s azure organization %s within but not valid", inactiveSecret, org)), // the secret would satisfy the regex but not pass validation + verify: true, + }, + want: []detectors.Result{ + { + DetectorType: detectorspb.DetectorType_AzureDevopsPersonalAccessToken, + Verified: false, + }, + }, + wantErr: false, + wantVerificationErr: false, + }, + { + name: "not found", + s: Scanner{}, + args: args{ + ctx: context.Background(), + data: []byte("You cannot find the secret within"), + verify: true, + }, + want: nil, + wantErr: false, + wantVerificationErr: false, + }, + { + name: "found, would be verified if not for timeout", + s: Scanner{client: common.SaneHttpClientTimeOut(1 * time.Microsecond)}, + args: args{ + ctx: context.Background(), + data: []byte(fmt.Sprintf("You can find a azure secret %s azure organization %s within", secret, org)), + verify: true, + }, + want: []detectors.Result{ + { + DetectorType: detectorspb.DetectorType_AzureDevopsPersonalAccessToken, + Verified: false, + }, + }, + wantErr: false, + wantVerificationErr: true, + }, + { + name: "found, verified but unexpected api surface", + s: Scanner{client: common.ConstantResponseHttpClient(404, "")}, + args: args{ + ctx: context.Background(), + data: []byte(fmt.Sprintf("You can find a azure secret %s azure organization %s within", secret, org)), + verify: true, + }, + want: []detectors.Result{ + { + DetectorType: detectorspb.DetectorType_AzureDevopsPersonalAccessToken, + Verified: false, + }, + }, + wantErr: false, + wantVerificationErr: true, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + got, err := tt.s.FromData(tt.args.ctx, tt.args.verify, tt.args.data) + if (err != nil) != tt.wantErr { + t.Errorf("AzureDevopsPersonalAccessToken.FromData() error = %v, wantErr %v", err, tt.wantErr) + return + } + for i := range got { + if len(got[i].Raw) == 0 { + t.Fatalf("no raw secret present: \n %+v", got[i]) + } + if (got[i].VerificationError() != nil) != tt.wantVerificationErr { + t.Fatalf("wantVerificationError = %v, verification error = %v", tt.wantVerificationErr, got[i].VerificationError()) + } + } + ignoreOpts := cmpopts.IgnoreFields(detectors.Result{}, "Raw", "verificationError") + if diff := cmp.Diff(got, tt.want, ignoreOpts); diff != "" { + t.Errorf("AzureDevopsPersonalAccessToken.FromData() %s diff: (-got +want)\n%s", tt.name, diff) + } + }) + } +} + +func BenchmarkFromData(benchmark *testing.B) { + ctx := context.Background() + s := Scanner{} + for name, data := range detectors.MustGetBenchmarkData() { + benchmark.Run(name, func(b *testing.B) { + b.ResetTimer() + for n := 0; n < b.N; n++ { + _, err := s.FromData(ctx, false, data) + if err != nil { + b.Fatal(err) + } + } + }) + } +} From 792266afa9b92860d6aa3454bf85e4d73d71d6ec Mon Sep 17 00:00:00 2001 From: joeleonjr <20135619+joeleonjr@users.noreply.github.com> Date: Wed, 24 Jan 2024 12:20:33 -0500 Subject: [PATCH 34/35] updating doppler logic (#2329) * updating doppler logic * added json response struct --- pkg/detectors/doppler/doppler.go | 38 ++++++++++++++++++++++++--- pkg/detectors/doppler/doppler_test.go | 4 +++ 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/pkg/detectors/doppler/doppler.go b/pkg/detectors/doppler/doppler.go index 1e27f1566..20de7114f 100644 --- a/pkg/detectors/doppler/doppler.go +++ b/pkg/detectors/doppler/doppler.go @@ -2,6 +2,8 @@ package doppler import ( "context" + "encoding/json" + "fmt" regexp "github.com/wasilibs/go-re2" "net/http" "strings" @@ -11,6 +13,14 @@ import ( "github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb" ) +type response struct { + Name string `json:"name"` + Type string `json:"type"` + Workplace struct { + Name string `json:"name"` + } `json:"workplace"` +} + type Scanner struct{} // Ensure the Scanner satisfies the interface at compile time. @@ -20,13 +30,21 @@ var ( client = common.SaneHttpClient() // Make sure that your group is surrounded in boundary characters such as below to reduce false positives. - keyPat = regexp.MustCompile(`\b(dp\.pt\.[a-zA-Z0-9]{43})\b`) + //keyPat = regexp.MustCompile(`\b(dp\.pt\.[a-zA-Z0-9]{43})\b`) + keyPat = regexp.MustCompile(`\b(dp\.(?:ct|pt|st(?:\.[a-z0-9\-_]{2,35})?|sa|scim|audit)\.[a-zA-Z0-9]{40,44})\b`) ) // Keywords are used for efficiently pre-filtering chunks. // Use identifiers in the secret preferably, or the provider name. func (s Scanner) Keywords() []string { - return []string{"dp.pt."} + return []string{ + "dp.ct.", + "dp.pt.", + "dp.st", + "dp.sa.", + "dp.scim.", + "dp.audit.", + } } // FromData will find and optionally verify Doppler secrets in a given set of bytes. @@ -44,20 +62,32 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result s1 := detectors.Result{ DetectorType: detectorspb.DetectorType_Doppler, Raw: []byte(resMatch), + ExtraData: map[string]string{}, } if verify { - req, err := http.NewRequestWithContext(ctx, "GET", "https://api.doppler.com/v3/workplace", nil) + req, err := http.NewRequestWithContext(ctx, "GET", "https://api.doppler.com/v3/me", nil) if err != nil { continue } req.Header.Add("Accept", "application/json") - req.SetBasicAuth(resMatch, "") + req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", resMatch)) res, err := client.Do(req) if err == nil { defer res.Body.Close() if res.StatusCode >= 200 && res.StatusCode < 300 { s1.Verified = true + var r response + if err := json.NewDecoder(res.Body).Decode(&r); err != nil { + s1.SetVerificationError(err, resMatch) + continue + } + if r.Type != "" { + s1.ExtraData["key type"] = r.Type + } + if r.Workplace.Name != "" { + s1.ExtraData["workplace"] = r.Workplace.Name + } } else { // This function will check false positives for common test words, but also it will make sure the key appears 'random' enough to be a real key. if detectors.IsKnownFalsePositive(resMatch, detectors.DefaultFalsePositives, true) { diff --git a/pkg/detectors/doppler/doppler_test.go b/pkg/detectors/doppler/doppler_test.go index dc7374b42..8e8a88893 100644 --- a/pkg/detectors/doppler/doppler_test.go +++ b/pkg/detectors/doppler/doppler_test.go @@ -50,6 +50,10 @@ func TestDoppler_FromChunk(t *testing.T) { { DetectorType: detectorspb.DetectorType_Doppler, Verified: true, + ExtraData: map[string]string{ + "key type": "personal", + "workplace": "test", + }, }, }, wantErr: false, From f209b04d5d24b3a0f10a61bd7d43930b3a917e84 Mon Sep 17 00:00:00 2001 From: ahrav Date: Wed, 24 Jan 2024 16:43:56 -0800 Subject: [PATCH 35/35] add priority semaphore (#2336) --- pkg/sources/source_manager.go | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkg/sources/source_manager.go b/pkg/sources/source_manager.go index bfc846ce0..25722ccf0 100644 --- a/pkg/sources/source_manager.go +++ b/pkg/sources/source_manager.go @@ -19,8 +19,9 @@ type SourceManager struct { api apiClient hooks []JobProgressHook // Pool limiting the amount of concurrent sources running. - sem semaphore.Semaphore - wg sync.WaitGroup + sem semaphore.Semaphore + prioritySem semaphore.Semaphore + wg sync.WaitGroup // Max number of units to scan concurrently per source. concurrentUnits int // Run the sources using source unit enumeration / chunking if available. @@ -60,6 +61,13 @@ func WithConcurrentSources(concurrency int) func(*SourceManager) { } } +// WithConcurrentTargets limits the concurrent number of targets a manager can run. +func WithConcurrentTargets(concurrency int) func(*SourceManager) { + return func(mgr *SourceManager) { + mgr.prioritySem.SetLimit(concurrency) + } +} + // WithBufferedOutput sets the size of the buffer used for the Chunks() channel. func WithBufferedOutput(size int) func(*SourceManager) { return func(mgr *SourceManager) { mgr.outputChunks = make(chan *Chunk, size) } @@ -89,6 +97,7 @@ func NewManager(opts ...func(*SourceManager)) *SourceManager { // Default to the headless API. Can be overwritten by the WithAPI option. api: &headlessAPI{}, sem: semaphore.New(runtime.NumCPU()), + prioritySem: semaphore.New(runtime.NumCPU()), outputChunks: make(chan *Chunk), firstErr: make(chan error, 1), } @@ -116,9 +125,13 @@ func (s *SourceManager) Run(ctx context.Context, sourceName string, source Sourc }, err } // Create a JobProgress object for tracking progress. + sem := s.sem + if len(targets) > 0 { + sem = s.prioritySem + } ctx, cancel := context.WithCancelCause(ctx) progress := NewJobProgress(jobID, sourceID, sourceName, WithHooks(s.hooks...), WithCancel(cancel)) - if err := s.sem.Acquire(ctx, 1); err != nil { + if err := sem.Acquire(ctx, 1); err != nil { // Context cancelled. progress.ReportError(Fatal{err}) return progress.Ref(), Fatal{err} @@ -127,7 +140,7 @@ func (s *SourceManager) Run(ctx context.Context, sourceName string, source Sourc go func() { // Call Finish after the semaphore has been released. defer progress.Finish() - defer s.sem.Release(1) + defer sem.Release(1) defer s.wg.Done() ctx := context.WithValues(ctx, "source_manager_worker_id", common.RandomID(5),