istox 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f204c5ffdfb9a40f6c2321cc863af4be2d859daabd265c4e38ef77f5a253ae3
-  data.tar.gz: ccd9b724f91399670ed6cc8ff583cc458ebf40bec8d4e524b20fe8ef5b7aa1b8
+  metadata.gz: c9bf3a17183d7fb91c6d6a36bb13dc59086424459a3aa798dccd6696fd4bf871
+  data.tar.gz: 869342180a08d2391a5b6d1b624f8279c054301a9b1ddfea74a94349c821bd17
 SHA512:
-  metadata.gz: 9858a1c492f1e12a4e4c32a2e36982d333a2e504ada7ce25e3724335855a244f525a2d75dea733aad6940267d659e82bfc3b12f2afaa3acb638b0b22ab5cc63f
-  data.tar.gz: 236e8870b856d0c89b315b4ce67c5b8a20c7c89e2135987878a9e85f144517074851040a41f295766defc3fb9ab83ce720cc1e3812a362c41684e35330063618
+  metadata.gz: f56dbd0b7e69a18b7f4340cf7aa7597f42a909b8e93c69c37f00bd65e76736b14f40cd9392ea3dad00f1bc6cedc1a11583868c89842b48eccc92dc4b24467d65
+  data.tar.gz: 7a901a264db41abe8d32686b777c28966154e9b6fe2d115a439c57ad3e465a32be45cd86fe7d6fb4f6c3aeff66651fa32301eac868b50b5a87df0c81542dbe86

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.2.15)
+    istox (0.3.2)
       amazing_print
       awesome_print
       aws-sdk-sns (~> 1)
@@ -17,7 +17,6 @@ PATH
       redis (>= 2.0.0)
       redis-namespace (>= 1.0.0)
       redis-rails (~> 5.0.2)
-      vault (~> 0.1)
 
 GEM
   remote: https://rubygems.org/
@@ -63,7 +62,7 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    amazing_print (1.3.0)
+    amazing_print (1.4.0)
     amq-protocol (2.3.2)
     arel (9.0.0)
     awesome_print (1.9.2)
@@ -112,43 +111,49 @@ GEM
       i18n (~> 0.5)
     fakeredis (0.7.0)
       redis (>= 3.2, < 5.0)
