Find, verify, and analyze leaked credentials
Go credentialsdevsecopsdynamic-analysisprecommitscanningsecretsecret-managementsecretssecuritysecurity-toolstrufflehogverification
Add generic JWT detection and verification (#4441)
Brad Larsenaade3bff5594
diff --git a/README.md b/README.mdindex f990deea0..dd1f98199 100644--- a/README.md+++ b/README.md@@ -30,7 +30,7 @@ To learn more about TruffleHog and its features and capabilities, visit our [pro# :globe_with_meridians: TruffleHog Enterprise-Are you interested in continuously monitoring **Git, Jira, Slack, Confluence, Microsoft Teams, Sharepoint, and more..** for credentials? We have an enterprise product that can help! Learn more at <https://trufflesecurity.com/trufflehog-enterprise>.+Are you interested in continuously monitoring **Git, Jira, Slack, Confluence, Microsoft Teams, Sharepoint (and more)** for credentials? We have an enterprise product that can help! Learn more at <https://trufflesecurity.com/trufflehog-enterprise>.We take the revenue from the enterprise product to fund more awesome open source projects that the whole community can benefit from.@@ -38,11 +38,11 @@ We take the revenue from the enterprise product to fund more awesome open source# What is TruffleHog π½-TruffleHog is the most powerful secrets **Discovery, Classification, Validation,** and **Analysis** tool. In this context, secret refers to a credential a machine uses to authenticate itself to another machine. This includes API keys, database passwords, private encryption keys, and more...+TruffleHog is the most powerful secrets **Discovery, Classification, Validation,** and **Analysis** tool. In this context, secret refers to a credential a machine uses to authenticate itself to another machine. This includes API keys, database passwords, private encryption keys, and more.## Discovery π-TruffleHog can look for secrets in many places including Git, chats, wikis, logs, API testing platforms, object stores, filesystems and more+TruffleHog can look for secrets in many places including Git, chats, wikis, logs, API testing platforms, object stores, filesystems and more.## Classification π@@ -675,7 +675,7 @@ TruffleHog can be used in a pre-commit hook to prevent credentials from leakingSee the [pre-commit hook documentation](PreCommit.md) for more information.-## Regex Detector (alpha)+## Custom Regex Detector (alpha)TruffleHog supports detection and verification of custom regular expressions.For detection, at least one **regular expression** and **keyword** is required.@@ -696,6 +696,10 @@ your custom detector has multiple `regex` set (in this example `hogID`, and `hog### Regex Detector Example[Here](/pkg/custom_detectors/CUSTOM_DETECTORS.md) is how to setup a custom regex detector with verification server.+## Generic JWT Detection++TruffleHog supports detection and verification of a subset of generic JWTs it finds.+Specifically, if a JWT uses public-key cryptography rather than HMAC and the public key can be obtained, TruffleHog can determine whether the JWT is live or not.## :mag: Analyzediff --git a/go.mod b/go.modindex f3f3b0412..738e5c831 100644--- a/go.mod+++ b/go.mod@@ -1,6 +1,6 @@module github.com/trufflesecurity/trufflehog/v3-go 1.24+go 1.24.0toolchain go1.24.5@@ -70,6 +70,7 @@ require (github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213github.com/klauspost/pgzip v1.2.6github.com/kylelemons/godebug v1.1.0+ github.com/lestrrat-go/jwx/v3 v3.0.12github.com/lib/pq v1.10.9github.com/lrstanley/bubblezone v0.0.0-20250404061050-e13639e27357github.com/marusama/semaphore/v2 v2.5.0@@ -90,7 +91,7 @@ require (github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3github.com/shuheiktgw/go-travis v0.3.1github.com/shurcooL/githubv4 v0.0.0-20240727222349-48295856cce7- github.com/stretchr/testify v1.10.0+ github.com/stretchr/testify v1.11.1github.com/testcontainers/testcontainers-go v0.34.0github.com/testcontainers/testcontainers-go/modules/elasticsearch v0.34.0github.com/testcontainers/testcontainers-go/modules/mongodb v0.34.0@@ -105,11 +106,11 @@ require (go.uber.org/automaxprocs v1.6.0go.uber.org/mock v0.5.2go.uber.org/zap v1.27.0- golang.org/x/crypto v0.41.0- golang.org/x/net v0.43.0+ golang.org/x/crypto v0.43.0+ golang.org/x/net v0.45.0golang.org/x/oauth2 v0.30.0- golang.org/x/sync v0.16.0- golang.org/x/text v0.28.0+ golang.org/x/sync v0.17.0+ golang.org/x/text v0.30.0golang.org/x/time v0.12.0google.golang.org/api v0.247.0google.golang.org/protobuf v1.36.9@@ -184,6 +185,7 @@ require (github.com/cpuguy83/dockercfg v0.3.2 // indirectgithub.com/cyphar/filepath-securejoin v0.3.6 // indirectgithub.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect+ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirectgithub.com/distribution/reference v0.6.0 // indirectgithub.com/dlclark/regexp2 v1.11.0 // indirectgithub.com/docker/cli v28.2.2+incompatible // indirect@@ -204,6 +206,7 @@ require (github.com/go-jose/go-jose/v4 v4.0.5 // indirectgithub.com/go-logr/stdr v1.2.2 // indirectgithub.com/go-ole/go-ole v1.2.6 // indirect+ github.com/goccy/go-json v0.10.3 // indirectgithub.com/gofrs/flock v0.12.1 // indirectgithub.com/gogo/protobuf v1.3.2 // indirectgithub.com/golang-jwt/jwt/v4 v4.5.2 // indirect@@ -229,6 +232,11 @@ require (github.com/kevinburke/ssh_config v1.2.0 // indirectgithub.com/kjk/lzma v0.0.0-20161016003348-3fd93898850d // indirectgithub.com/klauspost/compress v1.18.0 // indirect+ github.com/lestrrat-go/blackmagic v1.0.4 // indirect+ github.com/lestrrat-go/httpcc v1.0.1 // indirect+ github.com/lestrrat-go/httprc/v3 v3.0.1 // indirect+ github.com/lestrrat-go/option v1.0.1 // indirect+ github.com/lestrrat-go/option/v2 v2.0.0 // indirectgithub.com/lucasb-eyer/go-colorful v1.2.0 // indirectgithub.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirectgithub.com/magiconair/properties v1.8.7 // indirect@@ -265,6 +273,7 @@ require (github.com/prometheus/procfs v0.15.1 // indirectgithub.com/rivo/uniseg v0.4.7 // indirectgithub.com/sahilm/fuzzy v0.1.1-0.20230530133925-c48e322e2a8f // indirect+ github.com/segmentio/asm v1.2.1 // indirectgithub.com/sendgrid/rest v2.6.9+incompatible // indirectgithub.com/shirou/gopsutil/v3 v3.23.12 // indirectgithub.com/shoenig/go-m1cpu v0.1.6 // indirect@@ -307,9 +316,9 @@ require (go.uber.org/multierr v1.11.0 // indirectgo4.org v0.0.0-20230225012048-214862532bf5 // indirectgolang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect- golang.org/x/mod v0.26.0 // indirect- golang.org/x/sys v0.35.0 // indirect- golang.org/x/term v0.34.0 // indirect+ golang.org/x/mod v0.28.0 // indirect+ golang.org/x/sys v0.37.0 // indirect+ golang.org/x/term v0.36.0 // indirectgoogle.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirectgoogle.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirectgoogle.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirectdiff --git a/go.sum b/go.sumindex 45d397219..57291d65a 100644--- a/go.sum+++ b/go.sum@@ -249,6 +249,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsgithub.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=+github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvwDRwnI3hwNaAHRnc=+github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40=github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=@@ -348,6 +350,8 @@ github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAgithub.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=+github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=+github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E=github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0=github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=@@ -516,6 +520,22 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=+github.com/lestrrat-go/blackmagic v1.0.4 h1:IwQibdnf8l2KoO+qC3uT4OaTWsW7tuRQXy9TRN9QanA=+github.com/lestrrat-go/blackmagic v1.0.4/go.mod h1:6AWFyKNNj0zEXQYfTMPfZrAXUWUfTIZ5ECEUEJaijtw=+github.com/lestrrat-go/dsig v1.0.0 h1:OE09s2r9Z81kxzJYRn07TFM9XA4akrUdoMwr0L8xj38=+github.com/lestrrat-go/dsig v1.0.0/go.mod h1:dEgoOYYEJvW6XGbLasr8TFcAxoWrKlbQvmJgCR0qkDo=+github.com/lestrrat-go/dsig-secp256k1 v1.0.0 h1:JpDe4Aybfl0soBvoVwjqDbp+9S1Y2OM7gcrVVMFPOzY=+github.com/lestrrat-go/dsig-secp256k1 v1.0.0/go.mod h1:CxUgAhssb8FToqbL8NjSPoGQlnO4w3LG1P0qPWQm/NU=+github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE=+github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=+github.com/lestrrat-go/httprc/v3 v3.0.1 h1:3n7Es68YYGZb2Jf+k//llA4FTZMl3yCwIjFIk4ubevI=+github.com/lestrrat-go/httprc/v3 v3.0.1/go.mod h1:2uAvmbXE4Xq8kAUjVrZOq1tZVYYYs5iP62Cmtru00xk=+github.com/lestrrat-go/jwx/v3 v3.0.12 h1:p25r68Y4KrbBdYjIsQweYxq794CtGCzcrc5dGzJIRjg=+github.com/lestrrat-go/jwx/v3 v3.0.12/go.mod h1:HiUSaNmMLXgZ08OmGBaPVvoZQgJVOQphSrGr5zMamS8=+github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU=+github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=+github.com/lestrrat-go/option/v2 v2.0.0 h1:XxrcaJESE1fokHy3FpaQ/cXW8ZsIdWcdFzzLOcID3Ss=+github.com/lestrrat-go/option/v2 v2.0.0/go.mod h1:oSySsmzMoR0iRzCDCaUfsCzxQHUEuhOViQObyy7S6Vg=github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=github.com/lrstanley/bubblezone v0.0.0-20250404061050-e13639e27357 h1:DxFncLGTrDh5v0z+DE7h+qjD5tPCGR+3knGVVfT3YLI=@@ -654,6 +674,8 @@ github.com/sassoftware/go-rpmutils v0.4.0 h1:ojND82NYBxgwrV+mX1CWsd5QJvvEZTKddtCgithub.com/sassoftware/go-rpmutils v0.4.0/go.mod h1:3goNWi7PGAT3/dlql2lv3+MSN5jNYPjT5mVcQcIsYzI=github.com/schollz/progressbar/v3 v3.17.1 h1:bI1MTaoQO+v5kzklBjYNRQLoVpe0zbyRZNK6DFkVC5U=github.com/schollz/progressbar/v3 v3.17.1/go.mod h1:RzqpnsPQNjUyIgdglUjRLgD7sVnxN1wpmBMV+UiEbL4=+github.com/segmentio/asm v1.2.1 h1:DTNbBqs57ioxAD4PrArqftgypG4/qNpXoJx8TVXxPR0=+github.com/segmentio/asm v1.2.1/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=github.com/sendgrid/rest v2.6.9+incompatible h1:1EyIcsNdn9KIisLW50MKwmSRSK+ekueiEMJ7NEoxJo0=github.com/sendgrid/rest v2.6.9+incompatible/go.mod h1:kXX7q3jZtJXK5c5qK83bSGMdV6tsOE70KbHoqJls4lE=github.com/sendgrid/sendgrid-go v3.16.1+incompatible h1:zWhTmB0Y8XCDzeWIm2/BIt1GjJohAA0p6hVEaDtHWWs=@@ -696,13 +718,14 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfgithub.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=github.com/testcontainers/testcontainers-go v0.34.0 h1:5fbgF0vIN5u+nD3IWabQwRybuB4GY8G2HHgCkbMzMHo=github.com/testcontainers/testcontainers-go v0.34.0/go.mod h1:6P/kMkQe8yqPHfPWNulFGdFHTD8HB2vLq/231xY2iPQ=github.com/testcontainers/testcontainers-go/modules/elasticsearch v0.34.0 h1:BBwJUs9xBpt1uOfO+yAr2pYW75MsyzuO/o70HTPnhe4=@@ -732,6 +755,8 @@ github.com/trufflesecurity/touchfile v0.1.1/go.mod h1:Yg/AUMrxAk+dWDUjIig0OyGgFOgithub.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=+github.com/valyala/fastjson v1.6.4 h1:uAUNq9Z6ymTgGhcm0UynUAB6tlbakBrz6CQFax3BXVQ=+github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=github.com/vbatts/tar-split v0.12.1 h1:CqKoORW7BUWBe7UL/iqTVvkTBOF8UvOMKOIZykxnnbo=github.com/vbatts/tar-split v0.12.1/go.mod h1:eF6B6i6ftWQcDqEn3/iGFRFRo8cBIMSJVOpnNdfTMFA=github.com/wasilibs/go-re2 v1.9.0 h1:kjAd8qbNvV4Ve2Uf+zrpTCrDHtqH4dlsRXktywo73JQ=@@ -827,8 +852,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8Ugolang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=-golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=-golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=+golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=+golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=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=@@ -858,8 +883,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBgolang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=-golang.org/x/mod v0.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg=-golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=+golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U=+golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI=golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=@@ -881,8 +906,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9vgolang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=-golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=-golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=+golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM=+golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=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=@@ -898,8 +923,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJgolang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=-golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=-golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=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=@@ -941,13 +966,13 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=-golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=-golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=+golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=+golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=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.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=-golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=-golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=+golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=+golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=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=@@ -957,8 +982,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=-golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=-golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=+golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=+golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=diff --git a/pkg/detectors/alchemy/alchemy_test.go b/pkg/detectors/alchemy/alchemy_test.goindex 6473aebcf..ce397c363 100644--- a/pkg/detectors/alchemy/alchemy_test.go+++ b/pkg/detectors/alchemy/alchemy_test.go@@ -32,12 +32,12 @@ func TestAlchemy_Pattern(t *testing.T) {name: "valid pattern - xml",input: `<com.cloudbees.plugins.credentials.impl.StringCredentialsImpl>- <scope>GLOBAL</scope>- <id>{alchemy}</id>- <secret>{alchemy AQAAABAAA 5iqW7gKQVXvwnykF9xAVfenemmnUJznI}</secret>- <description>configuration for production</description>+ <scope>GLOBAL</scope>+ <id>{alchemy}</id>+ <secret>{alchemy AQAAABAAA 5iqW7gKQVXvwnykF9xAVfenemmnUJznI}</secret>+ <description>configuration for production</description><creationDate>2023-05-18T14:32:10Z</creationDate>- <owner>jenkins-admin</owner>+ <owner>jenkins-admin</owner></com.cloudbees.plugins.credentials.impl.StringCredentialsImpl>`,want: []string{"5iqW7gKQVXvwnykF9xAVfenemmnUJznI"},diff --git a/pkg/detectors/detectors.go b/pkg/detectors/detectors.goindex 1be6d1c1f..473e52714 100644--- a/pkg/detectors/detectors.go+++ b/pkg/detectors/detectors.go@@ -17,10 +17,13 @@ import (// Detector defines an interface for scanning for and verifying secrets.type Detector interface {- // FromData will scan bytes for results, and optionally verify them.+ // FromData will scan bytes for results and optionally verify them.FromData(ctx context.Context, verify bool, data []byte) ([]Result, error)// Keywords are used for efficiently pre-filtering chunks using substring operations.// Use unique identifiers that are part of the secret if you can, or the provider name.+ //+ // When multiple keywords are provided, they are is treated as a *union* of filtering terms.+ // That is, if any of the keywords are found in a chunk, the chunk will be run through the detector.Keywords() []string// Type returns the DetectorType number from detectors.proto for the given detector.Type() detectorspb.DetectorType@@ -89,6 +92,7 @@ type Result struct {DetectorType detectorspb.DetectorType// DetectorName is the name of the Detector. Used for custom detectors.DetectorName string+ // Verified indicates whether the result was verified or not.Verified bool// VerificationFromCache indicates whether this result's verification result came from the verification cache rather// than an actual remote request.@@ -104,7 +108,7 @@ type Result struct {ExtraData map[string]stringStructuredData *detectorspb.StructuredData- // This field should only be populated if the verification process itself failed in a way that provides no+ // verificationError should be populated if the verification process itself failed in a way that provides no// information about the verification status of the candidate secret, such as if the verification request timed out.verificationError error@@ -167,7 +171,7 @@ func redactSecrets(err error, secrets ...string) error {lastErr := unwrapToLast(err)errStr := lastErr.Error()for _, secret := range secrets {- errStr = strings.Replace(errStr, secret, "[REDACTED]", -1)+ errStr = strings.ReplaceAll(errStr, secret, "[REDACTED]")}return errors.New(errStr)}@@ -289,7 +293,7 @@ func MustGetBenchmarkData() map[string][]byte {for key, size := range sizes {// Generating a byte slice of a specific size with random data.content := make([]byte, size)- for i := 0; i < size; i++ {+ for i := range(size) {randomByte, err := rand.Int(rand.Reader, big.NewInt(256))if err != nil {panic(err)@@ -304,7 +308,7 @@ func MustGetBenchmarkData() map[string][]byte {func RedactURL(u url.URL) string {u.User = url.UserPassword(u.User.Username(), "********")- return strings.TrimSpace(strings.Replace(u.String(), "%2A", "*", -1))+ return strings.TrimSpace(strings.ReplaceAll(u.String(), "%2A", "*"))}func ParseURLAndStripPathAndParams(u string) (*url.URL, error) {diff --git a/pkg/detectors/jwt/jwt.go b/pkg/detectors/jwt/jwt.gonew file mode 100644index 000000000..f69d5b7ac--- /dev/null+++ b/pkg/detectors/jwt/jwt.go@@ -0,0 +1,313 @@+package jwt++import (+ "cmp"+ "context"+ "encoding/json"+ "fmt"+ "io"+ "net"+ "net/http"+ "net/url"+ "strings"+ "time"++ "github.com/golang-jwt/jwt/v5"+ "github.com/lestrrat-go/jwx/v3/jwk"++ 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"+)++type Scanner struct {+ client *http.Client+}++// Ensure the Scanner satisfies expected interfaces at compile time.+var _ interface {+ detectors.Detector+ detectors.MaxSecretSizeProvider+} = (*Scanner)(nil)++var keyPat = regexp.MustCompile(`\b((?:eyJ|ewogIC|ewoid)[A-Za-z0-9_-]{12,}={0,2}\.(?:eyJ|ewo)[A-Za-z0-9_-]{12,}={0,2}\.[A-Za-z0-9_-]{12,})\b`)++// The default max secret size value for this detector must be overridden or JWTs with lots of claims will get missed.+func (s Scanner) MaxSecretSize() int64 {+ return 4096+}++// These keywords are derived from prefixes of the base64url-encoded versions of JSON object strings like the following:+//+// `{"typ":"`+// `{"alg":"`+// `{\n "typ":"`+// `{\n "typ":"`+func (s Scanner) Keywords() []string {+ return []string{+ "ewogIC",+ "ewoid",+ "eyJ",+ }+}++var jwtOptions = []jwt.ParserOption{+ jwt.WithValidMethods([]string{+ // HMAC-based algorithms+ // jwt.SigningMethodHS256.Alg(),+ // jwt.SigningMethodHS384.Alg(),+ // jwt.SigningMethodHS512.Alg(),++ // Public key-based algorithms+ jwt.SigningMethodRS256.Alg(),+ jwt.SigningMethodRS384.Alg(),+ jwt.SigningMethodRS512.Alg(),+ jwt.SigningMethodEdDSA.Alg(),+ jwt.SigningMethodES256.Alg(),+ jwt.SigningMethodES384.Alg(),+ jwt.SigningMethodES512.Alg(),+ jwt.SigningMethodPS256.Alg(),+ jwt.SigningMethodPS384.Alg(),+ jwt.SigningMethodPS512.Alg(),+ }),+ jwt.WithIssuedAt(),+ jwt.WithPaddingAllowed(),+ jwt.WithLeeway(time.Minute),+}++var jwtParser = jwt.NewParser(jwtOptions...)++var jwtValidator = jwt.NewValidator(jwtOptions...)++// FromData will find and optionally verify JWT secrets in a given set of bytes.+func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (results []detectors.Result, err error) {+ client := cmp.Or(s.client, common.SaneHttpClient())+ seenMatches := make(map[string]struct{})++ for _, matchGroups := range keyPat.FindAllStringSubmatch(string(data), -1) {+ match := matchGroups[1]++ if _, ok := seenMatches[match]; ok {+ continue+ }+ seenMatches[match] = struct{}{}++ claims := jwt.MapClaims{}+ parsedToken, tokenParts, err := jwtParser.ParseUnverified(match, claims)+ if err != nil || len(tokenParts) != 3 {+ // skip malformed tokens; no need to do claims validation or signature verification+ continue+ }++ switch parsedToken.Method.Alg() {+ case "HS256", "HS384", "HS512":+ // The JWT *might* be valid, but we can't in general do signature verification on HMAC-based algorithms.+ // We don't have a suitable status to represent this situation in trufflehog.+ // (The `unknown` status is intended to indicate that an error occurred to to external environment conditions, like trannsient network errors.)+ // So instead, to avoid possible false positives, totally skip HMAC-based JWTs; don't even create results for them.+ continue+ }++ // Decode signature+ parsedToken.Signature, err = jwtParser.DecodeSegment(tokenParts[2])+ if err != nil {+ // skip JWTs with malformed signatures+ continue+ }++ issString, _ := claims.GetIssuer()++ iatString := ""+ iat, err := claims.GetIssuedAt()+ if err == nil && iat != nil {+ iatString = iat.String()+ }++ expString := ""+ exp, err := claims.GetExpirationTime()+ if err == nil && exp != nil {+ expString = exp.String()+ }++ extraData := map[string]string{+ "alg": parsedToken.Method.Alg(),+ "iss": issString,+ "iat": iatString,+ "exp": expString,+ }++ s1 := detectors.Result{+ DetectorType: detectorspb.DetectorType_JWT,+ Raw: []byte(match),+ ExtraData: extraData,+ }++ if verify {+ isVerified, verificationErr := verifyJWT(ctx, client, tokenParts, parsedToken)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, match)+ }++ results = append(results, s1)+ }++ return+}++// Does the URL's refer to a non-routing host?+func isNonRoutingHost(url *url.URL) bool {+ h := url.Hostname()+ if h == "localhost" {+ return true+ }++ ip := net.ParseIP(h)+ if ip != nil {+ return ip.IsPrivate()+ }++ return false+}++// Parse a string into a URL, check that it is an HTTPS URL, and that it doesn't refer to a non-routing host.+func parseRoutableHttpsUrl(urlString string) (*url.URL, error) {+ url, err := url.ParseRequestURI(urlString)+ if err != nil {+ return nil, err+ }+ if url.Scheme != "https" {+ return nil, fmt.Errorf("only https scheme is supported")+ }+ if isNonRoutingHost(url) {+ return nil, fmt.Errorf("only public hosts are supported")+ }++ return url, nil+}++func performHttpRequest(ctx context.Context, client *http.Client, method string, url string) (*http.Response, error) {+ req, err := http.NewRequestWithContext(ctx, method, url, nil)+ if err != nil {+ return nil, fmt.Errorf("failed to create request: %w", err)+ }+ resp, err := client.Do(req)+ if err != nil {+ return nil, fmt.Errorf("failed to perform request: %w", err)+ }+ return resp, nil+}++// Wrap an `io.Reader` with a reasonable limit as an additional measure against DoS from a malicious JWKS issuer+func limitReader(reader io.Reader) io.Reader {+ return io.LimitReader(reader, 1024*1024)+}++// Attempt to verify a JWT+//+// This cannot be done in general, but in a few special cases we can get definitive answers.+//+// In particular:+//+// - If the JWT uses public key cryptography and the OIDC Discovery protocol, we can fetch the public key and perform signature verification+// - In all cases, we can perform claims validation (e.g., checking expiration time) and sometimes get a definite answer that a JWT is *not* live+func verifyJWT(ctx context.Context, client *http.Client, tokenParts []string, parsedToken *jwt.Token) (bool, error) {+ if err := jwtValidator.Validate(parsedToken.Claims); err != nil {+ // though we have not checked the signature, the token is definitely invalid+ return false, nil+ }++ // Use the OIDC Discovery protocol to fetch the public signing key,+ // being careful to avoid possible DoS from a potentially malicious JWKS server.+ issuer, err := parsedToken.Claims.GetIssuer()+ if err != nil || issuer == "" {+ // missing or invalid issuer+ return false, nil+ }+ issuerURL, err := parseRoutableHttpsUrl(issuer)+ if err != nil {+ // unsupported issuer+ return false, nil+ }++ oidcDiscoveryURL := issuerURL.JoinPath(".well-known/openid-configuration")++ // Check for a proper key id before making any network requests+ kid, ok := parsedToken.Header["kid"].(string)+ if !ok {+ // invalid key id+ return false, nil+ }++ // Fetch the OIDC discovery document+ resp, err := performHttpRequest(ctx, client, "GET", oidcDiscoveryURL.String())+ if err != nil {+ return false, fmt.Errorf("failed to perform OIDC discovery: %w", err)+ }+ defer resp.Body.Close()+ if resp.StatusCode != 200 {+ return false, fmt.Errorf("bad status for OIDC discovery document: %v", resp.Status)+ }++ // Get the JWKS URL from the OIDC discovery document+ var discoveryDoc struct {+ JWKSUri string `json:"jwks_uri"`+ }+ if err := json.NewDecoder(limitReader(resp.Body)).Decode(&discoveryDoc); err != nil {+ return false, fmt.Errorf("failed to decode OIDC discovery document: %w", err)+ }++ jwksURL, err := parseRoutableHttpsUrl(discoveryDoc.JWKSUri)+ if err != nil {+ return false, fmt.Errorf("invalid JWKS URL: %w", err)+ }++ if jwksURL.Host != issuerURL.Host {+ return false, fmt.Errorf("JWKS host does not match issuer host: %q", discoveryDoc.JWKSUri)+ }++ // Fetch the JWKS+ resp, err = performHttpRequest(ctx, client, "GET", discoveryDoc.JWKSUri)+ if err != nil {+ return false, fmt.Errorf("failed to fetch JWKS: %w", err)+ }+ defer resp.Body.Close()+ if resp.StatusCode != 200 {+ return false, fmt.Errorf("bad status for JWKS: %v", resp.Status)+ }++ // Parse the JWKS and find the first matching key+ keySet, err := jwk.ParseReader(limitReader(resp.Body))+ if err != nil {+ return false, fmt.Errorf("failed to parse JWKS: %w", err)+ }+ matchingKey, found := keySet.LookupKeyID(kid)+ if !found {+ return false, fmt.Errorf("no matching JWKS key")+ }++ // Parse matching key to the "raw" key type needed for signature verification+ var rawMatchingKey any+ err = jwk.Export(matchingKey, &rawMatchingKey)+ if err != nil {+ return false, fmt.Errorf("failed to export matching key: %w", err)+ }++ err = parsedToken.Method.Verify(strings.Join(tokenParts[0:2], "."), parsedToken.Signature, rawMatchingKey)+ if err != nil {+ // signature invalid+ return false, nil+ }++ // signature valid and claims check out+ return true, nil+}++func (s Scanner) Type() detectorspb.DetectorType {+ return detectorspb.DetectorType_JWT+}++func (s Scanner) Description() string {+ return "A JSON Web Token (JWT) is an approach to authentication or authorization that does not depend on server-side data. It may allow access to protected resources."+}diff --git a/pkg/detectors/jwt/jwt_test.go b/pkg/detectors/jwt/jwt_test.gonew file mode 100644index 000000000..ede498035--- /dev/null+++ b/pkg/detectors/jwt/jwt_test.go@@ -0,0 +1,137 @@+package jwt++import (+ "context"+ "testing"++ "github.com/google/go-cmp/cmp"+ "github.com/stretchr/testify/require"++ "github.com/trufflesecurity/trufflehog/v3/pkg/detectors"+ "github.com/trufflesecurity/trufflehog/v3/pkg/engine/ahocorasick"+)++// This tests the JWT detector for a number of different cases (mostly HMAC-based) without verification enabled.+func TestJwt_Pattern(t *testing.T) {+ d := Scanner{}+ ahoCorasickCore := ahocorasick.NewAhoCorasickCore([]detectors.Detector{d})+ tests := []struct {+ name string+ input string+ want []string+ }{+ {+ name: "HS256/valid",+ input: `+ // secret is "a-string-secret-at-least-256-bits-long"+ eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWUsImlhdCI6MTUxNjIzOTAyMn0.KMUFsIDTnFmyG3nMiGM6H9FNFUROf3wh7SmqJp-QV30+ `,+ want: []string{},+ },+ {+ name: "HS256/valid-verbose-header",+ input: `+ // secret is "a-string-secret-at-least-256-bits-long"+ ewogICJhbGciOiJIUzI1NiIsCiIgIHR5cCI6IkpXVCIKfQo.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWUsImlhdCI6MTUxNjIzOTAyMn0.KMUFsIDTnFmyG3nMiGM6H9FNFUROf3wh7SmqJp-QV30+ `,+ want: []string{},+ },++ {+ name: "HS384/valid/no-expiration",+ input: `+ // secret is "a-string-secret-at-least-256-bits-long"+ eyJhbGciOiJIUzM4NCJ9.eyJtc2ciOiJoZWxsbyBoYWNrZXIsIHRoZXJlJ3Mgbm90aGluZyBmb3IgeW91IGhlcmUg8J-YhiJ9.NArdGjJ9DjXwGCLdNXDVjlwlvI_tUa2B3H44dvrZfKliBNTUL0YyKi8q4Al0Wl8u+ `,+ want: []string{},+ },++ {+ name: "HS512/valid/no-expiration",+ input: `+ // secret is "a-string-secret-at-least-256-bits-long"+ eyJhbGciOiJIUzUxMiJ9.eyJtc2ciOiJoZWxsbyBoYWNrZXIsIHRoZXJlJ3Mgbm90aGluZyBmb3IgeW91IGhlcmUg8J-YhiJ9.SiKgg2-kq7kVXhe5uLMakzlygHsJ70aTyXGhdbqG2SfkUC_fwk8MZ3JAWXrCIEJAUi_QMmQm-7qMU0SCMFRQug+ `,+ want: []string{},+ },++ {+ name: "HS256/padding-in-verbose-header/invalid-sig",+ input: `+ // secret is "a-string-secret-at-least-256-bits-long"+ ewogICJhbGciOiJIUzI1NiIsCiIgIHR5cCI6IkpXVCIKfQ==.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWUsImlhdCI6MTUxNjIzOTAyMn0.KMUFsIDTnFmyG3nMiGM6H9FNFUROf3wh7SmqJp-QV30+ `,+ want: []string{},+ },+ {+ name: "HS256/padding-in-claims/invalid-sig",+ input: `+ // secret is "a-string-secret-at-least-256-bits-long"+ ewogICJhbGciOiJIUzI1NiIsCiAgInR5cCI6IkpXVCIKfQ.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWUsImlhdCI6MTUxNjIzOTAyfQo=.KMUFsIDTnFmyG3nMiGM6H9FNFUROf3wh7SmqJp-QV30+ `,+ want: []string{},+ },++ {+ name: "HS256/expired",+ input: `+ // secret is "a-string-secret-at-least-256-bits-long"+ eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWUsImlhdCI6MTQxNjIzOTAyMiwiZXhwIjoxNDE2MjM5MTIyfQ.EwRkAg9uOr6kVajMdMvB6KWGvIdDlGNRAH3lsZ2qQHI+ `,+ want: []string{},+ },++ {+ name: "HS256/not-yet-valid",+ input: `+ // secret is "a-string-secret-at-least-256-bits-long"+ eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWUsImlhdCI6MjQxNjIzOTAyMiwibmJmIjozNDE2MjM5MDIyLCJleHAiOjQ0MTYyMzkwMjJ9.rVQaCey3ETfhn8AeiC_EmFjp6_X2Dq8QY_AzBAF2ZzQ+ `,+ want: []string{},+ },++ {+ name: "PS384/expired/invalid-issuer",+ input: `+ eyJhbGciOiJQUzM4NCIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJMeDFGbWF5UDJZQnR4YXFTMVNLSlJKR2lYUktudzJvdjVXbVlJTUctQkxFIn0.eyJleHAiOjE2MTU0MDY5ODIsImlhdCI6MTYxNTQwNjkyMiwianRpIjoiMGY2NGJjYTktYjU4OC00MWFhLWFkNDEtMmFmZDM2OGRmNTFkIiwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo4MDgwL2F1dGgvcmVhbG1zL21hc3RlciIsImF1ZCI6ImFjY291bnQiLCJzdWIiOiJhZDEyOGRmMS0xMTQwLTRlNGMtYjA5Ny1hY2RjZTcwNWJkOWIiLCJ0eXAiOiJCZWFyZXIiLCJhenAiOiJ0b2tlbmRlbG1lIiwiYWNyIjoiMSIsInJlYWxtX2FjY2VzcyI6eyJyb2xlcyI6WyJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJlbWFpbCBwcm9maWxlIiwiY2xpZW50SG9zdCI6IjE3Mi4yMC4wLjEiLCJjbGllbnRJZCI6InRva2VuZGVsbWUiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsInByZWZlcnJlZF91c2VybmFtZSI6InNlcnZpY2UtYWNjb3VudC10b2tlbmRlbG1lIiwiY2xpZW50QWRkcmVzcyI6IjE3Mi4yMC4wLjEifQ.Rxrq41AxbWKIQHWv-Tkb7rqwel3sKT_R_AGvn9mPIHqhw1m7nsQWcL9t2a_8MI2hCwgWtYdgTF1xxBNmb2IW3CZkML5nGfcRrFvNaBHd3UQEqbFKZgnIX29h5VoxekyiwFaGD-0RXL83jF7k39hytEzTatwoVjZ-frga0KFl-nLce3OwncRXVCGmxoFzUsyu9TQFS2Mm_p0AMX1y1MAX1JmLC3WFhH3BohhRqpzBtjSfs_f46nE1-HKjqZ1ERrAc2fmiVJjmG7sT702JRuuzrgUpHlMy2juBG4DkVcMlj4neJUmCD1vZyZBRggfaIxNkwUhHtmS2Cp9tOcwNu47tSg+ `,+ want: []string{"eyJhbGciOiJQUzM4NCIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJMeDFGbWF5UDJZQnR4YXFTMVNLSlJKR2lYUktudzJvdjVXbVlJTUctQkxFIn0.eyJleHAiOjE2MTU0MDY5ODIsImlhdCI6MTYxNTQwNjkyMiwianRpIjoiMGY2NGJjYTktYjU4OC00MWFhLWFkNDEtMmFmZDM2OGRmNTFkIiwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo4MDgwL2F1dGgvcmVhbG1zL21hc3RlciIsImF1ZCI6ImFjY291bnQiLCJzdWIiOiJhZDEyOGRmMS0xMTQwLTRlNGMtYjA5Ny1hY2RjZTcwNWJkOWIiLCJ0eXAiOiJCZWFyZXIiLCJhenAiOiJ0b2tlbmRlbG1lIiwiYWNyIjoiMSIsInJlYWxtX2FjY2VzcyI6eyJyb2xlcyI6WyJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJlbWFpbCBwcm9maWxlIiwiY2xpZW50SG9zdCI6IjE3Mi4yMC4wLjEiLCJjbGllbnRJZCI6InRva2VuZGVsbWUiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsInByZWZlcnJlZF91c2VybmFtZSI6InNlcnZpY2UtYWNjb3VudC10b2tlbmRlbG1lIiwiY2xpZW50QWRkcmVzcyI6IjE3Mi4yMC4wLjEifQ.Rxrq41AxbWKIQHWv-Tkb7rqwel3sKT_R_AGvn9mPIHqhw1m7nsQWcL9t2a_8MI2hCwgWtYdgTF1xxBNmb2IW3CZkML5nGfcRrFvNaBHd3UQEqbFKZgnIX29h5VoxekyiwFaGD-0RXL83jF7k39hytEzTatwoVjZ-frga0KFl-nLce3OwncRXVCGmxoFzUsyu9TQFS2Mm_p0AMX1y1MAX1JmLC3WFhH3BohhRqpzBtjSfs_f46nE1-HKjqZ1ERrAc2fmiVJjmG7sT702JRuuzrgUpHlMy2juBG4DkVcMlj4neJUmCD1vZyZBRggfaIxNkwUhHtmS2Cp9tOcwNu47tSg"},+ },+ }++ for _, test := range tests {+ t.Run(test.name, func(t *testing.T) {+ matchedDetectors := ahoCorasickCore.FindDetectorMatches([]byte(test.input))+ if len(matchedDetectors) == 0 {+ t.Errorf("test %q failed: expected keywords %v to be found in the input", test.name, d.Keywords())+ return+ }++ results, err := d.FromData(context.Background(), false, []byte(test.input))+ require.NoError(t, err)++ if len(results) != len(test.want) {+ t.Errorf("mismatch in result count: expected %d, got %d", len(test.want), len(results))+ return+ }++ actual := make(map[string]struct{}, len(results))+ for _, r := range results {+ if len(r.RawV2) > 0 {+ actual[string(r.RawV2)] = struct{}{}+ } else {+ actual[string(r.Raw)] = struct{}{}+ }+ }++ expected := make(map[string]struct{}, len(test.want))+ for _, v := range test.want {+ expected[v] = struct{}{}+ }++ if diff := cmp.Diff(expected, actual); diff != "" {+ t.Errorf("%s diff: (-want +got)\n%s", test.name, diff)+ }+ })+ }+}diff --git a/pkg/engine/defaults/defaults.go b/pkg/engine/defaults/defaults.goindex 45c03b957..a84945752 100644--- a/pkg/engine/defaults/defaults.go+++ b/pkg/engine/defaults/defaults.go@@ -399,6 +399,7 @@ import ("github.com/trufflesecurity/trufflehog/v3/pkg/detectors/jumpcloud""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/jupiterone""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/juro"+ "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/jwt""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/kanban""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/kanbantool""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/karmacrm"@@ -1270,6 +1271,7 @@ func buildDetectorList() []detectors.Detector {&jumpcloud.Scanner{},&jupiterone.Scanner{},&juro.Scanner{},+ &jwt.Scanner{},&kanban.Scanner{},&kanbantool.Scanner{},&karmacrm.Scanner{},diff --git a/pkg/pb/detectorspb/detectors.pb.go b/pkg/pb/detectorspb/detectors.pb.goindex af94bc51a..d2ae6abe8 100644--- a/pkg/pb/detectorspb/detectors.pb.go+++ b/pkg/pb/detectorspb/detectors.pb.go@@ -1145,6 +1145,7 @@ const (DetectorType_HashiCorpVaultAuth DetectorType = 1036DetectorType_PhraseAccessToken DetectorType = 1037DetectorType_Photoroom DetectorType = 1038+ DetectorType_JWT DetectorType = 1039)// Enum value maps for DetectorType.@@ -2185,6 +2186,7 @@ var (1036: "HashiCorpVaultAuth",1037: "PhraseAccessToken",1038: "Photoroom",+ 1039: "JWT",}DetectorType_value = map[string]int32{"Alibaba": 0,@@ -3222,6 +3224,7 @@ var ("HashiCorpVaultAuth": 1036,"PhraseAccessToken": 1037,"Photoroom": 1038,+ "JWT": 1039,})@@ -3675,7 +3678,7 @@ var file_detectors_proto_rawDesc = []byte{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, 0x12, 0x13, 0x0a,0x0f, 0x45, 0x53, 0x43, 0x41, 0x50, 0x45, 0x44, 0x5f, 0x55, 0x4e, 0x49, 0x43, 0x4f, 0x44, 0x45,- 0x10, 0x04, 0x2a, 0xbb, 0x86, 0x01, 0x0a, 0x0c, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x6f, 0x72,+ 0x10, 0x04, 0x2a, 0xc5, 0x86, 0x01, 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, 0x7a, 0x75, 0x72, 0x65, 0x10, 0x03, 0x12,@@ -4751,11 +4754,12 @@ var file_detectors_proto_rawDesc = []byte{0x6c, 0x74, 0x41, 0x75, 0x74, 0x68, 0x10, 0x8c, 0x08, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x68, 0x72,0x61, 0x73, 0x65, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x10, 0x8d,0x08, 0x12, 0x0e, 0x0a, 0x09, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x72, 0x6f, 0x6f, 0x6d, 0x10, 0x8e,- 0x08, 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,+ 0x08, 0x12, 0x08, 0x0a, 0x03, 0x4a, 0x57, 0x54, 0x10, 0x8f, 0x08, 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.protoindex 0c1ea05ee..1d93440a9 100644--- a/proto/detectors.proto+++ b/proto/detectors.proto@@ -1048,6 +1048,7 @@ enum DetectorType {HashiCorpVaultAuth = 1036;PhraseAccessToken = 1037;Photoroom = 1038;+ JWT = 1039;}message Result {