From e1a876dad4a6f2e46af55df9e1be1a8865a9b61c Mon Sep 17 00:00:00 2001 From: lightsocks Date: Wed, 4 Feb 2015 11:56:38 +0800 Subject: [PATCH 01/10] add code to support blowfish --- .../java/com/lightsocks/socks5/Client.java | 23 +++++----- .../java/com/lightsocks/socks5/Server.java | 14 +++--- .../com/lightsocks/socks5/bean/Config.java | 12 +++++ .../lightsocks/socks5/crpt/CrptorParam.java | 41 +++++++++++++++++ .../lightsocks/socks5/crpt/CrptorUtil.java | 28 +++++++++++ .../com/lightsocks/socks5/crpt/Icrptor.java | 12 +++++ .../lightsocks/socks5/crpt/IcrptorImp.java | 46 +++++++++++++++++++ .../socks5/handler/CLeftHandler.java | 2 +- .../socks5/handler/CRightHandler.java | 30 +++++++----- .../socks5/handler/SDstHandler.java | 14 +++--- .../socks5/handler/SLeftHandler.java | 30 ++++++------ 11 files changed, 201 insertions(+), 51 deletions(-) create mode 100644 src/main/java/com/lightsocks/socks5/crpt/CrptorParam.java create mode 100644 src/main/java/com/lightsocks/socks5/crpt/CrptorUtil.java create mode 100644 src/main/java/com/lightsocks/socks5/crpt/Icrptor.java create mode 100644 src/main/java/com/lightsocks/socks5/crpt/IcrptorImp.java diff --git a/src/main/java/com/lightsocks/socks5/Client.java b/src/main/java/com/lightsocks/socks5/Client.java index 33402f4..636c7a1 100644 --- a/src/main/java/com/lightsocks/socks5/Client.java +++ b/src/main/java/com/lightsocks/socks5/Client.java @@ -12,6 +12,8 @@ import java.util.logging.Logger; import com.lightsocks.socks5.bean.Config; +import com.lightsocks.socks5.crpt.CrptorParam; +import com.lightsocks.socks5.crpt.CrptorUtil; import com.lightsocks.socks5.handler.CHandShakeHandler; import com.lightsocks.socks5.util.ConfigUtil; @@ -28,8 +30,8 @@ public static void main(String[] args) throws Exception { ConfigUtil util = new ConfigUtil(); util.parseConfig(args); if (checkParams(util)) { - new ClientListener(AppConfig.getLocalIp(), AppConfig.getLocalPort(), bossGroup, workerGroup) - .run(); + new ClientListener(AppConfig.getLocalIp(), + AppConfig.getLocalPort(), bossGroup, workerGroup).run(); } else if (util.getValue("-h") != null || util.getValue("--h") != null || util.getValue("-help") != null || util.getValue("--help") != null) { @@ -83,21 +85,20 @@ private static boolean checkParams(ConfigUtil util) { } else { config.setLocalIp("127.0.0.1"); } - - if (util.getValue("-m") != null) { - if (util.getValue("-m").equalsIgnoreCase("aes-cfb-128")) { - config.setMode("AES/CFB128/NoPadding"); - } // to do - } else { - config.setMode("AES/CFB128/NoPadding"); + + String mode = util.getValue("-m"); + if (mode == null) { + mode = "aes-cfb-128"; } + CrptorParam param = CrptorUtil.getCrptorParam(mode); + config.setCrptorParam(param); AppConfig = config; return true; } private final static class ClientListener { - private static final Logger s_logger = Logger.getLogger(ClientListener.class - .getName()); + private static final Logger s_logger = Logger + .getLogger(ClientListener.class.getName()); private EventLoopGroup bossGroup; private EventLoopGroup workerGroup; diff --git a/src/main/java/com/lightsocks/socks5/Server.java b/src/main/java/com/lightsocks/socks5/Server.java index 3887b67..60d4b1e 100644 --- a/src/main/java/com/lightsocks/socks5/Server.java +++ b/src/main/java/com/lightsocks/socks5/Server.java @@ -13,6 +13,8 @@ import java.util.logging.Logger; import com.lightsocks.socks5.bean.Config; +import com.lightsocks.socks5.crpt.CrptorParam; +import com.lightsocks.socks5.crpt.CrptorUtil; import com.lightsocks.socks5.handler.SIVHandler; import com.lightsocks.socks5.util.ConfigUtil; @@ -71,13 +73,13 @@ private static boolean checkParams(ConfigUtil util) { s_logger.info("must specify password"); return false; } - if (util.getValue("-m") != null) { - if (util.getValue("-m").equalsIgnoreCase("aes-cfb-128")) { - config.setMode("AES/CFB128/NoPadding"); - } // to do - } else { - config.setMode("AES/CFB128/NoPadding"); + + String mode = util.getValue("-m"); + if (mode == null) { + mode = "aes-cfb-128"; } + CrptorParam param = CrptorUtil.getCrptorParam(mode); + config.setCrptorParam(param); AppConfig = config; return true; } diff --git a/src/main/java/com/lightsocks/socks5/bean/Config.java b/src/main/java/com/lightsocks/socks5/bean/Config.java index 40547ad..48e6f4f 100644 --- a/src/main/java/com/lightsocks/socks5/bean/Config.java +++ b/src/main/java/com/lightsocks/socks5/bean/Config.java @@ -1,5 +1,7 @@ package com.lightsocks.socks5.bean; +import com.lightsocks.socks5.crpt.CrptorParam; + public class Config { private String serverIp; @@ -13,6 +15,8 @@ public class Config { private String password; private String mode; + + private CrptorParam crptorParam; public String getServerIp() { return serverIp; @@ -61,4 +65,12 @@ public String getMode() { public void setMode(String mode) { this.mode = mode; } + + public CrptorParam getCrptorParam() { + return crptorParam; + } + + public void setCrptorParam(CrptorParam crptorParam) { + this.crptorParam = crptorParam; + } } diff --git a/src/main/java/com/lightsocks/socks5/crpt/CrptorParam.java b/src/main/java/com/lightsocks/socks5/crpt/CrptorParam.java new file mode 100644 index 0000000..2ce5fa2 --- /dev/null +++ b/src/main/java/com/lightsocks/socks5/crpt/CrptorParam.java @@ -0,0 +1,41 @@ +package com.lightsocks.socks5.crpt; + +public class CrptorParam { + private int keyLen; + private int ivLen; + private String mode; + private String type; + + public int getKeyLen() { + return keyLen; + } + + public void setKeyLen(int keyLen) { + this.keyLen = keyLen; + } + + public int getIvLen() { + return ivLen; + } + + public void setIvLen(int ivLen) { + this.ivLen = ivLen; + } + + public String getMode() { + return mode; + } + + public void setMode(String mode) { + this.mode = mode; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + +} diff --git a/src/main/java/com/lightsocks/socks5/crpt/CrptorUtil.java b/src/main/java/com/lightsocks/socks5/crpt/CrptorUtil.java new file mode 100644 index 0000000..5f77f32 --- /dev/null +++ b/src/main/java/com/lightsocks/socks5/crpt/CrptorUtil.java @@ -0,0 +1,28 @@ +package com.lightsocks.socks5.crpt; + +import java.util.HashMap; + +public class CrptorUtil { + private static HashMap paraMap = new HashMap(); + + static { + + CrptorParam aescfb128 = new CrptorParam(); + aescfb128.setIvLen(16); + aescfb128.setKeyLen(16); + aescfb128.setMode("AES/CFB128/NoPadding"); + aescfb128.setType("AES"); + paraMap.put("aes-cfb-128", aescfb128); + + CrptorParam blowfish = new CrptorParam(); + blowfish.setIvLen(8); + blowfish.setKeyLen(16); + blowfish.setMode("Blowfish/CFB/NoPadding"); + blowfish.setType("Blowfish"); + paraMap.put("blowfish", blowfish); + } + + public static CrptorParam getCrptorParam(String type) { + return paraMap.get(type); + } +} diff --git a/src/main/java/com/lightsocks/socks5/crpt/Icrptor.java b/src/main/java/com/lightsocks/socks5/crpt/Icrptor.java new file mode 100644 index 0000000..7c90f08 --- /dev/null +++ b/src/main/java/com/lightsocks/socks5/crpt/Icrptor.java @@ -0,0 +1,12 @@ +package com.lightsocks.socks5.crpt; + +public interface Icrptor { + + public void init() throws Exception; + + public byte[] update(byte[] src); + + public byte[] update(byte[] src, int offset, int length); + + public byte[] getIv(); +} diff --git a/src/main/java/com/lightsocks/socks5/crpt/IcrptorImp.java b/src/main/java/com/lightsocks/socks5/crpt/IcrptorImp.java new file mode 100644 index 0000000..adb0e8e --- /dev/null +++ b/src/main/java/com/lightsocks/socks5/crpt/IcrptorImp.java @@ -0,0 +1,46 @@ +package com.lightsocks.socks5.crpt; + +import javax.crypto.Cipher; +import javax.crypto.SecretKey; +import javax.crypto.spec.IvParameterSpec; +import javax.crypto.spec.SecretKeySpec; + +public class IcrptorImp implements Icrptor { + private Cipher m_aesCipher = null; + private SecretKey m_aesKey; + private IvParameterSpec m_aesIv; + private byte[] key; + private byte[] iv; + private String mode; + private String type; + private int flag = 0; // 0 encrpt,1 decrpt + + public IcrptorImp(byte[] key, byte[] iv, String mode, String type, int flag) { + this.key = key; + this.iv = iv; + this.mode = mode; + this.type = type; + this.flag = flag; + } + + public void init() throws Exception { + m_aesCipher = Cipher.getInstance(mode); + m_aesKey = new SecretKeySpec(key, type); + m_aesIv = new IvParameterSpec(iv); + m_aesCipher.init(flag == 0 ? Cipher.ENCRYPT_MODE : Cipher.DECRYPT_MODE, + m_aesKey, m_aesIv); + } + + public byte[] update(byte[] src) throws IllegalStateException { + return m_aesCipher.update(src); + } + + public byte[] update(byte[] src, int offset, int length) + throws IllegalStateException { + return m_aesCipher.update(src, offset, length); + } + + public byte[] getIv() { + return this.iv; + } +} diff --git a/src/main/java/com/lightsocks/socks5/handler/CLeftHandler.java b/src/main/java/com/lightsocks/socks5/handler/CLeftHandler.java index 403414c..a00486e 100644 --- a/src/main/java/com/lightsocks/socks5/handler/CLeftHandler.java +++ b/src/main/java/com/lightsocks/socks5/handler/CLeftHandler.java @@ -93,7 +93,7 @@ public void attach(ForwardAdapter target) { try { sendDstAddress(); } catch (Exception ex) { - + ex.printStackTrace(); } } diff --git a/src/main/java/com/lightsocks/socks5/handler/CRightHandler.java b/src/main/java/com/lightsocks/socks5/handler/CRightHandler.java index 345002e..219bffb 100644 --- a/src/main/java/com/lightsocks/socks5/handler/CRightHandler.java +++ b/src/main/java/com/lightsocks/socks5/handler/CRightHandler.java @@ -8,15 +8,15 @@ import java.util.Random; import com.lightsocks.socks5.Client; -import com.lightsocks.socks5.crpt.AESDecrptor; -import com.lightsocks.socks5.crpt.AESEncrptor; +import com.lightsocks.socks5.crpt.Icrptor; +import com.lightsocks.socks5.crpt.IcrptorImp; import com.lightsocks.socks5.crpt.KeyUtil; public class CRightHandler extends ChannelHandlerAdapter implements ForwardAdapter { - private AESDecrptor decrpt; - private AESEncrptor encrptor; + private Icrptor decrpt; + private Icrptor encrptor; private ChannelHandlerContext ctx; private ForwardAdapter forwardWriter; private volatile boolean isInitEncrptor = false; @@ -54,7 +54,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) int length = m.readInt(); // read the content length byte[] content = new byte[length]; m.readBytes(content); - ByteBuf buf = Unpooled.wrappedBuffer(decrpt.decrpt(content), 0, validate); + ByteBuf buf = Unpooled.wrappedBuffer(decrpt.update(content), 0, validate); forwardWriter.forward(buf); } @@ -83,12 +83,12 @@ public void forward(ByteBuf m) throws Exception { isInitEncrptor = true; } int total = m.readableBytes(); - int left = total % 16; + int left = total % Client.AppConfig.getCrptorParam().getKeyLen(); int first = total - left; if (first != 0) { byte[] firstBulk = new byte[first]; m.readBytes(firstBulk); - byte[] dst = encrptor.encrpt(firstBulk); + byte[] dst = encrptor.update(firstBulk); if (dst != null) { write(dst,first); @@ -97,11 +97,11 @@ public void forward(ByteBuf m) throws Exception { if (left != 0) { byte[] LeftBulk = new byte[left]; m.readBytes(LeftBulk); - byte[] end = new byte[16]; + byte[] end = new byte[Client.AppConfig.getCrptorParam().getKeyLen()]; for (int i = 0; i < left; i++) { end[i] = LeftBulk[i]; } - byte[] dst = encrptor.encrpt(end); + byte[] dst = encrptor.update(end); if (dst != null) { write(dst,left); } @@ -124,15 +124,21 @@ public void closeNotify() { } private void initEncrptor() throws Exception { - byte[] iv = new byte[16]; + byte[] iv = new byte[Client.AppConfig.getCrptorParam().getIvLen()]; Random random1 = new Random(256); random1.nextBytes(iv); - encrptor = new AESEncrptor(KeyUtil.evpBytesToKey(Client.AppConfig.getPassword(),16), iv, Client.AppConfig.getMode()); + encrptor = new IcrptorImp(KeyUtil.evpBytesToKey(Client.AppConfig + .getPassword(), Client.AppConfig.getCrptorParam().getKeyLen()), + iv, Client.AppConfig.getCrptorParam().getMode(), + Client.AppConfig.getCrptorParam().getType(), 0); encrptor.init(); } private void initDecrptor(byte[] iv) throws Exception { - decrpt = new AESDecrptor(KeyUtil.evpBytesToKey(Client.AppConfig.getPassword(),16), iv, Client.AppConfig.getMode()); + decrpt = new IcrptorImp(KeyUtil.evpBytesToKey(Client.AppConfig + .getPassword(), Client.AppConfig.getCrptorParam().getKeyLen()), + iv, Client.AppConfig.getCrptorParam().getMode(), + Client.AppConfig.getCrptorParam().getType(), 1); decrpt.init(); } diff --git a/src/main/java/com/lightsocks/socks5/handler/SDstHandler.java b/src/main/java/com/lightsocks/socks5/handler/SDstHandler.java index 63f3afb..5f8845f 100644 --- a/src/main/java/com/lightsocks/socks5/handler/SDstHandler.java +++ b/src/main/java/com/lightsocks/socks5/handler/SDstHandler.java @@ -6,12 +6,13 @@ import com.lightsocks.socks5.Server; import com.lightsocks.socks5.bean.DstServer; -import com.lightsocks.socks5.crpt.AESDecrptor; +import com.lightsocks.socks5.crpt.Icrptor; +import com.lightsocks.socks5.crpt.IcrptorImp; import com.lightsocks.socks5.crpt.KeyUtil; public class SDstHandler extends ChannelHandlerAdapter { private byte[] iv; - private AESDecrptor decrpt; + private Icrptor decrpt; public SDstHandler(byte[] iv) { this.iv = iv; @@ -41,9 +42,10 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { } private void initDecrptor(byte[] iv) throws Exception { - decrpt = new AESDecrptor(KeyUtil.evpBytesToKey( - Server.AppConfig.getPassword(), 16), iv, - Server.AppConfig.getMode()); + decrpt = new IcrptorImp(KeyUtil.evpBytesToKey(Server.AppConfig + .getPassword(), Server.AppConfig.getCrptorParam().getKeyLen()), + iv, Server.AppConfig.getCrptorParam().getMode(), + Server.AppConfig.getCrptorParam().getType(), 1); decrpt.init(); } @@ -58,7 +60,7 @@ private DstServer getDstServer(ChannelHandlerContext ctx, Object msg) byte[] content = new byte[length]; buf.readBytes(content); - byte[] res = decrpt.decrpt(content); + byte[] res = decrpt.update(content); byte atyp = res[0]; DstServer server = new DstServer(); diff --git a/src/main/java/com/lightsocks/socks5/handler/SLeftHandler.java b/src/main/java/com/lightsocks/socks5/handler/SLeftHandler.java index 869da40..b8c49d5 100644 --- a/src/main/java/com/lightsocks/socks5/handler/SLeftHandler.java +++ b/src/main/java/com/lightsocks/socks5/handler/SLeftHandler.java @@ -2,7 +2,6 @@ import io.netty.bootstrap.Bootstrap; import io.netty.buffer.ByteBuf; -import io.netty.buffer.PooledByteBufAllocator; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandlerAdapter; @@ -18,15 +17,15 @@ import com.lightsocks.socks5.Server; import com.lightsocks.socks5.bean.DstServer; -import com.lightsocks.socks5.crpt.AESDecrptor; -import com.lightsocks.socks5.crpt.AESEncrptor; +import com.lightsocks.socks5.crpt.Icrptor; +import com.lightsocks.socks5.crpt.IcrptorImp; import com.lightsocks.socks5.crpt.KeyUtil; public class SLeftHandler extends ChannelHandlerAdapter implements ForwardAdapter { - private AESDecrptor decrpt; - private AESEncrptor encrptor; + private Icrptor decrpt; + private Icrptor encrptor; private ChannelHandlerContext ctx; private ForwardAdapter forwardWriter; private volatile boolean isInitEncrptor = false; @@ -34,7 +33,7 @@ public class SLeftHandler extends ChannelHandlerAdapter implements private volatile boolean isForwardRead = false; private DstServer dst; - public SLeftHandler(AESDecrptor decrpt, DstServer dst) { + public SLeftHandler(Icrptor decrpt, DstServer dst) { this.decrpt = decrpt; this.dst = dst; } @@ -69,7 +68,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) byte[] content = new byte[length]; m.readBytes(content); ByteBuf buf = ctx.alloc().buffer(validate); - buf.writeBytes(decrpt.decrpt(content), 0, validate); + buf.writeBytes(decrpt.update(content), 0, validate); forwardWriter.forward(buf); } } @@ -83,12 +82,12 @@ public void forward(ByteBuf m) throws Exception { isInitEncrptor = true; } int total = m.readableBytes(); - int left = total % 16; + int left = total % Server.AppConfig.getCrptorParam().getKeyLen(); int first = total - left; if (first != 0) { byte[] firstBulk = new byte[first]; m.readBytes(firstBulk); - byte[] dst = encrptor.encrpt(firstBulk); + byte[] dst = encrptor.update(firstBulk); if (dst != null) { write(dst, first); } @@ -97,11 +96,11 @@ public void forward(ByteBuf m) throws Exception { if (left != 0) { byte[] LeftBulk = new byte[left]; m.readBytes(LeftBulk); - byte[] end = new byte[16]; + byte[] end = new byte[Server.AppConfig.getCrptorParam().getKeyLen()]; for (int i = 0; i < left; i++) { end[i] = LeftBulk[i]; } - byte[] dst = encrptor.encrpt(end); + byte[] dst = encrptor.update(end); if (dst != null) { write(dst, left); } @@ -138,12 +137,13 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { } private void initEncrptor() throws Exception { - byte[] iv = new byte[16]; + byte[] iv = new byte[Server.AppConfig.getCrptorParam().getIvLen()]; Random random1 = new Random(256); random1.nextBytes(iv); - encrptor = new AESEncrptor(KeyUtil.evpBytesToKey( - Server.AppConfig.getPassword(), 16), iv, - Server.AppConfig.getMode()); + encrptor = new IcrptorImp(KeyUtil.evpBytesToKey(Server.AppConfig + .getPassword(), Server.AppConfig.getCrptorParam().getKeyLen()), + iv, Server.AppConfig.getCrptorParam().getMode(), + Server.AppConfig.getCrptorParam().getType(), 0); encrptor.init(); } From b746f62b1a41ff8ce29a71aa133cc0e68639f8ac Mon Sep 17 00:00:00 2001 From: lightsocks Date: Wed, 4 Feb 2015 12:03:36 +0800 Subject: [PATCH 02/10] remove AESDecrptor and AESEncrptor which were replaced by ICrptorImpl --- .../lightsocks/socks5/crpt/AESDecrptor.java | 38 ----------------- .../lightsocks/socks5/crpt/AESEncrptor.java | 42 ------------------- 2 files changed, 80 deletions(-) delete mode 100644 src/main/java/com/lightsocks/socks5/crpt/AESDecrptor.java delete mode 100644 src/main/java/com/lightsocks/socks5/crpt/AESEncrptor.java diff --git a/src/main/java/com/lightsocks/socks5/crpt/AESDecrptor.java b/src/main/java/com/lightsocks/socks5/crpt/AESDecrptor.java deleted file mode 100644 index be083b2..0000000 --- a/src/main/java/com/lightsocks/socks5/crpt/AESDecrptor.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.lightsocks.socks5.crpt; - -import javax.crypto.Cipher; -import javax.crypto.SecretKey; -import javax.crypto.spec.IvParameterSpec; -import javax.crypto.spec.SecretKeySpec; - -public class AESDecrptor { - private Cipher m_aesCipher = null; - private SecretKey m_aesKey; - private IvParameterSpec m_aesIv; - private byte[] key; - private byte[] iv; - private String mode; - - public AESDecrptor(byte[] key, byte[] iv, String mode) { - this.key = key; - this.iv = iv; - this.mode = mode; - } - - public void init() throws Exception { - m_aesCipher = Cipher.getInstance(mode); - m_aesKey = new SecretKeySpec(key, "AES"); - m_aesIv = new IvParameterSpec(iv); - m_aesCipher.init(Cipher.DECRYPT_MODE, m_aesKey, m_aesIv); - } - - public byte[] decrpt(byte[] src) throws IllegalStateException { - return m_aesCipher.update(src); - } - - public byte[] encrpt(byte[] src, int offset, int length) - throws IllegalStateException { - return m_aesCipher.update(src, offset, length); - } - -} diff --git a/src/main/java/com/lightsocks/socks5/crpt/AESEncrptor.java b/src/main/java/com/lightsocks/socks5/crpt/AESEncrptor.java deleted file mode 100644 index 1e88079..0000000 --- a/src/main/java/com/lightsocks/socks5/crpt/AESEncrptor.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.lightsocks.socks5.crpt; - -import javax.crypto.Cipher; -import javax.crypto.SecretKey; -import javax.crypto.spec.IvParameterSpec; -import javax.crypto.spec.SecretKeySpec; - -public class AESEncrptor { - - private Cipher m_aesCipher = null; - private SecretKey m_aesKey; - private IvParameterSpec m_aesIv; - private byte[] key; - private byte[] iv; - private String mode; - - public AESEncrptor(byte[] key, byte[] iv, String mode) { - this.key = key; - this.iv = iv; - this.mode = mode; - } - - public void init() throws Exception { - m_aesCipher = Cipher.getInstance(mode); - m_aesKey = new SecretKeySpec(key, "AES"); - m_aesIv = new IvParameterSpec(iv); - m_aesCipher.init(Cipher.ENCRYPT_MODE, m_aesKey, m_aesIv); - } - - public byte[] encrpt(byte[] src) throws IllegalStateException { - return m_aesCipher.update(src); - } - - public byte[] encrpt(byte[] src, int offset, int length) throws IllegalStateException { - return m_aesCipher.update(src, offset, length); - } - - public byte[] getIv() { - return iv; - } - -} From 53ff2aea35e2e6a6b62440f8ac7fbd6f7c7d942b Mon Sep 17 00:00:00 2001 From: lightsocks Date: Fri, 6 Feb 2015 17:09:05 +0800 Subject: [PATCH 03/10] fix memory leak of ByteBuf.releas() was not called --- .../java/com/lightsocks/socks5/handler/CHandShakeHandler.java | 2 ++ .../java/com/lightsocks/socks5/handler/CRequestHandler.java | 1 + src/main/java/com/lightsocks/socks5/handler/CRightHandler.java | 2 ++ src/main/java/com/lightsocks/socks5/handler/SDstHandler.java | 1 + src/main/java/com/lightsocks/socks5/handler/SIVHandler.java | 1 + src/main/java/com/lightsocks/socks5/handler/SLeftHandler.java | 2 ++ 6 files changed, 9 insertions(+) diff --git a/src/main/java/com/lightsocks/socks5/handler/CHandShakeHandler.java b/src/main/java/com/lightsocks/socks5/handler/CHandShakeHandler.java index 5e01840..be2ff30 100644 --- a/src/main/java/com/lightsocks/socks5/handler/CHandShakeHandler.java +++ b/src/main/java/com/lightsocks/socks5/handler/CHandShakeHandler.java @@ -37,10 +37,12 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) { // (2) private boolean handShake(ChannelHandlerContext ctx, Object msg) { ByteBuf buf = ((ByteBuf) msg); if (buf.readableBytes() < 2) { + buf.release(); return false; } byte v = buf.readByte(); if (v != 5) { + buf.release(); return false; } byte nmethod = buf.readByte(); diff --git a/src/main/java/com/lightsocks/socks5/handler/CRequestHandler.java b/src/main/java/com/lightsocks/socks5/handler/CRequestHandler.java index f1014c3..4ac267f 100644 --- a/src/main/java/com/lightsocks/socks5/handler/CRequestHandler.java +++ b/src/main/java/com/lightsocks/socks5/handler/CRequestHandler.java @@ -33,6 +33,7 @@ private DstServer getDstServer(ChannelHandlerContext ctx, Object msg) { ByteBuf buf = ((ByteBuf) msg); byte v = buf.readByte(); if (v != 5) { + buf.release(); return null; } buf.skipBytes(2); // skip cmd and rsv diff --git a/src/main/java/com/lightsocks/socks5/handler/CRightHandler.java b/src/main/java/com/lightsocks/socks5/handler/CRightHandler.java index 219bffb..8b270db 100644 --- a/src/main/java/com/lightsocks/socks5/handler/CRightHandler.java +++ b/src/main/java/com/lightsocks/socks5/handler/CRightHandler.java @@ -54,6 +54,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) int length = m.readInt(); // read the content length byte[] content = new byte[length]; m.readBytes(content); + m.release(); ByteBuf buf = Unpooled.wrappedBuffer(decrpt.update(content), 0, validate); forwardWriter.forward(buf); } @@ -106,6 +107,7 @@ public void forward(ByteBuf m) throws Exception { write(dst,left); } } + m.release(); } public void attach(ForwardAdapter target) { diff --git a/src/main/java/com/lightsocks/socks5/handler/SDstHandler.java b/src/main/java/com/lightsocks/socks5/handler/SDstHandler.java index 5f8845f..d6c579a 100644 --- a/src/main/java/com/lightsocks/socks5/handler/SDstHandler.java +++ b/src/main/java/com/lightsocks/socks5/handler/SDstHandler.java @@ -53,6 +53,7 @@ private DstServer getDstServer(ChannelHandlerContext ctx, Object msg) throws Exception { ByteBuf buf = ((ByteBuf) msg); if (buf.readableBytes() < 8) { + buf.release(); return null; } buf.readInt();// validate length; diff --git a/src/main/java/com/lightsocks/socks5/handler/SIVHandler.java b/src/main/java/com/lightsocks/socks5/handler/SIVHandler.java index a33417d..a5cac92 100644 --- a/src/main/java/com/lightsocks/socks5/handler/SIVHandler.java +++ b/src/main/java/com/lightsocks/socks5/handler/SIVHandler.java @@ -19,6 +19,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) { private byte[] recvIV(ChannelHandlerContext ctx, Object msg) { ByteBuf buf = (ByteBuf) msg; if (buf.readableBytes() < 8) { + buf.release(); return null; } int validate = buf.readInt(); // read the validate length diff --git a/src/main/java/com/lightsocks/socks5/handler/SLeftHandler.java b/src/main/java/com/lightsocks/socks5/handler/SLeftHandler.java index b8c49d5..8f2fc89 100644 --- a/src/main/java/com/lightsocks/socks5/handler/SLeftHandler.java +++ b/src/main/java/com/lightsocks/socks5/handler/SLeftHandler.java @@ -67,6 +67,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) int length = m.readInt(); // read the content length byte[] content = new byte[length]; m.readBytes(content); + m.release(); ByteBuf buf = ctx.alloc().buffer(validate); buf.writeBytes(decrpt.update(content), 0, validate); forwardWriter.forward(buf); @@ -105,6 +106,7 @@ public void forward(ByteBuf m) throws Exception { write(dst, left); } } + m.release(); } public void channelInactive(ChannelHandlerContext ctx) throws Exception { From 77ec1f9475ee6a95b97cbc5ba5ee2347987ed33e Mon Sep 17 00:00:00 2001 From: damnhe Date: Tue, 4 Aug 2015 12:38:05 +0800 Subject: [PATCH 04/10] update readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 704cbdb..2b0d086 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ ## lightsocks-java A fast proxy that helps you bypass firewalls. -At first, i planned implementing the shadowsocks protocol which is widely used many popular tools [shadowsocks](https://github.com/shadowsocks/) . I found the AES encrpt/decrpt stream will not end if the src bytes length is less than 16 when invoke update method of JCE cipher (aes-cfb-128), this will cause some problems , the connection will wait for the rest data but it is cached in the buff . By reading the [shadowsocks-go](https://github.com/shadowsocks/shadowsocks-go) code I also found shadowsocks handshake process designed not good engough if the server could not reach the destination address but the data has been transfered from broswer to proxy client. +At first, I planned implementing the shadowsocks protocol which is widely used many popular tools [shadowsocks](https://github.com/shadowsocks/) . I found the AES encrpt/decrpt stream will not end if the src bytes length is less than 16 when invoke update method of JCE cipher (aes-cfb-128), this will cause some problems , the connection will wait for the rest data but it is cached in the buff . By reading the [shadowsocks-go](https://github.com/shadowsocks/shadowsocks-go) code I also found shadowsocks handshake process designed not good engough if the server could not reach the destination address but the data has been transfered from broswer to proxy client. -After some thinking , i decided to develp the tool using a new protocal below:
+After some thinking , I decided to develop the tool using a new protocal below:
* the handshake should be ended not only the client and server have been exchanged iv but also the server side has been connected the destination server. * each packet has two field plus .One is the validate length of encrpted data ,the other is the total length. This design has much benefit when writing network programs. From 2eb22b7fe8b34e73d6618ddb147297f90deed7a3 Mon Sep 17 00:00:00 2001 From: damnhe Date: Mon, 17 Aug 2015 10:34:31 +0800 Subject: [PATCH 05/10] 'update' --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2b0d086..6a07091 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ A fast proxy that helps you bypass firewalls. At first, I planned implementing the shadowsocks protocol which is widely used many popular tools [shadowsocks](https://github.com/shadowsocks/) . I found the AES encrpt/decrpt stream will not end if the src bytes length is less than 16 when invoke update method of JCE cipher (aes-cfb-128), this will cause some problems , the connection will wait for the rest data but it is cached in the buff . By reading the [shadowsocks-go](https://github.com/shadowsocks/shadowsocks-go) code I also found shadowsocks handshake process designed not good engough if the server could not reach the destination address but the data has been transfered from broswer to proxy client. -After some thinking , I decided to develop the tool using a new protocal below:
+After some thinking , I decided to develop a tool using a new protocal below:
* the handshake should be ended not only the client and server have been exchanged iv but also the server side has been connected the destination server. * each packet has two field plus .One is the validate length of encrpted data ,the other is the total length. This design has much benefit when writing network programs. From 210ce7b5e2ba576c48bc49e77a6f67488d39e147 Mon Sep 17 00:00:00 2001 From: damnhe Date: Mon, 17 Aug 2015 10:51:31 +0800 Subject: [PATCH 06/10] update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 704cbdb..9d0312d 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ On Client java -jar lightsocks-client.jar -c=config.propeties Change proxy settings of your browser to -SOCKS5 127.0.0.1:local.port +SOCKS5 127.0.0.1:8888 ``` From 8fcaeda4c9c5d06f4c7691446e9ff5b9aaadce67 Mon Sep 17 00:00:00 2001 From: lightsocks Date: Mon, 24 Aug 2015 09:46:04 +0800 Subject: [PATCH 07/10] update README.md and pom.xml --- README.md | 5 ----- pom.xml | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 07a5e64..7dfae58 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,6 @@ ## lightsocks-java A fast proxy that helps you bypass firewalls. -At first, I planned implementing the shadowsocks protocol which is widely used many popular tools [shadowsocks](https://github.com/shadowsocks/) . I found the AES encrpt/decrpt stream will not end if the src bytes length is less than 16 when invoke update method of JCE cipher (aes-cfb-128), this will cause some problems , the connection will wait for the rest data but it is cached in the buff . By reading the [shadowsocks-go](https://github.com/shadowsocks/shadowsocks-go) code I also found shadowsocks handshake process designed not good engough if the server could not reach the destination address but the data has been transfered from broswer to proxy client. - -After some thinking , I decided to develop a tool using a new protocal below:
- * the handshake should be ended not only the client and server have been exchanged iv but also the server side has been connected the destination server. - * each packet has two field plus .One is the validate length of encrpted data ,the other is the total length. This design has much benefit when writing network programs. ### System requirements * Java 7+ diff --git a/pom.xml b/pom.xml index 4c4b8b5..251eb80 100644 --- a/pom.xml +++ b/pom.xml @@ -30,8 +30,8 @@ maven-compiler-plugin 3.1 - 1.8 - 1.8 + 1.7 + 1.7 UTF-8 From 166adafffc5f209aad7393c907e4dd5dc87ef397 Mon Sep 17 00:00:00 2001 From: lightsocks Date: Tue, 19 Mar 2019 13:47:21 +0800 Subject: [PATCH 08/10] add script for quickstart --- client_start.sh | 11 +++++++++++ server_start.sh | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100755 client_start.sh create mode 100755 server_start.sh diff --git a/client_start.sh b/client_start.sh new file mode 100755 index 0000000..8abdf44 --- /dev/null +++ b/client_start.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +mvn clean package -Pclient + +cp src/main/resources/config.properties target/config.properties + +cd "target" + +pwd + +java -jar lightsocks-client.jar -c=config.propeties diff --git a/server_start.sh b/server_start.sh new file mode 100755 index 0000000..d3b7fa6 --- /dev/null +++ b/server_start.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +mvn clean package -Pserver + +cp src/main/resources/config.properties target/config.properties + +cd "target" + +pwd + +java -jar lightsocks-server.jar -c=config.propeties From 869146f077126b134b946a757141b4e4b8986a31 Mon Sep 17 00:00:00 2001 From: lightsocks Date: Tue, 19 Mar 2019 13:59:44 +0800 Subject: [PATCH 09/10] add quickstart tutorial --- README.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7dfae58..16b02dc 100644 --- a/README.md +++ b/README.md @@ -3,16 +3,20 @@ A fast proxy that helps you bypass firewalls. ### System requirements - * Java 7+ + * Java 7+ * maven +### quickstart +Run the script server_start.sh or client_start.sh on terminal. +Change setttings through [src/main/resources/config.properties](https://github.com/lightsocks/lightsocks-java/blob/master/src/main/resources/config.properties),see the detail below. + ### How to build ``` On Server mvn package -Pserver -On Client +On Client mvn package -Pclient ``` @@ -31,15 +35,15 @@ local.port             local socks5 prox ``` On Server -java -jar lightsocks-server.jar -c=config.propeties +java -jar lightsocks-server.jar -c=config.properties On Client -java -jar lightsocks-client.jar -c=config.propeties +java -jar lightsocks-client.jar -c=config.properties Change proxy settings of your browser to SOCKS5 127.0.0.1:8888 ``` - + ### Reference [rfc1928](http://www.ietf.org/rfc/rfc1928.txt) From 9131677400dedccd65fc1f0dcf7c4ad2dd66819d Mon Sep 17 00:00:00 2001 From: lightsocks Date: Tue, 19 Mar 2019 14:06:40 +0800 Subject: [PATCH 10/10] add plugin description --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 16b02dc..bbb7e19 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,8 @@ A fast proxy that helps you bypass firewalls. * Java 7+ * maven -### quickstart -Run the script server_start.sh or client_start.sh on terminal. -Change setttings through [src/main/resources/config.properties](https://github.com/lightsocks/lightsocks-java/blob/master/src/main/resources/config.properties),see the detail below. +### Quickstart +Run the script server_start.sh or client_start.sh on terminal,change setttings through [src/main/resources/config.properties](https://github.com/lightsocks/lightsocks-java/blob/master/src/main/resources/config.properties),see the detail below. ### How to build ``` @@ -43,7 +42,8 @@ java -jar lightsocks-client.jar -c=config.properties Change proxy settings of your browser to SOCKS5 127.0.0.1:8888 ``` - +### Proxy settings +Use SwitchyOmega Plugin on chrome is quite helpful. ### Reference [rfc1928](http://www.ietf.org/rfc/rfc1928.txt)