Mercurial > jdk8-mips64-public > corba / changeset
changeset
Merge
Tue, 16 Jan 2018 22:52:07 -0800
- author
- asaha
- date
- Tue, 16 Jan 2018 22:52:07 -0800
- changeset 1662
- 65a52284d8a3
- parent 1660
- a5563d019ac4
- parent 1661
- f6b6ad6feb6e
- child 1663
- 7834bc524282
- child 1736
- 57eccad755a0
Merge
| .hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Mon Jan 08 22:35:25 2018 -0800 1.2 +++ b/.hgtags Tue Jan 16 22:52:07 2018 -0800 1.3 @@ -701,6 +701,8 @@ 1.4 30f83ac389f06c38dc0b6f71b1d8344c01436a16 jdk8u112-b15 1.5 8ef3cc2bbc7dc687e9502ae957337b1ded1b32d4 jdk8u112-b16 1.6 7d4291146927c3430652a07f506d530c2eff7eb9 jdk8u112-b31 1.7 +46db19bfd51b4039cff4dae563c3b5d3f70d64da jdk8u112-b32 1.8 +d52e17760c1dafa4fa17ec388aeaaf8fcacb444b jdk8u112-b33 1.9 3a25f8a752524bad7e78800158c485b890be3982 jdk8u121-b00 1.10 1ebd97292358cd158b6f7d5884526207fbfe796e jdk8u121-b01 1.11 349d130d7a7f2bcaaed8dd2696030022eb4e7b75 jdk8u121-b02 1.12 @@ -715,6 +717,12 @@ 1.13 acbfa2934b2411dd20aacb42d1c8dd198fe9f8e9 jdk8u121-b11 1.14 cc9a5d631b77582d52aceaf6d6066e99533d1756 jdk8u121-b12 1.15 386e9b79fcf5bfad5ff7b0fc991a7c6c5cbfed17 jdk8u121-b13 1.16 +61eb6e79aabe13253306d6e614a21619dacfa2cc jdk8u121-b31 1.17 +d28f2fc91487a86a7deffe71e38179067807c60b jdk8u121-b32 1.18 +58f874750c2823443a8712f3728e6aa91d45bb5b jdk8u121-b33 1.19 +3f0f5fc9e9a8c487dee66d7b300e265a10fd1355 jdk8u121-b34 1.20 +345b15579d5e3563e818d95ff9c47cabea1c5771 jdk8u121-b35 1.21 +1c16b68906a0bf305f1e23072bfd6cb3f3fc84be jdk8u121-b36 1.22 e30c16839f2225d2fff653088636dafcb812cd4d jdk8u131-b00 1.23 464cf9d3b00291fcf879ceca1b66bc7588093c47 jdk8u131-b01 1.24 1656050026687c96900eed3b415d0ca1a0dc55b3 jdk8u131-b02 1.25 @@ -727,6 +735,10 @@ 1.26 c5fd9c3a2eb12d366d59195dbea54c60db2a1df3 jdk8u131-b09 1.27 de3c63a8b2e52d47554c999a65dbcec7f6d9c1be jdk8u131-b10 1.28 2b88cb53e31fb637d7c37cc3414bb3eb3e9d1f0d jdk8u131-b11 1.29 +4db7f76e9f3266c8ba5c801996b27009bb17b335 jdk8u131-b31 1.30 +d81babb8888496371bb80757f2650dec9ff95175 jdk8u131-b32 1.31 +6184f10981e7a321b52c13c609bb41f289d85270 jdk8u131-b33 1.32 +2cb574e6eca33fad6858dcfc9c6c7b45a112e965 jdk8u131-b34 1.33 7056e474d6e3b7b3bac76bc35f8c4c321bf9abe9 jdk8u141-b00 1.34 0f825574a7c8742494810d1f29193bfc3f1d370c jdk8u141-b01 1.35 66d2dbe82668e425317ec0c421f5384399b220c9 jdk8u141-b02 1.36 @@ -745,6 +757,14 @@ 1.37 4f242f33e89a7900f2fcdcd9402058b6d01f340c jdk8u141-b15 1.38 77461a27d91fcb53106e6b3234468bff4d0eec9e jdk8u144-b00 1.39 0d5d2e29f93b01ffa4998c2e3a61d2e6eaa96b1b jdk8u144-b01 1.40 +e03501807899791ff7888884bcf47eb39be594bb jdk8u141-b31 1.41 +1bbe5d997ab4e030dd961ab78e11ddae1bc6786c jdk8u141-b32 1.42 +77461a27d91fcb53106e6b3234468bff4d0eec9e jdk8u144-b00 1.43 +0d5d2e29f93b01ffa4998c2e3a61d2e6eaa96b1b jdk8u144-b01 1.44 +d3a4dd903475fd77fae2f6f87deb9219f455dcff jdk8u144-b31 1.45 +5d81bcd53ba0d79ab2843891759b31e4ef497fad jdk8u144-b32 1.46 +b7f3faccefc33fc76d7c5c1c4d4cf6c85d0dad61 jdk8u144-b33 1.47 +ecfa8b7c2c1f71a3f9240ad0c6a5e3f7104a9cce jdk8u144-b34 1.48 2dbdceff6ade82aa9942cdea6b62d5655d65183c jdk8u151-b00 1.49 4449c73dbfdf2e32889e3ce769bd4160daa48b71 jdk8u151-b01 1.50 ffa099d5b88ff14cea677d2afa4229354e9404d0 jdk8u151-b02 1.51 @@ -785,10 +805,60 @@ 1.52 2b4802994bf5a4a634258c9ff06d3da474130f8b jdk8u152-b14 1.53 f89071fbde60b327d6940a34fcdeed96b6440dd2 jdk8u152-b15 1.54 674aecf3d87ae774e2026a1cb2a60eaa651bc7c2 jdk8u152-b16 1.55 +2dbdceff6ade82aa9942cdea6b62d5655d65183c jdk8u151-b00 1.56 +4449c73dbfdf2e32889e3ce769bd4160daa48b71 jdk8u151-b01 1.57 +ffa099d5b88ff14cea677d2afa4229354e9404d0 jdk8u151-b02 1.58 +a6814326f989837019ff7dd0d9b0e57065499bc5 jdk8u151-b03 1.59 +cefb3694f8565e1f23ff3231fd21523f52161a95 jdk8u151-b04 1.60 +8977426affc02fdf74b1163865059ec86ddccb61 jdk8u151-b05 1.61 +3289ad7e88f3aa38fdaa4910e9eeed5e1e5430b1 jdk8u151-b06 1.62 +58d0ffe75dc5597310d422e214dc077476bd2338 jdk8u122-b00 1.63 +a87b06da783bb5a11f7857220789979129e39e7c jdk8u122-b01 1.64 +8684348ae5eb6f895d19e4752dea567642dbcec4 jdk8u122-b02 1.65 +117a593d021502529821afbd7e0d695c170449f8 jdk8u122-b03 1.66 +117a593d021502529821afbd7e0d695c170449f8 jdk8u122-b03 1.67 +0000000000000000000000000000000000000000 jdk8u122-b03 1.68 +0000000000000000000000000000000000000000 jdk8u122-b03 1.69 +f8661a76fe475b1d7653493e407086830fde81f8 jdk8u122-b03 1.70 +7bd4195b17aa0a268eee4bc4b89f30ed3b096898 jdk8u122-b04 1.71 +f86d6064d7cfa022425c3df03d4335511ab33ecb jdk8u132-b00 1.72 +ea3d3c26102dcb82d9b140f729308395310dae7a jdk8u152-b00 1.73 +1819d008129b31df8c74b5d16e9daabc2bdcc10c jdk8u152-b01 1.74 +06f411ed0014d88050d9bd1e74c208a9fa3cfb6e jdk8u152-b02 1.75 +d36e9c6f195c5604626f7c836c17826960ca2a11 jdk8u152-b03 1.76 +4f94cc55256028ab54390abe212959c241b0670f jdk8u152-b04 1.77 +2917e61cfadab474625d19fb7775ccdec5584738 jdk8u152-b05 1.78 +bc6e4d3f7a20c34dcdccc1be17792188ccdcb917 jdk8u152-b06 1.79 +87992ac3484c6c2ae5cad4ad14701a03a9ec963c jdk8u152-b07 1.80 +1f7bbfb8b2632ac610c3a0d7d944ff0a3967469a jdk8u152-b08 1.81 +a9e83644bd11b5da49bb4424eed9c5a34003085c jdk8u152-b09 1.82 +2dbdceff6ade82aa9942cdea6b62d5655d65183c jdk8u151-b00 1.83 +aed470d361fe9b3a6714e6c9942923c188dcc050 jdk8u161-b00 1.84 +968a7e1a6e6c5e79237b796e562f149214e2ae9b jdk8u161-b01 1.85 +bb767c7211eace9df83649ba937d2ce507223e4d jdk8u161-b02 1.86 +b50b596df2a1b4ad86e73d0d309c27c7ba1ad0c0 jdk8u161-b03 1.87 +ea5791706d0992acb1f74129128ba5f60dcfff6e jdk8u161-b04 1.88 +897b749544e9803038c9696e145959bdc9eb5008 jdk8u161-b05 1.89 +bbdd5e2c46e87bafe419a82309ddbb1ffc8f6215 jdk8u161-b06 1.90 +b1a36f62733a920e04d9eed825264dbe12d91ef4 jdk8u161-b07 1.91 +49b9defc1bfc0507f87e05bba4de4d8b3cca1996 jdk8u161-b08 1.92 +2b03640b61bda0a4d8e89c57d919bf1742aeeb8f jdk8u161-b09 1.93 +1a3e06fc462b39d065e9fc78191cc6d8a9c33fc0 jdk8u161-b10 1.94 +104006ed6c31ed1fe46cbee9d665e0dbc6bcac13 jdk8u161-b11 1.95 +b49016a1d704c25d6e66f3d6eb614b70f8a931eb jdk8u161-b12 1.96 1160ad38fc7495c01c25421ae89689232481eb6b jdk8u162-b00 1.97 86b1cd17fde74427ac4b9312cc56bafc57b32fb4 jdk8u162-b01 1.98 1b40ae740b78de002d4096feee0407a4ce0e1608 jdk8u162-b02 1.99 b28af4ff80a964defc89cc9c7084f8f6e82a52ba jdk8u162-b03 1.100 +8cfa77f0651d850cfd3c8e8eea8272d6ccefa86f jdk8u162-b04 1.101 +6f3097ab2b1bfc00f8efc895369faf2228422526 jdk8u162-b05 1.102 +59f9887ee15eefabe300dedf835abd1c0aec40df jdk8u162-b06 1.103 +5066fa48df81b06eeffebc10e13308b68cd59e89 jdk8u162-b07 1.104 +7279642d20886178bd18a713a309619e3298935c jdk8u162-b08 1.105 +59171db1d423142a596dcde1f353d4277f016b98 jdk8u162-b09 1.106 +2c68567bdcf2bb465d38c9783c0886df98fc496e jdk8u162-b10 1.107 +6029daad75bf459b330fc79ebf208dc35dc682d5 jdk8u162-b11 1.108 +ace99846c1fd92e8bec4cbe912ec3fc8a74fbf0c jdk8u162-b12 1.109 72dbc8d63308f5b04b9fd3e06d139d673f992212 jdk8u172-b00 1.110 fbb7c1e76e59aabb85a70c81301f47b980f83225 jdk8u172-b01 1.111 56874ff37e89559692d1314d48cbab574544b677 jdk8u172-b02
2.1 --- a/THIRD_PARTY_README Mon Jan 08 22:35:25 2018 -0800 2.2 +++ b/THIRD_PARTY_README Tue Jan 16 22:52:07 2018 -0800 2.3 @@ -7,7 +7,7 @@ 2.4 2.5 --- begin of LICENSE --- 2.6 2.7 -Copyright (c) 2000-2011 France Télécom 2.8 +Copyright (c) 2000-2011 France T??l??com 2.9 All rights reserved. 2.10 2.11 Redistribution and use in source and binary forms, with or without 2.12 @@ -849,7 +849,7 @@ 2.13 --- begin of LICENSE --- 2.14 2.15 Copyright notice 2.16 -Copyright © 2011 Ecma International 2.17 +Copyright ?? 2011 Ecma International 2.18 Ecma International 2.19 Rue du Rhone 114 2.20 CH-1204 Geneva 2.21 @@ -916,7 +916,7 @@ 2.22 2.23 --- begin of LICENSE --- 2.24 2.25 -Copyright © 2001,2003 Keith Packard 2.26 +Copyright ?? 2001,2003 Keith Packard 2.27 2.28 Permission to use, copy, modify, distribute, and sell this software and its 2.29 documentation for any purpose is hereby granted without fee, provided that the 2.30 @@ -2212,16 +2212,16 @@ 2.31 Unicode Terms of Use 2.32 2.33 For the general privacy policy governing access to this site, see the Unicode 2.34 -Privacy Policy. For trademark usage, see the Unicode® Consortium Name and 2.35 +Privacy Policy. For trademark usage, see the Unicode?? Consortium Name and 2.36 Trademark Usage Policy. 2.37 2.38 A. Unicode Copyright. 2.39 - 1. Copyright © 1991-2013 Unicode, Inc. All rights reserved. 2.40 + 1. Copyright ?? 1991-2013 Unicode, Inc. All rights reserved. 2.41 2.42 2. Certain documents and files on this website contain a legend indicating 2.43 that "Modification is permitted." Any person is hereby authorized, 2.44 without fee, to modify such documents and files to create derivative 2.45 - works conforming to the Unicode® Standard, subject to Terms and 2.46 + works conforming to the Unicode?? Standard, subject to Terms and 2.47 Conditions herein. 2.48 2.49 3. Any person is hereby authorized, without fee, to view, use, reproduce, 2.50 @@ -2287,14 +2287,14 @@ 2.51 2.52 E.Trademarks & Logos. 2.53 1. The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, 2.54 - Inc. “The Unicode Consortium” and “Unicode, Inc.” are trade names of 2.55 + Inc. ???The Unicode Consortium??? and ???Unicode, Inc.??? are trade names of 2.56 Unicode, Inc. Use of the information and materials found on this 2.57 - website indicates your acknowledgement of Unicode, Inc.’s exclusive 2.58 + website indicates your acknowledgement of Unicode, Inc.???s exclusive 2.59 worldwide rights in the Unicode Word Mark, the Unicode Logo, and the 2.60 Unicode trade names. 2.61 2.62 - 2. The Unicode Consortium Name and Trademark Usage Policy (“Trademark 2.63 - Policy”) are incorporated herein by reference and you agree to abide by 2.64 + 2. The Unicode Consortium Name and Trademark Usage Policy (???Trademark 2.65 + Policy???) are incorporated herein by reference and you agree to abide by 2.66 the provisions of the Trademark Policy, which may be changed from time 2.67 to time in the sole discretion of Unicode, Inc. 2.68 2.69 @@ -2317,12 +2317,12 @@ 2.70 2.71 2. Modification by Unicode. Unicode shall have the right to modify this 2.72 Agreement at any time by posting it to this site. The user may not 2.73 - assign any part of this Agreement without Unicode’s prior written 2.74 + assign any part of this Agreement without Unicode???s prior written 2.75 consent. 2.76 2.77 3. Taxes. The user agrees to pay any taxes arising from access to this 2.78 website or use of the information herein, except for those based on 2.79 - Unicode’s net income. 2.80 + Unicode???s net income. 2.81 2.82 4. Severability. If any provision of this Agreement is declared invalid or 2.83 unenforceable, the remaining provisions of this Agreement shall remain 2.84 @@ -2351,7 +2351,7 @@ 2.85 2.86 COPYRIGHT AND PERMISSION NOTICE 2.87 2.88 -Copyright © 1991-2012 Unicode, Inc. All rights reserved. Distributed under the 2.89 +Copyright ?? 1991-2012 Unicode, Inc. All rights reserved. Distributed under the 2.90 Terms of Use in http://www.unicode.org/copyright.html. 2.91 2.92 Permission is hereby granted, free of charge, to any person obtaining a copy
3.1 --- a/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteGrow.java Mon Jan 08 22:35:25 2018 -0800 3.2 +++ b/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteGrow.java Tue Jan 16 22:52:07 2018 -0800 3.3 @@ -1,5 +1,5 @@ 3.4 /* 3.5 - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. 3.6 + * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. 3.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.8 * 3.9 * This code is free software; you can redistribute it and/or modify it 3.10 @@ -26,11 +26,13 @@ 3.11 package com.sun.corba.se.impl.encoding; 3.12 3.13 import com.sun.corba.se.impl.orbutil.ORBConstants; 3.14 +import com.sun.corba.se.impl.orbutil.ORBUtility; 3.15 import com.sun.corba.se.impl.encoding.ByteBufferWithInfo; 3.16 import com.sun.corba.se.impl.encoding.BufferManagerWrite; 3.17 import com.sun.corba.se.pept.encoding.OutputObject; 3.18 import com.sun.corba.se.pept.transport.Connection; 3.19 import com.sun.corba.se.spi.orb.ORB; 3.20 +import com.sun.corba.se.spi.orb.ORBData; 3.21 3.22 public class BufferManagerWriteGrow extends BufferManagerWrite 3.23 { 3.24 @@ -48,7 +50,20 @@ 3.25 * buffer manager as set in the ORB. 3.26 */ 3.27 public int getBufferSize() { 3.28 - return orb.getORBData().getGIOPBufferSize(); 3.29 + ORBData orbData = null; 3.30 + int bufferSize = ORBConstants.GIOP_DEFAULT_BUFFER_SIZE; 3.31 + if (orb != null) { 3.32 + orbData = orb.getORBData(); 3.33 + if (orbData != null) { 3.34 + bufferSize = orbData.getGIOPBufferSize(); 3.35 + dprint("BufferManagerWriteGrow.getBufferSize: bufferSize == " + bufferSize); 3.36 + } else { 3.37 + dprint("BufferManagerWriteGrow.getBufferSize: orbData reference is NULL"); 3.38 + } 3.39 + } else { 3.40 + dprint("BufferManagerWriteGrow.getBufferSize: orb reference is NULL"); 3.41 + } 3.42 + return bufferSize; 3.43 } 3.44 3.45 public void overflow (ByteBufferWithInfo bbwi) 3.46 @@ -89,4 +104,9 @@ 3.47 */ 3.48 public void close() {} 3.49 3.50 + private void dprint(String msg) { 3.51 + if (orb.transportDebugFlag) { 3.52 + ORBUtility.dprint(this, msg); 3.53 + } 3.54 + } 3.55 }
4.1 --- a/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java Mon Jan 08 22:35:25 2018 -0800 4.2 +++ b/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java Tue Jan 16 22:52:07 2018 -0800 4.3 @@ -1,5 +1,5 @@ 4.4 /* 4.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 4.6 + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. 4.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4.8 * 4.9 * This code is free software; you can redistribute it and/or modify it 4.10 @@ -32,18 +32,9 @@ 4.11 4.12 package com.sun.corba.se.impl.encoding; 4.13 4.14 +import java.io.Serializable; 4.15 import java.io.IOException; 4.16 -import java.io.Serializable; 4.17 -import java.io.ByteArrayInputStream; 4.18 -import java.io.ObjectInputStream; 4.19 -import java.io.IOException; 4.20 -import java.io.StreamCorruptedException; 4.21 -import java.io.OptionalDataException; 4.22 -import java.io.IOException; 4.23 - 4.24 -import java.util.Stack; 4.25 - 4.26 -import java.net.URL; 4.27 + 4.28 import java.net.MalformedURLException; 4.29 4.30 import java.nio.ByteBuffer; 4.31 @@ -53,19 +44,11 @@ 4.32 4.33 import java.math.BigDecimal; 4.34 4.35 -import java.rmi.Remote; 4.36 -import java.rmi.StubNotFoundException; 4.37 - 4.38 import java.security.AccessController; 4.39 import java.security.PrivilegedExceptionAction; 4.40 import java.security.PrivilegedActionException; 4.41 4.42 import org.omg.CORBA.SystemException; 4.43 -import org.omg.CORBA.Object; 4.44 -import org.omg.CORBA.Principal; 4.45 -import org.omg.CORBA.TypeCode; 4.46 -import org.omg.CORBA.Any; 4.47 -import org.omg.CORBA.portable.Delegate; 4.48 import org.omg.CORBA.portable.ValueBase; 4.49 import org.omg.CORBA.portable.IndirectionException; 4.50 import org.omg.CORBA.CompletionStatus; 4.51 @@ -82,15 +65,12 @@ 4.52 import org.omg.CORBA.MARSHAL; 4.53 import org.omg.CORBA.portable.IDLEntity; 4.54 4.55 -import javax.rmi.PortableRemoteObject; 4.56 import javax.rmi.CORBA.Tie; 4.57 -import javax.rmi.CORBA.Util; 4.58 import javax.rmi.CORBA.ValueHandler; 4.59 4.60 import com.sun.corba.se.pept.protocol.MessageMediator; 4.61 import com.sun.corba.se.pept.transport.ByteBufferPool; 4.62 4.63 -import com.sun.corba.se.spi.protocol.RequestDispatcherRegistry; 4.64 import com.sun.corba.se.spi.protocol.CorbaClientDelegate; 4.65 4.66 import com.sun.corba.se.spi.ior.IOR; 4.67 @@ -99,9 +79,6 @@ 4.68 4.69 import com.sun.corba.se.spi.orb.ORB; 4.70 import com.sun.corba.se.spi.orb.ORBVersionFactory; 4.71 -import com.sun.corba.se.spi.orb.ORBVersion; 4.72 - 4.73 -import com.sun.corba.se.spi.protocol.CorbaMessageMediator; 4.74 4.75 import com.sun.corba.se.spi.logging.CORBALogDomains; 4.76 import com.sun.corba.se.spi.presentation.rmi.PresentationManager; 4.77 @@ -725,12 +702,14 @@ 4.78 // IDLEntity.class.isAssignableFrom( clz ). 4.79 // 3. If clz is an interface, use it to create the appropriate 4.80 // stub factory. 4.81 + 4.82 public org.omg.CORBA.Object read_Object(Class clz) 4.83 { 4.84 // In any case, we must first read the IOR. 4.85 IOR ior = IORFactories.makeIOR(parent) ; 4.86 - if (ior.isNil()) 4.87 + if (ior.isNil()) { 4.88 return null ; 4.89 + } 4.90 4.91 PresentationManager.StubFactoryFactory sff = ORB.getStubFactoryFactory() ; 4.92 String codeBase = ior.getProfile().getCodebase() ; 4.93 @@ -739,6 +718,7 @@ 4.94 if (clz == null) { 4.95 RepositoryId rid = RepositoryId.cache.getId( ior.getTypeId() ) ; 4.96 String className = rid.getClassName() ; 4.97 + orb.validateIORClass(className); 4.98 boolean isIDLInterface = rid.isIDLType() ; 4.99 4.100 if (className == null || className.equals( "" )) 4.101 @@ -761,11 +741,9 @@ 4.102 } else { 4.103 // clz is an interface class 4.104 boolean isIDL = IDLEntity.class.isAssignableFrom( clz ) ; 4.105 - 4.106 stubFactory = sff.createStubFactory( clz.getName(), 4.107 isIDL, codeBase, clz, clz.getClassLoader() ) ; 4.108 } 4.109 - 4.110 return internalIORToObject( ior, stubFactory, orb ) ; 4.111 } 4.112
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/src/share/classes/com/sun/corba/se/impl/ior/IORTypeCheckRegistryImpl.java Tue Jan 16 22:52:07 2018 -0800 5.3 @@ -0,0 +1,180 @@ 5.4 +/* 5.5 + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. 5.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 5.7 + * 5.8 + * This code is free software; you can redistribute it and/or modify it 5.9 + * under the terms of the GNU General Public License version 2 only, as 5.10 + * published by the Free Software Foundation. Oracle designates this 5.11 + * particular file as subject to the "Classpath" exception as provided 5.12 + * by Oracle in the LICENSE file that accompanied this code. 5.13 + * 5.14 + * This code is distributed in the hope that it will be useful, but WITHOUT 5.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 5.16 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 5.17 + * version 2 for more details (a copy is included in the LICENSE file that 5.18 + * accompanied this code). 5.19 + * 5.20 + * You should have received a copy of the GNU General Public License version 5.21 + * 2 along with this work; if not, write to the Free Software Foundation, 5.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 5.23 + * 5.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 5.25 + * or visit www.oracle.com if you need additional information or have any 5.26 + * questions. 5.27 + */ 5.28 + 5.29 +package com.sun.corba.se.impl.ior; 5.30 + 5.31 +import java.util.Arrays; 5.32 +import java.util.Collections; 5.33 +import java.util.HashSet; 5.34 +import java.util.Set; 5.35 + 5.36 +import com.sun.corba.se.impl.orbutil.ORBUtility; 5.37 +import com.sun.corba.se.spi.ior.IORTypeCheckRegistry; 5.38 +import com.sun.corba.se.spi.orb.ORB; 5.39 + 5.40 +public class IORTypeCheckRegistryImpl implements IORTypeCheckRegistry { 5.41 + 5.42 + private final Set<String> iorTypeNames; 5.43 + private static final Set<String> builtinIorTypeNames; 5.44 + private ORB theOrb; 5.45 + 5.46 + static { 5.47 + builtinIorTypeNames = initBuiltinIorTypeNames(); 5.48 + } 5.49 + 5.50 + public IORTypeCheckRegistryImpl(String filterProperties, ORB orb) { 5.51 + theOrb = orb; 5.52 + iorTypeNames = parseIorClassNameList(filterProperties); 5.53 + } 5.54 + 5.55 + /* 5.56 + * 5.57 + * A note on the validation flow: 5.58 + * 1. against the filter class name list 5.59 + * 2. against the builtin class name list 5.60 + */ 5.61 + @Override 5.62 + public boolean isValidIORType(String iorClassName) { 5.63 + dprintTransport(".isValidIORType : iorClassName == " + iorClassName); 5.64 + return validateIorTypeByName(iorClassName); 5.65 + } 5.66 + 5.67 + 5.68 + private boolean validateIorTypeByName(String iorClassName) { 5.69 + dprintTransport(".validateIorTypeByName : iorClassName == " + iorClassName); 5.70 + boolean isValidType; 5.71 + 5.72 + isValidType = checkIorTypeNames(iorClassName); 5.73 + 5.74 + if (!isValidType) { 5.75 + isValidType = checkBuiltinClassNames(iorClassName); 5.76 + } 5.77 + 5.78 + dprintTransport(".validateIorTypeByName : isValidType == " + isValidType); 5.79 + return isValidType; 5.80 + } 5.81 + 5.82 + 5.83 + /* 5.84 + * check if the class name corresponding to an IOR Type name 5.85 + * is in the ior class name list as generated from the filter property. 5.86 + * So if the IOR type is recorded in the registry then allow the creation of the 5.87 + * stub factory and let it resolve and load the class. That is if current 5.88 + * type check deliberation permits. 5.89 + * IOR Type names are configured by the filter property 5.90 + */ 5.91 + private boolean checkIorTypeNames( 5.92 + String theIorClassName) { 5.93 + return (iorTypeNames != null) && (iorTypeNames.contains(theIorClassName)); 5.94 + } 5.95 + 5.96 + /* 5.97 + * Check the IOR interface class name against the set of 5.98 + * class names that correspond to the builtin JDK IDL stub classes. 5.99 + */ 5.100 + private boolean checkBuiltinClassNames( 5.101 + String theIorClassName) { 5.102 + return builtinIorTypeNames.contains(theIorClassName); 5.103 + } 5.104 + 5.105 + private Set<String> parseIorClassNameList(String filterProperty) { 5.106 + Set<String> _iorTypeNames = null; 5.107 + if (filterProperty != null) { 5.108 + String[] tempIorClassNames = filterProperty.split(";"); 5.109 + _iorTypeNames = Collections.unmodifiableSet(new HashSet<>(Arrays 5.110 + .asList(tempIorClassNames))); 5.111 + if (theOrb.orbInitDebugFlag) { 5.112 + dprintConfiguredIorTypeNames(); 5.113 + } 5.114 + } 5.115 + return _iorTypeNames; 5.116 + } 5.117 + 5.118 + private static Set<String> initBuiltinIorTypeNames() { 5.119 + Set<Class<?>> builtInCorbaStubTypes = initBuiltInCorbaStubTypes(); 5.120 + String[] tempBuiltinIorTypeNames = new String[builtInCorbaStubTypes.size()]; 5.121 + int i = 0; 5.122 + for (Class<?> _stubClass : builtInCorbaStubTypes) { 5.123 + tempBuiltinIorTypeNames[i++] = _stubClass.getName(); 5.124 + } 5.125 + return Collections.unmodifiableSet(new HashSet<>(Arrays 5.126 + .asList(tempBuiltinIorTypeNames))); 5.127 + } 5.128 + 5.129 + private static Set<Class<?>> initBuiltInCorbaStubTypes() { 5.130 + Class<?> tempBuiltinCorbaStubTypes[] = { 5.131 + com.sun.corba.se.spi.activation.Activator.class, 5.132 + com.sun.corba.se.spi.activation._ActivatorStub.class, 5.133 + com.sun.corba.se.spi.activation._InitialNameServiceStub.class, 5.134 + com.sun.corba.se.spi.activation._LocatorStub.class, 5.135 + com.sun.corba.se.spi.activation._RepositoryStub.class, 5.136 + com.sun.corba.se.spi.activation._ServerManagerStub.class, 5.137 + com.sun.corba.se.spi.activation._ServerStub.class, 5.138 + org.omg.CosNaming.BindingIterator.class, 5.139 + org.omg.CosNaming._BindingIteratorStub.class, 5.140 + org.omg.CosNaming.NamingContextExt.class, 5.141 + org.omg.CosNaming._NamingContextExtStub.class, 5.142 + org.omg.CosNaming.NamingContext.class, 5.143 + org.omg.CosNaming._NamingContextStub.class, 5.144 + org.omg.DynamicAny.DynAnyFactory.class, 5.145 + org.omg.DynamicAny._DynAnyFactoryStub.class, 5.146 + org.omg.DynamicAny.DynAny.class, 5.147 + org.omg.DynamicAny._DynAnyStub.class, 5.148 + org.omg.DynamicAny.DynArray.class, 5.149 + org.omg.DynamicAny._DynArrayStub.class, 5.150 + org.omg.DynamicAny.DynEnum.class, 5.151 + org.omg.DynamicAny._DynEnumStub.class, 5.152 + org.omg.DynamicAny.DynFixed.class, 5.153 + org.omg.DynamicAny._DynFixedStub.class, 5.154 + org.omg.DynamicAny.DynSequence.class, 5.155 + org.omg.DynamicAny._DynSequenceStub.class, 5.156 + org.omg.DynamicAny.DynStruct.class, 5.157 + org.omg.DynamicAny._DynStructStub.class, 5.158 + org.omg.DynamicAny.DynUnion.class, 5.159 + org.omg.DynamicAny._DynUnionStub.class, 5.160 + org.omg.DynamicAny._DynValueStub.class, 5.161 + org.omg.DynamicAny.DynValue.class, 5.162 + org.omg.PortableServer.ServantActivator.class, 5.163 + org.omg.PortableServer._ServantActivatorStub.class, 5.164 + org.omg.PortableServer.ServantLocator.class, 5.165 + org.omg.PortableServer._ServantLocatorStub.class}; 5.166 + return new HashSet<>( 5.167 + Arrays.asList(tempBuiltinCorbaStubTypes)); 5.168 + } 5.169 + 5.170 + private void dprintConfiguredIorTypeNames() { 5.171 + if (iorTypeNames != null) { 5.172 + for (String iorTypeName : iorTypeNames) { 5.173 + ORBUtility.dprint(this, ".dprintConfiguredIorTypeNames: " + iorTypeName); 5.174 + } 5.175 + } 5.176 + } 5.177 + 5.178 + private void dprintTransport(String msg) { 5.179 + if (theOrb.transportDebugFlag) { 5.180 + ORBUtility.dprint(this, msg); 5.181 + } 5.182 + } 5.183 +}
6.1 --- a/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java Mon Jan 08 22:35:25 2018 -0800 6.2 +++ b/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java Tue Jan 16 22:52:07 2018 -0800 6.3 @@ -1,5 +1,5 @@ 6.4 /* 6.5 - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. 6.6 + * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved. 6.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 6.8 * 6.9 * This code is free software; you can redistribute it and/or modify it 6.10 @@ -32,37 +32,25 @@ 6.11 import java.lang.reflect.Constructor; 6.12 import java.lang.reflect.Field; 6.13 import java.lang.reflect.Modifier; 6.14 -import java.lang.reflect.InvocationTargetException; 6.15 6.16 import java.util.Set; 6.17 import java.util.HashSet; 6.18 -import java.util.ArrayList; 6.19 -import java.util.Iterator; 6.20 import java.util.Properties; 6.21 import java.util.Vector; 6.22 import java.util.Hashtable; 6.23 import java.util.Map; 6.24 -import java.util.HashMap; 6.25 -import java.util.LinkedList; 6.26 -import java.util.Collection; 6.27 import java.util.Collections; 6.28 -import java.util.StringTokenizer; 6.29 import java.util.Enumeration; 6.30 import java.util.WeakHashMap; 6.31 6.32 import java.net.InetAddress; 6.33 6.34 import java.security.PrivilegedAction; 6.35 +import java.security.Security; 6.36 import java.security.AccessController; 6.37 6.38 -import javax.rmi.CORBA.Util; 6.39 import javax.rmi.CORBA.ValueHandler; 6.40 6.41 -import org.omg.CORBA.Context; 6.42 -import org.omg.CORBA.ContextList; 6.43 -import org.omg.CORBA.Environment; 6.44 -import org.omg.CORBA.ExceptionList; 6.45 -import org.omg.CORBA.ORBPackage.InvalidName; 6.46 import org.omg.CORBA.NVList; 6.47 import org.omg.CORBA.TCKind; 6.48 import org.omg.CORBA.NamedValue; 6.49 @@ -75,7 +63,6 @@ 6.50 import org.omg.CORBA.UnionMember; 6.51 import org.omg.CORBA.ValueMember; 6.52 import org.omg.CORBA.BAD_PARAM; 6.53 -import org.omg.CORBA.MARSHAL; 6.54 6.55 import org.omg.CORBA.portable.ValueFactory; 6.56 6.57 @@ -83,10 +70,7 @@ 6.58 6.59 import com.sun.org.omg.SendingContext.CodeBase; 6.60 6.61 -import com.sun.corba.se.pept.broker.Broker; 6.62 import com.sun.corba.se.pept.protocol.ClientInvocationInfo; 6.63 -import com.sun.corba.se.pept.transport.ContactInfo; 6.64 -import com.sun.corba.se.pept.transport.ConnectionCache; 6.65 import com.sun.corba.se.pept.transport.TransportManager; 6.66 6.67 import com.sun.corba.se.spi.ior.IOR; 6.68 @@ -95,8 +79,6 @@ 6.69 import com.sun.corba.se.spi.ior.IORFactories; 6.70 import com.sun.corba.se.spi.ior.ObjectKey; 6.71 import com.sun.corba.se.spi.ior.ObjectKeyFactory; 6.72 -import com.sun.corba.se.spi.ior.iiop.IIOPFactories; 6.73 -import com.sun.corba.se.spi.ior.iiop.GIOPVersion; 6.74 import com.sun.corba.se.spi.oa.OAInvocationInfo; 6.75 import com.sun.corba.se.spi.oa.ObjectAdapterFactory; 6.76 import com.sun.corba.se.spi.orb.DataCollector; 6.77 @@ -113,24 +95,18 @@ 6.78 import com.sun.corba.se.spi.protocol.ClientDelegateFactory; 6.79 import com.sun.corba.se.spi.protocol.RequestDispatcherRegistry; 6.80 import com.sun.corba.se.spi.protocol.CorbaServerRequestDispatcher; 6.81 -import com.sun.corba.se.spi.protocol.RequestDispatcherDefault; 6.82 import com.sun.corba.se.spi.protocol.PIHandler; 6.83 -import com.sun.corba.se.spi.protocol.CorbaMessageMediator; 6.84 -import com.sun.corba.se.spi.protocol.ForwardException; 6.85 import com.sun.corba.se.spi.resolver.Resolver; 6.86 import com.sun.corba.se.spi.resolver.LocalResolver; 6.87 -import com.sun.corba.se.spi.orb.StringPair; 6.88 -import com.sun.corba.se.spi.orb.StringPair; 6.89 import com.sun.corba.se.spi.transport.CorbaContactInfoListFactory; 6.90 import com.sun.corba.se.spi.transport.CorbaTransportManager; 6.91 +import com.sun.corba.se.spi.ior.IORTypeCheckRegistry; 6.92 import com.sun.corba.se.spi.legacy.connection.LegacyServerSocketManager; 6.93 +import com.sun.corba.se.spi.logging.CORBALogDomains; 6.94 import com.sun.corba.se.spi.copyobject.CopierManager; 6.95 -import com.sun.corba.se.spi.presentation.rmi.PresentationDefaults; 6.96 -import com.sun.corba.se.spi.presentation.rmi.PresentationManager; 6.97 import com.sun.corba.se.spi.presentation.rmi.StubAdapter; 6.98 import com.sun.corba.se.spi.servicecontext.ServiceContextRegistry; 6.99 6.100 -import com.sun.corba.se.impl.corba.TypeCodeFactory; 6.101 import com.sun.corba.se.impl.corba.TypeCodeImpl; 6.102 import com.sun.corba.se.impl.corba.NVListImpl; 6.103 import com.sun.corba.se.impl.corba.ExceptionListImpl; 6.104 @@ -139,9 +115,6 @@ 6.105 import com.sun.corba.se.impl.corba.EnvironmentImpl; 6.106 import com.sun.corba.se.impl.corba.AsynchInvoke; 6.107 import com.sun.corba.se.impl.corba.AnyImpl; 6.108 -import com.sun.corba.se.impl.corba.RequestImpl; 6.109 -import com.sun.corba.se.impl.dynamicany.DynAnyFactoryImpl; 6.110 -import com.sun.corba.se.impl.encoding.EncapsOutputStream; 6.111 import com.sun.corba.se.impl.encoding.CachedCodeBase; 6.112 import com.sun.corba.se.impl.interceptors.PIHandlerImpl; 6.113 import com.sun.corba.se.impl.interceptors.PINoOpHandlerImpl; 6.114 @@ -150,12 +123,10 @@ 6.115 import com.sun.corba.se.impl.ior.TaggedProfileTemplateFactoryFinderImpl; 6.116 import com.sun.corba.se.impl.oa.toa.TOAFactory; 6.117 import com.sun.corba.se.impl.oa.poa.BadServerIdHandler; 6.118 -import com.sun.corba.se.impl.oa.poa.DelegateImpl; 6.119 import com.sun.corba.se.impl.oa.poa.POAFactory; 6.120 import com.sun.corba.se.impl.orbutil.ORBConstants; 6.121 import com.sun.corba.se.impl.orbutil.ORBUtility; 6.122 import com.sun.corba.se.impl.orbutil.StackImpl; 6.123 -import com.sun.corba.se.impl.orbutil.threadpool.ThreadPoolImpl; 6.124 import com.sun.corba.se.impl.orbutil.threadpool.ThreadPoolManagerImpl; 6.125 import com.sun.corba.se.impl.protocol.RequestDispatcherRegistryImpl; 6.126 import com.sun.corba.se.impl.protocol.CorbaInvocationInfo; 6.127 @@ -164,7 +135,7 @@ 6.128 import com.sun.corba.se.impl.util.Utility; 6.129 import com.sun.corba.se.impl.logging.ORBUtilSystemException; 6.130 import com.sun.corba.se.impl.copyobject.CopierManagerImpl; 6.131 -import com.sun.corba.se.impl.presentation.rmi.PresentationManagerImpl; 6.132 +import com.sun.corba.se.impl.ior.IORTypeCheckRegistryImpl; 6.133 6.134 /** 6.135 * The JavaIDL ORB implementation. 6.136 @@ -226,6 +197,8 @@ 6.137 6.138 private ServiceContextRegistry serviceContextRegistry ; 6.139 6.140 + private IORTypeCheckRegistry iorTypeCheckRegistry; 6.141 + 6.142 // Needed here to implement connect/disconnect 6.143 private TOAFactory toaFactory ; 6.144 6.145 @@ -274,6 +247,8 @@ 6.146 // insNamingDelegate. 6.147 private final Object resolverLock = new Object() ; 6.148 6.149 + private static final String IORTYPECHECKREGISTRY_FILTER_PROPNAME = "com.sun.CORBA.ORBIorTypeCheckRegistryFilter"; 6.150 + 6.151 private TaggedComponentFactoryFinder taggedComponentFactoryFinder ; 6.152 6.153 private IdentifiableFactoryFinder taggedProfileFactoryFinder ; 6.154 @@ -413,6 +388,37 @@ 6.155 serviceContextRegistry = new ServiceContextRegistry( this ) ; 6.156 } 6.157 6.158 + private void initIORTypeCheckRegistry() { 6.159 + String filterProps = AccessController 6.160 + .doPrivileged(new PrivilegedAction<String>() { 6.161 + public String run() { 6.162 + String props = System 6.163 + .getProperty(IORTYPECHECKREGISTRY_FILTER_PROPNAME); 6.164 + if (props == null) { 6.165 + props = Security 6.166 + .getProperty(IORTYPECHECKREGISTRY_FILTER_PROPNAME); 6.167 + } 6.168 + return props; 6.169 + } 6.170 + }); 6.171 + if (filterProps != null) { 6.172 + try { 6.173 + iorTypeCheckRegistry = new IORTypeCheckRegistryImpl(filterProps, this); 6.174 + } catch (Exception ex) { 6.175 + throw wrapper.bootstrapException(ex); 6.176 + } 6.177 + 6.178 + if (this.orbInitDebugFlag) { 6.179 + dprint(".initIORTypeCheckRegistry, IORTypeCheckRegistryImpl created for properties == " 6.180 + + filterProps); 6.181 + } 6.182 + } else { 6.183 + if (this.orbInitDebugFlag) { 6.184 + dprint(".initIORTypeCheckRegistry, IORTypeCheckRegistryImpl NOT created for properties == "); 6.185 + } 6.186 + } 6.187 + } 6.188 + 6.189 protected void setDebugFlags( String[] args ) 6.190 { 6.191 for (int ctr=0; ctr<args.length; ctr++ ) { 6.192 @@ -494,6 +500,8 @@ 6.193 getThreadPoolManager(); 6.194 6.195 super.getByteBufferPool(); 6.196 + 6.197 + initIORTypeCheckRegistry(); 6.198 } 6.199 6.200 private synchronized POAFactory getPOAFactory() 6.201 @@ -2089,6 +2097,17 @@ 6.202 } 6.203 return copierManager ; 6.204 } 6.205 + 6.206 + @Override 6.207 + public void validateIORClass(String iorClassName) { 6.208 + if (iorTypeCheckRegistry != null) { 6.209 + if (!iorTypeCheckRegistry.isValidIORType(iorClassName)) { 6.210 + throw ORBUtilSystemException.get( this, 6.211 + CORBALogDomains.OA_IOR ).badStringifiedIor(); 6.212 + } 6.213 + } 6.214 + } 6.215 + 6.216 } // Class ORBImpl 6.217 6.218 ////////////////////////////////////////////////////////////////////////
7.1 --- a/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java Mon Jan 08 22:35:25 2018 -0800 7.2 +++ b/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java Tue Jan 16 22:52:07 2018 -0800 7.3 @@ -1,5 +1,5 @@ 7.4 /* 7.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 7.6 + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. 7.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 7.8 * 7.9 * This code is free software; you can redistribute it and/or modify it 7.10 @@ -31,28 +31,16 @@ 7.11 7.12 package com.sun.corba.se.impl.orb; 7.13 7.14 -import java.util.Collection; 7.15 import java.util.Properties; 7.16 -import java.util.Hashtable; 7.17 7.18 import java.applet.Applet; 7.19 7.20 import java.net.URL; 7.21 7.22 -import java.io.IOException ; 7.23 - 7.24 -import java.util.logging.Logger ; 7.25 - 7.26 -import org.omg.CORBA.Context; 7.27 -import org.omg.CORBA.ContextList; 7.28 -import org.omg.CORBA.Environment; 7.29 -import org.omg.CORBA.ExceptionList; 7.30 import org.omg.CORBA.ORBPackage.InvalidName; 7.31 import org.omg.CORBA.NVList; 7.32 import org.omg.CORBA.TCKind; 7.33 -import org.omg.CORBA.NamedValue; 7.34 import org.omg.CORBA.NO_IMPLEMENT; 7.35 -import org.omg.CORBA.Object; 7.36 import org.omg.CORBA.Request; 7.37 import org.omg.CORBA.TypeCode; 7.38 import org.omg.CORBA.Any; 7.39 @@ -63,7 +51,6 @@ 7.40 import org.omg.CORBA.PolicyError; 7.41 7.42 import org.omg.CORBA.portable.OutputStream; 7.43 -import org.omg.CORBA.portable.RemarshalException; 7.44 7.45 import com.sun.corba.se.pept.protocol.ClientInvocationInfo ; 7.46 import com.sun.corba.se.pept.transport.ContactInfo; 7.47 @@ -71,15 +58,12 @@ 7.48 import com.sun.corba.se.pept.transport.Selector ; 7.49 import com.sun.corba.se.pept.transport.TransportManager; 7.50 7.51 -import com.sun.corba.se.spi.legacy.connection.ORBSocketFactory; 7.52 import com.sun.corba.se.spi.orb.ORBData; 7.53 import com.sun.corba.se.spi.orb.Operation; 7.54 import com.sun.corba.se.spi.orb.ORB; 7.55 import com.sun.corba.se.spi.orb.ORBVersion; 7.56 import com.sun.corba.se.spi.orb.ORBVersionFactory; 7.57 import com.sun.corba.se.spi.oa.OAInvocationInfo; 7.58 -import com.sun.corba.se.spi.oa.ObjectAdapter; 7.59 -import com.sun.corba.se.spi.protocol.CorbaMessageMediator; 7.60 import com.sun.corba.se.spi.protocol.ClientDelegateFactory; 7.61 import com.sun.corba.se.spi.protocol.RequestDispatcherRegistry; 7.62 import com.sun.corba.se.spi.protocol.CorbaServerRequestDispatcher; 7.63 @@ -92,22 +76,17 @@ 7.64 import com.sun.corba.se.spi.ior.ObjectKey; 7.65 import com.sun.corba.se.spi.ior.ObjectKeyFactory; 7.66 import com.sun.corba.se.spi.ior.iiop.GIOPVersion; 7.67 -import com.sun.corba.se.pept.transport.ByteBufferPool ; 7.68 import com.sun.corba.se.spi.transport.CorbaContactInfoListFactory ; 7.69 import com.sun.corba.se.spi.transport.CorbaTransportManager; 7.70 import com.sun.corba.se.spi.legacy.connection.LegacyServerSocketManager; 7.71 import com.sun.corba.se.spi.orbutil.closure.Closure; 7.72 import com.sun.corba.se.spi.orbutil.threadpool.ThreadPoolManager; 7.73 -import com.sun.corba.se.spi.logging.LogWrapperFactory; 7.74 -import com.sun.corba.se.spi.logging.LogWrapperBase; 7.75 import com.sun.corba.se.spi.copyobject.CopierManager; 7.76 import com.sun.corba.se.spi.presentation.rmi.PresentationManager; 7.77 import com.sun.corba.se.spi.presentation.rmi.PresentationDefaults; 7.78 7.79 import com.sun.corba.se.spi.servicecontext.ServiceContextRegistry; 7.80 -import com.sun.corba.se.spi.servicecontext.ServiceContexts; 7.81 7.82 -import com.sun.corba.se.impl.corba.TypeCodeFactory; 7.83 import com.sun.corba.se.impl.corba.TypeCodeImpl; 7.84 import com.sun.corba.se.impl.corba.NVListImpl; 7.85 import com.sun.corba.se.impl.corba.NamedValueImpl; 7.86 @@ -117,9 +96,6 @@ 7.87 import com.sun.corba.se.impl.corba.AnyImpl; 7.88 import com.sun.corba.se.impl.encoding.BufferManagerFactory; 7.89 import com.sun.corba.se.impl.encoding.CodeSetComponentInfo; 7.90 -import com.sun.corba.se.impl.encoding.MarshalInputStream; 7.91 -import com.sun.corba.se.impl.encoding.EncapsOutputStream; 7.92 -import com.sun.corba.se.impl.encoding.MarshalOutputStream; 7.93 import com.sun.corba.se.impl.oa.poa.BadServerIdHandler; 7.94 import com.sun.corba.se.impl.orbutil.ORBConstants; 7.95 import com.sun.corba.se.spi.legacy.connection.LegacyServerSocketEndPointInfo; 7.96 @@ -768,6 +744,12 @@ 7.97 public CopierManager getCopierManager() { 7.98 return null ; 7.99 } 7.100 + 7.101 + @Override 7.102 + public void validateIORClass(String iorClassName) { 7.103 + getFullORB().validateIORClass(iorClassName); 7.104 + } 7.105 + 7.106 } 7.107 7.108 // End of file.
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/src/share/classes/com/sun/corba/se/spi/ior/IORTypeCheckRegistry.java Tue Jan 16 22:52:07 2018 -0800 8.3 @@ -0,0 +1,31 @@ 8.4 +/* 8.5 + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. 8.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 8.7 + * 8.8 + * This code is free software; you can redistribute it and/or modify it 8.9 + * under the terms of the GNU General Public License version 2 only, as 8.10 + * published by the Free Software Foundation. Oracle designates this 8.11 + * particular file as subject to the "Classpath" exception as provided 8.12 + * by Oracle in the LICENSE file that accompanied this code. 8.13 + * 8.14 + * This code is distributed in the hope that it will be useful, but WITHOUT 8.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 8.16 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 8.17 + * version 2 for more details (a copy is included in the LICENSE file that 8.18 + * accompanied this code). 8.19 + * 8.20 + * You should have received a copy of the GNU General Public License version 8.21 + * 2 along with this work; if not, write to the Free Software Foundation, 8.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 8.23 + * 8.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 8.25 + * or visit www.oracle.com if you need additional information or have any 8.26 + * questions. 8.27 + */ 8.28 + 8.29 +package com.sun.corba.se.spi.ior; 8.30 + 8.31 +public interface IORTypeCheckRegistry { 8.32 + public boolean isValidIORType(String iorClassName); 8.33 +} 8.34 +
9.1 --- a/src/share/classes/com/sun/corba/se/spi/orb/ORB.java Mon Jan 08 22:35:25 2018 -0800 9.2 +++ b/src/share/classes/com/sun/corba/se/spi/orb/ORB.java Tue Jan 16 22:52:07 2018 -0800 9.3 @@ -1,5 +1,5 @@ 9.4 /* 9.5 - * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. 9.6 + * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved. 9.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 9.8 * 9.9 * This code is free software; you can redistribute it and/or modify it 9.10 @@ -42,16 +42,13 @@ 9.11 import com.sun.corba.se.spi.protocol.RequestDispatcherRegistry ; 9.12 import com.sun.corba.se.spi.protocol.ClientDelegateFactory ; 9.13 import com.sun.corba.se.spi.protocol.CorbaServerRequestDispatcher ; 9.14 -import com.sun.corba.se.spi.protocol.CorbaMessageMediator ; 9.15 import com.sun.corba.se.spi.protocol.PIHandler ; 9.16 import com.sun.corba.se.spi.resolver.LocalResolver ; 9.17 import com.sun.corba.se.spi.resolver.Resolver ; 9.18 import com.sun.corba.se.spi.transport.CorbaContactInfoListFactory ; 9.19 -import com.sun.corba.se.spi.legacy.connection.LegacyServerSocketEndPointInfo; 9.20 import com.sun.corba.se.spi.legacy.connection.LegacyServerSocketManager; 9.21 import com.sun.corba.se.spi.monitoring.MonitoringConstants; 9.22 import com.sun.corba.se.spi.monitoring.MonitoringManager; 9.23 -import com.sun.corba.se.spi.monitoring.MonitoringManagerFactory; 9.24 import com.sun.corba.se.spi.monitoring.MonitoringFactories; 9.25 9.26 import com.sun.corba.se.spi.ior.IdentifiableFactoryFinder ; 9.27 @@ -60,8 +57,6 @@ 9.28 import com.sun.corba.se.spi.ior.ObjectKeyFactory ; 9.29 import com.sun.corba.se.spi.ior.IOR ; 9.30 9.31 -import com.sun.corba.se.spi.orbutil.closure.Closure ; 9.32 - 9.33 import com.sun.corba.se.spi.orb.Operation ; 9.34 import com.sun.corba.se.spi.orb.ORBData ; 9.35 import com.sun.corba.se.spi.orb.ORBVersion ; 9.36 @@ -135,6 +130,7 @@ 9.37 public boolean shutdownDebugFlag = false; 9.38 public boolean giopDebugFlag = false; 9.39 public boolean invocationTimingDebugFlag = false ; 9.40 + public boolean orbInitDebugFlag = false; 9.41 9.42 // SystemException log wrappers. Protected so that they can be used in 9.43 // subclasses. 9.44 @@ -564,6 +560,24 @@ 9.45 public abstract ThreadPoolManager getThreadPoolManager(); 9.46 9.47 public abstract CopierManager getCopierManager() ; 9.48 + 9.49 + /* 9.50 + * This method is called to verify that a stringified IOR passed to 9.51 + * an org.omg.CORBA.ORB::string_to_object method contains a valid and acceptable IOR type. 9.52 + * If an ORB is configured with IOR type checking enabled, 9.53 + * the ORB executes a IOR type registry lookup to 9.54 + * validate that the class name extract from a type id in 9.55 + * a stringified IOR is a known and accepted type. 9.56 + * A CORBA {@code org.omg.CORBA.DATA_CONVERSION} exception will be thrown should the type check fail. 9.57 + * 9.58 + * @param iorClassName 9.59 + * a string representing the class name corresponding to the type id of an IOR 9.60 + * @throws org.omg.CORBA.DATA_CONVERSION 9.61 + * exception with an indication that it is a "Bad stringified IOR", which is thrown 9.62 + * when the type check fails. 9.63 + */ 9.64 + public abstract void validateIORClass(String iorClassName); 9.65 + 9.66 } 9.67 9.68 // End of file.
