Commit Graph

217 Commits

Author SHA1 Message Date
Tom Limoncelli
15a0fa9490 merge 2018-12-09 07:30:49 -05:00
Kamil Wilczek
17ce90125b .blackbox is now the default config directory for new repos. (#272)
- _blackbox_common.sh sets the default Blackbox directory
  for the new repositories using the first entry of the
  BLACKBOX_CANDIDATES array. This small change sets the
  first entry to the new .blackbox dir (instead of the keyring/live)
2018-10-03 09:09:11 -04:00
Tobias Dubois
9d305233ca Add blackbox_decrypt_file (#270)
Add a command for decrypting single files. It is currently just an alias
for blackbox_edit_start.
It is meant to be a more obvious command for decrypting a single file
without editing it.

Fixes #268
2018-09-27 07:31:03 -04:00
r-savu
dc9fa326f4 Improved compatibility: change"/bin/[x]" to "/usr/bin/env [x]" (#265)
changed paths of the form "/bin/[x]" into "/usr/bin/env [x]" (#265)
2018-08-13 10:39:15 -04:00
winter0mute
74de17a4f6 Add blackbox_less. (#263)
* Add blackbox_view and use PAGER (default to less)
2018-07-26 10:24:32 -04:00
Ben Tullis
e01f740504 Ensure that git commits the changes to pubring.gpg when running blackbox_removeadmin
This relates to https://github.com/StackExchange/blackbox/issues/247 where it has been observed that the blackbox_removeadmin script prompts the user to run an incorrect command after running blackbox_removeadmin. This commit simply adds pubring.gpg to the list of files to be committed.
2018-04-13 13:31:53 -04:00
Pim Snel
efda6e25ec Fix problems when gpg2 is installed next to gpg (#237)
* implement fixes from https://stackoverflow.com/questions/44247308/blackbox-gpg-decrypt-fails-dont-know-ctb-00
* fix problems when working with gpg2 next to gpg. Add's readme section
* fix anchor
2018-04-13 13:31:53 -04:00
Jinn Koriech
8b944f3ac9 Exclude our default keyring from import
By default GPG will continue to perform actions against our default keyring.

During the keychain import stage this results in the export of both the
keyring for the repository we're working on, plus our own default keyring.
The import phase then continues to import all these exported keys, which
include the entries from our default keyring, for which all those entries
already exist.  If you have a lot of keys in your default keyring this takes a
long time, and can be noisy due to validation, yet offers absolutely no value.

To avoid all this overhead we only need to pass the `--no-default-keyring`
option to GPG during this export phase.  The result will still be what we're
expecting - i.e. that all entries from the repository pubring are imported
into our default keyring.
2018-04-13 13:31:53 -04:00
Tom Limoncelli
60cfa8a8e7 .gitattributes not created in some situations
Replaces https://github.com/StackExchange/blackbox/pull/146
2018-04-13 13:31:53 -04:00
Jon Bardin
9b5e91c57c Fixes issue were .gitignore is not included in the commit when you register new file (#206)
* this should fix the .gitignore not be including in the commit when registering a new file
2018-04-13 13:31:53 -04:00
Aymeric Beaumet
0386308e4e Store keys in .blackbox directory (#218) 2018-04-13 13:31:53 -04:00
James Gregory
9165a77d15 Fixed Alpine compatibility (chmod) (#212) 2018-04-13 13:31:53 -04:00
Patrick Sanders
25bc3e64b7 direct repobase message to stderr (#204) 2018-04-13 13:31:53 -04:00
Jinn Koriech
620f77fbe9 Silence 'not changed' output during keychain import (#200)
Previously the keychain import appears to have redirected stderr to stdout,
silenced lines that indicate a key has 'not changed' then send the output back
to stdout.  This behaviour has been carried over to the new GnuPG-2.1
compatible implementation.
2018-04-13 13:31:53 -04:00
Tom Limoncelli
e1f03e4a74 Blackbox should work with Windows better WRT crlf. 2018-04-13 13:31:53 -04:00
Tom Limoncelli
9ee69f7f5a "gpg --export" should export LANG=C.UTF-8 to be safe. 2018-04-13 13:31:53 -04:00
Robert Taylor
3e60c0c80e Fixing physical_directory_of function for cases when target directory lives in root. (#194) 2018-04-13 13:31:53 -04:00
Tom Limoncelli
d81cc6653f Fix https://github.com/StackExchange/blackbox/issues/193
Add unit tests to tools/confidence_test.sh to verify admin operations work.
2018-04-13 13:31:52 -04:00
tlimoncelli@stackoverflow.com
3b0f0194a0 tools/confidence_test.sh: now works with gnupg-2.0 and gnupg-2.1 2018-04-13 13:31:52 -04:00
tlimoncelli@stackoverflow.com
ca1d10ba80 tools/confidence_test.sh: now works with gnupg-2.0 again 2018-04-13 13:31:52 -04:00
tlimoncelli@stackoverflow.com
836657ebdf blackbox_shred_all_files: BUGFIX: Does not shred files with spaces. 2018-04-13 13:31:52 -04:00
tlimoncelli@stackoverflow.com
5767f22445 blackbox_removeadmin: Disable gpg's confirmation. 2018-04-13 13:31:52 -04:00
Matthew
415f7664b5 shred_file() outputs warning message to stderr. (#192) 2018-04-13 13:31:52 -04:00
Simon Gate
5a05be06c7 Don't complain about GPG_AGENT_INFO if using newer gpg-agent (#189) 2018-04-13 13:31:52 -04:00
Graham Lyons
bb9f8584c3 Use the rm command with -P as a shred fallback (#179)
* Use the `rm` command with `-P` as a shred fallback

The newer versions of OSX (Sierra) have neither `shred` nor `srm`.
They do have `rm` with the `-P` option, so we can fall back to that
before resorting to plain old `rm`.

* Add double-quotes and braces to the shell variable.

We should treat the variable as a string, and we should also be safe
when interpolating it.
2018-04-13 13:31:52 -04:00
Tom Limoncelli
c89951c3db make_tempdir must create shorter paths. 2018-04-13 13:31:52 -04:00
Tino Breddin
653cfb618e [FreeBSD] Fix use of chmod (#180)
LGTM

Thanks for the fix!
2018-04-13 13:31:52 -04:00
Ben Watson
d7ed89da4c Requiring a file to be entered to finish editing (#175)
* Requiring a file to be entered to finish editing

Running blackbox_edit_end without an argument doesn't currently print out a warning that no files are being changed. A developer in my team who was new to Blackbox committed a decrypted file (and made no changes to the GPG file) as they didn't realise the command hadn't worked.

The check I've added should help to avoid these errors.

* Adding argument check to start editing
2018-04-13 13:31:52 -04:00
Joseph Herlant
7e3eb624f5 Remove the key from the keyring when removing an admin (#173)
Thanks for the submission!
2018-04-13 13:31:52 -04:00
Tino Breddin
d4e8acd5ef Add FreeBSD support (#172) 2018-04-13 13:31:52 -04:00
Jason Price
7ca433361e Add list admins commandline tool. (#170)
* adding a list_admins command

* updating README and V2 ideas to include list_admins

* fix documentation misses

* add list_admins to the toolchain
2018-04-13 13:31:52 -04:00
Dave Jachimiak
2f3dc405f1 ignore backup files and secring.gpg in $BLACKBOXDATA (#169) 2018-04-13 13:31:52 -04:00
Tom Limoncelli
ad0673841e merged 2018-04-13 13:31:24 -04:00
Jose Diaz-Gonzalez
05c87ad601 Check return value contents
Closes #156
2018-04-13 13:30:16 -04:00
jonathan vanasco
689952582d added blackbox_listadmins, which just displays active admins via cat "$BB_ADMINS" 2018-04-13 13:30:16 -04:00
Ben Tullis
7cebec9450 Ensure that git commits the changes to pubring.gpg when running blackbox_removeadmin
This relates to https://github.com/StackExchange/blackbox/issues/247 where it has been observed that the blackbox_removeadmin script prompts the user to run an incorrect command after running blackbox_removeadmin. This commit simply adds pubring.gpg to the list of files to be committed.
2018-04-11 11:06:14 +01:00
Pim Snel
0c4cdace10 Fix problems when gpg2 is installed next to gpg (#237)
* implement fixes from https://stackoverflow.com/questions/44247308/blackbox-gpg-decrypt-fails-dont-know-ctb-00
* fix problems when working with gpg2 next to gpg. Add's readme section
* fix anchor
2018-01-05 08:05:57 -05:00
Jinn Koriech
3fda14fd23 Exclude our default keyring from import
By default GPG will continue to perform actions against our default keyring.

During the keychain import stage this results in the export of both the
keyring for the repository we're working on, plus our own default keyring.
The import phase then continues to import all these exported keys, which
include the entries from our default keyring, for which all those entries
already exist.  If you have a lot of keys in your default keyring this takes a
long time, and can be noisy due to validation, yet offers absolutely no value.

To avoid all this overhead we only need to pass the `--no-default-keyring`
option to GPG during this export phase.  The result will still be what we're
expecting - i.e. that all entries from the repository pubring are imported
into our default keyring.
2017-11-11 09:34:59 +00:00
Tom Limoncelli
9ff5892ddf .gitattributes not created in some situations
Replaces https://github.com/StackExchange/blackbox/pull/146
2017-11-07 10:57:08 -05:00
Jon Bardin
043b66dc50 Fixes issue were .gitignore is not included in the commit when you register new file (#206)
* this should fix the .gitignore not be including in the commit when registering a new file
2017-11-07 07:52:34 -08:00
Aymeric Beaumet
60e782a09e Store keys in .blackbox directory (#218) 2017-09-17 18:13:36 -04:00
James Gregory
0626efa7e8 Fixed Alpine compatibility (chmod) (#212) 2017-09-01 05:01:20 -07:00
Patrick Sanders
b483f65c0b direct repobase message to stderr (#204) 2017-08-17 08:57:04 -07:00
Jinn Koriech
c91b29be12 Silence 'not changed' output during keychain import (#200)
Previously the keychain import appears to have redirected stderr to stdout,
silenced lines that indicate a key has 'not changed' then send the output back
to stdout.  This behaviour has been carried over to the new GnuPG-2.1
compatible implementation.
2017-07-04 10:32:48 -04:00
Tom Limoncelli
9966283368 Blackbox should work with Windows better WRT crlf. 2017-06-16 08:16:07 -04:00
Tom Limoncelli
800fe098a6 "gpg --export" should export LANG=C.UTF-8 to be safe. 2017-05-29 19:39:01 -04:00
Robert Taylor
09a62cb1d2 Fixing physical_directory_of function for cases when target directory lives in root. (#194) 2017-05-29 18:00:06 -04:00
Tom Limoncelli
7649c9f00b Fix https://github.com/StackExchange/blackbox/issues/193
Add unit tests to tools/confidence_test.sh to verify admin operations work.
2017-05-15 11:10:01 -04:00
tlimoncelli@stackoverflow.com
4bc97049ab tools/confidence_test.sh: now works with gnupg-2.0 and gnupg-2.1 2017-05-14 18:48:59 -04:00
tlimoncelli@stackoverflow.com
50ac1697c3 tools/confidence_test.sh: now works with gnupg-2.0 again 2017-05-14 17:52:27 -04:00