2005-08-30 Sebastien Pouliot <sebastien@ximian.com>

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

diff --git a/mcs/class/corlib/System.Security.Policy/PublisherMembershipCondition.cs b/mcs/class/corlib/System.Security.Policy/PublisherMembershipCondition.cs
index 72a275eab8cd1693108fc223f33978aa853e29b7..68367d6d53d591481b69bf0014e50483f2112307 100644 (file)
--- a/mcs/class/corlib/System.Security.Policy/PublisherMembershipCondition.cs
+++ b/mcs/class/corlib/System.Security.Policy/PublisherMembershipCondition.cs
@@ -5,7 +5,7 @@
 //     Sebastien Pouliot  <sebastien@ximian.com>
 //
 // (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -27,19 +27,22 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using System.Collections;
 using System.Security.Cryptography.X509Certificates;
-using System.Text;
+using System.Runtime.InteropServices;
 
 using Mono.Security.Cryptography;
 
 namespace System.Security.Policy {
 
        [Serializable]
-       public sealed class PublisherMembershipCondition
-                : IConstantMembershipCondition, IMembershipCondition, ISecurityEncodable, ISecurityPolicyEncodable {
-       
+#if NET_2_0
+       [ComVisible (true)]
+#endif
+       public sealed class PublisherMembershipCondition : IConstantMembershipCondition, IMembershipCondition {
+
+               private readonly int version = 1;
+
                private X509Certificate x509;
 
                // so System.Activator.CreateInstance can create an instance...
@@ -47,18 +50,21 @@ namespace System.Security.Policy {
                {
                }
 
-               // LAMESPEC: Undocumented ArgumentNullException exception
                public PublisherMembershipCondition (X509Certificate certificate) 
                {
                        if (certificate == null)
                                throw new ArgumentNullException ("certificate");
                        // needed to match MS implementation
-                       if (certificate.GetRawCertData () == null)
+                       if (certificate.GetHashCode () == 0) {
+#if NET_2_0
+                               throw new ArgumentException ("certificate");
+#else
                                throw new NullReferenceException ("certificate");
+#endif
+                       }
                        x509 = certificate;
                }
        
-               // LAMESPEC: Undocumented ArgumentNullException exception
                public X509Certificate Certificate {
                        get { return x509; }
                        set { 
@@ -70,6 +76,9 @@ namespace System.Security.Policy {
        
                public bool Check (Evidence evidence) 
                {
+                       if (evidence == null)
+                               return false;
+
                        IEnumerator e = evidence.GetHostEnumerator ();
                        while (e.MoveNext ()) {
                                if (e.Current is Publisher) {
@@ -87,9 +96,10 @@ namespace System.Security.Policy {
        
                public override bool Equals (object o) 
                {
-                       if (!(o is PublisherMembershipCondition))
-                               throw new ArgumentException ("not a PublisherMembershipCondition");
-                       return x509.Equals ((o as PublisherMembershipCondition).Certificate);
+                       PublisherMembershipCondition pmc = (o as PublisherMembershipCondition);
+                       if (pmc == null)
+                               return false;
+                       return x509.Equals (pmc.Certificate);
                }
        
                public void FromXml (SecurityElement e) 
@@ -99,16 +109,13 @@ namespace System.Security.Policy {
        
                public void FromXml (SecurityElement e, PolicyLevel level) 
                {
-                       if (e == null)
-                               throw new ArgumentNullException ("e");
-                       if (e.Tag != "IMembershipCondition")
-                               throw new ArgumentException ("Not IMembershipCondition", "e");
-                       // PolicyLevel isn't used as there's no need to resolve NamedPermissionSet references
+                       MembershipConditionHelper.CheckSecurityElement (e, "e", version, version);
                        string cert = e.Attribute ("X509Certificate");
                        if (cert != null) {
                                byte[] rawcert = CryptoConvert.FromHex (cert);
                                x509 = new X509Certificate (rawcert);
                        }
+                       // PolicyLevel isn't used as there's no need to resolve NamedPermissionSet references
                }
        
                public override int GetHashCode () 
@@ -121,18 +128,6 @@ namespace System.Security.Policy {
                        return "Publisher - " + x509.GetPublicKeyString ();
                }
 
-               // snippet moved from FileIOPermission (nickd) to be reused in all derived classes
-               internal SecurityElement Element (object o, int version) 
-               {
-                       SecurityElement se = new SecurityElement ("IMembershipCondition");
-                       Type type = this.GetType ();
-                       StringBuilder asmName = new StringBuilder (type.Assembly.ToString ());
-                       asmName.Replace ('\"', '\'');
-                       se.AddAttribute ("class", type.FullName + ", " + asmName);
-                       se.AddAttribute ("version", version.ToString ());
-                       return se;
-               }
-       
                public SecurityElement ToXml () 
                {
                        return ToXml (null);
@@ -141,7 +136,7 @@ namespace System.Security.Policy {
                public SecurityElement ToXml (PolicyLevel level) 
                {
                        // PolicyLevel isn't used as there's no need to resolve NamedPermissionSet references
-                       SecurityElement se = Element (this, 1);
+                       SecurityElement se = MembershipConditionHelper.Element (typeof (PublisherMembershipCondition), version);
                        se.AddAttribute ("X509Certificate", x509.GetRawCertDataString ());
                        return se;
                }