da_funk 3.26.0 → 3.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74ed04e91a2835da1b6ac8a32738190f6f6ad3b1bfb867df409d70e138f7935e
-  data.tar.gz: a39e91339b6e9a1ee64b6292a2bce50f2d384826bf1d9434438049bba2f5f918
+  metadata.gz: 37d7e3cf03459d285f8f3dc049befefc6857d63f8f9d3920c7a28e5ba128879e
+  data.tar.gz: 78e552609442541e0dec9badacbcabe081ef2541350f3b9e5c684d106dd72871
 SHA512:
-  metadata.gz: 436ae480832d515c74f1d6ab89a97c3e3aacdcdaafefe6a434d7145291d66e1722d629cd77bb2e024a86b31ac40ad8ad5af2256120bcfb5ab1de177cde9869f9
-  data.tar.gz: 22cd5633ff6197cbc0b9d8fcbe54dd17af8fcbcfc852fbc243c051e1a476ff5814c2e11f4e4dca29c8f986a2e8a0d6b5c62d04fcab1a0a27be49566da67b6ca1
+  metadata.gz: 7e08477af30c8b15a55b9b20d5132d90afb85d17609758bde631f09697cca24527e12069dc7a82b33dc2da3ccde99e62b8a1404cfc113d369be25ab645700f3a
+  data.tar.gz: 1bfe9676a867791075006151532f96b02fae0a3b2bf194b1389804b8aac5f29980671709567db2fe6a3de2d7b234a077168764da0db7f5f6f7ee4d9c49e5a1c7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (3.26.0)
+    da_funk (3.29.0)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -18,7 +18,7 @@ GEM
     cloudwalk (1.15.0)
       bundler
       rake
-    cloudwalk_handshake (1.20.0)
+    cloudwalk_handshake (1.21.3)
       funky-simplehttp (~> 0.6)
     funky-emv (1.4.1)
       funky-tlv (~> 0.2)
@@ -27,25 +27,25 @@ GEM
     funky-tlv (0.2.3)
     io-like (0.3.1)
     parallel (1.19.2)
-    parser (2.7.1.4)
+    parser (2.7.2.0)
       ast (~> 2.4.1)
     posxml_parser (2.26.0)
       funky-emv (~> 1)
     rainbow (3.0.0)
     rake (13.0.1)
-    regexp_parser (1.7.1)
+    regexp_parser (1.8.2)
     rexml (3.2.4)
-    rubocop (0.90.0)
+    rubocop (1.1.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8)
       rexml
-      rubocop-ast (>= 0.3.0, < 1.0)
+      rubocop-ast (>= 1.0.1)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.4.0)
-      parser (>= 2.7.1.4)
+    rubocop-ast (1.1.0)
+      parser (>= 2.7.1.5)
     ruby-progressbar (1.10.1)
     unicode-display_width (1.7.0)
     yard (0.9.25)

data/RELEASE_NOTES.md

@@ -1,5 +1,31 @@
 # DaFunk
 
+### 3.29.0 - 2020-11-03
+
+- Added support to Ruby SecureRandom;
+- Update cloudwalk_handshake (1.21.3).
+
+### 3.28.2 - 2020-10-07
+
+- Added support of params.dat file restore if it was corrupted;
+- Wait 3 seconds before restart after main update;
+- Fixed method_missing exception;
+
+### 3.28.1 - 2020-09-26
+
+- Close socket in case of ssl exceptions;
+- Do not assign nil to PaymentChannel#current and client on error because this is already being done on PaymentChannel#close.
+
+### 3.28.0 - 2020-09-25
+
+- Check if system update file is present after device restart in order to continue with system update process;
+- Implemented block to write and break line if message has '\n'.
+
+### 3.27.0 - 2020-09-25
+
+- Print bitmap if exists on DaFunk::ParamsDat#restart;
+- Add main application version on config.dat file.
+
 ### 3.26.0 - 2020-09-14
 
 - Fixed error on virtual keyboard, chars y and Y were duplicated;

data/Rakefile

