From 537a2bb962cc60b09fe1453587f7a33acb6da4ab Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Sun, 4 Mar 2018 11:34:13 -0800 Subject: Update changelog for 1.1.0 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0226d3e..43782b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ Change Log ============= +Version 1.1.0 *(2018-03-04)* +------------------------------- + + * New: `insert` and `append` commands accept secret parameters directly using + the `--secret`, `--issuer` and `--account` arguments. + * Fix compatibility with Bash versions prior to 4.x. + * Return an error status for `code` when the passfile does not contain an + `otpauth://` entry. + Version 1.0.0 *(2017-03-20)* ------------------------------- -- cgit v1.2.3 From bc7642b454dec457b972826ac093ca2e2d64e77d Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Mon, 5 Mar 2018 11:53:52 -0800 Subject: Add test/lint requirement documentation --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 114f48f..1625f52 100644 --- a/README.md +++ b/README.md @@ -134,6 +134,11 @@ make install PREFIX=/usr/local - `oathtool` for generating 2FA codes - `qrencode` for generating QR code images +### Build requirements + +- `expect` - `make test` requirement +- `shellcheck` - `make lint` requirement + ## Migrating from pass-otp 0.1 `pass-otp` has switched to storing OTP tokens in the -- cgit v1.2.3 From 74fdfede153ca983deb09e4d1fede412b6b844bc Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Mon, 5 Mar 2018 11:57:08 -0800 Subject: Clarify build requirements --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1625f52..6397eea 100644 --- a/README.md +++ b/README.md @@ -136,8 +136,13 @@ make install PREFIX=/usr/local ### Build requirements -- `expect` - `make test` requirement -- `shellcheck` - `make lint` requirement +- `make test` + - `pass` >= 1.7.0 + - `git` + - `oathtool` + - `expect` +- `make lint` + - `shellcheck` ## Migrating from pass-otp 0.1 -- cgit v1.2.3 From 4119587bf7988ebe901e3ceaea297ec894e64b0e Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Mon, 5 Mar 2018 12:05:45 -0800 Subject: Add master/develop build badges --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6397eea..6c3ee78 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -[![Build Status](https://travis-ci.org/tadfisher/pass-otp.svg?branch=master)](https://travis-ci.org/tadfisher/pass-otp) +- **master** [![Build Status: master](https://travis-ci.org/tadfisher/pass-otp.svg?branch=master)](https://travis-ci.org/tadfisher/pass-otp) +- **develop** [![Build Status: develop](https://travis-ci.org/tadfisher/pass-otp.svg?branch=develop)](https://travis-ci.org/tadfisher/pass-otp) # pass-otp -- cgit v1.2.3 From 8cb93f45422a02b7c99c51ae984d57e97f215f10 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Mon, 5 Mar 2018 12:13:59 -0800 Subject: Add NixOS install instructions --- README.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/README.md b/README.md index 6c3ee78..39342f1 100644 --- a/README.md +++ b/README.md @@ -120,6 +120,28 @@ sudo make install pacman -S pass-otp ``` +### NixOS + +- `configuration.nix` + +System-wide: + +```nix +environment.systemPackages = [ pkgs.pass-otp ]; +``` + +Per-user: + +```nix +users.users..packages = [ pkgs.pass-otp ]; +``` + +- Imperative + +``` +nix-env -i pass-otp +``` + ### macOS ``` -- cgit v1.2.3 From 78b4755f970644258c1467ce1a837494e4018a61 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Mon, 5 Mar 2018 12:15:40 -0800 Subject: Fix NixOS instruction formatting --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 39342f1..9949952 100644 --- a/README.md +++ b/README.md @@ -127,13 +127,17 @@ pacman -S pass-otp System-wide: ```nix -environment.systemPackages = [ pkgs.pass-otp ]; +{ + environment.systemPackages = [ pkgs.pass-otp ]; +} ``` Per-user: ```nix -users.users..packages = [ pkgs.pass-otp ]; +{ + users.users."name".packages = [ pkgs.pass-otp ]; +} ``` - Imperative -- cgit v1.2.3 From f7b79f2889e6f84ba8fe0aa89d09b5a72f545179 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Mon, 5 Mar 2018 12:26:50 -0800 Subject: Format build badges more nicely --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9949952..426b600 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ -- **master** [![Build Status: master](https://travis-ci.org/tadfisher/pass-otp.svg?branch=master)](https://travis-ci.org/tadfisher/pass-otp) -- **develop** [![Build Status: develop](https://travis-ci.org/tadfisher/pass-otp.svg?branch=develop)](https://travis-ci.org/tadfisher/pass-otp) + +| | | +|--|--| +| [**master**](https://github.com/tadfisher/pass-otp/tree/master) | [![Build Status: master](https://travis-ci.org/tadfisher/pass-otp.svg?branch=master)](https://travis-ci.org/tadfisher/pass-otp) | +| [**develop**](https://github.com/tadfisher/pass-otp/tree/develop) | [![Build Status: develop](https://travis-ci.org/tadfisher/pass-otp.svg?branch=develop)](https://travis-ci.org/tadfisher/pass-otp) | # pass-otp -- cgit v1.2.3 From 1e67a4ed0ce8748ca4c6a6ce51937f710af3841b Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Mon, 5 Mar 2018 12:27:28 -0800 Subject: Add headers to build badge table --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 426b600..7f7a10f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -| | | -|--|--| +| Branch | Status | +|--------|--------| | [**master**](https://github.com/tadfisher/pass-otp/tree/master) | [![Build Status: master](https://travis-ci.org/tadfisher/pass-otp.svg?branch=master)](https://travis-ci.org/tadfisher/pass-otp) | | [**develop**](https://github.com/tadfisher/pass-otp/tree/develop) | [![Build Status: develop](https://travis-ci.org/tadfisher/pass-otp.svg?branch=develop)](https://travis-ci.org/tadfisher/pass-otp) | -- cgit v1.2.3 From 694d10db8fb714d1dc69ec50c0298833a7922088 Mon Sep 17 00:00:00 2001 From: Lucid One Date: Wed, 7 Mar 2018 00:24:43 -0500 Subject: Add `make debug` target to log errors for failed tests to console. --- test/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/Makefile b/test/Makefile index 45882e7..deb6033 100644 --- a/test/Makefile +++ b/test/Makefile @@ -29,6 +29,9 @@ T = $(sort $(wildcard *.t)) all: $(DEFAULT_TEST_TARGET) +debug: pre-clean + TEST_OPTS="-v" $(MAKE) aggregate-results-and-cleanup + test: pre-clean $(MAKE) aggregate-results-and-cleanup -- cgit v1.2.3 From 742aaaab15a78bce52fbe5bed4bcc29cdfca7ee8 Mon Sep 17 00:00:00 2001 From: Lucid One Date: Wed, 7 Mar 2018 01:58:00 -0500 Subject: Added support for `pass otp --version` --- otp.bash | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/otp.bash b/otp.bash index 447af1e..33aca78 100755 --- a/otp.bash +++ b/otp.bash @@ -16,6 +16,7 @@ # along with this program. If not, see . # [] +VERSION="1.1.0" OATH=$(which oathtool) ## source: https://gist.github.com/cdown/1163649 @@ -185,6 +186,11 @@ _EOF exit 0 } +cmd_otp_version() { + echo $VERSION + exit 0 +} + cmd_otp_insert() { local opts force=0 echo=0 from_secret=0 opts="$($GETOPT -o fesi:a: -l force,echo,secret,issuer:,account: -n "$PROGRAM" -- "$@")" @@ -398,6 +404,7 @@ cmd_otp_validate() { case "$1" in help|--help|-h) shift; cmd_otp_usage "$@" ;; + version|--version) shift; cmd_otp_version "$@" ;; insert|add) shift; cmd_otp_insert "$@" ;; append) shift; cmd_otp_append "$@" ;; uri) shift; cmd_otp_uri "$@" ;; -- cgit v1.2.3 From 20232a9ecd5f4909f0965b3abc1f80a70671076e Mon Sep 17 00:00:00 2001 From: Lucid One Date: Wed, 7 Mar 2018 10:38:41 -0500 Subject: Check that testing prerequisites are installed --- test/setup.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/test/setup.sh b/test/setup.sh index f407164..2ec49d3 100644 --- a/test/setup.sh +++ b/test/setup.sh @@ -41,17 +41,21 @@ export GIT_WORK_TREE="$PASSWORD_STORE_DIR" git config --global user.email "Pass-Automated-Testing-Suite@zx2c4.com" git config --global user.name "Pass Automated Testing Suite" -PASS=`which pass` -if [[ ! -e $PASS ]]; then - echo "Could not find pass command" - exit 1 -fi +PASS=$(which pass) +[[ -e $PASS ]] || error "Could not find pass command" + +EXPECT=$(which expect) +[[ -e $EXPECT ]] || error "Could not find expect command" + +OAUTHTOOL=$(which oathtool) +[[ -e $OAUTHTOOL ]] || error "Could not find oathtool command" + +GPG=$(which gpg2) || GPG=$(which gpg) +[[ -e $GPG ]] || error "Could not find gpg command" # Note: the assumption is the test key is unencrypted. export GNUPGHOME="$TEST_HOME/gnupg/" chmod 700 "$GNUPGHOME" -GPG="gpg" -which gpg2 &>/dev/null && GPG="gpg2" # We don't want any currently running agent to conflict. unset GPG_AGENT_INFO -- cgit v1.2.3 From 8c37628a5d50e1a01fd7c97ba0aa80a39c972638 Mon Sep 17 00:00:00 2001 From: Lucid One Date: Wed, 7 Mar 2018 11:09:52 -0500 Subject: Enable `make lint` for test/setup.sh --- Makefile | 1 + test/Makefile | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a9c1c55..402dc39 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,7 @@ uninstall: lint: shellcheck -s bash $(PROG).bash + $(MAKE) -C test lint test: $(MAKE) -C test diff --git a/test/Makefile b/test/Makefile index deb6033..027feca 100644 --- a/test/Makefile +++ b/test/Makefile @@ -61,5 +61,8 @@ aggregate-results: echo "$$f"; \ done | '$(SHELL_PATH_SQ)' '$(AGGREGATE_SCRIPT)' -.PHONY: all test prove $(T) pre-clean clean +lint: + shellcheck -s bash setup.sh + +.PHONY: all test prove $(T) pre-clean clean lint .PHONY: aggregate-results-and-cleanup aggregate-results -- cgit v1.2.3 From f44934582124502b6609ddf145f183c8f18d3238 Mon Sep 17 00:00:00 2001 From: Lucid One Date: Wed, 7 Mar 2018 12:24:35 -0500 Subject: Modified setup.sh to pass lint --- test/setup.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/test/setup.sh b/test/setup.sh index 2ec49d3..5fd7173 100644 --- a/test/setup.sh +++ b/test/setup.sh @@ -27,8 +27,9 @@ unset EDITOR # We must be called from test/ TEST_HOME="$(pwd)" -EXT_HOME="$(dirname $TEST_HOME)" +EXT_HOME="$(dirname "$TEST_HOME")" +# shellcheck disable=SC1091 . ./sharness.sh export PASSWORD_STORE_ENABLE_EXTENSIONS=true @@ -60,14 +61,14 @@ chmod 700 "$GNUPGHOME" # We don't want any currently running agent to conflict. unset GPG_AGENT_INFO -KEY1="CF90C77B" # pass test key 1 -KEY2="D774A374" # pass test key 2 -KEY3="EB7D54A8" # pass test key 3 -KEY4="E4691410" # pass test key 4 -KEY5="39E5020C" # pass test key 5 +KEY[1]="CF90C77B" # pass test key 1 +KEY[2]="D774A374" # pass test key 2 +KEY[3]="EB7D54A8" # pass test key 3 +KEY[4]="E4691410" # pass test key 4 +KEY[5]="39E5020C" # pass test key 5 # Test helpers test_pass_init() { rm -rf "$PASSWORD_STORE_DIR" - "$PASS" init "$KEY1" + "$PASS" init "${KEY[@]}" } -- cgit v1.2.3 From 6f5f35fd167177e3e18639593d540207c74992c1 Mon Sep 17 00:00:00 2001 From: Lucid One Date: Wed, 7 Mar 2018 14:33:29 -0500 Subject: Fixed aggregate-results target to run indently of aggregate-results-and-clean --- test/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Makefile b/test/Makefile index 027feca..5cc4e57 100644 --- a/test/Makefile +++ b/test/Makefile @@ -52,11 +52,11 @@ clean: clean-except-prove-cache $(RM) .prove $(RM) gnupg/random_seed -aggregate-results-and-cleanup: $(T) +aggregate-results-and-cleanup: $(MAKE) aggregate-results $(MAKE) clean -aggregate-results: +aggregate-results: $(T) for f in test-results/*.counts; do \ echo "$$f"; \ done | '$(SHELL_PATH_SQ)' '$(AGGREGATE_SCRIPT)' -- cgit v1.2.3 From 778400313da4533a5fb9e5940df79249ebcbe140 Mon Sep 17 00:00:00 2001 From: Lucid One Date: Wed, 7 Mar 2018 14:37:27 -0500 Subject: Marked debug target as .PHONY --- test/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Makefile b/test/Makefile index 5cc4e57..16da562 100644 --- a/test/Makefile +++ b/test/Makefile @@ -64,5 +64,5 @@ aggregate-results: $(T) lint: shellcheck -s bash setup.sh -.PHONY: all test prove $(T) pre-clean clean lint +.PHONY: all debug test prove $(T) pre-clean clean lint .PHONY: aggregate-results-and-cleanup aggregate-results -- cgit v1.2.3 From 02bdc4a06fb2a2419b7cd29f19912052248d1c01 Mon Sep 17 00:00:00 2001 From: Benjamin Denhartog Date: Thu, 15 Mar 2018 14:03:50 -0700 Subject: otp-insert: require only one of `--issuer` or `--account` closes #68 --- otp.bash | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/otp.bash b/otp.bash index 33aca78..25ac459 100755 --- a/otp.bash +++ b/otp.bash @@ -105,9 +105,10 @@ otp_read_uri() { } otp_read_secret() { - local uri prompt="$1" echo="$2" issuer accountname - issuer="$(urlencode "$3")" - accountname="$(urlencode "$4")" + local uri prompt="$1" echo="$2" issuer accountname separator + [ ! "$3" = false ] && issuer="$(urlencode "$3")" + [ ! "$4" = false ] && accountname="$(urlencode "$4")" + [ -n "$issuer" ] && [ -n "$accountname" ] && separator=":" if [[ -t 0 ]]; then if [[ $echo -eq 0 ]]; then @@ -123,7 +124,8 @@ otp_read_secret() { read -r secret fi - uri="otpauth://totp/$issuer:$accountname?secret=$secret&issuer=$issuer" + uri="otpauth://totp/${issuer}${separator}${accountname}?secret=${secret}" + [ -n "$issuer" ] && uri="${uri}&issuer=${issuer}" otp_parse_uri "$uri" } @@ -216,7 +218,11 @@ cmd_otp_insert() { fi if [[ $from_secret -eq 1 ]]; then - ([[ -z "$issuer" ]] || [[ -z "$account" ]]) && die "Missing issuer or account" + [ -z "$issuer" ] && issuer=false + [ -z "$account" ] && account=false + + [ "$issuer" = false ] && [ "$account" = false ] && die "Missing one of either '--issuer' or '--account'" + otp_read_secret "$prompt" $echo "$issuer" "$account" else otp_read_uri "$prompt" $echo -- cgit v1.2.3 From 34869baf28206715eb0b67eb1bb1b558ad7812fd Mon Sep 17 00:00:00 2001 From: endgame Date: Fri, 27 Apr 2018 10:35:47 +1000 Subject: README.md: Remove redundant use of cat --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7f7a10f..e63be27 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ Enter otpauth:// URI for totp-secret: otpauth://totp/totp-secret?secret=AAAAAAAA Pipe an `otpauth://` URI into a passfile: ``` -$ cat totp-secret.txt | pass otp insert totp-secret +$ pass otp insert totp-secret < totp-secret.txt ``` Use [zbar](http://zbar.sourceforge.net/) to decode a QR image into a passfile: -- cgit v1.2.3 From 8c5e834b60d5135123e779ed4a56f514fa45660f Mon Sep 17 00:00:00 2001 From: Benjamin Denhartog Date: Tue, 1 May 2018 15:44:49 -0700 Subject: fix missing secret name when reading secret in `cmd_otp_append` closes #75 --- otp.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/otp.bash b/otp.bash index 25ac459..5c06dc5 100755 --- a/otp.bash +++ b/otp.bash @@ -256,8 +256,9 @@ cmd_otp_append() { [[ $err -ne 0 || $# -ne 1 ]] && die "Usage: $PROGRAM $COMMAND append [--force,-f] [--echo,-e] [--secret, -s] [--issuer,-i issuer] [--account,-a account] pass-name" - local prompt uri + local uri local path="${1%/}" + local prompt="$path" local passfile="$PREFIX/$path.gpg" [[ -f $passfile ]] || die "Passfile not found" -- cgit v1.2.3 From cae5d5088ef5056ab3d3e4c144ec1b02d4ee2d3d Mon Sep 17 00:00:00 2001 From: xPMo Date: Mon, 21 May 2018 17:11:28 -0500 Subject: Fix behaviour for otp append as well --- otp.bash | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/otp.bash b/otp.bash index 5c06dc5..72e3aa2 100755 --- a/otp.bash +++ b/otp.bash @@ -273,7 +273,11 @@ cmd_otp_append() { [[ -n "$existing" ]] && yesno "An OTP secret already exists for $path. Overwrite it?" if [[ $from_secret -eq 1 ]]; then - ([[ -z "$issuer" ]] || [[ -z "$account" ]]) && die "Missing issuer or account" + [ -z "$issuer" ] && issuer=false + [ -z "$account" ] && account=false + + [ "$issuer" = false ] && [ "$account" = false ] && die "Missing one of either '--issuer' or '--account'" + otp_read_secret "$prompt" $echo "$issuer" "$account" else otp_read_uri "$prompt" $echo -- cgit v1.2.3 From 955c8a104b3bda5d501104985f50fbdc607bc104 Mon Sep 17 00:00:00 2001 From: Dany Marcoux Date: Thu, 28 Jun 2018 10:48:57 +0200 Subject: Add LICENSE file --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 19 -- 2 files changed, 674 insertions(+), 19 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md index e63be27..4cdc302 100644 --- a/README.md +++ b/README.md @@ -209,22 +209,3 @@ Note that the following default values do not need to be specified in the URI: | algorithm | sha1 | | period | 30 | | digits | 6 | - -## License - -``` -Copyright (C) 2017 Tad Fisher - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -``` -- cgit v1.2.3 From e5642a873b41790b3e18c427d54df5831f355ae2 Mon Sep 17 00:00:00 2001 From: Remus Buzatu Date: Thu, 28 Jun 2018 03:20:59 +0300 Subject: Don't use herestrings --- otp.bash | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/otp.bash b/otp.bash index 72e3aa2..2668d9a 100755 --- a/otp.bash +++ b/otp.bash @@ -61,7 +61,7 @@ otp_parse_uri() { local p=${BASH_REMATCH[7]} local params - local IFS=\&; read -r -a params <<< "$p"; unset IFS + local IFS=\&; read -r -a params < <(echo "$p") ; unset IFS pattern='^(.+)=(.+)$' for param in "${params[@]}"; do @@ -138,7 +138,7 @@ otp_insert() { mkdir -p -v "$PREFIX/$(dirname "$path")" set_gpg_recipients "$(dirname "$path")" - $GPG -e "${GPG_RECIPIENT_ARGS[@]}" -o "$passfile" "${GPG_OPTS[@]}" <<<"$contents" || die "OTP secret encryption aborted." + echo "$contents" | $GPG -e "${GPG_RECIPIENT_ARGS[@]}" -o "$passfile" "${GPG_OPTS[@]}" || die "OTP secret encryption aborted." git_add_file "$passfile" "$message" } @@ -289,7 +289,7 @@ cmd_otp_append() { [[ "$line" == otpauth://* ]] && line="$otp_uri" [[ -n "$replaced" ]] && replaced+=$'\n' replaced+="$line" - done <<< "$contents" + done < <(echo "$contents") else replaced="$contents"$'\n'"$otp_uri" fi @@ -329,7 +329,7 @@ cmd_otp_code() { otp_parse_uri "$line" break fi - done <<< "$contents" + done < <(echo "$contents") local cmd case "$otp_type" in @@ -362,7 +362,7 @@ cmd_otp_code() { [[ "$line" == otpauth://* ]] && line="$uri" [[ -n "$replaced" ]] && replaced+=$'\n' replaced+="$line" - done <<< "$contents" + done < <(echo "$contents") otp_insert "$path" "$passfile" "$replaced" "Increment HOTP counter for $path." fi @@ -398,7 +398,7 @@ cmd_otp_uri() { otp_parse_uri "$line" break fi - done <<< "$contents" + done < <(echo "$contents") if [[ $clip -eq 1 ]]; then clip "$otp_uri" "OTP key URI for $path" -- cgit v1.2.3 From a4680706bb2ed80ad42fbc8622bf3ef3768ca759 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Thu, 28 Jun 2018 14:19:59 -0700 Subject: travis: Bump stable upstream to 1.7.2 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d548c3b..ef19910 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ sudo: false language: bash env: - - PASS_VERSION=1.7.1 + - PASS_VERSION=1.7.2 - PASS_VERSION=master addons: -- cgit v1.2.3 From 5d0cf801f21414a0f08cf593da914a5e6fc191ed Mon Sep 17 00:00:00 2001 From: Roman Valls Guimera Date: Thu, 14 Jun 2018 13:42:12 +1000 Subject: Refer to the migration wiki page in the README. --- README.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4cdc302..d6d617d 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ Enter otpauth:// URI for totp-secret: otpauth://totp/totp-secret?secret=AAAAAAAA Pipe an `otpauth://` URI into a passfile: ``` -$ pass otp insert totp-secret < totp-secret.txt +$ pass otp insert totp-secret < totp-secret.txt ``` Use [zbar](http://zbar.sourceforge.net/) to decode a QR image into a passfile: @@ -209,3 +209,15 @@ Note that the following default values do not need to be specified in the URI: | algorithm | sha1 | | period | 30 | | digits | 6 | + +## Migrating from Google Authenticator + +**Warning:** This method is provided as a means to transport your TOTP tokens to +other devices, disconnected from your single factor authentication part. If you +add those secrets into the same basket of eggs, you will be defeating the whole +purpose of the [multi factor +authentication](https://en.wikipedia.org/wiki/Multi-factor_authentication) +mantra. Please think it through before running this migration. + +If you read the warning paragraph above, [keep calm and move on with the +migration](https://github.com/tadfisher/pass-otp/wiki/How-to-migrate-your-Google-Authenticator-database-to-pass-otp%3F). -- cgit v1.2.3 From cb461eb752766c34cec422110239fbae4e1765fd Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Thu, 28 Jun 2018 15:27:34 -0700 Subject: Tolerate base64 padding in secret --- otp.bash | 2 +- test/insert.t | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/otp.bash b/otp.bash index 2668d9a..55dbcb3 100755 --- a/otp.bash +++ b/otp.bash @@ -63,7 +63,7 @@ otp_parse_uri() { local params local IFS=\&; read -r -a params < <(echo "$p") ; unset IFS - pattern='^(.+)=(.+)$' + pattern='^([^=]+)=(.+)$' for param in "${params[@]}"; do if [[ "$param" =~ $pattern ]]; then case ${BASH_REMATCH[1]} in diff --git a/test/insert.t b/test/insert.t index 1c8ddb2..a8c6458 100755 --- a/test/insert.t +++ b/test/insert.t @@ -130,4 +130,13 @@ test_expect_success 'Insert from secret without passfile' ' echo [[ $("$PASS" show Example/alice@google.com) == "$uri" ]] ' +test_expect_success 'Tolerates padding in secret' ' + secret="JBSWY3DPEHPK3PXP==" + uri="otpauth://totp/Example:alice@google.com?secret=JBSWY3DPEHPK3PXP&issuer=Example" + + test_pass_init && + "$PASS" otp insert -s -i Example -a alice@google.com <<< "$secret" && + echo [[ $("$PASS" show Example/alice@google.com) == "$uri" ]] +' + test_done -- cgit v1.2.3 From 5fb4620b087a34c93b8f67874992dcc6409f7fcc Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Thu, 28 Jun 2018 15:44:21 -0700 Subject: Version 1.1.1 --- CHANGELOG.md | 16 ++++++++++++++++ otp.bash | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43782b1..0ea68f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,22 @@ Change Log ============= +Version 1.1.1 *(2018-06-28)* +------------------------------- + +This is mainly a bugfix release. + + * Numerous build and test infrstructure updates. (thanks @LucidOne) + * `insert` and `append` now require only one of "issuer" or "account", + matching the documentation. (thanks @sudoforge and @xPMo) + * `append` now displays the passfile in its prompt. (thanks @sudoforge) + * Add a separate `LICENSE` file. (thanks @dmarcoux) + * Avoid use of herestrings when reading input. (thanks @rbuzatu90) + * Discard base64 padding (`=` characters) in OTP secrets. + +In addition, thanks to @endgame and @brainstorm for their contributions to the +documentation. + Version 1.1.0 *(2018-03-04)* ------------------------------- diff --git a/otp.bash b/otp.bash index 55dbcb3..382ec19 100755 --- a/otp.bash +++ b/otp.bash @@ -16,7 +16,7 @@ # along with this program. If not, see . # [] -VERSION="1.1.0" +VERSION="1.1.1" OATH=$(which oathtool) ## source: https://gist.github.com/cdown/1163649 -- cgit v1.2.3