slosilo 1.1.0 → 2.2.2

data/spec/slosilo_spec.rb

@@ -88,5 +88,37 @@ describe Slosilo do
         expect(subject.token_signer(token)).not_to be
       end
     end
+
+    context "with JWT token" do
+      before do
+        expect(key).to receive(:validate_jwt) do |jwt|
+          expect(jwt.header).to eq 'kid' => key.fingerprint
+          expect(jwt.claims).to eq({})
+          expect(jwt.signature).to eq 'sig'
+        end
+      end
+
+      it "accepts pre-parsed JSON serialization" do
+        expect(Slosilo.token_signer(
+          'protected' => 'eyJraWQiOiIxMDdiZGI4NTAxYzQxOWZhZDJmZGIyMGI0NjdkNGQwYTYyYTE2YTk4YzM1ZjJkYTBlYjNiMWZmOTI5Nzk1YWQ5In0=',
+          'payload' => 'e30=',
+          'signature' => 'c2ln'
+        )).to eq 'test'
+      end
+
+      it "accepts pre-parsed JWT token" do
+        expect(Slosilo.token_signer(Slosilo::JWT(
+          'protected' => 'eyJraWQiOiIxMDdiZGI4NTAxYzQxOWZhZDJmZGIyMGI0NjdkNGQwYTYyYTE2YTk4YzM1ZjJkYTBlYjNiMWZmOTI5Nzk1YWQ5In0=',
+          'payload' => 'e30=',
+          'signature' => 'c2ln'
+        ))).to eq 'test'
+      end
+
+      it "accepts compact serialization" do
+        expect(Slosilo.token_signer(
+          'eyJraWQiOiIxMDdiZGI4NTAxYzQxOWZhZDJmZGIyMGI0NjdkNGQwYTYyYTE2YTk4YzM1ZjJkYTBlYjNiMWZmOTI5Nzk1YWQ5In0=.e30=.c2ln'
+        )).to eq 'test'
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,7 @@
 require "simplecov"
+require "simplecov-cobertura"
+
+SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
 SimpleCov.start
 
 require 'slosilo'
@@ -41,7 +44,7 @@ Dg1ikwi8GUF4HPZe9DyhXgDhg19wM/qcpjX8bSypsUWHWP+FanhjdWU=
 -----END RSA PRIVATE KEY-----
         """ }
   let (:key) { Slosilo::Key.new rsa.to_der }
-  let (:key_fingerprint) { "d28e3a347e368416b3129a40c1b887fe" }
+  let (:key_fingerprint) { "107bdb8501c419fad2fdb20b467d4d0a62a16a98c35f2da0eb3b1ff929795ad9" }
 
   let (:another_rsa) do
     OpenSSL::PKey::RSA.new """