-    faraday (1.5.1)
+    faraday (1.9.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+      faraday-net_http_persistent (~> 1.0)
       faraday-patron (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
-    faraday_middleware (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    ffi (1.15.3)
+    ffi (1.15.5)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.17.3-universal-darwin)
-    googleapis-common-protos-types (1.1.0)
+    google-protobuf (3.19.4-x86_64-darwin)
+    googleapis-common-protos-types (1.3.0)
       google-protobuf (~> 3.14)
     graphlient (0.5.0)
       faraday (>= 1.0)
       faraday_middleware
       graphql-client
-    graphql (1.12.14)
-    graphql-client (0.16.0)
+    graphql (1.13.6)
+    graphql-client (0.17.0)
       activesupport (>= 3.0)
-      graphql (~> 1.8)
-    grpc (1.38.0-universal-darwin)
-      google-protobuf (~> 3.15)
+      graphql (~> 1.10)
+    grpc (1.43.1-universal-darwin)
+      google-protobuf (~> 3.18)
       googleapis-common-protos-types (~> 1.0)
-    grpc-tools (1.38.0)
+    grpc-tools (1.43.1)
     hashie (3.5.7)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
@@ -178,11 +183,11 @@ GEM
     nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
-    oj (3.12.2)
+    oj (3.13.11)
     ougai (2.0.0)
       oj (~> 3.10)
-    paranoia (2.4.3)
-      activerecord (>= 4.0, < 6.2)
+    paranoia (2.6.0)
+      activerecord (>= 5.1, < 7.1)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -220,28 +225,28 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rake (10.5.0)
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbtree (0.4.4)
+    rbtree (0.4.5)
     redis (4.3.1)
-    redis-actionpack (5.2.0)
-      actionpack (>= 5, < 7)
+    redis-actionpack (5.3.0)
+      actionpack (>= 5, < 8)
       redis-rack (>= 2.1.0, < 3)
       redis-store (>= 1.1.0, < 2)
-    redis-activesupport (5.2.1)
-      activesupport (>= 3, < 7)
+    redis-activesupport (5.3.0)
+      activesupport (>= 3, < 8)
       redis-store (>= 1.3, < 2)
     redis-namespace (1.8.1)
       redis (>= 3.0.4)
-    redis-rack (2.1.3)
+    redis-rack (2.1.4)
       rack (>= 2.0.8, < 3)
       redis-store (>= 1.2, < 2)
     redis-rails (5.0.2)
       redis-actionpack (>= 5.0, < 6)
       redis-activesupport (>= 5.0, < 6)
       redis-store (>= 1.2, < 2)
-    redis-store (1.9.0)
+    redis-store (1.9.1)
       redis (>= 4, < 5)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -265,7 +270,7 @@ GEM
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
     ruby2_keywords (0.0.5)
-    set (1.0.1)
+    set (1.0.2)
     slop (4.9.1)
     sorted_set (1.0.3)
       rbtree
@@ -284,8 +289,6 @@ GEM
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
     uniform_notifier (1.11.0)
-    vault (0.16.0)
-      aws-sigv4
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)

data/istox.gemspec

@@ -45,7 +45,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'redis', '>= 2.0.0'
   spec.add_dependency 'redis-namespace', '>= 1.0.0'
   spec.add_dependency 'redis-rails', '~> 5.0.2'
-  spec.add_dependency 'vault', '~> 0.1'
+  # spec.add_dependency 'vault', '~> 0.1'
   spec.add_development_dependency 'aws-xray-sdk'
   spec.add_development_dependency 'bullet', '~> 5.7.5'
   spec.add_development_dependency 'bundler', '~> 1.16'

data/lib/istox/helpers/redis_manager.rb

@@ -32,6 +32,14 @@ module Istox
           db: 5
         ))
       end
+
+      # for otp of SNS
+      def otp_redis
+        @otp_redis ||= Redis::Namespace.new(:otp, redis: Redis.new(
+          url: ENV['REDIS_URL'] || 'redis://127.0.0.1:16379',
+          db: 10
+        ))
+      end
     end
   end
 end

data/lib/istox/helpers/vault.rb

@@ -1,85 +1,106 @@
 require 'istox/helpers/logger'
-require 'vault'
+# require 'vault'
 
 module Istox
   module Vault
