andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FIX : Unpacking causes socks5proxy init failure (#9582)

Browse Source 
Motivation:

Socks5InitialRequestDecoder does not correctly handle fragmentation

Modifications:

- Delete detection of not enough bytes as ReplyingDecoder already handles all of this correctly.
- Add unit test

Result:

Fixes #9574.
This commit is contained in:
switchYello 2019-09-20 16:16:13 +08:00 committed by Norman Maurer
parent 2b9f69ac38
commit ec34fce431
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
codec-socks/src/main/java/io/netty/handler/codec/socksx/v5/Socks5InitialRequestDecoder.java
View File

@ -56,9 +56,6 @@ public class Socks5InitialRequestDecoder extends ReplayingDecoder<State> {
}
final int authMethodCnt = in.readUnsignedByte();
if (actualReadableBytes() < authMethodCnt) {
break;
}
final Socks5AuthMethod[] authMethods = new Socks5AuthMethod[authMethodCnt];
for (int i = 0; i < authMethodCnt; i++) {

38
codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5InitialRequestDecoderTest.java Normal file
View File

@ -0,0 +1,38 @@
/*
* Copyright 2019 The Netty Project
*
* The Netty Project licenses this file to you under the Apache License,
* version 2.0 (the "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*/
package io.netty.handler.codec.socksx.v5;
import io.netty.buffer.Unpooled;
import io.netty.channel.embedded.EmbeddedChannel;
import io.netty.handler.codec.DecoderResult;
import org.junit.Test;
import static org.junit.Assert.*;
public class Socks5InitialRequestDecoderTest {
@Test
public void testUnpackingCausesDecodeFail() {
EmbeddedChannel e = new EmbeddedChannel(new Socks5InitialRequestDecoder());
assertFalse(e.writeInbound(Unpooled.wrappedBuffer(new byte[]{5, 2, 0})));
assertTrue(e.writeInbound(Unpooled.wrappedBuffer(new byte[]{1})));
Object o = e.readInbound();
assertTrue(o instanceof DefaultSocks5InitialRequest);
DefaultSocks5InitialRequest req = (DefaultSocks5InitialRequest) o;
assertSame(req.decoderResult(), DecoderResult.SUCCESS);
assertFalse(e.finish());
}
}