peatio1.9 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c27f83d3d8bcd476b619d1935c563452c4b7290300907326c651d4a24bcc0b0
-  data.tar.gz: 45a725ae726b661d0a787db208a03b02864c3079863ba4aa5516fa339d3cfede
+  metadata.gz: 0f5ab1f88fc0487521a71471f00c2e28b177bc238369d21a4d8db06972510fa5
+  data.tar.gz: c23b852b70ec0d82262933657f16a940c1fed3427e56e6cd1205a4d7611cdc54
 SHA512:
-  metadata.gz: ef2e5cea2866ffc70d4fb0498da9ba8d26ad3120f9dac860f7a8402c93d37fe4d176eee0f485a1923b73ba938636f951d70844bf284df02143f306e526a99a80
-  data.tar.gz: 76aaf1deab676935b9ebb52a81966682963497c17ea7010d8aed09ae92259fbcec94717e6e5b604162f943d826c792a1751eae023853561752ba8b63070d01c1
+  metadata.gz: 9aae070516e3960bd77c929730776e6530e1b9fab4bb069b820ff12cd4c3a0a476efc6fbf2044fe682284c0703f2ae3b2250e87dc17ae1604b60b0cf5d2e7ff5
+  data.tar.gz: 0341c2e90e7c00d647e41c4419d4c6889e2d8e237d89d57933a586737924ff86ba85c5319c0a62bc37d4c6bd19444965e695fe5c8682896a51e28252abac9f75

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    peatio1.9 (0.4.5)
+    peatio1.9 (0.4.6)
       amqp
       bunny
       clamp

data/lib/peatio/auth/jwt_authenticator.rb

@@ -115,13 +115,14 @@ module Peatio::Auth
     private
 
     def decode_and_verify_token(token)
+      p JWT.decode(token, @public_key, false, @verify_options), Time.now.to_i
       payload, header = JWT.decode(token, @public_key, true, @verify_options)
 
       payload.keys.each { |k| payload[k.to_sym] = payload.delete(k) }
 
       payload
     rescue JWT::DecodeError => e
-      raise(Peatio::Auth::Error, "Failed to decode and verify JWT")
+      raise(Peatio::Auth::Error, "Failed to decode and verify JWT:  #{e.message}")
     end
   end
 end

data/lib/peatio/ranger.rb

@@ -34,9 +34,8 @@ module Peatio::Ranger
       send :success, message: "unsubscribed", streams: @client.streams.keys
     end
 
-    def authenticate(jwt)
+    def authenticate(token)
       begin
-        token = data["jwt"]
         payload = @authenticator.authenticate!(token)
         authorized = true
       rescue => error
@@ -78,21 +77,13 @@ module Peatio::Ranger
     def handshake(hs)
       @client = Peatio::MQ::Events::Client.new(@socket)
       query = URI::decode_www_form(hs.query_string)
-      subscribe(query.map {|item| item.last if item.first == "stream"})
+      subscribe(query.map { |item| item.last if item.first == "stream" })
       @logger.info "ranger: WebSocket connection openned"
 
       if hs.headers_downcased.key?("authorization")
-        authorized, payload = authenticate(hs.headers["authorization"])
-
-        if !authorized
-          @logger.info "ranger: #{@client.user} authentication failed"
-          raise EM::WebSocket::HandshakeError, "Authorization failed"
-        else
-          @logger.info [authorized, payload].inspect
-          @client.user = payload[:uid]
-          @client.authorized = true
-          @logger.info "ranger: user #{@client.user} authenticated #{@client.streams}"
-        end
+        authenticate(hs.headers["authorization"])
+
+        @logger.info "ranger: user #{@client.user} authenticated #{@client.streams}"
       end
     end
   end
@@ -114,9 +105,9 @@ module Peatio::Ranger
       Peatio::MQ::Events.subscribe!
 
       EM::WebSocket.start(
-        host: host,
-        port: port,
-        secure: false,
+          host: host,
+          port: port,
+          secure: false,
       ) do |socket|
         connection = Connection.new(authenticator, socket, logger)
 

data/lib/peatio/version.rb

@@ -1,3 +1,3 @@
 module Peatio
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peatio1.9
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - topdev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2020-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp