shadowsocks 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffa53ad10b7ef10c31fbec7b957634073144266f
-  data.tar.gz: ba754df84d406718006c4259e75b2513da528054
+  metadata.gz: 89505690269fc4fea4a159ad713ea3a69045a269
+  data.tar.gz: 076b3e073b3cd64d4c56b4dd22647eddaa866e22
 SHA512:
-  metadata.gz: b09c4253cbfc84d1a6974aa2e92075c58df655b08b881e448be0a362601e0b24f909ba2ab0c04e5402d944c8fc25ff1144b1a59069e1612942b99ce4801ad856
-  data.tar.gz: d72621ffe2282033410bb989a85b3ede86d8d8aed22a8f4eaab2c8c9ec326f5d39a1f91e8f03a42074d4d92e25f36ed8bde76d28e7cd8395a52508f9020e5322
+  metadata.gz: 6016baaee667416efb16d7884e41cba5957a8f2f3ccd12036ddf2c36238341965a8ca3971fcda5ea28d2254e4c15f3d5dc384d5621732a23145197473368e1e9
+  data.tar.gz: e839023341a1870a1c624d7263909c6e65657954dd90336eb4e5c841d23a474c391251f974c1564a274904d707d7877f80172da504345cebde85afee23b56acb

data/README.md

