More removal of old defines

[mono.git] / mcs / class / corlib / System.Security / HostSecurityManager.cs

diff --git a/mcs/class/corlib/System.Security/HostSecurityManager.cs b/mcs/class/corlib/System.Security/HostSecurityManager.cs
index 65f781afbbce9da7803b3e5752c3b09035e7b891..8b6c9c8c50d372eb39364131457906fd13cd0145 100644 (file)
--- a/mcs/class/corlib/System.Security/HostSecurityManager.cs
+++ b/mcs/class/corlib/System.Security/HostSecurityManager.cs
@@ -26,14 +26,15 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
 using System.Reflection;
+using System.Runtime.Hosting;
+using System.Runtime.InteropServices;
 using System.Security.Policy;
 
 namespace System.Security {
 
        [Serializable]
+       [ComVisible (true)]
        public class HostSecurityManager {
 
                public HostSecurityManager ()
@@ -49,14 +50,34 @@ namespace System.Security {
                        get { return HostSecurityManagerOptions.AllFlags; }
                }
 
-               [MonoTODO ("incomplete - docs talks about a System.Runtime.Hosting in corlib but it's not there (yet?)")]
                public virtual ApplicationTrust DetermineApplicationTrust (Evidence applicationEvidence, Evidence activatorEvidence, TrustManagerContext context)
                {
                        if (applicationEvidence == null)
                                throw new ArgumentNullException ("applicationEvidence");
-                       // TODO extract the ActivationContext from the ActivationArguments (inside the applicationEvidence)
-                       ActivationContext ac = null;
-                       ApplicationSecurityManager.DetermineApplicationTrust (ac, context);
+
+                       ActivationArguments aa = null;
+                       foreach (object o in applicationEvidence) {
+                               aa = (o as ActivationArguments);
+                               if (aa != null)
+                                       break;
+                       }
+
+                       if (aa == null) {
+                               string msg = Locale.GetText ("No {0} found in {1}.");
+                               throw new ArgumentException (string.Format (msg, "ActivationArguments", "Evidence"), "applicationEvidence");
+                       }
+                       if (aa.ActivationContext == null) {
+                               string msg = Locale.GetText ("No {0} found in {1}.");
+                               throw new ArgumentException (string.Format (msg, "ActivationContext", "ActivationArguments"), "applicationEvidence");
+                       }
+
+                       // FIXME: this part is still untested (requires manifest support)
+                       if (ApplicationSecurityManager.DetermineApplicationTrust (aa.ActivationContext, context)) {
+                               if (aa.ApplicationIdentity == null)
+                                       return new ApplicationTrust ();
+                               else
+                                       return new ApplicationTrust (aa.ApplicationIdentity);
+                       }
                        return null;
                }
 
@@ -80,5 +101,3 @@ namespace System.Security {
                }
        }
 }
-
-#endif