[prev in list] [next in list] [prev in thread] [next in thread]
List: mono-patches
Subject: [Mono-patches] r67187 - trunk/mcs/class/System/System.Net.Mail
From: "Sebastien Pouliot (sebastien () ximian ! com)"
Date: 2006-10-31 20:34:35
Message-ID: 20061031203435.9AB049472C () mono-cvs ! ximian ! com
[Download RAW message or body]
Author: spouliot
Date: 2006-10-31 15:34:35 -0500 (Tue, 31 Oct 2006)
New Revision: 67187
Added:
trunk/mcs/class/System/System.Net.Mail/SmtpPermission.cs
trunk/mcs/class/System/System.Net.Mail/SmtpPermissionAttribute.cs
Modified:
trunk/mcs/class/System/System.Net.Mail/ChangeLog
trunk/mcs/class/System/System.Net.Mail/SmtpException.cs
Log:
2006-10-31 Sebastien Pouliot <sebastien@ximian.com>
* SmtpException.cs: Fix visibility on .ctor(SerializationInfo,
StreamingContext).
* SmtpPermissionAttribute.cs: New (2.0). Security attribute for SMTP.
* SmtpPermission.cs: New (2.0). Security permission for SMTP.
Modified: trunk/mcs/class/System/System.Net.Mail/ChangeLog
===================================================================
--- trunk/mcs/class/System/System.Net.Mail/ChangeLog 2006-10-31 20:13:34 UTC (rev 67186)
+++ trunk/mcs/class/System/System.Net.Mail/ChangeLog 2006-10-31 20:34:35 UTC (rev 67187)
@@ -1,3 +1,10 @@
+2006-10-31 Sebastien Pouliot <sebastien@ximian.com>
+
+ * SmtpException.cs: Fix visibility on .ctor(SerializationInfo,
+ StreamingContext).
+ * SmtpPermissionAttribute.cs: New (2.0). Security attribute for SMTP.
+ * SmtpPermission.cs: New (2.0). Security permission for SMTP.
+
2006-09-28 Andrew Skiba <andrews@mainsoft.com>
* SmtpClient.cs: TARGET_JVM
Modified: trunk/mcs/class/System/System.Net.Mail/SmtpException.cs
===================================================================
--- trunk/mcs/class/System/System.Net.Mail/SmtpException.cs 2006-10-31 20:13:34 UTC (rev 67186)
+++ trunk/mcs/class/System/System.Net.Mail/SmtpException.cs 2006-10-31 20:34:35 UTC (rev 67187)
@@ -58,7 +58,7 @@
{
}
- public SmtpException (SerializationInfo info, StreamingContext context)
+ protected SmtpException (SerializationInfo info, StreamingContext context)
: base (info, context)
{
}
Added: trunk/mcs/class/System/System.Net.Mail/SmtpPermission.cs
===================================================================
--- trunk/mcs/class/System/System.Net.Mail/SmtpPermission.cs 2006-10-31 20:13:34 UTC (rev 67186)
+++ trunk/mcs/class/System/System.Net.Mail/SmtpPermission.cs 2006-10-31 20:34:35 UTC (rev 67187)
@@ -0,0 +1,189 @@
+//
+// System.Net.Mail.SmtpPermission
+//
+// Authors:
+// Sebastien Pouliot <sebastien@ximian.com>
+//
+// Copyright (C) 2006 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
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+
+using System.Security;
+using System.Security.Permissions;
+
+namespace System.Net.Mail {
+
+ [Serializable]
+ public sealed class SmtpPermission : CodeAccessPermission, IUnrestrictedPermission {
+
+ private const int version = 1;
+
+ private bool unrestricted;
+ private SmtpAccess access;
+
+
+ public SmtpPermission (bool unrestricted)
+ : base ()
+ {
+ this.unrestricted = unrestricted;
+ access = unrestricted ? SmtpAccess.ConnectToUnrestrictedPort : SmtpAccess.None;
+ }
+
+ public SmtpPermission (PermissionState state)
+ : base ()
+ {
+ unrestricted = (state == PermissionState.Unrestricted);
+ access = unrestricted ? SmtpAccess.ConnectToUnrestrictedPort : SmtpAccess.None;
+ }
+
+ public SmtpPermission (SmtpAccess access)
+ : base ()
+ {
+ // this ctor can accept invalid enum values
+ this.access = access;
+ }
+
+
+ public SmtpAccess Access {
+ get { return access; }
+ }
+
+
+ public void AddPermission (SmtpAccess access)
+ {
+ if (!unrestricted && (access > this.access)) {
+ this.access = access;
+ }
+ }
+
+ public override IPermission Copy ()
+ {
+ if (unrestricted) {
+ return new SmtpPermission (true);
+ } else {
+ return new SmtpPermission (access);
+ }
+ }
+
+ public override IPermission Intersect (IPermission target)
+ {
+ SmtpPermission sp = Cast (target);
+ if (sp == null)
+ return null;
+
+ if (unrestricted && sp.unrestricted)
+ return new SmtpPermission (true);
+ else if (access > sp.access)
+ return new SmtpPermission (sp.access);
+ else
+ return new SmtpPermission (access);
+ }
+
+ public override bool IsSubsetOf (IPermission target)
+ {
+ SmtpPermission sp = Cast (target);
+ if (sp == null)
+ return IsEmpty ();
+
+ if (unrestricted) {
+ return sp.unrestricted;
+ } else {
+ return (access <= sp.access);
+ }
+ }
+
+ public bool IsUnrestricted ()
+ {
+ return unrestricted;
+ }
+
+ public override SecurityElement ToXml ()
+ {
+ SecurityElement se = PermissionHelper.Element (typeof (SmtpPermission), version);
+ if (unrestricted) {
+ se.AddAttribute ("Unrestricted", "true");
+ } else {
+ switch (access) {
+ case SmtpAccess.ConnectToUnrestrictedPort:
+ se.AddAttribute ("Access", "ConnectToUnrestrictedPort");
+ break;
+ case SmtpAccess.Connect:
+ se.AddAttribute ("Access", "Connect");
+ break;
+ // note: SmtpAccess.None and invalid values aren't serialized to XML
+ }
+ }
+ return se;
+ }
+
+ public override void FromXml (SecurityElement securityElement)
+ {
+ PermissionHelper.CheckSecurityElement (securityElement, "securityElement", version, version);
+
+ // LAMESPEC: it says to throw an ArgumentNullException in this case
+ if (securityElement.Tag != "IPermission")
+ throw new ArgumentException ("securityElement");
+
+ if (PermissionHelper.IsUnrestricted (securityElement))
+ access = SmtpAccess.Connect;
+ else
+ access = SmtpAccess.None;
+ }
+
+ public override IPermission Union (IPermission target)
+ {
+ SmtpPermission sp = Cast (target);
+ if (sp == null)
+ return Copy ();
+
+ if (unrestricted || sp.unrestricted)
+ return new SmtpPermission (true);
+ else if (access > sp.access)
+ return new SmtpPermission (access);
+ else
+ return new SmtpPermission (sp.access);
+ }
+
+ // Internal helpers methods
+
+ private bool IsEmpty ()
+ {
+ return (!unrestricted && (access == SmtpAccess.None));
+ }
+
+ private SmtpPermission Cast (IPermission target)
+ {
+ if (target == null)
+ return null;
+
+ SmtpPermission sp = (target as SmtpPermission);
+ if (sp == null) {
+ PermissionHelper.ThrowInvalidPermission (target, typeof (SmtpPermission));
+ }
+
+ return sp;
+ }
+ }
+}
+
+#endif
Added: trunk/mcs/class/System/System.Net.Mail/SmtpPermissionAttribute.cs
===================================================================
--- trunk/mcs/class/System/System.Net.Mail/SmtpPermissionAttribute.cs 2006-10-31 20:13:34 UTC (rev 67186)
+++ trunk/mcs/class/System/System.Net.Mail/SmtpPermissionAttribute.cs 2006-10-31 20:34:35 UTC (rev 67187)
@@ -0,0 +1,84 @@
+//
+// System.Net.Mail.SmtpPermissionAttribute
+//
+// Authors:
+// Sebastien Pouliot <sebastien@ximian.com>
+//
+// Copyright (C) 2006 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
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+
+using System.Security;
+using System.Security.Permissions;
+
+namespace System.Net.Mail {
+
+ [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct
+ | AttributeTargets.Constructor | AttributeTargets.Method, AllowMultiple = true, Inherited = false)]
+ [Serializable]
+ public sealed class SmtpPermissionAttribute : CodeAccessSecurityAttribute {
+
+ private string access;
+
+
+ public SmtpPermissionAttribute (SecurityAction action)
+ : base (action)
+ {
+ }
+
+
+ public string Access {
+ get { return access; }
+ set { access = value; }
+ }
+
+
+ private SmtpAccess GetSmtpAccess ()
+ {
+ if (access == null)
+ return SmtpAccess.None;
+
+ switch (access.ToLowerInvariant ()) {
+ case "connecttounrestrictedport":
+ return SmtpAccess.ConnectToUnrestrictedPort;
+ case "connect":
+ return SmtpAccess.Connect;
+ case "none":
+ return SmtpAccess.None;
+ default:
+ string s = Locale.GetText ("Invalid Access='{0}' value.", access);
+ throw new ArgumentException ("Access", s);
+ }
+ }
+
+ public override IPermission CreatePermission ()
+ {
+ if (Unrestricted)
+ return new SmtpPermission (true);
+
+ return new SmtpPermission (GetSmtpAccess ());
+ }
+ }
+}
+
+#endif
_______________________________________________
Mono-patches maillist - Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic