From c2176f7d71e92976d21f7b56fea0701528f94be7 Mon Sep 17 00:00:00 2001 From: Dominik Schulz Date: Sat, 24 Feb 2024 08:48:54 +0100 Subject: [PATCH] [chore] Upgrade to Go 1.22 (#2805) * [chore] Upgrade to Go 1.22 Also upgrades dependencies and fixes a flaky pwgen test. Signed-off-by: Dominik Schulz * Update pkg/pwgen/cryptic_test.go Co-authored-by: Yolan Romailler Signed-off-by: Dominik Schulz * Format Signed-off-by: Dominik Schulz --------- Signed-off-by: Dominik Schulz Signed-off-by: Dominik Schulz Co-authored-by: Yolan Romailler --- .github/workflows/autorelease.yml | 2 +- .github/workflows/build.yml | 6 +- .github/workflows/golangci-lint.yml | 2 +- .github/workflows/grype.yml | 2 +- .golangci.yml | 2 +- Dockerfile | 4 +- go.mod | 40 +++++------ go.sum | 103 ++++++++++++++++++---------- pkg/pwgen/cryptic.go | 10 ++- pkg/pwgen/cryptic_test.go | 5 +- pkg/pwgen/pwrules/pwrules_gen.go | 90 +++++++++++++++++++++++- 11 files changed, 192 insertions(+), 74 deletions(-) diff --git a/.github/workflows/autorelease.yml b/.github/workflows/autorelease.yml index 1a8dd79b3b..f08c552a60 100644 --- a/.github/workflows/autorelease.yml +++ b/.github/workflows/autorelease.yml @@ -30,7 +30,7 @@ jobs: name: Set up Go uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: '1.21' + go-version: '1.22' - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 with: path: ~/go/pkg/mod diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a7cc2e34f2..f88a0837ba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,7 +38,7 @@ jobs: - name: Set up Go uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: '1.21' + go-version: '1.22' - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 with: path: ~/go/pkg/mod @@ -92,7 +92,7 @@ jobs: - name: Set up Go uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: '1.21' + go-version: '1.22' - run: git config --global user.name nobody - run: git config --global user.email foo.bar@example.org @@ -115,7 +115,7 @@ jobs: - name: Set up Go uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: '1.21' + go-version: '1.22' - run: git config --global user.name nobody - run: git config --global user.email foo.bar@example.org diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 02d1dbdfdd..3cac2105b0 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -38,7 +38,7 @@ jobs: - name: Set up Go uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: '1.21' + go-version: '1.22' - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: golangci-lint uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v4.0.0 diff --git a/.github/workflows/grype.yml b/.github/workflows/grype.yml index 2d05a20623..eca64ef28e 100644 --- a/.github/workflows/grype.yml +++ b/.github/workflows/grype.yml @@ -30,7 +30,7 @@ jobs: - name: Set up Go uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: '1.21' + go-version: '1.22' - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 with: path: ~/go/pkg/mod diff --git a/.golangci.yml b/.golangci.yml index 63f4e6d54c..85c60c720c 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,7 +1,7 @@ run: skip-dirs: - helpers/ - go: 1.21 + go: 1.22 deadline: 5m linters-settings: diff --git a/Dockerfile b/Dockerfile index eed3ba382c..0c60e481c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21-alpine@sha256:110b07af87238fbdc5f1df52b00927cf58ce3de358eeeb1854f10a8b5e5e1411 AS build-env +FROM golang:1.22-alpine@sha256:8e96e6cff6a388c2f70f5f662b64120941fcd7d4b89d62fec87520323a316bd9 AS build-env ENV CGO_ENABLED 0 @@ -59,7 +59,7 @@ RUN go mod download RUN make clean RUN make git-credential-gopass -FROM alpine@sha256:eece025e432126ce23f223450a0326fbebde39cdf496a85d8c016293fc851978 +FROM alpine@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b RUN apk add --no-cache ca-certificates git gnupg COPY --from=build-env /home/runner/work/gopass/gopass/gopass /usr/local/bin/ COPY --from=build-env /home/runner/work/gopass/gopass-jsonapi/gopass-jsonapi /usr/local/bin/ diff --git a/go.mod b/go.mod index 862e70cf53..3e370ca581 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ module github.com/gopasspw/gopass -go 1.21 +go 1.22 require ( filippo.io/age v1.1.1 - github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c + github.com/ProtonMail/go-crypto v1.0.0 github.com/atotto/clipboard v0.1.4 github.com/blang/semver/v4 v4.0.0 github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b @@ -17,7 +17,7 @@ require ( github.com/google/go-cmp v0.6.0 github.com/google/go-github v17.0.0+incompatible github.com/google/go-github/v33 v33.0.0 - github.com/gopasspw/gopass-hibp v1.15.10 + github.com/gopasspw/gopass-hibp v1.15.11 github.com/hashicorp/golang-lru v1.0.2 github.com/jsimonetti/pwscheme v0.0.0-20220922140336-67a4d090f150 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 @@ -30,39 +30,39 @@ require ( github.com/mitchellh/go-ps v1.0.0 github.com/muesli/crunchy v0.4.0 github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 - github.com/noborus/ov v0.32.1 + github.com/noborus/ov v0.33.2 github.com/pquerna/otp v1.4.0 github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e github.com/stretchr/testify v1.8.4 github.com/twpayne/go-pinentry v0.3.0 - github.com/urfave/cli/v2 v2.25.7 + github.com/urfave/cli/v2 v2.27.1 github.com/xhit/go-str2duration v1.2.0 github.com/zalando/go-keyring v0.2.3 github.com/zeebo/blake3 v0.2.3 - golang.org/x/crypto v0.17.0 - golang.org/x/exp v0.0.0-20231127185646-65229373498e - golang.org/x/net v0.19.0 - golang.org/x/oauth2 v0.15.0 - golang.org/x/sys v0.15.0 - golang.org/x/term v0.15.0 + golang.org/x/crypto v0.19.0 + golang.org/x/exp v0.0.0-20240213143201-ec583247a57a + golang.org/x/net v0.21.0 + golang.org/x/oauth2 v0.17.0 + golang.org/x/sys v0.17.0 + golang.org/x/term v0.17.0 gopkg.in/yaml.v3 v3.0.1 ) require ( code.rocketnine.space/tslocum/cbind v0.1.5 // indirect - filippo.io/edwards25519 v1.0.0 // indirect + filippo.io/edwards25519 v1.1.0 // indirect github.com/alessio/shellescape v1.4.2 // indirect github.com/boombuler/barcode v1.0.1 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cloudflare/circl v1.3.7 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect - github.com/danieljoos/wincred v1.2.0 // indirect + github.com/danieljoos/wincred v1.2.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/frankban/quicktest v1.14.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/gdamore/encoding v1.0.0 // indirect - github.com/gdamore/tcell/v2 v2.6.0 // indirect + github.com/gdamore/tcell/v2 v2.7.0 // indirect github.com/gen2brain/shm v0.1.0 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/golang/protobuf v1.5.3 // indirect @@ -72,7 +72,7 @@ require ( github.com/jwalton/gchalk v1.3.0 // indirect github.com/jwalton/go-supportscolor v1.2.0 // indirect github.com/kjk/lzmadec v0.0.0-20210713164611-19ac3ee91a71 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.6 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect github.com/lxn/win v0.0.0-20210218163916-a377121e959e // indirect @@ -80,16 +80,16 @@ require ( github.com/noborus/guesswidth v0.3.4 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/rivo/uniseg v0.4.4 // indirect - github.com/rs/zerolog v1.31.0 // indirect + github.com/rivo/uniseg v0.4.7 // indirect + github.com/rs/zerolog v1.32.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/ulikunitz/xz v0.5.11 // indirect - github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect - golang.org/x/sync v0.5.0 // indirect + github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e // indirect + golang.org/x/sync v0.6.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.32.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect rsc.io/qr v0.2.0 // indirect ) diff --git a/go.sum b/go.sum index 5ae57feb20..29e18653c4 100644 --- a/go.sum +++ b/go.sum @@ -2,10 +2,10 @@ code.rocketnine.space/tslocum/cbind v0.1.5 h1:i6NkeLLNPNMS4NWNi3302Ay3zSU6MrqOT+ code.rocketnine.space/tslocum/cbind v0.1.5/go.mod h1:LtfqJTzM7qhg88nAvNhx+VnTjZ0SXBJtxBObbfBWo/M= filippo.io/age v1.1.1 h1:pIpO7l151hCnQ4BdyBujnGP2YlUo0uj6sAVNHGBvXHg= filippo.io/age v1.1.1/go.mod h1:l03SrzDUrBkdBx8+IILdnn2KZysqQdbEBUQ4p3sqEQE= -filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= -filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= -github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c h1:kMFnB0vCcX7IL/m9Y5LO+KQYv+t1CQOiFe6+SV2J7bE= -github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= +github.com/ProtonMail/go-crypto v1.0.0 h1:LRuvITjQWX+WIfr930YHG2HNfjR1uOfyf5vE0kC2U78= +github.com/ProtonMail/go-crypto v1.0.0/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk= github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ= github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk= @@ -33,8 +33,8 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/danieljoos/wincred v1.2.0 h1:ozqKHaLK0W/ii4KVbbvluM91W2H3Sh0BncbUNPS7jLE= -github.com/danieljoos/wincred v1.2.0/go.mod h1:FzQLLMKBFdvu+osBrnFODiv32YGwCfx0SkRa/eYHgec= +github.com/danieljoos/wincred v1.2.1 h1:dl9cBrupW8+r5250DYkYxocLeZ1Y4vB1kxgtjxw8GQs= +github.com/danieljoos/wincred v1.2.1/go.mod h1:uGaFL9fDn3OLTvzCGulzE+SzjEe5NGlh5FdCcyfPwps= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -51,8 +51,8 @@ github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyT github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko= github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= github.com/gdamore/tcell/v2 v2.2.0/go.mod h1:cTTuF84Dlj/RqmaCIV5p4w8uG1zWdk0SF6oBpwHp4fU= -github.com/gdamore/tcell/v2 v2.6.0 h1:OKbluoP9VYmJwZwq/iLb4BxwKcwGthaa1YNBJIyCySg= -github.com/gdamore/tcell/v2 v2.6.0/go.mod h1:be9omFATkdr0D9qewWW3d+MEvl5dha+Etb5y65J2H8Y= +github.com/gdamore/tcell/v2 v2.7.0 h1:I5LiGTQuwrysAt1KS9wg1yFfOI3arI3ucFrxtd/xqaA= +github.com/gdamore/tcell/v2 v2.7.0/go.mod h1:hl/KtAANGBecfIPxk+FzKvThTqI84oplgbPEmVX60b8= github.com/gen2brain/shm v0.1.0 h1:MwPeg+zJQXN0RM9o+HqaSFypNoNEcNpeoGp0BTSx2YY= github.com/gen2brain/shm v0.1.0/go.mod h1:UgIcVtvmOu+aCJpqJX7GOtiN7X2ct+TKLg4RTxwPIUA= github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722 h1:NNKZiuNXd6lpZRyoFM/uhssj5W9Ps1DbhGHxT49Pm9I= @@ -82,12 +82,14 @@ github.com/google/go-github/v33 v33.0.0/go.mod h1:GMdDnVZY/2TsWgp/lkYnpSAh6TrzhA github.com/google/go-querystring v1.0.0/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= -github.com/gopasspw/gopass-hibp v1.15.10 h1:mQyxHyVWuoIQ64Tohmot1/Wx0A+5a7xmjDLoG263gcQ= -github.com/gopasspw/gopass-hibp v1.15.10/go.mod h1:gLkzfut41fE3PHMpY5SGxajeYHkvr+YXmyoKo7ATiIg= +github.com/gopasspw/gopass-hibp v1.15.11 h1:Cpins5/iE4A/lBO2DhKUc7rhuiE02POsKihui2YI9gk= +github.com/gopasspw/gopass-hibp v1.15.11/go.mod h1:ipB7vEn2Y7vosD6nywmFVkT+RwQZb4y4fyyMUtcFcw4= github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/jezek/xgb v1.1.1 h1:bE/r8ZZtSv7l9gk6nU0mYx51aXrvnyb44892TwSaqS4= @@ -105,8 +107,8 @@ github.com/kbinani/screenshot v0.0.0-20230812210009-b87d31814237 h1:YOp8St+CM/AQ github.com/kbinani/screenshot v0.0.0-20230812210009-b87d31814237/go.mod h1:e7qQlOY68wOz4b82D7n+DdaptZAi+SHW0+yKiWZzEYE= github.com/kjk/lzmadec v0.0.0-20210713164611-19ac3ee91a71 h1:TYp9Fj0apeZMWentXRaFM6B0ixdFefrlgY8n8XYEz1s= github.com/kjk/lzmadec v0.0.0-20210713164611-19ac3ee91a71/go.mod h1:2zRkQCuw/eK6cqkYAeNqyBU7JKa2Gcq40BZ9GSJbmfE= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.6 h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI= +github.com/klauspost/compress v1.17.6/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -122,6 +124,8 @@ github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/lxn/win v0.0.0-20210218163916-a377121e959e h1:H+t6A/QJMbhCSEH5rAuRxh+CtW96g0Or0Fxa9IKr4uc= github.com/lxn/win v0.0.0-20210218163916-a377121e959e/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk= +github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= +github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/makiuchi-d/gozxing v0.1.1 h1:xxqijhoedi+/lZlhINteGbywIrewVdVv2wl9r5O9S1I= github.com/makiuchi-d/gozxing v0.1.1/go.mod h1:eRIHbOjX7QWxLIDJoQuMLhuXg9LAuw6znsUtRkNw9DU= github.com/martinhoefling/goxkcdpwgen v0.1.2-0.20231122080842-e51aa57005ca h1:jV6vw7U2RoS1sI7f6f12/wsCwMjADZ/xUxi/lhUqjV8= @@ -137,21 +141,24 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= -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-tty v0.0.5 h1:s09uXI7yDbXzzTTfw3zonKFzwGkyYlgU3OMjqA0ddz4= github.com/mattn/go-tty v0.0.5/go.mod h1:u5GGXBtZU6RQoKV8gY5W6UhMudbR5vXnUe7j3pxse28= github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/muesli/crunchy v0.4.0 h1:qdiml8gywULHBsztiSAf6rrE6EyuNasNKZ104mAaahM= github.com/muesli/crunchy v0.4.0/go.mod h1:9k4x6xdSbb7WwtAVy0iDjaiDjIk6Wa5AgUIqp+HqOpU= github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 h1:4kuARK6Y6FxaNu/BnU2OAaLF86eTVhP2hjTB6iMvItA= github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8= github.com/noborus/guesswidth v0.3.4 h1:+iKmbm0iFTS3pksIOKQQvLVZVOKNZHavqJoFK2mPoTQ= github.com/noborus/guesswidth v0.3.4/go.mod h1:2F1sqiazKIwuSRjQTweQHPFJcjV5375jYUrTik9/V5k= -github.com/noborus/ov v0.32.1 h1:C/o09eIw5Z49FiV/w9SWB5CzPoFWLaLSW2mb9Xek2so= -github.com/noborus/ov v0.32.1/go.mod h1:aqCiO+fCoc8vnoGr9spbSy/xMrKjMSwELukZ8W/8z88= +github.com/noborus/ov v0.33.2 h1:s25LWDv5LzjYPv0GQUUQux26xbNUp+mQ1+AJObxf9t8= +github.com/noborus/ov v0.33.2/go.mod h1:Pz54YZuLrOa/nC4TaVCpSiHcM98KwLYsSXh820VAxP4= +github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= +github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM= github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= @@ -165,20 +172,34 @@ github.com/pquerna/otp v1.4.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= -github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= -github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= +github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= -github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= +github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0= +github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= +github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= +github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= +github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e h1:HFUDYOpUVZ0oTXeZy2A59Lkf69SsOF03Lg1GsI3Xh9o= github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M= +github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= +github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= +github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= +github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= +github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= +github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ= +github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= @@ -186,17 +207,19 @@ github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= +github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/twpayne/go-pinentry v0.3.0 h1:Rr+fEOZXmeItOb4thjeVaBWJKB9Xa/eojolycyF/26c= github.com/twpayne/go-pinentry v0.3.0/go.mod h1:iOIZD+9np/2V24OdCGos7Y1/xX90wc6VEAZsgb+r9D4= github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs= -github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= +github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho= +github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= github.com/xhit/go-str2duration v1.2.0 h1:BcV5u025cITWxEQKGWr1URRzrcXtu7uk8+luz3Yuhwc= github.com/xhit/go-str2duration v1.2.0/go.mod h1:3cPSlfZlUHVlneIVfePFWcJZsuwf+P1v2SRTV4cUmp4= github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= -github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= -github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= +github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e h1:+SOyEddqYF09QP7vr7CgJ1eti3pY9Fn3LHO1M1r/0sI= +github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zalando/go-keyring v0.2.3 h1:v9CUu9phlABObO4LPWycf+zwMG7nlbb3t/B5wa97yms= github.com/zalando/go-keyring v0.2.3/go.mod h1:HL4k+OXQfJUWaMnqyuSOc0drfGPX2b51Du6K+MRgZMk= @@ -206,15 +229,17 @@ github.com/zeebo/blake3 v0.2.3 h1:TFoLXsjeXqRNFxSbk35Dk4YtszE/MQQGK10BH4ptoTg= github.com/zeebo/blake3 v0.2.3/go.mod h1:mjJjZpnsyIVtVgTOSpJ9vmRE4wgDeyt2HU3qXvvKCaQ= github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo= github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -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/exp v0.0.0-20231127185646-65229373498e h1:Gvh4YaCaXNs6dKTlfgismwWZKyjVZXwOPfIyUaqU3No= -golang.org/x/exp v0.0.0-20231127185646-65229373498e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= +golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/exp v0.0.0-20240213143201-ec583247a57a h1:HinSgX1tJRX3KsL//Gxynpw5CTOAIPhgL4W8PNiIpVE= +golang.org/x/exp v0.0.0-20240213143201-ec583247a57a/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -226,16 +251,16 @@ golang.org/x/net v0.0.0-20220921155015-db77216a4ee9/go.mod h1:YDH+HFinaLZZlnHAfS golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -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.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ= -golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM= +golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= +golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= golang.org/x/sync v0.0.0-20190423024810-112230192c58/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.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-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -257,8 +282,9 @@ golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.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.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -267,8 +293,9 @@ golang.org/x/term v0.0.0-20220919170432-7a66f970e087/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -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.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -294,11 +321,13 @@ google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAs google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= 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-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/pkg/pwgen/cryptic.go b/pkg/pwgen/cryptic.go index 2d34a92b72..8e00b464f7 100644 --- a/pkg/pwgen/cryptic.go +++ b/pkg/pwgen/cryptic.go @@ -59,7 +59,7 @@ func NewCrypticForDomain(ctx context.Context, length int, domain string) *Crypti c.Length = r.Maxlen } - if c.Length < r.Minlen { + if r.Minlen > 0 && c.Length < r.Minlen { c.Length = r.Minlen } @@ -87,6 +87,10 @@ func NewCrypticForDomain(ctx context.Context, length int, domain string) *Crypti return fmt.Errorf("password %s does not contain any of %s: %w", pw, chars, ErrCrypticInvalid) }) } + // if we have a required rule, we need to make sure the password is at least that long. + if c.Length < len(r.Required) { + c.Length = len(r.Required) + 1 + } if r.Maxconsec > 0 { c.Validators = append(c.Validators, func(pw string) error { @@ -197,9 +201,11 @@ func (c *Cryptic) Password() string { return "" } - if pw := c.randomString(); c.isValid(pw) { + pw := c.randomString() + if c.isValid(pw) { return pw } + debug.Log("generated invalid password %q, trying again (%d/%d)", pw, round, c.MaxTries) } } diff --git a/pkg/pwgen/cryptic_test.go b/pkg/pwgen/cryptic_test.go index 4479a66d46..7430c2bc61 100644 --- a/pkg/pwgen/cryptic_test.go +++ b/pkg/pwgen/cryptic_test.go @@ -26,11 +26,10 @@ func TestCrypticForDomain(t *testing.T) { for _, domain := range keys { domain := domain t.Run(domain, func(t *testing.T) { - t.Parallel() - for _, length := range []int{1, 4, 8, 100} { - tcName := fmt.Sprintf("%s - %d", domain, length) + tcName := fmt.Sprintf("%s: generated password with %d chars", domain, length) c := NewCrypticForDomain(config.NewContextInMemory(), length, domain) + c.MaxTries = 1024 require.NotNil(t, c, tcName) diff --git a/pkg/pwgen/pwrules/pwrules_gen.go b/pkg/pwgen/pwrules/pwrules_gen.go index 06eea31ab2..bb3b17e949 100644 --- a/pkg/pwgen/pwrules/pwrules_gen.go +++ b/pkg/pwgen/pwrules/pwrules_gen.go @@ -1,6 +1,6 @@ // Code generated by go generate gen.go. DO NOT EDIT. // This package was generated by go generate gen.go at -// 2023-12-01 13:04:43.331767505 +0000 UTC +// 2024-02-16 09:43:10.351013071 +0000 UTC // using data from // // https://raw.githubusercontent.com/apple/password-manager-resources/main/quirks/websites-with-shared-credential-backends.json @@ -5839,6 +5839,14 @@ var genAliases = map[string][]string{ "vail.com", "whistlerblackcomb.com", }, + "parkmobile.io": { + "parkmobile.us", + "parkmobile.io", + }, + "parkmobile.us": { + "parkmobile.us", + "parkmobile.io", + }, "pavilions.com": { "albertsons.com", "acmemarkets.com", @@ -6427,6 +6435,10 @@ var genAliases = map[string][]string{ "probikeshop.pt", "probikeshop.com", }, + "profile.callofduty.com": { + "s.activision.com", + "profile.callofduty.com", + }, "protonmail.com": { "protonmail.com", "protonvpn.com", @@ -6453,6 +6465,10 @@ var genAliases = map[string][]string{ "questdiagnostics.com", "care360.com", }, + "quicken.com": { + "quicken.com", + "simplifimoney.com", + }, "randalls.com": { "albertsons.com", "acmemarkets.com", @@ -6505,6 +6521,10 @@ var genAliases = map[string][]string{ "rtlplus.de", "rtlplus.com", }, + "s.activision.com": { + "s.activision.com", + "profile.callofduty.com", + }, "safeway.com": { "albertsons.com", "acmemarkets.com", @@ -6712,6 +6732,10 @@ var genAliases = map[string][]string{ "hulu.com", "shopdisney.com", }, + "simplifimoney.com": { + "quicken.com", + "simplifimoney.com", + }, "skicb.com": { "beavercreek.com", "breckenridge.com", @@ -7056,6 +7080,10 @@ var genAliases = map[string][]string{ "tp-link.com", "tplinkcloud.com", }, + "transferwise.com": { + "transferwise.com", + "wise.com", + }, "trello.com": { "atlassian.com", "trello.com", @@ -7505,6 +7533,10 @@ var genAliases = map[string][]string{ "evoshield.com", "luxilon.com", }, + "wise.com": { + "transferwise.com", + "wise.com", + }, "worldlink.com.np": { "worldlink.com.np", "nettv.com.np", @@ -8000,6 +8032,7 @@ var genRules = map[string]Rule{ "claimlookup.com": {Minlen: 8, Maxlen: 16, Required: []string{"[@#$%^&+=!]", "[@#$%^&+=!]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "claro.com.br": {Minlen: 8, Maxlen: 0, Required: []string{"lower"}, Allowed: []string{"", "digit", "upper"}, Maxconsec: 0, Exact: false}, "classmates.com": {Minlen: 6, Maxlen: 20, Required: []string{}, Allowed: []string{"", "digit", "lower", "upper"}, Maxconsec: 0, Exact: false}, + "clegc-gckey.gc.ca": {Minlen: 8, Maxlen: 16, Required: []string{"digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "clien.net": {Minlen: 5, Maxlen: 0, Required: []string{"digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "collectivehealth.com": {Minlen: 8, Maxlen: 0, Required: []string{"digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "comcastpaymentcenter.com": {Minlen: 8, Maxlen: 20, Required: []string{"digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 2, Exact: false}, @@ -8044,7 +8077,7 @@ var genRules = map[string]Rule{ "fc2.com": {Minlen: 8, Maxlen: 16, Required: []string{}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "fccaccessonline.com": {Minlen: 8, Maxlen: 14, Required: []string{"[!#$%*^_]", "[!#$%*^_]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, "fedex.com": {Minlen: 8, Maxlen: 0, Required: []string{"digit", "lower", "upper"}, Allowed: []string{"[-!@#$%^&*_+=`|(){}[:;,.?]]"}, Maxconsec: 3, Exact: false}, - "fidelity.com": {Minlen: 6, Maxlen: 20, Required: []string{"lower"}, Allowed: []string{"", "digit", "upper"}, Maxconsec: 0, Exact: false}, + "fidelity.com": {Minlen: 6, Maxlen: 20, Required: []string{"./:", "[-!$%+,./:;=?@^_|]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 2, Exact: false}, "flysas.com": {Minlen: 8, Maxlen: 14, Required: []string{".?]]", "[-~!@#$%^&_+=`|(){}[:\"'<>,.?]]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "fnac.com": {Minlen: 8, Maxlen: 0, Required: []string{"digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "fuelrewards.com": {Minlen: 8, Maxlen: 16, Required: []string{}, Allowed: []string{"", "digit", "lower", "upper"}, Maxconsec: 0, Exact: false}, @@ -8058,18 +8091,65 @@ var genRules = map[string]Rule{ "gwl.greatwestlife.com": {Minlen: 8, Maxlen: 0, Required: []string{"[-!#$%_=+<>]", "[-!#$%_=+<>]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "hangseng.com": {Minlen: 8, Maxlen: 30, Required: []string{"digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "hawaiianairlines.com": {Minlen: 0, Maxlen: 16, Required: []string{}, Allowed: []string{}, Maxconsec: 0, Exact: false}, + "hertz-japan.com": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz-kuwait.com": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz-saudi.com": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.at": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.be": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.bh": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.ca": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.ch": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.cn": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.co.ao": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.co.id": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.co.kr": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.co.nz": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.co.th": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.co.uk": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, "hertz.com": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.com.au": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.com.bh": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.com.hk": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.com.kw": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.com.mt": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.com.pl": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.com.pt": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.com.sg": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.com.tw": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.cv": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.cz": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.de": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.ee": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.es": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.fi": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.fr": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.hu": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.ie": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.it": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.jo": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.lt": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.nl": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.no": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.nu": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.pl": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.pt": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.qa": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.ru": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.se": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertz.si": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, + "hertzcaribbean.com": {Minlen: 8, Maxlen: 30, Required: []string{"[#$%^&!@]", "[#$%^&!@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, "hetzner.com": {Minlen: 8, Maxlen: 0, Required: []string{"digit", "lower", "special", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "hilton.com": {Minlen: 8, Maxlen: 32, Required: []string{"digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "hkbea.com": {Minlen: 8, Maxlen: 12, Required: []string{"digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "hkexpress.com": {Minlen: 8, Maxlen: 15, Required: []string{"digit", "lower", "special", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, - "hotels.com": {Minlen: 6, Maxlen: 20, Required: []string{"digit"}, Allowed: []string{"", "lower", "upper"}, Maxconsec: 0, Exact: false}, + "hotels.com": {Minlen: 6, Maxlen: 20, Required: []string{"[-~#@$%&!*_?^]", "[-~#@$%&!*_?^]", "digit"}, Allowed: []string{"lower", "upper"}, Maxconsec: 0, Exact: false}, "hotwire.com": {Minlen: 6, Maxlen: 30, Required: []string{}, Allowed: []string{"", "digit", "lower", "upper"}, Maxconsec: 0, Exact: false}, "hrblock.com": {Minlen: 8, Maxlen: 0, Required: []string{"[$#%!]", "[$#%!]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "hsbc.com.hk": {Minlen: 6, Maxlen: 30, Required: []string{"digit", "lower", "upper"}, Allowed: []string{"['.@_]", "['.@_]"}, Maxconsec: 0, Exact: false}, "hsbc.com.my": {Minlen: 8, Maxlen: 30, Required: []string{"digit", "lower", "upper"}, Allowed: []string{"[-!$*.=?@_']", "[-!$*.=?@_']"}, Maxconsec: 0, Exact: false}, "hypovereinsbank.de": {Minlen: 6, Maxlen: 10, Required: []string{"digit", "lower", "upper"}, Allowed: []string{"[!\"#$%&()*+:;<=>?@[{}~]]"}, Maxconsec: 0, Exact: false}, "hyresbostader.se": {Minlen: 6, Maxlen: 20, Required: []string{"digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, + "ichunqiu.com": {Minlen: 8, Maxlen: 20, Required: []string{"digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "id.sonyentertainmentnetwork.com": {Minlen: 8, Maxlen: 30, Required: []string{"digit", "lower", "upper"}, Allowed: []string{"[-!@#^&*=+;:]"}, Maxconsec: 0, Exact: false}, "identitytheft.gov": {Minlen: 0, Maxlen: 0, Required: []string{}, Allowed: []string{"", "digit", "lower", "upper"}, Maxconsec: 0, Exact: false}, "idestination.info": {Minlen: 0, Maxlen: 15, Required: []string{}, Allowed: []string{}, Maxconsec: 0, Exact: false}, @@ -8094,6 +8174,7 @@ var genRules = map[string]Rule{ "leetchi.com": {Minlen: 8, Maxlen: 0, Required: []string{"./:", "[!#$%&()*+,./:;<>?@\"_]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "lepida.it": {Minlen: 8, Maxlen: 16, Required: []string{".:", "[-!\"#$%&'()*+,.:;<=>?@[^_`{|}~]]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 2, Exact: false}, "lg.com": {Minlen: 8, Maxlen: 16, Required: []string{"digit", "lower", "upper"}, Allowed: []string{".:", "[-!#$%&'()*+,.:;=?@[^_{|}~]]"}, Maxconsec: 0, Exact: false}, + "linearity.io": {Minlen: 8, Maxlen: 0, Required: []string{"digit", "lower", "special", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "live.com": {Minlen: 8, Maxlen: 0, Required: []string{"digit", "lower", "upper"}, Allowed: []string{"", "[-@_#!&$`%*+()./,;~:{}|?>=<^'[]]"}, Maxconsec: 0, Exact: false}, "lloydsbank.co.uk": {Minlen: 8, Maxlen: 15, Required: []string{"digit", "lower"}, Allowed: []string{"upper"}, Maxconsec: 0, Exact: false}, "lowes.com": {Minlen: 8, Maxlen: 128, Required: []string{"digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 3, Exact: false}, @@ -8109,6 +8190,7 @@ var genRules = map[string]Rule{ "member.everbridge.net": {Minlen: 8, Maxlen: 0, Required: []string{"digit", "lower", "upper"}, Allowed: []string{"[!@#$%^&*()]", "[!@#$%^&*()]"}, Maxconsec: 0, Exact: false}, "metlife.com": {Minlen: 6, Maxlen: 20, Required: []string{}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "microsoft.com": {Minlen: 8, Maxlen: 0, Required: []string{"digit", "lower", "special", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, + "milogin.michigan.gov": {Minlen: 8, Maxlen: 0, Required: []string{"[@#$!~&]", "[@#$!~&]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "mintmobile.com": {Minlen: 8, Maxlen: 20, Required: []string{"digit", "lower", "special", "upper"}, Allowed: []string{"[!#$%&()*+:;=@[^_`{}~]]"}, Maxconsec: 0, Exact: false}, "mlb.com": {Minlen: 8, Maxlen: 15, Required: []string{"digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "mpv.tickets.com": {Minlen: 8, Maxlen: 15, Required: []string{"digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, @@ -8198,10 +8280,12 @@ var genRules = map[string]Rule{ "ventrachicago.com": {Minlen: 8, Maxlen: 0, Required: []string{"", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "verizonwireless.com": {Minlen: 8, Maxlen: 20, Required: []string{"digit", "lower", "upper"}, Allowed: []string{"unicode"}, Maxconsec: 0, Exact: false}, "vetsfirstchoice.com": {Minlen: 8, Maxlen: 0, Required: []string{"digit", "lower", "upper"}, Allowed: []string{"[?!@$%^+=&]", "[?!@$%^+=&]"}, Maxconsec: 0, Exact: false}, + "vince.com": {Minlen: 8, Maxlen: 0, Required: []string{"[$%/(){}=?!.,_*|+~#[]]", "_*|+~#[]]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "virginmobile.ca": {Minlen: 8, Maxlen: 0, Required: []string{"[!#$@]", "[!#$@]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "visa.com": {Minlen: 6, Maxlen: 32, Required: []string{}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "visabenefits-auth.axa-assistance.us": {Minlen: 8, Maxlen: 0, Required: []string{".:<>?@^{|}]", "[!\"#$%&()*,.:<>?@^{|}]", "digit", "lower", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "vivo.com.br": {Minlen: 0, Maxlen: 6, Required: []string{}, Allowed: []string{"digit"}, Maxconsec: 3, Exact: false}, + "volaris.com": {Minlen: 8, Maxlen: 16, Required: []string{"digit", "lower", "special", "upper"}, Allowed: []string{}, Maxconsec: 0, Exact: false}, "wa.aaa.com": {Minlen: 8, Maxlen: 16, Required: []string{"digit", "lower", "upper"}, Allowed: []string{"ascii-printable"}, Maxconsec: 0, Exact: false}, "walkhighlands.co.uk": {Minlen: 9, Maxlen: 15, Required: []string{"digit", "lower", "upper"}, Allowed: []string{"special"}, Maxconsec: 0, Exact: false}, "walmart.com": {Minlen: 0, Maxlen: 0, Required: []string{}, Allowed: []string{"", "digit", "lower", "upper"}, Maxconsec: 0, Exact: false},