Set expectations about the project in README.md

* git ignore golang vendor folder

* update golang deps

.circleci/config.yml

@@ -0,0 +1,56 @@
+version: 2
+
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - debian
+      - ubuntu
+
+jobs:
+
+  debian:
+    docker:
+      - image: debian:9.1
+    steps:
+      - checkout
+      - run:
+          name: 'Installing'
+          command: |
+            apt-get update -y
+            apt-get install -y build-essential expect git gnupg2 pinentry-tty procps rpm ruby-dev libffi-dev
+            gem install fpm
+      - run:
+          name: 'Cleaning'
+          command: |
+            rm -rf ~/.gpnupg
+            make clean
+      - run:
+          name: 'Testing'
+          command: |
+            GPG=gpg2 make test
+            make packages-deb
+            make packages-rpm
+
+  ubuntu:
+    docker:
+      - image: ubuntu:16.04
+    steps:
+      - checkout
+      - run:
+          name: 'Installing'
+          command: |
+            apt-get update -y
+            apt-get install -y build-essential expect git gnupg2 pinentry-tty procps rpm ruby-dev libffi-dev
+            gem install fpm
+      - run:
+          name: 'Cleaning'
+          command: |
+            rm -rf ~/.gpnupg
+            make clean
+      - run:
+          name: 'Testing'
+          command: |
+            GPG=gpg2 make test
+            make packages-deb
+            make packages-rpm

.gitattributes

