show some warnings

shadowsocks · Jul 4, 2013 · 20a657a · 20a657a
1 parent a08e3fa
commit 20a657a
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,6 @@
+1.3.6 2013-07-04
+- Check config and show some warning messages
+
 1.3.5 2013-06-29
 - Make local.js and server.js runnable
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 shadowsocks-nodejs
 ===========
 
-Current version: 1.3.5
+Current version: 1.3.6
 [![Build Status](https://travis-ci.org/clowwindy/shadowsocks-nodejs.png)](https://travis-ci.org/clowwindy/shadowsocks-nodejs)
 
 shadowsocks-nodejs is a lightweight tunnel proxy which can help you get through

diff --git a/lib/shadowsocks/local.js b/lib/shadowsocks/local.js
diff --git a/lib/shadowsocks/server.js b/lib/shadowsocks/server.js
diff --git a/lib/shadowsocks/utils.js b/lib/shadowsocks/utils.js
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
     "description": "a tunnel proxy that help you get through firewalls",
     "keywords": ["shadowsocks", "proxy", "socks5"],
     "author": "clowwindy",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "licenses": [{
         "type": "MIT",
         "url": "https://raw.github.com/clowwindy/shadowsocks-nodejs/master/LICENSE"

diff --git a/src/local.coffee b/src/local.coffee
@@ -265,6 +265,9 @@ exports.main = ->
     config[k] = v
   if config.verbose
     utils.config(utils.DEBUG)
+
+  utils.checkConfig config
+
   SERVER = config.server
   REMOTE_PORT = config.server_port
   PORT = config.local_port

diff --git a/src/server.coffee b/src/server.coffee
@@ -64,6 +64,8 @@ exports.main = ->
     config[k] = v
   if config.verbose
     utils.config(utils.DEBUG)
+
+  utils.checkConfig config
 
   timeout = Math.floor(config.timeout * 1000) or 600000
   portPassword = config.port_password

diff --git a/src/utils.coffee b/src/utils.coffee
@@ -24,7 +24,14 @@ exports.parseArgs = ->
       result['verbose'] = true
   result
 
-exports.version = "shadowsocks-nodejs v1.3.5"
+exports.checkConfig = (config) ->
+  if config.server in ['127.0.0.1', 'localhost']
+    exports.warn "Server is set to #{config.server}, maybe it's not correct"
+    exports.warn "Notice server will listen at #{config.server}:#{config.server_port}"
+  if (config.method or '').toLowerCase() == 'rc4'
+    exports.warn 'RC4 is not safe; please use a safer cipher, like AES-256-CFB'
+
+exports.version = "shadowsocks-nodejs v1.3.6"
 
 exports.EVERYTHING = 0
 exports.DEBUG = 1