mtproto 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f20076eea4c2e79508740e13b6f8405437f47ce5ea04f7bffcb55eef0134026
-  data.tar.gz: 3e0ad205973f1f54e8ba60b1b97c4cac1c4a67ea5e59d2b7c797950f943953e0
+  metadata.gz: fc4ebf89bbc3d69e0b542b04320af0e74acdd828279411bad647e995a5aad06d
+  data.tar.gz: acb092bf151f543578359c1bcd9d81ff1a2f6bc20e5935276a5c8a7b117892ec
 SHA512:
-  metadata.gz: 815dbe344577826f6ef0e6d4fac25c0a56eb58f8372f5612c3c77c8f71b9b2684624f3152b3ba4c7f62046dcb239b1bff6ee95b0af98ab249f79a30928abb6cb
-  data.tar.gz: daaf36af66d6cff257881b8ebb3b19ab6c7b6c4bdaa8d7b9ef9f277a7da53539525039380714555948f80112fd46815985c324cbbd6c3075bef8738cf1ef8296
+  metadata.gz: da18a3d97b307eee7bc93ce71efe179a571c4a6385c94a81b43e6dc8e950aabc002fe31b4312b51a1d91157bb3e102b11ce213409eb4ebafbc37db998dd528ab
+  data.tar.gz: cdc1d6a7bd55e8ca66841e43e6f40ec8bdfcd950a7c2bad5325dc8dff2f5d4aecb9eb948d76b7787f3c36a255fc5301830145820037c7e9fc5660459747dadd1

data/lib/mtproto/auth_key_generator.rb

@@ -193,7 +193,9 @@ module MTProto
                                   Digest::SHA1.digest(new_nonce + "\x03".b + auth_key_aux_hash)[-16..]
                                 end
 
-      raise 'new_nonce_hash mismatch!' unless dh_gen_response.new_nonce_hash == expected_new_nonce_hash
+      unless dh_gen_response.new_nonce_hash == expected_new_nonce_hash
+        raise "new_nonce_hash mismatch! (dh_gen #{dh_gen_response.status}, auth_key #{auth_key.bytesize} bytes)"
+      end
 
       case dh_gen_response.status
       when :retry

data/lib/mtproto/client/api/resolve_username.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require_relative '../../tl/objects/resolve_username'
+require_relative '../../tl/objects/resolved_peer'
+
+module MTProto
+  class Client
+    class API
+      def resolve_username(username:)
+        rpc_call(TL::ResolveUsername.new(username: username), TL::ResolvedPeer).body
+      rescue RpcError => e
+        raise unless e.error_message == 'USERNAME_NOT_OCCUPIED'
+
+        nil
+      end
+    end
+  end
+end

data/lib/mtproto/client/api.rb

@@ -18,6 +18,7 @@ require_relative 'api/get_bot_callback_answer'
 require_relative 'api/send_message'
 require_relative 'api/set_typing'
 require_relative 'api/get_contacts'
+require_relative 'api/resolve_username'
 require_relative 'api/export_bot_token'
 require_relative 'api/pin_message'
 require_relative 'api/unpin_all_messages'

data/lib/mtproto/crypto/dh_key_exchange.rb

@@ -29,7 +29,8 @@ module MTProto
         dh_prime = OpenSSL::BN.new(dh_prime_bytes, 2)
 
         auth_key_bn = g_a.mod_exp(b, dh_prime)
-        auth_key_bn.to_s(2)
+        # BN#to_s(2) drops leading zero bytes, and roughly one shared secret in 256 has one.
+        auth_key_bn.to_s(2).rjust(dh_prime_bytes.bytesize, "\x00".b)
       end
 
       def generate_random_2048_bit_number

data/lib/mtproto/tl/constructors.rb

@@ -89,6 +89,7 @@ module MTProto
       CONTACTS_CONTACTS = 0xeae87e42
       CONTACTS_CONTACTS_NOT_MODIFIED = 0xb74ba9d2
       CONTACT = 0x145ade0b
+      CONTACTS_RESOLVED_PEER = 0x7f077ad9
 
       # Messages
       MESSAGES_GET_DIALOGS = 0xa0f4cb4f

data/lib/mtproto/tl/objects/authorization.rb

@@ -27,13 +27,14 @@ module MTProto
         flags = data[offset, 4].unpack1('L<')
         offset += 4
 
-        offset += 4 if flags.anybits?(1 << 0) # tmp_sessions
         offset += 4 if flags.anybits?(1 << 1) # otherwise_relogin_days
+        offset += 4 if flags.anybits?(1 << 0) # tmp_sessions
 
         offset = skip_tl_bytes(data, offset) if flags.anybits?(1 << 2) # future_auth_token
 