@@ -3,7 +3,7 @@ shadowsocks-ruby
 
 [![Code Climate](https://codeclimate.com/repos/524baea6c7f3a37df208dd4c/badges/9dd6c11b6a17c3a55631/gpa.png)](https://codeclimate.com/repos/524baea6c7f3a37df208dd4c/feed)
 
-Current version: 0.5
+Current version: 0.6
 
 shadowsocks-ruby is a lightweight tunnel proxy which can help you get through firewalls. It is a port of [shadowsocks](https://github.com/clowwindy/shadowsocks).
 
@@ -27,7 +27,7 @@ Create a file named `config.json`, with the following content.
         "local_port":1080,
         "password":"barfoo!",
         "timeout":60,
-        "method":"aes-256-cfb"
+        "method":"aes-128-cfb"
     }
 
 Explanation of the fields:
@@ -37,7 +37,7 @@ Explanation of the fields:
     local_port      local port
     password        a password used to encrypt transfer
     timeout         in seconds
-    method          encryption method, "bf-cfb", "aes-256-cfb", "des-cfb", "rc4", etc. Default is aes-256-cfb
+    method          encryption method, "bf-cfb", "aes-256-cfb", "des-cfb", "rc4", etc. Default is "aes-128-cfb"
     
 `cd` into the directory of `config.json`. Run `ss-server` on your server. To run it in the background, run
 `nohup ss-server -c ./config.json > log &`.

data/config.json

@@ -4,5 +4,5 @@
     "local_port":1080,
     "password":"barfoo!",
     "timeout":60,
-    "method":"aes-256-cfb"
+    "method":"aes-128-cfb"
 }

data/lib/shadowsocks/cli.rb

@@ -57,6 +57,7 @@ module Shadowsocks
       connection.config                  = @config
       connection.crypto                  = Shadowsocks::Crypto.new @method_options
       connection.pending_connect_timeout = @config.timeout
+      connection.comm_inactivity_timeout = @config.timeout
     end
 
   end

data/lib/shadowsocks/connection.rb

@@ -1,6 +1,6 @@
 module Shadowsocks
   class Connection < EventMachine::Connection
-    BackpressureLevel = 2097152 # 2m
+    BackpressureLevel = 524288 # 512k
 
     attr_accessor :crypto
 
@@ -18,10 +18,10 @@ module Shadowsocks
       remote.get_outbound_data_size > BackpressureLevel
     end
 
-    def outbound_checker
+    def outbound_scheduler
       if over_pressure?
         pause unless paused?
-        EM.add_timer(1) { outbound_checker }
+        EM.add_timer(0.2) { outbound_scheduler }
       else
         resume if paused?
       end

data/lib/shadowsocks/crypto.rb

@@ -9,6 +9,23 @@ module Shadowsocks
     attr_accessor :encrypt_table, :decrypt_table, :password, :method,
                   :cipher, :bytes_to_key_results, :iv_sent
 
+    def initialize(options = {})
+      @password = options[:password]
+      @method   = options[:method].downcase
+      if method == 'table'
+        @encrypt_table = options[:encrypt_table]
+        @decrypt_table = options[:decrypt_table]
+      else
+        if method_supported.nil?
+          raise "Encrypt method not support"
+        end
+      end
+
+      if method != 'table'
+        @cipher = get_cipher(1, SecureRandom.hex(32))
+      end
+    end
+
     def method_supported
       case method
       when 'aes-128-cfb'      then [16, 16]
@@ -28,24 +45,6 @@ module Shadowsocks
     end
     alias_method :get_cipher_len, :method_supported
 
-    def initialize(options = {})
-      @password = options[:password]
-      @method   = options[:method].downcase
-      @iv_sent  = false
-      if method == 'table'
-        @encrypt_table = options[:encrypt_table]
-        @decrypt_table = options[:decrypt_table]
-      else
-        if method_supported.nil?
-          raise "Encrypt method not support"
-        end
-      end
-
-      if method != 'table'
-        @cipher = get_cipher(1, SecureRandom.hex(32))
-      end
-    end
-
     def encrypt buf
       return buf if buf.length == 0
       if method == 'table'
@@ -71,6 +70,7 @@ module Shadowsocks
           @iv             = decipher_iv
           @decipher       = get_cipher(0, @iv)
           buf             = buf[decipher_iv_len..-1]
+
           return buf if buf.length == 0
         end
         @decipher.update(buf)
@@ -85,21 +85,20 @@ module Shadowsocks
 
     def get_cipher(op, iv)
       m = get_cipher_len
-      unless m.nil?
-        key, _iv   = EVP_BytesToKey(m[0], m[1])
 
-        iv         = _iv[0..m[1] - 1]
-        @iv        = iv unless @iv
-        @cipher_iv = iv if op == 1
+      key, _iv   = EVP_BytesToKey(m[0], m[1])
 
-        cipher = OpenSSL::Cipher.new method
+      iv         = _iv[0..m[1] - 1]
+      @iv        = iv unless @iv
+      @cipher_iv = iv if op == 1
 
-        op == 1 ? cipher.encrypt : cipher.decrypt
+      cipher = OpenSSL::Cipher.new method
 
-        cipher.key = key
-        cipher.iv  = @iv
-        cipher
-      end
+      op == 1 ? cipher.encrypt : cipher.decrypt
+
+      cipher.key = key
+      cipher.iv  = @iv
+      cipher
     end
 
     def EVP_BytesToKey key_len, iv_len
@@ -112,21 +111,19 @@ module Shadowsocks
 
       len = key_len + iv_len
 
-      code = password.unpack('H*').first
-
       while m.join.length < len do
         data = if i > 0
                  m[i - 1] + password
                else
                  password
                end
-        m.push Digest::MD5.digest data
+        m.push Digest::MD5.digest(data)
         i += 1
       end
       ms  = m.join
       key = ms[0, key_len]
       iv  = ms[key_len, key_len + iv_len]
-      bytes_to_key_results = [key, iv]
+      @bytes_to_key_results = [key, iv]
       bytes_to_key_results
     end
   end

data/lib/shadowsocks/listener.rb

@@ -5,7 +5,7 @@ module Shadowsocks
 
     def receive_data data
       data_handler data
-      outbound_checker if connector
+      outbound_scheduler if connector
     end
 
     def post_init

data/lib/shadowsocks/local.rb

@@ -14,7 +14,7 @@ module Shadowsocks
 
       def receive_data data
         server.send_data decrypt(data)
-        outbound_checker
+        outbound_scheduler
       end
     end
 

data/lib/shadowsocks/server.rb

@@ -12,7 +12,7 @@ module Shadowsocks
 
       def receive_data data
         server.send_data encrypt(data)
-        outbound_checker
+        outbound_scheduler
       end
     end
 

data/lib/shadowsocks/version.rb

@@ -1,3 +1,3 @@
 module Shadowsocks
-  VERSION = '0.5'
+  VERSION = '0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shadowsocks
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Sen