attr_keyring 0.5.2 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf52bc4c9faa76f061e0023bf8bf21cfe9de59a5ff1ce608392b388957be85db
-  data.tar.gz: 3b5e4145a2704b00b5784b49fd949172e66629499d0eccaaf5f237b8a1828b70
+  metadata.gz: d02280da9cb28259980ea283b6030672957657ead8b895594176eef09d78382b
+  data.tar.gz: 88ddda0bb1d9a85869246e46ab49a8f4889bc0c398d616be9dd162eec239a177
 SHA512:
-  metadata.gz: bf408bfc13aa86d353d345c47a08a40d04113408f3a7d20c9a7ba0e6cc347c12b5adf533fe0c250764cc0df330b283a96ee2a6db4cacff7ce61b20c07614772d
-  data.tar.gz: 4a38d54dbf79ad34a9b9a54bbdbc655382e4ab128209ec4f73fbcb62df46b0040519a47c394dffabc4b567e5c852a89c91ee6bfe5d35c8ed4b10dfbe1943b270
+  metadata.gz: 6a3108027fac7dbfee097e7afa3227f58f33560e540f19bc0f0b63cb4e482e8315ffafdbd4360bc31724426c9150109c6b9e46e9ecdf70526ca13cb34a8bee93
+  data.tar.gz: 16a5ca41d03b434dbf2eb4a5751af6595e7d00c93867159c3990a3e1d0a104d170dfd434580eff0420b1b966afe0877ec70362c6d66cad34e89e0f5fed8867d4

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+---
+github: [fnando]
+custom: ["https://www.paypal.me/nandovieira/🍕"]

data/.github/dependabot.yml

@@ -0,0 +1,15 @@
+---
+# Documentation:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: bundler
+    directory: "/"
+    schedule:
+      interval: "daily"

data/.github/workflows/tests.yml

@@ -0,0 +1,65 @@
+---
+name: Tests
+
+on:
+  pull_request:
+  push:
+
+jobs:
+  build:
+    name: Tests with Ruby ${{ matrix.ruby }} with ${{ matrix.gemfile }}
+    runs-on: "ubuntu-latest"
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.7", "3.0"]
+        gemfile:
+          - gemfiles/7_0.gemfile
+          - gemfiles/6_0.gemfile
+
+    services:
+      postgres:
+        image: postgres:11.5
+        ports: ["5432:5432"]
+        options:
+          --health-cmd pg_isready --health-interval 10s --health-timeout 5s
+          --health-retries 5
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: >
+            ${{ runner.os }}-${{ matrix.ruby }}-gems-${{
+            hashFiles('**/attr_keyring.gemspec') }}
+          restore-keys: >
+            ${{ runner.os }}-${{ matrix.ruby }}-gems-${{
+            hashFiles('**/attr_keyring.gemspec') }}
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - name: Install PostgreSQL 11 client
+        run: |
+          sudo apt-get -yqq install libpq-dev
+
+      - name: Install gem dependencies
+        env:
+          BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+        run: |
+          gem install bundler
+          bundle config path vendor/bundle
+          bundle update --jobs 4 --retry 3
+
+      - name: Run Tests
+        env:
+          PGHOST: localhost
+          PGUSER: postgres
+          BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+        run: |
+          psql -U postgres -c "create database test"
+          bundle exec rake

data/.rubocop.yml

@@ -1,73 +1,22 @@
+---
+inherit_gem:
+  rubocop-fnando: .rubocop.yml
+
 AllCops:
   TargetRubyVersion: 2.5
-  Include:
-    - '**/*.gemspec'
-    - '**/*.podspec'
-    - '**/*.jbuilder'
-    - '**/*.rake'
-    - '**/*.opal'
-    - '**/config.ru'
-    - '**/Gemfile'
-    - '**/Rakefile'
-    - '**/Capfile'
-    - '**/Guardfile'
-    - '**/Podfile'
-    - '**/Thorfile'
-    - '**/Vagrantfile'
-    - '**/Berksfile'
-    - '**/Cheffile'
-    - '**/Vagabondfile'
-
-Style/Documentation:
-  Enabled: false
-
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
-Layout/SpaceInsideBlockBraces:
-  EnforcedStyle: space
-  EnforcedStyleForEmptyBraces: space
-  SpaceBeforeBlockParameters: false
-
-Layout/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
-  EnforcedStyleForEmptyBraces: no_space
+  Exclude:
+    - vendor/**/*
+    - gemfiles/**/*
 
