Fixes bugs when the backed array's offset is not zero.
This commit is contained in:
parent
ca2ee88d19
commit
5a44162c52
@ -52,7 +52,9 @@ final class WebSocketUtil {
|
|||||||
try {
|
try {
|
||||||
MessageDigest md = MessageDigest.getInstance("MD5");
|
MessageDigest md = MessageDigest.getInstance("MD5");
|
||||||
if (buffer.hasArray()) {
|
if (buffer.hasArray()) {
|
||||||
md.update(buffer.array(), buffer.readerIndex(), buffer.readableBytes());
|
int offset = buffer.arrayOffset() + buffer.readerIndex();
|
||||||
|
int length = buffer.readableBytes();
|
||||||
|
md.update(buffer.array(), offset, length);
|
||||||
} else {
|
} else {
|
||||||
md.update(buffer.toByteBuffer());
|
md.update(buffer.toByteBuffer());
|
||||||
}
|
}
|
||||||
@ -86,7 +88,9 @@ final class WebSocketUtil {
|
|||||||
try {
|
try {
|
||||||
MessageDigest md = MessageDigest.getInstance("SHA1");
|
MessageDigest md = MessageDigest.getInstance("SHA1");
|
||||||
if (buffer.hasArray()) {
|
if (buffer.hasArray()) {
|
||||||
md.update(buffer.array(), buffer.readerIndex(), buffer.readableBytes());
|
int offset = buffer.arrayOffset() + buffer.readerIndex();
|
||||||
|
int length = buffer.readableBytes();
|
||||||
|
md.update(buffer.array(), offset, length);
|
||||||
} else {
|
} else {
|
||||||
md.update(buffer.toByteBuffer());
|
md.update(buffer.toByteBuffer());
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,61 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2013 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 org.jboss.netty.handler.codec.http.websocketx;
|
||||||
|
|
||||||
|
import org.jboss.netty.buffer.ChannelBuffer;
|
||||||
|
import org.jboss.netty.buffer.ChannelBuffers;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import java.nio.charset.Charset;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
public class WebSocketUtilTest {
|
||||||
|
|
||||||
|
private final static Charset UTF_8 = Charset.forName("UTF-8");
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testMd5() {
|
||||||
|
byte[] bytes1 = "hello, world".getBytes(UTF_8);
|
||||||
|
ChannelBuffer buf1 = ChannelBuffers.wrappedBuffer(bytes1, 0, bytes1.length);
|
||||||
|
byte[] bytes2 = " hello, world".getBytes(UTF_8);
|
||||||
|
ChannelBuffer buf2 = ChannelBuffers.wrappedBuffer(bytes2, 3, bytes2.length - 3);
|
||||||
|
|
||||||
|
assertEquals(buf1, buf2);
|
||||||
|
|
||||||
|
ChannelBuffer digest1 = WebSocketUtil.md5(buf1);
|
||||||
|
ChannelBuffer digest2 = WebSocketUtil.md5(buf2);
|
||||||
|
|
||||||
|
assertEquals(digest1, digest2);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testSha1() {
|
||||||
|
byte[] bytes1 = "hello, world".getBytes(UTF_8);
|
||||||
|
ChannelBuffer buf1 = ChannelBuffers.wrappedBuffer(bytes1, 0, bytes1.length);
|
||||||
|
byte[] bytes2 = " hello, world".getBytes(UTF_8);
|
||||||
|
ChannelBuffer buf2 = ChannelBuffers.wrappedBuffer(bytes2, 3, bytes2.length - 3);
|
||||||
|
|
||||||
|
assertEquals(buf1, buf2);
|
||||||
|
|
||||||
|
ChannelBuffer digest1 = WebSocketUtil.sha1(buf1);
|
||||||
|
ChannelBuffer digest2 = WebSocketUtil.sha1(buf2);
|
||||||
|
|
||||||
|
assertEquals(digest1, digest2);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user