diff --git a/CHANGELOG.md b/CHANGELOG.md index 596a4ff8d8..971b8c549b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## 1.15.10 / 2023-11-25 + +* [BUGFIX] Allow to move shadowed entries into their own folder (#2718) +* [BUGFIX] Try to always honor local config for mounts (#2724) +* [chore] Add OSSF scorecard link and improve security posture (#2704) +* [chore] Update goxkcdpwgen dependency to include my PR (#2722) +* [chore] Update grype workflow and pin Docker base images (#2706) +* [cleanup] Add package description (#2702) +* [feature] Add new pwgen options to capitalize and include numbers in (#2703) + ## 1.15.9 / 2023-11-18 * [BUGFIX] Disabling the OTP snip screenshot feature on OpenBSD (#2685) diff --git a/VERSION b/VERSION index 30a88ea45a..fcf38d94da 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.15.9 +1.15.10 diff --git a/go.mod b/go.mod index 855b2aa250..5706d7ebb6 100644 --- a/go.mod +++ b/go.mod @@ -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.8 + github.com/gopasspw/gopass-hibp v1.15.9 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 diff --git a/go.sum b/go.sum index 55639ca27c..1c3d339391 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,6 @@ github.com/danieljoos/wincred v1.2.0/go.mod h1:FzQLLMKBFdvu+osBrnFODiv32YGwCfx0S 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= -github.com/dominikschulz/goxkcdpwgen v0.1.2-num h1:uEhXPi3Ckm1el5HARUBFH5WR8rK2hUI+x21IyINwIms= -github.com/dominikschulz/goxkcdpwgen v0.1.2-num/go.mod h1:6TCkeMIDjs8RBu1OPOIVtxmmI3Nfcz6EyCGh+12gL6U= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/ergochat/readline v0.0.6 h1:tzs8UNseob/yqphZt0GTgC07JUnQNJSFhLWAnwvd2sg= @@ -84,8 +82,8 @@ 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.8 h1:awcJF1LZC8ejs0ujFIn4uWrSio1ou2L+Xw/Pu/zfCUQ= -github.com/gopasspw/gopass-hibp v1.15.8/go.mod h1:yrTzyJWS6+MafPS1mosFLmjHzuB+rXwAaIZXyaN1vQ0= +github.com/gopasspw/gopass-hibp v1.15.9 h1:syU+5P35j9uI7rLBZP0rRGS69l5nzighbKRdNi2HQH8= +github.com/gopasspw/gopass-hibp v1.15.9/go.mod h1:pxgvhja9Pzx5Yelpp8/mxbjt8n9UjTpPkbHko/pViIg= 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= @@ -126,8 +124,6 @@ github.com/lxn/win v0.0.0-20210218163916-a377121e959e h1:H+t6A/QJMbhCSEH5rAuRxh+ github.com/lxn/win v0.0.0-20210218163916-a377121e959e/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk= 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.20221205222637-737661b92a0e h1:Msp8Yrv7Z/QVD+GAdkHTtStGqtAGBxoJ9a/+j2D2AFc= -github.com/martinhoefling/goxkcdpwgen v0.1.2-0.20221205222637-737661b92a0e/go.mod h1:6TCkeMIDjs8RBu1OPOIVtxmmI3Nfcz6EyCGh+12gL6U= github.com/martinhoefling/goxkcdpwgen v0.1.2-0.20231122080842-e51aa57005ca h1:jV6vw7U2RoS1sI7f6f12/wsCwMjADZ/xUxi/lhUqjV8= github.com/martinhoefling/goxkcdpwgen v0.1.2-0.20231122080842-e51aa57005ca/go.mod h1:IKRlPM0t4ZmK9YZ33QZ2hB1DcSY8WnQedKRDyYeNRp4= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= diff --git a/gopass.1 b/gopass.1 index af851d19bb..6ee941fcec 100644 --- a/gopass.1 +++ b/gopass.1 @@ -1,5 +1,5 @@ -.TH GOPASS "1" "November 2023" "gopass (github.com/gopasspw/gopass) 1.15.9" "User Commands" +.TH GOPASS "1" "November 2023" "gopass (github.com/gopasspw/gopass) 1.15.10" "User Commands" .SH NAME gopass - The standard Unix password manager .SH SYNOPSIS @@ -458,6 +458,14 @@ Include at least one symbol in the password. \fB\-\-xkcd\fR, \fB\-x\fR, Use multiple random english words combined to a password. By default, space is used as separator and all words are lowercase +.TP +\fB\-\-xkcdcapitalize\fR, +\fB\-\-xc\fR, +Capitalize first letter of each word in generated xkcd style password. This flag implies -xkcd +.TP +\fB\-\-xkcdnumbers\fR, +\fB\-\-xn\fR, +Add a random number to the end of the generated xkcd style password. This flag implies -xkcd .SS rcs Run a RCS command inside a password store diff --git a/pkg/pwgen/pwrules/pwrules_gen.go b/pkg/pwgen/pwrules/pwrules_gen.go index 49bba05c6d..6eec5bd8ea 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-11-18 07:48:57.207866458 +0000 UTC +// 2023-11-25 16:50:00.627428559 +0000 UTC // using data from // // https://raw.githubusercontent.com/apple/password-manager-resources/main/quirks/websites-with-shared-credential-backends.json diff --git a/version.go b/version.go index 69e3169747..8644ad5061 100644 --- a/version.go +++ b/version.go @@ -15,7 +15,7 @@ func getVersion() semver.Version { return semver.Version{ Major: 1, Minor: 15, - Patch: 9, + Patch: 10, Pre: []semver.PRVersion{ {VersionStr: "git"}, }, diff --git a/zsh.completion b/zsh.completion index a1004a66f0..f28f81a504 100644 --- a/zsh.completion +++ b/zsh.completion @@ -180,7 +180,7 @@ _gopass () { ;; pwgen) - _arguments : "--no-numerals[Do not include numerals in the generated passwords.]" "--no-capitalize[Do not include capital letter in the generated passwords.]" "--ambiguous[Do not include characters that could be easily confused with each other, like '1' and 'l' or '0' and 'O']" "--symbols[Include at least one symbol in the password.]" "--one-per-line[Print one password per line]" "--xkcd[Use multiple random english words combined to a password. By default, space is used as separator and all words are lowercase]" "--sep[Word separator for generated xkcd style password. If no separator is specified, the words are combined without spaces/separator and the first character of words is capitalised. This flag implies -xkcd]" "--lang[Language to generate password from, currently only en (english, default) or de are supported]" + _arguments : "--no-numerals[Do not include numerals in the generated passwords.]" "--no-capitalize[Do not include capital letter in the generated passwords.]" "--ambiguous[Do not include characters that could be easily confused with each other, like '1' and 'l' or '0' and 'O']" "--symbols[Include at least one symbol in the password.]" "--one-per-line[Print one password per line]" "--xkcd[Use multiple random english words combined to a password. By default, space is used as separator and all words are lowercase]" "--sep[Word separator for generated xkcd style password. If no separator is specified, the words are combined without spaces/separator and the first character of words is capitalised. This flag implies -xkcd]" "--lang[Language to generate password from, currently only en (english, default) or de are supported]" "--xkcdcapitalize[Capitalize first letter of each word in generated xkcd style password. This flag implies -xkcd]" "--xkcdnumbers[Add a random number to the end of the generated xkcd style password. This flag implies -xkcd]" ;;