@@ -0,0 +1,5 @@
+bin/** text eol=lf
+tools/** text eol=lf
+Makefile text eol=lf
+Portfile text eol=lf
+blackbox.plugin.zsh text eol=lf

.github/workflows/build.yml

@@ -0,0 +1,28 @@
+name: build
+
+on: 
+  pull_request:
+    branches: [ master ]
+  push:
+    branches: [ master ]
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Set up Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: ^1.15
+    - name: Build binaries
+      run: go run build/build.go
+    - name: Run unit tests
+      run: go test ./...
+    - name: Run integration tests
+      working-directory: integrationTest
+      run: umask 0027 ; rm -rf /tmp/bbhome-* && go test -long -nocleanup

.github/workflows/release.yml

@@ -0,0 +1,59 @@
+on:
+  release:
+    types: [published]
+
+name: release
+jobs:
+  release:
+    name: release
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Get release
+      id: get_release
+      uses: bruceadams/get-release@v1.2.2
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+
+    - name: Checkout repo
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Set up Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: ^1.15
+
+    - name: Build binaries
+      run: go run build/build.go
+
+    - name: Upload blackbox-Darwin
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.get_release.outputs.upload_url }} 
+        asset_path: ./blackbox-Darwin
+        asset_name: blackbox-Darwin
+        asset_content_type: application/octet-stream
+
+    - name: Upload blackbox-Linux
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.get_release.outputs.upload_url }} 
+        asset_path: ./blackbox-Linux
+        asset_name: blackbox-Linux
+        asset_content_type: application/octet-stream
+
+    - name: Upload blackbox.exe
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.get_release.outputs.upload_url }} 
+        asset_path: ./blackbox.exe
+        asset_name: blackbox.exe
+        asset_content_type: application/octet-stream

.gitignore

@@ -5,13 +5,9 @@ __pycache__/
 # C extensions
 *.so
 
-# backup shell files
-*~
-
 # Distribution / packaging
 .Python
 env/
-build/
 develop-eggs/
 dist/
 eggs/
@@ -54,3 +50,13 @@ coverage.xml
 # Sphinx documentation
 docs/_build/
 
+# macOS
+.DS_Store
+
+# Blackbox
+bbintegration
+.*.swp
+/integrationTest/.blackbox
+
+# golang
+/vendor/

CHANGELOG.md

@@ -0,0 +1,106 @@
+Release v1.20220610
+
+NOTE: I don't have a lot of time to commit to this project.  I'd gladly accept help, especially
+with improving the testing on various operating systems.
+
+Major feature: macOS users rejoice!  Incompatibility with macOS Monterey 12.3 is fixed! (#347)
+
+* Add .gitattributes during repo initialization (#352)
+* Update zgen reference to zgenom (#350)
+* Improve test data generation (#348)
+* Fix 'chmod' for macOS Monterey 12.3 (#347)
+
+
+Release v1.20200429
+
+NOTE: While there is now support for NetBSD and SunOS/SmartOS, the
+release process only tests on macOS and CentOS7 because that's all I
+have access to.
+
+* Fix tools that break when ".." or "." are used in a path (#304)
+* Respect PREFIX variable for copy-install (#294)
+* Documentation: Add pkgsrc install instructions (#292)
+* Improve support for Windows (#291)
+* Clarify gpg version usage (#290)
+* Many documentation fixes
+* DOCUMENTATION: Promote 'getting started' to a section, enumerate steps (#283)
+* Commit changes to gitignore when deregistering (#282)
+* Add support for NetBSD and SunOS (SmartOS)
+* Defend against ShellShock
+
+
+Release v1.20181219
+
+* New OS support: Add support for NetBSD and SunOS (SmartOS)
+* Testing: Improve confidence test.
+* .blackbox is now the default config directory for new repos. (#272)
+* Add blackbox_decrypt_file (#270)
+* Improved compatibility: change"/bin/[x]" to "/usr/bin/env [x]" (#265)
+* Add blackbox_less. (#263)
+* add nix method of install (#261)
+* Linked setting up of GPG key (#260)
+
+
+Release v1.20180618
+
+* Restore `make manual-install` with warning. (#258)
+
+Release v1.20180615
+
+* Standardize on .blackbox for config. Use keyrings/live for backwards compatibility.
+* Store keys in .blackbox directory (#218)
+* Suggest committing changes to pubring.gpg when running blackbox_removeadmin (#248)
+* Fix typo (#246)
+* Improve installation instructions (#244)
+* Fix replacing-expired-keys link in README (#241)
+* Fix problems when gpg2 is installed next to gpg (#237)
+* Many documentation corrections, updates, etc.
+* Exclude default keyring from import (#223)
+* .gitattributes not always updated (PR#146)
+* Fix bugs related to updating .gitattributes (PR#146)
+* Update readme with CircleCI link (#216)
+* Run the tests on a CI (#215)
+* Fixed Alpine compatibility (chmod) (#212)
+* direct repobase message to stderr (#204)
+* Improve Windows compatibility
+* NEW: .gitattributes Set Unix-only files to eol=lf
+* Silence 'not changed' output during keychain import (#200)
+* Improve FreeBSD compatibility
+* shred_file() outputs warning message to stderr. (#192)
+* Don't complain about GPG_AGENT_INFO if using newer gpg-agent (#189)
+* [FreeBSD] Fix use of chmod (#180)
+* Requiring a file to be entered to finish editing (#175)
+* Remove the key from the keyring when removing an admin (#173)
+* Add FreeBSD support (#172)
+* Add list admins commandline tool. (#170)
+ignore backup files and secring.gpg in $BLACKBOXDATA (#169)
+Allow parallel shredding of files (#167)
+* Add/improve Mingw support
+* Make "make confidence" less fragile
+* And a lot, lot more.
+
+Release v1.20170309
+
+* "make test" is an alias for "make confidence"
+* macOS: make_tempdir must create shorter paths
+* Fix "make confidence" for newer version of Git
+* README.md: Add info about our new mailing list
+
+Release v1.20170611
+
+* confidence_test.sh verifies external tools exist
+* confidence_test.sh more reliable for non-UTF8 users
+* "make test" no longer prompts for passwords
+* blackbox works better when target directory lives in root (#194)
+* Add confidence_test.sh tests for admin operations
+* blackbox_list_admins fails (#193)
+* confidence_test.sh works better on FreeBSD
+* tools/confidence_test.sh: now works with gnupg-2.0 and gnupg-2.1
+* Blackbox now officially supports both gnupg-2.0 and gnupg-2.1
+* blackbox_shred_all_files: BUGFIX: Does not shred files with spaces
+* blackbox_removeadmin: disable gpg's confirmation
+* Sync mk_rpm_fpmdir from master
+
+Release v1.20170127
+
+* Starting CHANGELOG.

DESIGN.md

@@ -0,0 +1,74 @@
+BlackBox Internals
+==================
+
+The goal of the Go rewrite is to improve the usability and
+maintainability of Blackbox, meanwhile make it easier to implement new 
+
+The system is built in distinct layers: view, controller, model.
+
+Suppose there is a subcommand "`foo`".  `blackbox.go` parses the
+user's command line args and calls `cmdFoo()`, which is given
+everything it needs to do the operation.  For example, it is given the
+filenames the user specified exactly; even if an empty list means "all
+files", at this layer the empty list is passed to the function.
+
+`cmdFoo()` contains the business logic of how the operation should be
+done: usually iterating over filenames and calling verb(s) for each
+one.  For example if an empty file list means "all files", this is the
+layer that enumerates the files.
+
+`cmdFoo()` is implemented in the file `cmd_foo.go`.  The caller of
+`cmdFoo()` should provide all data it needs to get the job done.
+`cmdFoo()` doesn't refer to global flags, they are passed to the
+function as parameters.  Therefore the function has zero side-effects
+(except possibly logging) and can be called as library functions by
+other systems.  This is the external (binary) API which should be
+relatively stable.
+
+`cmdFoo()` calls verbs that are in `bbutil/`.  Some of those verbs are
+actually interfaces. For example, any VCS-related verbs are actually a
+Go interface which might be implemented one of many ways (Git,
+Subversion, Mercurial), GPG-functions may be implemented by shelling
+out to `gpg.exe` or by using Go's gpg library.
+
+They layers look like this:
+
+| View | `blackbox.go` | Parses User Commands, calls controller |
+| Controller | `cmd_*.go` | The business logic. Iterates and calls verbs |
+| Model | `pkg/bbutil` | Verbs |
+| Interfaces | `pkg/*` | Interfaces and their implementations |
+
+At least that's the goal.  We'll see how well we can achieve this.
+
+
+Version 2.0
+===========
+
+Software architecture.
+
+We try to keep the command-line parsing separate from the business
+logic and all plug-ins.  This keeps things clean and easy to refactor.
+In fact layer 2 could be used as a stand-alone module for projects
+that want to embed blackbox actions.
+
+Layer 1: The command itself
+
+  * cmd/blackbox/blackbox.go -- main() not much more
+  * cmd/blackbox/cli.go      -- Set up and call the ufave/cli flag parser
+  * cmd/blackbox/drive.go    -- Check # of arguments, conflicting flags, and then call the businss logic layer
+
+Layer 2: The business logic
+
+  * pkg/box/box.go      -- The interface to accessing .blackbox (admins, files, etc.)
+  * pkg/box/verbs.go    -- Verbs called by Layer 1. Just the verbs
+  * pkg/box/boxutils.go -- Functions needed by the verbs
+
+Layer 3: The plug-ins
+
+  * pkg/vcs/...      -- Plug-ins for Git, (Mercurial, Subversion, Perforce,) and None
+  * pkg/crypters/... -- Plug-ins for PGP access: GnuPG, (go-openpgp, others in the future)
+
+Layer 4: Support functions for use by Layer 3
+
+  * pkg/bbutil/filestats.go -- File manipulations
+  * pkg/bbutil/runbash.go   -- Safely run external Linux commands

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2016 Stack Exchange, Inc.
+Copyright (c) 2014-2021 Stack Exchange, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,17 +1,23 @@
 SHELL=/bin/sh
-
+PREFIX?=/usr/local
 PKGNAME=stack_blackbox
+BASEDIR?=$(HOME)
+OUTPUTDIR?="$(BASEDIR)/debbuild-${PKGNAME}"
 
 all:
 	@echo 'Menu:'
-	@echo '  make update            Update any generated files'
-	@echo '  make packages          Make RPM packages'
-	@echo '  make packages-deb      Make DEB packages'
-	@echo '  make install           (incomplete)'
+	@echo '  make update             Update any generated files'
+	@echo '  make packages-rpm       Make RPM packages'
+	@echo '  make packages-deb       Make DEB packages'
+	@echo '  make symlinks-install   Make symlinks in ${PREFIX}/bin/'
+	@echo '  make copy-install       Copy "bin" files to ${PREFIX}/bin/'
+	@echo '  make copy-uninstall     Remove blackbox files from ${PREFIX}/bin/'
+	@echo '  make test               Run tests'
 
 install:
 	@echo 'To install, copy the files from bin to somewhere in your PATH.'
-	@echo 'Or, if you use RPMs, "make packages" and install the result.'
+	@echo 'The README.md document gives more details.'
+	@echo 'Or run "make" (with no options) for more info.'
 
 # The default package type is RPM.
 packages: packages-rpm
@@ -30,14 +36,14 @@ packages-rpm-debug:
 	@echo BUILD:
 	@PKGRELEASE=99 make packages
 	@echo ITEMS TO BE PACKAGED:
-	find ~/rpmbuild-$(PKGNAME)/installroot -type f
+	find $(BASEDIR)/rpmbuild-$(PKGNAME)/installroot -type f
 	@echo ITEMS ACTUALLY IN PACKAGE:
-	@rpm -qpl $$(cat ~/rpmbuild-$(PKGNAME)/bin-packages.txt)
+	@rpm -qpl $$(cat $(BASEDIR)/rpmbuild-$(PKGNAME)/bin-packages.txt)
 
 local-rpm:
 	@PKGRELEASE=1 make packages
 	-@sudo rpm -e $(PKGNAME)
-	sudo rpm -i $$(cat ~/rpmbuild-$(PKGNAME)/bin-packages.txt)
+	sudo rpm -i $$(cat $(BASEDIR)/rpmbuild-$(PKGNAME)/bin-packages.txt)
 
 lock-rpm:
 	sudo yum versionlock add $(PKGNAME)
@@ -48,14 +54,26 @@ unlock-rpm:
 #
 # Manual install
 #
-manual-install:
-	@echo 'Symlinking files from ./bin to /usr/local/bin'
-	@cd bin && for f in `find . -type f -iname "*" ! -iname "Makefile"`; do ln -fs `pwd`/$$f /usr/local/bin/$$f; done
+symlinks-install:
+	@echo "Symlinking files from ./bin to ${PREFIX}/bin"
+	@cd bin && for f in `find . -type f -iname "*" ! -iname "Makefile"`; do ln -fs `pwd`/$$f $(PREFIX)/bin/$$f; done
 	@echo 'Done.'
 
-manual-uninstall:
-	@echo 'Removing blackbox files from /usr/local/bin'
-	@cd bin && for f in `find . -type f -iname "*" ! -iname "Makefile"`; do rm /usr/local/bin/$$f; done
+manual-install:
+	@echo '***************************************************************'
+	@echo '*                      DEPRECATED                             *'
+	@echo '* `make manual-install` is now called `make symlinks-install` *'
+	@echo '***************************************************************'
+	$(MAKE) symlinks-install
+
+copy-install:
+	@echo "Copying files from ./bin to ${PREFIX}/bin"
+	@cd bin && for f in `find . -type f -iname "*" ! -iname "Makefile"`; do cp `pwd`/$$f $(PREFIX)/bin/$$f; done
+	@echo 'Done.'
+
+copy-uninstall:
+	@echo "Removing blackbox files from ${PREFIX}/bin"
+	@cd bin && for f in `find . -type f -iname "*" ! -iname "Makefile"`; do rm $(PREFIX)/bin/$$f; done
 	@echo 'Done.'
 
 #
@@ -63,7 +81,7 @@ manual-uninstall:
 #
 
 packages-deb:	tools/mk_deb_fpmdir.stack_blackbox.txt
-	cd tools && PKGRELEASE="$${PKGRELEASE}" PKGDESCRIPTION="Safely store secrets in git/hg/svn repos using GPG encryption" ./mk_deb_fpmdir stack_blackbox mk_deb_fpmdir.stack_blackbox.txt
+	cd tools && OUTPUTDIR=$(OUTPUTDIR) PKGRELEASE="$${PKGRELEASE}" PKGDESCRIPTION="Safely store secrets in git/hg/svn repos using GPG encryption" ./mk_deb_fpmdir stack_blackbox mk_deb_fpmdir.stack_blackbox.txt
 
 # Make mk_deb_fpmdir.vcs_blackbox.txt from mk_rpm_fpmdir.stack_blackbox.txt:
 tools/mk_deb_fpmdir.stack_blackbox.txt: tools/mk_rpm_fpmdir.stack_blackbox.txt
@@ -75,12 +93,12 @@ packages-deb-debug:	tools/mk_deb_fpmdir.stack_blackbox.txt
 	@echo ITEMS TO BE PACKAGED:
 	find ~/debbuild-$(PKGNAME)/installroot -type f
 	@echo ITEMS ACTUALLY IN PACKAGE:
-	@dpkg --contents $$(cat ~/debbuild-$(PKGNAME)/bin-packages.txt)
+	@dpkg --contents $$(cat $(BASEDIR)/debbuild-$(PKGNAME)/bin-packages.txt)
 
 local-deb:
 	@PKGRELEASE=1 make packages
 	-@sudo dpkg -e $(PKGNAME)
-	sudo dpkg -i $$(cat ~/rpmbuild-$(PKGNAME)/bin-packages.txt)
+	sudo dpkg -i $$(cat $(BASEDIR)/rpmbuild-$(PKGNAME)/bin-packages.txt)
 
 #
 # MacPorts builds
@@ -115,15 +133,15 @@ uninstall-stow:
 update: tools/mk_deb_fpmdir.stack_blackbox.txt tools/mk_macports.vcs_blackbox.txt
 
 clean:
-	rm tools/mk_deb_fpmdir.stack_blackbox.txt tools/mk_macports.vcs_blackbox.txt
+	rm -f tools/mk_deb_fpmdir.stack_blackbox.txt tools/mk_macports.vcs_blackbox.txt
 
 #
 # System Test:
 #
+test: confidence
 confidence:
 	@if [ -e ~/.gnupg ]; then echo ERROR: '~/.gnupg should not exist. If it does, bugs may polute your .gnupg configuration. If the code has no bugs everything will be fine. Do you feel lucky?'; false ; fi
 	@if which >/dev/null gpg-agent ; then pkill gpg-agent ; rm -rf /tmp/tmp.* ; fi
-	@export PATH="$(PWD)/bin:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/local/bin:$(PATH)" ; tools/confidence_test.sh
-		tools/confidence_test.sh
+	@export PATH="$(PWD)/bin:$(PREFIX)/bin:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/local/bin:/usr/local/MacGPG2/bin:/opt/homebrew/bin:$(PATH)" ; tools/auto_system_test
 	@if which >/dev/null gpg-agent ; then pkill gpg-agent ; fi
 	@if [ -e ~/.gnupg ]; then echo ERROR: '~/.gnupg was created which means the scripts might be poluting GnuPG configuration.  Fix this bug.'; false ; fi

README-v2.md

@@ -0,0 +1,65 @@
+BlackBox v2
+===========
+
+WARNING: v2 is still experimental.  It is in the same git repo as v1
+because the filenames do not overlap.  Please do not mix the two.  v1
+is in `bin`.  v2 is in `cmd/blackbox` and `binv2`.
+
+Blackbox is an open source tool that enables you to safe store sensitive information in
+Git (or other) repos by encrypting them with GPG.  Only the encrypted
+version of the file is available.  You can be free to provide access
+to the repo, as but only people with the right GPG keys can access the
+encrypted data.
+
+Things you should **never** store in a repo without encryption:
+
+* TLS (SSL) certificates
+* Passwords
+* API keys
+* And more!
+
+Project Info:
+
+* [Overview](user-overview.md)
+* [Why is this important?](why-is-this-important.md)
+* [Support/Community](support.md)
+* [How BB encrypts](encryption.md)
+* [OS Compatibility](compatibility.md)
+* [Installation Instructions](installation.md)
+* [Alternatives](alternatives.md)
+
+User Info:
+
+* [Enabling Blackbox on a Repo](enable-repo.md)
+* [Enroll a file](enable-repo.md)
+* [Full Command List](full-command-list.md)
+* [Add/Remove users](admin-ops.md)
+* [Add/Remove files](file-ops.md)
+* [Advanced techiques](advanced.md)
+* [Use with Role Accounts](role-accounts.md)
+* [Backwards Compatibility](backwards-compatibility.md)
+* [Replacing expired keys](expired-keys.md)
+* [Git Tips](git-tips.md)
+* [SubVersion Tips](subversion-tips.md)
+* [GnuPG tips](gnupg-tips.md)
+* [Use with Ansible](with-ansible.md)
+* [Use with Puppet](with-puppet.md)
+
+For contributors:
+
+* [Developer Info](dev.md)
+* [Code overview](dev-code-overview.md)
+* [HOWTO: Add new OS support](dev-add-os-support.md)
+* [HOWTO: Add new VCS support](dev-add-vcs-support.md)
+
+
+A slide presentation about an older release [is on SlideShare](http://www.slideshare.net/TomLimoncelli/the-blackbox-project-sfae).
+
+Join our mailing list: [https://groups.google.com/d/forum/blackbox-project](https://groups.google.com/d/forum/blackbox-project)
+
+
+License
+=======
+
+This content is released under the MIT License.
+See the [LICENSE.txt](LICENSE.txt) file.

README.md

@@ -1,10 +1,14 @@
-BlackBox
+BlackBox [![CircleCI](https://circleci.com/gh/StackExchange/blackbox.svg?style=shield)](https://circleci.com/gh/StackExchange/workflows/blackbox) [![Build Status](https://github.com/StackExchange/blackbox/workflows/build/badge.svg)](https://github.com/StackExchange/blackbox/actions?query=workflow%3Abuild+branch%3Amaster)
 ========
 
 Safely store secrets in a VCS repo (i.e. Git, Mercurial, Subversion or Perforce). These commands make it easy for you to Gnu Privacy Guard (GPG) encrypt specific files in a repo so they are "encrypted at rest" in your repository. However, the scripts make it easy to decrypt them when you need to view or edit them, and decrypt them for use in production. Originally written for Puppet, BlackBox now works with any Git or Mercurial repository.
 
+WARNING: The goal of this project is to be a simple wrapper around `gpg` so you and your coworkers don't have to remember its all those inscrutable and confusing flags.  It is *not* intented to be a sophisticated encryption system that solves all problems or supports a large numbers of files.  The ideal use-case is to keep secrets in a secure service such as Conjur, AWS KMS, Azure Key Vault or GCP KMS; then use Blackbox for safely storing the API keys needed to access that system. That way you are encrypting one tiny file.
+
 A slide presentation about an older release [is on SlideShare](http://www.slideshare.net/TomLimoncelli/the-blackbox-project-sfae).
 
+Join our mailing list: [https://groups.google.com/d/forum/blackbox-project](https://groups.google.com/d/forum/blackbox-project)
+
 Table of Contents
 =================
 
@@ -12,29 +16,36 @@ Table of Contents
 - [Table of Contents](#table-of-contents)
 - [Overview](#overview)
 - [Why is this important?](#why-is-this-important)
-- [Installation Instructions:](#installation-instructions)
-- [Commands:](#commands)
-- [Compatibility:](#compatibility)
+- [Installation Instructions](#installation-instructions)
+- [Commands](#commands)
+- [Compatibility](#compatibility)
 - [How is the encryption done?](#how-is-the-encryption-done)
 - [What does this look like to the typical user?](#what-does-this-look-like-to-the-typical-user)
-- [How to use the secrets with Puppet?](#how-to-use-the-secrets-with-puppet)
-  - [Entire files:](#entire-files)
-  - [Small strings:](#small-strings)
-- [How to enroll a new file into the system?](#how-to-enroll-a-new-file-into-the-system)
-- [How to remove a file from the system?](#how-to-remove-a-file-from-the-system)
-- [How to indoctrinate a new user into the system?](#how-to-indoctrinate-a-new-user-into-the-system)
-- [How to remove a user from the system?](#how-to-remove-a-user-from-the-system)
-- [Enabling Blackbox For a Repo](#enabling-blackbox-for-a-repo)
+- Configuration Management
+  - [How to use the secrets with Ansible?](#how-to-use-the-secrets-with-ansible)
+  - [How to use the secrets with Puppet?](#how-to-use-the-secrets-with-puppet)
+    - [Entire files](#entire-files)
+    - [Small strings](#small-strings)
+- File Management
+  - [How to enroll a new file into the system?](#how-to-enroll-a-new-file-into-the-system)
+  - [How to remove a file from the system?](#how-to-remove-a-file-from-the-system)
+- User Management
+  - [How to indoctrinate a new user into the system?](#how-to-indoctrinate-a-new-user-into-the-system)
+  - [How to remove a user from the system?](#how-to-remove-a-user-from-the-system)
+- Repo Management
+  - [Enabling BlackBox For a Repo](#enabling-blackbox-for-a-repo)
 - [Set up automated users or “role accounts”](#set-up-automated-users-or-role-accounts)
-- [Replace expired keys:](#replace-expired-keys)
-- [Some common errors:](#some-common-errors)
-- [Using Blackbox without a repo](#using-blackbox-without-a-repo)
+- [Replacing expired keys](#replacing-expired-keys)
+- [Some common errors](#some-common-errors)
+- [Using BlackBox on Windows](#using-blackbox-on-windows)
+- [Using BlackBox without a repo](#using-blackbox-without-a-repo)
+- [Some Subversion gotchas](#some-subversion-gotchas)
+- [Using Blackbox when gpg2 is installed next to gpg](#using-blackbox-when-gpg2-is-installed-next-to-gpg)
 - [How to submit bugs or ask questions?](#how-to-submit-bugs-or-ask-questions)
 - [Developer Info](#developer-info)
 - [Alternatives](#alternatives)
 - [License](#license)
 
-
 Overview
 ========
 
@@ -46,7 +57,28 @@ Rather than one GPG passphrase for all the files, each person with access has th
 
 Automated processes often need access to all the decrypted files. This is easy too. For example, suppose Git is being used for Puppet files. The master needs access to the decrypted version of all the files. Simply set up a GPG key for the Puppet master (or the role account that pushes new files to the Puppet master) and have that user run `blackbox_postdeploy` after any files are updated.
 
-Getting started is easy. Just `cd` into a Git, Mercurial, Subversion or Perforce repository and run `blackbox_initialize`. After that, if a file is to be encrypted, run `blackbox_register_new_file` and you are done. Add and remove keys with `blackbox_addadmin` and `blackbox_removeadmin`. To view and/or edit a file, run `blackbox_edit`; this will decrypt the file and open with whatever is specified by your $EDITOR environment variable. When you close the editor the file will automatically be encrypted again and the temporary plaintext file will be shredded. If you need to leave the file decrypted while you update you can use the`blackbox_edit_start` to decrypt the file and `blackbox_edit_end` when you want to "put it back in the box."
+Getting started
+---------------
+
+1. If you don't have a GPG key, set it up using instructions such as:
+[Set up GPG key](https://help.github.com/articles/generating-a-new-gpg-key/). \
+Now you are ready to go.
+
+1. `cd` into a Git, Mercurial, Subversion or Perforce repository and run `blackbox_initialize`.
+
+1. If a file is to be encrypted, run `blackbox_register_new_file` and you are done.
+
+1. Add and remove keys with `blackbox_addadmin` and `blackbox_removeadmin`.
+
+1. To view and/or edit a file, run `blackbox_edit`;
+this will decrypt the file and open with whatever is specified by
+your $EDITOR environment variable. \
+When you close the editor the
+file will automatically be encrypted again and the temporary plaintext
+file will be shredded. \
+If you need to leave the file decrypted while
+you update you can use the`blackbox_edit_start` to decrypt the file
+and `blackbox_edit_end` when you want to "put it back in the box."
 
 Why is this important?
 ======================
@@ -55,75 +87,126 @@ OBVIOUSLY we don't want secret things like SSL private keys and passwords to be
 
 NOT SO OBVIOUSLY when we store "secrets" in a VCS repo like Git or Mercurial, suddenly we are less able to share our code with other people. Communication between subteams of an organization is hurt. You can't collaborate as well. Either you find yourself emailing individual files around (yuck!), making a special repo with just the files needed by your collaborators (yuck!!), or just deciding that collaboration isn't worth all that effort (yuck!!!).
 
-The ability to be open and transparent about our code, with the exception of a few specific files, is key to the kind of collaboration that DevOps and modern IT practitioniers need to do.
+The ability to be open and transparent about our code, with the exception of a few specific files, is key to the kind of collaboration that DevOps and modern IT practitioners need to do.
 
-Installation Instructions:
-==========================
+Installation Instructions
+=========================
 
--	*The MacPorts Way*: `sudo port install vcs_blackbox`
--	*The RPM way*: Check out the repo and make an RPM via `make packages-rpm`; now you can distribute the RPM via local methods.
--	*The Debian/Ubuntu way*: Check out the repo and install [fpm](https://github.com/jordansissel/fpm). Now you can make a DEB `make packages-deb` that can be distributed via local methods.
--	*The hard way*: Copy all the files in "bin" to your "bin".
--	*The manual way*: `make manual-install` to install. `make manual-uninstall` to uninstall.
--	*The Antigen Way*: Add `antigen bundle StackExchange/blackbox` to your .zshrc
--	*The Zgen Way*: Add `zgen load StackExchange/blackbox` to your .zshrc where you're loading your other plugins.
+- *The hard way (manual)*: Copy all the files in "bin" to your "bin".
+- *The hard way (automatic)*: `make copy-install` will copy the bin files into $PREFIX/bin, default is /usr/local (uninstall with `make copy-uninstall`).
+- *The symlinks way*: `make symlinks-install` will make symlinks of the bin files into $PREFIX/bin, default is /usr/local (uninstall with `make copy-uninstall`) (useful when doing development)
+- *The MacPorts Way*: `sudo port install vcs_blackbox`
+- *The Homebrew Way*: `brew install blackbox`
+- *The RPM way*: Check out the repo and make an RPM via `make packages-rpm`; now you can distribute the RPM via local methods. (Requires [fpm](https://github.com/jordansissel/fpm).)
+- *The Debian/Ubuntu way*: Check out the repo and make a DEB via `make packages-deb`; now you can distribute the DEB via local methods. (Requires [fpm](https://github.com/jordansissel/fpm).)
+- *The Antigen Way*: Add `antigen bundle StackExchange/blackbox` to your .zshrc
+- *The Zgenom Way*: Add `zgenom load StackExchange/blackbox` to your .zshrc where you're loading your other plugins.
+- *The Nix Way*: `nix-shell -p blackbox`
+- *The Pkgsrc Way*: `pkgin in scm-blackbox`
 
-Commands:
-=========
+Commands
+========
 
-| Name:                        | Description:                                                            |
-|------------------------------|-------------------------------------------------------------------------|
-| `blackbox_edit`              | Decrypt, run $EDITOR, re-encrypt a file                                 |
-| `blackbox_edit_start`        | Decrypt a file so it can be updated                                     |
-| `blackbox_edit_end`          | Encrypt a file after blackbox_edit_start was used                       |
-| `blackbox_cat`               | Decrypt and view the contents of a file                                 |
-| `blackbox_diff`              | Diff decrypted files against their original crypted version             |
-| `blackbox_initialize`        | Enable blackbox for a GIT or HG repo                                    |
-| `blackbox_register_new_file` | Encrypt a file for the first time                                       |
-| `blackbox_deregister_file`   | Remove a file from blackbox                                             |
-| `blackbox_list_files`        | List the files maintained by blackbox                                   |
-| `blackbox_decrypt_all_files` | Decrypt all managed files (INTERACTIVE)                                 |
-| `blackbox_postdeploy`        | Decrypt all managed files (batch)                                       |
-| `blackbox_addadmin`          | Add someone to the list of people that can encrypt/decrypt secrets      |
-| `blackbox_removeadmin`       | Remove someone from the list of people that can encrypt/decrypt secrets |
-| `blackbox_shred_all_files`   | Safely delete any decrypted files                                       |
-| `blackbox_update_all_files`  | Decrypt then re-encrypt all files. Useful after keys are changed        |
-| `blackbox_whatsnew`          | show what has changed in the last commit for a given file               |
+| Name:                               | Description:                                                            |
+|-------------------------------------|-------------------------------------------------------------------------|
+| `blackbox_edit <file>`              | Decrypt, run $EDITOR, re-encrypt a file                                 |
+| `blackbox_edit_start <file>`        | Decrypt a file so it can be updated                                     |
+| `blackbox_edit_end <file>`          | Encrypt a file after blackbox_edit_start was used                       |
+| `blackbox_cat <file>`               | Decrypt and view the contents of a file                                 |
+| `blackbox_view <file>`              | Like blackbox_cat but pipes to `less` or $PAGER                         |
+| `blackbox_diff`                     | Diff decrypted files against their original crypted version             |
+| `blackbox_initialize`               | Enable blackbox for a GIT or HG repo                                    |
+| `blackbox_register_new_file <file>` | Encrypt a file for the first time                                       |
+| `blackbox_deregister_file <file>`   | Remove a file from blackbox                                             |
+| `blackbox_list_files`               | List the files maintained by blackbox                                   |
+| `blackbox_list_admins`              | List admins currently authorized for blackbox                           |
+| `blackbox_decrypt_file <file>`      | Decrypt a file                                                          |
+| `blackbox_decrypt_all_files`        | Decrypt all managed files (INTERACTIVE)                                 |
+| `blackbox_postdeploy`               | Decrypt all managed files (batch)                                       |
+| `blackbox_addadmin <gpg-key>`       | Add someone to the list of people that can encrypt/decrypt secrets      |
+| `blackbox_removeadmin <gpg-key>`    | Remove someone from the list of people that can encrypt/decrypt secrets |
+| `blackbox_shred_all_files`          | Safely delete any decrypted files                                       |
+| `blackbox_update_all_files`         | Decrypt then re-encrypt all files. Useful after keys are changed        |
+| `blackbox_whatsnew <file>`          | show what has changed in the last commit for a given file               |
 
-Compatibility:
-==============
+Compatibility
+=============
 
-Blackbox automatically determines which VCS you are using and does the right thing. It has a plug-in architecture to make it easy to extend to work with other systems. It has been tested to work with many operating systems.
+BlackBox automatically determines which VCS you are using and does the right thing. It has a plug-in architecture to make it easy to extend to work with other systems. It has been tested to work with many operating systems.
 
--	Version Control systems
-	-	`git` -- The Git
-	-	`hg` -- Mercurial
-	-	`svn` -- SubVersion (Thanks, Ben Drasin!)
-	-	`p4` -- Perforce
-	-	none -- The files can be decrypted outside of a repo if the keyrings directory is intact
--	Operating system
-	-	CentOS / RedHat
-	-	MacOS X
-	-	Cygwin (Thanks, Ben Drasin!)
+- Version Control systems
+  - `git` -- The Git
+  - `hg` -- Mercurial
+  - `svn` -- SubVersion (Thanks, Ben Drasin!)
+  - `p4` -- Perforce
+  - none -- The files can be decrypted outside of a repo if the `.blackbox` directory is intact
+- Operating system
+  - CentOS / RedHat
+  - MacOS X
+  - Cygwin (Thanks, Ben Drasin!) **See Note Below**
+  - MinGW (git bash on windows) **See Note Below**
+  - NetBSD
+  - SmartOS
 
 To add or fix support for a VCS system, look for code at the end of `bin/_blackbox_common.sh`
 
 To add or fix support for a new operating system, look for the case statements in `bin/_blackbox_common.sh` and `bin/_stack_lib.sh` and maybe `tools/confidence_test.sh`
 
-Note: Cywin support requires the following packages:
+Using BlackBox on Windows
+=========================
 
--	Normal operation:
-	-	gnupg
-	-	git or mercurial or subversion or perforce (as appropriate)
--	Development (if you will be adding code and want to run the confidence test)
-	-	procps
-	-	make
-	-	git (the confidence test currently only tests git)
+BlackBox can be used with Cygwin or MinGW.
+
+### Protect the line endings
+
+BlackBox assumes that `blackbox-admins.txt` and `blackbox-files.txt` will have
+LF line endings. Windows users should be careful to configure Git or other systems
+to not convert or "fix" those files.
+
+If you use Git, add the following lines to your `.gitattributes` file:
+
+    **/blackbox-admins.txt text eol=lf
+    **/blackbox-files.txt text eol=lf
+
+The latest version of `blackbox_initialize` will create a `.gitattributes` file in the `$BLACKBOXDATA`
+directory (usually `.blackbox`) for you.
+
+### Cygwin
+
+Cygwin support requires the following packages:
+
+Normal operation:
+
+- gnupg
+- git or mercurial or subversion or perforce (as appropriate)
+
+Development (if you will be adding code and want to run the confidence test)
+
+- procps
+- make
+- git (the confidence test currently only tests git)
+
+### MinGW
+
+MinGW (comes with Git for Windows) support requires the following:
+
+Normal operation:
+
+- [Git for Windows](https://git-scm.com/) (not tested with Mercurial)
+  - Git Bash MINTTY returns a MinGW console.  So when you install make sure you pick `MINTTY` instead of windows console.  You'll be executing blackbox from the Git Bash prompt.
+  - You need at least version 2.8.1 of Git for Windows.
+- [GnuWin32](https://sourceforge.net/projects/getgnuwin32/files/) - needed for various tools not least of which is mktemp which is used by blackbox
+  - after downloading the install just provides you with some batch files.  Because of prior issues at sourceforge and to make sure you get the latest version of each package the batch files handle the brunt of the work of getting the correct packages and installing them for you.
+  - from a **windows command prompt** run `download.bat`  once it has completed run `install.bat` then add the path for those tools to your PATH (ex: `PATH=%PATH%;c:\GnuWin32\bin`)
+
+Development:
+
+- unknown (if you develop Blackbox under MinGW, please let us know if any additional packages are required to run `make test`)
 
 How is the encryption done?
 ===========================
 
-GPG has many different ways to encrypt a file. BlackBox uses the mode that lets you specify a list of keys that can decrypt the messsage.
+GPG has many different ways to encrypt a file. BlackBox uses the mode that lets you specify a list of keys that can decrypt the message.
 
 If you have 5 people ("admins") that should be able to access the secrets, each creates a GPG key and adds their public key to the keychain. The GPG command used to encrypt the file lists all 5 key names, and therefore any 1 key can decrypt the file.
 
@@ -137,23 +220,39 @@ To remove someone's access, remove that admin's key name (i.e. email address) fr
 
 *If you use Puppet, why didn't you just use hiera-eyaml?* There are 4 reasons:
 
-1.	This works with any Git or Mercurial repo, even if you aren't using Puppet.
-2.	hiera-eyaml decrypts "on demand" which means your Puppet Master now uses a lot of CPU to decrypt keys every time it is contacted. It slows down your master, which, in my case, is already slow enough.
-3.	This works with binary files, without having to ASCIIify them and paste them into a YAML file. Have you tried to do this with a cert that is 10K long and changes every few weeks? Ick.
-4.	hiera-eyaml didn't exist when I wrote this.
+1. This works with any Git or Mercurial repo, even if you aren't using Puppet.
+2. hiera-eyaml decrypts "on demand" which means your Puppet Master now uses a lot of CPU to decrypt keys every time it is contacted. It slows down your master, which, in my case, is already slow enough.
+3. This works with binary files, without having to ASCIIify them and paste them into a YAML file. Have you tried to do this with a cert that is 10K long and changes every few weeks? Ick.
+4. hiera-eyaml didn't exist when I wrote this.
 
 What does this look like to the typical user?
 =============================================
 
--	If you need to, start the GPG Agent: `eval $(gpg-agent --daemon)`
--	Decrypt the file so it is editable: `blackbox_edit_start FILENAME`
--	(You will need to enter your GPG passphrase.)
--	Edit FILENAME as you desire: `vim FILENAME`
--	Re-encrypt the file: `blackbox_edit_end FILENAME`
--	Commit the changes. `git commit -a` or `hg commit`
+- If you need to, start the GPG Agent: `eval $(gpg-agent --daemon)`
+- Decrypt the file so it is editable: `blackbox_edit_start FILENAME`
+- (You will need to enter your GPG passphrase.)
+- Edit FILENAME as you desire: `vim FILENAME`
+- Re-encrypt the file: `blackbox_edit_end FILENAME`
+- Commit the changes. `git commit -a` or `hg commit`
 
 Wait... it can be even easier than that! Run `blackbox_edit FILENAME`, and it'll decrypt the file in a temp file and call `$EDITOR` on it, re-encrypting again after the editor is closed.
 
+How to use the secrets with Ansible?
+===================================
+
+Ansible Vault provides functionality for encrypting both entire files and strings stored within files; however,
+keeping track of the password(s) required for decryption is not handled by this module.
+
+Instead one must specify a password file when running the playbook.
+
+Ansible example for password file: `my_secret_password.txt.gpg`
+
+```
+ansible-playbook --vault-password-file my_secret_password.txt site.yml
+```
+
+Alternatively, one can specify this in the `ANSIBLE_VAULT_PASSWORD_FILE` environment variable.
+
 How to use the secrets with Puppet?
 ===================================
 
@@ -211,8 +310,8 @@ The variable `$the_password` will contain "my secret password" and can be used a
 How to enroll a new file into the system?
 =========================================
 
--	If you need to, start the GPG Agent: `eval $(gpg-agent --daemon)`
--	Add the file to the system:
+- If you need to, start the GPG Agent: `eval $(gpg-agent --daemon)`
+- Add the file to the system:
 
 ```
 blackbox_register_new_file path/to/file.name.key
@@ -244,11 +343,13 @@ blackbox_deregister_file path/to/file.name.key
 How to indoctrinate a new user into the system?
 ===============================================
 
-`keyrings/live/blackbox-admins.txt` is a file that lists which users are able to decrypt files. (More pedantically, it is a list of the GnuPG key names that the file is encrypted for.)
+FYI: Your repo may use `keyrings/live` instead of `.blackbox`. See "Where is the configuration stored?"
+
+`.blackbox/blackbox-admins.txt` is a file that lists which users are able to decrypt files. (More pedantically, it is a list of the GnuPG key names that the file is encrypted for.)
 
 To join the list of people that can edit the file requires three steps; You create a GPG key and add it to the key ring. Then, someone that already has access adds you to the system. Lastly, you should test your access.
 
-### Step 1: YOU create a GPG key pair on a secure machine and add to public keychain.
+### Step 1: NEW USER creates a GPG key pair on a secure machine and adds to public keychain.
 
 If you don't already have a GPG key, here's how to generate one:
 
@@ -256,7 +357,19 @@ If you don't already have a GPG key, here's how to generate one:
 gpg --gen-key
 ```
 
-Pick defaults for encryption settings, 0 expiration. Pick a VERY GOOD passphrase. Store the private key securely. Tip: Store it on a secure machine, or one with little or no internet access, with full-disk-encryption, etc. Your employer problably has rules about how to store such things.
+WARNING: New versions of GPG generate keys which are not understood by
+old versions of GPG.  If you generate a key with a new version of GPG,
+this will cause problems for users of older versions of GPG.
+Therefore it is recommended that you either assure that everyone using
+Blackbox have the exact same version of GPG, or generate GPG keys
+using a version of GPG as old as the oldest version of GPG used by
+everyone using Blackbox.
+
+Pick defaults for encryption settings, 0 expiration. Pick a VERY GOOD passphrase. Store a backup of the private key someplace secure. For example, keep the backup copy on a USB drive that is locked in safe.  Or, at least put it on a secure machine with little or no internet access, full-disk-encryption, etc. Your employer probably has rules about how to store such things.
+
+FYI: If generating the key is slow, this is usually because the system
+isn't generating enough entropy.  Tip: Open another window on that
+machine and run this command: `ls -R /`
 
 Now that you have a GPG key, add yourself as an admin:
 
@@ -273,7 +386,7 @@ blackbox_addadmin tal@example.com
 When the command completes successfully, instructions on how to commit these changes will be output. Run the command as given to commit the changes. It will look like this:
 
 ```
-git commit -m'NEW ADMIN: tal@example.com' keyrings/live/pubring.gpg keyrings/live/trustdb.gpg keyrings/live/blackbox-admins.txt
+git commit -m'NEW ADMIN: tal@example.com' .blackbox/pubring.gpg .blackbox/trustdb.gpg .blackbox/blackbox-admins.txt
 ```
 
 Then push it to the repo:
@@ -290,14 +403,15 @@ ht push
 
 NOTE: Creating a Role Account? If you are adding the pubring.gpg of a role account, you can specify the directory where the pubring.gpg file can be found as a 2nd parameter: `blackbox_addadmin puppetmaster@puppet-master-1.example.com /path/to/the/dir`
 
-### Step 2: SOMEONE ELSE adds you to the system.
+### Step 2: EXISTING ADMIN adds new user to the system.
 
 Ask someone that already has access to re-encrypt the data files. This gives you access. They simply decrypt and re-encrypt the data without making any changes.
 
 Pre-check: Verify the new keys look good.
 
 ```
-$ gpg --homedir=keyrings/live --list-keys 
+git pull    # Or whatever is required for your system
+gpg --homedir=.blackbox --list-keys
 ```
 
 For example, examine the key name (email address) to make sure it conforms to corporate standards.
@@ -305,7 +419,7 @@ For example, examine the key name (email address) to make sure it conforms to co
 Import the keychain into your personal keychain and reencrypt:
 
 ```
-gpg --import keyrings/live/pubring.gpg
+gpg --import .blackbox/pubring.gpg
 blackbox_update_all_files
 ```
 
@@ -321,7 +435,7 @@ hg commit
 hg push
 ```
 
-### Step 3: YOU test.
+### Step 3: NEW USER tests.
 
 Make sure you can decrypt a file. (Suggestion: Keep a dummy file in VCS just for new people to practice on.)
 
@@ -341,27 +455,61 @@ When the command completes, you will be given a reminder to check in the change
 
 Note that their keys will still be in the key ring, but they will go unused. If you'd like to clean up the keyring, use the normal GPG commands and check in the file.
 
+FYI: Your repo may use `keyrings/live` instead of `.blackbox`. See "Where is the configuration stored?"
+
 ```
-gpg --homedir=keyrings/live --list-keys
-gpg --homedir=keyrings/live --delete-key olduser@example.com
-git commit -m'Cleaned olduser@example.com from keyring'  keyrings/live/*
+gpg --homedir=.blackbox --list-keys
+gpg --homedir=.blackbox --delete-key olduser@example.com
+git commit -m'Cleaned olduser@example.com from keyring'  .blackbox/*
 ```
 
+FYI: Your repo may use `keyrings/live` instead of `.blackbox`. See "Where is the configuration stored?"
+
 The key ring only has public keys. There are no secret keys to delete.
 
 Remember that this person did have access to all the secrets at one time. They could have made a copy. Therefore, to be completely secure, you should change all passwords, generate new SSL keys, and so on just like when anyone that had privileged access leaves an organization.
 
-Enabling Blackbox For a Repo
+Where is the configuration stored? .blackbox vs. keyrings/live
+==============================================================
+
+Blackbox stores its configuration data in the `.blackbox` subdirectory.  Older
+repos use `keyrings/live`.  For backwards compatibility either will work.
+
+All documentation refers to `.blackbox`.
+
+You can convert an old repo by simply renaming the directory:
+
+```
+mv keyrings/live .blackbox
+rmdir keyrings
+```
+
+There is no technical reason to convert old repos except that it is less
+confusing to users.
+
+This change was made in commit 60e782a0, release v1.20180615.
+
+The details:
+
+- First Blackbox checks `$BLACKBOXDATA`. If this environment variable is set, this is the directory that will be used. If it lists a directory that does not exist, Blackbox will print an error and exit.
+- If `$BLACKBOXDATA` is not set: (which is the typical use case)
+  - Blackbox will first try `keyrings/live` and use it if it exists.
+  - Otherwise the default `.blackbox` will be used.  If `.blackbox` does not exist, Blackbox will print an error and exit.
+
+
+Enabling BlackBox For a Repo
 ============================
 
 Overview:
 
 To add "blackbox" to a git or mercurial repo, you'll need to do the following:
 
-1.	Run the initialize script. This adds a few files to your repo in a directory called "keyrings".
-2.	For the first user, create a GPG key and add it to the key ring.
-3.	Encrypt the files you want to be "secret".
-4.	For any automated user (one that must be able to decrypt without a passphrase), create a GPG key and create a subkey with an empty passphrase.
+1. Run the initialize script. This adds a few files to your repo in a directory called ".blackbox".
+2. For the first user, create a GPG key and add it to the key ring.
+3. Encrypt the files you want to be "secret".
+4. For any automated user (one that must be able to decrypt without a passphrase), create a GPG key and create a subkey with an empty passphrase.
+
+FYI: Your repo may use `keyrings/live` instead of `.blackbox`. See "Where is the configuration stored?"
 
 ### Run the initialize script.
 
@@ -412,6 +560,8 @@ Set up automated users or "role accounts"
 
 i.e. This is how a Puppet Master can have access to the unencrypted data.
 
+FYI: Your repo may use `keyrings/live` instead of `.blackbox`. See "Where is the configuration stored?"
+
 An automated user (a "role account") is one that that must be able to decrypt without a passphrase. In general you'll want to do this for the user that pulls the files from the repo to the master. This may be automated with Jenkins CI or other CI system.
 
 GPG keys have to have a passphrase. However, passphrases are optional on subkeys. Therefore, we will create a key with a passphrase then create a subkey without a passphrase. Since the subkey is very powerful, it should be created on a very secure machine.
@@ -424,9 +574,9 @@ ProTip: If asked to generate entropy, consider running this on the same machine
 
 For the rest of this doc, you'll need to make the following substitutions:
 
--	ROLEUSER: svc_deployacct or whatever your role account's name is.
--	NEWMASTER: the machine this role account exists on.
--	SECUREHOST: The machine you use to create the keys.
+- ROLEUSER: svc_deployacct or whatever your role account's name is.
+- NEWMASTER: the machine this role account exists on.
+- SECUREHOST: The machine you use to create the keys.
 
 NOTE: This should be more automated/scripted. Patches welcome.
 
@@ -474,9 +624,9 @@ Command> save
 Now securely export this directory to NEWMASTER:
 
 ```
-$ gpg --homedir . --export -a svc_sadeploy >/tmp/NEWMASTER/pubkey.txt
-$ tar cvf /tmp/keys.tar .
-$ rsync -avP /tmp/keys.tar NEWMASTER:/tmp/.
+gpg --homedir . --export -a svc_sadeploy >/tmp/NEWMASTER/pubkey.txt
+tar cvf /tmp/keys.tar .
+rsync -avP /tmp/keys.tar NEWMASTER:/tmp/.
 ```
 
 On NEWMASTER, receive the new GnuPG config:
@@ -491,12 +641,12 @@ cd ~/.gnupg && tar xpvf /tmp/keys.tar
 Back on SECUREHOST, import the pubkey into the repository.
 
 ```
-$ cd keyrings/live
+$ cd .blackbox
 $ gpg --homedir . --import /tmp/NEWMASTER/pubkey.txt
 ```
 -->
 
-Back on SECUREHOST, add the new email address to keyrings/live/blackbox-admins.txt:
+Back on SECUREHOST, add the new email address to .blackbox/blackbox-admins.txt:
 
 ```
 cd /path/to/the/repo
@@ -506,14 +656,14 @@ blackbox_addadmin $KEYNAME /tmp/NEWMASTER
 Verify that secring.gpg is a zero-length file. If it isn't, you have somehow added a private key to the keyring. Start over.
 
 ```
-$ cd keyrings/live
-$ ls -l secring.gpg
+cd .blackbox
+ls -l secring.gpg
 ```
 
 Commit the recent changes:
 
 ```
-$ cd keyrings/live
+cd .blackbox
 git commit -m"Adding key for KEYNAME" pubring.gpg trustdb.gpg blackbox-admins.txt
 ```
 
@@ -530,7 +680,7 @@ On NEWMASTER, import the keys and decrypt the files:
 
 ```
 sudo -u svc_sadeploy bash   # Become the role account.
-gpg --import /etc/puppet/keyrings/live/pubring.gpg
+gpg --import /etc/puppet/.blackbox/pubring.gpg
 export PATH=$PATH:/path/to/blackbox/bin
 blackbox_postdeploy
 sudo -u puppet cat /etc/puppet/hieradata/blackbox.yaml # or any encrypted file.
@@ -538,7 +688,7 @@ sudo -u puppet cat /etc/puppet/hieradata/blackbox.yaml # or any encrypted file.
 
 ProTip: If you get "gpg: decryption failed: No secret key" then you forgot to re-encrypt blackbox.yaml with the new key.
 
-On SECUREHOST, securerly delete your files:
+On SECUREHOST, securely delete your files:
 
 ```
 cd /tmp/NEWMASTER
@@ -551,19 +701,30 @@ rm -rf /tmp/NEWMASTER
 
 Also shred any other temporary files you may have made.
 
-Replace expired keys:
-=====================
+Replacing expired keys
+======================
 
-If any one admin's key expires, you can no longer encrypt files. You will need to replace the key and re-encrypt.
-
--	Step 0: You see this error:
+If someone's key has already expired, blackbox will stop
+encrypting.  You see this error:
 
 ```
 $ blackbox_edit_end modified_file.txt
 --> Error: can't re-encrypt because a key has expired.
 ```
 
--	Step 1. Administrator removes expired user:
+FYI: Your repo may use `keyrings/live` instead of `.blackbox`. See "Where is the configuration stored?"
+
+You can also detect keys that are about to expire by issuing this command and manually reviewing the "expired:" dates:
+
+    gpg --homedir=.blackbox  --list-keys
+
+or... list UIDs that will expire within 1 month from today: (Warning: this also lists keys without an expiration date)
+
+    gpg --homedir=.blackbox --list-keys  --with-colons --fixed-list-mode  | grep ^uid | awk -F: '$6 < '$(( $(date +%s) + 2592000))
+
+Here's how to replace the key:
+
+- Step 1. Administrator removes expired user:
 
 Warning: This process will erase any unencrypted files that you were in the process of editing. Copy them elsewhere and restore the changes when done.
 
@@ -572,62 +733,107 @@ blackbox_removeadmin expired_user@example.com
 # This next command overwrites any changed unencrypted files. See warning above.
 blackbox_update_all_files
 git commit -m "Re-encrypt all files"
-gpg --homedir=keyrings/live --delete-key expired_user@example.com
-git commit -m 'Cleaned expired_user@example.com from keyring'  keyrings/live/*
+gpg --homedir=.blackbox --delete-key expired_user@example.com
+git commit -m 'Cleaned expired_user@example.com from keyring'  .blackbox/*
 git push
 ```
 
--	Step 2. Expired user adds an updated key:
+- Step 2. Expired user adds an updated key:
 
 ```
 git pull
 blackbox_addadmin updated_user@example.com
-git commit -m'NEW ADMIN: updated_user@example.com keyrings/live/pubring.gpg keyrings/live/trustdb.gpg keyrings/live/blackbox-admins.txt
+git commit -m'NEW ADMIN: updated_user@example.com .blackbox/pubring.gpg .blackbox/trustdb.gpg .blackbox/blackbox-admins.txt
 git push
 ```
 
--	Step 3. Administrator re-encrypts all files with the updated key of the expired user:
+- Step 3. Administrator re-encrypts all files with the updated key of the expired user:
 
 ```
 git pull
-gpg --import keyrings/live/pubring.gpg 
-blackbox_update_all_files 
+gpg --import .blackbox/pubring.gpg
+blackbox_update_all_files
 git commit -m "Re-encrypt all files"
 git push
 ```
 
--	Step 4: Clean up:
+- Step 4: Clean up:
 
 Any files that were temporarily copied in the first step so as to not be overwritten can now be copied back and re-encrypted with the `blackbox_edit_end` command.
 
 (Thanks to @chishaku for finding a solution to this problem!)
 
-Some common errors:
-===================
+### Configure git to show diffs in encrypted files
 
-`gpg: filename: skipped: No public key` -- Usually this means there is an item in `keyrings/live/blackbox-admins.txt` that is not the name of the key. Either something invalid was inserted (like a filename instead of a username) or a user has left the organization and their key was removed from the keychain, but their name wasn't removed from the blackbox-admins.txt file.
+It's possible to tell Git to decrypt versions of the file before running them through `git diff` or `git log`. To achieve this do:
+
+- Add the following to `.gitattributes` at the top of the git repository:
+
+```
+*.gpg diff=blackbox
+```
+
+- Add the following to `.git/config`:
+
+```
+[diff "blackbox"]
+    textconv = gpg --use-agent -q --batch --decrypt
+````
+
+And now commands like `git log -p file.gpg` will show a nice log of the changes in the encrypted file.
+
+Some common errors
+==================
+
+`gpg: filename: skipped: No public key` -- Usually this means there is an item in `.blackbox/blackbox-admins.txt` that is not the name of the key. Either something invalid was inserted (like a filename instead of a username) or a user has left the organization and their key was removed from the keychain, but their name wasn't removed from the blackbox-admins.txt file.
 
 `gpg: decryption failed: No secret key` -- Usually means you forgot to re-encrypt the file with the new key.
 
-`Error: can't re-encrypt because a key has expired.` -- A user's key has expired and can't be used to encrypt any more. Follow the[Replace expired keys](#replace-expired-keys) tip.
+`Error: can't re-encrypt because a key has expired.` -- A user's key has expired and can't be used to encrypt any more. Follow the [Replace expired keys](#replace-expired-keys) tip.
+
+FYI: Your repo may use `keyrings/live` instead of `.blackbox`. See "Where is the configuration stored?"
 
 Using Blackbox without a repo
 =============================
 
-If the files are copied out of a repo they can still be decrypted and edited. Obviously edits, changes to keys, and such will be lost if they are made outside the repo. Also note that commands are most likely to only work if run from the base directory (i.e. the parent to the keyrings directory).
+If the files are copied out of a repo they can still be decrypted and edited. Obviously edits, changes to keys, and such will be lost if they are made outside the repo. Also note that commands are most likely to only work if run from the base directory (i.e. the parent to the .blackbox directory).
 
 The following commands have been tested outside a repo:
 
--	`blackbox_postdeploy`
--	`blackbox_edit_start`
--	`blackbox_edit_end`
+- `blackbox_postdeploy`
+- `blackbox_edit_start`
+- `blackbox_edit_end`
+
+Some Subversion gotchas
+=======================
+
+The current implementation will store the blackbox in `/keyrings` at the root of the entire repo.  This will create an issue between environments that have different roots (i.e. checking out `/` on development vs `/releases/foo` in production). To get around this, you can `export BLACKBOX_REPOBASE=/path/to/repo` and set a specific base for your repo.
+
+This was originally written for git and supports a two-phase commit, in which `commit` is a local commit and "push" sends the change upstream to the version control server when something is registered or deregistered with the system.  The current implementation will immediately `commit` a file (to the upstream subversion server) when you execute a `blackbox_*` command.
+
+Using Blackbox when gpg2 is installed next to gpg
+=================================================
+
+In some situations, team members or automated roles need to install gpg
+2.x alongside the system gpg version 1.x to catch up with the team's gpg
+version. On Ubuntu 16, you can ```apt-get install gnupg2``` which
+installs the binary gpg2. If you want to use this gpg2 binary, run every
+blackbox command with GPG=gpg2.
+
+For example:
+
+```
+GPG=gpg2 blackbox_postdeploy
+```
 
 How to submit bugs or ask questions?
 ====================================
 
 We welcome questions, bug reports and feedback!
 
--	https://github.com/StackExchange/blackbox/issues
+The best place to start is to join the [blackbox-project mailing list](https://groups.google.com/d/forum/blackbox-project) and ask there.
+
+Bugs are tracked here in Github. Please feel free to [report bugs](https://github.com/StackExchange/blackbox/issues) yourself.
 
 Developer Info
 ==============
@@ -650,23 +856,26 @@ This runs through a number of system tests. It creates a repo, encrypts files, d
 
 Please submit tests with code changes:
 
-The best way to change Blackbox is via Test Driven Development. First add a test to `tools/confidence.sh`. This test should fail, and demonstrate the need for the change you are about to make. Then fix the bug or add the feature you want. When you are done, `make confidence` should pass all tests. The PR you submit should include your code as well as the new test. This way the confidence tests accumulate as the system grows as we know future changes don't break old features.
+The best way to change BlackBox is via Test Driven Development. First add a test to `tools/confidence.sh`. This test should fail, and demonstrate the need for the change you are about to make. Then fix the bug or add the feature you want. When you are done, `make confidence` should pass all tests. The PR you submit should include your code as well as the new test. This way the confidence tests accumulate as the system grows as we know future changes don't break old features.
 
 Note: The tests currently assume "git" and have been tested only on CentOS, Mac OS X, and Cygwin. Patches welcome!
 
 Alternatives
 ============
 
-Here are other open source packages that do something similar to Blackbox. If you like them better than Blackbox, please use them.
+Here are other open source packages that do something similar to BlackBox. If you like them better than BlackBox, please use them.
 
--	git-crypt: https://www.agwa.name/projects/git-crypt/
--	Pass: http://www.zx2c4.com/projects/password-store/
--	Transcrypt: https://github.com/elasticdog/transcrypt
--	Keyringer: https://keyringer.pw/
+- [git-crypt](https://www.agwa.name/projects/git-crypt/)
+- [Pass](http://www.zx2c4.com/projects/password-store/)
+- [Transcrypt](https://github.com/elasticdog/transcrypt)
+- [Keyringer](https://keyringer.pw/)
+- [git-secret](https://github.com/sobolevn/git-secret)
 
 git-crypt has the best git integration. Once set up it is nearly transparent to the users. However it only works with git.
 
+
 License
 =======
 
-This content is released under the MIT License. See the LICENSE.txt file.
+This content is released under the MIT License.
+See the [LICENSE.txt](LICENSE.txt) file.

RELEASE_ENGINEERING.md

@@ -2,6 +2,7 @@ Table of Contents:
 ==================
 
 -	[Branches and Tags:](#branches-and-tags)
+-	[Testing:](#testing)
 -	[Build Tasks](#build-tasks)
 -	[Stable Releases](#stable-releases)
 -	[Production Releases](#production-releases)
@@ -17,7 +18,26 @@ There are 3 branches/tags:
 -	**tag stable:** Stable enough for use by most people.
 -	**tag production:** Burned in long enough that we are confident it can be widely adopted.
 
-If you are packaging Blackbox for distribution, you should track the *tag production*. You might also want to provide a separate package that tracks *tag stable:* for early adopters.
+If you are packaging BlackBox for distribution, you should track the *tag production*. You might also want to provide a separate package that tracks *tag stable:* for early adopters.
+
+Testing
+=======
+
+Tips:
+
+* macOS: `brew install gpg pinentry`
+* FreeBSD: `pkg install gpg gmake`
+* CentOS7: `yum install gpg`
+
+To run a suite of tests:
+
+```
+cd ~/src/github.com/StackExchange/blackbox
+make test
+```
+
+FYI: For FreeBSD, use `gmake test`
+
 
 Build Tasks
 ===========
@@ -25,9 +45,36 @@ Build Tasks
 Stable Releases
 ===============
 
+Step 0. Test the software
+
+Run this command to run the unit and system tests:
+
+```
+make test
+```
+
+NOTE: The tests require pinentry-tty. On macOS with NIX this
+can be installed via: `nix-env -i pinentry`
+
 Marking the software to be "stable":
 
-Step 1. Tag it.
+Step 1.  Update CHANGELOG.md
+
+Use "git log" to see what has changed and update CHANGELOG.md.
+
+For a new release, add:
+
+```
+   echo Release v1.$(date +%Y%m%d)
+```
+
+Commit with:
+
+```
+git commit -m'Update CHANGELOG.md' CHANGELOG.md
+```
+
+Step 2. Tag it.
 
 ```
 git pull
@@ -37,7 +84,7 @@ git tag stable
 git push origin tag stable
 ```
 
-Step 2. Mark your calendar 1 week from today to check to see if this should be promoted to production.
+Step 3. Mark your calendar 1 week from today to check to see if this should be promoted to production.
 
 Production Releases
 ===================
@@ -56,6 +103,12 @@ git tag "$R"
 git push origin tag "$R"
 ```
 
+Step 4. Get credit!
+
+Record the fact that you did this release in your weekly accomplishments file.
+
+
+
 Updating MacPorts (automatic)
 =============================
 
@@ -83,6 +136,7 @@ Submit the diff file as a bug as instructed. The instructions should look like t
 
 Step 3: Watch for the update to happen.
 
+
 Updating MacPorts (manual)
 ==========================
 

Version2-Ideas.md

@@ -0,0 +1,144 @@
+# Ideas for BlackBox Version 2
+
+I'm writing this to solicit feedback and encourage discussion.
+
+Here are my thoughts on a "version 2" of BlackBox.  This is where
+I list ideas that would require major changes to the system. They
+might break backwards compatibility, though usually not.
+
+BlackBox grew from a few simple shell scripts used at StackOverflow.com
+to a larger system used by dozens (hundreds?) of organizations. Not
+all the design decisions were "forward looking".
+
+These are the things I'd like to change someday.
+
+[TOC]
+
+## Change the commmand names
+
+There should be one program, with subcommands that have names that make more sense:
+
+* `blackbox admin add <key>`
+* `blackbox admin list`
+* `blackbox admin remove <key>`
+* `blackbox cat <filename> ...`
+* `blackbox decrypt <filename> ...`
+* `blackbox diff <filename> ...`
+* `blackbox edit <filename> ...`
+* `blackbox encrypt <filename> ...`
+* `blackbox file add <filename> ...`
+* `blackbox file list`
+* `blackbox file remove <filename> ...`
+* `blackbox info`
+* `blackbox init`
+* `blackbox reencrypt`
+* `blackbox shred --all|<filename> ...`
+* `blackbox status --all|<filename> ...`
+
+Backwards compatibility: The old scripts will be rewritten to use the new commands.
+
+## Change the "keyrings" directory
+
+The name `keyrings` was unfortunate.  First, it should probably begin with a `.`.  Second, it stores more than just keyrings.  Lastly, I'm finding that in most cases we want many repos to refer to the same keyring, which is not supported very well.
+
+A better system would be:
+
+1. If `$BLACKBOX_CONFIG` is set, use that directory.
+2. If the repo base directory has a file called `.blackbox_external`, read that file as if you are reading `$BLACKBOX_CONFIG`
+3. If the repo base directory has a `keyrings` directory, use that.
+4. If the repo base directory has a `.blackbox` directory, use that.
+
+Some thoughts on `.blackbox_external`:
+I'm not sure what the format should be, but I want it to be simple and expandable.  It should support support `../../dir/name` and `/long/path`.  However some day we may want to include a Git URL and have the system automatically get the keychain from it. That means the format has to be something like directory:../dir/name so that later we can add git:the-url.
+
+NOTE: Maybe `.blackbox_external` should be `.blackbox/BLACKBOX_CONFIG`?
+
+Backwards compatibility: `keyrings` would be checked before `.blackbox`.
+
+## System Test
+
+There needs to be a very complete system test.  The `make test` we
+have now is great for something written in bash.
+
+It should be easy to make tests. Perhaps a directory of files, each
+specifying a test.  We could make a little language for writing tests.
+
+    # This test becomes the user "alice" and verifies that she
+    # can encrypt a file, and decrypt it, with full fidelity.
+    BECOME alice a
+    BASH echo "foo contents" >foo.txt
+    SHOULD_NOT_EXIST foo.txt.gpg
+    BASH blackbox encrypt foo.txt
+    SHOULD_NOT_EXIST foo.txt
+    SHOULD_EXIST foo.txt.gpg
+    BASH_WITH_PASSWORD a blackbox decrypt foo.txt
+    SHOULD_EXIST foo.txt.gpg
+    SHOULD_EXIST foo.txt
+    SHOULD_CONTAIN foo.txt "foo contents\n"
+
+## Plug-in support
+
+There should plug-ins support for:
+
+Repo type:
+
+* Git -- Using /usr/bin/git or git.exe
+* Subversion
+* Mercurial
+* None (repoless)
+* Autodetect
+
+Encryption software:
+
+* GnuPG -- using /usr/bin/gpg{,2} or gpg.exe
+* golang.org/x/crypto/openpgp
+
+## JSON or .txt
+
+The files in .blackbox are mostly .txt files.  Instead we should
+define a .json format, and only read the .txt file is the .json file
+doesn't exist.
+
+
+## Repo-less mode
+
+I can't imagine storing files that aren't in a repo. I just put everything in repos lately. I use it more than I use NFS.  That said, I have received feedback that people would like the ability to disable automatic committing of files.
+
+I prefer the file commits to be automatic because when they were manual, people often accidentally committed the plaintext file instead of the GPG file.  Fixing such mistakes is a PITA and, of yeah, a big security nightmare.
+
+That said, I'm willing to have a "repo-less" mode.
+
+When this mode is triggered, no add/commit/ignore tasks are done.  The search for the keyrings directory still uses `$BLACKBOX_CONFIG` but if that is unset it looks for `.blackbox_config` in the current directory, then recursively `..` until we hit `/`.
+
+I think (but I'm not sure) this would benefit the entire system because it would force us to re-think what VCS actions are done when.
+
+I think (but I'm not sure) that a simple way to implement this would be to add an environment variable that overrides the automatic VCS detection. When set to "none", all VCS operations would basically become no-ops.  (This could be done by writing a plug-in that does nothing for all the `vcs_*` calls)
+
+
+Backwards compatibility: This would add a `none` VCS, not remove any existing functionality.
+
+
+## Is "bash" the right language?
+
+`bash` is fairly universal. It even exists on Windows.  However it is not the right language for large systems. Writing the acceptance tests is quite a bear.  Managing `.gitignore` files in bash is impossible and the current implementation fails in many cases.
+
+`python` is my second favorite language. It would make the code cleaner and more testable. However it is not installed everywhere.  I would also want to write it in Python3 (why start a new project in Python2?) but sadly Python3 is less common.  It is a chicken vs. egg situation.
+
+`go` is my favorite language. I could probably rewrite this in go in a weekend. However, now the code is compiled, not interpreted. Therefore we lose the ability to just `git clone` and have the tools you want.  Not everyone has a Go compiler installed on every machine.
+
+The system is basically unusable on Windows without Cygwin or MINGW.  A rewrite in python or go would make it work better on Windows, which currently requires Cygwin or MinGW (which is a bigger investment than installing Python). On the other hand, maybe Ubuntu-on-Windows makes that a non-issue.
+
+As long as the code is in `bash` the configuration files like `blackbox-files.txt` and `blackbox-admins.txt` have problems.  Filenames with carriage returns aren't supported.  If this was in Python/Go/etc. those files could be json or some format with decent quoting and we could handle funny file names better. On the other hand, maybe it is best that we don't support funny filenames... we shouldn't enable bad behavior.
+
+How important is itto blackbox users that the system is written in `bash`?
+
+
+## Ditch the project and use git-crypt
+
+People tell me that git-crypt is better because, as a plug-in, automagically supports `git diff`, `git log` and `git blame`.
+
+However, I've never used it so I don't have any idea whether git-crypt is any better than blackbox.
+
+Of course, git-crypt doesn't work with SVN, HG, or any other VCS.  Is blackbox's strong point the fact that it support so many VCS systems?  To be honest, it originally only supported HG and GIT because I was at a company that used HG but then changed to GIT.  Supporting anything else was thanks to contributors. Heck, HG support hasn't even been tested recently (by me) since we've gone all git where I work.
+
+How important is this to BlackBox users?

bin/_blackbox_common.sh

@@ -15,9 +15,15 @@ source "${0%/*}"/_stack_lib.sh
 # Where are we?
 : "${BLACKBOX_HOME:="$(cd "${0%/*}" ; pwd)"}" ;
 
-# Where in the VCS repo should the blackbox data be found?
-: "${BLACKBOXDATA:=keyrings/live}" ;   # If BLACKBOXDATA not set, set it.
-
+# What are the candidates for the blackbox data directory?
+#
+# The order of candidates matter. The first entry of the array
+# sets the default Blackbox directory for all new repositories.
+declare -a BLACKBOXDATA_CANDIDATES
+BLACKBOXDATA_CANDIDATES=(
+  '.blackbox'
+  'keyrings/live'
+)
 
 # If $EDITOR is not set, set it to "vi":
 : "${EDITOR:=vi}" ;
@@ -28,7 +34,7 @@ source "${0%/*}"/_stack_lib.sh
 function physical_directory_of() {
   local d=$(dirname "$1")
   local f=$(basename "$1")
-  (cd "$d" && echo "$(pwd -P)/$f" )
+  (cd "$d" && echo "$(pwd -P | sed 's/\/$//')/$f" )
 }
 
 # Set REPOBASE to the top of the repository
@@ -62,6 +68,21 @@ export REPOBASE=$(physical_directory_of "$REPOBASE")
 # FIXME: Verify this function by checking for .hg or .git
 # after determining what we believe to be the answer.
 
+if [[ -n "$BLACKBOX_REPOBASE" ]]; then
+	echo "Using custom repobase: $BLACKBOX_REPOBASE" >&2
+	export REPOBASE="$BLACKBOX_REPOBASE"
+fi
+
+if [ -z "$BLACKBOXDATA" ] ; then
+  BLACKBOXDATA="${BLACKBOXDATA_CANDIDATES[0]}"
+  for candidate in ${BLACKBOXDATA_CANDIDATES[@]} ; do
+    if [ -d "$REPOBASE/$candidate" ] ; then
+      BLACKBOXDATA="$candidate"
+      break
+    fi
+  done
+fi
+
 KEYRINGDIR="$REPOBASE/$BLACKBOXDATA"
 BB_ADMINS_FILE="blackbox-admins.txt"
 BB_ADMINS="${KEYRINGDIR}/${BB_ADMINS_FILE}"
@@ -122,7 +143,7 @@ function fail_if_not_on_cryptlist() {
 
   if ! is_on_cryptlist "$name" ; then
     echo "ERROR: $name not found in $BB_FILES" >&2
-    echo "PWD=$(/bin/pwd)" >&2
+    echo "PWD=$(/usr/bin/env pwd)" >&2
     echo 'Exiting...' >&2
     exit 1
   fi
@@ -158,8 +179,23 @@ function get_encrypted_filename() {
 
 # Prepare keychain for use.
 function prepare_keychain() {
+  local keyringasc
   echo '========== Importing keychain: START' >&2
-  $GPG --import "$(get_pubring_path)" 2>&1 | egrep -v 'not changed$' >&2
+  # Works with gpg 2.0
+  #$GPG --import "$(get_pubring_path)" 2>&1 | egrep -v 'not changed$' >&2
+  # Works with gpg 2.0 and 2.1
+  # NB: We must export the keys to a format that can be imported.
+  make_self_deleting_tempfile keyringasc
+  export LANG="C.UTF-8"
+
+  #if gpg2 is installed next to gpg like on ubuntu 16
+  if [[ "$GPG" != "gpg2" ]]; then
+    $GPG --export --no-default-keyring --keyring "$(get_pubring_path)" >"$keyringasc"
+    $GPG --import "$keyringasc" 2>&1 | egrep -v 'not changed$' >&2
+  else
+    $GPG --keyring "$(get_pubring_path)" --export | $GPG --import
+  fi
+
   echo '========== Importing keychain: DONE' >&2
 }
 
@@ -177,7 +213,8 @@ function add_filename_to_cryptlist() {
   else
     echo "========== Adding file to list."
     touch "$BB_FILES"
-    sort -u -o "$BB_FILES" <(echo "$name") "$BB_FILES"
+    echo "$name" >> "$BB_FILES"
+    sort -u -o "$BB_FILES" "$BB_FILES"
   fi
 }
 
@@ -272,7 +309,11 @@ function shred_file() {
     #NOTE: srm by default uses 35-pass Gutmann algorithm
     CMD=srm
     OPT=-f
+  elif _F=$(mktemp); rm -P "${_F}" >/dev/null 2>/dev/null ; then
+    CMD=rm
+    OPT=-Pf
   else
+    echo "shred_file: WARNING: No secure deletion utility (shred or srm) present; using insecure rm" >&2
     CMD=rm
     OPT=-f
   fi
@@ -368,9 +409,15 @@ function file_contains_line() {
 function md5sum_file() {
   # Portably generate the MD5 hash of file $1.
   case $(uname -s) in
-    Darwin )
+    Darwin | FreeBSD )
       md5 -r "$1" | awk '{ print $1 }'
       ;;
+    NetBSD )
+      md5 -q "$1"
+      ;;
+    SunOS )
+      digest -a md5 "$1"
+      ;;
     Linux | CYGWIN* | MINGW* )
       md5sum "$1" | awk '{ print $1 }'
       ;;
@@ -385,11 +432,21 @@ function cp_permissions() {
   # Copy the perms of $1 onto $2 .. end.
   case $(uname -s) in
     Darwin )
-      chmod $( stat -f '%p' "$1" ) "${@:2}"
+      chmod $( stat -f '%Lp' "$1" ) "${@:2}"
       ;;
-    Linux | CYGWIN* | MINGW* )
-      chmod --reference "$1" "${@:2}"
+    FreeBSD | NetBSD )
+      chmod $( stat -f '%p' "$1" | sed -e "s/^100//" ) "${@:2}"
       ;;
+    SunOS )
+      chmod $( stat -c '%a' "$1" ) "${@:2}"
+      ;;
+    Linux | CYGWIN* | MINGW* | SunOS )
+      if [[ -e /etc/alpine-release ]]; then
+        chmod $( stat -c '%a' "$1" ) "${@:2}"
+      else
+        chmod --reference "$1" "${@:2}"
+      fi
+      ;; 
     * )
       echo 'ERROR: Unknown OS. Exiting. (cp_permissions)'
       exit 1
@@ -566,7 +623,7 @@ function vcs_ignore_git() {
 }
 # Subversion
 function vcs_ignore_svn() {
-  svn propset svn:ignore "$(vcs_relative_path "$file")"
+  svn propset svn:ignore "$file" "$(vcs_relative_path)"
 }
 # Perforce
 function vcs_ignore_p4() {
@@ -634,3 +691,20 @@ function vcs_notice_generic_file() {
     echo "WARNING:  If so, manually update the ignore file"
   fi
 }
+
+function gpg_agent_version_check() {
+  if ! hash 'gpg-agent' &> /dev/null; then
+    return 1
+  fi
+  local gpg_agent_version=$(gpg-agent --version | head -1 | awk '{ print $3 }' | tr -d '\n')
+  semverLT $gpg_agent_version "2.1.0"
+}
+
+function gpg_agent_notice() {
+  if [[ $(gpg_agent_version_check) == '0' && -z $GPG_AGENT_INFO ]];then
+    echo 'WARNING: You probably want to run gpg-agent as'
+    echo 'you will be asked for your passphrase many times.'
+    echo 'Example: $ eval $(gpg-agent --daemon)'
+    read -r -p 'Press CTRL-C now to stop. ENTER to continue: '
+  fi
+}

bin/_stack_lib.sh

@@ -53,11 +53,11 @@ function create_self_deleting_tempfile() {
   local filename
 
   case $(uname -s) in
-    Darwin )
-      : "${TMPDIR:=/tmp}"
+    Darwin | FreeBSD )
+      : "${TMPDIR:=/tmp}" ;
       filename=$(mktemp -t _stacklib_.XXXXXXXX )
       ;;
-    Linux | CYGWIN* | MINGW* )
+    Linux | CYGWIN* | MINGW* | NetBSD | SunOS )
       filename=$(mktemp)
       ;;
     * )
@@ -74,11 +74,11 @@ function create_self_deleting_tempdir() {
   local filename
 
   case $(uname -s) in
-    Darwin )
-      : "${TMPDIR:=/tmp}"
+    Darwin | FreeBSD )
+      : "${TMPDIR:=/tmp}" ;
       filename=$(mktemp -d -t _stacklib_.XXXXXXXX )
       ;;
-    Linux | CYGWIN* | MINGW* )
+    Linux | CYGWIN* | MINGW* | NetBSD | SunOS )
       filename=$(mktemp -d)
       ;;
     * )
@@ -98,11 +98,11 @@ function make_self_deleting_tempfile() {
   local name
 
   case $(uname -s) in
-    Darwin )
-      : "${TMPDIR:=/tmp}"
+    Darwin | FreeBSD )
+      : "${TMPDIR:=/tmp}" ;
       name=$(mktemp -t _stacklib_.XXXXXXXX )
       ;;
-    Linux | CYGWIN* | MINGW* )
+    Linux | CYGWIN* | MINGW* | NetBSD | SunOS )
       name=$(mktemp)
       ;;
     * )
@@ -120,11 +120,14 @@ function make_tempdir() {
   local name
 
   case $(uname -s) in
-    Darwin )
-      : "${TMPDIR:=/tmp}"
-      name=$(mktemp -d -t _stacklib_.XXXXXXXX )
+    Darwin | FreeBSD )
+      : "${TMPDIR:=/tmp}" ;
+      # The full path to the temp directory must be short.
+      # This is used by blackbox's testing suite to make a fake GNUPGHOME,
+      # which needs to fit within sockaddr_un.sun_path (see unix(7)).
+      name=$(mktemp -d -t SO )
       ;;
-    Linux | CYGWIN* | MINGW* )
+    Linux | CYGWIN* | MINGW* | NetBSD | SunOS )
       name=$(mktemp -d)
       ;;
     * )
@@ -157,14 +160,14 @@ function fail_if_not_running_as_root() {
 function fail_if_in_root_directory() {
   # Verify nobody has tricked us into being in "/".
   case $(uname -s) in
-    Darwin )
+    Darwin | FreeBSD | NetBSD )
       if [[ $(stat -f'%i' / ) == $(stat -f'%i' . ) ]] ; then
         echo 'SECURITY ALERT: The current directory is the root directory.'
         echo 'Exiting...'
         exit 1
       fi
       ;;
-    Linux | CYGWIN* | MINGW* )
+    Linux | CYGWIN* | MINGW* | SunOS )
       if [[ $(stat -c'%i' / ) == $(stat -c'%i' . ) ]] ; then
         echo 'SECURITY ALERT: The current directory is the root directory.'
         echo 'Exiting...'
@@ -177,3 +180,109 @@ function fail_if_in_root_directory() {
       ;;
   esac
 }
+
+function semverParseInto() {
+    local RE='[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)'
+    #MAJOR
+    eval $2=`echo $1 | sed -e "s#$RE#\1#"`
+    #MINOR
+    eval $3=`echo $1 | sed -e "s#$RE#\2#"`
+    #MINOR
+    eval $4=`echo $1 | sed -e "s#$RE#\3#"`
+    #SPECIAL
+    eval $5=`echo $1 | sed -e "s#$RE#\4#"`
+}
+
+function semverEQ() {
+    local MAJOR_A=0
+    local MINOR_A=0
+    local PATCH_A=0
+    local SPECIAL_A=0
+
+    local MAJOR_B=0
+    local MINOR_B=0
+    local PATCH_B=0
+    local SPECIAL_B=0
+
+    semverParseInto $1 MAJOR_A MINOR_A PATCH_A SPECIAL_A
+    semverParseInto $2 MAJOR_B MINOR_B PATCH_B SPECIAL_B
+
+    if [ $MAJOR_A -ne $MAJOR_B ]; then
+        return 1
+    fi
+
+    if [ $MINOR_A -ne $MINOR_B ]; then
+        return 1
+    fi
+
+    if [ $PATCH_A -ne $PATCH_B ]; then
+        return 1
+    fi
+
+    if [[ "_$SPECIAL_A" != "_$SPECIAL_B" ]]; then
+        return 1
+    fi
+
+
+    return 0
+
+}
+
+function semverLT() {
+    local MAJOR_A=0
+    local MINOR_A=0
+    local PATCH_A=0
+    local SPECIAL_A=0
+
+    local MAJOR_B=0
+    local MINOR_B=0
+    local PATCH_B=0
+    local SPECIAL_B=0
+
+    semverParseInto $1 MAJOR_A MINOR_A PATCH_A SPECIAL_A
+    semverParseInto $2 MAJOR_B MINOR_B PATCH_B SPECIAL_B
+
+    if [ $MAJOR_A -lt $MAJOR_B ]; then
+        return 0
+    fi
+
+    if [[ $MAJOR_A -le $MAJOR_B  && $MINOR_A -lt $MINOR_B ]]; then
+        return 0
+    fi
+
+    if [[ $MAJOR_A -le $MAJOR_B  && $MINOR_A -le $MINOR_B && $PATCH_A -lt $PATCH_B ]]; then
+        return 0
+    fi
+
+    if [[ "_$SPECIAL_A"  == "_" ]] && [[ "_$SPECIAL_B"  == "_" ]] ; then
+        return 1
+    fi
+    if [[ "_$SPECIAL_A"  == "_" ]] && [[ "_$SPECIAL_B"  != "_" ]] ; then
+        return 1
+    fi
+    if [[ "_$SPECIAL_A"  != "_" ]] && [[ "_$SPECIAL_B"  == "_" ]] ; then
+        return 0
+    fi
+
+    if [[ "_$SPECIAL_A" < "_$SPECIAL_B" ]]; then
+        return 0
+    fi
+
+    return 1
+
+}
+
+function semverGT() {
+    semverEQ $1 $2
+    local EQ=$?
+
+    semverLT $1 $2
+    local LT=$?
+
+    if [ $EQ -ne 0 ] && [ $LT -ne 0 ]; then
+        return 0
+    else
+        return 1
+    fi
+}
+

bin/blackbox_addadmin

@@ -19,7 +19,8 @@ KEYNAME="$1"
 # Add the email address to the BB_ADMINS file.  Remove any duplicates.
 # The file must exist for sort to act as we expect.
 touch "$BB_ADMINS"
-sort  -fdu -o "$BB_ADMINS" <(echo "$1") "$BB_ADMINS"
+echo "$1" >> "$BB_ADMINS"
+sort -fdu -o "$BB_ADMINS" "$BB_ADMINS"
 
 
 # Add the user's key to the keychain.

bin/blackbox_decrypt_all_files

@@ -14,9 +14,7 @@
 export PATH=/usr/bin:/bin:"$PATH"
 
 set -e
+source "${0%/*}/_blackbox_common.sh"
 
-if [[ -z $GPG_AGENT_INFO ]]; then
-  eval $(gpg-agent --daemon)
-fi
-
+gpg_agent_notice
 exec blackbox_postdeploy "$@"

bin/blackbox_decrypt_file

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+#
+# blackbox_decrypt_file -- Decrypt one or more blackbox files.
+#
+
+set -e
+source "${0%/*}/_blackbox_common.sh"
+
+if [ $# -eq 0 ]; then
+  echo >&2 "Please provide at least one file to decrypt"
+  exit 1
+fi
+
+"${BLACKBOX_HOME}/blackbox_edit_start" "$@"

bin/blackbox_deregister_file

@@ -29,7 +29,7 @@ vcs_remove "$encrypted_file"
 vcs_notice "$unencrypted_file"
 vcs_add "$BB_FILES" 
 
-vcs_commit "Removing from blackbox: ${unencrypted_file}" "$BB_FILES" "$encrypted_file"
+vcs_commit "Removing from blackbox: ${unencrypted_file}" "$BB_FILES" "$encrypted_file" "$(vcs_ignore_file_path)"
 echo "========== UPDATING VCS: DONE"
 echo "Local repo updated.  Please push when ready."
 echo "    $VCS_TYPE push"

bin/blackbox_diff

@@ -7,13 +7,7 @@
 set -e
 source "${0%/*}/_blackbox_common.sh"
 
-if [[ -z $GPG_AGENT_INFO ]]; then
-  echo 'WARNING: You probably want to run gpg-agent as'
-  echo 'you will be asked for your passphrase many times.'
-  echo 'Example: $ eval $(gpg-agent --daemon)'
-  read -r -p 'Press CTRL-C now to stop. ENTER to continue: '
-fi
-
+gpg_agent_notice
 prepare_keychain
 
 modified_files=()

bin/blackbox_edit_end

@@ -9,6 +9,11 @@ source "${0%/*}/_blackbox_common.sh"
 
 next_steps=()
 
+if [ $# -eq 0 ]; then
+  echo >&2 "Please provide at least one file for which editing has finished"
+  exit 1
+fi
+
 for param in "$@" ; do
 
   unencrypted_file=$(get_unencrypted_filename "$param")

bin/blackbox_edit_start

@@ -7,6 +7,11 @@
 set -e
 source "${0%/*}/_blackbox_common.sh"
 
+if [ $# -eq 0 ]; then
+  echo >&2 "Please provide at least one file to start editing"
+  exit 1
+fi
+
 for param in "$@" ; do
 
   unencrypted_file=$(get_unencrypted_filename "$param")

bin/blackbox_initialize

@@ -19,10 +19,15 @@ if [[ $1 != 'yes' ]]; then
   fi
 fi
 
+if [[ $VCS_TYPE = "unknown" ]]; then
+	echo 'Not in a known VCS directory'
+	exit 1
+fi
+
 change_to_vcs_root
 
 echo VCS_TYPE: $VCS_TYPE
-vcs_ignore keyrings/live/pubring.gpg~ keyrings/live/pubring.kbx~ keyrings/live/secring.gpg
+vcs_ignore "${BLACKBOXDATA}/pubring.gpg~" "${BLACKBOXDATA}/pubring.kbx~" "${BLACKBOXDATA}/secring.gpg"
 
 # Make directories
 mkdir -p "${KEYRINGDIR}"
@@ -30,11 +35,29 @@ vcs_add "${KEYRINGDIR}"
 touch "$BLACKBOXDATA/$BB_ADMINS_FILE" "$BLACKBOXDATA/$BB_FILES_FILE"
 vcs_add "$BLACKBOXDATA/$BB_ADMINS_FILE" "$BLACKBOXDATA/$BB_FILES_FILE"
 
-IGNOREFILE="$(vcs_ignore_file_path)"
-test -f "$IGNOREFILE" && vcs_add "$IGNOREFILE"
+if [[ $VCS_TYPE = "git" ]]; then
 
-# Make a suggestion:
-echo
-echo
-echo 'NEXT STEP: You need to manually check these in:'
-echo '     ' $VCS_TYPE commit -m\'INITIALIZE BLACKBOX\' keyrings "$IGNOREFILE"
+  # Set .gitattributes so that Windows users don't break the admin files.
+  FILE="$BLACKBOXDATA/.gitattributes"
+  touch "$FILE"
+  LINE='blackbox-admins.txt text eol=lf'
+  grep -qF "$LINE" "$FILE" || echo "$LINE" >> "$FILE"
+  LINE='blackbox-files.txt text eol=lf'
+  grep -qF "$LINE" "$FILE" || echo "$LINE" >> "$FILE"
+  vcs_add "$FILE"
+fi
+
+if [[ $VCS_TYPE = "svn" ]]; then
+	echo
+	echo
+	echo '`subversion` automatically tracks the ignored files; you just need to commit.'
+else
+	IGNOREFILE="$(vcs_ignore_file_path)"
+	test -f "$IGNOREFILE" && vcs_add "$IGNOREFILE"
+
+	# Make a suggestion:
+	echo
+	echo
+	echo 'NEXT STEP: You need to manually check these in:'
+	echo '     ' $VCS_TYPE commit -m\'INITIALIZE BLACKBOX\' "$BLACKBOXDATA" "$IGNOREFILE"
+fi

bin/blackbox_list_admins

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+#
+# blackbox_list_admins -- List authorized admins
+#
+set -e
+source "${0%/*}/_blackbox_common.sh"
+cat "$BB_ADMINS"

bin/blackbox_listadmins

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+#
+# blackbox_listadmins -- List active admins for keyring
+#
+
+# Example:
+#    blackbox_listadmins
+#
+
+set -e
+source "${0%/*}/_blackbox_common.sh"
+
+fail_if_not_in_repo
+
+
+# simply display the contents of the admins file
+cat "$BB_ADMINS"

bin/blackbox_register_new_file

@@ -29,6 +29,7 @@ function register_new_file() {
   prepare_keychain
   encrypt_file "$unencrypted_file" "$encrypted_file"
   add_filename_to_cryptlist "$unencrypted_file"
+  vcs_ignore "$unencrypted_file"
 
   # Is the unencrypted file already in HG? (ie. are we correcting a bad situation)
   SECRETSEXPOSED=$(is_in_vcs "${unencrypted_file}")
@@ -36,15 +37,14 @@ function register_new_file() {
   echo "========== UPDATING REPO:"
   shred_file "$unencrypted_file"
 
-  if "$SECRETSEXPOSED" ; then
+  if [[ "$SECRETSEXPOSED" == "true" ]] ; then
     vcs_remove "$unencrypted_file"
     vcs_add "$encrypted_file"
   fi
 
-  vcs_ignore "$unencrypted_file"
   echo 'NOTE: "already tracked!" messages are safe to ignore.'
   vcs_add "$BB_FILES" "$encrypted_file"
-  vcs_commit "registered in blackbox: ${unencrypted_file}" "$BB_FILES" "$encrypted_file"
+  vcs_commit "registered in blackbox: ${unencrypted_file}" "$BB_FILES" "$encrypted_file" "$(vcs_ignore_file_path)"
 }
 
 for target in "$@"; do
@@ -52,5 +52,9 @@ for target in "$@"; do
 done
 
 echo "========== UPDATING VCS: DONE"
-echo "Local repo updated.  Please push when ready."
-echo "    $VCS_TYPE push"
+if [[ $VCS_TYPE = "svn" ]]; then
+	echo "Local repo updated and file pushed to source control (unless an error was displayed)."
+else
+	echo "Local repo updated.  Please push when ready."
+	echo "    $VCS_TYPE push"
+fi

bin/blackbox_removeadmin

@@ -20,8 +20,15 @@ KEYNAME="$1"
 # Remove the email address from the BB_ADMINS file.
 remove_line "$BB_ADMINS" "$KEYNAME"
 
+
+# remove the admin key from the pubring
+$GPG --no-permission-warning --homedir="$KEYRINGDIR" --batch --yes --delete-key "$KEYNAME" || true
+pubring_path=$(get_pubring_path)
+vcs_add "$pubring_path" "$KEYRINGDIR/trustdb.gpg" "$BB_ADMINS"
+
+
 # Make a suggestion:
 echo
 echo
 echo 'NEXT STEP: Check these into the repo.  Probably with a command like...'
-echo $VCS_TYPE commit -m\'REMOVED ADMIN: $KEYNAME\' "$BLACKBOXDATA/$BB_ADMINS_FILE"
+echo $VCS_TYPE commit -m\'REMOVED ADMIN: $KEYNAME\' "$BLACKBOXDATA/$(basename ${pubring_path})" "$BLACKBOXDATA/trustdb.gpg" "$BLACKBOXDATA/$BB_ADMINS_FILE"

bin/blackbox_shred_all_files

@@ -21,13 +21,30 @@ source "${0%/*}/_blackbox_common.sh"
 change_to_vcs_root
 
 echo '========== FILES BEING SHREDDED:'
-while IFS= read <&99 -r unencrypted_file; do
-  unencrypted_file=$(get_unencrypted_filename "$unencrypted_file")
-  encrypted_file=$(get_encrypted_filename "$unencrypted_file")
+
+exported_internal_shred_file() {
+  source "$1/_blackbox_common.sh"
+  #unencrypted_file=$(get_unencrypted_filename "$2")
+  unencrypted_file="$2"
   if [[ -f "$unencrypted_file" ]]; then
-    echo "    $unencrypted_file"
+    echo "    SHRED: $unencrypted_file"
     shred_file "$unencrypted_file"
+  else
+    echo "NOT FOUND: $unencrypted_file"
   fi
-done 99<"$BB_FILES"
+}
+
+export -f exported_internal_shred_file
+
+DEREFERENCED_BIN_DIR="${0%/*}"
+MAX_PARALLEL_SHRED=10
+
+bash_args=
+if bash --help | grep import-functions >/dev/null 2>/dev/null; then
+  bash_args=--import-functions
+fi
+
+export IFS=
+tr '\n' '\0' <"$BB_FILES" | xargs -0 -I{} -P $MAX_PARALLEL_SHRED bash $bash_args -c "exported_internal_shred_file $DEREFERENCED_BIN_DIR \"{}\"" $DEREFERENCED_BIN_DIR/fake
 
 echo '========== DONE.'

bin/blackbox_update_all_files

@@ -7,13 +7,7 @@
 set -e
 source "${0%/*}/_blackbox_common.sh"
 
-if [[ -z $GPG_AGENT_INFO ]]; then
-  echo 'WARNING: You probably want to run gpg-agent as'
-  echo 'you will be asked for your passphrase many times.'
-  echo 'Example: $ eval $(gpg-agent --daemon)'
-  read -r -p 'Press CTRL-C now to stop. ENTER to continue: '
-fi
-
+gpg_agent_notice
 disclose_admins
 prepare_keychain
 

bin/blackbox_view

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+#
+# blackbox_view -- Decrypt a file, view it, shred it
+#
+set -e
+source "${0%/*}/_blackbox_common.sh"
+
+for param in "$@" ; do
+  shreddable=0
+  unencrypted_file=$(get_unencrypted_filename "$param")
+  if [[ ! -e "$unencrypted_file" ]]; then
+    "${BLACKBOX_HOME}/blackbox_edit_start" "$param"
+    shreddable=1
+  fi
+  ${PAGER:-less} "$unencrypted_file"
+  if [[ $shreddable = 1 ]]; then
+    shred_file "$unencrypted_file"
+  fi
+done

bin/blackbox_whatsnew

@@ -14,13 +14,7 @@ then
 fi
 
 fail_if_not_in_repo
-
-if [[ -z $GPG_AGENT_INFO ]]; then
-  echo 'WARNING: You probably want to run gpg-agent as'
-  echo 'you will be asked for your passphrase many times.'
-  echo 'Example: $ eval $(gpg-agent --daemon)'
-  read -r -p 'Press CTRL-C now to stop. ENTER to continue: '
-fi
+gpg_agent_notice
 
 COLUMNS=`tput cols`
 FILE=$1

binv2/blackbox_addadmin

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+exec blackbox admin add "$@"

binv2/blackbox_cat

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+exec blackbox cat "$@"

binv2/blackbox_decrypt_all_files

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+exec blackbox decrypt --all --agentcheck=true --overwrite "@"

binv2/blackbox_decrypt_file

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+exec blackbox decrypt --overwrite "$@"

binv2/blackbox_deregister_file

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+exec blackbox file remove --safe "$@"

binv2/blackbox_diff

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+exec blackbox diff --diff "$@"

binv2/blackbox_edit

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+exec blackbox edit "$@"

binv2/blackbox_edit_end

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+exec blackbox encrypt --shred "$@"

binv2/blackbox_edit_start

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+exec blackbox decrypt "$@"

binv2/blackbox_initialize

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+exec blackbox init "$@"

binv2/blackbox_list_admins

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+exec blackbox admin list

binv2/blackbox_list_files

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+exec blackbox file list

binv2/blackbox_listadmins

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+exec blackbox admin list

binv2/blackbox_postdeploy

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+blackbox decrypt --all --overwrite --group "$1"

binv2/blackbox_register_new_file

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+exec blackbox file add --shred "$@"

binv2/blackbox_removeadmin

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+exec blackbox admin remove "$@"

binv2/blackbox_shred_all_files

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+exec blackbox shred --all

binv2/blackbox_update_all_files

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+exec blackbox reencrypt --all --agentcheck

binv2/blackbox_view

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+blackbox cat "$@" | ${PAGER:-less}

binv2/blackbox_whatsnew

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+
+#
+# blackbox_whatsnew - show what has changed in the last commit for a given file
+#
+exec blackbox whatsnew "$@"
+exit 0
+
+set -e
+source "${0%/*}/_blackbox_common.sh"
+
+if [[ $# -ne 1 ]]
+then
+  echo "Pass only 1 file at a time"
+  exit 1
+fi
+
+fail_if_not_in_repo
+gpg_agent_notice
+
+COLUMNS=`tput cols`
+FILE=$1
+GIT="git log --abbrev-commit --pretty=oneline"
+CURR_COMMIT=`$GIT                  $FILE | head -1 | awk '{print $1}'`
+PREV_COMMIT=`$GIT ${CURR_COMMIT}~1 $FILE | head -1 | awk '{print $1}'`
+# Use colordiff if available
+if which colordiff > /dev/null 2>&1
+  then DIFF="colordiff"
+  else DIFF="diff"
+fi
+
+cat_commit()
+{
+  COMMIT=$1
+  git checkout $COMMIT $FILE
+  echo "[$COMMIT] $FILE"
+  echo "---------------------"
+  "${BLACKBOX_HOME}/blackbox_cat" $FILE | sed '/========== PLAINFILE/,/========== EXTRACTING/d'
+}
+
+CURR_CONTENT=`cat_commit $CURR_COMMIT`
+PREV_CONTENT=`cat_commit $PREV_COMMIT`
+clear
+
+# For some unknown reason this command executes fine but return exit code 1
+$DIFF -y --width $COLUMNS \
+  <(echo "CURRENT"  "$CURR_CONTENT" | fold -w $(( $COLUMNS / 2 - 4 ))  ) \
+  <(echo "PREVIOUS" "$PREV_CONTENT" | fold -w $(( $COLUMNS / 2 - 4 ))  )
+
+git checkout $CURR_COMMIT $FILE
+echo

blackbox.plugin.zsh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/usr/bin/env zsh
 # The MIT License (MIT)
 
 # Copyright (c) 2014 Stack Exchange, Inc.

build/build.go

@@ -0,0 +1,75 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"log"
+	"os"
+	"os/exec"
+	"strings"
+	"time"
+)
+
+var sha = flag.String("sha", "", "SHA of current commit")
+
+var goos = flag.String("os", "", "OS to build (linux, windows, or darwin) Defaults to all.")
+
+func main() {
+	flag.Parse()
+	flags := fmt.Sprintf(`-s -w -X main.SHA="%s" -X main.BuildTime=%d`, getVersion(), time.Now().Unix())
+	pkg := "github.com/StackExchange/blackbox/v2/cmd/blackbox"
+
+	build := func(out, goos string) {
+		log.Printf("Building %s", out)
+		cmd := exec.Command("go", "build", "-o", out, "-ldflags", flags, pkg)
+		os.Setenv("GOOS", goos)
+		os.Setenv("GO111MODULE", "on")
+		cmd.Stderr = os.Stderr
+		cmd.Stdout = os.Stdout
+		err := cmd.Run()
+		if err != nil {
+			log.Fatal(err)
+		}
+	}
+
+	for _, env := range []struct {
+		binary, goos string
+	}{
+		{"blackbox-Linux", "linux"},
+		{"blackbox.exe", "windows"},
+		{"blackbox-Darwin", "darwin"},
+	} {
+		if *goos == "" || *goos == env.goos {
+			build(env.binary, env.goos)
+		}
+	}
+}
+
+func getVersion() string {
+	if *sha != "" {
+		return *sha
+	}
+	// check teamcity build version
+	if v := os.Getenv("BUILD_VCS_NUMBER"); v != "" {
+		return v
+	}
+	// check git
+	cmd := exec.Command("git", "rev-parse", "HEAD")
+	v, err := cmd.CombinedOutput()
+	if err != nil {
+		return ""
+	}
+	ver := strings.TrimSpace(string(v))
+	// see if dirty
+	cmd = exec.Command("git", "diff-index", "--quiet", "HEAD", "--")
+	err = cmd.Run()
+	// exit status 1 indicates dirty tree
+	if err != nil {
+		if err.Error() == "exit status 1" {
+			ver += "[dirty]"
+		} else {
+			log.Printf("!%s!", err.Error())
+		}
+	}
+	return ver
+}

cmd/blackbox/blackbox.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	_ "github.com/StackExchange/blackbox/v2/pkg/crypters"
+	_ "github.com/StackExchange/blackbox/v2/pkg/crypters/_all"
+	_ "github.com/StackExchange/blackbox/v2/pkg/vcs"
+	_ "github.com/StackExchange/blackbox/v2/pkg/vcs/_all"
+)
+
+var dryRun bool
+
+func main() {
+	app := flags()
+	err := app.Run(os.Args)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "ERROR: %s\n", err)
+		os.Exit(1)
+	}
+}

cmd/blackbox/cli.go

@@ -0,0 +1,227 @@
+package main
+
+// cli.go -- Create urfave/cli datastructures and apply them.
+
+import (
+	"fmt"
+
+	"github.com/urfave/cli/v2"
+
+	"github.com/StackExchange/blackbox/v2/pkg/bbutil"
+)
+
+func flags() *cli.App {
+	app := cli.NewApp()
+	app.Version = "2.0.0"
+	app.Usage = "Maintain encrypted files in a VCS (Git, Hg, Svn)"
+
+	defUmask := bbutil.Umask(0)
+	bbutil.Umask(defUmask)
+	defUmaskS := fmt.Sprintf("%04o", defUmask)
+
+	app.Flags = []cli.Flag{
+		//		&cli.BoolFlag{
+		//			Name:        "dry-run",
+		//			Aliases:     []string{"n"},
+		//			Usage:       "show what would have been done",
+		//			Destination: &dryRun,
+		//		},
+		&cli.StringFlag{
+			Name:    "vcs",
+			Usage:   "Use this VCS (GIT, NONE) rather than autodetect",
+			EnvVars: []string{"BLACKBOX_VCS"},
+		},
+		&cli.StringFlag{
+			Name:    "crypto",
+			Usage:   "Crypto back-end plugin",
+			Value:   "GnuPG",
+			EnvVars: []string{"BLACKBOX_CRYPTO"},
+		},
+		&cli.StringFlag{
+			Name:  "config",
+			Usage: "Path to config",
+			//Value:   ".blackbox",
+			EnvVars: []string{"BLACKBOX_CONFIGDIR", "BLACKBOXDATA"},
+		},
+		&cli.StringFlag{
+			Name:    "team",
+			Usage:   "Use .blackbox-$TEAM as the configdir",
+			EnvVars: []string{"BLACKBOX_TEAM"},
+		},
+		&cli.StringFlag{
+			Name:    "editor",
+			Usage:   "editor to use",
+			Value:   "vi",
+			EnvVars: []string{"EDITOR", "BLACKBOX_EDITOR"},
+		},
+		&cli.StringFlag{
+			Name:    "umask",
+			Usage:   "umask to set when decrypting",
+			Value:   defUmaskS,
+			EnvVars: []string{"BLACKBOX_UMASK", "DECRYPT_UMASK"},
+		},
+		&cli.BoolFlag{
+			Name:    "debug",
+			Usage:   "Show debug output",
+			EnvVars: []string{"BLACKBOX_DEBUG"},
+		},
+	}
+
+	app.Commands = []*cli.Command{
+
+		// List items in the order they appear in the help menu.
+
+		{
+			Name:    "decrypt",
+			Aliases: []string{"de", "start"},
+			Usage:   "Decrypt file(s)",
+			Flags: []cli.Flag{
+				&cli.BoolFlag{Name: "all", Usage: "All registered files"},
+				&cli.BoolFlag{Name: "agentcheck", Usage: "Do not check for gpg-agent when using --all"},
+				&cli.StringFlag{Name: "group", Usage: "Set group ownership"},
+				&cli.BoolFlag{Name: "overwrite", Usage: "Overwrite plaintext if it exists"},
+			},
+			Action: func(c *cli.Context) error { return cmdDecrypt(c) },
+		},
+
+		{
+			Name:    "encrypt",
+			Aliases: []string{"en", "end"},
+			Usage:   "Encrypts file(s)",
+			Flags: []cli.Flag{
+				&cli.BoolFlag{Name: "shred", Usage: "Remove plaintext afterwards"},
+			},
+			Action: func(c *cli.Context) error { return cmdEncrypt(c) },
+		},
+
+		{
+			Name:    "edit",
+			Aliases: []string{"vi"},
+			Usage:   "Runs $EDITOR on file(s) (decrypt if needed)",
+			Action:  func(c *cli.Context) error { return cmdEdit(c) },
+		},
+
+		{
+			Name:   "cat",
+			Usage:  "Output plaintext to stderr (decrypt if needed)",
+			Action: func(c *cli.Context) error { return cmdCat(c) },
+		},
+
+		{
+			Name:  "diff",
+			Usage: "Diffs against encrypted version",
+			Flags: []cli.Flag{
+				&cli.BoolFlag{Name: "all", Usage: "all files"},
+			},
+			Action: func(c *cli.Context) error { return cmdDiff(c) },
+		},
+
+		{
+			Name:     "init",
+			Category: "ADMINISTRATIVE",
+			Usage:    "Initialized blackbox for this repo",
+			Action:   func(c *cli.Context) error { return cmdInit(c) },
+		},
+
+		{
+			Name:     "admin",
+			Category: "ADMINISTRATIVE",
+			Usage:    "Add/list/remove administrators",
+			Subcommands: []*cli.Command{
+				{
+					Name:   "add",
+					Usage:  "Adds admin(s)",
+					Action: func(c *cli.Context) error { return cmdAdminAdd(c) },
+				},
+				{
+					Name:   "list",
+					Usage:  "Lists admins",
+					Action: func(c *cli.Context) error { return cmdAdminList(c) },
+				},
+				{
+					Name:   "remove",
+					Usage:  "Remove admin(s)",
+					Action: func(c *cli.Context) error { return cmdAdminRemove(c) },
+				},
+			},
+		},
+
+		{
+			Name:     "file",
+			Category: "ADMINISTRATIVE",
+			Usage:    "Add/list/remove files from the registry",
+			Subcommands: []*cli.Command{
+				{
+					Name:  "add",
+					Usage: "Registers file with the system",
+					Flags: []cli.Flag{
+						&cli.BoolFlag{Name: "shred", Usage: "Remove plaintext afterwords"},
+					},
+					Action: func(c *cli.Context) error { return cmdFileAdd(c) },
+				},
+				{
+					Name:   "list",
+					Usage:  "Lists the registered files",
+					Action: func(c *cli.Context) error { return cmdFileList(c) },
+				},
+				{
+					Name:   "remove",
+					Usage:  "Deregister file from the system",
+					Action: func(c *cli.Context) error { return cmdFileRemove(c) },
+				},
+			},
+		},
+
+		{
+			Name:     "info",
+			Category: "DEBUG",
+			Usage:    "Report what we know about this repo",
+			Action:   func(c *cli.Context) error { return cmdInfo(c) },
+		},
+
+		{
+			Name:  "shred",
+			Usage: "Shred files, or --all for all registered files",
+			Flags: []cli.Flag{
+				&cli.BoolFlag{Name: "all", Usage: "All registered files"},
+			},
+			Action: func(c *cli.Context) error { return cmdShred(c) },
+		},
+
+		{
+			Name:     "status",
+			Category: "ADMINISTRATIVE",
+			Usage:    "Print status of files",
+			Flags: []cli.Flag{
+				&cli.BoolFlag{Name: "name-only", Usage: "Show only names of the files"},
+				&cli.BoolFlag{Name: "all", Usage: "All registered files"},
+				&cli.StringFlag{Name: "type", Usage: "only list if status matching this string"},
+			},
+			Action: func(c *cli.Context) error { return cmdStatus(c) },
+		},
+
+		{
+			Name:     "reencrypt",
+			Usage:    "Decrypt then re-encrypt files (erases any plaintext)",
+			Category: "ADMINISTRATIVE",
+			Flags: []cli.Flag{
+				&cli.BoolFlag{Name: "all", Usage: "All registered files"},
+				&cli.BoolFlag{Name: "overwrite", Usage: "Overwrite plaintext if it exists"},
+				&cli.BoolFlag{Name: "agentcheck", Usage: "Do not check for gpg-agent when using --all"},
+			},
+			Action: func(c *cli.Context) error { return cmdReencrypt(c) },
+		},
+
+		{
+			Name:     "testing_init",
+			Usage:    "For use with integration test",
+			Category: "INTEGRATION TEST",
+			Action:   func(c *cli.Context) error { return testingInit(c) },
+		},
+
+		//
+
+	}
+
+	return app
+}

cmd/blackbox/drive.go

@@ -0,0 +1,296 @@
+package main
+
+// Now that cli.go has processed the flags, validate there are no
+// conflicts and drive to the business logic.
+
+import (
+	"fmt"
+	"log"
+	"os"
+
+	"github.com/StackExchange/blackbox/v2/pkg/bblog"
+	"github.com/StackExchange/blackbox/v2/pkg/box"
+	"github.com/urfave/cli/v2"
+)
+
+var logErr *log.Logger
+
+func init() {
+	if logErr == nil {
+		logErr = log.New(os.Stderr, "", 0)
+	}
+}
+
+func allOrSomeFiles(c *cli.Context) error {
+	if c.Bool("all") && c.Args().Present() {
+		return fmt.Errorf("Can not specify filenames and --all")
+	}
+	if (!c.Args().Present()) && (!c.Bool("all")) {
+		return fmt.Errorf("Must specify at least one file name or --all")
+	}
+	return nil
+}
+
+const roError = `This command is disabled due to --config flag being used.
+We can not determine if the flag's value is in or out of the repo, and
+Blackbox can only work on one repo at a time. If the value is inside the
+repo, and you'd like to suggest an algorithm that would let us determine that
+automatically, please file a bug. We'd love to have this work better. In the
+meanwhile, run this command without the --config flag, perhaps after cd'ing
+to the base of the repo.`
+
+// Keep these functions in alphabetical order.
+
+func cmdAdminAdd(c *cli.Context) error {
+	if c.NArg() == 0 || c.NArg() > 2 {
+		return fmt.Errorf(
+			"Must specify one admin's GnuPG user-id (i.e. email address) and optionally the directory of the pubkey data (default ~/.GnuPG)")
+	}
+	bx := box.NewFromFlags(c)
+	if bx.ConfigRO {
+		return fmt.Errorf(roError)
+	}
+	err := bx.AdminAdd(c.Args().Get(0), c.Args().Get(1))
+	if err != nil {
+		return err
+	}
+	return bx.Vcs.FlushCommits()
+}
+
+func cmdAdminList(c *cli.Context) error {
+	if c.Args().Present() {
+		return fmt.Errorf("This command takes zero arguments")
+	}
+	bx := box.NewFromFlags(c)
+	err := bx.AdminList()
+	if err != nil {
+		return err
+	}
+	return bx.Vcs.FlushCommits()
+}
+
+func cmdAdminRemove(c *cli.Context) error {
+	if !c.Args().Present() {
+		return fmt.Errorf("Must specify at least one admin's GnuPG user-id (i.e. email address)")
+	}
+	bx := box.NewFromFlags(c)
+	if bx.ConfigRO {
+		return fmt.Errorf(roError)
+	}
+	err := bx.AdminRemove(c.Args().Slice())
+	if err != nil {
+		return err
+	}
+	return bx.Vcs.FlushCommits()
+}
+
+func cmdCat(c *cli.Context) error {
+	if !c.Args().Present() {
+		return fmt.Errorf("Must specify at least one file name")
+	}
+	bx := box.NewFromFlags(c)
+	err := bx.Cat(c.Args().Slice())
+	if err != nil {
+		return err
+	}
+	return bx.Vcs.FlushCommits()
+}
+
+func cmdDecrypt(c *cli.Context) error {
+	if err := allOrSomeFiles(c); err != nil {
+		return err
+	}
+
+	// The default for --agentcheck is off normally, and on when using --all.
+	pauseNeeded := c.Bool("all")
+	// If the user used the flag, abide by it.
+	if c.IsSet("agentcheck") {
+		pauseNeeded = c.Bool("agentcheck")
+	}
+
+	bx := box.NewFromFlags(c)
+	err := bx.Decrypt(c.Args().Slice(),
+		c.Bool("overwrite"),
+		pauseNeeded,
+		c.String("group"),
+	)
+	if err != nil {
+		return err
+	}
+	return bx.Vcs.FlushCommits()
+}
+
+func cmdDiff(c *cli.Context) error {
+	if err := allOrSomeFiles(c); err != nil {
+		return err
+	}
+	bx := box.NewFromFlags(c)
+	err := bx.Diff(c.Args().Slice())
+	if err != nil {
+		return err
+	}
+	return bx.Vcs.FlushCommits()
+}
+
+func cmdEdit(c *cli.Context) error {
+	if !c.Args().Present() {
+		return fmt.Errorf("Must specify at least one file name")
+	}
+	bx := box.NewFromFlags(c)
+	err := bx.Edit(c.Args().Slice())
+	if err != nil {
+		return err
+	}
+	return bx.Vcs.FlushCommits()
+}
+
+func cmdEncrypt(c *cli.Context) error {
+	if err := allOrSomeFiles(c); err != nil {
+		return err
+	}
+	bx := box.NewFromFlags(c)
+	err := bx.Encrypt(c.Args().Slice(), c.Bool("shred"))
+	if err != nil {
+		return err
+	}
+	return bx.Vcs.FlushCommits()
+}
+
+func cmdFileAdd(c *cli.Context) error {
+	if !c.Args().Present() {
+		return fmt.Errorf("Must specify at least one file name")
+	}
+	bx := box.NewFromFlags(c)
+	if bx.ConfigRO {
+		return fmt.Errorf(roError)
+	}
+	err := bx.FileAdd(c.Args().Slice(), c.Bool("shred"))
+	if err != nil {
+		return err
+	}
+	return bx.Vcs.FlushCommits()
+}
+
+func cmdFileList(c *cli.Context) error {
+	if c.Args().Present() {
+		return fmt.Errorf("This command takes zero arguments")
+	}
+	bx := box.NewFromFlags(c)
+	err := bx.FileList()
+	if err != nil {
+		return err
+	}
+	return bx.Vcs.FlushCommits()
+}
+
+func cmdFileRemove(c *cli.Context) error {
+	if !c.Args().Present() {
+		return fmt.Errorf("Must specify at least one file name")
+	}
+	bx := box.NewFromFlags(c)
+	if bx.ConfigRO {
+		return fmt.Errorf(roError)
+	}
+	err := bx.FileRemove(c.Args().Slice())
+	if err != nil {
+		return err
+	}
+	return bx.Vcs.FlushCommits()
+}
+
+func cmdInfo(c *cli.Context) error {
+	if c.Args().Present() {
+		return fmt.Errorf("This command takes zero arguments")
+	}
+	bx := box.NewFromFlags(c)
+	err := bx.Info()
+	if err != nil {
+		return err
+	}
+	return bx.Vcs.FlushCommits()
+}
+
+func cmdInit(c *cli.Context) error {
+	if c.Args().Len() > 1 {
+		return fmt.Errorf("This command takes one or two arguments")
+	}
+	bx := box.NewUninitialized(c)
+	if bx.ConfigRO {
+		return fmt.Errorf(roError)
+	}
+	err := bx.Init(c.Args().First(), c.String("vcs"))
+	if err != nil {
+		return err
+	}
+	return bx.Vcs.FlushCommits()
+}
+
+func cmdReencrypt(c *cli.Context) error {
+	if err := allOrSomeFiles(c); err != nil {
+		return err
+	}
+
+	// The default for --agentcheck is off normally, and on when using --all.
+	pauseNeeded := c.Bool("all")
+	// If the user used the flag, abide by it.
+	if c.IsSet("agentcheck") {
+		pauseNeeded = c.Bool("agentcheck")
+	}
+
+	bx := box.NewFromFlags(c)
+	err := bx.Reencrypt(c.Args().Slice(),
+		c.Bool("overwrite"),
+		pauseNeeded,
+	)
+	if err != nil {
+		return err
+	}
+	return bx.Vcs.FlushCommits()
+}
+
+func cmdShred(c *cli.Context) error {
+	if err := allOrSomeFiles(c); err != nil {
+		return err
+	}
+	bx := box.NewFromFlags(c)
+	err := bx.Shred(c.Args().Slice())
+	if err != nil {
+		return err
+	}
+	return bx.Vcs.FlushCommits()
+}
+
+func cmdStatus(c *cli.Context) error {
+	if c.Bool("all") && c.Args().Present() {
+		return fmt.Errorf("Can not specify filenames and --all")
+	}
+	bx := box.NewFromFlags(c)
+	err := bx.Status(c.Args().Slice(), c.Bool("name-only"), c.String("type"))
+	if err != nil {
+		return err
+	}
+	return bx.Vcs.FlushCommits()
+}
+
+// These are "secret" commands used by the integration tests.
+
+func testingInit(c *cli.Context) error {
+	if c.Args().Present() {
+		return fmt.Errorf("No args required")
+	}
+
+	logDebug := bblog.GetDebug(c.Bool("debug"))
+	logDebug.Printf(
+		"c.String(vcs) reports %q\n",
+		c.String("vcs"),
+	)
+	bx := box.NewForTestingInit(c.String("vcs"))
+	if bx.ConfigRO {
+		return fmt.Errorf(roError)
+	}
+	err := bx.TestingInitRepo()
+	if err != nil {
+		return err
+	}
+	return bx.Vcs.FlushCommits()
+}

docs/README.md

@@ -0,0 +1,61 @@
+BlackBox
+========
+
+Blackbox is an open source tool that enables you to safe store sensitive information in
+Git (or other) repos by encrypting them with GPG.  Only the encrypted
+version of the file is available.  You can be free to provide access
+to the repo, as but only people with the right GPG keys can access the
+encrypted data.
+
+Things you should **never** store in a repo without encryption:
+
+* TLS (SSL) certificates
+* Passwords
+* API keys
+* And more!
+
+Project Info:
+
+* [Overview](user-overview.md)
+* [Why is this important?](why-is-this-important.md)
+* [Support/Community](support.md)
+* [How BB encrypts](encryption.md)
+* [OS Compatibility](compatibility.md)
+* [Installation Instructions](installation.md)
+* [Alternatives](alternatives.md)
+
+User Info:
+
+* [Enabling Blackbox on a Repo](enable-repo.md)
+* [Enroll a file](enable-repo.md)
+* [Full Command List](full-command-list.md)
+* [Add/Remove users](admin-ops.md)
+* [Add/Remove files](file-ops.md)
+* [Advanced techiques](advanced.md)
+* [Use with Role Accounts](role-accounts.md)
+* [Backwards Compatibility](backwards-compatibility.md)
+* [Replacing expired keys](expired-keys.md)
+* [Git Tips](git-tips.md)
+* [SubVersion Tips](subversion-tips.md)
+* [GnuPG tips](gnupg-tips.md)
+* [Use with Ansible](with-ansible.md)
+* [Use with Puppet](with-puppet.md)
+
+For contributors:
+
+* [Developer Info](dev.md)
+* [Code overview](dev-code-overview.md)
+* [HOWTO: Add new OS support](dev-add-os-support.md)
+* [HOWTO: Add new VCS support](dev-add-vcs-support.md)
+
+
+A slide presentation about an older release [is on SlideShare](http://www.slideshare.net/TomLimoncelli/the-blackbox-project-sfae).
+
+Join our mailing list: [https://groups.google.com/d/forum/blackbox-project](https://groups.google.com/d/forum/blackbox-project)
+
+
+License
+=======
+
+This content is released under the MIT License.
+See the [LICENSE.txt](LICENSE.txt) file.

docs/admin-ops.md

@@ -0,0 +1,148 @@
+User Management
+===============
+
+
+# Who are the current admins?
+
+```
+blackbox admin list
+```
+
+
+# Add a new user (admin)
+
+FYI: Your repo may use `keyrings/live` instead of `.blackbox`. See "Where is the configuration stored?"
+
+`.blackbox/blackbox-admins.txt` is a file that lists which users are able to decrypt files. (More pedantically, it is a list of the GnuPG key names that the file is encrypted for.)
+
+To join the list of people that can edit the file requires three steps; You create a GPG key and add it to the key ring. Then, someone that already has access adds you to the system. Lastly, you should test your access.
+
+## Step 1: NEWPERSON creates a GPG key pair on a secure machine and add to public keychain.
+
+If you don't already have a GPG key, here's how to generate one:
+
+```
+gpg --gen-key
+```
+
+WARNING: New versions of GPG generate keys which are not understood by
+old versions of GPG.  If you generate a key with a new version of GPG,
+this will cause problems for users of older versions of GPG.
+Therefore it is recommended that you either assure that everyone using
+Blackbox have the exact same version of GPG, or generate GPG keys
+using a version of GPG as old as the oldest version of GPG used by
+everyone using Blackbox.
+
+Pick defaults for encryption settings, 0 expiration. Pick a VERY GOOD
+passphrase. Store a backup of the private key someplace secure. For
+example, keep the backup copy on a USB drive that is locked in safe.
+Or, at least put it on a secure machine with little or no internet
+access, full-disk-encryption, etc. Your employer probably has rules
+about how to store such things.
+
+FYI: If generating the key is slow, this is usually because the system
+isn't generating enough entropy.  Tip: Open another window on that
+machine and run this command: `ls -R /`
+
+Now that you have a GPG key, add yourself as an admin:
+
+```
+blackbox admin add KEYNAME
+```
+
+...where "KEYNAME" is the email address listed in the gpg key you created previously. For example:
+
+```
+blackbox admin add tal@example.com
+```
+
+When the command completes successfully, instructions on how to commit these changes will be output. Run the command as given to commit the changes. It will look like this:
+
+```
+git commit -m'NEW ADMIN: tal@example.com' .blackbox/pubring.gpg .blackbox/trustdb.gpg .blackbox/blackbox-admins.txt
+```
+
+
+Then push it to the repo:
+
+```
+git push
+
+or
+
+ht push
+
+(or whatever is appropriate)
+```
+
+NOTE: Creating a Role Account? If you are adding the pubring.gpg of a role account, you can specify the directory where the pubring.gpg file can be found as a 2nd parameter: `blackbox admin add puppetmaster@puppet-master-1.example.com /path/to/the/dir`
+
+## Step 2: AN EXISTING ADMIN accepts you into the system.
+
+Ask someone that already has access to re-encrypt the data files. This
+gives you access. They simply decrypt and re-encrypt the data without
+making any changes.
+
+Pre-check: Verify the new keys look good.
+
+```
+git pull    # Or whatever is required for your system
+gpg --homedir=.blackbox --list-keys
+```
+
+For example, examine the key name (email address) to make sure it conforms to corporate standards.
+
+Import the keychain into your personal keychain and reencrypt:
+
+```
+gpg --import .blackbox/pubring.gpg
+blackbox reencrypt --all shred
+```
+
+Push the re-encrypted files:
+
+```
+git commit -a
+git push
+
+or
+
+hg commit
+hg push
+```
+
+### Step 3: NEWPERSON tests.
+
+Make sure you can decrypt a file. (Suggestion: Keep a dummy file in
+VCS just for new people to practice on.)
+
+
+# Remove a user
+
+Simply run `blackbox admin remove` with their keyname then re-encrypt:
+
+Example:
+
+```
+blackbox admin remove olduser@example.com
+blackbox reencrypt --all shred
+```
+
+When the command completes, you will be given a reminder to check in the change and push it.
+
+Note that their keys will still be in the key ring, but they will go unused. If you'd like to clean up the keyring, use the normal GPG commands and check in the file.
+
+FYI: Your repo may use `keyrings/live` instead of `.blackbox`. See "Where is the configuration stored?"
+
+```
+gpg --homedir=.blackbox --list-keys
+gpg --homedir=.blackbox --delete-key olduser@example.com
+git commit -m'Cleaned olduser@example.com from keyring'  .blackbox/*
+```
+
+FYI: Your repo may use `keyrings/live` instead of `.blackbox`. See "Where is the configuration stored?"
+
+The key ring only has public keys. There are no secret keys to delete.
+
+Remember that this person did have access to all the secrets at one time. They could have made a copy. Therefore, to be completely secure, you should change all passwords, generate new SSL keys, and so on just like when anyone that had privileged access leaves an organization.
+

docs/advanced.md

@@ -0,0 +1,46 @@
+Advanced Techniques
+===================
+
+
+# Using Blackbox without a repo
+
+If the files are copied out of a repo they can still be decrypted and
+edited. Obviously edits, changes to keys, and such will be lost if
+they are made outside the repo. Also note that commands are most
+likely to only work if run from the base directory (i.e. the parent to
+the .blackbox directory).
+
+Without a repo, all commands must be run from the same directory
+as the ".blackbox" directory.  It might work otherwise but no
+promises.
+
+
+# Mixing gpg 1.x/2.0 and 2.2
+
+WARNING: Each version of GnuPG uses a different, and incompatible,
+binary format to store the keychain.  When Blackbox was originally
+created, I didn't know this.  Things are mostly upwards compatible.
+That said, if you have some admins with GnuPG 1.x and others with GnuPG 2.2,
+you may corrupt the keychain.
+
+A future version will store the keychain in an GnuPG-approved
+version-neutral format.
+
+
+# Having gpg and gpg2 on the same machine
+
+NOTE: This is not implemented at this time. TODO(tlim) Use GPG to find
+the binary.
+
+In some situations, team members or automated roles need to install gpg
+2.x alongside the system gpg version 1.x to catch up with the team's gpg
+version. On Ubuntu 16, you can ```apt-get install gnupg2``` which
+installs the binary gpg2. If you want to use this gpg2 binary, run every
+blackbox command with GPG=gpg2.
+
+For example:
+
+```
+GPG=gpg2 blackbox_postdeploy
+```
+

docs/alternatives.md

@@ -0,0 +1,14 @@
+Alternatives
+============
+
+Here are other open source packages that do something similar to
+BlackBox. If you like them better than BlackBox, please use them.
+
+- [git-crypt](https://www.agwa.name/projects/git-crypt/)
+- [Pass](http://www.zx2c4.com/projects/password-store/)
+- [Transcrypt](https://github.com/elasticdog/transcrypt)
+- [Keyringer](https://keyringer.pw/)
+- [git-secret](https://github.com/sobolevn/git-secret)
+
+git-crypt has the best git integration. Once set up it is nearly
+transparent to the users. However it only works with git.

docs/backwards-compatibility.md

@@ -0,0 +1,55 @@
+Backwards Compatibility
+=======================
+
+# Where is the configuration stored? .blackbox vs. keyrings/live
+
+Blackbox stores its configuration data in the `.blackbox` subdirectory.  Older
+repos use `keyrings/live`.  For backwards compatibility either will work.
+
+All documentation refers to `.blackbox`.
+
+You can convert an old repo by simply renaming the directory:
+
+```
+mv keyrings/live .blackbox
+rmdir keyrings
+```
+
+There is no technical reason to convert old repos except that it is less
+confusing to users.
+
+This change was made in commit 60e782a0, release v1.20180615.
+
+
+# How blackbox fines the config directory:
+
+## Creating the repo:
+
+`blackbox init` creates the config directory in the root
+of the repo.  Here's how it picks the name:
+
+- If `$BLACKBOX_TEAM` is set, `.blackbox-$BLACKBOX_TEAM` is used.
+- If the flag `--team <teamname>` is set, it uses `.blackbox-<teamname>`
+- Otherwise, it uses `.blackbox`
+
+When searching for the configuration directory, the following
+locations are checked. First match wins.
+
+- `.blackbox-$BLACKBOX_TEAM` (only if `$BLACKBOX_TEAM` is set)
+- The value of `--config value` (if the flag is set)
+- `$BLACKBOX_CONFIGDIR` (the preferred env. variable to use)
+- `$BLACKBOXDATA` (for backwards compatibility with v1)
+- `.blackbox`
+- `keyrings/live` (for backwards compatibility)
+
+NOTE: The env variables and `--config` should be set to the full path
+to the config directory (i.e.: `/Users/tom/gitstuff/myrepo/.blackbox`).
+If it is set to a relative directory (i.e. `.blackbox` or
+`../myrepo/.blackbox`) most commands will break.
+
+NOTE: Why the change from `$BLACKBOXDATA` to `$BLACKBOX_CONFIGDIR`?  We want
+all the env. variables to begin with the prefix `BLACKBOX_`.  If v1
+supported another name, that is still supported. If you are starting
+with v2 and have no other users using v1, please use the `BLACKBOX_`
+prefix.
+

docs/compatibility.md

@@ -0,0 +1,78 @@
+Compatibility
+=============
+
+# Compatibility with Blackbox v1
+
+The command names all changed from v1 to v2.  The `binv2` directory
+includes shell scripts that provide full backwards compatibility.
+
+# Supported Architectures
+
+Blackbox supports a plug-in archtecture to easily support multiple VCS
+system.  Current support is for:
+
+## Supported VCS/DVCS systems
+
+* git
+* "none" (repo-less use is supported)
+* WOULD LOVE VOLUNTEERS TO HELP ADD SUPPORT FOR: hg, svn, p4
+
+## Supported GPG versions
+
+* Git 1.x and 2.0
+* Git 2.2 and higher
+* WOULD LOVE VOLUNTEERS TO HELP ADD SUPPORT FOR:
+  golang.org/x/crypto/openpgp (this would make the code have no
+  external dependencies)
+
+## Supported Operating systems
+
+Blackbox should work on any Linux system with GnuPG installed.
+Blackbox simply looks for `gpg` in `$PATH`.
+
+Windows: It should work (but has not been extensively tested) on
+Windows WSL2.
+
+# Automated testing
+
+While many combinations work, we do automated tests
+on these combinations.  If any of these fail it blocks the release:
+
+* macOS: GnuPG 2.2 executables from https://gpgtools.org/
+* CentOS: GnuPG 2.0.x executables from the "base" or "updates" repo.
+
+Windows native: VOLUNTEER NEEDED to make a native Windows version
+(should be rather simple as Go does most of the work)
+
+NOTE: Version 1 worked on CentOS/RedHat, macOS, Gygwin, WinGW, NetBSD,
+and SmartOS.  Hopefully we can achieve that broad level of support in
+the future.  Any system that is supported by the Go language and
+has GuPG 2.0.x or higher binaries available should be easy to achieve.
+We'd also like to have automated testing for the same.
+
+# Windows Support
+
+BlackBox assumes that `blackbox-admins.txt` and `blackbox-files.txt` will have
+LF line endings. Windows users should be careful to configure Git or other systems
+to not convert or "fix" those files.
+
+If you use Git, add the following lines to your `.gitattributes` file:
+
+    **/blackbox-admins.txt text eol=lf
+    **/blackbox-files.txt text eol=lf
+
+The `blackbox init` (and newer versions of `blackbox_initialize`)
+will create an appropriate `.gitattributes` file for you.
+
+# Cygwin
+
+TODO: List what packages are required for building the software.
+
+TODO: List what packages are required for running the software.
+
+
+# MinGW
+
+MinGW (comes with Git for Windows) support requires the following:
+
+TODO: FILL IN any requirements

docs/dev-code-overview.md

@@ -0,0 +1,36 @@
+Code Overview
+=============
+
+Here is how the code is laid out.
+
+TODO(tlim): Add a diagram of the layers
+
+```
+cmd/blackbox/   The command line tool.
+             blackbox.go   main()
+             cli.go        Definition of all subcommands and flags
+             drive.go      Processes flags and calls functions in verbs.go
+                   NOTE: These are the only files that are aware of the
+                         flags.  Everything else gets the flag data passed to it
+                         as a parameter. This way the remaining system can be
+                         used as a module.
+
+pkg/box/        High-level functions related to "the black box".
+        verbs.go       One function per subcommand.
+        box.go         Functions for manipulating the files in .blackbox
+        boxutils.go    Helper functions for the above.
+
+pkg/bblog/      Module that provides logging facilities.
+pkg/bbutil/     Functions that are useful to box, plug-ins, etc.
+pkg/tainedname/ Module for printing filenames escaped for Bash.
+
+models/vcs.go        The interface that defines a VCS plug-in.
+models/crypters.go   The interface that defines a GPG plug-in.
+
+pkg/crypters/   Plug-ins for GPG functionality.
+pkg/crypters/gnupg   Plug-in that runs an external gpg binary (found via $PATH)
+
+pkg/vcs/        Plug-ins for VCS functionality.
+pkg/vcs/none        Repo-less mode.
+pkg/vcs/git         Git mode.
+```

docs/dev.md

@@ -0,0 +1,36 @@
+Developer Info
+==============
+
+Code submissions are gladly welcomed! The code is fairly easy to read.
+
+Get the code:
+
+```
+git clone git@github.com:StackExchange/blackbox.git
+```
+
+Test your changes:
+
+```
+go test ./...
+```
+
+This runs through a number of system tests. It creates a repo,
+encrypts files, decrypts files, and so on. You can run these tests to
+verify that the changes you made didn't break anything. You can also
+use these tests to verify that the system works with a new operating
+system.
+
+Please submit tests with code changes:
+
+The best way to change BlackBox is via Test Driven Development. First
+add a test to `tools/confidence.sh`. This test should fail, and
+demonstrate the need for the change you are about to make. Then fix
+the bug or add the feature you want. When you are done, `make
+confidence` should pass all tests. The PR you submit should include
+your code as well as the new test. This way the confidence tests
+accumulate as the system grows as we know future changes don't break
+old features.
+
+Note: More info about compatibility are on the [Compatibility Page](compatibility.md)
+

docs/enable-repo.md

@@ -0,0 +1,58 @@
+Enabling Blackbox on a Repo
+===========================
+
+Overview:
+1. Run the initialization command
+2. Add at least one admin.
+3. Add files. (don't add files before the admins)
+
+The long version:
+
+1. If you don't have a GPG key, set it up using instructions such as:
+[Set up GPG key](https://help.github.com/articles/generating-a-new-gpg-key/). \
+Now you are ready to go.
+
+1. `cd` into a Git, Mercurial, Subversion or Perforce repository and run `blackbox init`.
+
+1. Add yourself with `blackbox admin add YOUR@EMAIL`
+
+1. Commit the files as directed.
+
+That's it!
+
+At this point you should encrypt a file and make sure you can decrypt
+it. This verifies that everything is working as expected.
+
+
+1. Pick a file to be encrypted. Since this is a test, you might want
+   to create a test file.  Call it `secret.txt` and edit the file
+   so that it includes your mother's maiden name.  Just kidding!
+   Store this sentence: `This is my test file.`
+
+2. Run `blackbox file add secret.txt`
+
+3. Decode the encrypted version: `blackbox cat secret.txt`
+
+The "cat" subcommand only accesses the encrypted (`.gpg`) file and is
+a good way to see that the file was encrypted properly.  You should
+see `This is my test file.` 
+
+4  Verify that editing the file works.
+
+To view and/or edit a file, run `blackbox edit --shred secret.txt`
+
+Now encrypt it and shred the original:
+
+```
+blackbox encrypt --shred secret.txt
+```
+
+Now make sure you can decrypt the new file:
+
+```
+blackbox cat secret.txt
+```
+
+You should see the changed text.
+
+Now commit and push `secret.txt.gpg` and you are done!

docs/encryption.md

@@ -0,0 +1,54 @@
+How is the encryption done?
+===========================
+
+GPG has many different ways to encrypt a file. BlackBox uses the mode
+that lets you specify a list of keys that can decrypt the message.
+
+If you have 5 people ("admins") that should be able to access the
+secrets, each creates a GPG key and adds their public key to the
+keychain. The GPG command used to encrypt the file lists all 5 key
+names, and therefore any 1 key can decrypt the file.
+
+Blackbox stores a copy of the public keys of all admins. It never
+stores the private keys.
+
+To remove someone's access, remove that admin's key name (i.e. email
+address) from the list of admins and re-encrypt all the files. They
+can still read the .gpg file (assuming they have access to the
+repository) but they can't decrypt it any more.
+
+*What if they kept a copy of the old repo before you removed access?*
+Yes, they can decrypt old versions of the file. This is why when an
+admin leaves the team, you should change all your passwords, SSL
+certs, and so on. You should have been doing that before BlackBox,
+right?
+
+*Why don't you use symmetric keys?* In other words, why mess with all
+this GPG key stuff and instead why don't we just encrypt all the files
+with a single passphrase. Yes, GPG supports that, but then we are
+managing a shared password, which is fraught with problems. If someone
+"leaves the team" we would have to communicate to everyone a new
+password. Now we just have to remove their key. This scales better.
+
+*How do automated processes decrypt without asking for a password?*
+GPG requires a passphrase on a private key. However, it permits the
+creation of subkeys that have no passphrase. For automated processes,
+create a subkey that is only stored on the machine that needs to
+decrypt the files. For example, at Stack Exchange, when our Continuous
+Integration (CI) system pushes a code change to our Puppet masters,
+they run `blackbox decrypt --all --overwrite` to decrypt all the files.
+The user that
+runs this code has a subkey that doesn't require a passphrase. Since
+we have many masters, each has its own key. And, yes, this means our
+Puppet Masters have to be very secure. However, they were already
+secure because, like, dude... if you can break into someone's puppet
+master you own their network.
+
+*If you use Puppet, why didn't you just use hiera-eyaml?* There are 4
+reasons:
+
+1. This works with any Git or Mercurial repo, even if you aren't using Puppet.
+2. hiera-eyaml decrypts "on demand" which means your Puppet Master now uses a lot of CPU to decrypt keys every time it is contacted. It slows down your master, which, in my case, is already slow enough.
+3. This works with binary files, without having to ASCIIify them and paste them into a YAML file. Have you tried to do this with a cert that is 10K long and changes every few weeks? Ick.
+4. hiera-eyaml didn't exist when I wrote this. (That's the real reason.)
+

docs/expired-keys.md

@@ -0,0 +1,62 @@
+Replacing expired keys
+======================
+
+If someone's key has already expired, blackbox will stop
+encrypting.  You see this error:
+
+```
+$ blackbox_edit_end modified_file.txt
+--> Error: can't re-encrypt because a key has expired.
+```
+
+FYI: Your repo may use `keyrings/live` instead of `.blackbox`. See "Where is the configuration stored?"
+
+You can also detect keys that are about to expire by issuing this command and manually reviewing the "expired:" dates:
+
+    gpg --homedir=.blackbox  --list-keys
+
+or... list UIDs that will expire within 1 month from today: (Warning: this also lists keys without an expiration date)
+
+    gpg --homedir=.blackbox --list-keys  --with-colons --fixed-list-mode  | grep ^uid | awk -F: '$6 < '$(( $(date +%s) + 2592000))
+
+Here's how to replace the key:
+
+- Step 1. Administrator removes expired user:
+
+Warning: This process will erase any unencrypted files that you were in the process of editing. Copy them elsewhere and restore the changes when done.
+
+```
+blackbox_removeadmin expired_user@example.com
+# This next command overwrites any changed unencrypted files. See warning above.
+blackbox_update_all_files
+git commit -m "Re-encrypt all files"
+gpg --homedir=.blackbox --delete-key expired_user@example.com
+git commit -m 'Cleaned expired_user@example.com from keyring'  .blackbox/*
+git push
+```
+
+- Step 2. Expired user adds an updated key:
+
+```
+git pull
+blackbox_addadmin updated_user@example.com
+git commit -m'NEW ADMIN: updated_user@example.com .blackbox/pubring.gpg .blackbox/trustdb.gpg .blackbox/blackbox-admins.txt
+git push
+```
+
+- Step 3. Administrator re-encrypts all files with the updated key of the expired user:
+
+```
+git pull
+gpg --import .blackbox/pubring.gpg
+blackbox_update_all_files
+git commit -m "Re-encrypt all files"
+git push
+```
+
+- Step 4: Clean up:
+
+Any files that were temporarily copied in the first step so as to not be overwritten can now be copied back and re-encrypted with the `blackbox_edit_end` command.
+
+(Thanks to @chishaku for finding a solution to this problem!)
+

docs/file-ops.md

@@ -0,0 +1,55 @@
+How to add/remove a file into the system?
+=========================================
+
+# Adding files:
+
+- If you need to, start the GPG Agent: `eval $(gpg-agent --daemon)`
+- Add the file to the system:
+
+```
+blackbox file add path/to/file.name.key
+
+# If you want to delete the old plaintext:
+blackbox file add --shred path/to/file.name.key
+```
+
+Multiple file names can be specified on the command line:
+
+Example 1: Register 2 files:
+
+```
+blackbox file add --shred file1.txt file2.txt
+```
+
+Example 2: Register all the files in `$DIR`:
+
+```
+find $DIR -type f -not -name '*.gpg' -print0 | xargs -0 blackbox file add
+```
+
+
+# Removing files
+
+This command
+
+```
+blackbox file remove path/to/file.name.key
+```
+
+TODO(tlim): Add examples.
+
+# List files
+
+To see what files are currently enrolled in the system:
+
+```
+blackbox file list
+```
+
+You can also see their status:
+
+```
+blackbox status
+blackbox status just_one_file.txt
+blackbox status --type ENCRYPTED
+```

docs/full-command-list.md

@@ -0,0 +1,34 @@
+Blackbox Command List
+=====================
+
+## Global Flags
+### `--vcs`
+### `--crypto`
+### `--config`
+### `--team`
+### `--editor`
+### `--umask`
+### `--debug`
+### `--help`
+### `--help`
+### `--version`
+## User Commands
+### `blackbox decrypt`
+### `blackbox encrypt`
+### `blackbox edit`
+### `blackbox cat`
+### `blackbox diff`
+### `blackbox shred`
+### `blackbox help`
+## User Commands
+### `blackbox init`
+### `blackbox admin`
+### `blackbox file`
+### `blackbox status`
+### `blackbox reencrypt`
+## Debug
+### `blackbox info`
+## Integration Test (secret menu)
+### `blackbox testing_init`
+
+TODO(tlim): Can we automatically generate this?  The data is all in cli.go

docs/git-tips.md

@@ -0,0 +1,22 @@
+GIT tips
+========
+
+
+# Configure git to show diffs in encrypted files
+
+It's possible to tell Git to decrypt versions of the file before running them through `git diff` or `git log`. To achieve this do:
+
+- Add the following to `.gitattributes` at the top of the git repository:
+
+```
+*.gpg diff=blackbox
+```
+
+- Add the following to `.git/config`:
+
+```
+[diff "blackbox"]
+    textconv = gpg --use-agent -q --batch --decrypt
+````
+
+Commands like `git log -p file.gpg` and `git diff master --` will display as expected.

docs/gnupg-tips.md

@@ -0,0 +1,31 @@
+GnuPG tips
+==========
+
+# Common error messages
+
+* Message: `gpg: filename: skipped: No public key`
+* Solution: Usually this means there is an item in
+  `.blackbox/blackbox-admins.txt` that is not the name of the key.
+  Either something invalid was inserted (like a filename instead of a
+  username) or a user has left the organization and their key was
+  removed from the keychain, but their name wasn't removed from the
+  blackbox-admins.txt file.
+
+* Message: `gpg: decryption failed: No secret key`
+* Solution: Usually means you forgot to re-encrypt the file with the new key.
+
+* Message: `Error: can't re-encrypt because a key has expired.`
+* Solution: A user's key has expired and can't be used to encrypt any more. Follow the [Replace expired keys](expired-keys.md) page.
+
+FYI: Your repo may use `keyrings/live` instead of `.blackbox`. See "Where is the configuration stored?"
+
+# GnuPG problems
+
+Blackbox is just a front-end to GPG. If you get into a problem with a
+key or file, you'll usually have better luck asking for advice on
+the gnupg users mailing list TODO: Get link to this list
+
+
+The author of Blackbox is not a GnuPG expert. He wrote Blackbox
+because it was better than trying to remember GPG's horrible flag
+names.

docs/installation.md

@@ -0,0 +1,17 @@
+Installation Instructions
+=========================
+
+Currently blackbox v2 is installed by compiling the code and
+copying the binary someplace:
+
+TODO:
+
+```
+git clone FILL IN
+```
+
+Future:  We will have RPM, DEB, Chocolately packages.
+
+
+Next step: [Enable on a repo](enable-repo.md)
+

docs/role-accounts.md

@@ -0,0 +1,158 @@
+Set up automated users or "role accounts"
+=========================================
+
+TODO(tlim): I think this is overly complex. With GnuPG 2.2 and later,
+you can use `--password '' --quick-generate-key userid` and you are
+done. No need for subkeys.  Maybe rework this?
+
+With role accounts, you have an automated system that needs to be able
+to decrypt secrets without a password. This means the security of your
+repo is based on how locked down the automation system is. This
+is risky, so be careful.
+
+
+i.e. This is how a Puppet Master can have access to the unencrypted data.
+
+FYI: Your repo may use `keyrings/live` instead of `.blackbox`. See "Where is the configuration stored?"
+
+An automated user (a "role account") is one that that must be able to decrypt without a passphrase. In general you'll want to do this for the user that pulls the files from the repo to the master. This may be automated with Jenkins CI or other CI system.
+
+GPG keys have to have a passphrase. However, passphrases are optional on subkeys. Therefore, we will create a key with a passphrase then create a subkey without a passphrase. Since the subkey is very powerful, it should be created on a very secure machine.
+
+There's another catch. The role account probably can't check files into Git/Mercurial. It probably only has read-only access to the repo. That's a good security policy. This means that the role account can't be used to upload the subkey public bits into the repo.
+
+Therefore, we will create the key/subkey on a secure machine as yourself. From there we can commit the public portions into the repo. Also from this account we will export the parts that the role account needs, copy them to where the role account can access them, and import them as the role account.
+
+ProTip: If asked to generate entropy, consider running this on the same machine in another window: `sudo dd if=/dev/sda of=/dev/null`
+
+For the rest of this doc, you'll need to make the following substitutions:
+
+- ROLEUSER: svc_deployacct or whatever your role account's name is.
+- NEWMASTER: the machine this role account exists on.
+- SECUREHOST: The machine you use to create the keys.
+
+NOTE: This should be more automated/scripted. Patches welcome.
+
+On SECUREHOST, create the puppet master's keys:
+
+```
+$ mkdir /tmp/NEWMASTER
+$ cd /tmp/NEWMASTER
+$ gpg --homedir . --gen-key
+Your selection?
+   (1) RSA and RSA (default)
+What keysize do you want? (2048) DEFAULT
+Key is valid for? (0) DEFAULT
+
+# Real name: Puppet CI Deploy Account
+# Email address: svc_deployacct@hostname.domain.name
+```
+
+NOTE: Rather than a real email address, use the username@FQDN of the host the key will be used on. If you use this role account on many machines, each should have its own key. By using the FQDN of the host, you will be able to know which key is which. In this doc, we'll refer to username@FQDN as $KEYNAME
+
+Save the passphrase somewhere safe!
+
+Create a sub-key that has no password:
+
+```
+$ gpg --homedir . --edit-key svc_deployacct
+gpg> addkey
+(enter passphrase)
+  Please select what kind of key you want:
+   (3) DSA (sign only)
+   (4) RSA (sign only)
+   (5) Elgamal (encrypt only)
+   (6) RSA (encrypt only)
+Your selection? 6
+What keysize do you want? (2048)
+Key is valid for? (0)
+Command> key 2
+(the new subkey has a "*" next to it)
+Command> passwd
+(enter the main key's passphrase)
+(enter an empty passphrase for the subkey... confirm you want to do this)
+Command> save
+```
+
+Now securely export this directory to NEWMASTER:
+
+```
+gpg --homedir . --export -a svc_sadeploy >/tmp/NEWMASTER/pubkey.txt
+tar cvf /tmp/keys.tar .
+rsync -avP /tmp/keys.tar NEWMASTER:/tmp/.
+```
+
+On NEWMASTER, receive the new GnuPG config:
+
+```
+sudo -u svc_deployacct bash
+mkdir -m 0700 -p ~/.gnupg
+cd ~/.gnupg && tar xpvf /tmp/keys.tar
+```
+
+<!---
+Back on SECUREHOST, import the pubkey into the repository.
+
+```
+$ cd .blackbox
+$ gpg --homedir . --import /tmp/NEWMASTER/pubkey.txt
+```
+-->
+
+Back on SECUREHOST, add the new email address to .blackbox/blackbox-admins.txt:
+
+```
+cd /path/to/the/repo
+blackbox_addadmin $KEYNAME /tmp/NEWMASTER
+```
+
+Verify that secring.gpg is a zero-length file. If it isn't, you have somehow added a private key to the keyring. Start over.
+
+```
+cd .blackbox
+ls -l secring.gpg
+```
+
+Commit the recent changes:
+
+```
+cd .blackbox
+git commit -m"Adding key for KEYNAME" pubring.gpg trustdb.gpg blackbox-admins.txt
+```
+
+Regenerate all encrypted files with the new key:
+
+```
+blackbox_update_all_files
+git status
+git commit -m"updated encryption" -a
+git push
+```
+
+On NEWMASTER, import the keys and decrypt the files:
+
+```
+sudo -u svc_sadeploy bash   # Become the role account.
+gpg --import /etc/puppet/.blackbox/pubring.gpg
+export PATH=$PATH:/path/to/blackbox/bin
+blackbox_postdeploy
+sudo -u puppet cat /etc/puppet/hieradata/blackbox.yaml # or any encrypted file.
+```
+
+ProTip: If you get "gpg: decryption failed: No secret key" then you forgot to re-encrypt blackbox.yaml with the new key.
+
+On SECUREHOST, securely delete your files:
+
+```
+cd /tmp/NEWMASTER
+# On machines with the "shred" command:
+shred -u /tmp/keys.tar
+find . -type f -print0 | xargs -0 shred -u
+# All else:
+rm -rf /tmp/NEWMASTER
+```
+
+Also shred any other temporary files you may have made.
+
+
+

docs/subversion-tips.md

@@ -0,0 +1,21 @@
+Subversion Tips
+===============
+
+NOTE: This is from v1.  Can someone that uses Subversion check
+this and update it?
+
+
+The current implementation will store the blackbox in `/keyrings` at
+the root of the entire repo.  This will create an issue between
+environments that have different roots (i.e. checking out `/` on
+development vs `/releases/foo` in production). To get around this, you
+can `export BLACKBOX_REPOBASE=/path/to/repo` and set a specific base
+for your repo.
+
+This was originally written for git and supports a two-phase commit,
+in which `commit` is a local commit and "push" sends the change
+upstream to the version control server when something is registered or
+deregistered with the system.  The current implementation will
+immediately `commit` a file (to the upstream subversion server) when
+you execute a `blackbox_*` command.
+

docs/support.md

@@ -0,0 +1,16 @@
+Support
+=======
+
+# Join our community!
+
+Join the [blackbox-project mailing list](https://groups.google.com/d/forum/blackbox-project)!
+
+
+
+# How to submit bugs or ask questions?
+
+We welcome questions, bug reports and feedback!
+
+The best place to start is to join the [blackbox-project mailing list](https://groups.google.com/d/forum/blackbox-project) and ask there.
+
+Bugs are tracked here in Github. Please feel free to [report bugs](https://github.com/StackExchange/blackbox/issues) yourself.

docs/user-overview.md

@@ -0,0 +1,124 @@
+User Guide
+==========
+
+# Overview
+
+Suppose you have a VCS repository (i.e. a Git or Mercurial repo) and
+certain files contain secrets such as passwords or SSL private keys.
+Often people just store such files "and hope that nobody finds them in
+the repo". That's not safe.  Hope is not a strategy.
+
+With BlackBox, those files are stored encrypted using GPG. Access to
+the repo without also having the right GPG keys makes those files as worthless
+as random bits. As long as you keep your GPG keys safe, you don't
+have to worry about storing your VCS repo on an untrusted server or
+letting anyone clone the repo.
+
+Heck, even if you trust your server, now you don't have to trust the
+people that do backups of that server!
+
+Each person ("admin") of the system can decrypt all the files using
+their GPG key, which has its own passphrase.  The authorized GPG keys
+can decrypt any file.  This is better than systems that use one
+GPG key (and passphrase) that must be shared among a group of people.
+It is much better than having one passphrase for each file (I don't
+think anyone actually does that).
+
+Since any admin's GPG key can decrypt the files, if one person leaves
+the company, you don't have to communicate a new passphrase to everyone.
+Simply disable the one key that should no longer have access.
+The process for doing this is as easy as running 2 commands (1 to
+disable their key, 1 to re-encrypt all files.)  Obviously if they kept
+a copy of the repo (and their own passphrase) before leaving the
+company, they have access to the secrets. However, you should rotate
+those secrets anyway. ("rotate secrets" means changing the passwords,
+regenerating TLS certs, and so on).
+
+# Sample session:
+
+First we are going to list the files currently in the blackbox. In
+this case, it is an SSH private key.
+
+```
+$ blackbox file list
+modules/log_management/files/id_rsa
+```
+
+Excellent! Our coworkers have already registered a file with the
+system.  Let's decrypt it, edit it, and re-encrypt it.
+
+```
+$ blackbox decrypt modules/log_management/files/id_rsa
+========== DECRYPTING "modules/log_management/files/id_rsa"
+$ vi modules/log_management/files/id_rsa
+```
+
+That was easy so far!
+
+When we encrypt it, Blackbox will not commit the changes, but it
+will give a hint that you should. It spells out the exact command you
+need to type and even proposes a commit message.
+
+```
+$ blackbox encrypt modules/log_management/files/id_rsa
+========== ENCRYPTING "modules/log_management/files/id_rsa"
+
+NEXT STEP: You need to manually check these in:
+     git commit -m"ENCRYPTED modules/log_management/files/id_rsa" modules/log_management/files/id_rsa.gpg
+```
+
+You can also use `blackbox edit <filename>` to decrypt a file, edit it
+(it will call `$EDITOR`) and re-encrypt it.
+
+
+Now let's register a new file with the blackbox system.
+`data/pass.yaml` is a small file that stores a very important
+password.  In this example, we had just stored the unecrypted
+password in our repo. That's bad.  Let's encrypt it.
+
+```
+$ blackbox file add data/pass.yaml
+========== SHREDDING ("/bin/rm", "-f"): "data/pass.yaml"
+
+NEXT STEP: You need to manually check these in:
+     git commit -m"NEW FILES: data/pass.yaml" .gitignore keyrings/live/blackbox-files.txt modules/stacklb/pass.yaml modules/stacklb/pass.yaml.gpg
+```
+
+Before we commit the change, let's do a `git status` to see what else
+has changed.
+
+```
+$ git status
+On branch master
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   .gitignore
+	modified:   keyrings/live/blackbox-files.txt
+	deleted:    modules/stacklb/pass.yaml
+	new file:   modules/stacklb/pass.yaml.gpg
+
+```
+
+Notice that a number of files were modified:
+
+* `.gitignore`: This file is updated to include the plaintext
+  filename, so that you don't accidentally add it to the repo in the
+  future.
+* `.blackbox/blackbox-files.txt`: The list of files that are registered with the system.
+* `data/pass.yaml`: The file we encrypted is deleted from the repo.
+* `data/pass.yaml.gpg`: The encrypted file is added to the repo.
+
+Even though pass.yaml was deleted from the repo, it is still in the
+repo's history. Anyone with an old copy of the repo, or a new copy
+that knows how to view the repo's history, can see the secret
+password.  For that reason, you should change the password and
+re-encrypt the file.  This is an important point.  Blackbox is not
+magic and it doesn't have a "Men In Black"-style neuralizer that
+can make people forget the past.  If someone leaves a project, you
+have to change the old passwords, etc.
+
+Those are the basics.  Your next step might be:
+
+* TODO: How to enable Blackbox for a repo.
+* TODO: How to add yourself as an admin to a repo.
+* TODO: Complete list of [all blackbox commands](all-commands)

docs/why-is-this-important.md

@@ -0,0 +1,17 @@
+Why encrypt your secrets?
+=========================
+
+OBVIOUSLY we don't want secret things like SSL private keys and
+passwords to be leaked.
+
+NOT SO OBVIOUSLY when we store "secrets" in a VCS repo like Git or
+Mercurial, suddenly we are less able to share our code with other
+people. Communication between subteams of an organization is hurt. You
+can't collaborate as well. Either you find yourself emailing
+individual files around (yuck!), making a special repo with just the
+files needed by your collaborators (yuck!!), or just deciding that
+collaboration isn't worth all that effort (yuck!!!).
+
+The ability to be open and transparent about our code, with the
+exception of a few specific files, is key to the kind of collaboration
+that DevOps and modern IT practitioners need to do.

docs/with-ansible.md

@@ -0,0 +1,18 @@
+How to use the secrets with Ansible?
+===================================
+
+Ansible Vault provides functionality for encrypting both entire files
+and strings stored within files; however, keeping track of the
+password(s) required for decryption is not handled by this module.
+
+Instead one must specify a password file when running the playbook.
+
+Ansible example for password file: `my_secret_password.txt.gpg`
+
+```
+ansible-playbook --vault-password-file my_secret_password.txt site.yml
+```
+
+Alternatively, one can specify this in the
+`ANSIBLE_VAULT_PASSWORD_FILE` environment variable.
+

docs/with-puppet.md

@@ -0,0 +1,68 @@
+How to use the secrets with Puppet?
+===================================
+
+# Entire files:
+
+Entire files, such as SSL certs and private keys, are treated just
+like regular files. You decrypt them any time you push a new release
+to the puppet master.
+
+Example of an encrypted file named `secret_file.key.gpg`
+
+* Plaintext file is: `modules/${module_name}/files/secret_file.key`
+* Encrypted file is: `modules/${module_name}/files/secret_file.key.gpg`
+* Puppet sees it as: `puppet:///modules/${module_name}/secret_file.key`
+
+Puppet code that stores `secret_file.key` in `/etc/my_little_secret.key`:
+
+```
+file { '/etc/my_little_secret.key':
+    ensure  => 'file',
+    owner   => 'root',
+    group   => 'puppet',
+    mode    => '0760',
+    source  => "puppet:///modules/${module_name}/secret_file.key",  # No ".gpg"
+}
+```
+
+# Small strings:
+
+For small strings such as passwords and API keys, it makes sense
+to store them in an (encrypted) YAML file which is then made
+available via hiera.
+
+For example, we use a file called `blackbox.yaml`. You can access the
+data in it using the hiera() function.
+
+*Setup:*
+
+Edit `hiera.yaml` to include "blackbox" to the search hierarchy:
+
+```
+:hierarchy:
+  - ...
+  - blackbox
+  - ...
+```
+
+In blackbox.yaml specify:
+
+```
+---
+module::test_password: "my secret password"
+```
+
+In your Puppet Code, access the password as you would any hiera data:
+
+```
+$the_password = hiera('module::test_password', 'fail')
+
+file {'/tmp/debug-blackbox.txt':
+    content => $the_password,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0600',
+}
+```
+
+The variable `$the_password` will contain "my secret password" and can be used anywhere strings are used.

go.mod

@@ -0,0 +1,11 @@
+module github.com/StackExchange/blackbox/v2
+
+go 1.14
+
+require (
+	github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883
+	github.com/mattn/go-runewidth v0.0.9 // indirect
+	github.com/olekukonko/tablewriter v0.0.4
+	github.com/sergi/go-diff v1.2.0 // indirect
+	github.com/urfave/cli/v2 v2.2.0
+)

go.sum

@@ -0,0 +1,37 @@
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ=
+github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+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/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
+github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8=
+github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
+github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
+github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/urfave/cli/v2 v2.2.0 h1:JTTnM6wKzdA0Jqodd966MVj4vWbbquZykeX1sKbe2C4=
+github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

integrationTest/NOTES.txt

@@ -0,0 +1,91 @@
+
+This should accept VCS-type and --crypto flags.
+Then a shell script should run various combinations of VCS and crypters.
+
+# Startup
+* Create a repo (git, none)
+
+# Test basic operations:
+* As Alice:
+  * initialize blackbox, add her keys to it, see that the usual files
+    exist. See her name in bb-admins.txt
+  * encrypt a file, see that the plaintext is deleted, see the file in bb-files.txt
+  * decrypt the file, see the original plaintext is recovered.
+  * Encrypt a file --noshred.
+  * Decrypt the file, it should fail as the plaintext exists.
+  * Remove the plaintext.
+  * Decrypt the file, it should fail as the plaintext exists.
+
+# Test hand-off from Alice to Bob.
+* As Bob
+    * add himself to the admins.
+* As Alice
+    * Update-all-files
+    * Create a new file. Encrypt it.
+* As Bob
+    * Decrypt both files
+    * Verify contents of the new file, and the file from previous.
+    * Create a new file. Encrypt it.
+* As Alice:
+    * Decrypt all files.
+    * Verify contents of the 3 plaintext files.
+
+# Test a git-less directory
+* Copy the old repo somewhere. Remove the .git directory.
+* As Alice:
+    * Decrypt all
+    * Verify plaintext contents
+
+# Test post-deploy with/without GID
+* Back at the original repo:
+* Shred all
+* Run post-deploy. Verify.
+* Shred all
+* Run post-deploy with a custom GID. Verify.
+
+# Test removing an admin
+* As Bob:
+    * removes Alice. (Verify)
+    * Re-encrypt
+    * Decrypt all & verify.
+* As alice
+    * Decrypting should fail.
+
+# Test funny names and paths
+    * my/path/to/relsecrets.txt
+    * cwd=other/place ../../my/path/to/relsecrets.txt
+    * !important!.txt
+    * #andpounds.txt
+    * stars*bars?.txt
+    * space space.txt
+* Do add/encrypt/decrypt
+* Do blackbox_update_all_files
+* Do remove them all
+
+# When people start asking for commands to work with relative paths
+# Test from outside the repo
+* mkdir ../other/place
+* cd    ../other/place
+* decrypt ../../secret1.txt
+* encrypt ../../secret1.txt
+
+# Test specific commands:
+# blackbox admins list
+# blackbox file list
+# blackbox status --name-only (create 1 of each "type")
+# blackbox status --type=FOO
+
+# These should all fail:
+# blackbox file list --all
+# blackbox file list blah
+# blackbox shred list --all
+# blackbox shred list blah
+
+
+
+rm -rf /tmp/bbhome-* && BLACKBOX_DEBUG=true go test -verbose -long -nocleanup
+rm -rf /tmp/bbhome-* && go test -long -nocleanup
+
+( gbb && cd cmd/blackbox && go install ) && blackbox
+
+cd /tmp && rm -rf /tmp/bbhome-* ; mkdir /tmp/bbhome-1 ; cd /tmp/bbhome-1 && git init ; gitmeWork ; ( gbb && cd cmd/blackbox && go install ) && blackbox init yes && gitmeWork ; git commit -mm -a ; blackbox admin add tlimoncelli ; git commit -mnewadmin -a ; echo secrt > secret.txt ; blackbox file add secret.txt

integrationTest/README.txt

@@ -0,0 +1,55 @@
+
+Each test does the following:
+1. Copy the files from testdata/NNNN
+2. Run the command in test_NNNN.sh
+3. 
+
+
+TEST ENROLLMENT:
+
+PHASE 'Alice creates a repo.  She creates secret.txt.'
+PHASE 'Alice wants to be part of the secret system.'
+PHASE 'She creates a GPG key...'
+PHASE 'Initializes BB...'
+PHASE 'and adds herself as an admin.'
+PHASE 'Bob arrives.'
+PHASE 'Bob creates a gpg key.'
+PHASE 'Alice does the second part to enroll bob.'
+PHASE 'She enrolls bob.'
+PHASE 'She enrolls secrets.txt.'
+PHASE 'She decrypts secrets.txt.'
+PHASE 'She edits secrets.txt.'
+PHASE 'Alice copies files to a non-repo directory. (NO REPO)'
+PHASE 'Alice shreds these non-repo files. (NO REPO)'
+PHASE 'Alice decrypts secrets.txt (NO REPO).'
+PHASE 'Alice edits secrets.txt. (NO REPO EDIT)'
+PHASE 'Alice decrypts secrets.txt (NO REPO EDIT).'
+PHASE 'appears.'
+#PHASE 'Bob makes sure he has all new keys.'
+
+TEST INDIVIDUAL COMMANDS:
+
+PHASE 'Bob postdeploys... default.'
+PHASE 'Bob postdeploys... with a GID.'
+PHASE 'Bob cleans up the secret.'
+PHASE 'Bob removes Alice.'
+PHASE 'Bob reencrypts files so alice can not access them.'
+PHASE 'Bob decrypts secrets.txt.'
+PHASE 'Bob edits secrets.txt.'
+PHASE 'Bob decrypts secrets.txt VERSION 3.'
+PHASE 'Bob exposes a secret in the repo.'
+PHASE 'Bob corrects it by registering it.'
+PHASE 'Bob enrolls my/path/to/relsecrets.txt.'
+PHASE 'Bob decrypts relsecrets.txt.'
+PHASE 'Bob enrolls !important!.txt'
+PHASE 'Bob enrolls #andpounds.txt'
+PHASE 'Bob enrolls stars*bars?.txt'
+PHASE 'Bob enrolls space space.txt'
+PHASE 'Bob checks out stars*bars?.txt.'
+PHASE 'Bob checks out space space.txt.'
+PHASE 'Bob shreds all exposed files.'
+PHASE 'Bob updates all files.'
+PHASE 'Bob DEregisters mistake.txt'
+PHASE 'Bob enrolls multiple files: multi1.txt and multi2.txt'
+PHASE 'Alice returns. She should be locked out'
+PHASE 'Alice tries to decrypt secret.txt. Is blocked.'

integrationTest/asserts.go

@@ -0,0 +1,68 @@
+package main
+
+import (
+	"io/ioutil"
+	"os"
+	"testing"
+
+	"github.com/andreyvit/diff"
+)
+
+func assertFileMissing(t *testing.T, name string) {
+	t.Helper()
+	_, err := os.Stat(name)
+	if err != nil && os.IsNotExist(err) {
+		return
+	}
+	if err == nil {
+		t.Fatalf("assertFileMissing failed: %v exists", name)
+	}
+	t.Fatalf("assertFileMissing: %q: %v", name, err)
+}
+
+func assertFileExists(t *testing.T, name string) {
+	t.Helper()
+	_, err := os.Stat(name)
+	if err == nil {
+		return
+	}
+	if os.IsNotExist(err) {
+		t.Fatalf("assertFileExists failed: %v not exist", name)
+	}
+	t.Fatalf("assertFileExists: file can't be accessed: %v: %v", name, err)
+}
+
+func assertFileEmpty(t *testing.T, name string) {
+	t.Helper()
+	c, err := ioutil.ReadFile(name)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(c) != 0 {
+		t.Fatalf("got=%v want=%v: %v", len(c), 0, name)
+	}
+}
+
+func assertFileContents(t *testing.T, name string, contents string) {
+	t.Helper()
+	c, err := ioutil.ReadFile(name)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if w, g := contents, string(c); w != g {
+		t.Errorf("assertFileContents(%q) mismatch (-got +want):\n%s",
+			name, diff.LineDiff(g, w))
+	}
+}
+
+func assertFilePerms(t *testing.T, name string, perms os.FileMode) {
+	t.Helper()
+	s, err := os.Stat(name)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if s.Mode() != perms {
+		t.Fatalf("got=%#o want=%#o: %v", s.Mode(), perms, name)
+	}
+}

integrationTest/integration_test.go

@@ -0,0 +1,343 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"testing"
+
+	"github.com/StackExchange/blackbox/v2/pkg/bblog"
+	_ "github.com/StackExchange/blackbox/v2/pkg/bblog"
+	_ "github.com/StackExchange/blackbox/v2/pkg/vcs/_all"
+)
+
+var vcsToTest = flag.String("testvcs", "GIT", "VCS to test")
+var longTests = flag.Bool("long", false, "Run long version of tests")
+
+//var crypterToTest = flag.String("crypter", "GnuPG", "crypter to test")
+
+func init() {
+	testing.Init()
+	flag.Parse()
+
+	op, err := os.Getwd()
+	if err != nil {
+		panic(err)
+	}
+	originPath = op
+}
+
+func compile(t *testing.T) {
+	if PathToBlackBox() != "" {
+		// It's been compiled already.
+		return
+	}
+	// Make sure we have the latest binary
+	fmt.Println("========== Compiling")
+	cmd := exec.Command("go", "build", "-o", "../bbintegration", "../cmd/blackbox")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	err := cmd.Run()
+	if err != nil {
+		t.Fatalf("setup_compile: %v", err)
+	}
+	cwd, err := os.Getwd()
+	if err != nil {
+		t.Fatal(err)
+	}
+	SetPathToBlackBox(filepath.Join(cwd, "../bbintegration"))
+}
+
+func setup(t *testing.T) {
+	logDebug := bblog.GetDebug(*verbose)
+
+	logDebug.Printf("flag.testvcs is %v", *vcsToTest)
+	vh := getVcs(t, *vcsToTest)
+	logDebug.Printf("Using BLACKBOX_VCS=%v", vh.Name())
+	os.Setenv("BLACKBOX_VCS", vh.Name())
+
+}
+
+func TestInit(t *testing.T) {
+	if !*longTests {
+		return
+	}
+	compile(t)
+	makeHomeDir(t, "init")
+
+	// Only zero or one args are permitted.
+	invalidArgs(t, "init", "one", "two")
+	invalidArgs(t, "init", "one", "two", "three")
+
+	runBB(t, "init", "yes")
+	assertFileEmpty(t, ".blackbox/blackbox-admins.txt")
+	assertFileEmpty(t, ".blackbox/blackbox-files.txt")
+	assertFilePerms(t, ".blackbox/blackbox-admins.txt", 0o640)
+	assertFilePerms(t, ".blackbox/blackbox-files.txt", 0o640)
+}
+
+func TestList(t *testing.T) {
+	if !*longTests {
+		return
+	}
+	compile(t)
+	makeHomeDir(t, "init")
+
+	runBB(t, "init", "yes")
+	createDummyFilesAdmin(t)
+	checkOutput("000-admin-list.txt", t, "admin", "list")
+	checkOutput("000-file-list.txt", t, "file", "list")
+
+	invalidArgs(t, "file", "list", "extra")
+	invalidArgs(t, "admin", "list", "extra")
+}
+
+func TestStatus(t *testing.T) {
+	if !*longTests {
+		return
+	}
+	compile(t)
+	makeHomeDir(t, "init")
+
+	runBB(t, "init", "yes")
+	createFilesStatus(t)
+	checkOutput("000-status.txt", t, "status")
+}
+
+func TestShred(t *testing.T) {
+	if !*longTests {
+		return
+	}
+	compile(t)
+	makeHomeDir(t, "shred")
+	runBB(t, "init", "yes")
+
+	makeFile(t, "shredme.txt", "File with SHREDME in it.\n")
+	assertFileExists(t, "shredme.txt")
+	runBB(t, "shred", "shredme.txt")
+	assertFileMissing(t, "shredme.txt")
+}
+
+func TestStatus_notreg(t *testing.T) {
+	if !*longTests {
+		return
+	}
+	compile(t)
+	makeHomeDir(t, "init")
+
+	runBB(t, "init", "yes")
+	createFilesStatus(t)
+	checkOutput("status-noreg.txt", t, "status", "status-ENCRYPTED.txt", "blah.txt")
+}
+
+// TestHard tests the functions using a fake homedir and repo.
+func TestHard(t *testing.T) {
+	if !*longTests {
+		return
+	}
+	// These are basic tests that work on a fake repo.
+	// The repo has mostly real data, except any .gpg file
+	// is just garbage.
+	compile(t)
+	setup(t)
+
+	for _, cx := range []struct{ subname, prefix string }{
+		//{subname: ".", prefix: "."},
+		{subname: "mysub", prefix: ".."},
+	} {
+		subname := cx.subname
+		prefix := cx.prefix
+		_ = prefix
+
+		phase("========== SUBDIR = " + subname + " ==========")
+
+		makeHomeDir(t, "BasicAlice")
+
+		plaintextFoo := "I am the foo.txt file!\n"
+		plainAltered := "I am the altered file!\n"
+
+		runBB(t, "testing_init") // Runs "git init" or equiv
+		assertFileExists(t, ".git")
+		runBB(t, "init", "yes") // Creates .blackbox or equiv
+
+		if subname != "." {
+			err := os.Mkdir(subname, 0770)
+			if err != nil {
+				t.Fatal(fmt.Errorf("hard-mk-home %q: %v", subname, err))
+			}
+		}
+		olddir, err := os.Getwd()
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		os.Chdir(subname)
+		os.Chdir(olddir)
+
+		phase("Alice creates a GPG key")
+		gpgdir := makeAdmin(t, "alice", "Alice Example", "alice@example.com")
+		become(t, "alice")
+
+		phase("Alice enrolls as an admin")
+		//os.Chdir(subname)
+		runBB(t, "admin", "add", "alice@example.com", gpgdir)
+		//os.Chdir(olddir)
+
+		// encrypt
+		phase("Alice registers foo.txt")
+		makeFile(t, "foo.txt", plaintextFoo)
+		//os.Chdir(subname)
+		//runBB(t, "file", "add", "--shred", filepath.Join(prefix, "foo.txt"))
+		runBB(t, "file", "add", "--shred", "foo.txt")
+		//os.Chdir(olddir)
+		// "file add" encrypts the file.
+		// We shred the plaintext so that we are sure that when Decrypt runs,
+		// we can verify the contents wasn't just sitting there all the time.
+		assertFileMissing(t, "foo.txt")
+		assertFileExists(t, "foo.txt.gpg")
+
+		phase("Alice decrypts foo.txt")
+		// decrypt
+		//os.Chdir(subname)
+		runBB(t, "decrypt", "foo.txt")
+		//runBB(t, "decrypt", filepath.Join(prefix, "foo.txt"))
+		//os.Chdir(olddir)
+		assertFileExists(t, "foo.txt")
+		assertFileExists(t, "foo.txt.gpg")
+		assertFileContents(t, "foo.txt", plaintextFoo)
+
+		// encrypts (without shredding)
+		phase("Alice encrypts foo.txt (again)")
+		runBB(t, "encrypt", "foo.txt")
+		assertFileExists(t, "foo.txt")
+		assertFileExists(t, "foo.txt.gpg")
+		assertFileContents(t, "foo.txt", plaintextFoo)
+
+		// reencrypt
+		phase("Alice reencrypts")
+		checkOutput("basic-status.txt", t, "status")
+		runBB(t, "reencrypt", "--overwrite", "foo.txt")
+
+		// Test variations of cat
+
+		// foo.txt=plain    result=plain
+		phase("Alice cats plain:plain")
+		makeFile(t, "foo.txt", plaintextFoo)
+		assertFileExists(t, "foo.txt")
+		runBB(t, "encrypt", "foo.txt")
+		assertFileExists(t, "foo.txt")
+		assertFileExists(t, "foo.txt.gpg")
+		checkOutput("alice-cat-plain.txt", t, "cat", "foo.txt")
+		assertFileExists(t, "foo.txt")
+		assertFileExists(t, "foo.txt.gpg")
+
+		// foo.txt=altered    result=plain
+		phase("Alice cats altered:plain")
+		makeFile(t, "foo.txt", plainAltered)
+		assertFileExists(t, "foo.txt")
+		assertFileExists(t, "foo.txt.gpg")
+		checkOutput("alice-cat-plain.txt", t, "cat", "foo.txt")
+		assertFileExists(t, "foo.txt")
+		assertFileExists(t, "foo.txt.gpg")
+
+		// foo.txt=missing  result=plain
+		phase("Alice cats missing:plain")
+		removeFile(t, "foo.txt")
+		assertFileMissing(t, "foo.txt")
+		assertFileMissing(t, "foo.txt")
+		assertFileExists(t, "foo.txt.gpg")
+		checkOutput("alice-cat-plain.txt", t, "cat", "foo.txt")
+		assertFileMissing(t, "foo.txt")
+		assertFileExists(t, "foo.txt.gpg")
+
+		// Chapter 2: Bob
+		// Alice adds Bob.
+		// Bob encrypts a file.
+		// Bob makes sure he can decrypt alice's file.
+		// Bob removes Alice.
+		// Alice verifies she CAN'T decrypt files.
+		// Bob adds Alice back.
+		// Alice verifies she CAN decrypt files.
+		// Bob adds an encrypted file by mistake, "bb add" and fixes it.
+		// Bob corrupts the blackbox-admins.txt file, verifies that commands fail.
+
+	}
+
+}
+
+// TestEvilFilenames verifies commands work with "difficult" file names
+func TestEvilFilenames(t *testing.T) {
+	if !*longTests {
+		return
+	}
+	compile(t)
+	setup(t)
+	makeHomeDir(t, "Mallory")
+
+	runBB(t, "testing_init") // Runs "git init" or equiv
+	assertFileExists(t, ".git")
+	runBB(t, "init", "yes") // Creates .blackbox or equiv
+
+	phase("Malory creates a GPG key")
+	gpgdir := makeAdmin(t, "mallory", "Mallory Evil", "mallory@example.com")
+	become(t, "mallory")
+
+	phase("Mallory enrolls as an admin")
+	runBB(t, "admin", "add", "mallory@example.com", gpgdir)
+
+	_ = os.MkdirAll("my/path/to", 0o770)
+	_ = os.Mkdir("other", 0o770)
+
+	for i, name := range []string{
+		"!important!.txt",
+		"#andpounds.txt",
+		"stars*bars?.txt",
+		"space space.txt",
+		"tab\ttab.txt",
+		"ret\rret.txt",
+		"smile😁eyes",
+		"¡que!",
+		"thé",
+		"pound£",
+		"*.go",
+		"rm -f erase ; echo done",
+		`smile☺`,
+		`dub𝓦`,
+		"my/path/to/relsecrets.txt",
+		//"my/../my/path/../path/to/myother.txt",  // Not permitted yet
+		//"other/../my//path/../path/to/otherother.txt", // Not permitted yet
+		//"new\nnew.txt",  // \n not permitted
+		//"two\n",  // \n not permitted (yet)
+		//"four\U0010FFFF",  // Illegal byte sequence. git won't accept.
+	} {
+		phase(fmt.Sprintf("Mallory tries %02d: %q", i, name))
+		contents := "the name of this file is the talking heads... i mean, " + name
+		makeFile(t, name, contents)
+		assertFileExists(t, name)
+		assertFileMissing(t, name+".gpg")
+		assertFileContents(t, name, contents)
+
+		runBB(t, "file", "add", name)
+		assertFileMissing(t, name)
+		assertFileExists(t, name+".gpg")
+
+		runBB(t, "decrypt", name)
+		assertFileExists(t, name)
+		assertFileExists(t, name+".gpg")
+		assertFileContents(t, name, contents)
+
+		runBB(t, "encrypt", name)
+		assertFileExists(t, name)
+		assertFileExists(t, name+".gpg")
+		assertFileContents(t, name, contents)
+
+		runBB(t, "shred", name)
+		assertFileMissing(t, name)
+		assertFileExists(t, name+".gpg")
+	}
+}
+
+// More tests to implement.
+// 1. Verify that the --gid works (blackbox decrypt --gid)

integrationTest/ithelpers.go

@@ -0,0 +1,617 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/StackExchange/blackbox/v2/pkg/bblog"
+	"github.com/StackExchange/blackbox/v2/pkg/bbutil"
+	"github.com/StackExchange/blackbox/v2/pkg/vcs"
+	_ "github.com/StackExchange/blackbox/v2/pkg/vcs/_all"
+
+	"github.com/andreyvit/diff"
+)
+
+var verbose = flag.Bool("verbose", false, "reveal stderr")
+var nocleanup = flag.Bool("nocleanup", false, "do not delete the tmp directory")
+
+type userinfo struct {
+	name      string
+	dir       string // .gnupg-$name
+	agentInfo string // GPG_AGENT_INFO
+	email     string
+	fullname  string
+}
+
+var users = map[string]*userinfo{}
+
+func init() {
+	testing.Init()
+	flag.Parse()
+}
+
+var logErr *log.Logger
+var logDebug *log.Logger
+
+func init() {
+	logErr = bblog.GetErr()
+	logDebug = bblog.GetDebug(*verbose)
+}
+
+func getVcs(t *testing.T, name string) vcs.Vcs {
+	t.Helper()
+	// Set up the vcs
+	for _, v := range vcs.Catalog {
+		logDebug.Printf("Testing vcs: %v == %v", name, v.Name)
+		if strings.ToLower(v.Name) == strings.ToLower(name) {
+			h, err := v.New()
+			if err != nil {
+				return nil // No idea how that would happen.
+			}
+			return h
+		}
+		logDebug.Println("...Nope.")
+
+	}
+	return nil
+}
+
+// TestBasicCommands's helpers
+
+func makeHomeDir(t *testing.T, testname string) {
+	t.Helper()
+	var homedir string
+	var err error
+
+	if *nocleanup {
+		// Make a predictable location; don't deleted.
+		homedir = "/tmp/bbhome-" + testname
+		os.RemoveAll(homedir)
+		err = os.Mkdir(homedir, 0770)
+		if err != nil {
+			t.Fatal(fmt.Errorf("mk-home %q: %v", homedir, err))
+		}
+	} else {
+		// Make a random location that is deleted automatically
+		homedir, err = ioutil.TempDir("", filepath.Join("bbhome-"+testname))
+		defer os.RemoveAll(homedir) // clean up
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	err = os.Setenv("HOME", homedir)
+	if err != nil {
+		t.Fatal(err)
+	}
+	logDebug.Printf("TESTING DIR HOME: cd %v\n", homedir)
+
+	repodir := filepath.Join(homedir, "repo")
+	err = os.Mkdir(repodir, 0770)
+	if err != nil {
+		t.Fatal(fmt.Errorf("mk-repo %q: %v", repodir, err))
+	}
+	err = os.Chdir(repodir)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func createDummyFilesAdmin(t *testing.T) {
+	// This creates a repo with real data, except any .gpg file
+	// is just garbage.
+	addLineSorted(t, ".blackbox/blackbox-admins.txt", "user1@example.com")
+	addLineSorted(t, ".blackbox/blackbox-admins.txt", "user2@example.com")
+	addLineSorted(t, ".blackbox/blackbox-files.txt", "foo.txt")
+	addLineSorted(t, ".blackbox/blackbox-files.txt", "bar.txt")
+	makeFile(t, "foo.txt", "I am the foo.txt file!")
+	makeFile(t, "bar.txt", "I am the foo.txt file!")
+	makeFile(t, "foo.txt.gpg", "V nz gur sbb.gkg svyr!")
+	makeFile(t, "bar.txt.gpg", "V nz gur one.gkg svyr!")
+}
+
+func createFilesStatus(t *testing.T) {
+	// This creates a few files with real plaintext but fake cyphertext.
+	// There are a variety of timestamps to enable many statuses.
+	t.Helper()
+
+	// DECRYPTED: File is decrypted and ready to edit (unknown if it has been edited).
+	// ENCRYPTED: GPG file is newer than plaintext. Indicates recented edited then encrypted.
+	// SHREDDED: Plaintext is missing.
+	// GPGMISSING: The .gpg file is missing. Oops?
+	// PLAINERROR: Can't access the plaintext file to determine status.
+	// GPGERROR: Can't access .gpg file to determine status.
+
+	addLineSorted(t, ".blackbox/blackbox-files.txt", "status-DECRYPTED.txt")
+	addLineSorted(t, ".blackbox/blackbox-files.txt", "status-ENCRYPTED.txt")
+	addLineSorted(t, ".blackbox/blackbox-files.txt", "status-SHREDDED.txt")
+	addLineSorted(t, ".blackbox/blackbox-files.txt", "status-GPGMISSING.txt")
+	// addLineSorted(t, ".blackbox/blackbox-files.txt", "status-PLAINERROR.txt")
+	// addLineSorted(t, ".blackbox/blackbox-files.txt", "status-GPGERROR.txt")
+	addLineSorted(t, ".blackbox/blackbox-files.txt", "status-BOTHMISSING.txt")
+
+	// Combination of age difference either missing, file error, both missing.
+	makeFile(t, "status-DECRYPTED.txt", "File with DECRYPTED in it.")
+	makeFile(t, "status-DECRYPTED.txt.gpg", "Svyr jvgu QRPELCGRQ va vg.")
+
+	makeFile(t, "status-ENCRYPTED.txt", "File with ENCRYPTED in it.")
+	makeFile(t, "status-ENCRYPTED.txt.gpg", "Svyr jvgu RAPELCGRQ va vg.")
+
+	// Plaintext intentionally missing.
+	makeFile(t, "status-SHREDDED.txt.gpg", "Svyr jvgu FUERQQRQ va vg.")
+
+	makeFile(t, "status-GPGMISSING.txt", "File with GPGMISSING in it.")
+	// gpg file intentionally missing.
+
+	// Plaintext intentionally missing. ("status-BOTHMISSING.txt")
+	// gpg file intentionally missing. ("status-BOTHMISSING.txt.gpg")
+
+	// NB(tlim): commented out.  I can't think of an error I can reproduce.
+	// makeFile(t, "status-PLAINERROR.txt", "File with PLAINERROR in it.")
+	// makeFile(t, "status-PLAINERROR.txt.gpg", "Svyr jvgu CYNVAREEBE va vg.")
+	// setFilePerms(t, "status-PLAINERROR.txt", 0000)
+
+	// NB(tlim): commented out.  I can't think of an error I can reproduce.
+	// makeFile(t, "status-GPGERROR.txt", "File with GPGERROR in it.")
+	// makeFile(t, "status-GPGERROR.txt.gpg", "Svyr jvgu TCTREEBE va vg.")
+	// setFilePerms(t, "status-GPGERROR.txt.gpg", 0000)
+
+	time.Sleep(200 * time.Millisecond)
+
+	if err := bbutil.Touch("status-DECRYPTED.txt"); err != nil {
+		t.Fatal(err)
+	}
+	if err := bbutil.Touch("status-ENCRYPTED.txt.gpg"); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func addLineSorted(t *testing.T, filename, line string) {
+	err := bbutil.AddLinesToSortedFile(filename, line)
+	if err != nil {
+		t.Fatalf("addLineSorted failed: %v", err)
+	}
+}
+
+func removeFile(t *testing.T, name string) {
+	os.RemoveAll(name)
+}
+
+func makeFile(t *testing.T, name string, content string) {
+	t.Helper()
+
+	err := ioutil.WriteFile(name, []byte(content), 0666)
+	if err != nil {
+		t.Fatalf("makeFile can't create %q: %v", name, err)
+	}
+}
+
+func setFilePerms(t *testing.T, name string, perms int) {
+	t.Helper()
+
+	err := os.Chmod(name, os.FileMode(perms))
+	if err != nil {
+		t.Fatalf("setFilePerms can't chmod %q: %v", name, err)
+	}
+}
+
+var originPath string // CWD when program started.
+
+// checkOutput runs blackbox with args, the last arg is the filename
+// of the expected output. Error if output is not expected.
+func checkOutput(name string, t *testing.T, args ...string) {
+	t.Helper()
+
+	cmd := exec.Command(PathToBlackBox(), args...)
+	cmd.Stdin = nil
+	cmd.Stdout = nil
+	cmd.Stderr = os.Stderr
+	var gb []byte
+	gb, err := cmd.Output()
+	if err != nil {
+		t.Fatal(fmt.Errorf("checkOutput(%q): %w", args, err))
+	}
+	got := string(gb)
+
+	wb, err := ioutil.ReadFile(filepath.Join(originPath, "test_data", name))
+	if err != nil {
+		t.Fatalf("checkOutput can't read %v: %v", name, err)
+	}
+	want := string(wb)
+
+	//fmt.Printf("CHECKOUTPUT g: %v\n", got)
+	//fmt.Printf("CHECKOUTPUT w: %v\n", want)
+
+	if g, w := got, want; g != w {
+		t.Errorf("checkOutput(%q) mismatch (-got +want):\n%s",
+			args, diff.LineDiff(g, w))
+	}
+
+}
+
+func invalidArgs(t *testing.T, args ...string) {
+	t.Helper()
+
+	logDebug.Printf("invalidArgs(%q): \n", args)
+	cmd := exec.Command(PathToBlackBox(), args...)
+	cmd.Stdin = nil
+	if *verbose {
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+	}
+	err := cmd.Run()
+	if err == nil {
+		logDebug.Println("BAD")
+		t.Fatal(fmt.Errorf("invalidArgs(%q): wanted failure but got success", args))
+	}
+	logDebug.Printf("^^^^ (correct error received): err=%q\n", err)
+}
+
+// TestAliceAndBob's helpers.
+
+func setupUser(t *testing.T, user, passphrase string) {
+	t.Helper()
+	logDebug.Printf("DEBUG: setupUser %q %q\n", user, passphrase)
+}
+
+var pathToBlackBox string
+
+// PathToBlackBox returns the path to the executable we compile for integration testing.
+func PathToBlackBox() string { return pathToBlackBox }
+
+// SetPathToBlackBox sets the path.
+func SetPathToBlackBox(n string) {
+	logDebug.Printf("PathToBlackBox=%q\n", n)
+	pathToBlackBox = n
+}
+
+func runBB(t *testing.T, args ...string) {
+	t.Helper()
+
+	logDebug.Printf("runBB(%q)\n", args)
+	cmd := exec.Command(PathToBlackBox(), args...)
+	cmd.Stdin = nil
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	err := cmd.Run()
+	if err != nil {
+		t.Fatal(fmt.Errorf("runBB(%q): %w", args, err))
+	}
+}
+
+func phase(msg string) {
+	logDebug.Println("********************")
+	logDebug.Println("********************")
+	logDebug.Printf("********* %v\n", msg)
+	logDebug.Println("********************")
+	logDebug.Println("********************")
+}
+
+func makeAdmin(t *testing.T, name, fullname, email string) string {
+	testing.Init()
+
+	dir, err := filepath.Abs(filepath.Join(os.Getenv("HOME"), ".gnupg-"+name))
+	if err != nil {
+		t.Fatal(err)
+	}
+	os.Mkdir(dir, 0700)
+
+	u := &userinfo{
+		name:     name,
+		dir:      dir,
+		fullname: fullname,
+		email:    email,
+	}
+	users[name] = u
+
+	// GNUPGHOME=u.dir
+	// echo 'pinentry-program' "$(which pinentry-tty)" >> "$GNUPGHOME/gpg-agent.conf"
+	os.Setenv("GNUPGHOME", u.dir)
+	if runtime.GOOS != "darwin" {
+		ai, err := bbutil.RunBashOutput("gpg-agent", "--homedir", u.dir, "--daemon")
+		// NB(tlim): It should return something like:
+		//   `GPG_AGENT_INFO=/home/tlimoncelli/.gnupg/S.gpg-agent:18548:1; export GPG_AGENT_INFO;`
+		if err != nil {
+			//t.Fatal(err)
+		}
+		if !strings.HasPrefix(ai, "GPG_AGENT_INFO=") {
+			fmt.Println("WARNING: gpg-agent didn't output what we expected. Assumed dead.")
+		} else {
+			u.agentInfo = ai[15:strings.Index(ai, ";")]
+			os.Setenv("GPG_AGENT_INFO", u.agentInfo)
+			fmt.Printf("GPG_AGENT_INFO=%q (was %q)\n", ai, u.agentInfo)
+		}
+	}
+
+	os.Setenv("GNUPGHOME", u.dir)
+	// Generate key:
+	if hasQuick(t) {
+		fmt.Println("DISCOVERED: NEW GPG")
+		fmt.Printf("Generating %q using --qgk\n", u.email)
+		bbutil.RunBash("gpg",
+			"--homedir", u.dir,
+			"--batch",
+			"--passphrase", "",
+			"--quick-generate-key", u.email,
+		)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+	} else {
+
+		fmt.Println("DISCOVERED: OLD GPG")
+		fmt.Println("MAKING KEY")
+
+		tmpfile, err := ioutil.TempFile("", "example")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.Remove(tmpfile.Name()) // clean up
+
+		batch := `%echo Generating a basic OpenPGP key
+Key-Type: RSA
+Key-Length: 2048
+Subkey-Type: RSA
+Subkey-Length: 2048
+Name-Real: ` + u.fullname + `
+Name-Comment: Not for actual use
+Name-Email: ` + u.email + `
+Expire-Date: 0
+%pubring ` + filepath.Join(u.dir, `pubring.gpg`) + `
+%secring ` + filepath.Join(u.dir, `secring.gpg`) + `
+# Do a commit here, so that we can later print "done"
+%commit
+%echo done`
+		//fmt.Printf("BATCH START\n%s\nBATCH END\n", batch)
+		fmt.Fprintln(tmpfile, batch)
+
+		// FIXME(tlim): The batch file should include a password, but then
+		// we need to figure out how to get "blackbox encrypt" and other
+		// commands to input a password in an automated way.
+		// To experiment with this, add after "Expire-Date:" a line like:
+		//         Passphrase: kljfhslfjkhsaljkhsdflgjkhsd
+		// Current status: without that line GPG keys have no passphrase
+		// and none is requested.
+
+		bbutil.RunBash("gpg",
+			"--homedir", u.dir,
+			"--verbose",
+			"--batch",
+			"--gen-key",
+			tmpfile.Name(),
+		)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if err := tmpfile.Close(); err != nil {
+			log.Fatal(err)
+		}
+
+		// We do this just to for gpg to create trustdb.gpg
+		bbutil.RunBash("gpg",
+			"--homedir", u.dir,
+			"--list-keys",
+		)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		bbutil.RunBash("gpg",
+			"--homedir", u.dir,
+			"--list-secret-keys",
+		)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+	}
+
+	return u.dir
+}
+
+func hasQuick(t *testing.T) bool {
+	testing.Init()
+	fmt.Println("========== Do we have --quick-generate-key?")
+	err := bbutil.RunBash("gpg2",
+		"--dry-run",
+		"--quick-generate-key",
+		"--batch",
+		"--passphrase", "",
+		"foo", "rsa", "encr")
+	fmt.Println("========== Done")
+	if err == nil {
+		return true
+	}
+	//fmt.Printf("DISCOVER GPG: %d", err.ExitCode())
+	if exitError, ok := err.(*exec.ExitError); ok {
+		if exitError.ExitCode() == 0 {
+			return true
+		}
+	}
+	return false
+}
+
+func become(t *testing.T, name string) {
+	testing.Init()
+	u := users[name]
+
+	os.Setenv("GNUPGHOME", u.dir)
+	os.Setenv("GPG_AGENT_INFO", u.agentInfo)
+	bbutil.RunBash("git", "config", "user.name", u.name)
+	bbutil.RunBash("git", "config", "user.email", u.fullname)
+}
+
+//	// Get fingerprint:
+//	// Retrieve fingerprint of generated key.
+//	// Use it to extract the secret/public keys.
+//	// (stolen from https://raymii.org/s/articles/GPG_noninteractive_batch_sign_trust_and_send_gnupg_keys.html)
+//
+//	// fpr=`gpg --homedir /tmp/blackbox_createrole --fingerprint --with-colons "$ROLE_NAME" | awk -F: '/fpr:/ {print $10}' | head -n 1`
+//	var fpr string
+//	bbutil.RunBashOutput("gpg",
+//		"--homedir", "/tmp/blackbox_createrole",
+//		"--fingerprint",
+//		"--with-colons",
+//		u.email,
+//	)
+//	for i, l := range string.Split(out, "\n") {
+//		if string.HasPrefix(l, "fpr:") {
+//			fpr = strings.Split(l, ":")[9]
+//		}
+//		break
+//	}
+//
+//	// Create key key:
+//	// gpg --homedir "$gpghomedir" --batch --passphrase '' --quick-add-key "$fpr" rsa encr
+//	bbutil.RunBash("gpg",
+//		"--homedir", u.dir,
+//		"--batch",
+//		"--passphrase", "",
+//		"--quick-add-key", fpr,
+//		"rsa", "encr",
+//	)
+
+// function md5sum_file() {
+//   # Portably generate the MD5 hash of file $1.
+//   case $(uname -s) in
+//     Darwin | FreeBSD )
+//       md5 -r "$1" | awk '{ print $1 }'
+//       ;;
+//     NetBSD )
+//       md5 -q "$1"
+//       ;;
+//     SunOS )
+//       digest -a md5 "$1"
+//       ;;
+//     Linux )
+//       md5sum "$1" | awk '{ print $1 }'
+//       ;;
+//     CYGWIN* )
+//       md5sum "$1" | awk '{ print $1 }'
+//       ;;
+//     * )
+//       echo 'ERROR: Unknown OS. Exiting.'
+//       exit 1
+//       ;;
+//   esac
+// }
+//
+// function assert_file_missing() {
+//   if [[ -e "$1" ]]; then
+//     echo "ASSERT FAILED: ${1} should not exist."
+//     exit 1
+//   fi
+// }
+//
+// function assert_file_exists() {
+//   if [[ ! -e "$1" ]]; then
+//     echo "ASSERT FAILED: ${1} should exist."
+//     echo "PWD=$(/usr/bin/env pwd -P)"
+//     #echo "LS START"
+//     #ls -la
+//     #echo "LS END"
+//     exit 1
+//   fi
+// }
+// function assert_file_md5hash() {
+//   local file="$1"
+//   local wanted="$2"
+//   assert_file_exists "$file"
+//   local found
+//   found=$(md5sum_file "$file")
+//   if [[ "$wanted" != "$found" ]]; then
+//     echo "ASSERT FAILED: $file hash wanted=$wanted found=$found"
+//     exit 1
+//   fi
+// }
+// function assert_file_group() {
+//   local file="$1"
+//   local wanted="$2"
+//   local found
+//   assert_file_exists "$file"
+//
+//   case $(uname -s) in
+//     Darwin | FreeBSD | NetBSD )
+//       found=$(stat -f '%Dg' "$file")
+//       ;;
+//     Linux | SunOS )
+//       found=$(stat -c '%g' "$file")
+//       ;;
+//     CYGWIN* )
+//       echo "ASSERT_FILE_GROUP: Running on Cygwin. Not being tested."
+//       return 0
+//       ;;
+//     * )
+//       echo 'ERROR: Unknown OS. Exiting.'
+//       exit 1
+//       ;;
+//   esac
+//
+//   echo "DEBUG: assert_file_group X${wanted}X vs. X${found}X"
+//   echo "DEBUG:" $(which stat)
+//   if [[ "$wanted" != "$found" ]]; then
+//     echo "ASSERT FAILED: $file chgrp group wanted=$wanted found=$found"
+//     exit 1
+//   fi
+// }
+// function assert_file_perm() {
+//   local wanted="$1"
+//   local file="$2"
+//   local found
+//   assert_file_exists "$file"
+//
+//   case $(uname -s) in
+//     Darwin | FreeBSD | NetBSD )
+//       found=$(stat -f '%Sp' "$file")
+//       ;;
+//     # NB(tlim): CYGWIN hasn't been tested. It might be more like Darwin.
+//     Linux | CYGWIN* | SunOS )
+//       found=$(stat -c '%A' "$file")
+//       ;;
+//     * )
+//       echo 'ERROR: Unknown OS. Exiting.'
+//       exit 1
+//       ;;
+//   esac
+//
+//   echo "DEBUG: assert_file_perm X${wanted}X vs. X${found}X"
+//   echo "DEBUG:" $(which stat)
+//   if [[ "$wanted" != "$found" ]]; then
+//     echo "ASSERT FAILED: $file chgrp perm wanted=$wanted found=$found"
+//     exit 1
+//   fi
+// }
+// function assert_line_not_exists() {
+//   local target="$1"
+//   local file="$2"
+//   assert_file_exists "$file"
+//   if grep -F -x -s -q >/dev/null "$target" "$file" ; then
+//     echo "ASSERT FAILED: line '$target' should not exist in file $file"
+//     echo "==== file contents: START $file"
+//     cat "$file"
+//     echo "==== file contents: END $file"
+//     exit 1
+//   fi
+// }
+// function assert_line_exists() {
+//   local target="$1"
+//   local file="$2"
+//   assert_file_exists "$file"
+//   if ! grep -F -x -s -q >/dev/null "$target" "$file" ; then
+//     echo "ASSERT FAILED: line '$target' should exist in file $file"
+//     echo "==== file contents: START $file"
+//     cat "$file"
+//     echo "==== file contents: END $file"
+//     exit 1
+//   fi
+// }

integrationTest/test_data/000-admin-list.txt

@@ -0,0 +1,2 @@
+user1@example.com
+user2@example.com

integrationTest/test_data/000-file-list.txt

@@ -0,0 +1,2 @@
+bar.txt
+foo.txt

integrationTest/test_data/000-status.txt

@@ -0,0 +1,9 @@
++-------------+------------------------+
+|   STATUS    |          NAME          |
++-------------+------------------------+
+| BOTHMISSING | status-BOTHMISSING.txt |
+| DECRYPTED   | status-DECRYPTED.txt   |
+| ENCRYPTED   | status-ENCRYPTED.txt   |
+| GPGMISSING  | status-GPGMISSING.txt  |
+| SHREDDED    | status-SHREDDED.txt    |
++-------------+------------------------+

integrationTest/test_data/alice-cat-plain.txt

@@ -0,0 +1 @@
+I am the foo.txt file!

integrationTest/test_data/basic-status.txt

@@ -0,0 +1,5 @@
++-----------+---------+
+|  STATUS   |  NAME   |
++-----------+---------+
+| ENCRYPTED | foo.txt |
++-----------+---------+

integrationTest/test_data/reencrypt-plain.txt

@@ -0,0 +1 @@
+I am the foo.txt file!

integrationTest/test_data/status-noreg.txt

@@ -0,0 +1,6 @@
++-----------+----------------------+
+|  STATUS   |         NAME         |
++-----------+----------------------+
+| ENCRYPTED | status-ENCRYPTED.txt |
+| NOTREG    | blah.txt             |
++-----------+----------------------+

models/crypters.go

@@ -0,0 +1,15 @@
+package models
+
+// Crypter is gpg binaries, go-opengpg, etc.
+type Crypter interface {
+	// Name returns the plug-in's canonical name.
+	Name() string
+	// Decrypt name+".gpg", possibly overwriting name.
+	Decrypt(filename string, umask int, overwrite bool) error
+	// Encrypt name, overwriting name+".gpg"
+	Encrypt(filename string, umask int, receivers []string) (string, error)
+	// Cat outputs a file, unencrypting if needed.
+	Cat(filename string) ([]byte, error)
+	// AddNewKey extracts keyname from sourcedir's GnuPG chain to destdir keychain.
+	AddNewKey(keyname, repobasename, sourcedir, destdir string) ([]string, error)
+}

models/vcs.go

@@ -0,0 +1,30 @@
+package models
+
+import "github.com/StackExchange/blackbox/v2/pkg/commitlater"
+
+// Vcs is git/hg/etc.
+type Vcs interface {
+	// Name returns the plug-in's canonical name.
+	Name() string
+	// Discover returns true if we are a repo of this type; along with the Abs path to the repo root (or "" if we don't know).
+	Discover() (bool, string)
+
+	// SetFileTypeUnix informs the VCS that files should maintain unix-style line endings.
+	SetFileTypeUnix(repobasedir string, files ...string) error
+	// IgnoreAnywhere tells the VCS to ignore these files anywhere in the repo.
+	IgnoreAnywhere(repobasedir string, files []string) error
+	// IgnoreAnywhere tells the VCS to ignore these files, rooted in the base of the repo.
+	IgnoreFiles(repobasedir string, files []string) error
+
+	// CommitTitle sets the title of the next commit.
+	CommitTitle(title string)
+	// NeedsCommit queues up commits for later execution.
+	NeedsCommit(message string, repobasedir string, names []string)
+	// DebugCommits dumps a list of future commits.
+	DebugCommits() commitlater.List
+	// FlushCommits informs the VCS to do queued up commits.
+	FlushCommits() error
+
+	// TestingInitRepo initializes a repo of this type (for use by integration tests)
+	TestingInitRepo() error
+}

pkg/bblog/bblog.go

@@ -0,0 +1,48 @@
+package bblog
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+)
+
+/*
+
+To use this, include the following lines in your .go file.
+
+var logErr *log.Logger
+var logDebug *log.Logger
+func init() {
+  logErr = bblog.GetErr()
+  logDebug = bblog.GetDebug(debug)
+}
+
+Or in a function:
+
+  logErr := bblog.GetErr()
+  logDebug := bblog.GetDebug(debug)
+	logDebug.Printf("whatever: %v", err)
+
+*/
+
+var logErr *log.Logger
+var logDebug *log.Logger
+
+// GetErr returns a logger handle used for errors
+func GetErr() *log.Logger {
+	if logErr == nil {
+		logErr = log.New(os.Stderr, "", 0)
+	}
+	return logErr
+}
+
+// GetDebug returns a Logger handle used for debug info (output is discarded if viable=false)
+func GetDebug(visible bool) *log.Logger {
+	if visible {
+		logDebug = log.New(os.Stderr, "", 0)
+	} else {
+		// Invisible mode (i.e. display nothing)
+		logDebug = log.New(ioutil.Discard, "", 0)
+	}
+	return logDebug
+}

pkg/bbutil/filestats.go

@@ -0,0 +1,130 @@
+package bbutil
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"sort"
+	"strings"
+	"time"
+)
+
+// DirExists returns true if directory exists.
+func DirExists(path string) (bool, error) {
+	stat, err := os.Stat(path)
+	if err == nil {
+		return stat.IsDir(), nil
+	}
+	if os.IsNotExist(err) {
+		return false, nil
+	}
+	return true, err
+}
+
+// FileExistsOrProblem returns true if the file exists or if we can't determine its existence.
+func FileExistsOrProblem(path string) bool {
+	_, err := os.Stat(path)
+	if err == nil {
+		return true
+	}
+	if os.IsNotExist(err) {
+		return false
+	}
+	return true
+}
+
+// Touch updates the timestamp of a file.
+func Touch(name string) error {
+	var err error
+	_, err = os.Stat(name)
+	if os.IsNotExist(err) {
+		file, err := os.Create(name)
+		if err != nil {
+			return fmt.Errorf("TouchFile failed: %w", err)
+		}
+		file.Close()
+	}
+
+	currentTime := time.Now().Local()
+	return os.Chtimes(name, currentTime, currentTime)
+}
+
+// ReadFileLines is like ioutil.ReadFile() but returns an []string.
+func ReadFileLines(filename string) ([]string, error) {
+	b, err := ioutil.ReadFile(filename)
+	if err != nil {
+		return nil, err
+	}
+	s := string(b)
+	s = strings.TrimSuffix(s, "\n")
+	if s == "" {
+		return []string{}, nil
+	}
+	l := strings.Split(s, "\n")
+	return l, nil
+}
+
+// AddLinesToSortedFile adds a line to a sorted file.
+func AddLinesToSortedFile(filename string, newlines ...string) error {
+	lines, err := ReadFileLines(filename)
+	//fmt.Printf("DEBUG: read=%q\n", lines)
+	if err != nil {
+		return fmt.Errorf("AddLinesToSortedFile can't read %q: %w", filename, err)
+	}
+	if !sort.StringsAreSorted(lines) {
+		return fmt.Errorf("AddLinesToSortedFile: file wasn't sorted: %v", filename)
+	}
+	lines = append(lines, newlines...)
+	sort.Strings(lines)
+	contents := strings.Join(lines, "\n") + "\n"
+	//fmt.Printf("DEBUG: write=%q\n", contents)
+	err = ioutil.WriteFile(filename, []byte(contents), 0o660)
+	if err != nil {
+		return fmt.Errorf("AddLinesToSortedFile can't write %q: %w", filename, err)
+	}
+	return nil
+}
+
+// AddLinesToFile adds lines to the end of a file.
+func AddLinesToFile(filename string, newlines ...string) error {
+	lines, err := ReadFileLines(filename)
+	if err != nil {
+		return fmt.Errorf("AddLinesToFile can't read %q: %w", filename, err)
+	}
+	lines = append(lines, newlines...)
+	contents := strings.Join(lines, "\n") + "\n"
+	err = ioutil.WriteFile(filename, []byte(contents), 0o660)
+	if err != nil {
+		return fmt.Errorf("AddLinesToFile can't write %q: %w", filename, err)
+	}
+	return nil
+}
+
+// FindDirInParent looks for target in CWD, or .., or ../.., etc.
+func FindDirInParent(target string) (string, error) {
+	// Prevent an infinite loop by only doing "cd .." this many times
+	maxDirLevels := 30
+	relpath := "."
+	for i := 0; i < maxDirLevels; i++ {
+		// Does relpath contain our target?
+		t := filepath.Join(relpath, target)
+		//logDebug.Printf("Trying %q\n", t)
+		_, err := os.Stat(t)
+		if err == nil {
+			return t, nil
+		}
+		if !os.IsNotExist(err) {
+			return "", fmt.Errorf("stat failed FindDirInParent (%q): %w", t, err)
+		}
+		// Ok, it really wasn't found.
+
+		// If we are at the root, stop.
+		if abs, err := filepath.Abs(relpath); err == nil && abs == "/" {
+			break
+		}
+		// Try one directory up
+		relpath = filepath.Join("..", relpath)
+	}
+	return "", fmt.Errorf("Not found")
+}

pkg/bbutil/rbio_test.go

@@ -0,0 +1,21 @@
+package bbutil
+
+import (
+	"testing"
+)
+
+func TestRunBashInputOutput(t *testing.T) {
+
+	in := "This is a test of the RBIO system.\n"
+	bin := []byte(in)
+
+	out, err := RunBashInputOutput(bin, "cat")
+	sout := string(out)
+	if err != nil {
+		t.Error(err)
+	}
+
+	if in != sout {
+		t.Errorf("not equal %q %q", in, out)
+	}
+}

pkg/bbutil/runbash.go

@@ -0,0 +1,77 @@
+package bbutil
+
+import (
+	"bytes"
+	"fmt"
+	"log"
+	"os"
+	"os/exec"
+)
+
+// RunBash runs a Bash command.
+func RunBash(command string, args ...string) error {
+	cmd := exec.Command(command, args...)
+	cmd.Stdin = os.Stdin
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	err := cmd.Start()
+	if err != nil {
+		log.Fatal(err)
+	}
+	err = cmd.Wait()
+	if err != nil {
+		return fmt.Errorf("RunBash cmd=%q err=%w", command, err)
+	}
+	return nil
+}
+
+// RunBashOutput runs a Bash command, captures output.
+func RunBashOutput(command string, args ...string) (string, error) {
+	cmd := exec.Command(command, args...)
+	cmd.Stdin = os.Stdin
+	cmd.Stderr = os.Stderr
+	out, err := cmd.Output()
+	if err != nil {
+		return "", fmt.Errorf("RunBashOutput err=%w", err)
+	}
+	return string(out), err
+}
+
+// RunBashOutputSilent runs a Bash command, captures output, discards stderr.
+func RunBashOutputSilent(command string, args ...string) (string, error) {
+	cmd := exec.Command(command, args...)
+	cmd.Stdin = os.Stdin
+	// Leave cmd.Stderr unmodified and stderr is discarded.
+	out, err := cmd.Output()
+	if err != nil {
+		return "", fmt.Errorf("RunBashOutputSilent err=%w", err)
+	}
+	return string(out), err
+}
+
+// RunBashInput runs a Bash command, sends input on stdin.
+func RunBashInput(input string, command string, args ...string) error {
+
+	cmd := exec.Command(command, args...)
+	cmd.Stdin = bytes.NewBuffer([]byte(input))
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	err := cmd.Run()
+	if err != nil {
+		return fmt.Errorf("RunBashInput err=%w", err)
+	}
+	return nil
+}
+
+// RunBashInputOutput runs a Bash command, sends input on stdin.
+func RunBashInputOutput(input []byte, command string, args ...string) ([]byte, error) {
+
+	cmd := exec.Command(command, args...)
+	cmd.Stdin = bytes.NewBuffer(input)
+	cmd.Stderr = os.Stderr
+	out, err := cmd.Output()
+	if err != nil {
+		return nil, fmt.Errorf("RunBashInputOutput err=%w", err)
+	}
+	return out, nil
+}

pkg/bbutil/shred.go

@@ -0,0 +1,109 @@
+package bbutil
+
+// Pick an appropriate secure erase command for this operating system
+// or just delete the file with os.Remove().
+
+// Code rewritten based https://codereview.stackexchange.com/questions/245072
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+)
+
+var shredCmds = []struct {
+	name, opts string
+}{
+	{"sdelete", "-a"},
+	{"shred", "-u"},
+	{"srm", "-f"},
+	{"rm", "-Pf"},
+}
+
+func shredTemp(path, opts string) error {
+	file, err := ioutil.TempFile("", "shredTemp.")
+	if err != nil {
+		return err
+	}
+	filename := file.Name()
+	defer os.Remove(filename)
+	defer file.Close()
+
+	err = file.Close()
+	if err != nil {
+		return err
+	}
+	err = RunBash(path, opts, filename)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+var shredPath, shredOpts = func() (string, string) {
+	for _, cmd := range shredCmds {
+		path, err := exec.LookPath(cmd.name)
+		if err != nil {
+			continue
+		}
+		err = shredTemp(path, cmd.opts)
+		if err == nil {
+			return path, cmd.opts
+		}
+	}
+	return "", ""
+}()
+
+// ShredInfo reveals the shred command and flags (for "blackbox info")
+func ShredInfo() string {
+	return shredPath + " " + shredOpts
+}
+
+// shredFile shreds one file.
+func shredFile(filename string) error {
+	fi, err := os.Stat(filename)
+	if err != nil {
+		return err
+	}
+	if !fi.Mode().IsRegular() {
+		err := fmt.Errorf("filename is not mode regular")
+		return err
+	}
+
+	if shredPath == "" {
+		// No secure erase command found.  Default to a normal file delete.
+		// TODO(tlim): Print a warning? Have a flag that causes this to be an error?
+		return os.Remove(filename)
+	}
+
+	err = RunBash(shredPath, shredOpts, filename)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// ShredFiles securely erases a list of files.
+func ShredFiles(names []string) error {
+
+	// TODO(tlim) DO the shredding in parallel like in v1.
+
+	var eerr error
+	for _, n := range names {
+		_, err := os.Stat(n)
+		if err != nil {
+			if os.IsNotExist(err) {
+				fmt.Printf("======= already gone: %q\n", n)
+				continue
+			}
+		}
+		fmt.Printf("========== SHREDDING: %q\n", n)
+		e := shredFile(n)
+		if e != nil {
+			eerr = e
+			fmt.Printf("ERROR: %v\n", e)
+		}
+	}
+	return eerr
+}