1 Commits

Author SHA1 Message Date
Tom Limoncelli
a9b1160025 Update CHANGELOG.md 2017-03-09 11:11:34 -05:00
23 changed files with 205 additions and 661 deletions

View File

@@ -1,56 +0,0 @@
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

5
.gitattributes vendored
View File

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

View File

@@ -1,40 +1,7 @@
Release v1.20180618 Release v1.20170127
* Restore `make manual-install` with warning. (#258) * Starting CHANGELOG.
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 Release v1.20170309
@@ -42,22 +9,3 @@ Release v1.20170309
* macOS: make_tempdir must create shorter paths * macOS: make_tempdir must create shorter paths
* Fix "make confidence" for newer version of Git * Fix "make confidence" for newer version of Git
* README.md: Add info about our new mailing list * 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.

View File

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

View File

@@ -7,17 +7,14 @@ OUTPUTDIR?="$(BASEDIR)/debbuild-${PKGNAME}"
all: all:
@echo 'Menu:' @echo 'Menu:'
@echo ' make update Update any generated files' @echo ' make update Update any generated files'
@echo ' make packages-rpm Make RPM packages' @echo ' make packages Make RPM packages'
@echo ' make packages-deb Make DEB packages' @echo ' make packages-deb Make DEB packages'
@echo ' make symlinks-install Make symlinks in /usr/local/bin/'
@echo ' make copy-install Copy "bin" files to /usr/local/bin/'
@echo ' make usrlocal-uninstall Remove blackbox files from /usr/local/bin/'
@echo ' make test Run tests' @echo ' make test Run tests'
@echo ' make install (incomplete)'
install: install:
@echo 'To install, copy the files from bin to somewhere in your PATH.' @echo 'To install, copy the files from bin to somewhere in your PATH.'
@echo 'The README.md document gives more details.' @echo 'Or, if you use RPMs, "make packages" and install the result.'
@echo 'Or run "make" (with no options) for more info.'
# The default package type is RPM. # The default package type is RPM.
packages: packages-rpm packages: packages-rpm
@@ -54,24 +51,12 @@ unlock-rpm:
# #
# Manual install # Manual install
# #
symlinks-install: manual-install:
@echo 'Symlinking files from ./bin to /usr/local/bin' @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 @cd bin && for f in `find . -type f -iname "*" ! -iname "Makefile"`; do ln -fs `pwd`/$$f /usr/local/bin/$$f; done
@echo 'Done.' @echo 'Done.'
manual-install: manual-uninstall:
@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 /usr/local/bin'
@cd bin && for f in `find . -type f -iname "*" ! -iname "Makefile"`; do cp `pwd`/$$f /usr/local/bin/$$f; done
@echo 'Done.'
usrlocal-uninstall:
@echo 'Removing blackbox files from /usr/local/bin' @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 @cd bin && for f in `find . -type f -iname "*" ! -iname "Makefile"`; do rm /usr/local/bin/$$f; done
@echo 'Done.' @echo 'Done.'
@@ -133,7 +118,7 @@ uninstall-stow:
update: tools/mk_deb_fpmdir.stack_blackbox.txt tools/mk_macports.vcs_blackbox.txt update: tools/mk_deb_fpmdir.stack_blackbox.txt tools/mk_macports.vcs_blackbox.txt
clean: clean:
rm -f tools/mk_deb_fpmdir.stack_blackbox.txt tools/mk_macports.vcs_blackbox.txt rm tools/mk_deb_fpmdir.stack_blackbox.txt tools/mk_macports.vcs_blackbox.txt
# #
# System Test: # System Test:
@@ -142,6 +127,7 @@ test: confidence
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 [ -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 @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/auto_system_test @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
@if which >/dev/null gpg-agent ; then pkill gpg-agent ; fi @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 @if [ -e ~/.gnupg ]; then echo ERROR: '~/.gnupg was created which means the scripts might be poluting GnuPG configuration. Fix this bug.'; false ; fi

262
README.md
View File

@@ -1,4 +1,4 @@
BlackBox [![CircleCI](https://circleci.com/gh/StackExchange/blackbox.svg?style=shield)](https://circleci.com/gh/StackExchange/workflows/blackbox) BlackBox
======== ========
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. 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.
@@ -14,31 +14,30 @@ Table of Contents
- [Table of Contents](#table-of-contents) - [Table of Contents](#table-of-contents)
- [Overview](#overview) - [Overview](#overview)
- [Why is this important?](#why-is-this-important) - [Why is this important?](#why-is-this-important)
- [Installation Instructions](#installation-instructions) - [Installation Instructions:](#installation-instructions)
- [Commands](#commands) - [Commands:](#commands)
- [Compatibility](#compatibility) - [Compatibility:](#compatibility)
- [How is the encryption done?](#how-is-the-encryption-done) - [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) - [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) - [How to use the secrets with Puppet?](#how-to-use-the-secrets-with-puppet)
- [Entire files](#entire-files) - [Entire files:](#entire-files)
- [Small strings](#small-strings) - [Small strings:](#small-strings)
- [How to enroll a new file into the system?](#how-to-enroll-a-new-file-into-the-system) - [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 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 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) - [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) - [Enabling Blackbox For a Repo](#enabling-blackbox-for-a-repo)
- [Set up automated users or “role accounts”](#set-up-automated-users-or-role-accounts) - [Set up automated users or “role accounts”](#set-up-automated-users-or-role-accounts)
- [Replacing expired keys](#replacing-expired-keys) - [Replace expired keys:](#replace-expired-keys)
- [Some common errors](#some-common-errors) - [Some common errors:](#some-common-errors)
- [Using BlackBox on Windows](#using-blackbox-on-windows) - [Using Blackbox without a repo](#using-blackbox-without-a-repo)
- [Using BlackBox without a repo](#using-blackbox-without-a-repo) - [Some Subversion gotchas:](#some-subversion-gotchas)
- [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) - [How to submit bugs or ask questions?](#how-to-submit-bugs-or-ask-questions)
- [Developer Info](#developer-info) - [Developer Info](#developer-info)
- [Alternatives](#alternatives) - [Alternatives](#alternatives)
- [License](#license) - [License](#license)
Overview Overview
======== ========
@@ -59,23 +58,22 @@ 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!!!). 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. 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.
Installation Instructions Installation Instructions:
========================= ==========================
- *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 /usr/local/bin (uninstall with `make usrlocal-uninstall`).
- *The symlinks way*: `make symlinks-install` will make symlinks of the bin files into /usr/local/bin (uninstall with `make usrlocal-uninstall`) (useful when doing development)
- *The MacPorts Way*: `sudo port install vcs_blackbox` - *The MacPorts Way*: `sudo port install vcs_blackbox`
- *The Homebrew Way*: `brew install 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 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 make a DEB via `make packages-deb`; now you can distribute the DEB via local methods. (Requires [fpm](https://github.com/jordansissel/fpm).) - *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 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 Zgen Way*: Add `zgen load StackExchange/blackbox` to your .zshrc where you're loading your other plugins.
Commands Commands:
======== =========
| Name: | Description: | | Name: | Description: |
|-------------------------------------|-------------------------------------------------------------------------| |-------------------------------------|-------------------------------------------------------------------------|
@@ -97,82 +95,52 @@ Commands
| `blackbox_update_all_files` | Decrypt then re-encrypt all files. Useful after keys are changed | | `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 | | `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 - Version Control systems
- `git` -- The Git - `git` -- The Git
- `hg` -- Mercurial - `hg` -- Mercurial
- `svn` -- SubVersion (Thanks, Ben Drasin!) - `svn` -- SubVersion (Thanks, Ben Drasin!)
- `p4` -- Perforce - `p4` -- Perforce
- none -- The files can be decrypted outside of a repo if the `.blackbox` directory is intact - none -- The files can be decrypted outside of a repo if the keyrings directory is intact
- Operating system - Operating system
- CentOS / RedHat - CentOS / RedHat
- MacOS X - MacOS X
- Cygwin (Thanks, Ben Drasin!) **See Note Below** - Cygwin (Thanks, Ben Drasin!)
- MinGW (git bash on windows) **See Note Below** - MinGW (git bash on windows) **See Note Below**
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 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` 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`
Using BlackBox on Windows Note: Cywin support requires the following packages:
=========================
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:
- Normal operation:
- gnupg - gnupg
- git or mercurial or subversion or perforce (as appropriate) - git or mercurial or subversion or perforce (as appropriate)
- Development (if you will be adding code and want to run the confidence test)
Development (if you will be adding code and want to run the confidence test)
- procps - procps
- make - make
- git (the confidence test currently only tests git) - git (the confidence test currently only tests git)
### MinGW Note: MinGW (comes with Git for Windows) support requires the following additional installations
- Normal operation:
MinGW (comes with Git for Windows) support requires the following:
Normal operation:
- [Git for Windows](https://git-scm.com/) (not tested with Mercurial) - [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. - 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. - 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 - [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. - 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`) - 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:
Development: - unknown
- 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? 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. 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.
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. 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.
@@ -293,9 +261,7 @@ blackbox_deregister_file path/to/file.name.key
How to indoctrinate a new user into the system? How to indoctrinate a new user into the system?
=============================================== ===============================================
FYI: Your repo may use `keyrings/live` instead of `.blackbox`. See "Where is the configuration stored?" `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.)
`.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. 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.
@@ -307,7 +273,7 @@ If you don't already have a GPG key, here's how to generate one:
gpg --gen-key gpg --gen-key
``` ```
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 machine secure machine with little or no internet access, full-disk-encryption, etc. Your employer probably has rules about how to store such things. 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.
Now that you have a GPG key, add yourself as an admin: Now that you have a GPG key, add yourself as an admin:
@@ -324,7 +290,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: 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 git commit -m'NEW ADMIN: tal@example.com' keyrings/live/pubring.gpg keyrings/live/trustdb.gpg keyrings/live/blackbox-admins.txt
``` ```
Then push it to the repo: Then push it to the repo:
@@ -348,7 +314,7 @@ Ask someone that already has access to re-encrypt the data files. This gives you
Pre-check: Verify the new keys look good. Pre-check: Verify the new keys look good.
``` ```
gpg --homedir=.blackbox --list-keys $ gpg --homedir=keyrings/live --list-keys
``` ```
For example, examine the key name (email address) to make sure it conforms to corporate standards. For example, examine the key name (email address) to make sure it conforms to corporate standards.
@@ -356,7 +322,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: Import the keychain into your personal keychain and reencrypt:
``` ```
gpg --import .blackbox/pubring.gpg gpg --import keyrings/live/pubring.gpg
blackbox_update_all_files blackbox_update_all_files
``` ```
@@ -392,62 +358,28 @@ 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. 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=keyrings/live --list-keys
gpg --homedir=.blackbox --delete-key olduser@example.com gpg --homedir=keyrings/live --delete-key olduser@example.com
git commit -m'Cleaned olduser@example.com from keyring' .blackbox/* git commit -m'Cleaned olduser@example.com from keyring' keyrings/live/*
``` ```
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. 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. 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.
Where is the configuration stored? .blackbox vs. keyrings/live Enabling Blackbox For a Repo
==============================================================
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: Overview:
To add "blackbox" to a git or mercurial repo, you'll need to do the following: 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 ".blackbox". 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. 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". 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. 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. ### Run the initialize script.
You'll want to include blackbox's "bin" directory in your PATH: You'll want to include blackbox's "bin" directory in your PATH:
@@ -497,8 +429,6 @@ Set up automated users or "role accounts"
i.e. This is how a Puppet Master can have access to the unencrypted data. 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. 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. 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.
@@ -561,9 +491,9 @@ Command> save
Now securely export this directory to NEWMASTER: Now securely export this directory to NEWMASTER:
``` ```
gpg --homedir . --export -a svc_sadeploy >/tmp/NEWMASTER/pubkey.txt $ gpg --homedir . --export -a svc_sadeploy >/tmp/NEWMASTER/pubkey.txt
tar cvf /tmp/keys.tar . $ tar cvf /tmp/keys.tar .
rsync -avP /tmp/keys.tar NEWMASTER:/tmp/. $ rsync -avP /tmp/keys.tar NEWMASTER:/tmp/.
``` ```
On NEWMASTER, receive the new GnuPG config: On NEWMASTER, receive the new GnuPG config:
@@ -578,12 +508,12 @@ cd ~/.gnupg && tar xpvf /tmp/keys.tar
Back on SECUREHOST, import the pubkey into the repository. Back on SECUREHOST, import the pubkey into the repository.
``` ```
$ cd .blackbox $ cd keyrings/live
$ gpg --homedir . --import /tmp/NEWMASTER/pubkey.txt $ gpg --homedir . --import /tmp/NEWMASTER/pubkey.txt
``` ```
--> -->
Back on SECUREHOST, add the new email address to .blackbox/blackbox-admins.txt: Back on SECUREHOST, add the new email address to keyrings/live/blackbox-admins.txt:
``` ```
cd /path/to/the/repo cd /path/to/the/repo
@@ -593,14 +523,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. 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 $ cd keyrings/live
ls -l secring.gpg $ ls -l secring.gpg
``` ```
Commit the recent changes: Commit the recent changes:
``` ```
cd .blackbox $ cd keyrings/live
git commit -m"Adding key for KEYNAME" pubring.gpg trustdb.gpg blackbox-admins.txt git commit -m"Adding key for KEYNAME" pubring.gpg trustdb.gpg blackbox-admins.txt
``` ```
@@ -617,7 +547,7 @@ On NEWMASTER, import the keys and decrypt the files:
``` ```
sudo -u svc_sadeploy bash # Become the role account. sudo -u svc_sadeploy bash # Become the role account.
gpg --import /etc/puppet/.blackbox/pubring.gpg gpg --import /etc/puppet/keyrings/live/pubring.gpg
export PATH=$PATH:/path/to/blackbox/bin export PATH=$PATH:/path/to/blackbox/bin
blackbox_postdeploy blackbox_postdeploy
sudo -u puppet cat /etc/puppet/hieradata/blackbox.yaml # or any encrypted file. sudo -u puppet cat /etc/puppet/hieradata/blackbox.yaml # or any encrypted file.
@@ -625,7 +555,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. 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: On SECUREHOST, securerly delete your files:
``` ```
cd /tmp/NEWMASTER cd /tmp/NEWMASTER
@@ -638,29 +568,18 @@ rm -rf /tmp/NEWMASTER
Also shred any other temporary files you may have made. Also shred any other temporary files you may have made.
Replacing expired keys Replace expired keys:
====================== =====================
If someone's key has already expired, blackbox will stop If any one admin's key expires, you can no longer encrypt files. You will need to replace the key and re-encrypt.
encrypting. You see this error:
- Step 0: You see this error:
``` ```
$ blackbox_edit_end modified_file.txt $ blackbox_edit_end modified_file.txt
--> Error: can't re-encrypt because a key has expired. --> 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: - 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. 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.
@@ -670,8 +589,8 @@ blackbox_removeadmin expired_user@example.com
# This next command overwrites any changed unencrypted files. See warning above. # This next command overwrites any changed unencrypted files. See warning above.
blackbox_update_all_files blackbox_update_all_files
git commit -m "Re-encrypt all files" git commit -m "Re-encrypt all files"
gpg --homedir=.blackbox --delete-key expired_user@example.com gpg --homedir=keyrings/live --delete-key expired_user@example.com
git commit -m 'Cleaned expired_user@example.com from keyring' .blackbox/* git commit -m 'Cleaned expired_user@example.com from keyring' keyrings/live/*
git push git push
``` ```
@@ -680,7 +599,7 @@ git push
``` ```
git pull git pull
blackbox_addadmin updated_user@example.com 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 commit -m'NEW ADMIN: updated_user@example.com keyrings/live/pubring.gpg keyrings/live/trustdb.gpg keyrings/live/blackbox-admins.txt
git push git push
``` ```
@@ -688,7 +607,7 @@ git push
``` ```
git pull git pull
gpg --import .blackbox/pubring.gpg gpg --import keyrings/live/pubring.gpg
blackbox_update_all_files blackbox_update_all_files
git commit -m "Re-encrypt all files" git commit -m "Re-encrypt all files"
git push git push
@@ -705,13 +624,11 @@ Any files that were temporarily copied in the first step so as to not be overwri
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: 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: - Add the following to `.gitattributes` at the top of the git repository:
``` ```
*.gpg diff=blackbox *.gpg diff=blackbox
``` ```
- Add the following to `.git/config`: - Add the following to `.git/config`:
``` ```
[diff "blackbox"] [diff "blackbox"]
textconv = gpg --use-agent -q --batch --decrypt textconv = gpg --use-agent -q --batch --decrypt
@@ -719,21 +636,19 @@ It's possible to tell Git to decrypt versions of the file before running them th
And now commands like `git log -p file.gpg` will show a nice log of the changes in the encrypted file. And now commands like `git log -p file.gpg` will show a nice log of the changes in the encrypted file.
Some common errors 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: 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.
`gpg: decryption failed: No secret key` -- Usually means you forgot to re-encrypt the file with the new key. `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 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). 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).
The following commands have been tested outside a repo: The following commands have been tested outside a repo:
@@ -741,28 +656,13 @@ The following commands have been tested outside a repo:
- `blackbox_edit_start` - `blackbox_edit_start`
- `blackbox_edit_end` - `blackbox_edit_end`
Some Subversion gotchas 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. 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 (ie, 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. 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? How to submit bugs or ask questions?
==================================== ====================================
@@ -770,7 +670,9 @@ 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. 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. Bugs are tracked here in Github. Please feel free to files bugs yourself:
- https://github.com/StackExchange/blackbox/issues
Developer Info Developer Info
============== ==============
@@ -793,26 +695,24 @@ This runs through a number of system tests. It creates a repo, encrypts files, d
Please submit tests with code changes: 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! Note: The tests currently assume "git" and have been tested only on CentOS, Mac OS X, and Cygwin. Patches welcome!
Alternatives 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/) - git-crypt: https://www.agwa.name/projects/git-crypt/
- [Pass](http://www.zx2c4.com/projects/password-store/) - Pass: http://www.zx2c4.com/projects/password-store/
- [Transcrypt](https://github.com/elasticdog/transcrypt) - Transcrypt: https://github.com/elasticdog/transcrypt
- [Keyringer](https://keyringer.pw/) - Keyringer: https://keyringer.pw/
- [git-secret](https://github.com/sobolevn/git-secret) - 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. git-crypt has the best git integration. Once set up it is nearly transparent to the users. However it only works with git.
License License
======= =======
This content is released under the MIT License. This content is released under the MIT License. See the LICENSE.txt file.
See the [LICENSE.txt](LICENSE.txt) file.

View File

@@ -17,7 +17,7 @@ There are 3 branches/tags:
- **tag stable:** Stable enough for use by most people. - **tag stable:** Stable enough for use by most people.
- **tag production:** Burned in long enough that we are confident it can be widely adopted. - **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.
Build Tasks Build Tasks
=========== ===========
@@ -99,7 +99,6 @@ Submit the diff file as a bug as instructed. The instructions should look like t
Step 3: Watch for the update to happen. Step 3: Watch for the update to happen.
Updating MacPorts (manual) Updating MacPorts (manual)
========================== ==========================

View File

@@ -1,12 +1,12 @@
# Ideas for BlackBox Version 2 # Ideas for blackbox Version 2
I'm writing this to solicit feedback and encourage discussion. I'm writing this to solicit feedback and encourage discussion.
Here are my thoughts on a "version 2" of BlackBox. This is where Here are my thoughts on a "verison 2" of blackbox. This is where
I list ideas that would require major changes to the system. They I list ideas that would require major changes to the system. They
might break backwards compatibility, though usually not. might break backwards compatibility, though usually not.
BlackBox grew from a few simple shell scripts used at StackOverflow.com Blackbox grew from a few simple shell scripts used at StackOverflow.com
to a larger system used by dozens (hundreds?) of organizations. Not to a larger system used by dozens (hundreds?) of organizations. Not
all the design decisions were "forward looking". all the design decisions were "forward looking".
@@ -75,7 +75,7 @@ Backwards compatibility: This would add a "none" VCS, not remove any existing fu
`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. `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. `python` is my second favorite langauge. 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. `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.
@@ -94,4 +94,4 @@ However, I've never used it so I don't have any idea whether git-crypt is any be
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. 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? How important is this to blackbox users?

View File

@@ -15,12 +15,9 @@ source "${0%/*}"/_stack_lib.sh
# Where are we? # Where are we?
: "${BLACKBOX_HOME:="$(cd "${0%/*}" ; pwd)"}" ; : "${BLACKBOX_HOME:="$(cd "${0%/*}" ; pwd)"}" ;
# What are the candidates for the blackbox data directory? # Where in the VCS repo should the blackbox data be found?
declare -a BLACKBOXDATA_CANDIDATES : "${BLACKBOXDATA:=keyrings/live}" ; # If BLACKBOXDATA not set, set it.
BLACKBOXDATA_CANDIDATES=(
'keyrings/live'
'.blackbox'
)
# If $EDITOR is not set, set it to "vi": # If $EDITOR is not set, set it to "vi":
: "${EDITOR:=vi}" ; : "${EDITOR:=vi}" ;
@@ -31,7 +28,7 @@ BLACKBOXDATA_CANDIDATES=(
function physical_directory_of() { function physical_directory_of() {
local d=$(dirname "$1") local d=$(dirname "$1")
local f=$(basename "$1") local f=$(basename "$1")
(cd "$d" && echo "$(pwd -P | sed 's/\/$//')/$f" ) (cd "$d" && echo "$(pwd -P)/$f" )
} }
# Set REPOBASE to the top of the repository # Set REPOBASE to the top of the repository
@@ -66,20 +63,10 @@ export REPOBASE=$(physical_directory_of "$REPOBASE")
# after determining what we believe to be the answer. # after determining what we believe to be the answer.
if [[ -n "$BLACKBOX_REPOBASE" ]]; then if [[ -n "$BLACKBOX_REPOBASE" ]]; then
echo "Using custom repobase: $BLACKBOX_REPOBASE" >&2 echo "Using custom repobase: $BLACKBOX_REPOBASE"
export REPOBASE="$BLACKBOX_REPOBASE" export REPOBASE="$BLACKBOX_REPOBASE"
fi 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" KEYRINGDIR="$REPOBASE/$BLACKBOXDATA"
BB_ADMINS_FILE="blackbox-admins.txt" BB_ADMINS_FILE="blackbox-admins.txt"
BB_ADMINS="${KEYRINGDIR}/${BB_ADMINS_FILE}" BB_ADMINS="${KEYRINGDIR}/${BB_ADMINS_FILE}"
@@ -176,23 +163,8 @@ function get_encrypted_filename() {
# Prepare keychain for use. # Prepare keychain for use.
function prepare_keychain() { function prepare_keychain() {
local keyringasc
echo '========== Importing keychain: START' >&2 echo '========== Importing keychain: START' >&2
# Works with gpg 2.0 $GPG --import "$(get_pubring_path)" 2>&1 | egrep -v 'not changed$' >&2
#$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 echo '========== Importing keychain: DONE' >&2
} }
@@ -305,11 +277,8 @@ function shred_file() {
#NOTE: srm by default uses 35-pass Gutmann algorithm #NOTE: srm by default uses 35-pass Gutmann algorithm
CMD=srm CMD=srm
OPT=-f OPT=-f
elif _F=$(mktemp); rm -P "${_F}" >/dev/null 2>/dev/null ; then
CMD=rm
OPT=-Pf
else else
echo "shred_file: WARNING: No secure deletion utility (shred or srm) present; using insecure rm" >&2 echo "shred_file: WARNING: No secure deletion utility (shred or srm) present; using insecure rm"
CMD=rm CMD=rm
OPT=-f OPT=-f
fi fi
@@ -428,11 +397,7 @@ function cp_permissions() {
chmod $( stat -f '%p' "$1" | sed -e "s/^100//" ) "${@:2}" chmod $( stat -f '%p' "$1" | sed -e "s/^100//" ) "${@:2}"
;; ;;
Linux | CYGWIN* | MINGW* ) Linux | CYGWIN* | MINGW* )
if [[ -e /etc/alpine-release ]]; then
chmod $( stat -c '%a' "$1" ) "${@:2}"
else
chmod --reference "$1" "${@:2}" chmod --reference "$1" "${@:2}"
fi
;; ;;
* ) * )
echo 'ERROR: Unknown OS. Exiting. (cp_permissions)' echo 'ERROR: Unknown OS. Exiting. (cp_permissions)'
@@ -678,20 +643,3 @@ function vcs_notice_generic_file() {
echo "WARNING: If so, manually update the ignore file" echo "WARNING: If so, manually update the ignore file"
fi 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
}

View File

@@ -180,109 +180,3 @@ function fail_if_in_root_directory() {
;; ;;
esac 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
}

View File

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

View File

@@ -7,7 +7,13 @@
set -e set -e
source "${0%/*}/_blackbox_common.sh" source "${0%/*}/_blackbox_common.sh"
gpg_agent_notice 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
prepare_keychain prepare_keychain
modified_files=() modified_files=()

View File

@@ -35,18 +35,6 @@ vcs_add "${KEYRINGDIR}"
touch "$BLACKBOXDATA/$BB_ADMINS_FILE" "$BLACKBOXDATA/$BB_FILES_FILE" touch "$BLACKBOXDATA/$BB_ADMINS_FILE" "$BLACKBOXDATA/$BB_FILES_FILE"
vcs_add "$BLACKBOXDATA/$BB_ADMINS_FILE" "$BLACKBOXDATA/$BB_FILES_FILE" vcs_add "$BLACKBOXDATA/$BB_ADMINS_FILE" "$BLACKBOXDATA/$BB_FILES_FILE"
if [[ $VCS_TYPE = "git" ]]; then
# 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"
fi
if [[ $VCS_TYPE = "svn" ]]; then if [[ $VCS_TYPE = "svn" ]]; then
echo echo
echo echo

View File

@@ -5,4 +5,4 @@
# #
set -e set -e
source "${0%/*}/_blackbox_common.sh" source "${0%/*}/_blackbox_common.sh"
cat "$BB_ADMINS" cat "$BB_ADMINS_FILE"

View File

@@ -44,7 +44,7 @@ function register_new_file() {
vcs_ignore "$unencrypted_file" vcs_ignore "$unencrypted_file"
echo 'NOTE: "already tracked!" messages are safe to ignore.' echo 'NOTE: "already tracked!" messages are safe to ignore.'
vcs_add "$BB_FILES" "$encrypted_file" vcs_add "$BB_FILES" "$encrypted_file"
vcs_commit "registered in blackbox: ${unencrypted_file}" "$BB_FILES" "$encrypted_file" "$(vcs_ignore_file_path)" vcs_commit "registered in blackbox: ${unencrypted_file}" "$BB_FILES" "$encrypted_file"
} }
for target in "$@"; do for target in "$@"; do

View File

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

View File

@@ -24,13 +24,11 @@ echo '========== FILES BEING SHREDDED:'
exported_internal_shred_file() { exported_internal_shred_file() {
source "$1/_blackbox_common.sh" source "$1/_blackbox_common.sh"
#unencrypted_file=$(get_unencrypted_filename "$2") unencrypted_file=$(get_unencrypted_filename "$2")
unencrypted_file="$2" encrypted_file=$(get_encrypted_filename "$unencrypted_file")
if [[ -f "$unencrypted_file" ]]; then if [[ -f "$unencrypted_file" ]]; then
echo " SHRED: $unencrypted_file" echo " $unencrypted_file"
shred_file "$unencrypted_file" shred_file "$unencrypted_file"
else
echo "NOT FOUND: $unencrypted_file"
fi fi
} }
@@ -40,6 +38,6 @@ DEREFERENCED_BIN_DIR="${0%/*}"
MAX_PARALLEL_SHRED=10 MAX_PARALLEL_SHRED=10
export IFS= export IFS=
tr '\n' '\0' <"$BB_FILES" | xargs -0 -I{} -n 1 -P $MAX_PARALLEL_SHRED bash -c "exported_internal_shred_file $DEREFERENCED_BIN_DIR \"{}\"" $DEREFERENCED_BIN_DIR/fake xargs -I{} -n 1 -P $MAX_PARALLEL_SHRED bash -c "exported_internal_shred_file $DEREFERENCED_BIN_DIR {}" $DEREFERENCED_BIN_DIR/fake <"$BB_FILES"
echo '========== DONE.' echo '========== DONE.'

View File

@@ -7,7 +7,13 @@
set -e set -e
source "${0%/*}/_blackbox_common.sh" source "${0%/*}/_blackbox_common.sh"
gpg_agent_notice 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
disclose_admins disclose_admins
prepare_keychain prepare_keychain

View File

@@ -14,7 +14,13 @@ then
fi fi
fail_if_not_in_repo fail_if_not_in_repo
gpg_agent_notice
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
COLUMNS=`tput cols` COLUMNS=`tput cols`
FILE=$1 FILE=$1

View File

@@ -1,25 +0,0 @@
#!/usr/bin/env expect
# Run the confidence test non-interactively. Since the script
# asks for passphrases, we use "expect" to simulate keyboard data entry.
# Run the test:
spawn tools/confidence_test.sh
# As we run the confidence test, respond with the right password.
# We do this for up to 300 times to prevent an infinite loop.
set times 0;
while { $times < 300 } {
expect {
# The script outputs what the password will be, and we save
# that info in $pw any time we see the text.
"my password is the lowercase letter a" { set pw "a\n" ; exp_continue }
"my password is the lowercase letter b" { set pw "b\n" ; exp_continue }
# If the passphrase is requested, send it.
"Passphrase:" { send $pw ; exp_continue }
# If we reach EOF, exit this loop.
eof { break }
}
set times [ expr $times+1];
}

View File

@@ -1,27 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
blackbox_home=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../bin blackbox_home=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../bin
export PATH="${blackbox_home}:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/local/bin:${blackbox_home}" export PATH="${blackbox_home}:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/local/bin"
export LANG=C.UTF-8 # Required ro "gpg --export" to work properly.
# This script requires many utilities, some are not
# required by the usual blackbox scripts. Test to make
# sure we have them all.
e=false
for i in blackbox_addadmin blackbox_list_admins blackbox_register_new_file \
cat git gpg gpg-agent mkdir pinentry pinentry-tty rm tar which ; do
if ! which >/dev/null 2>&1 $i ; then
echo ERROR: Command not in PATH: $i
e=true
fi
done
if $e ; then
echo 'Exiting. Please install the above commands.'
echo 'This script requires many utilities not required by blackbox itself.'
echo PATH="$PATH"
exit 1
fi
set -e set -e
. _stack_lib.sh . _stack_lib.sh
@@ -39,15 +19,10 @@ cd "$test_repository"
make_self_deleting_tempdir fake_alice_home make_self_deleting_tempdir fake_alice_home
make_self_deleting_tempdir fake_bob_home make_self_deleting_tempdir fake_bob_home
export GNUPGHOME="$fake_alice_home" export GNUPGHOME="$fake_alice_home"
#echo 'pinentry-program' "$(which pinentry-insecure-fake)" >> "$GNUPGHOME/gpg-agent.conf"
echo 'pinentry-program' "$(which pinentry-tty)" >> "$GNUPGHOME/gpg-agent.conf"
#pinentry-program "${blackbox_home}/pinentry-fake-insecure"
eval "$(gpg-agent --homedir "$fake_alice_home" --daemon)" eval "$(gpg-agent --homedir "$fake_alice_home" --daemon)"
GPG_AGENT_INFO_ALICE="$GPG_AGENT_INFO" GPG_AGENT_INFO_ALICE="$GPG_AGENT_INFO"
export GNUPGHOME="$fake_bob_home" export GNUPGHOME="$fake_bob_home"
#echo 'pinentry-program' "$(which pinentry-insecure-fake)" >> "$GNUPGHOME/gpg-agent.conf"
echo 'pinentry-program' "$(which pinentry-tty)" >> "$GNUPGHOME/gpg-agent.conf"
eval "$(gpg-agent --homedir "$fake_bob_home" --daemon)" eval "$(gpg-agent --homedir "$fake_bob_home" --daemon)"
GPG_AGENT_INFO_BOB="$GPG_AGENT_INFO" GPG_AGENT_INFO_BOB="$GPG_AGENT_INFO"
@@ -107,11 +82,7 @@ git commit -m'INITIALIZE BLACKBOX' keyrings .gitignore
PHASE 'and adds herself as an admin.' PHASE 'and adds herself as an admin.'
blackbox_addadmin alice@example.com blackbox_addadmin alice@example.com
git commit -m'NEW ADMIN: alice@example.com' keyrings/live/pubring.??? keyrings/live/trustdb.gpg keyrings/live/blackbox-admins.txt git commit -m'NEW ADMIN: alice@example.com' keyrings/live/pubring.gpg keyrings/live/trustdb.gpg keyrings/live/blackbox-admins.txt
make_self_deleting_tempfile adminlist1
blackbox_list_admins >"$adminlist1"
assert_file_md5hash "$adminlist1" "aa1db827772e1d51d453b844394b7617"
PHASE 'Bob arrives.' PHASE 'Bob arrives.'
@@ -139,18 +110,14 @@ gpg --no-permission-warning --batch --gen-key "$gpgconfig"
echo '========== Bob enrolls himself too.' echo '========== Bob enrolls himself too.'
blackbox_addadmin bob@example.com blackbox_addadmin bob@example.com
git commit -m'NEW ADMIN: alice@example.com' keyrings/live/pubring.??? keyrings/live/trustdb.gpg keyrings/live/blackbox-admins.txt git commit -m'NEW ADMIN: alice@example.com' keyrings/live/pubring.gpg keyrings/live/trustdb.gpg keyrings/live/blackbox-admins.txt
make_self_deleting_tempfile adminlist2
blackbox_list_admins >"$adminlist2"
assert_file_md5hash "$adminlist2" "0b82b0b3c96e6e5dd5faf60493fe5cf7"
PHASE 'Alice does the second part to enroll bob.' PHASE 'Alice does the second part to enroll bob.'
become_alice become_alice
PHASE 'She enrolls bob.' PHASE 'She enrolls bob.'
#gpg --import $(get_pubring_path) gpg --import keyrings/live/pubring.gpg
## TODO(tlim) That --import can be eliminated... maybe? # TODO(tlim) That --import can be eliminated... maybe?
PHASE 'She enrolls secrets.txt.' PHASE 'She enrolls secrets.txt.'
blackbox_register_new_file secret.txt blackbox_register_new_file secret.txt
@@ -218,14 +185,15 @@ assert_file_md5hash secret.txt "d3e6bbdfc76fae7fd0a921f3408db1d1"
PHASE 'appears.' PHASE 'appears.'
become_bob become_bob
#PHASE 'Bob makes sure he has all new keys.' PHASE 'Bob makes sure he has all new keys.'
#gpg --import keyrings/live/pubring.???
gpg --import keyrings/live/pubring.gpg
# Pick a GID to use: # Pick a GID to use:
# This users's default group: # This users's default group:
DEFAULT_GID_NUM=$(id -g) DEFAULT_GID_NUM=$(id -g)
# Pick a group that is not the default group: # Pick a group that is not the default group:
TEST_GID_NUM=$(grep -v "$DEFAULT_GID_NUM" /etc/group | cut -d: -f3 | sort -rn | head -1) TEST_GID_NUM=$(id -G | fmt -1 | grep -xv "$(id -u)" | grep -xv "$(id -g)" | head -1)
echo "DEFAULT_GID_NUM=$DEFAULT_GID_NUM" echo "DEFAULT_GID_NUM=$DEFAULT_GID_NUM"
echo "TEST_GID_NUM=$TEST_GID_NUM" echo "TEST_GID_NUM=$TEST_GID_NUM"
@@ -250,10 +218,6 @@ PHASE 'Bob removes Alice.'
blackbox_removeadmin alice@example.com blackbox_removeadmin alice@example.com
assert_line_not_exists 'alice@example.com' keyrings/live/blackbox-admins.txt assert_line_not_exists 'alice@example.com' keyrings/live/blackbox-admins.txt
make_self_deleting_tempfile adminlist3
blackbox_list_admins >"$adminlist3"
assert_file_md5hash "$adminlist3" "aadbfafd76ea66ff40dbfd239a69067f"
PHASE 'Bob reencrypts files so alice can not access them.' PHASE 'Bob reencrypts files so alice can not access them.'
blackbox_update_all_files blackbox_update_all_files
@@ -350,7 +314,6 @@ PHASE 'Bob shreds all exposed files.'
assert_file_exists 'my/path/to/relsecrets.txt' assert_file_exists 'my/path/to/relsecrets.txt'
assert_file_exists 'secret.txt' assert_file_exists 'secret.txt'
blackbox_shred_all_files blackbox_shred_all_files
which blackbox_shred_all_files
assert_file_missing '!important!.txt' assert_file_missing '!important!.txt'
assert_file_missing '#andpounds.txt' assert_file_missing '#andpounds.txt'
assert_file_missing 'mistake.txt' assert_file_missing 'mistake.txt'
@@ -428,10 +391,6 @@ fi
# Cleanup: # Cleanup:
blackbox_removeadmin abba@notarealuser.com blackbox_removeadmin abba@notarealuser.com
make_self_deleting_tempfile adminlist4
blackbox_list_admins >"$adminlist4"
assert_file_md5hash "$adminlist4" "aadbfafd76ea66ff40dbfd239a69067f"
# TODO: Create a new directory. "git clone" the repo into it. # TODO: Create a new directory. "git clone" the repo into it.

View File

@@ -107,7 +107,7 @@ cat "$@" | while read -a arr ; do
fi fi
if $GO_COMPILE && [[ $SRC == "cmd/"* || $SRC == *"/cmd/"* ]]; then if $GO_COMPILE && [[ $SRC == "cmd/"* || $SRC == *"/cmd/"* ]]; then
echo "========== BUILD&COPY $SRC" echo "========== BUILD&COPY $SRC"
( cd $(dirname "$SRC" ) && go get -d && go build ) ( cd $(dirname "$SRC" ) && go get -d && go build -a )
PKGARCH=native PKGARCH=native
else else
echo "========== COPY $SRC" echo "========== COPY $SRC"

View File

@@ -1,15 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# NB: This is copied from _blackbox_common.sh
function get_pubring_path() {
: "${KEYRINGDIR:=keyrings/live}" ;
if [[ -f "${KEYRINGDIR}/pubring.gpg" ]]; then
echo "${KEYRINGDIR}/pubring.gpg"
else
echo "${KEYRINGDIR}/pubring.kbx"
fi
}
function PHASE() { function PHASE() {
echo '********************' echo '********************'
echo '********************' echo '********************'
@@ -21,7 +11,7 @@ function PHASE() {
function md5sum_file() { function md5sum_file() {
# Portably generate the MD5 hash of file $1. # Portably generate the MD5 hash of file $1.
case $(uname -s) in case $(uname -s) in
Darwin | FreeBSD ) Darwin )
md5 -r "$1" | awk '{ print $1 }' md5 -r "$1" | awk '{ print $1 }'
;; ;;
Linux ) Linux )