-        # user#20b1422 flags:# flags2:# id:long access_hash:flags.0?long ...
-        offset += 4 # user constructor
+        user_constructor = data[offset, 4].unpack1('L<')
+        offset += 4
+        raise UnexpectedConstructorError, user_constructor unless user_constructor == Constructors::USER
 
         user_flags = data[offset, 4].unpack1('L<')
         offset += 4

data/lib/mtproto/tl/objects/channel_difference.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../schema'
+require_relative '../reader'
+require_relative '../peers'
 require_relative 'message'
-require_relative 'dialogs'
 
 module MTProto
   module TL
@@ -18,8 +18,6 @@ module MTProto
     class ChannelDifference
       attr_reader :type, :final, :pts, :timeout, :new_messages, :chats, :users
 
-      SCHEMA_PATH = File.expand_path('../../../../data/tl-schema.json', __dir__)
-
       # Channel messages ride in new_messages, but message-bearing updates can also
       # appear in other_updates — mine those too, like UpdatesDifference.
       UPDATE_NEW_MESSAGE = 0x1f2b0afd
@@ -35,10 +33,6 @@ module MTProto
         @users = users
       end
 
-      def self.schema
-        @schema ||= Schema.new(SCHEMA_PATH)
-      end
-
       def self.deserialize(data)
         constructor = data[0, 4].unpack1('L<')
 
@@ -77,10 +71,11 @@ module MTProto
             offset += 4
           end
 
-          messages, offset = parse_messages_vector(data, offset)
+          raw_messages, offset = Message.vector_at(data, offset)
+          messages = raw_messages.map(&:to_h)
           other_messages, offset = parse_other_updates(data, offset)
