Merge branch 'v2.5' into monoorigin/mono

Conflicts:
	src/DotNetOpenId/Properties/AssemblyInfo.cs
	src/DotNetOpenId/RelyingParty/AuthenticationResponse.cs

1 files changed, 29 insertions, 0 deletions

diff --git a/src/DotNetOpenId/Yadis/XrdElement.cs b/src/DotNetOpenId/Yadis/XrdElement.cs
index 285677b..5c0ba44 100644
--- a/src/DotNetOpenId/Yadis/XrdElement.cs
+++ b/src/DotNetOpenId/Yadis/XrdElement.cs
@@ -22,6 +22,28 @@ namespace DotNetOpenId.Yadis {
 			}

 		}

 

+

+		int XriResolutionStatusCode {

+			get {

+				var n = Node.SelectSingleNode("xrd:Status", XmlNamespaceResolver);

+				string codeString;

+				if (n == null || string.IsNullOrEmpty(codeString = n.GetAttribute("code", ""))) {

+					throw new OpenIdException(Strings.XriResolutionStatusMissing);

+				}

+				int code;

+				if (!int.TryParse(codeString, out code) || code < 100 || code > 399) {

+					throw new OpenIdException(Strings.XriResolutionStatusMissing);

+				}

+				return code;

+			}

+		}

+

+		public bool IsXriResolutionSuccessful {

+			get {

+				return XriResolutionStatusCode == 100;

+			}

+		}

+

 		public string CanonicalID {

 			get {

 				var n = Node.SelectSingleNode("xrd:CanonicalID", XmlNamespaceResolver);

@@ -29,6 +51,13 @@ namespace DotNetOpenId.Yadis {
 			}

 		}

 

+		public bool IsCanonicalIdVerified {

+			get {

+				var n = Node.SelectSingleNode("xrd:Status", XmlNamespaceResolver);

+				return n != null && string.Equals(n.GetAttribute("cid", ""), "verified", StringComparison.Ordinal);

+			}

+		}

+

 		IEnumerable<ServiceElement> searchForServiceTypeUris(Util.Func<Protocol, string> p) {

 			var xpath = new StringBuilder();

 			xpath.Append("xrd:Service[");