-    module TOTP
-      class << self
-        def create(sid, host)
-          log.debug { "Generate vault TOTP for key #{totp_key(sid).inspect}" }
-
-          write_data(totp_key(sid),
-                     generate: true,
-                     issuer: host,
-                     account_name: sid,
-                     period: 300,
-                     qr_size: 300)
-        end
-
-        def generate_code(sid)
-          log.debug { "Generate 6-digit OTP code: key #{totp_code_key(sid)}" }
-          read_data(totp_code_key(sid)).data[:code]
-        end
-
-        def validate?(sid, code)
-          log.debug { "Validate TOTP code: key #{totp_code_key(sid)}, code: #{code}" }
-          result = write_data(totp_code_key(sid), code: code).data[:valid]
-
-          unless result
-            code = read_data(totp_code_key(sid)).data[:code]
-            log.debug { "Code is not valid, it should be #{code}" }
-          end
-
-          result
-        end
-
-        private
-
-        def read_data(key)
-          ::Vault.logical.read(key)
-        end
-
-        def write_data(key, params)
-          ::Vault.logical.write(key, params)
-        end
-
-        def totp_key(sid)
-          "totp/keys/#{sid}"
-        end
-
-        def totp_code_key(sid)
-          "totp/code/#{sid}"
-        end
-      end
-    end
+    # module TOTP
+    #   class << self
+    #   #   def create(sid, host)
+    #   #     log.debug { "Generate vault TOTP for key #{totp_key(sid).inspect}" }
+
+    #   #     write_data(totp_key(sid),
+    #   #                generate: true,
+    #   #                issuer: host,
+    #   #                account_name: sid,
+    #   #                period: 300,
+    #   #                qr_size: 300)
+    #   #   end
+
+    #   #   def generate_code(sid)
+    #   #     log.debug { "Generate 6-digit OTP code: key #{totp_code_key(sid)}" }
+    #   #     read_data(totp_code_key(sid)).data[:code]
+    #   #   end
+
+    #   #   def validate?(sid, code)
+    #   #     log.debug { "Validate TOTP code: key #{totp_code_key(sid)}, code: #{code}" }
+    #   #     result = write_data(totp_code_key(sid), code: code).data[:valid]
+
+    #   #     unless result
+    #   #       code = read_data(totp_code_key(sid)).data[:code]
+    #   #       log.debug { "Code is not valid, it should be #{code}" }
+    #   #     end
+
+    #   #     result
+    #   #   end
+
+    #   #   private
+
+    #   #   def read_data(key)
+    #   #     ::Vault.logical.read(key)
+    #   #   end
+
+    #   #   def write_data(key, params)
+    #   #     ::Vault.logical.write(key, params)
+    #   #   end
+
+    #   #   def totp_key(sid)
+    #   #     "totp/keys/#{sid}"
+    #   #   end
+
+    #   #   def totp_code_key(sid)
+    #   #     "totp/code/#{sid}"
+    #   #   end
+    #   # end
+    # end
 
     class << self
-      def logical
-        ::Vault.logical
+      # def logical
+      #   ::Vault.logical
+      # end
+
+      # def initialize(secret_key, file_location)
+      #   ::Vault.configure do |config|
+      #     config.address = secret_key
+
+      #     if File.exist?(file_location)
+      #       token = File.read(file_location).strip
+      #       config.token = token
+      #       config.ssl_verify = false
+      #       config.timeout = 60
+      #     else
+      #       log.info 'Vault token not found, OTP will not be able to use'
+      #     end
+      #   end
+      # end
+
+      def get_otp(sid, _host, expired_seconds: 300)
+        # ::Istox::Vault::TOTP.create(sid, host)
+        # Istox::Vault::TOTP.generate_code(sid)
+
+        otp = 6.times.map { rand(10) }.join
+
+        otp_redis.set(sid, otp, nx: false, ex: expired_seconds.seconds)
+
+        otp
       end
 
-      def initialize(secret_key, file_location)
-        ::Vault.configure do |config|
-          config.address = secret_key
-
-          if File.exist?(file_location)
-            token = File.read(file_location).strip
-            config.token = token
-            config.ssl_verify = false
-            config.timeout = 60
-          else
-            log.info 'Vault token not found, OTP will not be able to use'
-          end
-        end
-      end
+      def validate_otp(sid, otp)
+        # ::Istox::Vault::TOTP.validate?(sid, otp)
+
+        stored_otp = otp_redis.get(sid)
 
-      def get_otp(sid, host)
-        ::Istox::Vault::TOTP.create(sid, host)
-        Istox::Vault::TOTP.generate_code(sid)
+        return false if stored_otp.blank?
+        return false if otp.blank?
+
+        result = otp.to_s == stored_otp.to_s
+
+        otp_redis.del(sid) if result == true
+
+        result
       end
 
-      def validate_otp(sid, otp)
-        ::Istox::Vault::TOTP.validate?(sid, otp)
+      def otp_redis
+        @otp_redis ||= ::Istox::RedisManager.otp_redis
       end
     end
   end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.3.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2022-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -220,20 +220,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.2
-- !ruby/object:Gem::Dependency
-  name: vault
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: aws-xray-sdk
   requirement: !ruby/object:Gem::Requirement