提交 09810169 编写于 作者: W weijun

6961765: Double byte characters corrupted in DN for LDAP referrals

Reviewed-by: vinnie
上级 a97fdee8
...@@ -27,6 +27,7 @@ package com.sun.jndi.toolkit.url; ...@@ -27,6 +27,7 @@ package com.sun.jndi.toolkit.url;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
/** /**
* Utilities for dealing with URLs. * Utilities for dealing with URLs.
...@@ -61,29 +62,14 @@ final public class UrlUtil { ...@@ -61,29 +62,14 @@ final public class UrlUtil {
* The string is subsequently converted using the specified encoding * The string is subsequently converted using the specified encoding
*/ */
public static final String decode(String s, String enc) public static final String decode(String s, String enc)
throws MalformedURLException, UnsupportedEncodingException { throws MalformedURLException, UnsupportedEncodingException {
try {
int length = s.length(); return URLDecoder.decode(s, enc);
byte[] bytes = new byte[length]; } catch (IllegalArgumentException iae) {
int j = 0; MalformedURLException mue = new MalformedURLException("Invalid URI encoding: " + s);
mue.initCause(iae);
for (int i = 0; i < length; i++) { throw mue;
if (s.charAt(i) == '%') {
i++; // skip %
try {
bytes[j++] = (byte)
Integer.parseInt(s.substring(i, i + 2), 16);
} catch (Exception e) {
throw new MalformedURLException("Invalid URI encoding: " + s);
}
i++; // skip first hex char; for loop will skip second one
} else {
bytes[j++] = (byte) s.charAt(i);
}
} }
return new String(bytes, 0, j, enc);
} }
/** /**
......
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* @test
* @bug 6961765
* @summary Double byte characters corrupted in DN for LDAP referrals
*/
import com.sun.jndi.ldap.LdapURL;
public class LdapUnicodeURL {
public static void main(String[] args) throws Exception {
// First 3 characters of the CJK Unified Ideographs
String uid = "uid=\u4e00\u4e01\u4e02";
LdapURL ldURL = new LdapURL("ldap://www.example.com/" + uid);
if (!ldURL.getDN().equals(uid)) {
throw new Exception("uid changed to " + ldURL.getDN());
}
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册