shadowsocks 0.6 → 0.7

data/lib/shadowsocks.rb

@@ -1,11 +1,18 @@
 require 'eventmachine'
 
 module Shadowsocks
-  autoload :Crypto,   'shadowsocks/crypto'
+  autoload :Crypto,     'shadowsocks/crypto'
   autoload :Connection, 'shadowsocks/connection'
   autoload :Server,     'shadowsocks/server'
   autoload :Local,      'shadowsocks/local'
   autoload :Table,      'shadowsocks/table'
   autoload :Tunnel,     'shadowsocks/tunnel'
   autoload :Listener,   'shadowsocks/listener'
+  autoload :IPDetector, 'shadowsocks/ip_detector'
+
+  module Parser
+    autoload :Base,     'shadowsocks/parser/base'
+    autoload :Local,    'shadowsocks/parser/local'
+    autoload :Server,   'shadowsocks/parser/server'
+  end
 end

data/lib/shadowsocks/cli.rb

@@ -10,8 +10,9 @@ module Shadowsocks
     attr_accessor :side, :args, :config
 
     def initialize(options)
-      @side   = options[:side]
-      @config = options[:config]
+      @side        = options[:side]
+      @config      = options[:config]
+      @ip_detector = Shadowsocks::IPDetector.new if @config.chnroutes
 
       @method_options = {
         method:   config.method,
@@ -58,7 +59,7 @@ module Shadowsocks
       connection.crypto                  = Shadowsocks::Crypto.new @method_options
       connection.pending_connect_timeout = @config.timeout
       connection.comm_inactivity_timeout = @config.timeout
+      connection.ip_detector             = @ip_detector if @config.chnroutes
     end
-
   end
 end

data/lib/shadowsocks/config.rb

@@ -2,7 +2,7 @@ require 'json'
 
 module Shadowsocks
   class Config
-    attr_reader :args, :server, :server_port, :local_port, :password, :timeout, :method, :config_path
+    attr_reader :args, :server, :server_port, :local_port, :password, :timeout, :method, :config_path, :chnroutes
 
     def initialize(_args)
       @args = _args || []
@@ -23,12 +23,13 @@ module Shadowsocks
       @local_port   = json["local_port"].to_i  if @local_port.nil?
       @timeout      = json["timeout"].to_i     if @timeout.nil?
       @method       = json["method"]           if @method.nil?
+      @chnroutes    = json["chnroutes"]        if @chnroutes.nil?
     end
 
     private
 
     def parse_args
-      opt_parser = OptionParser.new do |opts| 
+      opt_parser = OptionParser.new do |opts|
         opts.banner = "Usage: ss-server [options]"
 
         opts.separator ""
@@ -41,6 +42,7 @@ module Shadowsocks
         opts.on("-l", "--local_port PORT", Integer, "Local client port")                             { |c| @local_port  = c }
         opts.on("-m", "--method METHOD", "Encryption method")                                        { |c| @method      = c }
         opts.on("-t", "--timeout NUMBER", Integer, "connection timeout")                             { |c| @timeout     = c }
+        opts.on("-d", "--detect", "chnroutes feature")                                               { |c| @chnroutes   = c }
 
         opts.on_tail("-v", "--version", "Show shadowsocks gem version")                              { puts Shadowsocks::VERSION; exit }
         opts.on_tail("-h", "--help", "Show this message")                                            { puts opts; exit }

data/lib/shadowsocks/crypto.rb

@@ -15,13 +15,11 @@ module Shadowsocks
       if method == 'table'
         @encrypt_table = options[:encrypt_table]
         @decrypt_table = options[:decrypt_table]
-      else
-        if method_supported.nil?
-          raise "Encrypt method not support"
-        end
+      elsif method_supported.nil?
+        raise "Encrypt method not support"
       end
 
-      if method != 'table'
+      if method != 'table' and method != 'none'
         @cipher = get_cipher(1, SecureRandom.hex(32))
       end
     end
@@ -41,12 +39,13 @@ module Shadowsocks
       when 'rc2-cfb'          then [16, 8 ]
       when 'rc4'              then [16, 0 ]
       when 'seed-cfb'         then [16, 16]
+      when 'none'             then [0,  0]
       end
     end
     alias_method :get_cipher_len, :method_supported
 
     def encrypt buf
-      return buf if buf.length == 0
+      return buf if buf.length == 0 or method == 'none'
       if method == 'table'
         translate @encrypt_table, buf
       else
@@ -60,7 +59,7 @@ module Shadowsocks
     end
 
     def decrypt buf
-      return buf if buf.length == 0
+      return buf if buf.length == 0 or method == 'none'
       if method == 'table'
         translate @decrypt_table, buf
       else

data/lib/shadowsocks/ip_detector.rb

@@ -0,0 +1,30 @@
+require 'ipaddr'
+require 'socket'
+
+module Shadowsocks
+  class IPDetector
+    GFW_LIST_PATH = './data/gfwlist.txt'
+
+    def initialize
+      @internals = {}
+      @nums      = []
+      lines = File.readlines(GFW_LIST_PATH)
+      lines.each do |line|
+        num = IPAddr.new(line).to_i
+        @nums << num
+        @internals[num.to_s] = line
+      end
+      @nums.sort!
+    end
+
+    def behind_gfw?(domain)
+      ip = IPSocket::getaddress(domain)
+
+      ip_num = IPAddr.new(ip).to_i
+
+      i = @nums.bsearch { |x| x > ip_num }
+      index = @nums.index(i) - 1
+      IPAddr.new(@internals[@nums[index].to_s]).include? ip
+    end
+  end
+end

data/lib/shadowsocks/listener.rb

@@ -1,7 +1,7 @@
 module Shadowsocks
   class Listener < ::Shadowsocks::Connection
     attr_accessor :stage, :remote_addr, :remote_port, :addr_to_send, :cached_pieces,
-                  :header_length, :connector, :config
+                  :header_length, :connector, :config, :ip_detector
 
     def receive_data data
       data_handler data
@@ -25,37 +25,24 @@ module Shadowsocks
 
     private
 
-    def connection_cleanup
-      connector.close_connection if connector
-      self.close_connection
-    end
+    def parse_data parser
+      @addrtype = parser.addr_type
 
-    def resolve_addrtype data
-      case @addrtype
-      when "\x01"
-        ip_address data
-      when "\x03"
-        domain_address data
-      else
+      if parser.mode == :unsupported
         warn "unsupported addrtype: " + @addrtype.unpack('c')[0].to_s
         connection_cleanup
       end
-    end
 
-    def domain_address data
-      @remote_addr   = data[2, @addr_len]
-      @remote_port   = data[2 + @addr_len, 2].unpack('s>')[0]
-      @header_length = 2 + @addr_len + 2
+      @addr_len      = parser.addr_len
+      @addr_to_send  = parser.addr_to_send
+      @remote_addr   = parser.remote_addr
+      @remote_port   = parser.remote_port
+      @header_length = parser.header_length
     end
 
-    def ip_address data
-      @remote_addr   = inet_ntoa data[1..4]
-      @remote_port   = data[5, 2].unpack('s>')[0]
-      @header_length = 7
-    end
-
-    def inet_ntoa n
-      n.unpack("C*").join "."
+    def connection_cleanup
+      connector.close_connection if connector
+      self.close_connection
     end
   end
 end

data/lib/shadowsocks/local.rb

@@ -18,7 +18,24 @@ module Shadowsocks
       end
     end
 
+    class DirectConnector < ::Shadowsocks::Tunnel
+      def post_init
+        p "connecting #{server.remote_addr[3..-1]} directly"
+        server.cached_pieces.each { |piece| send_data piece }
+        server.cached_pieces = []
+
+        server.stage = 5
+      end
+
+      def receive_data data
+        server.send_data data
+        outbound_scheduler
+      end
+    end
+
     class LocalListener < ::Shadowsocks::Listener
+      attr_accessor :behind_gfw
+
       private
 
       def data_handler data
@@ -31,7 +48,13 @@ module Shadowsocks
         when 4
           cached_pieces.push data
         when 5
-          connector.send_data(encrypt(data)) and return
+          to_send = \
+            if behind_gfw
+              data
+            else
+              encrypt(data)
+            end
+          connector.send_data(to_send) and return
         end
       end
 
@@ -42,14 +65,21 @@ module Shadowsocks
             connection_cleanup and return
           end
 
-          @addr_to_send = data[3]
-
-          resolve_addrtype data
+          parse_data Shadowsocks::Parser::Local.new(data)
 
           send_data "\x05\x00\x00\x01\x00\x00\x00\x00" + [config.server_port].pack('s>')
 
           @stage = 4
-          @connector = EventMachine.connect config.server, config.server_port, ServerConnector, self, crypto
+
+          if config.chnroutes
+            @behind_gfw = @ip_detector.behind_gfw?(@remote_addr[3..-1])
+          end
+
+          if config.chnroutes == true and behind_gfw
+            @connector = EventMachine.connect @remote_addr[3..-1], @remote_port, DirectConnector, self, crypto
+          else
+            @connector = EventMachine.connect config.server, config.server_port, ServerConnector, self, crypto
+          end
 
           if data.size > header_length
             cached_pieces.push data[header_length, data.size]
@@ -59,22 +89,6 @@ module Shadowsocks
           connection_cleanup
         end
       end
-
-      def resolve_addrtype data
-        @addrtype = data[3]
-        super
-      end
-
-      def domain_address data
-        @addr_len       = data[4].unpack('c')[0]
-        @addr_to_send  += data[4..5 + @addr_len + 2]
-        super
-      end
-
-      def ip_address data
-        @addr_to_send  += data[4..9]
-        super
-      end
     end
   end
 end

data/lib/shadowsocks/parser/base.rb

@@ -0,0 +1,71 @@
+module Shadowsocks
+  module Parser
+    class Base
+      attr_accessor :data, :mode
+
+      def initialize(data)
+        @data = data
+
+        @mode = \
+          case addr_type
+          when "\x01"
+            :ip
+          when "\x03"
+            :domain
+          else
+            :unsupported
+          end
+      end
+
+      def addr_type
+        raise 'Called abstract method: addr_type'
+      end
+
+      def addr_len
+        raise 'Called abstract method: addr_len'
+      end
+
+      def addr_to_send
+        case mode
+        when :domain
+          data[3..5 + addr_len + 2]
+        when :ip
+          data[3..9]
+        end
+      end
+
+      def remote_addr
+        case mode
+        when :domain
+          data[2, addr_len + 3]
+        when :ip
+          inet_ntoa data[1..4]
+        end
+      end
+
+      def remote_port
+        case mode
+        when :domain
+          data[5 + addr_len, 2].unpack('s>')[0]
+        when :ip
+          data[5, 2].unpack('s>')[0]
+        end
+      end
+
+      def header_length
+        case mode
+        when :domain
+          4 + addr_len
+        when :ip
+          7
+        end
+      end
+
+      private
+
+      def inet_ntoa n
+        n.unpack("C*").join "."
+      end
+    end
+  end
+end

data/lib/shadowsocks/parser/local.rb

@@ -0,0 +1,15 @@
+module Shadowsocks
+  module Parser
+    class Local < Base
+      def addr_type
+        data[3]
+      end
+
+      def addr_len
+        if mode == :domain
+          data[4].unpack('c')[0]
+        end
+      end
+    end
+  end
+end

data/lib/shadowsocks/parser/server.rb

@@ -0,0 +1,15 @@
+module Shadowsocks
+  module Parser
+    class Server < Base
+      def addr_type
+        data[0]
+      end
+
+      def addr_len
+        if mode == :domain
+          data[1].unpack('c')[0]
+        end
+      end
+    end
+  end
+end

data/lib/shadowsocks/server.rb

@@ -33,7 +33,7 @@ module Shadowsocks
 
       def fireup_tunnel data
         begin
-          resolve_addrtype data
+          parse_data Shadowsocks::Parser::Server.new(data)
 
           @stage = 4
 
@@ -47,16 +47,6 @@ module Shadowsocks
           connection_cleanup
         end
       end
-
-      def resolve_addrtype data
-        @addrtype = data[0]
-        super
-      end
-
-      def domain_address data
-        @addr_len = data[1].unpack('c')[0]
-        super
-      end
     end
   end
 end

data/lib/shadowsocks/version.rb

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

data/shadowsocks.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency "json", "~> 1.8.0"
   s.add_dependency "ffi", "~> 1.9.0"
 
-  s.add_development_dependency "rake-compiler", "~> 0.9.1"
-  s.add_development_dependency "mocha", "~> 0.14.0"
+  s.add_development_dependency "rake-compiler", "~> 0.9.2"
+  s.add_development_dependency "mocha", "~> 1.0.0"
   s.add_development_dependency "rake"
 end

data/tasks/chnroutes.rake

@@ -0,0 +1,61 @@
+require 'ipaddr'
+require 'ipaddress'
+require 'benchmark'
+
+task :fetch_chnroutes do
+  url = 'http://ftp.apnic.net/apnic/stats/apnic/delegated-apnic-latest'
+  unless File.exists?('./delegated-apnic-latest')
+    `wget -v #{url}`
+  end
+
+  lines = File.readlines './delegated-apnic-latest'
+  file = File.open("./data/gfwlist.txt", "w")
+  lines.each do |line|
+    unit_items  = line.split('|')
+    if unit_items.length >= 5 and unit_items[2] == 'ipv4' and unit_items[1] == "CN"
+      starting_ip = unit_items[3]
+      num_ip      = unit_items[4].to_i
+
+      file.puts "#{starting_ip}/#{32 - (Math.log(num_ip, 2).ceil).to_i}"
+    end
+  end
+end
+
+task :test_ip do
+  ip = '162.243.140.72'
+  lines = File.readlines("./data/gfwlist.txt")
+  internals = []
+  lines.each do |line|
+    internals << IPAddr.new(line)
+  end
+
+  Benchmark.bm do |x|
+    x.report { 50.times { internals.any? { |i| i.include?(ip) } } }
+  end
+end
+
+task :test_new_ip do
+  ip = '122.97.254.169'
+  lines = File.readlines("./data/gfwlist.txt")
+  internals = {}
+  nums      = []
+  lines.each do |line|
+    num = IPAddr.new(line).to_i
+    nums << num
+    internals[num.to_s] = line
+  end
+  nums.sort!
+
+  Benchmark.bm do |x|
+    x.report do
+      1000.times do
+        ip_num = IPAddr.new(ip).to_i
+
+        i = nums.bsearch { |x| x > ip_num }
+        index = nums.index(i) - 1
+        IPAddr.new(internals[nums[index].to_s]).include? ip
+      end
+    end
+  end
+
+end