@@ -56,6 +56,7 @@ FILES = FileList[
   "lib/da_funk/notification_event.rb",
   "lib/da_funk/notification_callback.rb",
   "lib/da_funk/notification.rb",
+  "lib/da_funk/secure_random.rb",
 
   "lib/device.rb",
   "lib/device/audio.rb",

data/lib/da_funk/engine.rb

@@ -1,8 +1,13 @@
 module DaFunk
   class Engine
     def self.check
-      DaFunk::EventListener.check
-      ThreadScheduler.keep_alive
+      if Device::Setting.boot == '1'
+        DaFunk::EventListener.check(:file_exists) #to check if system update is in progress
+        Device::Setting.boot = '0'
+      else
+        DaFunk::EventListener.check
+        ThreadScheduler.keep_alive
+      end
     end
 
     def self.app_loop(&block)

data/lib/da_funk/i18n.rb

@@ -73,7 +73,11 @@ class I18n
 
   def self.pt(symbol, options = {})
     if options[:line] || options[:column]
-      Device::Display.print_line(t(symbol, options), options[:line] || 0, options[:column] || 0)
+      line = options[:line] || 0
+      t(symbol, options).split("\n").each do |message|
+        Device::Display.print_line(message, line, options[:column] || 0)
+        line+=1
+      end
     else
       puts(t(symbol, options))
     end

data/lib/da_funk/params_dat.rb

@@ -5,7 +5,7 @@ module DaFunk
     include DaFunk::Helper
 
     class << self
-      attr_accessor :file, :apps, :valid, :files
+      attr_accessor :file, :apps, :valid, :files, :checksum
     end
 
     self.apps = Array.new
@@ -20,9 +20,19 @@ module DaFunk
     end
 
     def self.setup
+      @checksum = calculate_checksum
       @file = FileDb.new(FILE_NAME)
     end
 
+    def self.calculate_checksum
+      Device::Crypto.crc16_hex(File.read(FILE_NAME)) if exists?
+    end
+
+    def self.corrupted?
+      return true unless exists?
+      @checksum != calculate_checksum
+    end
+
     def self.exists?
       File.exists?(FILE_NAME)
     end
@@ -151,10 +161,15 @@ module DaFunk
 
     def self.restart
       Device::Display.clear
-      I18n.pt(:admin_main_update_message)
-      3.times do |i|
-        Device::Display.print("REBOOTING IN #{3 - i}",3,3)
-        sleep(1)
+      if File.exists?('./shared/init_reboot.bmp')
+        Device::Display.print_bitmap('./shared/init_reboot.bmp')
+        getc(3000)
+      else
+        I18n.pt(:admin_main_update_message)
+        3.times do |i|
+          Device::Display.print("REBOOTING IN #{3 - i}",3,3)
+          sleep(1)
+        end
       end
       Device::System.restart
     end

data/lib/da_funk/payment_channel.rb

@@ -231,8 +231,7 @@ module DaFunk
       if Context.development?
         ContextLog.exception(exception, exception.backtrace, "PaymentChannel error")
       end
-      PaymentChannel.current = nil
-      @client = nil
+      self.close
     end
 
     def handshake

data/lib/da_funk/secure_random.rb

@@ -0,0 +1,17 @@
+module DaFunk
+  class SecureRandom
+    CHARS = [('a'..'z'), ('A'..'Z')].map(&:to_a).flatten
+
+    def self.random_bytes(n = nil)
+      n = n ? n.to_int : 16
+      (0...n).map { CHARS[rand(CHARS.length)] }.join
+    end
+
+    def self.uuid
+      bytes = random_bytes.unpack('NnnnnN')
+      bytes[2] = (bytes[2] & 0x0fff) | 0x4000
+      bytes[3] = (bytes[3] & 0x3fff) | 0x8000
+      "%08x-%04x-%04x-%04x-%04x%08x" % bytes
+    end
+  end
+end

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="3.26.0"
+  VERSION="3.29.0"
 end
 

data/lib/device/setting.rb

@@ -67,7 +67,8 @@ class Device
       "transaction_http_host"       => HTTP_HOST_PRODUCTION,
       "transaction_http_port"       => HTTP_PORT,
       "emv_contactless_amount"      => "0",
-      "network_init"                => ""
+      "network_init"                => "",
+      "main_app_version"            => ""
     }
 
     class << self
@@ -151,16 +152,16 @@ class Device
 
     # Custom Attributes
     def self.tcp_recv_timeout
-      DaFunk::ParamsDat.file["tcp_recv_timeout"] || method_missing(:tcp_recv_timeout)
+      DaFunk::ParamsDat.file["tcp_recv_timeout"] || @file&.dig("tcp_recv_timeout")
     end
 
     def self.attach_gprs_timeout
-      value = (DaFunk::ParamsDat.file["attach_gprs_timeout"] || method_missing(:attach_gprs_timeout))
+      value = (DaFunk::ParamsDat.file["attach_gprs_timeout"] || @file&.dig("attach_gprs_timeout"))
       value.to_s.empty? ? nil : value.to_s.to_i
     end
 
     def self.heartbeat
-      DaFunk::ParamsDat.file["heartbeat"] || method_missing(:heartbeat)
+      DaFunk::ParamsDat.file["heartbeat"] || @file&.dig("heartbeat")
     end
 
     def self.logical_number

data/test/unit/da_funk/secure_random.rb

@@ -0,0 +1,18 @@
+class SecureRandomTest < DaFunk::Test.case
+  def setup
+    @uuid = DaFunk::SecureRandom.uuid
+    @random_bytes = DaFunk::SecureRandom.random_bytes
+  end
+
+  def test_uuid
+    assert_equal(36, @uuid.size)
+
+    # Check time_hi_and_version and clock_seq_hi_res bits (RFC 4122 4.4)
+    assert_equal('4', @uuid[14])
+    assert_include(%w'8 9 a b', @uuid[19])
+  end
+
+  def test_random_bytes
+    assert_equal(16, @random_bytes.size)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 3.26.0
+  version: 3.29.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-14 00:00:00.000000000 Z
+date: 2020-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -174,6 +174,7 @@ files:
 - lib/da_funk/rake_task.rb
 - lib/da_funk/screen.rb
 - lib/da_funk/screen_flow.rb
+- lib/da_funk/secure_random.rb
 - lib/da_funk/struct.rb
 - lib/da_funk/test.rb
 - lib/da_funk/transaction/download.rb
@@ -220,6 +221,7 @@ files:
 - test/resources/shared/bitmap_gp.dat
 - test/test_helper.rb
 - test/unit/da_funk/event_listener_test.rb
+- test/unit/da_funk/secure_random.rb
 - test/unit/da_funk/struct_test.rb
 - test/unit/da_funk/support_test.rb
 - test/unit/device/application_test.rb
@@ -269,6 +271,7 @@ test_files:
 - test/resources/shared/bitmap_gp.dat
 - test/test_helper.rb
 - test/unit/da_funk/event_listener_test.rb
+- test/unit/da_funk/secure_random.rb
 - test/unit/da_funk/struct_test.rb
 - test/unit/da_funk/support_test.rb
 - test/unit/device/application_test.rb