From e438377297a7b49cd037b62e6ebbe78f9915586e Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Mon, 25 Jul 2005 17:24:25 +0000
Subject: [PATCH] Introspect on our classes in a privileged block so that
 unsigned code can call ObjectInputStream.defaultReadObject().

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3662 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 src/java/com/threerings/io/Streamer.java | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/java/com/threerings/io/Streamer.java b/src/java/com/threerings/io/Streamer.java
index c1403bc40..1f6a7690d 100644
--- a/src/java/com/threerings/io/Streamer.java
+++ b/src/java/com/threerings/io/Streamer.java
@@ -21,13 +21,15 @@
 
 package com.threerings.io;
 
-import java.lang.NoSuchMethodException;
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -76,7 +78,7 @@ public class Streamer
      * does not implement {@link Streamable} and is not one of the basic
      * object types (@see {@link ObjectOutputStream}).
      */
-    public synchronized static Streamer getStreamer (Class target)
+    public synchronized static Streamer getStreamer (final Class target)
         throws IOException
     {
         // if we have not yet initialized ourselves, do so now
@@ -96,8 +98,22 @@ public class Streamer
             if (ObjectInputStream.STREAM_DEBUG) {
                 Log.info("Creating a streamer for '" + target.getName() + "'.");
             }
-            stream = new Streamer(target);
-            _streamers.put(target, stream);
+
+            // create our streamer in a privileged block so that it can
+            // introspect on the to be streamed class
+            Object res = AccessController.doPrivileged(new PrivilegedAction() {
+                public Object run () {
+                    try {
+                        return new Streamer(target);
+                    } catch (IOException ioe) {
+                        return ioe;
+                    }
+                }
+            });
+            if (res instanceof IOException) {
+                throw (IOException)res;
+            }
+            _streamers.put(target, stream = (Streamer)res);
         }
         return stream;
     }