telegram-ruby 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3e2cd90813371c48e86462f40c3d14bfe89d1ea690d353afbe3e7423f5ad614
-  data.tar.gz: c67cb2a2abf5f70cb3b709a34dd08b9812506673964620bab999aa16a5935c92
+  metadata.gz: 70eaf9fcc2201790d04dd5d3f869381e7bfa3fdd71251b829c3c4966ec774303
+  data.tar.gz: ca1b6479195e5b7875af8c121aa459d248cbebbdd1751ae65c4a7d7047993a38
 SHA512:
-  metadata.gz: 3d4d6c06ef2f786860cc2bcfda2fa865ab316a7ac3bb5df1efcab8a0ccc0d1ee76ceeb850f52539fd639b8af8115679cf2c1aab0c0055f6ffab7672f70bc8b8d
-  data.tar.gz: ff9a0c9c986f804c092ef471f8b3f2ef85831c6f6c962b945b76af901783a7d63bf86fc8b6af26d14c7da23f70ec3069432cfaa0cb515adbbaae10b508301f6a
+  metadata.gz: b2533124cc5c0788c7bfdc368d0fac47a84209ec2a4c9953650e96f3d07be9d33fcefdfd5c775be4c9c6c2ef8bc55cb2f91142fdefddbaa4b82a24922e242f0e
+  data.tar.gz: 577e5597e564440d9cd59e750a88f418a03a2d632def2b5cba3f2f2b7229a6b36c43e1b04f0328dc31e23b0681c798ff0a716cf9b5fc317e7c0c5ec011c4efc3

data/lib/telegram/bot.rb

@@ -9,6 +9,7 @@ require 'telegram/bot/types'
 require 'telegram/bot/client'
 require 'telegram/bot/client_accessors'
 require 'telegram/bot/botan'
+require 'telegram/bot/login'
 
 module Telegram
   module Bot

data/lib/telegram/bot/api.rb

@@ -236,7 +236,7 @@ module Telegram
         body      = response.body
 
         if Bot.configuration.raise_exceptions && (response.status != 200 || body['ok'] != true)
-          raise Exceptions::ResponseError.new(body['description'])
+          raise Telegram::Bot::ResponseError.new(body['description'])
         end
 
         if type_obj.nil?

data/lib/telegram/bot/botan.rb

@@ -16,7 +16,7 @@ module Telegram::Bot
 
         JSON.parse(response.body)
       rescue => e
-        raise Telegram::Bot::Exceptions::BotanError.new(e.message)
+        raise Telegram::Bot::BotanError.new(e.message)
       end
     end
   end

data/lib/telegram/bot/client.rb

@@ -45,7 +45,7 @@ module Telegram::Bot
         end
       end
 
-      raise Exceptions::ParseError.new('Can not parse request') unless @message
+      raise Telegram::Bot::ParseError.new('Can not parse request') unless @message
     end
 
     def pull_command(text)

data/lib/telegram/bot/exceptions.rb

@@ -1,15 +1,15 @@
 module Telegram
   module Bot
-    module Exceptions
-      class Error < StandardError; end
+    class Error < StandardError; end
 
-      class ResponseError < Error; end
+    class ResponseError < Error; end
 
-      class ParseError < Error; end
+    class ParseError < Error; end
 
-      class KeyboardMarkupError < Error; end
+    class KeyboardMarkupError < Error; end
 
-      class BotanError < Error; end
-    end
+    class LoginError < Error; end
+
+    class BotanError < Error; end
   end
 end

data/lib/telegram/bot/login.rb

@@ -0,0 +1,19 @@
+require 'openssl'
+
+module Telegram::Bot
+  class Login
+    def self.verify!(auth_data)
+      check_hash = auth_data[:hash]
+      auth_data = auth_data.slice(:auth_date, :first_name, :id, :last_name, :photo_url, :username)
+      check_string = auth_data.map {|k, v| "#{k}=#{v}" }.sort.join("\n")
+
+      secret_key = OpenSSL::Digest::SHA256.new.digest('523479371:AAHutDxVN_4NI5oBmIMj8mfmn47bbOWqD70')
+      hash = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), secret_key, check_string)
+
+      raise Telegram::Bot::LoginError.new('Data is NOT from Telegram') if (hash.casecmp(check_hash) != 0)
+      raise Telegram::Bot::LoginError.new('Data is outdated') if Time.now.to_i - auth_data[:auth_date] > 86400
+
+      true
+    end
+  end
+end

data/lib/telegram/bot/types/inline_keyboard_markup.rb

@@ -10,8 +10,9 @@ module Telegram::Bot::Types
           elsif b.is_a?(Hash)
             InlineKeyboardButton.new(b)
           else
-            raise Telegram::Bot::Exceptions::KeyboardMarkupError
-                      .new('Attributes must be Array of Array of Telegram::Bot::Types::InlineKeyboardButton or Hash')
+            raise Telegram::Bot::KeyboardMarkupError.new(
+                'Attributes must be Array of Array of Telegram::Bot::Types::InlineKeyboardButton or Hash'
+            )
           end
         end
       end

data/lib/telegram/bot/types/reply_keyboard_markup.rb

@@ -12,7 +12,7 @@ module Telegram::Bot::Types
           elsif b.is_a?(Hash)
             InlineKeyboardButton.new(b)
           else
-            raise Telegram::Bot::Exceptions::KeyboardMarkupError
+            raise Telegram::Bot::KeyboardMarkupError
                       .new('Attributes must be Array of Array of Telegram::Bot::Types::KeyboardButton or Hash')
           end
         end

data/lib/telegram/version.rb

@@ -1,3 +1,3 @@
 module Telegram
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegram-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Alex Belenky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,6 +107,7 @@ files:
 - lib/telegram/bot/client_accessors.rb
 - lib/telegram/bot/configuration.rb
 - lib/telegram/bot/exceptions.rb
+- lib/telegram/bot/login.rb
 - lib/telegram/bot/types.rb
 - lib/telegram/bot/types/animation.rb
 - lib/telegram/bot/types/audio.rb