dcase 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d798b7687187ae48822a7697be6f6481ec5147d
-  data.tar.gz: a216c5043444fa4cd375af0f16a1724d76eade1e
+  metadata.gz: 1fec588b807e7fbd5220c48f3f742dcbe9bddaa5
+  data.tar.gz: 4d34376f2ff60eb1e2340b11e9f3d7b1790d0e41
 SHA512:
-  metadata.gz: 75fb759cf33a02d4bf5a13b11a003d75b0462b4b212f4bab0bd757e3222002519dd9e5c3ded0a72f889f77577bac5d1b17c98dde02ee1ea0bc95cfc0d916cb16
-  data.tar.gz: e5950388fe64ac83e88a81d00168a42e64cc251b9541d6c5e6c07a416c3e1a777812e9bee040489fef37cd1fa92598144cfab2076abcd2044d1ce4ba15f369e6
+  metadata.gz: 20eabd04c3ef770cb5f15668a60812efdaf55f3f2bbb311ad4ecfe577497f024eb7ff0c9dcae805ef0731f654d0d726623c8ff79c4f9d3cc449f172795021a86
+  data.tar.gz: 7e1cd1a5eb774599e69be9c588b4577d63e3fc1616d8bb528fef8a13226c61c2ee0de344b58280b07a30f1bd5eda579e6a0694af602442f12774ceb2a375c709

data/README.md

@@ -1,7 +1,7 @@
 DCase
 =====
 
-Current version: 0.2
+Current version: 0.3
 
 DCase is a lightweight dns proxy which can help you get through firewalls.
 
@@ -22,8 +22,10 @@ Create a file named `config.yml`, with the following content.
     side: 'local or server'
     password: 'your password'
     port: '8440'
-    # you don't need this line when it's on server side
     server: 'remote server address'
+    dns_list:
+      - '8.8.8.8'
+      - '8.8.4.4'
 
 Explanation of the fields:
 
@@ -31,7 +33,8 @@ Explanation of the fields:
     server    Remote server address
     port      Remote server port
     password  Password, should be same in client and server sides
-    
+    dns_list  A dns server will pick on server side
+
 `cd` into the directory of `config.yml`. Run `dcase` on your server. To run it in the background, run
 `nohup dcase -c ./config.yml > log &`.
 
@@ -43,7 +46,7 @@ Command line args
 You can use args to override settings from `config.json`.
 
     sudo dcase -s local -r remote_server_ip_address -p remote_server_port -k your_password
-    sudo dcase -s server -p remote_server_port -k your_password
+    sudo dcase -s server -p remote_server_port -k your_password -l 8.8.8.8,8.8.4.4
 
 License
 -------

data/Rakefile

@@ -5,8 +5,9 @@ require 'rake/testtask'
 # Load custom tasks
 Dir['tasks/*.rake'].sort.each { |f| load f }
 
-Rake::TestTask.new do |task|
-  task.libs << 'test'
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.pattern = "test/**/*_test.rb"
 end
 
 task :default => :test

data/config.yml

@@ -1,3 +1,6 @@
 password: 'your password'
 port: '8440'
 server: '127.0.0.1'
+dns_list:
+  - '8.8.8.8'
+  - '8.8.4.4'

data/lib/dcase/cli.rb

@@ -12,8 +12,8 @@ module DCase
           puts "*** Local side is up, remote server port:#{@config.port}"
           DCase::Local.supervise('0.0.0.0', 53, @crypto, @config)
         when 'server'
-          puts "*** Server side is up, port:#{@config.port}"
-          DCase::Server.supervise('0.0.0.0', @config.port, @crypto)
+          puts "*** Server side is up, port:#{@config.port}, with dns list: #{@config.dns_list.join(', ')}"
+          DCase::Server.supervise('0.0.0.0', @crypto, @config)
         end
 
       puts "*** Hit Ctrl+c to stop"

data/lib/dcase/config.rb

@@ -5,10 +5,10 @@ require File.expand_path('../version', __FILE__)
 
 module DCase
   class Config
-    attr_accessor :args, :side, :server, :port, :password, :config_path
+    attr_accessor :args, :side, :server, :port, :password, :dns_list, :config_path
 
-    def initialize(args)
-      @args = args || []
+    def initialize(args = [])
+      @args = args
 
       parse_args
       read_config