@@ -74,7 +77,7 @@ ooQ2FuL0K6ukQfHPjuMswqi41lmVH8gIVqVC+QnImUCrGxH9WXWy
 -----END RSA PRIVATE KEY-----
     """
   end
-  
+
   def self.mock_own_key
     before { allow(Slosilo).to receive(:[]).with(:own).and_return key }
   end

data/spec/symmetric_spec.rb

@@ -3,34 +3,56 @@ require 'spec_helper'
 describe Slosilo::Symmetric do
   # TODO transform it to class methods only?
   let(:plaintext) { "quick brown fox jumped over the lazy dog" }
+  let(:auth_data) { "some record id" }
   let(:key) { "^\xBAIv\xDB1\x0Fi\x04\x11\xFD\x14\xA7\xCD\xDFf\x93\xFE\x93}\v\x01\x11\x98\x14\xE0;\xC1\xE2 v\xA5".force_encoding("ASCII-8BIT") }
-  let(:iv) { "\xA1\xFA#z\x16\x80R\xCC|\x0Fyc\xB7j\x17\xED".force_encoding("ASCII-8BIT") }
-  let(:ciphertext) { "\xA1\xFA#z\x16\x80R\xCC|\x0Fyc\xB7j\x17\xED\x15\xC9r\xC9\xEE\xB9\xBC5\xB7\ni\x0F\f\xC8X\x80 h\a\xF4\xA6\xE3\x15\x9D\xF1-\xE5\bs\xF6\x02Z\x0F\xCD|S\x1A\xAA\x9At\xEFT\x17\xA5lT\x8C\xF3".force_encoding("ASCII-8BIT") }
+  let(:iv) { "\xD9\xABn\x01b\xFA\xBD\xC2\xE5\xEA\x01\xAC".force_encoding("ASCII-8BIT") }
+  let(:ciphertext) { "G^W1\x9C\xD4\xCC\x87\xD3\xFF\x86[\x0E3\xC0\xC8^\xD9\xABn\x01b\xFA\xBD\xC2\xE5\xEA\x01\xAC\x9E\xB9:\xF7\xD4ebeq\xDC \xC0sG\xA4\xAE,\xB8A|\x97\xBC\xFD\x85\xE1\xB93\x95>\xBD\n\x05\xFB\x15\x1F\x06#3M9".force_encoding('ASCII-8BIT') }
+
   describe '#encrypt' do
-    it "encrypts with AES-256-CBC" do
+    it "encrypts with AES-256-GCM" do
       allow(subject).to receive_messages random_iv: iv
-      expect(subject.encrypt(plaintext, key: key)).to eq(ciphertext)
+      expect(subject.encrypt(plaintext, key: key, aad: auth_data)).to eq(ciphertext)
     end
   end
   
   describe '#decrypt' do
-    it "decrypts with AES-256-CBC" do
-      expect(subject.decrypt(ciphertext, key: key)).to eq(plaintext)
+    it "decrypts with AES-256-GCM" do
+      expect(subject.decrypt(ciphertext, key: key, aad: auth_data)).to eq(plaintext)
+    end
+
+
+    context "when the ciphertext has been messed with" do
+      let(:ciphertext) {  "pwnd!" } # maybe we should do something more realistic like add some padding?
+      it "raises an exception" do
+        expect{ subject.decrypt(ciphertext, key: key, aad: auth_data)}.to raise_exception /Invalid version/
+      end
+      context "by adding a trailing 0" do
+        let(:new_ciphertext){ ciphertext + '\0' }
+        it "raises an exception" do
+          expect{ subject.decrypt(new_ciphertext, key: key, aad: auth_data) }.to raise_exception /Invalid version/
+        end
+      end
     end
-    
-    context "when ciphertext happens to end in a zero" do
-      let(:ciphertext) { "\x7F\xD6\xEAb\xE56\a\xD3\xC5\xF2J\n\x8C\x8Fg\xB7-\\\x8A\fh\x18\xC8\x91\xB9 \x97\xC9\x12\xE6\xA6\xAE\xB1I\x1E\x80\xAB\xD8\xDC\xBD\xB6\xCD\x9A\xA3MH\xA8\xB0\xC7\xDA\x87\xA7c\xD75,\xD2A\xB8\x9E\xE3o\x04\x00" }
-      let(:key) { "4pSuk1rAQyuHA5uUYaj0X0BsiPCFb9Nc8J03XA6V5/Y" }
-      it "works correctly" do
-        expect(subject.decrypt(ciphertext, key: key)).to eq("R6KNTQ4aUivojbaqhgAqj1I4PaF8h/5/YcENy4uNbfk=")
+
+    context "when no auth_data is given" do
+      let(:auth_data){""}
+      let(:ciphertext){ "Gm\xDAT\xE8I\x9F\xB7\xDC\xBB\x84\xD3Q#\x1F\xF4\x8C\aV\x93\x8F_\xC7\xBC87\xC9U\xF1\xAF\x8A\xD62\x1C5H\x86\x17\x19=B~Y*\xBC\x9D\eJeTx\x1F\x02l\t\t\xD3e\xA4\x11\x13y*\x95\x9F\xCD\xC4@\x9C"}
+
+      it "decrypts the message" do
+        expect(subject.decrypt(ciphertext, key: key, aad: auth_data)).to eq(plaintext)
+      end
+
+      context "and the ciphertext has been messed with" do
+        it "raises an exception" do
+          expect{ subject.decrypt(ciphertext + "\0\0\0", key: key, aad: auth_data)}.to raise_exception OpenSSL::Cipher::CipherError
+        end
       end
     end
 
-    context "when the iv ends in space" do
-      let(:ciphertext) { "\xC0\xDA#\xE9\xE1\xFD\xEDJ\xADs4P\xA9\xD6\x92 \xF7\xF8_M\xF6\x16\xC2i$\x8BT^\b\xA1\xB2L&\xE9\x80\x02[]6i\x9B\xD3\xC3\xED\xA9\xD1\x94\xE8\x15\xFD\xDA\xFEUj\xC5upH*\xBF\x82\x15le" }
-      let(:key) { "4pSuk1rAQyuHA5uUYaj0X0BsiPCFb9Nc8J03XA6V5/Y" }
-      it "works correctly" do
-        expect(subject.decrypt(ciphertext, key: key)).to eq("zGptmL3vd4obi1vqSiWHt/Ias2k+6qDtuq9vdow8jNA=")
+    context "when the auth data doesn't match" do
+      let(:auth_data){ "asdf" }
+      it "raises an exception" do
+        expect{ subject.decrypt(ciphertext, key: key, aad: auth_data)}.to raise_exception OpenSSL::Cipher::CipherError
       end
     end
   end

data/test.sh

@@ -0,0 +1,27 @@
+#!/bin/bash -xe
+
+iid=slosilo-test-$(date +%s)
+
+docker build -t $iid -f - . << EOF
+  FROM ruby
+  WORKDIR /app
+  COPY Gemfile slosilo.gemspec ./
+  RUN bundle
+  COPY . ./
+  RUN bundle
+EOF
+
+cidfile=$(mktemp -u)
+docker run --cidfile $cidfile -v /app/spec/reports $iid bundle exec rake jenkins || :
+
+cid=$(cat $cidfile)
+
+docker cp $cid:/app/spec/reports spec/
+docker cp $cid:/app/coverage spec
+
+docker rm $cid
+
+# untag, will use cache next time if available but no junk will be left
+docker rmi $iid
+
+rm $cidfile

metadata

@@ -1,111 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: slosilo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Rafał Rzepecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: ci_reporter_rspec
   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: simplecov
   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: simplecov-cobertura
+  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: io-grab
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: sequel
   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: sqlite3
   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: activesupport
+  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'
 description: This gem provides an easy way of storing and retrieving encryption keys
@@ -116,12 +144,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .kateproject
+- ".dockerignore"
+- ".github/CODEOWNERS"
+- ".github/PULL_REQUEST_TEMPLATE.md"
+- ".gitignore"
+- ".gitleaks.toml"
+- ".kateproject"
+- CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
+- Jenkinsfile
 - LICENSE
 - README.md
 - Rakefile
+- SECURITY.md
 - lib/slosilo.rb
 - lib/slosilo/adapters/abstract_adapter.rb
 - lib/slosilo/adapters/file_adapter.rb
@@ -131,14 +167,18 @@ files:
 - lib/slosilo/adapters/sequel_adapter/migration.rb
 - lib/slosilo/attr_encrypted.rb
 - lib/slosilo/errors.rb
+- lib/slosilo/jwt.rb
 - lib/slosilo/key.rb
 - lib/slosilo/keystore.rb
 - lib/slosilo/random.rb
 - lib/slosilo/symmetric.rb
 - lib/slosilo/version.rb
 - lib/tasks/slosilo.rake
+- publish-rubygem.sh
 - slosilo.gemspec
+- spec/encrypted_attributes_spec.rb
 - spec/file_adapter_spec.rb
+- spec/jwt_spec.rb
 - spec/key_spec.rb
 - spec/keystore_spec.rb
 - spec/random_spec.rb
@@ -146,6 +186,7 @@ files:
 - spec/slosilo_spec.rb
 - spec/spec_helper.rb
 - spec/symmetric_spec.rb
+- test.sh
 homepage: ''
 licenses:
 - MIT
@@ -156,22 +197,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Store SSL keys in a database
 test_files:
+- spec/encrypted_attributes_spec.rb
 - spec/file_adapter_spec.rb
+- spec/jwt_spec.rb
 - spec/key_spec.rb
 - spec/keystore_spec.rb
 - spec/random_spec.rb
@@ -179,4 +221,3 @@ test_files:
 - spec/slosilo_spec.rb
 - spec/spec_helper.rb
 - spec/symmetric_spec.rb
-has_rdoc: