killbill 8.3.4 → 8.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d643e71a3a12df8fab7f10f55095ab7b4a65ee4
-  data.tar.gz: 390ad4daadaecb7f8a72a709cab811eda25b04e5
+  metadata.gz: 0feadd53142c721c9c1d4f1104e5f1fccf96a28c
+  data.tar.gz: b0dae2773e4858d1f5a05486dbd1bf3cbb6c8983
 SHA512:
-  metadata.gz: 129c63889f636f2a527127aec4ef3adfa83d2afa0796f7fb9cb40cd5fa8f2e0c2025394e97efc0dcbd21549dc774af38f910bdaf629009a538f49606a5961a3d
-  data.tar.gz: 42e7fc83720a204d7bffd7e6911a3f06811cd8a69d3125203cde0c20ecba678c8c6ee5623b807475c281a38ada69b224b4f54314a29b6d56b1314d3f63bd637e
+  metadata.gz: f0ddb8614065fe850c6861b64b34df56a4bdc71e5573ea7a8daaf7338a18e39c5b1e5a9aa5901270b98c88d0d85b62b8f8566878ba8a4e8e4acfb3bd7f44e5e0
+  data.tar.gz: cc7eb2a3777464e2fc47a7226ef7435786d230960099a9469c2ff39f0fe6241a0dbbad269d3268a806f070075b1fef5ec50b7edb597adb97c9a00a980cc881ed

data/.circleci/config.yml

@@ -0,0 +1,138 @@
+defaults: &defaults
+  working_directory: ~/repo
+  environment:
+    JRUBY_OPTS: -J-Xmx1024M
+
+version: 2
+jobs:
+  build-jruby-1.7.26:
+    <<: *defaults
+    docker:
+      - image: killbill/kbbuild:0.5.0
+    steps:
+      - checkout
+      - restore_cache:
+          key: v4-dependencies-jruby-1.7.26-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
+      - run:
+          name: Install gem dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path=vendor/bundle
+            bundle exec jbundle install
+      - save_cache:
+          paths:
+            - ~/.m2
+            - .bundle
+            - .jbundler
+            - vendor/bundle
+          key: v4-dependencies-jruby-1.7.26-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
+
+  test-mysql-jruby-1.7.26:
+    <<: *defaults
+    docker:
+      - image: killbill/kbbuild:0.5.0
+      - image: killbill/mariadb:0.19
+        environment:
+        - MYSQL_ROOT_PASSWORD=root
+    steps:
+      - checkout
+      - restore_cache:
+          key: v4-dependencies-jruby-1.7.26-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
+      - run:
+          name: Setup DDL
+          command: |
+            set +e
+            count=0
+            until mysqladmin ping -h 127.0.0.1 -u root --password=root --silent; do
+              if [[ "$count" == "25" ]]; then
+                exit 1
+              fi
+              (( count++ ))
+              printf '.'
+              sleep 5
+            done
+            set -e
+            mysql -h 127.0.0.1 -u root --password=root -e 'create database killbill_test;'
+      - run:
+          name: Run tests
+          command: |
+            mkdir /tmp/test-results
+            AR_ADAPTER='mariadb' AR_USERNAME='root' AR_PASSWORD='' AR_DATABASE='killbill_test' bundle exec rake test:spec | tee /tmp/test-results/test.txt 2>&1
+            AR_ADAPTER='mariadb' AR_USERNAME='root' AR_PASSWORD='' AR_DATABASE='killbill_test' bundle exec rake test:remote:spec | tee /tmp/test-results/remote-test.txt 2>&1
+      - store_test_results:
+          path: /tmp/test-results
+      - store_artifacts:
+          path: /tmp/test-results
+          destination: test-results
+
+  test-postgresql-jruby-1.7.26:
+    <<: *defaults
+    docker:
+      - image: killbill/kbbuild:0.5.0
+      - image: killbill/postgresql:0.19
+        environment:
+        - POSTGRES_PASSWORD=postgres
+    steps:
+      - checkout
+      - restore_cache:
+          key: v4-dependencies-jruby-1.7.26-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
+      - run:
+          name: Setup DDL
+          command: |
+            set +e
+            count=0
+            until $(psql -h 127.0.0.1 -U postgres -p 5432 -l > /dev/null); do
+              if [[ "$count" == "25" ]]; then
+                exit 1
+              fi
+              (( count++ ))
+              printf '.'
+              sleep 5
+            done
+            set -e
+            psql -h 127.0.0.1 -U postgres -p 5432 -c 'create database killbill_test;'
+      - run:
+          name: Run tests
+          command: |
+            mkdir /tmp/test-results
+            AR_ADAPTER='postgresql' AR_USERNAME='postgres' AR_DATABASE='killbill_test' bundle exec rake test:spec | tee /tmp/test-results/test.txt 2>&1
+            AR_ADAPTER='postgresql' AR_USERNAME='postgres' AR_DATABASE='killbill_test' bundle exec rake test:remote:spec | tee /tmp/test-results/remote-test.txt 2>&1
+      - store_test_results:
+          path: /tmp/test-results
+      - store_artifacts:
+          path: /tmp/test-results
+          destination: test-results
+
+  test-h2-jruby-1.7.26:
+    <<: *defaults
+    docker:
+      - image: killbill/kbbuild:0.5.0
+    steps:
+      - checkout
+      - restore_cache:
+          key: v4-dependencies-jruby-1.7.26-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
+      - run:
+          name: Run tests
+          command: |
+            mkdir /tmp/test-results
+            AR_ADAPTER='sqlite3' AR_DATABASE='test.db' bundle exec rake test:spec | tee /tmp/test-results/test.txt 2>&1
+            AR_ADAPTER='sqlite3' AR_DATABASE='test.db' bundle exec rake test:remote:spec | tee /tmp/test-results/remote-test.txt 2>&1
+      - store_test_results:
+          path: /tmp/test-results
+      - store_artifacts:
+          path: /tmp/test-results
+          destination: test-results
+
+workflows:
+  version: 2
+  build-and-test:
+    jobs:
+      - build-jruby-1.7.26
+      #- test-mysql-jruby-1.7.26:
+      #    requires:
+      #      - build-jruby-1.7.26
+      - test-postgresql-jruby-1.7.26:
+          requires:
+            - build-jruby-1.7.26
+      - test-h2-jruby-1.7.26:
+          requires:
+            - build-jruby-1.7.26

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill (8.3.4)
+    killbill (8.3.5)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
       typhoeus (~> 0.6.9)

data/NEWS

@@ -1,3 +1,6 @@
+8.3.5
+    ActiveMerchant: add utility function to avoid persisting sensitive data (GDPR)
+
 8.3.4
     ActiveMerchant: pass in extra_params to gateway api calls
 

data/lib/killbill/helpers/active_merchant/active_record/models/response.rb

@@ -22,6 +22,7 @@ module Killbill
             # But regardless, for performance reasons, we want to set these timestamps ourselves
             # See ActiveRecord::Timestamp
             current_time = Time.now.utc
+            remove_sensitive_data_and_compact(extra_params)
             model.new({
                           :api_call                     => api_call,
                           :kb_account_id                => kb_account_id,
@@ -43,7 +44,7 @@ module Killbill
                           :success                      => response.success?,
                           :created_at                   => current_time,
                           :updated_at                   => current_time
-                      }.merge!(extra_params.compact)) # Don't override with nil values
+                      }.merge!(extra_params))
           end
 
           def self.create_response_and_transaction(identifier, transaction_model, api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, payment_processor_account_id, kb_tenant_id, gw_response, amount_in_cents, currency, extra_params = {}, model = Response)
@@ -159,9 +160,9 @@ module Killbill
           def self.search_where_clause(t, search_key)
             # Exact matches only
             where_clause = t[:kb_payment_id].eq(search_key)
-                       .or(t[:kb_payment_transaction_id].eq(search_key))
-                       .or(t[:message].eq(search_key))
-                       .or(t[:authorization].eq(search_key))
+                                            .or(t[:kb_payment_transaction_id].eq(search_key))
+                                            .or(t[:message].eq(search_key))
+                                            .or(t[:authorization].eq(search_key))
 
             # Only search successful payments and refunds
             where_clause = where_clause.and(t[:success].eq(true))
@@ -207,6 +208,16 @@ module Killbill
             pagination
           end
 
+          def self.remove_sensitive_data_and_compact(extra_params)
+            extra_params.compact!
+            extra_params.delete_if { |k, _| sensitive_fields.include?(k) }
+          end
+
+          # Override in your plugin if needed
+          def self.sensitive_fields
+            []
+          end
+
           # Override in your plugin if needed
           def txn_id
             authorization
@@ -289,4 +300,4 @@ module Killbill
       end
     end
   end
-end
+end

data/lib/killbill/version.rb

@@ -1,3 +1,3 @@
 module Killbill
-  VERSION = '8.3.4'
+  VERSION = '8.3.5'
 end

data/spec/killbill/helpers/response_spec.rb

@@ -135,6 +135,13 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::Response do
     ::Killbill::Test::TestResponse.from_kb_payment_id(::Killbill::Test::TestTransaction, kb_payment_id3, kb_tenant_id).size == 0
   end
 
+  it 'should filter out sensitive parameter if specified' do
+    extra_params = {:email => "test.test", :payer_id => "test"}
+    ::Killbill::Test::TestResponse.send(:remove_sensitive_data_and_compact, extra_params)
+    extra_params[:email].should be_nil
+    extra_params[:payer_id].should == "test"
+  end
+
   it 'should generate the right SQL query' do
     # Check count query (search query numeric)
     expected_query = "SELECT COUNT(DISTINCT #{q('test_responses')}.#{q('id')}) FROM #{q('test_responses')}  WHERE (((#{q('test_responses')}.#{q('kb_payment_id')} = '1234' OR #{q('test_responses')}.#{q('kb_payment_transaction_id')} = '1234') OR #{q('test_responses')}.#{q('message')} = '1234') OR #{q('test_responses')}.#{q('authorization')} = '1234') AND #{q('test_responses')}.#{q('success')} = #{qtrue} AND #{q('test_responses')}.#{q('kb_tenant_id')} = '11-22-33'"

data/spec/killbill/helpers/test_response.rb

@@ -6,6 +6,10 @@ module Killbill #:nodoc:
 
       has_one :test_transaction
 
+      def self.sensitive_fields
+        [:email]
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 8.3.4
+  version: 8.3.5
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -317,8 +317,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - Gemfile.head
 - Gemfile.lock

data/.travis.yml

@@ -1,51 +0,0 @@
-language: ruby
-
-sudo: false
-cache:
-  bundler: true
-  directories:
-    - $HOME/.m2
-
-services:
-  - mysql
-  - postgresql
-
-before_script:
-  - bundle exec jbundle install
-  - mysql -uroot -e 'create database killbill_test;'
-  - psql -c 'create database killbill_test;' -U postgres
-
-notifications:
-  email:
-    - kill-bill-commits@googlegroups.com
-
-env:
-  global:
-    - JRUBY_OPTS='-J-Xmx1024M'
-  matrix:
-    # Need MySQL 5.6 - see https://github.com/travis-ci/travis-ci/issues/1986
-    #- AR_ADAPTER='mariadb' AR_USERNAME='root' AR_PASSWORD='' AR_DATABASE='killbill_test'
-    - AR_ADAPTER='postgresql' AR_USERNAME='postgres' AR_DATABASE='killbill_test'
-    - AR_ADAPTER='sqlite3' AR_DATABASE='test.db'
-
-rvm:
-  - jruby-1.7.20
-  - jruby-20mode # latest 1.7.x
-  - jruby-head
-
-gemfile:
-  - Gemfile
-  - Gemfile.head
-
-jdk:
-  - openjdk7
-  - oraclejdk7
-  - oraclejdk8
-
-matrix:
-  allow_failures:
-    - rvm: jruby-head
-    - rvm: jruby-20mode # Gemfile.lock bug with --deployment?
-    - jdk: oraclejdk8
-    - gemfile: Gemfile.head
-  fast_finish: true