diffcrypt 0.1.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 123f8eedd18059e8df8ceee8ab1d8bf67db179c05102f13fc0eb826e05c5d1de
-  data.tar.gz: 9ea816271de575fc3e101b2bc7898ab85513beffc0ab126426a286e86310ebdc
+  metadata.gz: 2009b6cc9a7318e8f6624d6fbde27562799a4ccd44d7aa1263d6c1ff6dbea2a8
+  data.tar.gz: 9f3aacfbd55710037b3bbadc56d6513b66775da721e4120b20ab5e95f320837e
 SHA512:
-  metadata.gz: 8a97bbbd2f9c0f3f5ec04acb7ab65514b747da321fa1bf1d295c9e7a8a98b755d711b653cc888c60fa44b26a1e115a87061ee80d01788e6680a05e42eb5c8162
-  data.tar.gz: 5a1b1446b201762d5463d0774638dee995af9c26c6aad375f804f0682dd0efb8ce74c4fb40c7c048ba306a1e24fa18bc37408173f4bbe1852e12bd552522f25d
+  metadata.gz: 5412dc78d1e840f0b8d58eb60f13b3e761945c6a76235ad9eb32fd737eaba8df027892c8ad836a56f7e154a60ecb5085608db448021d1c4cd6aad0e8a87ba696
+  data.tar.gz: 2c3002f8783d0c92f13f3efc13e8e8a23a3d5d80aaa9ea1c20cf7148e8bad6b3ad1a840389412c138f70a8c494c465fc592beea2774f616ca63b8406370d7797

data/.circleci/config.yml

@@ -0,0 +1,25 @@
+version: 2.1
+
+jobs:
+  build:
+    docker:
+      - image: circleci/ruby:2.6.6
+    steps:
+      - checkout
+      - run: bundle install
+      - run:
+          name: Setup Code Climate test-reporter
+          command: |
+            # download test reporter as a static binary
+            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+            chmod +x ./cc-test-reporter
+      - run:
+          name: rake test
+          command: |
+            ./cc-test-reporter before-build
+            bundle exec rake test
+            ./cc-test-reporter after-build --coverage-input-type lcov --exit-code $?
+      - run:
+          name: rubocop
+          command: bundle exec rubocop
+          when: always

data/.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  rebase-strategy: auto
+  schedule:
+    interval: daily

data/.rubocop.yml

@@ -9,6 +9,12 @@ Style/Documentation:
 Metrics/MethodLength:
   Exclude:
     - test/**/*_test.rb
+TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: consistent_comma
+Style/AccessorGrouping:
+  EnforcedStyle: separated
 
 Layout/LineLength:
   Exclude:

data/CHANGELOG.md

@@ -0,0 +1,74 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+
+
+## [0.3.2] - 2020-07-20
+
+### Added
+
+- CLI: `diffcrypt generate-key` command to generate a new key for a cipher
+- Internal: Library now generates and publishes code coverage publically on Code Climate
+
+### Changed
+
+- Only support ruby 2.5+ since 2.4 is no longer maintained
+
+### Removed
+
+- No longer generate and store a checksum. Backwards compatible since it wasn't used
+
+
+
+## [0.3.1] - 2020-07-08
+
+### Fixed
+
+- Thor deprecation error no longer shows on CLI failure
+
+### Changed
+
+- Thor 0.20+ can now be used alongside this gem
+
+
+
+## [0.3.0] - 2020-06-30
+
+## Added
+
+- CLI: Use diffcrypt from command line of any project without requiring ruby integration
+- CLI: `diffcrypt encrypt` Directly encrypt any file and output the contents
+- CLI: `diffcrypt decrypt` Directly decrypt any file and output the contents
+
+
+
+## [0.2.0] - 2020-06-28
+
+### Added
+
+- Store client, cipher and checksum in file metadata
+
+### Fixed
+
+- Only attenpt to decrypt original content if it exists
+
+
+
+## [0.1.1] - 2020-06-28
+
+### Fixed
+
+- Converting rails native credentials files would fail on first run
+
+
+
+## [0.1.0] - 2020-06-28
+
+### Added
+
+- First release!
+- Rails support via monkey patch

data/Gemfile

@@ -7,4 +7,6 @@ gemspec
 
 gem 'minitest', '~> 5.0'
 gem 'rake', '~> 13.0'
-gem 'rubocop', '~> 0.86'
+gem 'rubocop', '~> 0.88.0'
+gem 'simplecov', '~> 0.17.0', require: false # CodeClimate not compatible with 0.18+ yet - https://github.com/codeclimate/test-reporter/issues/413
+gem 'simplecov-lcov', '< 0.8'

data/README.md

@@ -1,5 +1,9 @@
 # Diffcrypt
 
+[![Gem Version](https://badge.fury.io/rb/diffcrypt.svg)](https://rubygems.org/gems/diffcrypt)
+[![CircleCI](https://circleci.com/gh/marcqualie/diffcrypt.svg?style=svg)](https://circleci.com/gh/marcqualie/diffcrypt)
+
+
 Diffable encrypted files that you can safely commit into your repo.
 
 
@@ -16,7 +20,7 @@ And then execute:
 
     $ bundle install
 
-Or install it yourself as:
+Or install it globally (to use the CLI from any project):
 
     $ gem install diffcrypt
 
@@ -24,8 +28,24 @@ Or install it yourself as:
 
 ## Usage
 
+There are a few ways to use the library, depending on how advanced your use case is.
+
 
-### Encrypt existing file
+### CLI
+
+The easiest way to get started is to use the CLI.
+
+```shell
+diffcrypt decrypt -k $(cat test/fixtures/master.key) test/fixtures/example.yml.enc
+diffcrypt encrypt -k $(cat test/fixtures/master.key) test/fixtures/example.yml
+```
+
+
+### Ruby
+
+A direct API is exposed so `Diffcrypt::Encryptor` can be used in any ruby project.
+
+**NOTE:** This API may change any time until v1.0
 
 ```ruby
 encryptor = Diffcrypt::Encryptor.new('99e1f86b9e61f24c56ff4108dd415091')
@@ -34,18 +54,16 @@ encrypted = encryptor.encrypt(yaml)
 File.write('tmp/example.yml.enc', encrypted)
 ```
 
-### Decrypt a file
-
 ```ruby
 encryptor = Diffcrypt::Encryptor.new('99e1f86b9e61f24c56ff4108dd415091')
 yaml = File.read('test/fixtures/example.yml.enc')
 config = YAML.safe_load(encryptor.decrypt(yaml))
 ```
 
-### Rails
+### Ruby on Rails
 
 Currently there is not native support for rails, but ActiveSupport can be monkeypatched to override
-the build in encrypter.
+the built in encrypter. All existing `rails credentials:edit` also work with this method.
 
 ```ruby
 require 'diffcrypt/rails/encrypted_configuration'

data/SECURITY.md

@@ -0,0 +1,17 @@
+# Security Policy
+
+
+
+## Supported Versions
+
+Since the internal APIs may change dramatically until v1.0, here is a list of the versions that are supported.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 0.3.x   | :white_check_mark: |
+
+
+
+## Reporting a Vulnerability
+
+Please email security@marcqualie.com to report any security issues.

data/bin/diffcrypt

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'thor'
+
+require_relative '../lib/diffcrypt/cli'
+
+Diffcrypt::CLI.start(ARGV)

data/diffcrypt.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'Diffable encrypted configuration files that can be safely committed into a git repository'
   spec.homepage      = 'https://github.com/marcqualie/diffcrypt'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
@@ -25,9 +25,10 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir = 'exe'
-  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = 'bin'
+  spec.executables = %w[diffcrypt]
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'activesupport', '~> 6.0.0'
+  spec.add_runtime_dependency 'thor', '>= 0.20', '< 2'
 end

data/lib/diffcrypt/cli.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require_relative './encryptor'
+require_relative './version'
+
+module Diffcrypt
+  class CLI < Thor
+    desc 'decrypt <path>', 'Decrypt a file'
+    method_option :key, aliases: %i[k], required: true
+    def decrypt(path)
+      ensure_file_exists(path)
+      contents = File.read(path)
+      puts encryptor.decrypt(contents)
+    end
+
+    desc 'encrypt <path>', 'Encrypt a file'
+    method_option :key, aliases: %i[k], required: true
+    def encrypt(path)
+      ensure_file_exists(path)
+      contents = File.read(path)
+      puts encryptor.encrypt(contents)
+    end
+
+    desc 'generate-key', 'Generate a 32 bit key'
+    method_option :cipher, default: Encryptor::CIPHER
+    def generate_key
+      say Encryptor.generate_key(options[:cipher])
+    end
+
+    desc 'version', 'Show client version'
+    def version
+      say Diffcrypt::VERSION
+    end
+
+    no_commands do
+      def key
+        options[:key]
+      end
+
+      def encryptor
+        @encryptor ||= Encryptor.new(key)
+      end
+
+      def ensure_file_exists(path)
+        abort('[ERROR] File does not exist') unless File.exist?(path)
+      end
+
+      def self.exit_on_failure?
+        true
+      end
+    end
+  end
+end

data/lib/diffcrypt/encryptor.rb

@@ -8,12 +8,14 @@ require 'yaml'
 
 require 'active_support/message_encryptor'
 
+require_relative './version'
+
 module Diffcrypt
   class Encryptor
     CIPHER = 'aes-128-gcm'
 
-    def self.generate_key
-      SecureRandom.hex(ActiveSupport::MessageEncryptor.key_len(CIPHER))
+    def self.generate_key(cipher = CIPHER)
+      SecureRandom.hex(ActiveSupport::MessageEncryptor.key_len(cipher))
     end
 
     def initialize(key)
@@ -24,7 +26,7 @@ module Diffcrypt
     # @param [String] contents The raw YAML string to be encrypted
     def decrypt(contents)
       yaml = YAML.safe_load contents
-      decrypted = decrypt_hash yaml
+      decrypted = decrypt_hash yaml['data']
       YAML.dump decrypted
     end
 
@@ -43,11 +45,23 @@ module Diffcrypt
 
     # @param [String] contents The raw YAML string to be encrypted
     # @param [String, nil] original_encrypted_contents The original (encrypted) content to determine which keys have changed
+    # @return [String]
     def encrypt(contents, original_encrypted_contents = nil)
+      data = encrypt_data contents, original_encrypted_contents
+      YAML.dump(
+        'client' => "diffcrypt-#{Diffcrypt::VERSION}",
+        'cipher' => CIPHER,
+        'data' => data,
+      )
+    end
+
+    # @param [String] contents The raw YAML string to be encrypted
+    # @param [String, nil] original_encrypted_contents The original (encrypted) content to determine which keys have changed
+    # @return [Hash] Encrypted hash containing the data
+    def encrypt_data(contents, original_encrypted_contents = nil)
       yaml = YAML.safe_load contents
-      original_yaml = original_encrypted_contents ? YAML.safe_load(original_encrypted_contents) : nil
-      encrypted = encrypt_values yaml, original_yaml
-      YAML.dump encrypted
+      original_yaml = original_encrypted_contents ? YAML.safe_load(original_encrypted_contents)['data'] : nil
+      encrypt_values yaml, original_yaml
     end
 
     # @param [String] value Plain text string that needs encrypting
@@ -66,7 +80,7 @@ module Diffcrypt
         data[key] = if value.is_a?(Hash) || value.is_a?(Array)
                       encrypt_values(value, original_encrypted_value)
                     else
-                      original_decrypted_value = original_data ? decrypt_string(original_encrypted_value) : nil
+                      original_decrypted_value = original_encrypted_value ? decrypt_string(original_encrypted_value) : nil
                       key_changed = original_decrypted_value.nil? || original_decrypted_value != value
                       key_changed ? encrypt_string(value) : original_encrypted_value
                     end

data/lib/diffcrypt/rails/encrypted_configuration.rb

@@ -29,6 +29,13 @@ module Diffcrypt
         @active_support_encryptor = ActiveSupport::MessageEncryptor.new([key].pack('H*'), cipher: Encryptor::CIPHER)
       end
 
+      # Determines if file is using the diffable format, or still
+      # encrypted using default rails credentials format
+      # @return [Boolean]
+      def content_path_diffable?
+        content_path.binread.index('---')&.zero?
+      end
+
       # Allow a config to be started without a file present
       # @return [String] Returns decryped content or a blank string
       def read
@@ -72,7 +79,7 @@ module Diffcrypt
 
         updated_contents = tmp_path.binread
 
-        write(updated_contents, content_path.binread)
+        write(updated_contents, content_path_diffable? && content_path.binread)
       ensure
         FileUtils.rm(tmp_path) if tmp_path&.exist?
       end

data/lib/diffcrypt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Diffcrypt
-  VERSION = '0.1.0'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diffcrypt
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Marc Qualie
 autorequire:
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2020-06-28 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,25 +24,51 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.20'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.20'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 description: Diffable encrypted configuration files that can be safely committed into
   a git repository
 email:
 - marc@marcqualie.com
-executables: []
+executables:
+- diffcrypt
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- SECURITY.md
 - bin/console
+- bin/diffcrypt
 - bin/setup
 - diffcrypt.gemspec
 - lib/diffcrypt.rb
+- lib/diffcrypt/cli.rb
 - lib/diffcrypt/encryptor.rb
 - lib/diffcrypt/rails/encrypted_configuration.rb
 - lib/diffcrypt/version.rb
@@ -60,14 +86,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Diffable encrypted configuration files

data/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.6
-before_install: gem install bundler -v 2.1.4