thales-pse 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db6813422fd06fdd141a7d7fc07699068dd41d2f87ccb88e5613c18c2bfbba40
-  data.tar.gz: 89855eafec6c01c893ae7fc7554c1b2d8c8a178dde5a14b15208cab1b772eda6
+  metadata.gz: cb679e7365c1decbdd2d5f67b3730ac74227b0eae1721807fd576043e91a1188
+  data.tar.gz: 8d0a0f1a0da459a696989c85a2682afbd4ba9617811497d32023390a7e26e22b
 SHA512:
-  metadata.gz: 47bc74b8f11de38a213516e71893c851fa1637be876e7b693293ca99622360fbc2a037d97dc62ce357d18f8c54317a7f486290b02f612c9bf16d5820ce194fc4
-  data.tar.gz: a5ae951c39783df5f2e68d926214ef701739d37cc90c902a0da237d208283894493b55a32b69aa6bd82db807afb7021cea791766c8177a6434cf31d8b75f777b
+  metadata.gz: b12c2861bacc7bb18714ae1d2422577747ed30008bb09c2bf1395fdf4c5dc57808727b57b08e13e157cec3a4b00297e0788524879e4b6451054fa020524fe3f3
+  data.tar.gz: 968de2560c771ac44ee12951c41fa484bab289c797cb1fad89b093fa0875e727a9a73c4aa7badc3abf73674a03a6801f7a52c43e655b611c94ad8a375948e819

data/.release_history.yml

@@ -4,3 +4,5 @@ thales-pse:
   :timestamp: 1634916519.8704317
 - :version: 0.2.1
   :timestamp: 1640072484.0339034
+- :version: 0.2.2
+  :timestamp: 1640072784.0902636

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    thales-pse (0.1.1)
+    thales-pse (0.2.2)
       tlogger
       toolrack
 
@@ -63,6 +63,7 @@ GEM
 PLATFORMS
   java
   universal-java-1.8
+  universal-java-11
   x86_64-linux
 
 DEPENDENCIES
@@ -72,4 +73,4 @@ DEPENDENCIES
   thales-pse!
 
 BUNDLED WITH
-   2.2.28
+   2.2.29

data/docker/Dockerfile

@@ -0,0 +1,15 @@
+
+FROM rvm-dev
+
+WORKDIR /opt
+COPY PTKcpsdk-5.9.0-RC5.x86_64.rpm .
+
+#RUN apt-get update && apt-get install -y alien && alien -i *.rpm
+RUN apt-get install -y alien && cd /opt && alien --scripts -i *.rpm
+RUN ln -s /opt/safenet/protecttoolkit5/cpsdk/lib/linux-x86_64/libctsw.so /usr/lib/libcryptoki.so
+RUN ln -s /opt/safenet/protecttoolkit5/cpsdk/lib/linux-x86_64/libethsm.so /usr/lib/libethsm.so
+
+ENV PATH="/opt/safenet/protecttoolkit5/cpsdk/bin:/opt/safenet/protecttoolkit5/cpsdk/bin/linux-x86_64:$PATH"
+
+ENTRYPOINT [ "/bin/bash", "--login" ]
+

data/docker/build.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+docker build -t thales-pse-test .

data/docker/container.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+docker run -it --rm -v $PWD/..:/opt/thales-pse thales-pse-test 

data/lib/thales/pse/cli.rb

@@ -28,29 +28,47 @@ module Thales
 
         PTY.spawn(exePath, *params) do |read, write, pid|
 
+          cont = ""
+          timeoutAfter = 1
           begin
 
+            logger.tdebug :cmd, "expect list : #{expect_list}"
             if not is_empty?(expect_list)
               expect_list.each do |ex|
+                timeoutAfter = ex[:timeout_after] || 5
+                logger.tdebug :cmd, "expect list element : #{ex}"
                 to = ex[:timeout] || 1
+                logger.tdebug :cmd, "Expecting : #{ex[:matcher]}"
                 cont = read.expect(/#{ex[:matcher]}/, to)
-                output.puts cont
-                write.puts block.call(ex[:block_key], cont)
+                output.puts cont.first if not_empty?(cont)
+                v = block.call(ex[:block_key],cont)
+                #logger.tdebug :cmd, "Calling block_key '#{ex[:block_key]}' got #{v}"
+                if not_empty?(v)
+                  write.puts v 
+                else
+                  write.puts ""
+                end
+                #write.puts block.call(ex[:block_key], cont)
               end
             end
 
-            Timeout.timeout(1) do
+            Timeout.timeout(timeoutAfter) do
               read.each do |l|
                 output.puts l if not_empty?(l)
               end
             end
 
+            output.puts "[Done2] #{cmd}"
+
           rescue Timeout::Error => e
             read.close
             write.close
             Process.kill('TERM',pid)
             output.puts "Process #{cmd} ('#{pid}') killed due to timeout"
-          rescue Errno::EIO
+          rescue Errno::EIO => e
+            #output.puts e.message
+            #output.puts e.backtrace.join("\n")
+            #output.puts "Read : #{cont}"
             output.puts "[Done] #{cmd}"
           end
         end

data/lib/thales/pse/token.rb

@@ -23,9 +23,9 @@ module Thales
           raise TokenError, "Slot is not available!" if is_empty?(@slot)
 
           expect = [
-            { matcher: "new token label:", block_key: :token_label, timeout: 1 },
-            { matcher: "enter Security Officer\'s pin:", block_key: :token_so_pin, timeout: 1 },
-            { matcher: "confirm Security Officer\'s pin:", block_key: :token_so_pin_confirm, timeout: 1 }
+            { matcher: "new token label:", block_key: :token_label, timeout: 5 },
+            { matcher: "enter Security Officer\'s pin:", block_key: :token_so_pin, timeout: 5 },
+            { matcher: "confirm Security Officer\'s pin:", block_key: :token_so_pin_confirm, timeout: 5 }
           ]
 
           #slot = block.call(:slot) || 0
@@ -57,9 +57,9 @@ module Thales
 
           expect = [
             # this key is handled locally not passed to external
-            { matcher: "Security Officer PIN.+:|current user PIN.+:", block_key: :auth_pin, timeout: 3 },
-            { matcher: "enter the new user PIN.+:", block_key: :token_user_pin, timeout: 1 },
-            { matcher: "confirm the new user PIN.+:", block_key: :token_user_pin_confirm, timeout: 1 }
+            { matcher: "Security Officer PIN.+:|current user PIN.+:", block_key: :auth_pin, timeout: 5 },
+            { matcher: "enter the new user PIN.+:", block_key: :token_user_pin, timeout: 5 },
+            { matcher: "confirm the new user PIN.+:", block_key: :token_user_pin_confirm, timeout: 5 }
           ]
 
           #slot = block.call(:slot) || 0
@@ -98,7 +98,7 @@ module Thales
           raise TokenError, "Slot is not available!" if is_empty?(@slot)
 
           expect = [
-            { matcher: "Enter user PIN.+:", block_key: :token_user_pin, timeout: 1 }
+            { matcher: "Enter user PIN.+:", block_key: :token_user_pin, timeout: 1, timeout_after: 60*5 }
           ]
 
           type = args.first
@@ -183,7 +183,7 @@ module Thales
           raise TokenError, "Slot is not available!" if is_empty?(@slot)
 
           expect = [
-            { matcher: "Enter user PIN.+:", block_key: :token_user_pin, timeout: 1 }
+            { matcher: "Enter user PIN.+:", block_key: :token_user_pin, timeout: 60 }
           ]
 
           keylabel = block.call(:keylabel)
@@ -208,19 +208,19 @@ module Thales
 
           cn = block.call(:common_name)
           raise Error, "Common name is mandatory" if is_empty?(cn)
-          expect << { matcher: "Common Name:", block_key: :cn, timeout: 1 }
+          expect << { matcher: "Common Name:", block_key: :cn, timeout: 5 }
           org = block.call(:org)
-          expect << { matcher: "Organization:", block_key: :org, timeout: 1 }
+          expect << { matcher: "Organization:", block_key: :org, timeout: 5 }
           ou = block.call(:ou)
-          expect << { matcher: "Organizational Unit:", block_key: :ou, timeout: 1 }
+          expect << { matcher: "Organizational Unit:", block_key: :ou, timeout: 5 }
           loc = block.call(:locality)
-          expect << { matcher: "Locality:", block_key: :loc, timeout: 1 }
+          expect << { matcher: "Locality:", block_key: :loc, timeout: 5 }
           st = block.call(:state)
-          expect << { matcher: "State:", block_key: :st, timeout: 1 }
+          expect << { matcher: "State:", block_key: :st, timeout: 5 }
           ctry = block.call(:country)
-          expect << { matcher: "Country:", block_key: :ctry, timeout: 1 }
+          expect << { matcher: "Country:", block_key: :ctry, timeout: 5 }
           sn = block.call(:serial_no) || SecureRandom.uuid.gsub("-","")
-          expect << { matcher: "certificate\'s serial number.+:", block_key: :sn, timeout: 1 }
+          expect << { matcher: "certificate\'s serial number.+:", block_key: :sn, timeout: 5 }
 
           params = ["c","-l#{keylabel}", "-s#{slot}"]
           if not_empty?(validFrom)
@@ -240,6 +240,7 @@ module Thales
               when :params
                 params
               when :expect_list
+                #[expect[0]]
                 expect
               when :cn
                 cn

data/lib/thales/pse/version.rb

@@ -2,6 +2,6 @@
 
 module Thales
   module Pse
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thales-pse
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Ian
@@ -68,6 +68,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docker/Dockerfile
+- docker/build.sh
+- docker/container.sh
 - lib/thales/pse.rb
 - lib/thales/pse/cli.rb
 - lib/thales/pse/config.rb