@@ -44,6 +44,7 @@ module DCase
       @server    = config["server"]        if @server.nil?
       @port      = config["port"].to_i     if @port.nil?
       @password  = config["password"]      if @password.nil?
+      @dns_list  = config["dns_list"]      if @dns_list.nil?
     end
 
     def parse_args
@@ -73,6 +74,10 @@ module DCase
           @password = c
         end
 
+        opts.on("-l", "--dns-list LIST", "Password, should be same in client and server sides") do |c|
+          @dns_list = c.split(',').map(&:strip)
+        end
+
         opts.on_tail("-v", "--version", "Show shadowsocks gem version") do
           puts DCase::VERSION
           exit

data/lib/dcase/local.rb

@@ -8,6 +8,7 @@ module DCase
 
     def initialize(addr, port, crypto, config)
       @socket = UDPSocket.new
+      @socket.to_io.setsockopt(:SOCKET, :REUSEADDR, 1)
       @socket.bind(addr, port)
       @crypto = crypto
       @config = config

data/lib/dcase/server.rb

@@ -5,9 +5,12 @@ module DCase
 
     attr_accessor :crypto
 
-    def initialize(host, port, crypto)
+    def initialize(host, crypto, config)
+      @config = config
+
       @server = UDPSocket.new
-      @server.bind(host, port)
+      @server.to_io.setsockopt(:SOCKET, :REUSEADDR, 1)
+      @server.bind(host, @config.port)
 
       @crypto = crypto
 
@@ -27,7 +30,7 @@ module DCase
 
     def handle_data(data, port, addr)
       request = UDPSocket.new
-      request.send crypto.decrypt(data), 0, '8.8.8.8', 53
+      request.send crypto.decrypt(data), 0, @config.dns_list.sample, 53
 
       async.start_connect(request, port, addr)
     end

data/lib/dcase/version.rb

@@ -1,3 +1,3 @@
 module DCase
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

data/test/dcase/cli_test.rb

@@ -0,0 +1,5 @@
+require 'test_helper'
+require_relative '../../lib/dcase/cli.rb'
+
+class TestCli < TestCase
+end

data/test/dcase/config_test.rb

@@ -0,0 +1,42 @@
+require 'test_helper'
+require_relative '../../lib/dcase/config.rb'
+
+class TestConfig < TestCase
+  def test_local_params
+    config = DCase::Config.new ['-s', 'local']
+
+    assert_equal config.password, 'your password'
+    assert_equal config.server, '127.0.0.1'
+    assert_equal config.port, 8440
+    assert_equal config.dns_list, ['8.8.8.8', '8.8.4.4']
+  end
+
+  def test_server_params
+    config = DCase::Config.new ['-s', 'server']
+
+    assert_equal config.password, 'your password'
+    assert_equal config.server, '127.0.0.1'
+    assert_equal config.port, 8440
+    assert_equal config.dns_list, ['8.8.8.8', '8.8.4.4']
+  end
+
+  def test_local_with_command
+    config = DCase::Config.new ['-s', 'local', '-k', 'your password', '-r', '127.0.0.1', '-p', '8440']
+    assert_equal config.password, 'your password'
+    assert_equal config.server, '127.0.0.1'
+    assert_equal config.port, 8440
+  end
+
+  def test_server_with_command
+    config = DCase::Config.new ['-s', 'server', '-k', 'your password', '-r', '127.0.0.1', '-p', '8440', '-l', '8.8.8.8,8.8.4.4']
+    assert_equal config.password, 'your password'
+    assert_equal config.server, '127.0.0.1'
+    assert_equal config.port, 8440
+    assert_equal config.dns_list, ['8.8.8.8', '8.8.4.4']
+  end
+
+  def test_blank_side
+    e = assert_raises(RuntimeError) { DCase::Config.new }
+    assert_equal 'You need to define side of dcase in', e.message
+  end
+end

data/test/test_helper.rb

@@ -1,3 +1,8 @@
 require "bundler/setup"
 require "minitest/autorun"
 require "mocha/setup"
+
+Dir[File.expand_path('../support/**/*', __FILE__)].each &method(:require)
+
+class TestCase < Minitest::Test
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dcase
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Sen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
@@ -108,6 +108,8 @@ files:
 - lib/dcase/version.rb
 - tasks/compile.rake
 - tasks/dev.rake
+- test/dcase/cli_test.rb
+- test/dcase/config_test.rb
 - test/test_helper.rb
 homepage: https://github.com/Sen/DCase
 licenses: