jdk-sandbox: comparison jdk/src/java.rmi/share/classes/sun/rmi/server/Activation.java

equal deleted inserted replaced

-:6b7aa871e786
+:e4f526fd8e09
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.ObjectInput;
 import java.io.ObjectInputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.io.Serializable;
 import java.util.concurrent.ConcurrentHashMap;
 import sun.rmi.log.LogHandler;
 import sun.rmi.log.ReliableLog;
 import sun.rmi.registry.RegistryImpl;
 import sun.rmi.runtime.NewThreadAction;
-import sun.rmi.server.UnicastServerRef;
 import sun.rmi.transport.LiveRef;
 import sun.security.provider.PolicyFile;
 import com.sun.rmi.rmid.ExecPermission;
 import com.sun.rmi.rmid.ExecOptionPermission;
 {
 if (name.equals(NAME)) {
 throw new AccessException(
 "binding ActivationSystem is disallowed");
 } else {
+RegistryImpl.checkAccess("ActivationSystem.bind");
 super.bind(name, obj);
 }
 }
 public void unbind(String name)
 {
 if (name.equals(NAME)) {
 throw new AccessException(
 "unbinding ActivationSystem is disallowed");
 } else {
+RegistryImpl.checkAccess("ActivationSystem.unbind");
 super.unbind(name);
 }
 }
 {
 if (name.equals(NAME)) {
 throw new AccessException(
 "binding ActivationSystem is disallowed");
 } else {
+RegistryImpl.checkAccess("ActivationSystem.rebind");
 super.rebind(name, obj);
 }
 }
 }
 getGroupEntry(id).inactiveGroup(incarnation, false);
 }
 }
+/**
+* SameHostOnlyServerRef checks that access is from a local client
+* before the parameters are deserialized.  The unmarshalCustomCallData
+* hook is used to check the network address of the caller
+* with RegistryImpl.checkAccess().
+* The kind of access is retained for an exception if one is thrown.
+*/
+static class SameHostOnlyServerRef extends UnicastServerRef {
+private static final long serialVersionUID = 1234L;
+private String accessKind;      // an exception message
+/**
+* Construct a new SameHostOnlyServerRef from a LiveRef.
+* @param lref a LiveRef
+*/
+SameHostOnlyServerRef(LiveRef lref, String accessKind) {
+super(lref);
+this.accessKind = accessKind;
+}
+@Override
+protected void unmarshalCustomCallData(ObjectInput in) throws IOException, ClassNotFoundException {
+RegistryImpl.checkAccess(accessKind);
+super.unmarshalCustomCallData(in);
+}
+}
 class ActivationSystemImpl
 extends RemoteServer
 implements ActivationSystem
 {
 private static final long serialVersionUID = 9100152600327688967L;
 {
 /* Server ref must be created and assigned before remote object
 * 'this' can be exported.
 */
 LiveRef lref = new LiveRef(new ObjID(4), port, null, ssf);
-UnicastServerRef uref = new UnicastServerRef(lref);
+UnicastServerRef uref = new SameHostOnlyServerRef(lref,
+"ActivationSystem.nonLocalAccess");
 ref = uref;
 uref.exportObject(this, null);
 }
 public ActivationID registerObject(ActivationDesc desc)
 throws ActivationException, UnknownGroupException, RemoteException
 {
 checkShutdown();
-RegistryImpl.checkAccess("ActivationSystem.registerObject");
+// RegistryImpl.checkAccess() is done in the SameHostOnlyServerRef
+// during unmarshallCustomData and is not applicable to local access.
 ActivationGroupID groupID = desc.getGroupID();
 ActivationID id = new ActivationID(activatorStub);
 getGroupEntry(groupID).registerObject(id, desc, true);
 return id;
 }
 public void unregisterObject(ActivationID id)
 throws ActivationException, UnknownObjectException, RemoteException
 {
 checkShutdown();
-RegistryImpl.checkAccess("ActivationSystem.unregisterObject");
+// RegistryImpl.checkAccess() is done in the SameHostOnlyServerRef
+// during unmarshallCustomData and is not applicable to local access.
 getGroupEntry(id).unregisterObject(id, true);
 }
 public ActivationGroupID registerGroup(ActivationGroupDesc desc)
 throws ActivationException, RemoteException
 {
 checkShutdown();
-RegistryImpl.checkAccess("ActivationSystem.registerGroup");
+// RegistryImpl.checkAccess() is done in the SameHostOnlyServerRef
+// during unmarshallCustomData and is not applicable to local access.
 checkArgs(desc, null);
 ActivationGroupID id = new ActivationGroupID(systemStub);
 GroupEntry entry = new GroupEntry(id, desc);
 // table insertion must take place before log update
 ActivationInstantiator group,
 long incarnation)
 throws ActivationException, UnknownGroupException, RemoteException
 {
 checkShutdown();
-RegistryImpl.checkAccess("ActivationSystem.activeGroup");
+// RegistryImpl.checkAccess() is done in the SameHostOnlyServerRef
+// during unmarshallCustomData and is not applicable to local access.
 getGroupEntry(id).activeGroup(group, incarnation);
 return monitor;
 }
 public void unregisterGroup(ActivationGroupID id)
 throws ActivationException, UnknownGroupException, RemoteException
 {
 checkShutdown();
-RegistryImpl.checkAccess("ActivationSystem.unregisterGroup");
+// RegistryImpl.checkAccess() is done in the SameHostOnlyServerRef
+// during unmarshallCustomData and is not applicable to local access.
 // remove entry before unregister so state is updated before
 // logged
 removeGroupEntry(id).unregisterGroup(true);
 }
 public ActivationDesc setActivationDesc(ActivationID id,
 ActivationDesc desc)
 throws ActivationException, UnknownObjectException, RemoteException
 {
 checkShutdown();
-RegistryImpl.checkAccess("ActivationSystem.setActivationDesc");
+// RegistryImpl.checkAccess() is done in the SameHostOnlyServerRef
+// during unmarshallCustomData and is not applicable to local access.
 if (!getGroupID(id).equals(desc.getGroupID())) {
 throw new ActivationException(
 "ActivationDesc contains wrong group");
 }
 public ActivationGroupDesc setActivationGroupDesc(ActivationGroupID id,
 ActivationGroupDesc desc)
 throws ActivationException, UnknownGroupException, RemoteException
 {
 checkShutdown();
-RegistryImpl.checkAccess(
+// RegistryImpl.checkAccess() is done in the SameHostOnlyServerRef
-"ActivationSystem.setActivationGroupDesc");
+// during unmarshallCustomData and is not applicable to local access.
 checkArgs(desc, null);
 return getGroupEntry(id).setActivationGroupDesc(id, desc, true);
 }
 public ActivationDesc getActivationDesc(ActivationID id)
 throws ActivationException, UnknownObjectException, RemoteException
 {
 checkShutdown();
-RegistryImpl.checkAccess("ActivationSystem.getActivationDesc");
+// RegistryImpl.checkAccess() is done in the SameHostOnlyServerRef
+// during unmarshallCustomData and is not applicable to local access.
 return getGroupEntry(id).getActivationDesc(id);
 }
 public ActivationGroupDesc getActivationGroupDesc(ActivationGroupID id)
 throws ActivationException, UnknownGroupException, RemoteException
 {
 checkShutdown();
-RegistryImpl.checkAccess
+// RegistryImpl.checkAccess() is done in the SameHostOnlyServerRef
-("ActivationSystem.getActivationGroupDesc");
+// during unmarshallCustomData and is not applicable to local access.
 return getGroupEntry(id).desc;
 }
 /**
 * Shutdown the activation system. Destroys all groups spawned by
 * the activation daemon and exits the activation daemon.
 */
 public void shutdown() throws AccessException {
-RegistryImpl.checkAccess("ActivationSystem.shutdown");
+// RegistryImpl.checkAccess() is done in the SameHostOnlyServerRef
+// during unmarshallCustomData and is not applicable to local access.
 Object lock = startupLock;
 if (lock != null) {
 synchronized (lock) {
 // nothing

changeset 45989	e4f526fd8e09
parent 41751	365b2e7c0d2c