synacrb 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4964063b1ca35c7063231c1c10f1d86c088493f0
-  data.tar.gz: a0358c631c43e032dc73ef99785d479bf392d93b
+  metadata.gz: 30dbae35dd723e6b899621986b3a0399393cd8c9
+  data.tar.gz: ffcffa2fdbd971f00a753b2b0b58ee5a22d23557
 SHA512:
-  metadata.gz: f4e7277192867a5e82655c3f586a40a8ad4e9da8cb4bd0e43d4580deb256dc93f7123b7639752712c7364a9681e754744609a895fb2a29cdcfd422f33048dc58
-  data.tar.gz: 0ddd97c3a7dbbae5f8070fbd55ba33350fd1055b432a305ec1e9e15ef95e728982ead47ab614f26bd92d52a9b7f28988617adae7c25773b5f13c2b27c8e78079
+  metadata.gz: 55186b9bd1332c6803c7ab07038a11e5fc74107ef6283895545266d533b87e73ff5587147f6178cb58f99adc94f860bc81fa8599abc053c16f81236b940e4491
+  data.tar.gz: ea49876c0be8dbf2d13d1d6c4b080474ab2e14378aa4bebecbf1f23ba0f2fad91057f39839a81731bf08ba5e4a22a3099a7b464b30294b5404eca3970614056b

data/lib/{packets.rb → common.rb}

@@ -1,6 +1,7 @@
 module Synacrb
     module Common
         DEFAULT_PORT = 8439
+        RSA_LENGTH   = 3072
         TYPING_TIMEOUT = 10
 
         LIMIT_USER_NAME = 128
@@ -76,6 +77,13 @@ module Synacrb
         PACKET_TYPINGRECEIVE_ID = 29;        TypingReceive = Struct.new(:author, :channel)
         PACKET_USERRECEIVE_ID = 30;          UserReceive = Struct.new(:inner)
 
+        def self.encode_u16(input)
+            (input >> 8).chr + (input % 256).chr
+        end
+        def self.decode_u16(input)
+            (input[0].ord << 8) + input[1].ord
+        end
+
         def self.packet_from_id(id)
             case id
             when PACKET_CLOSE_ID

data/lib/encrypter.rb

@@ -0,0 +1,43 @@
+module Synacrb
+    # Encrypt `input` with `rsa` instance.
+    # The difference between just encrypting it normally
+    # is that this has a larger max-length and is
+    # following the standard synac format.
+    def self.encrypt(input, rsa)
+        cipher = OpenSSL::Cipher.new "AES-256-CBC"
+        cipher.encrypt
+        key = cipher.random_key
+        iv  = cipher.random_iv
+
+        encrypted_aes = cipher.update(input) + cipher.final
+        size_aes = encrypted_aes.bytesize
+
+        keyiv = key + iv
+        encrypted_rsa = rsa.public_encrypt keyiv
+        size_rsa = encrypted_rsa.bytesize
+
+        Common.encode_u16(size_rsa) +
+            Common.encode_u16(size_aes) +
+            encrypted_rsa +
+            encrypted_aes
+    end
+
+    # Decrypt `input` with `rsa` instance.
+    # The difference between just decrypting it normally
+    # is that this has a larger max-length and is
+    # following the standard synac format.
+    def self.decrypt(input, rsa)
+        size_rsa = Common.decode_u16(input.byteslice(0, 2));
+        size_aes = Common.decode_u16(input.byteslice(2, 4));
+
+        input = input.byteslice(4, input.bytesize)
+
+        keyiv = rsa.private_decrypt input.byteslice(0, size_rsa)
+
+        cipher = OpenSSL::Cipher.new "AES-256-CBC"
+        cipher.decrypt
+        cipher.key = keyiv.byteslice(0, 32)
+        cipher.iv  = keyiv.byteslice(32, 32+16)
+        cipher.update(input.byteslice(size_rsa, input.bytesize)) + cipher.final
+    end
+end

data/lib/synacrb/version.rb

@@ -1,3 +1,3 @@
 module Synacrb
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/synacrb.rb

@@ -1,5 +1,6 @@
+require "common.rb"
+require "encrypter.rb"
 require "state.rb"
-require "packets.rb"
 
 require "msgpack"
 require "openssl"
@@ -55,17 +56,15 @@ module Synacrb
         def send(packet)
             id = Common.packet_to_id(packet)
             data = [id, [packet.to_a]].to_msgpack
-            size1 = data.length >> 8
-            size2 = data.length % 256
 
-            @stream.write [size1, size2].pack("U*")
+            @stream.write Common.encode_u16(data.length)
             @stream.write data
         end
 
         # Read a packet from the connection
         def read()
             size_a = @stream.read 2
-            size = (size_a[0].ord << 8) + size_a[1].ord
+            size = Common.decode_u16(size_a)
             data = @stream.read size
 
             data = MessagePack.unpack data

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synacrb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - jD91mZM2
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-23 00:00:00.000000000 Z
+date: 2017-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,7 +53,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- lib/packets.rb
+- lib/common.rb
+- lib/encrypter.rb
 - lib/state.rb
 - lib/synacrb.rb
 - lib/synacrb/version.rb