Repository: qpid-proton-j Updated Branches: refs/heads/master ad6096746 -> 0d3f456df
PROTON-1462: specify the charset to ensure the 'plain' helper method uses UTF-8 Project: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/commit/0d3f456d Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/tree/0d3f456d Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/diff/0d3f456d Branch: refs/heads/master Commit: 0d3f456df65114caa97fc52617cea03ad5762b52 Parents: ad60967 Author: Robert Gemmell <rob...@apache.org> Authored: Thu Apr 13 18:27:49 2017 +0100 Committer: Robert Gemmell <rob...@apache.org> Committed: Thu Apr 13 18:27:49 2017 +0100 ---------------------------------------------------------------------- .../qpid/proton/engine/impl/SaslImpl.java | 5 +- .../qpid/proton/engine/impl/SaslImplTest.java | 54 ++++++++++++++++++++ 2 files changed, 57 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/0d3f456d/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java index 56567fe..daeb141 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java @@ -26,6 +26,7 @@ import static org.apache.qpid.proton.engine.impl.ByteBufferUtils.pourAll; import static org.apache.qpid.proton.engine.impl.ByteBufferUtils.pourBufferToArray; import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; import java.util.logging.Level; import java.util.logging.Logger; @@ -443,8 +444,8 @@ public class SaslImpl implements Sasl, SaslFrameBody.SaslFrameBodyHandler<Void>, { client(); _chosenMechanism = Symbol.valueOf("PLAIN"); - byte[] usernameBytes = username.getBytes(); - byte[] passwordBytes = password.getBytes(); + byte[] usernameBytes = username.getBytes(StandardCharsets.UTF_8); + byte[] passwordBytes = password.getBytes(StandardCharsets.UTF_8); byte[] data = new byte[usernameBytes.length+passwordBytes.length+2]; System.arraycopy(usernameBytes, 0, data, 1, usernameBytes.length); System.arraycopy(passwordBytes, 0, data, 2+usernameBytes.length, passwordBytes.length); http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/0d3f456d/proton-j/src/test/java/org/apache/qpid/proton/engine/impl/SaslImplTest.java ---------------------------------------------------------------------- diff --git a/proton-j/src/test/java/org/apache/qpid/proton/engine/impl/SaslImplTest.java b/proton-j/src/test/java/org/apache/qpid/proton/engine/impl/SaslImplTest.java new file mode 100644 index 0000000..ec524b5 --- /dev/null +++ b/proton-j/src/test/java/org/apache/qpid/proton/engine/impl/SaslImplTest.java @@ -0,0 +1,54 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.apache.qpid.proton.engine.impl; + +import static org.junit.Assert.assertEquals; + +import java.nio.charset.StandardCharsets; + +import org.apache.qpid.proton.amqp.Binary; +import org.junit.Test; + +public class SaslImplTest { + + @Test + public void testPlainHelperEncodesExpectedResponse() { + TransportImpl transport = new TransportImpl(); + SaslImpl sasl = new SaslImpl(transport, 512); + + // Use a username + password with a unicode char that encodes + // differently under changing charsets + String username = "username-with-unicode" + "\u1F570"; + String password = "password-with-unicode" + "\u1F570"; + + byte[] usernameBytes = username.getBytes(StandardCharsets.UTF_8); + byte[] passwordBytes = password.getBytes(StandardCharsets.UTF_8); + + byte[] expectedResponseBytes = new byte[usernameBytes.length + passwordBytes.length + 2]; + System.arraycopy(usernameBytes, 0, expectedResponseBytes, 1, usernameBytes.length); + System.arraycopy(passwordBytes, 0, expectedResponseBytes, 2 + usernameBytes.length, passwordBytes.length); + + sasl.plain(username, password); + + assertEquals("Unexpected response data", new Binary(expectedResponseBytes), sasl.getChallengeResponse()); + } + +} --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org