-Layout/FirstArrayElementLineBreak:
-  Enabled: true
-
-Layout/FirstHashElementLineBreak:
-  Enabled: true
-
-Style/SymbolArray:
-  Enabled: true
-
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    '%':  '[]'
-    '%i': '[]'
-    '%q': '[]'
-    '%Q': '[]'
-    '%r': '{}'
-    '%s': '[]'
-    '%w': '[]'
-    '%W': '[]'
-    '%x': '[]'
-
-Metrics/LineLength:
+Metrics/AbcSize:
   Enabled: false
 
-Style/EmptyMethod:
-  EnforcedStyle: expanded
+Layout/LineLength:
+  Exclude:
+    - test/**/*
 
-Style/FrozenStringLiteralComment:
+Metrics/MethodLength:
   Enabled: false
 
-Style/AccessModifierDeclarations:
-  EnforcedStyle: inline
-
-Style/Alias:
-  EnforcedStyle: prefer_alias_method
-
-Style/TrailingUnderscoreVariable:
+Metrics/ClassLength:
   Enabled: false

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }

data/README.md

@@ -1,16 +1,21 @@
-![attr_keyring: Simple encryption-at-rest with key rotation support for Ruby.](https://raw.githubusercontent.com/fnando/attr_keyring/master/attr_keyring.png)
+![attr_keyring: Simple encryption-at-rest with key rotation support for Ruby.](https://raw.githubusercontent.com/fnando/attr_keyring/main/attr_keyring.png)
 
 <p align="center">
-  <a href="https://travis-ci.org/fnando/attr_keyring"><img src="https://travis-ci.org/fnando/attr_keyring.svg" alt="Travis-CI"></a>
+  <a href="https://github.com/fnando/attr_keyring/actions?query=workflow%3ATests"><img src="https://github.com/fnando/attr_keyring/workflows/Tests/badge.svg" alt="Tests"></a>
   <a href="https://codeclimate.com/github/fnando/attr_keyring"><img src="https://codeclimate.com/github/fnando/attr_keyring/badges/gpa.svg" alt="Code Climate"></a>
-  <a href="https://codeclimate.com/github/fnando/attr_keyring/coverage"><img src="https://codeclimate.com/github/fnando/attr_keyring/badges/coverage.svg" alt="Test Coverage"></a>
   <a href="https://rubygems.org/gems/attr_keyring"><img src="https://img.shields.io/gem/v/attr_keyring.svg" alt="Gem"></a>
   <a href="https://rubygems.org/gems/attr_keyring"><img src="https://img.shields.io/gem/dt/attr_keyring.svg" alt="Gem"></a>
 </p>
 
-N.B.: attr_keyring is *not* for encrypting passwords--for that, you should use something like [bcrypt](https://github.com/codahale/bcrypt-ruby). It's meant for encrypting sensitive data you will need to access in plain text (e.g. storing OAuth token from users). Passwords do not fall in that category.
+N.B.: attr_keyring is not for encrypting passwords--for that, you should use
+something like [bcrypt](https://github.com/codahale/bcrypt-ruby). It's meant for
+encrypting sensitive data you will need to access in plain text (e.g. storing
+OAuth token from users). Passwords do not fall in that category.
 
-This library is heavily inspired by [attr_vault](https://github.com/uhoh-itsmaciek/attr_vault), and can read encrypted messages if you encode them in base64 (e.g. `Base64.strict_encode64(encrypted_by_attr_vault)`).
+This library is heavily inspired by
+[attr_vault](https://github.com/uhoh-itsmaciek/attr_vault), and can read
+encrypted messages if you encode them in base64 (e.g.
+`Base64.strict_encode64(encrypted_by_attr_vault)`).
 
 ## Installation
 
@@ -36,7 +41,10 @@ Or install it yourself as:
 gem "attr_keyring"
 require "keyring"
 
-keyring = Keyring.new("1" => "uDiMcWVNTuz//naQ88sOcN+E40CyBRGzGTT7OkoBS6M=")
+keyring = Keyring.new(
+  {"1" => "uDiMcWVNTuz//naQ88sOcN+E40CyBRGzGTT7OkoBS6M="},
+  digest_salt: "<custom salt>"
+)
 
 # STEP 1: Encrypt message using latest encryption key.
 encrypted, keyring_id, digest = keyring.encrypt("super secret")
@@ -52,30 +60,37 @@ puts "✉️ #{decrypted}"
 
 #### Change encryption algorithm
 
-You can choose between `AES-128-CBC`, `AES-192-CBC` and `AES-256-CBC`. By default, `AES-128-CBC` will be used.
-
-To specify the encryption algorithm, set the `encryption` option. The following example uses `AES-256-CBC`.
+You can choose between `AES-128-CBC`, `AES-192-CBC` and `AES-256-CBC`. By
+default, `AES-128-CBC` will be used.
 
-```js
-import { keyring } from "@fnando/keyring";
+To specify the encryption algorithm, set the `encryption` option. The following
+example uses `AES-256-CBC`.
 
-const keys = {"1": "uDiMcWVNTuz//naQ88sOcN+E40CyBRGzGTT7OkoBS6M="};
-const encryptor = keyring(keys, {encryption: "aes-256-cbc"});
+```ruby
+keyring = Keyring.new(
+  "1" => "uDiMcWVNTuz//naQ88sOcN+E40CyBRGzGTT7OkoBS6M=",
+  encryptor: Keyring::Encryptor::AES::AES256CBC,
+  digest_salt: "<custom salt>"
+)
 ```
 
 ### Configuration
 
 As far as database schema goes:
 
-1. You'll need a column to track the key that was used for encryption; by default it's called `keyring_id`.
-2. Every encrypted columns must follow the name `encrypted_<column name>`.
-3. Optionally, you can also have a `<column name>_digest` to help with searching (see Lookup section below).
+1. You'll need a column to track the key that was used for encryption; by
+   default it's called `keyring_id`.
+2. Every encrypted column must follow the name `encrypted_<column name>`.
+3. Optionally, you can also have a `<column name>_digest` to help with searching
+   (see Lookup section below).
 
-As far as model configuration goes, they're pretty similar, as you can see below:
+As far as model configuration goes, they're pretty similar, as you can see
+below:
 
 #### ActiveRecord
 
-From Rails 5+, ActiveRecord models now inherit from `ApplicationRecord` instead. This is how you set it up:
+From Rails 5+, ActiveRecord models now inherit from `ApplicationRecord` instead.
+This is how you set it up:
 
 ```ruby
 class ApplicationRecord < ActiveRecord::Base
@@ -86,7 +101,8 @@ end
 
 #### Sequel
 
-Sequel doesn't have an abstract model class (but it could), so you can set up the model class directly like the following:
+Sequel doesn't have an abstract model class (but it could), so you can set up
+the model class directly like the following:
 
 ```ruby
 class User < Sequel::Model
@@ -96,16 +112,20 @@ end
 
 ### Defining encrypted attributes
 
-To set up your model, you have to define the keyring (set of encryption keys) and the attributes that will be encrypted. Both ActiveRecord and Sequel have the same API, so the examples below work for both ORMs.
+To set up your model, you have to define the keyring (set of encryption keys)
+and the attributes that will be encrypted. Both ActiveRecord and Sequel have the
+same API, so the examples below work for both ORMs.
 
 ```ruby
 class User < ApplicationRecord
-  attr_keyring ENV["USER_KEYRING"]
+  attr_keyring ENV["USER_KEYRING"],
+               digest_salt: "<custom salt>"
   attr_encrypt :twitter_oauth_token, :social_security_number
 end
 ```
 
-The code above will encrypt your columns with the current key. If you're updating a record, then the column will be migrated to the latest key available.
+The code above will encrypt your columns with the current key. If you're
+updating a record, then the column will be migrated to the latest key available.
 
 You can use the model as you would normally do.
 
@@ -126,20 +146,27 @@ user.encrypted_email
 
 ### Encryption
 
-By default, AES-128-CBC is the algorithm used for encryption. This algorithm uses 16 bytes keys, but you're required to use a key that's double the size because half of that keys will be used to generate the HMAC. The first 16 bytes will be used as the encryption key, and the last 16 bytes will be used to generate the HMAC.
+By default, AES-128-CBC is the algorithm used for encryption. This algorithm
+uses 16 bytes keys, but you're required to use a key that's double the size
+because half of that keys will be used to generate the HMAC. The first 16 bytes
+will be used as the encryption key, and the last 16 bytes will be used to
+generate the HMAC.
 
-Using random data base64-encoded is the recommended way. You can easily generate keys by using the following command:
+Using random data base64-encoded is the recommended way. You can easily generate
+keys by using the following command:
 
 ```console
 $ dd if=/dev/urandom bs=32 count=1 2>/dev/null | openssl base64 -A
 qUjOJFgZsZbTICsN0TMkKqUvSgObYxnkHDsazTqE5tM=
 ```
 
-Include the result of this command in the `value` section of the key description in the keyring. Half this key is used for encryption, and half for the HMAC.
+Include the result of this command in the `value` section of the key description
+in the keyring. Half this key is used for encryption, and half for the HMAC.
 
 #### Key size
 
-The key size depends on the algorithm being used. The key size should be double the size as half of it is used for HMAC computation.
+The key size depends on the algorithm being used. The key size should be double
+the size as half of it is used for HMAC computation.
 
 - `aes-128-cbc`: 16 bytes (encryption) + 16 bytes (HMAC).
 - `aes-192-cbc`: 24 bytes (encryption) + 24 bytes (HMAC).
@@ -147,13 +174,25 @@ The key size depends on the algorithm being used. The key size should be double
 
 #### About the encrypted message
 
-Initialization vectors (IV) should be unpredictable and unique; ideally, they will be cryptographically random. They do not have to be secret: IVs are typically just added to ciphertext messages unencrypted. It may sound contradictory that something has to be unpredictable and unique, but does not have to be secret; it is important to remember that an attacker must not be able to predict ahead of time what a given IV will be.
+Initialization vectors (IV) should be unpredictable and unique; ideally, they
+will be cryptographically random. They do not have to be secret: IVs are
+typically just added to ciphertext messages unencrypted. It may sound
+contradictory that something has to be unpredictable and unique, but does not
+have to be secret; it is important to remember that an attacker must not be able
+to predict ahead of time what a given IV will be.
 
-With that in mind, _attr_keyring_ uses `base64(hmac(unencrypted iv + encrypted message) + unencrypted iv + encrypted message)` as the final message. If you're planning to migrate from other encryption mechanisms or read encrypted values from the database without using _attr_keyring_, make sure you account for this. The HMAC is 32-bytes long and the IV is 16-bytes long.
+With that in mind, _attr_keyring_ uses
+`base64(hmac(unencrypted iv + encrypted message) + unencrypted iv + encrypted message)`
+as the final message. If you're planning to migrate from other encryption
+mechanisms or read encrypted values from the database without using
+_attr_keyring_, make sure you account for this. The HMAC is 32-bytes long and
+the IV is 16-bytes long.
 
 ### Keyring
 
-Keys are managed through a keyring--a short JSON document describing your encryption keys. The keyring must be a JSON object mapping numeric ids of the keys to the key values. A keyring must have at least one key. For example:
+Keys are managed through a keyring--a short JSON document describing your
+encryption keys. The keyring must be a JSON object mapping numeric ids of the
+keys to the key values. A keyring must have at least one key. For example:
 
 ```json
 {
@@ -162,24 +201,30 @@ Keys are managed through a keyring--a short JSON document describing your encryp
 }
 ```
 
-The `id` is used to track which key encrypted which piece of data; a key with a larger id is assumed to be newer. The value is the actual bytes of the encryption key.
+The `id` is used to track which key encrypted which piece of data; a key with a
+larger id is assumed to be newer. The value is the actual bytes of the
+encryption key.
 
 #### Dynamically loading keyring
 
-If you're using Rails 5.2+, you can use credentials to define your keyring. Your `credentials.yml` must be define like the following:
+If you're using Rails 5.2+, you can use credentials to define your keyring. Your
+`credentials.yml` must be define like the following:
 
 ```yaml
+---
 user_keyring:
-  1: "QSXyoiRDPoJmfkJUZ4hJeQ=="
-  2: "r6AfOeilPDJomFsiOXLdfQ=="
+  "1": "QSXyoiRDPoJmfkJUZ4hJeQ=="
+  "2": "r6AfOeilPDJomFsiOXLdfQ=="
 ```
 
-Then you can setup your model by using `attr_keyring Rails.application.credentials.user_keyring`.
+Then you can setup your model by using
+`attr_keyring Rails.application.credentials.user_keyring`.
 
-Other possibilities (e.g. the keyring file is provided by configuration management):
+Other possibilities (e.g. the keyring file is provided by configuration
+management):
 
-- `attr_keyring YAML.load_file(keyring_file)`
-- `attr_keyring JSON.parse(File.read(keyring_file))`.
+- `attr_keyring YAML.load_file(keyring_file), digest_salt: "<custom salt>"`
+- `attr_keyring JSON.parse(File.read(keyring_file)), digest_salt: "<custom salt>"`.
 
 ### Lookup
 
@@ -189,17 +234,25 @@ One tricky aspect of encryption is looking up records by known secret. E.g.,
 User.where(email: "john@example.com")
 ```
 
-is trivial with plain text fields, but impossible with the model defined as above.
+is trivial with plain text fields, but impossible with the model defined as
+above.
 
-If a column `<attribute>_digest` exists, then a SHA1 digest from the value will be saved. This will allow you to lookup by that value instead and add unique indexes.
+If a column `<attribute>_digest` exists, then a SHA1 digest from the value will
+be saved. This will allow you to lookup by that value instead and add unique
+indexes. You don't have to use a hashing salt, but it's highly recommended; this
+way you can avoid leaking your users' info via rainbow tables.
 
 ```ruby
-User.where(email: Digest::SHA1.hexdigest("john@example.com"))
+User.where(email: User.keyring.digest("john@example.com")).first
 ```
 
 ### Key Rotation
 
-Because attr_keyring uses a keyring, with access to multiple keys at once, key rotation is fairly straightforward: if you add a key to the keyring with a higher id than any other key, that key will automatically be used for encryption when records are either created or updated. Any keys that are no longer in use can be safely removed from the keyring.
+Because attr_keyring uses a keyring, with access to multiple keys at once, key
+rotation is fairly straightforward: if you add a key to the keyring with a
+higher id than any other key, that key will automatically be used for encryption
+when records are either created or updated. Any keys that are no longer in use
+can be safely removed from the keyring.
 
 To check if an existing key with id `123` is still in use, run:
 
@@ -208,7 +261,8 @@ To check if an existing key with id `123` is still in use, run:
 User.where(keyring_id: 123).empty?
 ```
 
-You may not want to wait for records to be updated (e.g. key leaking). In that case, you can rollout a key rotation:
+You may not want to wait for records to be updated (e.g. key leaking). In that
+case, you can rollout a key rotation:
 
 ```ruby
 User.where(keyring_id: 1234).find_each do |user|
@@ -218,12 +272,18 @@ end
 
 ### What if I don't use ActiveRecord/Sequel?
 
-You can also leverage the encryption mechanism of `attr_keyring` totally decoupled from ActiveRecord/Sequel. First, make sure you load `keyring` instead. Then you can create a keyring to encrypt/decrypt strings, without even touching the database.
+You can also leverage the encryption mechanism of `attr_keyring` totally
+decoupled from ActiveRecord/Sequel. First, make sure you load `keyring` instead.
+Then you can create a keyring to encrypt/decrypt strings, without even touching
+the database.
 
 ```ruby
 require "keyring"
 
-keyring = Keyring.new("1" => "QSXyoiRDPoJmfkJUZ4hJeQ==")
+keyring = Keyring.new(
+  {"1" => "QSXyoiRDPoJmfkJUZ4hJeQ=="},
+  digest_salt: "<custom salt>"
+)
 
 encrypted, keyring_id, digest = keyring.encrypt("super secret")
 
@@ -244,26 +304,41 @@ puts decrypted
 
 ### Exchange data with Node.js
 
-If you use Node.js, you may be interested in <https://github.com/fnando/keyring-node>, which is able to read and write messages using the same format.
+If you use Node.js, you may be interested in
+<https://github.com/fnando/keyring-node>, which is able to read and write
+messages using the same format.
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run
+`rake test` to run the tests. You can also run `bin/console` for an interactive
+prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`. To
+release a new version, update the version number in `version.rb`, and then run
+`bundle exec rake release`, which will create a git tag for the version, push
+git commits and tags, and push the `.gem` file to
+[rubygems.org](https://rubygems.org).
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/fnando/attr_keyring. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at
+https://github.com/fnando/attr_keyring. This project is intended to be a safe,
+welcoming space for collaboration, and contributors are expected to adhere to
+the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the
+[MIT License](https://opensource.org/licenses/MIT).
 
 ## Icon
 
-Icon made by [Icongeek26](https://www.flaticon.com/authors/icongeek26) from [Flaticon](https://www.flaticon.com/) is licensed by Creative Commons BY 3.0.
+Icon made by [Icongeek26](https://www.flaticon.com/authors/icongeek26) from
+[Flaticon](https://www.flaticon.com/) is licensed by Creative Commons BY 3.0.
 
 ## Code of Conduct
 
-Everyone interacting in the attr_keyring project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/fnando/attr_keyring/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the attr_keyring project’s codebases, issue trackers,
+chat rooms and mailing lists is expected to follow the
+[code of conduct](https://github.com/fnando/attr_keyring/blob/main/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rake/testtask"
 
@@ -14,4 +16,4 @@ task(:rubocop) do
   RuboCop::CLI.new.run(["--config", File.join(__dir__, ".rubocop.yml")])
 end
 
-task :default => [:test, :rubocop] # rubocop:disable Style/HashSyntax, Style/SymbolArray
+task default: %i[test rubocop]

data/attr_keyring.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "./lib/attr_keyring/version"
 
 Gem::Specification.new do |spec|
@@ -10,12 +12,14 @@ Gem::Specification.new do |spec|
   spec.description   = spec.summary
   spec.homepage      = "https://github.com/fnando/attr_keyring"
   spec.license       = "MIT"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/}) }
+  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.require_paths = ["lib"]
@@ -29,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-meta"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "rubocop-fnando"
   spec.add_development_dependency "sequel"
   spec.add_development_dependency "simplecov"
 end

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "bundler/setup"
 require "attr_keyring"

data/examples/active_record_sample.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/inline"
 require "stringio"
 

data/examples/keyring_sample.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/inline"
 
 gemfile do

data/examples/sequel_sample.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/inline"
 require "stringio"
 

data/gemfiles/6_0.gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+gemspec path: ".."
+gem "activerecord", "~> 6.0.0"

data/gemfiles/7_0.gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+gemspec path: ".."
+gem "activerecord", "~> 7.0.0.rc1"

data/lib/attr_keyring/active_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_record"
 
 module AttrKeyring

data/lib/attr_keyring/sequel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "sequel"
 
 module AttrKeyring

data/lib/attr_keyring/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AttrKeyring
-  VERSION = "0.5.2".freeze
+  VERSION = "0.6.1"
 end

data/lib/attr_keyring.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AttrKeyring
   require "attr_keyring/version"
   require "keyring"
@@ -18,13 +20,11 @@ module AttrKeyring
       include InstanceMethods
 
       class << self
-        attr_accessor :encrypted_attributes
-        attr_accessor :keyring
-        attr_accessor :keyring_column_name
+        attr_accessor :encrypted_attributes, :keyring, :keyring_column_name
       end
 
       self.encrypted_attributes = []
-      self.keyring = Keyring.new({})
+      self.keyring = Keyring.new({}, digest_salt: "")
       self.keyring_column_name = :keyring_id
     end
   end
@@ -38,8 +38,8 @@ module AttrKeyring
       subclass.keyring_column_name = keyring_column_name
     end
 
-    def attr_keyring(keyring, encryptor: Keyring::Encryptor::AES::AES128CBC)
-      self.keyring = Keyring.new(keyring, encryptor)
+    def attr_keyring(keyring, options = {})
+      self.keyring = Keyring.new(keyring, options)
     end
 
     def attr_encrypt(*attributes)
@@ -73,37 +73,54 @@ module AttrKeyring
       value = value.to_s
 
       previous_keyring_id = public_send(self.class.keyring_column_name)
-      encrypted_value, keyring_id, digest = self.class.keyring.encrypt(value, previous_keyring_id)
+      encrypted_value, keyring_id, digest =
+        self.class.keyring.encrypt(value, previous_keyring_id)
 
       public_send("#{self.class.keyring_column_name}=", keyring_id)
       public_send("encrypted_#{attribute}=", encrypted_value)
-      public_send("#{attribute}_digest=", digest) if respond_to?("#{attribute}_digest=")
+
+      return unless respond_to?("#{attribute}_digest=")
+
+      public_send("#{attribute}_digest=", digest)
     end
 
     private def attr_decrypt_column(attribute)
       cache_name = :"@#{attribute}"
-      return instance_variable_get(cache_name) if instance_variable_defined?(cache_name)
+      if instance_variable_defined?(cache_name)
+        return instance_variable_get(cache_name)
+      end
 
       encrypted_value = public_send("encrypted_#{attribute}")
+
       return unless encrypted_value
 
-      decrypted_value = self.class.keyring.decrypt(encrypted_value, public_send(self.class.keyring_column_name))
+      decrypted_value = self.class.keyring.decrypt(
+        encrypted_value,
+        public_send(self.class.keyring_column_name)
+      )
 
       instance_variable_set(cache_name, decrypted_value)
     end
 
     private def clear_decrypted_column_cache(attribute)
       cache_name = :"@#{attribute}"
-      remove_instance_variable(cache_name) if instance_variable_defined?(cache_name)
+
+      return unless instance_variable_defined?(cache_name)
+
+      remove_instance_variable(cache_name)
     end
 
     private def reset_encrypted_column(attribute)
       public_send("encrypted_#{attribute}=", nil)
-      public_send("#{attribute}_digest=", nil) if respond_to?("#{attribute}_digest=")
+      if respond_to?("#{attribute}_digest=")
+        public_send("#{attribute}_digest=", nil)
+      end
       nil
     end
 
     private def migrate_to_latest_encryption_key
+      return unless self.class.keyring.current_key
+
       keyring_id = self.class.keyring.current_key.id
 
       self.class.encrypted_attributes.each do |attribute|
@@ -113,7 +130,10 @@ module AttrKeyring
         encrypted_value, _, digest = self.class.keyring.encrypt(value)
 
         public_send("encrypted_#{attribute}=", encrypted_value)
-        public_send("#{attribute}_digest=", digest) if respond_to?("#{attribute}_digest")
+
+        if respond_to?("#{attribute}_digest")
+          public_send("#{attribute}_digest=", digest)
+        end
       end
 
       public_send("#{self.class.keyring_column_name}=", keyring_id)

data/lib/keyring/encryptor/aes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Keyring
   module Encryptor
     module AES
@@ -35,7 +37,9 @@ module Keyring
 
           expected_hmac = hmac_digest(key.signing_key, encrypted_payload)
 
-          raise InvalidAuthentication, "Expected HMAC to be #{Base64.strict_encode64(expected_hmac)}; got #{Base64.strict_encode64(hmac)} instead" unless verify_signature(expected_hmac, hmac)
+          unless verify_signature(expected_hmac, hmac)
+            raise InvalidAuthentication, "Expected HMAC to be #{Base64.strict_encode64(expected_hmac)}; got #{Base64.strict_encode64(hmac)} instead" # rubocop:disable Layout/LineLength
+          end
 
           cipher.iv = iv
           cipher.key = key.encryption_key

data/lib/keyring/key.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Keyring
   class Key
     attr_reader :id, :signing_key, :encryption_key
 
     def initialize(id, key, key_size)
-      @id = Integer(id)
+      @id = Integer(id.to_s)
       @key_size = key_size
       @encryption_key, @signing_key = parse_key(key)
     end
@@ -11,13 +13,15 @@ module Keyring
     def to_s
       "#<Keyring::Key id=#{id.inspect}>"
     end
-    alias_method :inspect, :to_s
+    alias inspect to_s
 
     private def parse_key(key)
       expected_key_size = @key_size * 2
       secret = decode_key(key, expected_key_size)
 
-      raise InvalidSecret, "Secret must be #{expected_key_size} bytes, instead got #{secret.bytesize}" unless secret.bytesize == expected_key_size
+      unless secret.bytesize == expected_key_size
+        raise InvalidSecret, "Secret must be #{expected_key_size} bytes, instead got #{secret.bytesize}" # rubocop:disable Layout/LineLength
+      end
 
       signing_key = secret[0...@key_size]
       encryption_key = secret[@key_size..-1]

data/lib/keyring.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Keyring
   require "openssl"
   require "base64"
@@ -10,10 +12,19 @@ module Keyring
   InvalidSecret = Class.new(StandardError)
   EmptyKeyring = Class.new(StandardError)
   InvalidAuthentication = Class.new(StandardError)
+  MissingDigestSalt = Class.new(StandardError) do
+    def message
+      %w[
+        Please provide :digest_salt;
+        you can disable this error by explicitly passing an empty string.
+      ].join(" ")
+    end
+  end
 
   class Base
-    def initialize(keyring, encryptor)
-      @encryptor = encryptor
+    def initialize(keyring, options)
+      @encryptor = options[:encryptor]
+      @digest_salt = options[:digest_salt]
       @keyring = keyring.map do |id, value|
         Key.new(id, value, @encryptor.key_size)
       end
@@ -42,13 +53,12 @@ module Keyring
 
     def encrypt(message, keyring_id = nil)
       keyring_id ||= current_key&.id
-      digest = Digest::SHA1.hexdigest(message)
       key = self[keyring_id]
 
       [
         @encryptor.encrypt(key, message),
         keyring_id,
-        digest
+        digest(message)
       ]
     end
 
@@ -56,9 +66,19 @@ module Keyring
       key = self[keyring_id]
       @encryptor.decrypt(key, message)
     end
+
+    def digest(message)
+      Digest::SHA1.hexdigest("#{message}#{@digest_salt}")
+    end
   end
 
-  def self.new(keyring, encryptor = Encryptor::AES::AES128CBC)
-    Base.new(keyring, encryptor)
+  def self.new(keyring, options = {})
+    options = {
+      encryptor: Encryptor::AES::AES128CBC
+    }.merge(options)
+
+    raise MissingDigestSalt if options[:digest_salt].nil?
+
+    Base.new(keyring, options)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attr_keyring
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.1
 platform: ruby
 authors:
 - Nando Vieira
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-10-20 00:00:00.000000000 Z
+date: 2021-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-fnando
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -171,9 +185,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
+- ".github/dependabot.yml"
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -187,6 +203,8 @@ files:
 - examples/active_record_sample.rb
 - examples/keyring_sample.rb
 - examples/sequel_sample.rb
+- gemfiles/6_0.gemfile
+- gemfiles/7_0.gemfile
 - lib/attr_keyring.rb
 - lib/attr_keyring/active_record.rb
 - lib/attr_keyring/sequel.rb
@@ -198,7 +216,7 @@ homepage: https://github.com/fnando/attr_keyring
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -206,15 +224,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '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
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Simple encryption-at-rest plugin for ActiveRecord.
 test_files: []

data/.travis.yml

@@ -1,17 +0,0 @@
-language: ruby
-cache: bundler
-sudo: false
-notifications:
-  email: false
-rvm:
-- 2.5.3
-before_script:
-- createdb test
-- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-- chmod +x ./cc-test-reporter
-- "./cc-test-reporter before-build"
-after_script:
-- "./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT"
-env:
-  global:
-    secure: c0y7opFgX78UQL0dVq2gciMr3Ca4y4Aw4cSbQMnUwGecwuzOPUhjV98yy4b6EpQ0bLVbVcSPtx/PCVV750nxJPQsz9tWS0yGxQPBXuh2w0AX+ErYJVYaF6+hTjovEiHB86Q9g8YCD29CIMLZs2yeUrB+ORJWQcuAn8fw475Zskk8d8BWqR8CDdonFKlwS0Bx6rOqkyVy0JiNbOM4+trV/RzrNC+dc1geqOo45ceTYiGzkkMU1XANjNhzl/v0DYtCWLF/Dj1s8da96btqU6msZDfsBM73zKWtu0KJMnzqa8Ba4Tjc39kd2ro6Zb22cELBdXOFBvNCAEjbmZIaJ2OC45fES1OGZnB66SjAScdVdxKy2jOWjlFvrRiHu3Zrbl5tFTEaJ/PMHueQn4AzneK1wU2kzjq5iCwBZtMp/iJtCvz0V6qBt77qJe65YuENhcj26cDMqQkhKd0QBTWNs8r02KY3HFKcprgM+2TXxVSvfDu2cbiMInvc3K+uFNnEbu/1piTyStKWGd64WHixV6CEFpHxLU04IUNB62mSvUZtZ6V782X9kawoRyUg6lWvXmnGUUvczdJdpSR5/3gVXOWHireYy/qA6Zqoup27PPoaNgnKCa/fWvN/aJDvrGJb9OWpiK8DGi6T35V5gtDF+vd8mVzyPnYJznlWLgA5m7FSzLg=