warchat 0.0.7 → 0.0.8

data/README.rdoc

@@ -29,9 +29,7 @@ This is a simple chat client that will let you talk in guild chat and receive me
   client = Warchat::Chat::Client.new
 
   client.on_establish = Proc.new do |response|
-    client.character_name = CHARACTER_NAME
-    client.character_realm = CHARACTER_REALM
-    client.login
+    client.login CHARACTER_NAME,CHARACTER_REALM
   end
 
   client.on_message = Proc.new do |message|

data/lib/warchat.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 require 'active_support/inflector'
 
 module Warchat  

data/lib/warchat/byte_string.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 module Warchat
   class ByteString < String
   

data/lib/warchat/chat/chat_response.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 module Warchat  
   module Chat
     module ChatResponse

data/lib/warchat/chat/client.rb

@@ -1,9 +1,9 @@
+# encoding: ASCII-8BIT
 module Warchat
   module Chat
     class Warchat::Chat::Client
       attr_accessor :on_message,:on_presence,:on_logout,:on_fail,:on_establish
       attr_accessor :on_message_afk,:on_message_dnd,:on_message_guild_chat,:on_message_motd,:on_message_officer_chat,:on_message_whisper,:on_chat_logout
-      attr_accessor :character_name,:character_realm
       
       attr_reader :session
 
@@ -16,6 +16,7 @@ module Warchat
       end
       
       def start username, password
+        [username,password].each do |s| s.respond_to? :force_encoding and s.force_encoding(__ENCODING__) end
         self.session.start(username,password)
       end
 
@@ -32,7 +33,8 @@ module Warchat
         send(m,response) if respond_to? m
       end
       
-      def login
+      def login character_name,character_realm
+        [character_name,character_realm].each do |s| s.respond_to? :force_encoding and s.force_encoding(__ENCODING__) end
         request = Warchat::Network::Request.new("/chat-login",:options=>{:mature_filter=>'false'},:n=>character_name,:r=>character_realm)
         session.send_request(request)
         @timer = Warchat::Timer.new(30,&method(:keep_alive))
@@ -55,11 +57,11 @@ module Warchat
       end
 
       def chat response
-        response.extend(ChatResponse)
+        response.extend(Warchat::Chat::ChatResponse)
         if response.ack?
           
         elsif response.message?
-          message = Message.new(response)
+          message = Warchat::Chat::Message.new(response)
           [on_message,send("on_message_#{message.type}".to_sym)].compact.each do |m| m.call(message) end
         elsif response.presence?
           on_presence and on_presence.call(Presence.new(response))

data/lib/warchat/chat/message.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 module Warchat
   module Chat
     class Message

data/lib/warchat/chat/presence.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 module Warchat
   module Chat
     class Presence    

data/lib/warchat/network/binary_reader.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 module Warchat
   module Network
     class BinaryReader
@@ -11,11 +12,13 @@ module Warchat
       end
       
       def substream l
-        @socket.read l
+        sub = @socket.read(l) 
+        sub << @socket.read(l-sub.length) until sub.length >= l
+        sub
       end
 
       def byte
-        substream 1
+        substream(1)
       end
 
       def string
@@ -23,7 +26,7 @@ module Warchat
       end
 
       def array
-        (1..(int_32)).map &method(:parse_next)
+        (1..(int_32)).map(&method(:parse_next))
       end
 
       def hash

data/lib/warchat/network/binary_writer.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 module Warchat
   module Network
     class BinaryWriter
@@ -79,7 +80,7 @@ module Warchat
       end
 
       def bytes obj
-        @stream.print obj.to_s
+        @stream.print(obj.to_s)
       end
     end  
   end

data/lib/warchat/network/connection.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 require 'socket'
 require 'thread'
 
@@ -66,7 +67,6 @@ module Warchat
         until is_closed?
           @mutex.synchronize do
             until @queue.empty?
-              
               request = @queue.shift
               unless is_closed?
                 request.stream @socket

data/lib/warchat/network/request.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 module Warchat
   module Network
     class Request < Hash
@@ -30,7 +31,8 @@ module Warchat
       end
 
       def stream socket
-        writer = BinaryWriter.new socket
+        str_socket = StringSocket.new
+        writer = BinaryWriter.new str_socket
         writer.string(target)
         writer.int_32(@id)
         each do |k,v|
@@ -50,6 +52,7 @@ module Warchat
           writer.byte 0xFF
         end
         writer.byte 0xFF
+        socket.print(str_socket.value)
       end
       
       def inspect

data/lib/warchat/network/response.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 module Warchat
   module Network
     class Response < Hash

data/lib/warchat/network/session.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 module Warchat
   module Network
     class Session

data/lib/warchat/srp/client.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 require 'digest'
 require 'openssl'
 
@@ -13,7 +14,7 @@ module Warchat
       HASH_SIZE = 32
       SESSION_KEY_SIZE = HASH_SIZE * 2
 
-      attr_reader :b,:b_bytes
+      attr_reader :b,:b_bytes,:salt,:user,:password
 
       def modpow(a, n, m) 
         r = 1
@@ -21,12 +22,12 @@ module Warchat
           r = r * a % m if n[0] == 1
           n >>= 1
           return r if n == 0
-          a = a * a % m
+          a = (a ** 2) % m
         end
       end
 
       def pack_int int
-        Warchat::ByteString.new [int.to_s(16).reverse].pack('h*')
+        Warchat::ByteString.new([int.to_s(16).reverse].pack('h*'))
       end
       
       def unpack_int str
@@ -34,11 +35,15 @@ module Warchat
       end
       
       def digest_int s
-        unpack_int(Digest::SHA2.digest(s))
+        unpack_int(digest_str(s))
+      end
+      
+      def digest_str s
+        Digest::SHA2.digest(s).tap do |s| s.respond_to? :force_encoding and s.force_encoding(__ENCODING__) end
       end
       
       def adjust_size str,length
-        str[0..(length-1)].ljust(length,"\000")
+        Warchat::ByteString.new  str[0..(length-1)].ljust(length,"\000")
       end
 
       def random_crypt
@@ -48,14 +53,14 @@ module Warchat
       def hN_xor_hG
         # xor H(N) and H(G)
         return @hN_xor_hG if @hN_xor_hG
-        hN = Digest::SHA2.digest(pack_int(MODULUS))
-        hG = Digest::SHA2.digest(pack_int(G))
+        hN = digest_str(pack_int(MODULUS)).unpack('C*')
+        hG = digest_str(pack_int(G)).unpack('C*')
         
-        @hN_xor_hG = "\000" * HASH_SIZE
+        tmp = []
         
-        HASH_SIZE.times do |i| @hN_xor_hG[i] = (hN[i] ^ hG[i]) end
+        HASH_SIZE.times do |i| tmp[i] = (hN[i] ^ hG[i]) end
           
-        @hN_xor_hG
+        @hN_xor_hG = tmp.pack('C*')
       end
 
       def a
@@ -77,7 +82,7 @@ module Warchat
 
       def x
         # H(salt | H(userHash | : | sessionPassword))
-        @x ||= digest_int(@salt+Digest::SHA2.digest(@user+":"+@password))
+        @x ||= digest_int(@salt+digest_str(@user+":"+@password))
       end
 
       def s
@@ -92,13 +97,18 @@ module Warchat
 
       def auth1_proof user, password, salt, b_bytes
         @b = unpack_int b_bytes
+        
         @b_bytes = adjust_size(b_bytes,MODULUS_SIZE)
         @salt = adjust_size(salt,SALT_SIZE)
         @user = user
         @password = password
 
-        # hash this to generate client proof, H(H(N) xor H(G) | H(userHash) | salt | A | B | K)
-        Warchat::ByteString.new Digest::SHA2.digest(hN_xor_hG+Digest::SHA2.digest(@user)+salt+a_bytes+@b_bytes+session_key)
+        proof
+      end
+      
+      def proof
+         # hash this to generate client proof, H(H(N) xor H(G) | H(userHash) | salt | A | B | K)
+        Warchat::ByteString.new digest_str(hN_xor_hG+digest_str(user)+salt+a_bytes+b_bytes+session_key)
       end
 
       def session_key
@@ -116,7 +126,7 @@ module Warchat
           temp << s_bytes[i*2+offset]
         end
 
-        hash = Digest::SHA2.digest(temp)
+        hash = digest_str(temp)
         HASH_SIZE.times do |i|
           @session_key[i*2] = hash[i]
         end
@@ -126,7 +136,7 @@ module Warchat
           temp << s_bytes[i*2+offset+1]
         end
 
-        hash = Digest::SHA2.digest(temp)
+        hash = digest_str(temp)
         HASH_SIZE.times do |i|
           @session_key[i*2+1] = hash[i]
         end

data/lib/warchat/timer.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 require 'monitor'
 
 module Warchat  

data/lib/warchat/version.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 module Warchat  
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: warchat
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Zachary Gavin