infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-20 02:17:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

6696028: JMXServiceURL like service:jmx:rmi:///jndi/iiop:// should be rejected by the RMI conn provider

Browse Source 
6984520: NPE IN RMIConnector.connect

Reviewed-by: emcmanus, kevinw
This commit is contained in:
Sean Coffey 2010-11-05 13:52:37 +00:00
parent 628e3faeb4
commit 9072e150d7
2 changed files with 92 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2010, 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
@ -291,7 +291,24 @@ public class RMIConnector implements JMXConnector, Serializable, JMXAddressable
if (tracing)
logger.trace("connect",idstr + " getting connection...");
Object credentials = usemap.get(CREDENTIALS);
connection = getConnection(stub, credentials, checkStub);
try {
connection = getConnection(stub, credentials, checkStub);
} catch (java.rmi.RemoteException re) {
if (jmxServiceURL != null) {
final String pro = jmxServiceURL.getProtocol();
final String path = jmxServiceURL.getURLPath();
if ("rmi".equals(pro) &&
path.startsWith("/jndi/iiop:")) {
MalformedURLException mfe = new MalformedURLException(
"Protocol is rmi but JNDI scheme is iiop: " + jmxServiceURL);
mfe.initCause(re);
throw mfe;
}
}
throw re;
}
// Always use one of:
// ClassLoader provided in Map at connect time,

73
jdk/test/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java Normal file
View File

@ -0,0 +1,73 @@
/*
* Copyright (c) 2010, 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
* @summary NPE IN RMIConnector.connect
* @bug 6984520
* @run clean RMIConnector_NPETest
* @run build RMIConnector_NPETest
* @run main RMIConnector_NPETest
*/
import java.io.*;
import java.lang.management.*;
import java.rmi.registry.*;
import javax.management.*;
import javax.management.remote.*;
import javax.management.remote.rmi.*;
public class RMIConnector_NPETest {
public static void main(String argv[]) throws Exception {
boolean testFailed = false;
String rmidCmd = System.getProperty("java.home") + File.separator +
"bin" + File.separator + "rmid -port 3333";
String stopRmidCmd = System.getProperty("java.home") + File.separator +
"bin" + File.separator + "rmid -stop -port 3333";
try {
//start an rmid daemon and give it some time
System.out.println("Starting rmid");
Runtime.getRuntime().exec(rmidCmd);
Thread.sleep(5000);
MBeanServer mbs = MBeanServerFactory.createMBeanServer();
RMIJRMPServerImpl rmiserver = new RMIJRMPServerImpl(3333, null, null, null);
rmiserver.setMBeanServer(mbs);
RMIConnector agent = new RMIConnector(rmiserver, null);
agent.connect();
} catch(NullPointerException npe) {
npe.printStackTrace();
testFailed = true;
} catch (Exception e) {
// OK
} finally {
System.out.println("Stopping rmid");
Runtime.getRuntime().exec(stopRmidCmd);
}
if(testFailed)
throw new Exception("Test failed");
}
}