-          chats, offset = Dialogs.chats_at(data, offset)
-          users, = Dialogs.users_at(data, offset)
+          chats, offset = Peers.chats_at(data, offset)
+          users, = Peers.users_at(data, offset)
 
           new(
             type: :difference,
@@ -107,10 +102,11 @@ module MTProto
             offset += 4
           end
 
-          offset = schema.skip(data, offset) # dialog:Dialog
-          messages, offset = parse_messages_vector(data, offset)
-          chats, offset = Dialogs.chats_at(data, offset)
-          users, = Dialogs.users_at(data, offset)
+          offset = Reader.schema.skip(data, offset) # dialog:Dialog
+          raw_messages, offset = Message.vector_at(data, offset)
+          messages = raw_messages.map(&:to_h)
+          chats, offset = Peers.chats_at(data, offset)
+          users, = Peers.users_at(data, offset)
 
           new(
             type: :too_long,
@@ -122,24 +118,9 @@ module MTProto
           )
         end
 
-        def parse_messages_vector(data, offset)
-          offset += 4 # vector constructor
-          count = data[offset, 4].unpack1('L<')
-          offset += 4
-
-          messages = []
-          count.times do
-            constructor = data[offset, 4].unpack1('L<')
-            msg = Message.deserialize(data, offset, constructor)
-            messages << msg.to_h if msg
-            offset = schema.skip(data, offset)
-          end
-          [messages, offset]
-        end
-
         # other_updates:Vector<Update> — mine message-bearing updates
         # (updateNewMessage/updateNewChannelMessage: the ctor, then an inner Message,
-        # then pts/pts_count), and advance the rest via schema.
+        # then pts/pts_count), and advance the rest via Reader.schema.
         def parse_other_updates(data, offset)
           offset += 4 # vector constructor
           count = data[offset, 4].unpack1('L<')
@@ -153,7 +134,7 @@ module MTProto
               msg = Message.deserialize(data, inner_off, data[inner_off, 4].unpack1('L<'))
               messages << msg.to_h if msg
             end
-            offset = schema.skip(data, offset)
+            offset = Reader.schema.skip(data, offset)
           end
           [messages, offset]
         end

data/lib/mtproto/tl/objects/contacts.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../schema'
+require_relative '../reader'
+require_relative '../peers'
 
 module MTProto
   module TL
@@ -8,8 +9,6 @@ module MTProto
       Contact = Struct.new(:user_id, :mutual, keyword_init: true)
       User = Struct.new(:id, :first_name, :last_name, :access_hash, keyword_init: true)
 
-      SCHEMA_PATH = File.expand_path('../../../../data/tl-schema.json', __dir__)
-
       attr_reader :contacts, :saved_count, :users, :not_modified
 
       def initialize(contacts: [], saved_count: 0, users: [], not_modified: false)
@@ -23,10 +22,6 @@ module MTProto
         @not_modified
       end
 
-      def self.schema
-        @schema ||= Schema.new(SCHEMA_PATH)
-      end
-
       def self.deserialize(data)
         constructor = data[0, 4].unpack1('L<')
         return new(not_modified: true) if constructor == Constructors::CONTACTS_CONTACTS_NOT_MODIFIED
@@ -41,9 +36,6 @@ module MTProto
         new(contacts: contacts, saved_count: saved_count, users: users)
       end
 
-      USER_EMPTY = 0xd3bc4b7a
-      private_constant :USER_EMPTY
-
       class << self
         private
 
@@ -68,87 +60,13 @@ module MTProto
           [contacts, offset]
         end
 
-        # User parsing mirrors TL::Dialogs.parse_user (user#31774388). Kept private here
-        # so this class can be used without instantiating Dialogs.
         def parse_users_vector(data, offset)
-          offset += 4 # vector tag
-          count = data[offset, 4].unpack1('L<')
-          offset += 4
-
-          users = []
-          count.times do
-            user, offset = parse_user(data, offset)
-            users << user if user
-          end
-          [users, offset]
-        end
-
-        def parse_user(data, offset)
-          constructor = data[offset, 4].unpack1('L<')
-          offset += 4
-
-          if constructor == USER_EMPTY
-            offset += 8
-            return [nil, offset]
+          records, offset = Peers.users_at(data, offset)
+          mapped = records.map do |user|
+            User.new(id: user[:id], first_name: user[:first_name],
+              last_name: user[:last_name], access_hash: user[:access_hash])
           end
-
-          raise "Unknown User constructor: 0x#{constructor.to_s(16)}" unless constructor == Constructors::USER
-
-          flags = data[offset, 4].unpack1('L<')
-          offset += 4
-          flags2 = data[offset, 4].unpack1('L<')
-          offset += 4
-          id = data[offset, 8].unpack1('Q<')
-          offset += 8
-          access_hash = nil
-          if flags.anybits?(1 << 0)
-            access_hash = data[offset, 8].unpack1('Q<')
-            offset += 8
-          end
-
-          first_name = nil
-          first_name, offset = read_tl_string(data, offset) if flags.anybits?(1 << 1)
-          last_name = nil
-          last_name, offset = read_tl_string(data, offset) if flags.anybits?(1 << 2)
-
-          offset = skip_tl_string(data, offset) if flags.anybits?(1 << 3) # username
-          offset = skip_tl_string(data, offset) if flags.anybits?(1 << 4) # phone
-          offset = schema.skip(data, offset) if flags.anybits?(1 << 5) # photo
-          offset = schema.skip(data, offset) if flags.anybits?(1 << 6) # status
-          offset += 4 if flags.anybits?(1 << 14) # bot_info_version
-          offset = schema.skip_vector(data, offset) { |d, o| schema.skip(d, o) } if flags.anybits?(1 << 18)
-          offset = skip_tl_string(data, offset) if flags.anybits?(1 << 19) # bot_inline_placeholder
-          offset = skip_tl_string(data, offset) if flags.anybits?(1 << 22) # lang_code
-          offset = schema.skip(data, offset) if flags.anybits?(1 << 30) # emoji_status
-          offset = schema.skip_vector(data, offset) { |d, o| schema.skip(d, o) } if flags2.anybits?(1 << 0)
-          offset += 4 if flags2.anybits?(1 << 5) # stories_max_id
-          offset = schema.skip(data, offset) if flags2.anybits?(1 << 8) # color
-          offset = schema.skip(data, offset) if flags2.anybits?(1 << 9) # profile_color
-          offset += 4 if flags2.anybits?(1 << 12) # bot_active_users
-          offset += 8 if flags2.anybits?(1 << 14) # bot_verification_icon
-          offset += 8 if flags2.anybits?(1 << 15) # send_paid_messages_stars
-
-          [User.new(id: id, first_name: first_name, last_name: last_name, access_hash: access_hash), offset]
-        end
-
-        def read_tl_string(data, offset)
-          first_byte = data.getbyte(offset)
-          if first_byte == 254
-            len = data.getbyte(offset + 1) |
-                  (data.getbyte(offset + 2) << 8) |
-                  (data.getbyte(offset + 3) << 16)
-            total = 4 + len
-          else
-            len = first_byte
-            total = 1 + len
-          end
-          padding = (4 - (total % 4)) % 4
-          [data[offset + (total - len), len].force_encoding('UTF-8'), offset + total + padding]
-        end
-
-        def skip_tl_string(data, offset)
-          _, new_offset = read_tl_string(data, offset)
-          new_offset
+          [mapped, offset]
         end
       end
     end