diff --git a/go.mod b/go.mod index 76ee30e44..ac1447971 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module github.com/projectdiscovery/nuclei/v3 go 1.25.7 require ( - github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible github.com/andygrunwald/go-jira v1.16.1 github.com/antchfx/htmlquery v1.3.5 github.com/bluele/gcache v0.0.2 @@ -15,17 +14,17 @@ require ( github.com/itchyny/gojq v0.12.17 github.com/json-iterator/go v1.1.12 github.com/julienschmidt/httprouter v1.3.0 - github.com/logrusorgru/aurora v2.0.3+incompatible + github.com/logrusorgru/aurora v2.0.3+incompatible // indirect github.com/miekg/dns v1.1.68 github.com/olekukonko/tablewriter v1.0.8 github.com/pkg/errors v0.9.1 - github.com/projectdiscovery/clistats v0.1.2 - github.com/projectdiscovery/fastdialer v0.5.6 + github.com/projectdiscovery/clistats v0.1.3 + github.com/projectdiscovery/fastdialer v0.5.7 github.com/projectdiscovery/hmap v0.0.100 github.com/projectdiscovery/interactsh v1.3.1 github.com/projectdiscovery/rawhttp v0.1.90 github.com/projectdiscovery/retryabledns v1.0.114 - github.com/projectdiscovery/retryablehttp-go v1.3.10 + github.com/projectdiscovery/retryablehttp-go v1.3.11 github.com/projectdiscovery/yamldoc-go v1.0.6 github.com/remeh/sizedwaitgroup v1.0.0 github.com/rs/xid v1.6.0 @@ -90,6 +89,7 @@ require ( github.com/labstack/echo/v4 v4.13.4 github.com/leslie-qiwa/flat v0.0.0-20230424180412-f9d1cf014baa github.com/lib/pq v1.11.2 + github.com/logrusorgru/aurora/v4 v4.0.0 github.com/mattn/go-sqlite3 v1.14.28 github.com/maypok86/otter/v2 v2.2.1 github.com/mholt/archives v0.1.5 @@ -97,26 +97,27 @@ require ( github.com/oiweiwei/go-msrpc v1.2.12 github.com/ory/dockertest/v3 v3.12.0 github.com/praetorian-inc/fingerprintx v1.1.15 - github.com/projectdiscovery/dsl v0.8.17 + github.com/projectdiscovery/dsl v0.8.18 github.com/projectdiscovery/fasttemplate v0.0.2 github.com/projectdiscovery/gcache v0.0.0-20241015120333-12546c6e3f4c github.com/projectdiscovery/go-smb2 v0.0.0-20240129202741-052cc450c6cb github.com/projectdiscovery/goflags v0.1.74 github.com/projectdiscovery/gologger v1.1.68 github.com/projectdiscovery/gostruct v0.0.2 + github.com/projectdiscovery/govaluate v0.0.0-20260504230327-80320480bb6e github.com/projectdiscovery/gozero v0.1.1-0.20251027191944-a4ea43320b81 github.com/projectdiscovery/httpx v1.9.0 github.com/projectdiscovery/mapcidr v1.1.97 github.com/projectdiscovery/n3iwf v0.0.0-20230523120440-b8cd232ff1f5 - github.com/projectdiscovery/networkpolicy v0.1.37 - github.com/projectdiscovery/ratelimit v0.0.86 + github.com/projectdiscovery/networkpolicy v0.1.38 + github.com/projectdiscovery/ratelimit v0.0.87 github.com/projectdiscovery/rdap v0.9.0 - github.com/projectdiscovery/sarif v0.0.1 + github.com/projectdiscovery/sarif v0.1.0 github.com/projectdiscovery/tlsx v1.2.2 github.com/projectdiscovery/uncover v1.2.0 github.com/projectdiscovery/useragent v0.0.107 - github.com/projectdiscovery/utils v0.10.1 - github.com/projectdiscovery/wappalyzergo v0.2.79 + github.com/projectdiscovery/utils v0.11.0 + github.com/projectdiscovery/wappalyzergo v0.2.81 github.com/redis/go-redis/v9 v9.11.0 github.com/rs/zerolog v1.34.0 github.com/shurcooL/graphql v0.0.0-20230722043721-ed46e5a46466 @@ -287,7 +288,6 @@ require ( github.com/labstack/gommon v0.4.2 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/libdns/libdns v1.1.1 // indirect - github.com/logrusorgru/aurora/v4 v4.0.0 // indirect github.com/lor00x/goldap v0.0.0-20240304151906-8d785c64d1c8 // indirect github.com/lucasb-eyer/go-colorful v1.3.0 // indirect github.com/lufia/plan9stats v0.0.0-20250827001030-24949be3fa54 // indirect @@ -339,7 +339,7 @@ require ( github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect github.com/projectdiscovery/asnmap v1.1.1 // indirect github.com/projectdiscovery/blackrock v0.0.1 // indirect - github.com/projectdiscovery/cdncheck v1.2.34 // indirect + github.com/projectdiscovery/cdncheck v1.2.36 // indirect github.com/projectdiscovery/freeport v0.0.7 // indirect github.com/projectdiscovery/ldapserver v1.0.2-0.20240219154113-dcc758ebc0cb // indirect github.com/projectdiscovery/machineid v0.0.0-20250715113114-c77eb3567582 // indirect diff --git a/go.sum b/go.sum index 31107e5a9..e4cbb8582 100644 --- a/go.sum +++ b/go.sum @@ -79,8 +79,6 @@ github.com/DataDog/gostackparse v0.7.0 h1:i7dLkXHvYzHV308hnkvVGDL3BR4FWl7IsXNPz/ github.com/DataDog/gostackparse v0.7.0/go.mod h1:lTfqcJKqS9KnXQGnyQMCugq3u1FP6UZMfWR0aitKFMM= github.com/FalconOpsLLC/goexec v0.3.0 h1:ryLMkrGT6asnkqdc5rFMNOSTYdMH/iCfyEuwu0D6ZhA= github.com/FalconOpsLLC/goexec v0.3.0/go.mod h1:kiyxVbmFCGbbwXRyZmOSKlOy7PiK+JH2gq07Ztag/k8= -github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw= -github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0= github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= @@ -107,8 +105,6 @@ github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNx github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= github.com/PuerkitoBio/goquery v1.11.0 h1:jZ7pwMQXIITcUXNH83LLk+txlaEy6NVOfTuP43xxfqw= github.com/PuerkitoBio/goquery v1.11.0/go.mod h1:wQHgxUOU3JGuj3oD/QFfxUdlzW6xPHfqyHre6VMY4DQ= -github.com/RedTeamPentesting/adauth v0.5.0 h1:yKTLAeP2hrer9Bez4qM+fFqeVUuHfS5UhYE3WwMmxyU= -github.com/RedTeamPentesting/adauth v0.5.0/go.mod h1:9gHAk9qi+kZt5+orAgpE+oHFu32ijpvl4l7CYjg1aJc= github.com/RedTeamPentesting/adauth v0.5.4-0.20260511073005-3d18e8a5a687 h1:HHkHNwakgAFX3qlMm88c090vIYNFWiO5+4WyAr0xJuM= github.com/RedTeamPentesting/adauth v0.5.4-0.20260511073005-3d18e8a5a687/go.mod h1:l6FRaC2TliS/JMNWskO3J1tmrcKJyOaMFhWC6hHeWno= github.com/RumbleDiscovery/rumble-tools v0.0.0-20201105153123-f2adbb3244d2/go.mod h1:jD2+mU+E2SZUuAOHZvZj4xP4frlOo+N/YrXDvASFhkE= @@ -865,14 +861,14 @@ github.com/projectdiscovery/asnmap v1.1.1 h1:ImJiKIaACOT7HPx4Pabb5dksolzaFYsD1kI github.com/projectdiscovery/asnmap v1.1.1/go.mod h1:QT7jt9nQanj+Ucjr9BqGr1Q2veCCKSAVyUzLXfEcQ60= github.com/projectdiscovery/blackrock v0.0.1 h1:lHQqhaaEFjgf5WkuItbpeCZv2DUIE45k0VbGJyft6LQ= github.com/projectdiscovery/blackrock v0.0.1/go.mod h1:ANUtjDfaVrqB453bzToU+YB4cUbvBRpLvEwoWIwlTss= -github.com/projectdiscovery/cdncheck v1.2.34 h1:cwNfYMdb/5zwge2q0RMwvYy0sUE3ehayMlz8o3kKHBE= -github.com/projectdiscovery/cdncheck v1.2.34/go.mod h1:noT6kz0Ifep16n/TiUC6PGZCO3WbLiZ54HDFpAgpDoY= -github.com/projectdiscovery/clistats v0.1.2 h1:Fnh9ut2CODOtO9/RsBF0WO1eLgf+t+epOmQpdVZp0+M= -github.com/projectdiscovery/clistats v0.1.2/go.mod h1:J4lcP9K2yfNRtsliKEECE50+GmFD8er/O+ECIfQFpnM= -github.com/projectdiscovery/dsl v0.8.17 h1:q0pKTuvI+Gov18+cra/Ql6umNUNbT0fDk3o+ooQP1yc= -github.com/projectdiscovery/dsl v0.8.17/go.mod h1:C742lJ6Yhpe0wHXGFz8Eg9H2UyvYsBQB97p2WyAlkfU= -github.com/projectdiscovery/fastdialer v0.5.6 h1:kIBFmzbXrua41uf4fGsQClTZmT7cm7E3vVgcSj8gs6Q= -github.com/projectdiscovery/fastdialer v0.5.6/go.mod h1:QxvCe02Jii+j8vA3hWYkymgZIY8cqMgs2s3Jbz6mvbs= +github.com/projectdiscovery/cdncheck v1.2.36 h1:+KpWPZQUBVc1x1wa96ZFWzWlxaZzYmDPjCBXpYYlxZE= +github.com/projectdiscovery/cdncheck v1.2.36/go.mod h1:noT6kz0Ifep16n/TiUC6PGZCO3WbLiZ54HDFpAgpDoY= +github.com/projectdiscovery/clistats v0.1.3 h1:eT42hnKMmIilmPDMW30jv5HXhHfnNMzxxyNQ62wbJW0= +github.com/projectdiscovery/clistats v0.1.3/go.mod h1:J4lcP9K2yfNRtsliKEECE50+GmFD8er/O+ECIfQFpnM= +github.com/projectdiscovery/dsl v0.8.18 h1:2o0FoSJMDLGKXHEeFWwrunvDKzFlLdL1F36Mg4QiI08= +github.com/projectdiscovery/dsl v0.8.18/go.mod h1:M3IFrupPJ3xj6qauHvzGd1qKF+Bd3tnHI59EQ9ACoIw= +github.com/projectdiscovery/fastdialer v0.5.7 h1:Esf/ACWzEy+8EB0L4/8T6/2XID46gW6mR+AjpxhdXAM= +github.com/projectdiscovery/fastdialer v0.5.7/go.mod h1:hVQnaddbjVb7wkizhq/0K2f6PnO6DgKNZHFk+/cB2AI= github.com/projectdiscovery/fasttemplate v0.0.2 h1:h2cISk5xDhlJEinlBQS6RRx0vOlOirB2y3Yu4PJzpiA= github.com/projectdiscovery/fasttemplate v0.0.2/go.mod h1:XYWWVMxnItd+r0GbjA1GCsUopMw1/XusuQxdyAIHMCw= github.com/projectdiscovery/freeport v0.0.7 h1:Q6uXo/j8SaV/GlAHkEYQi8WQoPXyJWxyspx+aFmz9Qk= @@ -887,6 +883,8 @@ github.com/projectdiscovery/gologger v1.1.68 h1:KfdIO/3X7BtHssWZuqhxPZ+A946epCCx github.com/projectdiscovery/gologger v1.1.68/go.mod h1:Xae0t4SeqJVa0RQGK9iECx/+HfXhvq70nqOQp2BuW+o= github.com/projectdiscovery/gostruct v0.0.2 h1:s8gP8ApugGM4go1pA+sVlPDXaWqNP5BBDDSv7VEdG1M= github.com/projectdiscovery/gostruct v0.0.2/go.mod h1:H86peL4HKwMXcQQtEa6lmC8FuD9XFt6gkNR0B/Mu5PE= +github.com/projectdiscovery/govaluate v0.0.0-20260504230327-80320480bb6e h1:o+ulEIaC2+9V2Ezr6mI5xEhKWsf0V/+FUQIS723Aj6U= +github.com/projectdiscovery/govaluate v0.0.0-20260504230327-80320480bb6e/go.mod h1:xH7bPwHxUlz1yx9UlVeTF+UVCUaKhTnZgaxHb5z362E= github.com/projectdiscovery/gozero v0.1.1-0.20251027191944-a4ea43320b81 h1:yHh46pJovYbyiaHCV7oIDinFmy+Fyq36H1BowJgb0M0= github.com/projectdiscovery/gozero v0.1.1-0.20251027191944-a4ea43320b81/go.mod h1:9lmGPBDGZVANzCGjQg+V32n8Y3Cgjo/4kT0E88lsVTI= github.com/projectdiscovery/hmap v0.0.100 h1:DBZ3Req9lWf4P1YC9PRa4eiMvLY0Uxud43NRBcocPfs= @@ -903,20 +901,20 @@ github.com/projectdiscovery/mapcidr v1.1.97 h1:7FkxNNVXp+m1rIu5Nv/2SrF9k4+LwP8Qu github.com/projectdiscovery/mapcidr v1.1.97/go.mod h1:9dgTJh1SP02gYZdpzMjm6vtYFkEHQHoTyaVNvaeJ7lA= github.com/projectdiscovery/n3iwf v0.0.0-20230523120440-b8cd232ff1f5 h1:L/e8z8yw1pfT6bg35NiN7yd1XKtJap5Nk6lMwQ0RNi8= github.com/projectdiscovery/n3iwf v0.0.0-20230523120440-b8cd232ff1f5/go.mod h1:pGW2ncnTxTxHtP9wzcIJAB+3/NMp6IiuQWd2NK7K+oc= -github.com/projectdiscovery/networkpolicy v0.1.37 h1:y/eGU4Mu+z8thiOrAMj9RMmxXG6Zi2Nci81cjZVkMqM= -github.com/projectdiscovery/networkpolicy v0.1.37/go.mod h1:RCyBSZmhCueYfQflmvvsMZHMMH+Z6AQubpXAgM5b5r0= -github.com/projectdiscovery/ratelimit v0.0.86 h1:wkSKOQj3FvPUnh5zbZj50o8Ddgir4qgZN+FqWMc7dfw= -github.com/projectdiscovery/ratelimit v0.0.86/go.mod h1:d15gU8NFjgKw0F0hrDYprcPf73DqS51NJ44BwYmM1D8= +github.com/projectdiscovery/networkpolicy v0.1.38 h1:q1cQ0diccVfvXvVcRBsm9Q4BcO2rx62F3LMyMW9wThQ= +github.com/projectdiscovery/networkpolicy v0.1.38/go.mod h1:BIuDC/DLbWugwT18QI8KwZqaJWuKwF4DGOSNl+hBQOw= +github.com/projectdiscovery/ratelimit v0.0.87 h1:/iDEg78pmevmrj9hehkcLylszCVShG+fb2HeNFLgi0Y= +github.com/projectdiscovery/ratelimit v0.0.87/go.mod h1:LrUTP5crXcBp4TAtVTvz1Kek1z+Jo79VvWpO+z6Gpz4= github.com/projectdiscovery/rawhttp v0.1.90 h1:LOSZ6PUH08tnKmWsIwvwv1Z/4zkiYKYOSZ6n+8RFKtw= github.com/projectdiscovery/rawhttp v0.1.90/go.mod h1:VZYAM25UI/wVB3URZ95ZaftgOnsbphxyAw/XnQRRz4Y= github.com/projectdiscovery/rdap v0.9.0 h1:wPhHx5pQ2QI+WGhyNb2PjhTl0NtB39Nk7YFZ9cp8ZGA= github.com/projectdiscovery/rdap v0.9.0/go.mod h1:zk4yrJFQ2Hy36Aqk+DvotYQxYAeALaCJ5ORySkff36Q= github.com/projectdiscovery/retryabledns v1.0.114 h1:COyNKzhA7oa3C/1639WRXeXsKrUJx06paVbN64IHZ3E= github.com/projectdiscovery/retryabledns v1.0.114/go.mod h1:+DyanDr8naxQ2dRO9c4Ezo3NHHXhz8L0tTSRYWhiwyA= -github.com/projectdiscovery/retryablehttp-go v1.3.10 h1:v2flyFi5byeSc4++8s6ik7rGKOM/YREkPVEDb0whhWc= -github.com/projectdiscovery/retryablehttp-go v1.3.10/go.mod h1:RplucKGOCf+lHFxd1HVEale4qWKLSEu1ZJp2BRnuFp8= -github.com/projectdiscovery/sarif v0.0.1 h1:C2Tyj0SGOKbCLgHrx83vaE6YkzXEVrMXYRGLkKCr/us= -github.com/projectdiscovery/sarif v0.0.1/go.mod h1:cEYlDu8amcPf6b9dSakcz2nNnJsoz4aR6peERwV+wuQ= +github.com/projectdiscovery/retryablehttp-go v1.3.11 h1:NumGwEhVNRVD03BbUB8mIqEqrCSmmTMx0cuEeQw/zTI= +github.com/projectdiscovery/retryablehttp-go v1.3.11/go.mod h1:oTy1TiZcfb9SdDqekelu4EgvDyAj4/7V7+ckXymZQfE= +github.com/projectdiscovery/sarif v0.1.0 h1:O541T+a448nSJsmIMnXXSOeDQEzpnCAYvRfe0eG5h74= +github.com/projectdiscovery/sarif v0.1.0/go.mod h1:LBC+reM3bkI3qIIhE0rZaINaYX6VG+En6u2hHa5mA7E= github.com/projectdiscovery/stringsutil v0.0.2 h1:uzmw3IVLJSMW1kEg8eCStG/cGbYYZAja8BH3LqqJXMA= github.com/projectdiscovery/stringsutil v0.0.2/go.mod h1:EJ3w6bC5fBYjVou6ryzodQq37D5c6qbAYQpGmAy+DC0= github.com/projectdiscovery/tlsx v1.2.2 h1:Y96QBqeD2anpzEtBl4kqNbwzXh2TrzJuXfgiBLvK+SE= @@ -925,10 +923,10 @@ github.com/projectdiscovery/uncover v1.2.0 h1:31tjYa0v8FB8Ch8hJTxb+2t63vsljdOo0O github.com/projectdiscovery/uncover v1.2.0/go.mod h1:ozqKb++p39Kmh1SmwIpbQ9p0aVGPXuwsb4/X2Kvx6ms= github.com/projectdiscovery/useragent v0.0.107 h1:45gSBda052fv2Gtxtnpx7cu2rWtUpZEQRGAoYGP6F5M= github.com/projectdiscovery/useragent v0.0.107/go.mod h1:yv5ZZLDT/kq6P+NvBcCPq6sjEVQtZGgO+OvvHzZ+WtY= -github.com/projectdiscovery/utils v0.10.1 h1:9luYfL7PpN1L/cLO4bAES4+ltDaEBKOUnRiTn920XfM= -github.com/projectdiscovery/utils v0.10.1/go.mod h1:x3jGS2YIxnUYxlpB9HWBKf0k+AE83nYCGRX/YStC8G8= -github.com/projectdiscovery/wappalyzergo v0.2.79 h1:LBAd+nA+yv2Hf//q2TlODLRDkaaqzWlCaIPcwYyHZcU= -github.com/projectdiscovery/wappalyzergo v0.2.79/go.mod h1:hRsnKNleH693FFJsBOD5NMUDbxw/Q94f0Oq2OV04Q6M= +github.com/projectdiscovery/utils v0.11.0 h1:CxImZSRyj9spy1wpB9HKJopr5MsIPm2r5iS8uyhAMoQ= +github.com/projectdiscovery/utils v0.11.0/go.mod h1:q2mZngH1s4WDO3knYxG7iyP1KcxoRSORJCWSpCKFc1s= +github.com/projectdiscovery/wappalyzergo v0.2.81 h1:E+lOy8Xhb5ALEGrXFq64dgbkoVa0JWJw7nU6+yGnAz0= +github.com/projectdiscovery/wappalyzergo v0.2.81/go.mod h1:qMRkcU6PkpfglNpvddSztt+1GxdSeOB0jVjzbK17veU= github.com/projectdiscovery/yamldoc-go v1.0.6 h1:GCEdIRlQjDux28xTXKszM7n3jlMf152d5nqVpVoetas= github.com/projectdiscovery/yamldoc-go v1.0.6/go.mod h1:R5lWrNzP+7Oyn77NDVPnBsxx2/FyQZBBkIAaSaCQFxw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= diff --git a/internal/colorizer/colorizer.go b/internal/colorizer/colorizer.go index 3e369349b..25659270d 100644 --- a/internal/colorizer/colorizer.go +++ b/internal/colorizer/colorizer.go @@ -3,16 +3,16 @@ package colorizer import ( "fmt" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity" ) const ( - fgOrange uint8 = 208 + fgOrange aurora.ColorIndex = 208 ) -func GetColor(colorizer aurora.Aurora, templateSeverity fmt.Stringer) string { +func GetColor(colorizer *aurora.Aurora, templateSeverity fmt.Stringer) string { var method func(arg interface{}) aurora.Value switch templateSeverity { case severity.Info: @@ -32,7 +32,7 @@ func GetColor(colorizer aurora.Aurora, templateSeverity fmt.Stringer) string { return method(templateSeverity.String()).String() } -func New(colorizer aurora.Aurora) func(severity.Severity) string { +func New(colorizer *aurora.Aurora) func(severity.Severity) string { return func(severity severity.Severity) string { return GetColor(colorizer, severity) } diff --git a/internal/runner/runner.go b/internal/runner/runner.go index 33f20f27b..6283c8fdc 100644 --- a/internal/runner/runner.go +++ b/internal/runner/runner.go @@ -29,7 +29,7 @@ import ( pprofutil "github.com/projectdiscovery/utils/pprof" updateutils "github.com/projectdiscovery/utils/update" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/pkg/errors" "github.com/projectdiscovery/ratelimit" @@ -85,7 +85,7 @@ type Runner struct { projectFile *projectfile.ProjectFile catalog catalog.Catalog progress progress.Progress - colorizer aurora.Aurora + colorizer *aurora.Aurora issuesClient reporting.Client browser *engine.Browser rateLimiter *ratelimit.Limiter @@ -225,7 +225,7 @@ func New(options *types.Options) (*Runner, error) { // output coloring useColor := !options.NoColor - runner.colorizer = aurora.NewAurora(useColor) + runner.colorizer = aurora.New(aurora.WithColors(useColor)) templates.Colorizer = runner.colorizer templates.SeverityColorizer = colorizer.New(runner.colorizer) diff --git a/internal/runner/templates.go b/internal/runner/templates.go index 46a111ce5..03b6027fe 100644 --- a/internal/runner/templates.go +++ b/internal/runner/templates.go @@ -8,7 +8,7 @@ import ( "github.com/alecthomas/chroma/quick" jsoniter "github.com/json-iterator/go" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config" "github.com/projectdiscovery/nuclei/v3/pkg/catalog/loader" diff --git a/internal/server/nuclei_sdk.go b/internal/server/nuclei_sdk.go index 1f6a3dfe2..57ee11b04 100644 --- a/internal/server/nuclei_sdk.go +++ b/internal/server/nuclei_sdk.go @@ -6,7 +6,7 @@ import ( _ "net/http/pprof" "strings" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/projectdiscovery/gologger" "github.com/projectdiscovery/nuclei/v3/pkg/fuzz/frequency" "github.com/projectdiscovery/nuclei/v3/pkg/fuzz/stats" @@ -55,7 +55,7 @@ type NucleiExecutorOptions struct { ProjectFile *projectfile.ProjectFile Browser *browserEngine.Browser FuzzStatsDB *stats.Tracker - Colorizer aurora.Aurora + Colorizer *aurora.Aurora Parser parser.Parser TemporaryDirectory string Logger *gologger.Logger diff --git a/internal/tests/integration/library_test.go b/internal/tests/integration/library_test.go index a2d01533b..f764336f1 100644 --- a/internal/tests/integration/library_test.go +++ b/internal/tests/integration/library_test.go @@ -14,7 +14,7 @@ import ( "time" "github.com/julienschmidt/httprouter" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/pkg/errors" "github.com/projectdiscovery/goflags" "github.com/projectdiscovery/gologger" @@ -120,7 +120,7 @@ func executeNucleiAsLibrary(templatePath, templateURL string) ([]string, error) RateLimiter: ratelimiter, Interactsh: interactClient, HostErrorsCache: cache, - Colorizer: aurora.NewAurora(true), + Colorizer: aurora.New(aurora.WithColors(true)), ResumeCfg: types.NewResumeCfg(), Parser: templates.NewParser(), } diff --git a/internal/tests/testutils/testutils.go b/internal/tests/testutils/testutils.go index 18092915f..fd3a46bfa 100644 --- a/internal/tests/testutils/testutils.go +++ b/internal/tests/testutils/testutils.go @@ -9,7 +9,7 @@ import ( "github.com/projectdiscovery/ratelimit" "go.uber.org/multierr" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/projectdiscovery/gologger/levels" "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config" @@ -123,7 +123,7 @@ func (n *NoopWriter) Write(data []byte, level levels.Level) {} // MockOutputWriter is a mocked output writer. type MockOutputWriter struct { - aurora aurora.Aurora + aurora *aurora.Aurora omitTemplate bool RequestCallback func(templateID, url, requestType string, err error) FailureCallback func(result *output.InternalEvent) @@ -132,14 +132,14 @@ type MockOutputWriter struct { // NewMockOutputWriter creates a new mock output writer. func NewMockOutputWriter(omomitTemplate bool) *MockOutputWriter { - return &MockOutputWriter{aurora: aurora.NewAurora(false), omitTemplate: omomitTemplate} + return &MockOutputWriter{aurora: aurora.New(aurora.WithColors(false)), omitTemplate: omomitTemplate} } // Close closes the output writer interface. func (m *MockOutputWriter) Close() {} // Colorizer returns the colorizer instance for writer. -func (m *MockOutputWriter) Colorizer() aurora.Aurora { +func (m *MockOutputWriter) Colorizer() *aurora.Aurora { return m.aurora } diff --git a/lib/multi.go b/lib/multi.go index 535eca0cb..338ed1592 100644 --- a/lib/multi.go +++ b/lib/multi.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/projectdiscovery/nuclei/v3/pkg/catalog/loader" "github.com/projectdiscovery/nuclei/v3/pkg/core" "github.com/projectdiscovery/nuclei/v3/pkg/input/provider" @@ -36,7 +36,7 @@ func createEphemeralObjects(ctx context.Context, base *NucleiEngine, opts *types IssuesClient: base.rc, RateLimiter: base.rateLimiter, Interactsh: base.interactshClient, - Colorizer: aurora.NewAurora(true), + Colorizer: aurora.New(aurora.WithColors(true)), ResumeCfg: types.NewResumeCfg(), Parser: base.parser, Browser: base.browserInstance, diff --git a/lib/sdk_private.go b/lib/sdk_private.go index 9f427dd0b..d86ce4b9c 100644 --- a/lib/sdk_private.go +++ b/lib/sdk_private.go @@ -11,7 +11,7 @@ import ( "github.com/projectdiscovery/nuclei/v3/pkg/input" "github.com/projectdiscovery/nuclei/v3/pkg/reporting" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/pkg/errors" "github.com/projectdiscovery/gologger/levels" "github.com/projectdiscovery/httpx/common/httpx" @@ -213,7 +213,7 @@ func (e *NucleiEngine) init(ctx context.Context) error { IssuesClient: e.rc, RateLimiter: e.rateLimiter, Interactsh: e.interactshClient, - Colorizer: aurora.NewAurora(true), + Colorizer: aurora.New(aurora.WithColors(true)), ResumeCfg: types.NewResumeCfg(), Browser: e.browserInstance, Parser: e.parser, diff --git a/pkg/catalog/disk/find.go b/pkg/catalog/disk/find.go index 528ac5de0..2aff62b2c 100644 --- a/pkg/catalog/disk/find.go +++ b/pkg/catalog/disk/find.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/pkg/errors" "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config" stringsutil "github.com/projectdiscovery/utils/strings" diff --git a/pkg/catalog/loader/loader.go b/pkg/catalog/loader/loader.go index 0986084aa..e88d30125 100644 --- a/pkg/catalog/loader/loader.go +++ b/pkg/catalog/loader/loader.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/pkg/errors" "github.com/projectdiscovery/gologger" "github.com/projectdiscovery/nuclei/v3/pkg/catalog" diff --git a/pkg/fuzz/component/value.go b/pkg/fuzz/component/value.go index aa7404d2c..e5ebf8f0f 100644 --- a/pkg/fuzz/component/value.go +++ b/pkg/fuzz/component/value.go @@ -5,7 +5,7 @@ import ( "strconv" "github.com/leslie-qiwa/flat" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/projectdiscovery/gologger" "github.com/projectdiscovery/nuclei/v3/pkg/fuzz/dataformat" ) diff --git a/pkg/js/global/scripts.go b/pkg/js/global/scripts.go index 7818000b9..8203f02f5 100644 --- a/pkg/js/global/scripts.go +++ b/pkg/js/global/scripts.go @@ -11,7 +11,7 @@ import ( "time" "github.com/Mzack9999/goja" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/projectdiscovery/gologger" "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs" "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate" diff --git a/pkg/operators/cache/cache.go b/pkg/operators/cache/cache.go index ca486097c..cd4f911eb 100644 --- a/pkg/operators/cache/cache.go +++ b/pkg/operators/cache/cache.go @@ -4,8 +4,8 @@ import ( "regexp" "sync" - "github.com/Knetic/govaluate" "github.com/projectdiscovery/gcache" + "github.com/projectdiscovery/govaluate" ) var ( diff --git a/pkg/operators/cache/cache_test.go b/pkg/operators/cache/cache_test.go index c44b72c84..5b1e1f376 100644 --- a/pkg/operators/cache/cache_test.go +++ b/pkg/operators/cache/cache_test.go @@ -4,7 +4,7 @@ import ( "regexp" "testing" - "github.com/Knetic/govaluate" + "github.com/projectdiscovery/govaluate" ) func TestRegexCache_SetGet(t *testing.T) { diff --git a/pkg/operators/common/dsl/dsl.go b/pkg/operators/common/dsl/dsl.go index 3f9b74491..d93bdf62f 100644 --- a/pkg/operators/common/dsl/dsl.go +++ b/pkg/operators/common/dsl/dsl.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/Knetic/govaluate" "github.com/miekg/dns" "github.com/projectdiscovery/dsl" "github.com/projectdiscovery/gologger" + "github.com/projectdiscovery/govaluate" "github.com/projectdiscovery/nuclei/v3/pkg/protocols/dns/dnsclientpool" "github.com/projectdiscovery/nuclei/v3/pkg/types" sliceutil "github.com/projectdiscovery/utils/slice" diff --git a/pkg/operators/common/dsl/dsl_test.go b/pkg/operators/common/dsl/dsl_test.go index 40564ca18..86a2e2936 100644 --- a/pkg/operators/common/dsl/dsl_test.go +++ b/pkg/operators/common/dsl/dsl_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/Knetic/govaluate" + "github.com/projectdiscovery/govaluate" "github.com/projectdiscovery/nuclei/v3/pkg/protocols/dns/dnsclientpool" "github.com/projectdiscovery/nuclei/v3/pkg/types" "github.com/stretchr/testify/require" diff --git a/pkg/operators/extractors/compile.go b/pkg/operators/extractors/compile.go index bcfd37eeb..9c5a402cd 100644 --- a/pkg/operators/extractors/compile.go +++ b/pkg/operators/extractors/compile.go @@ -5,8 +5,8 @@ import ( "regexp" "strings" - "github.com/Knetic/govaluate" "github.com/itchyny/gojq" + "github.com/projectdiscovery/govaluate" "github.com/projectdiscovery/nuclei/v3/pkg/operators/cache" "github.com/projectdiscovery/nuclei/v3/pkg/operators/common/dsl" ) diff --git a/pkg/operators/extractors/extractors.go b/pkg/operators/extractors/extractors.go index 7071a0bda..d4bb9b6e7 100644 --- a/pkg/operators/extractors/extractors.go +++ b/pkg/operators/extractors/extractors.go @@ -3,8 +3,8 @@ package extractors import ( "regexp" - "github.com/Knetic/govaluate" "github.com/itchyny/gojq" + "github.com/projectdiscovery/govaluate" ) // Extractor is used to extract part of response using a regex. diff --git a/pkg/operators/matchers/compile.go b/pkg/operators/matchers/compile.go index 4ae72be60..54caa605d 100644 --- a/pkg/operators/matchers/compile.go +++ b/pkg/operators/matchers/compile.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "github.com/Knetic/govaluate" + "github.com/projectdiscovery/govaluate" "github.com/projectdiscovery/nuclei/v3/pkg/operators/cache" "github.com/projectdiscovery/nuclei/v3/pkg/operators/common/dsl" ) diff --git a/pkg/operators/matchers/match.go b/pkg/operators/matchers/match.go index a914b5f98..ed9058296 100644 --- a/pkg/operators/matchers/match.go +++ b/pkg/operators/matchers/match.go @@ -4,9 +4,9 @@ import ( "os" "strings" - "github.com/Knetic/govaluate" "github.com/antchfx/htmlquery" "github.com/antchfx/xmlquery" + "github.com/projectdiscovery/govaluate" "github.com/projectdiscovery/gologger" "github.com/projectdiscovery/nuclei/v3/pkg/operators/common/dsl" diff --git a/pkg/operators/matchers/match_test.go b/pkg/operators/matchers/match_test.go index 8a073318b..faed6de15 100644 --- a/pkg/operators/matchers/match_test.go +++ b/pkg/operators/matchers/match_test.go @@ -3,7 +3,7 @@ package matchers import ( "testing" - "github.com/Knetic/govaluate" + "github.com/projectdiscovery/govaluate" "github.com/projectdiscovery/nuclei/v3/pkg/operators/common/dsl" "github.com/stretchr/testify/require" ) diff --git a/pkg/operators/matchers/matchers.go b/pkg/operators/matchers/matchers.go index 95d1b2bf8..4e692e85c 100644 --- a/pkg/operators/matchers/matchers.go +++ b/pkg/operators/matchers/matchers.go @@ -3,7 +3,7 @@ package matchers import ( "regexp" - "github.com/Knetic/govaluate" + "github.com/projectdiscovery/govaluate" ) // Matcher is used to match a part in the output from a protocol. diff --git a/pkg/output/multi_writer.go b/pkg/output/multi_writer.go index 17b1c725a..99b8c8666 100644 --- a/pkg/output/multi_writer.go +++ b/pkg/output/multi_writer.go @@ -1,7 +1,7 @@ package output import ( - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" ) type MultiWriter struct { @@ -21,13 +21,13 @@ func (mw *MultiWriter) Close() { } } -func (mw *MultiWriter) Colorizer() aurora.Aurora { +func (mw *MultiWriter) Colorizer() *aurora.Aurora { // Return the colorizer of the first writer if len(mw.writers) > 0 { return mw.writers[0].Colorizer() } // Default to a no-op colorizer - return aurora.NewAurora(false) + return aurora.New(aurora.WithColors(false)) } func (mw *MultiWriter) Write(event *ResultEvent) error { diff --git a/pkg/output/output.go b/pkg/output/output.go index adebe867d..7f99cc976 100644 --- a/pkg/output/output.go +++ b/pkg/output/output.go @@ -20,7 +20,7 @@ import ( "go.uber.org/multierr" jsoniter "github.com/json-iterator/go" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/projectdiscovery/gologger" "github.com/projectdiscovery/interactsh/pkg/server" @@ -50,7 +50,7 @@ type Writer interface { // Close closes the output writer interface Close() // Colorizer returns the colorizer instance for writer - Colorizer() aurora.Aurora + Colorizer() *aurora.Aurora // Write writes the event to file and/or screen. Write(*ResultEvent) error // WriteFailure writes the optional failure event for template to file and/or screen. @@ -76,7 +76,7 @@ type StandardWriter struct { suppressHoneypot bool honeypotThreshold int mutex *sync.Mutex - aurora aurora.Aurora + aurora *aurora.Aurora outputFile io.WriteCloser traceFile io.WriteCloser errorFile io.WriteCloser @@ -241,7 +241,7 @@ type IssueTrackerMetadata struct { func NewStandardWriter(options *types.Options) (*StandardWriter, error) { resumeBool := options.Resume != "" - auroraColorizer := aurora.NewAurora(!options.NoColor) + auroraColorizer := aurora.New(aurora.WithColors(!options.NoColor)) var outputFile io.WriteCloser if options.Output != "" { @@ -490,7 +490,7 @@ func getJSONLogRequestFromError(templatePath, input, requestType string, request } // Colorizer returns the colorizer instance for writer -func (w *StandardWriter) Colorizer() aurora.Aurora { +func (w *StandardWriter) Colorizer() *aurora.Aurora { return w.aurora } diff --git a/pkg/output/output_stats.go b/pkg/output/output_stats.go index 68a234d85..e55910ba8 100644 --- a/pkg/output/output_stats.go +++ b/pkg/output/output_stats.go @@ -1,13 +1,13 @@ package output import ( - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/projectdiscovery/nuclei/v3/pkg/output/stats" ) // StatsOutputWriter implements writer interface for stats observation type StatsOutputWriter struct { - colorizer aurora.Aurora + colorizer *aurora.Aurora Tracker *stats.Tracker } @@ -16,14 +16,14 @@ var _ Writer = &StatsOutputWriter{} // NewStatsOutputWriter returns a new StatsOutputWriter instance. func NewTrackerWriter(t *stats.Tracker) *StatsOutputWriter { return &StatsOutputWriter{ - colorizer: aurora.NewAurora(true), + colorizer: aurora.New(aurora.WithColors(true)), Tracker: t, } } func (tw *StatsOutputWriter) Close() {} -func (tw *StatsOutputWriter) Colorizer() aurora.Aurora { +func (tw *StatsOutputWriter) Colorizer() *aurora.Aurora { return tw.colorizer } diff --git a/pkg/output/standard_writer.go b/pkg/output/standard_writer.go index 41800d7ba..10f533d37 100644 --- a/pkg/output/standard_writer.go +++ b/pkg/output/standard_writer.go @@ -5,7 +5,7 @@ import ( "os" "sync" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity" fileutil "github.com/projectdiscovery/utils/file" ) @@ -47,7 +47,7 @@ func WithMatcherStatus(matcherStatus bool) WriterOptions { } // WithAurora sets the aurora instance for the writer -func WithAurora(aurora aurora.Aurora) WriterOptions { +func WithAurora(aurora *aurora.Aurora) WriterOptions { return func(s *StandardWriter) error { s.aurora = aurora return nil @@ -109,7 +109,7 @@ func NewWriter(opts ...WriterOptions) (*StandardWriter, error) { } } if s.aurora == nil { - s.aurora = aurora.NewAurora(false) + s.aurora = aurora.New(aurora.WithColors(false)) } if s.outputFile == nil { s.outputFile = os.Stdout diff --git a/pkg/output/stats/stats.go b/pkg/output/stats/stats.go index 048d1f2bf..3256c37ea 100644 --- a/pkg/output/stats/stats.go +++ b/pkg/output/stats/stats.go @@ -11,7 +11,7 @@ import ( "strconv" "sync/atomic" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/projectdiscovery/nuclei/v3/pkg/output/stats/waf" mapsutil "github.com/projectdiscovery/utils/maps" ) diff --git a/pkg/protocols/common/automaticscan/automaticscan.go b/pkg/protocols/common/automaticscan/automaticscan.go index 015a40f5c..bd5dc386d 100644 --- a/pkg/protocols/common/automaticscan/automaticscan.go +++ b/pkg/protocols/common/automaticscan/automaticscan.go @@ -10,7 +10,7 @@ import ( "sync" "sync/atomic" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/pkg/errors" "github.com/projectdiscovery/gologger" "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config" diff --git a/pkg/protocols/common/expressions/expressions.go b/pkg/protocols/common/expressions/expressions.go index 2b87da8d7..859a555a4 100644 --- a/pkg/protocols/common/expressions/expressions.go +++ b/pkg/protocols/common/expressions/expressions.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/Knetic/govaluate" + "github.com/projectdiscovery/govaluate" "github.com/projectdiscovery/nuclei/v3/pkg/operators/common/dsl" "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/marker" diff --git a/pkg/protocols/common/expressions/variables.go b/pkg/protocols/common/expressions/variables.go index d769d8f9c..1a402e450 100644 --- a/pkg/protocols/common/expressions/variables.go +++ b/pkg/protocols/common/expressions/variables.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/Knetic/govaluate" + "github.com/projectdiscovery/govaluate" "github.com/projectdiscovery/nuclei/v3/pkg/operators/common/dsl" ) diff --git a/pkg/protocols/common/expressions/variables_test.go b/pkg/protocols/common/expressions/variables_test.go index 0deec3115..c275c73b5 100644 --- a/pkg/protocols/common/expressions/variables_test.go +++ b/pkg/protocols/common/expressions/variables_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - "github.com/Knetic/govaluate" + "github.com/projectdiscovery/govaluate" "github.com/projectdiscovery/nuclei/v3/pkg/operators/common/dsl" "github.com/stretchr/testify/require" ) diff --git a/pkg/protocols/common/helpers/responsehighlighter/response_highlighter.go b/pkg/protocols/common/helpers/responsehighlighter/response_highlighter.go index 39bb8e999..7b701bb47 100644 --- a/pkg/protocols/common/helpers/responsehighlighter/response_highlighter.go +++ b/pkg/protocols/common/helpers/responsehighlighter/response_highlighter.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/projectdiscovery/nuclei/v3/pkg/operators" ) diff --git a/pkg/protocols/common/variables/variables.go b/pkg/protocols/common/variables/variables.go index 76bcacd9a..7ba3a2a0b 100644 --- a/pkg/protocols/common/variables/variables.go +++ b/pkg/protocols/common/variables/variables.go @@ -3,8 +3,8 @@ package variables import ( "strings" - "github.com/Knetic/govaluate" "github.com/invopop/jsonschema" + "github.com/projectdiscovery/govaluate" "github.com/projectdiscovery/nuclei/v3/pkg/operators/common/dsl" "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/expressions" "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators" diff --git a/pkg/protocols/protocols.go b/pkg/protocols/protocols.go index ae5daa797..c917a9555 100644 --- a/pkg/protocols/protocols.go +++ b/pkg/protocols/protocols.go @@ -11,7 +11,7 @@ import ( mapsutil "github.com/projectdiscovery/utils/maps" stringsutil "github.com/projectdiscovery/utils/strings" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/projectdiscovery/nuclei/v3/pkg/authprovider" "github.com/projectdiscovery/nuclei/v3/pkg/catalog" @@ -119,7 +119,7 @@ type ExecutorOptions struct { // DoNotCache bool disables optional caching of the templates structure DoNotCache bool - Colorizer aurora.Aurora + Colorizer *aurora.Aurora WorkflowLoader model.WorkflowLoader ResumeCfg *types.ResumeCfg // ProtocolType is the type of the template diff --git a/pkg/reporting/exporters/sarif/sarif.go b/pkg/reporting/exporters/sarif/sarif.go index 67a438d80..651d35a40 100644 --- a/pkg/reporting/exporters/sarif/sarif.go +++ b/pkg/reporting/exporters/sarif/sarif.go @@ -55,7 +55,7 @@ func (exporter *Exporter) addToolDetails() { }, FullName: "Nuclei " + config.Version, SemanticVersion: config.Version, - DownloadURI: "https://github.com/projectdiscovery/nuclei/releases", + DownloadUri: "https://github.com/projectdiscovery/nuclei/releases", Rules: exporter.rules, } exporter.sarif.RegisterTool(driver) diff --git a/pkg/templates/compile.go b/pkg/templates/compile.go index 45b229a3d..8a2dbef54 100644 --- a/pkg/templates/compile.go +++ b/pkg/templates/compile.go @@ -7,7 +7,7 @@ import ( "sync" "sync/atomic" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/pkg/errors" "gopkg.in/yaml.v2" diff --git a/pkg/templates/log.go b/pkg/templates/log.go index a8f2735a0..583359ddd 100644 --- a/pkg/templates/log.go +++ b/pkg/templates/log.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/projectdiscovery/gologger" "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config" "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity" @@ -12,7 +12,7 @@ import ( ) var ( - Colorizer aurora.Aurora + Colorizer *aurora.Aurora SeverityColorizer func(severity.Severity) string deprecatedProtocolNameTemplates = mapsutil.SyncLockMap[string, bool]{Map: mapsutil.Map[string, bool]{}} //templates that still use deprecated protocol names ) diff --git a/pkg/templates/tag_filter.go b/pkg/templates/tag_filter.go index 960ab067e..6896d6883 100644 --- a/pkg/templates/tag_filter.go +++ b/pkg/templates/tag_filter.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/Knetic/govaluate" "github.com/projectdiscovery/gologger" + "github.com/projectdiscovery/govaluate" "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity" "github.com/projectdiscovery/nuclei/v3/pkg/operators/common/dsl" "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors" diff --git a/pkg/tmplexec/flow/vm.go b/pkg/tmplexec/flow/vm.go index 81c9c4c07..4b6f53503 100644 --- a/pkg/tmplexec/flow/vm.go +++ b/pkg/tmplexec/flow/vm.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/Mzack9999/goja" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/projectdiscovery/gologger" "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs" "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate" diff --git a/pkg/utils/stats/stats.go b/pkg/utils/stats/stats.go index f1edf2ea3..d374a9b3a 100644 --- a/pkg/utils/stats/stats.go +++ b/pkg/utils/stats/stats.go @@ -4,7 +4,7 @@ import ( "fmt" "sync/atomic" - "github.com/logrusorgru/aurora" + "github.com/logrusorgru/aurora/v4" "github.com/projectdiscovery/gologger" mapsutil "github.com/projectdiscovery/utils/maps" )