Author: atsushi
Date: 2007-04-02 10:46:40 -0400 (Mon, 02 Apr 2007)
New Revision: 75282
Modified:
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security.Tokens/ChangeLog
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SslSecurityTokenProvider.cs
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SslnegoCookieResolver.cs
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security.Tokens/TlsClientSession.cs
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security.Tokens/TlsServerSession.cs
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security/ChangeLog
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security/ServiceCredentialsSecurityTokenManager.cs
trunk/olive/class/System.ServiceModel/System.ServiceModel/ChangeLog
trunk/olive/class/System.ServiceModel/System.ServiceModel/ClientCredentialsSecurityTokenManager.cs
trunk/olive/class/System.ServiceModel/Test/System.ServiceModel.Security.Tokens/ChangeLog
trunk/olive/class/System.ServiceModel/Test/System.ServiceModel.Security.Tokens/SslSecurityTokenParametersTest.cs
trunk/olive/class/System.ServiceModel/Test/System.ServiceModel/ChangeLog
trunk/olive/class/System.ServiceModel/Test/System.ServiceModel/ClientCredentialsSecurityTokenManagerTest.cs
Log:
2007-04-02 Atsushi Enomoto <[EMAIL PROTECTED]>
* TlsClientSession.cs, TlsServerSession.cs,
SslSecurityTokenProvider.cs : support mutual sslnego.
* SslnegoCookieResolver.cs : .net seems to include X509Certificate
information in the cookie.
* ServiceCredentialsSecurityTokenManager.cs : support mutual sslnego.
* ClientCredentialsSecurityTokenManager.cs : support mutual sslnego.
* SslSecurityTokenParametersTest.cs : test both anonymous and mutual
sslnego provider creation (error) for recipient.
* ClientCredentialsSecurityTokenManagerTest.cs :
added mutual ssonego provider creation without client certificate.
Modified: trunk/olive/class/System.ServiceModel/System.ServiceModel/ChangeLog
===================================================================
--- trunk/olive/class/System.ServiceModel/System.ServiceModel/ChangeLog
2007-04-02 14:38:50 UTC (rev 75281)
+++ trunk/olive/class/System.ServiceModel/System.ServiceModel/ChangeLog
2007-04-02 14:46:40 UTC (rev 75282)
@@ -1,5 +1,9 @@
2007-04-02 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * ClientCredentialsSecurityTokenManager.cs : support mutual sslnego.
+
+2007-04-02 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* ServiceKnownTypeAttribute.cs : added.
2007-03-30 Atsushi Enomoto <[EMAIL PROTECTED]>
Modified:
trunk/olive/class/System.ServiceModel/System.ServiceModel/ClientCredentialsSecurityTokenManager.cs
===================================================================
---
trunk/olive/class/System.ServiceModel/System.ServiceModel/ClientCredentialsSecurityTokenManager.cs
2007-04-02 14:38:50 UTC (rev 75281)
+++
trunk/olive/class/System.ServiceModel/System.ServiceModel/ClientCredentialsSecurityTokenManager.cs
2007-04-02 14:46:40 UTC (rev 75282)
@@ -107,15 +107,19 @@
if (IsIssuedSecurityTokenRequirement (requirement))
return CreateIssuedTokenProvider (requirement);
+ bool isInitiator;
+
// huh, they are not constants but properties.
if (requirement.TokenType ==
SecurityTokenTypes.X509Certificate)
return CreateX509SecurityTokenProvider
(requirement);
else if (requirement.TokenType ==
ServiceModelSecurityTokenTypes.SecureConversation)
return CreateSecureConversationProvider
(requirement);
else if (requirement.TokenType ==
ServiceModelSecurityTokenTypes.AnonymousSslnego) {
- return CreateAnonymousSslnegoProvider
(requirement);
+ if (requirement.TryGetProperty<bool>
(ReqType.IsInitiatorProperty, out isInitiator) && isInitiator)
+ return CreateSslnegoProvider
(requirement);
} else if (requirement.TokenType ==
ServiceModelSecurityTokenTypes.MutualSslnego) {
- // FIXME: implement
+ if (requirement.TryGetProperty<bool>
(ReqType.IsInitiatorProperty, out isInitiator) && isInitiator)
+ return CreateSslnegoProvider
(requirement);
} else if (requirement.TokenType ==
ServiceModelSecurityTokenTypes.SecurityContext) {
// FIXME: implement
} else if (requirement.TokenType ==
ServiceModelSecurityTokenTypes.Spnego) {
@@ -274,9 +278,9 @@
return p;
}
- SecurityTokenProvider CreateAnonymousSslnegoProvider
(SecurityTokenRequirement r)
+ SecurityTokenProvider CreateSslnegoProvider
(SecurityTokenRequirement r)
{
- SslSecurityTokenProvider p = new
SslSecurityTokenProvider ();
+ SslSecurityTokenProvider p = new
SslSecurityTokenProvider (this, r.TokenType ==
ServiceModelSecurityTokenTypes.MutualSslnego);
InitializeProviderCommunicationObject (p.Communication,
r);
return p;
Modified:
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security/ChangeLog
===================================================================
---
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security/ChangeLog
2007-04-02 14:38:50 UTC (rev 75281)
+++
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security/ChangeLog
2007-04-02 14:46:40 UTC (rev 75282)
@@ -1,5 +1,9 @@
2007-04-02 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * ServiceCredentialsSecurityTokenManager.cs : support mutual sslnego.
+
+2007-04-02 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* WSSecurityTokenSerializer.cs : set cookie property for such tokens
that was created from cookie binary.
Modified:
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security/ServiceCredentialsSecurityTokenManager.cs
===================================================================
---
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security/ServiceCredentialsSecurityTokenManager.cs
2007-04-02 14:38:50 UTC (rev 75281)
+++
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security/ServiceCredentialsSecurityTokenManager.cs
2007-04-02 14:46:40 UTC (rev 75282)
@@ -83,6 +83,8 @@
}
if (requirement.TokenType ==
ServiceModelSecurityTokenTypes.AnonymousSslnego)
return CreateSslTokenAuthenticator
(requirement);
+ if (requirement.TokenType ==
ServiceModelSecurityTokenTypes.MutualSslnego)
+ return CreateSslTokenAuthenticator
(requirement);
if (requirement.TokenType ==
ServiceModelSecurityTokenTypes.Spnego)
return CreateSpnegoTokenAuthenticator
(requirement);
else
Modified:
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security.Tokens/ChangeLog
===================================================================
---
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security.Tokens/ChangeLog
2007-04-02 14:38:50 UTC (rev 75281)
+++
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security.Tokens/ChangeLog
2007-04-02 14:46:40 UTC (rev 75282)
@@ -1,5 +1,12 @@
2007-04-02 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * TlsClientSession.cs, TlsServerSession.cs,
+ SslSecurityTokenProvider.cs : support mutual sslnego.
+ * SslnegoCookieResolver.cs : .net seems to include X509Certificate
+ information in the cookie.
+
+2007-04-02 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* SecurityContextSecurityToken.cs : Cookie needs a setter.
* SslnegoCookieResolver.cs : set Cookie so that it can be serialized.
* SslSecurityTokenProvider.cs, SslSecurityTokenAuthenticator.cs :
Modified:
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SslSecurityTokenProvider.cs
===================================================================
---
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SslSecurityTokenProvider.cs
2007-04-02 14:38:50 UTC (rev 75281)
+++
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SslSecurityTokenProvider.cs
2007-04-02 14:46:40 UTC (rev 75282)
@@ -48,16 +48,22 @@
class SslSecurityTokenProvider : CommunicationSecurityTokenProvider
{
SslCommunicationObject comm;
+ ClientCredentialsSecurityTokenManager manager;
- public SslSecurityTokenProvider ()
+ public SslSecurityTokenProvider
(ClientCredentialsSecurityTokenManager manager, bool mutual)
{
- comm = new SslCommunicationObject ();
+ this.manager = manager;
+ comm = new SslCommunicationObject (this, mutual);
}
public override ProviderCommunicationObject Communication {
get { return comm; }
}
+ public ClientCredentialsSecurityTokenManager Manager {
+ get { return manager; }
+ }
+
public override SecurityToken GetOnlineToken (TimeSpan timeout)
{
return comm.GetToken (timeout);
@@ -66,10 +72,19 @@
class SslCommunicationObject : ProviderCommunicationObject
{
+ SslSecurityTokenProvider owner;
WSTrustSecurityTokenServiceProxy proxy;
+ X509Certificate2 client_certificate;
+
- public SslCommunicationObject ()
+ public SslCommunicationObject (SslSecurityTokenProvider owner,
bool mutual)
{
+ if (mutual) {
+ client_certificate =
owner.Manager.ClientCredentials.ClientCertificate.Certificate;
+ if (client_certificate == null)
+ throw new InvalidOperationException
("ClientCertificate is required for mutual SSL negotiation.");
+ }
+ this.owner = owner;
}
class TlsnegoClientSessionContext
@@ -98,7 +113,7 @@
{
TlsnegoClientSessionContext tlsctx =
new TlsnegoClientSessionContext ();
- TlsClientSession tls = new TlsClientSession
(IssuerAddress.Uri.ToString ());
+ TlsClientSession tls = new TlsClientSession
(IssuerAddress.Uri.ToString (), client_certificate);
WstRequestSecurityToken rst =
new WstRequestSecurityToken ();
string contextId = rst.Context;
Modified:
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SslnegoCookieResolver.cs
===================================================================
---
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SslnegoCookieResolver.cs
2007-04-02 14:38:50 UTC (rev 75281)
+++
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SslnegoCookieResolver.cs
2007-04-02 14:46:40 UTC (rev 75282)
@@ -27,6 +27,7 @@
//
using System;
using System.IO;
+using System.Security.Cryptography.X509Certificates;
using System.Xml;
/*
@@ -94,14 +95,17 @@
keyEffective = DateTime.MinValue,
keyExpired = DateTime.MaxValue;
byte [] key = null;
+ X509Certificate2 cert = null;
+ X500DistinguishedName issuer = null;
XmlDictionary dic = new XmlDictionary ();
- for (int i = 0; i < 12; i++)
+ for (int i = 0; i < 30; i++)
dic.Add ("n" + i);
// FIXME: create proper quotas
XmlDictionaryReaderQuotas quotas =
new XmlDictionaryReaderQuotas ();
XmlDictionaryReader cr =
XmlDictionaryReader.CreateBinaryReader (bytes, 0, bytes.Length, dic, quotas);
+
cr.MoveToContent (); // -> n1
cr.ReadStartElement ("n0", String.Empty);
do {
@@ -139,6 +143,25 @@
case "n11":
keyExpired = new DateTime
(cr.ReadElementContentAsLong ());
break;
+ case "n13":
+ // <n18>X509Certificate</n18>
+ cr.Read ();
+ cr.MoveToContent ();
+ cert = new X509Certificate2
(cr.ReadElementContentAsBase64 ());
+ cr.ReadEndElement ();
+ break;
+ case "n15":
+ // <n16><n24 n25="IssuerName" /></n16>
+ cr.Read ();
+ cr.ReadStartElement ("n16",
String.Empty);
+ issuer = new X500DistinguishedName
(cr.GetAttribute ("n25"));
+ bool empty = cr.IsEmptyElement;
+ cr.ReadStartElement ("n24",
String.Empty);
+ if (!empty)
+ cr.ReadEndElement (); // n24
+ cr.ReadEndElement (); // n16
+ cr.ReadEndElement (); // n15
+ break;
default:
throw new Exception ("INTERNAL ERROR:
there was an unhandled element: " + cr.Name);
}
Modified:
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security.Tokens/TlsClientSession.cs
===================================================================
---
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security.Tokens/TlsClientSession.cs
2007-04-02 14:38:50 UTC (rev 75281)
+++
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security.Tokens/TlsClientSession.cs
2007-04-02 14:46:40 UTC (rev 75282)
@@ -29,6 +29,7 @@
using System.Collections.Generic;
using System.IO;
using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
using System.Text;
using Mono.Security.Protocol.Tls;
using Mono.Security.Protocol.Tls.Handshake;
@@ -147,11 +148,24 @@
{
SslClientStream ssl;
MemoryStream stream;
+ bool mutual;
- public TlsClientSession (string host)
+ public TlsClientSession (string host, X509Certificate2
clientCert)
{
stream = new MemoryStream ();
- ssl = new SslClientStream (stream, host, true,
SecurityProtocolType.Tls);
+ if (clientCert == null)
+ ssl = new SslClientStream (stream, host, true,
SecurityProtocolType.Tls);
+ else {
+ ssl = new SslClientStream (stream, host, true,
SecurityProtocolType.Tls, new X509CertificateCollection (new X509Certificate []
{clientCert}));
+ mutual = true;
+ ssl.ClientCertSelection += delegate (
+ X509CertificateCollection
clientCertificates,
+ X509Certificate serverCertificate,
+ string targetHost,
+ X509CertificateCollection
serverRequestedCertificates) {
+ return clientCertificates [0];
+ };
+ }
}
protected override Context Context {
@@ -178,14 +192,20 @@
stream.Write (raw, 0, raw.Length);
stream.Seek (0, SeekOrigin.Begin);
- Protocol.ReceiveRecord (stream);
- Protocol.ReceiveRecord (stream);
- Protocol.ReceiveRecord (stream);
+ Protocol.ReceiveRecord (stream); // ServerHello
+ Protocol.ReceiveRecord (stream); // ServerCertificate
+ if (mutual)
+ Protocol.ReceiveRecord (stream); //
CertificateRequest
+ Protocol.ReceiveRecord (stream); // ServerHelloDone
+ if (stream.Position != stream.Length)
+ throw new SecurityNegotiationException
(String.Format ("Unexpected SSL negotiation binary: {0} bytes of excess in {1}
bytes of the octets", stream.Length - stream.Position, stream.Length));
}
public byte [] ProcessClientKeyExchange ()
{
stream.SetLength (0);
+ if (mutual)
+ Protocol.SendRecord (HandshakeType.Certificate);
Protocol.SendRecord (HandshakeType.ClientKeyExchange);
Context.Negotiating.Cipher.ComputeKeys ();
Context.Negotiating.Cipher.InitializeCipher ();
Modified:
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security.Tokens/TlsServerSession.cs
===================================================================
---
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security.Tokens/TlsServerSession.cs
2007-04-02 14:38:50 UTC (rev 75281)
+++
trunk/olive/class/System.ServiceModel/System.ServiceModel.Security.Tokens/TlsServerSession.cs
2007-04-02 14:46:40 UTC (rev 75282)
@@ -38,16 +38,22 @@
{
SslServerStream ssl;
MemoryStream stream;
+ bool mutual;
- public TlsServerSession (X509Certificate2 cert, bool
clientCertificateRequired)
+ public TlsServerSession (X509Certificate2 cert, bool mutual)
{
+ this.mutual = mutual;
stream = new MemoryStream ();
- ssl = new SslServerStream (stream, cert,
clientCertificateRequired, true, SecurityProtocolType.Tls);
+ ssl = new SslServerStream (stream, cert, mutual, true,
SecurityProtocolType.Tls);
ssl.PrivateKeyCertSelectionDelegate = delegate
(X509Certificate c, string host) {
if (c.GetCertHashString () ==
cert.GetCertHashString ())
return cert.PrivateKey;
return null;
};
+ ssl.ClientCertValidationDelegate = delegate
(X509Certificate certificate, int[] certificateErrors) {
+ // FIXME: use X509CertificateValidator
+ return true;
+ };
}
protected override Context Context {
@@ -89,10 +95,17 @@
WriteHandshake (ms);
- WriteOperations (ms,
- new TlsServerHello (ssl.context),
- new TlsServerCertificate (ssl.context),
- new TlsServerHelloDone (ssl.context));
+ if (mutual)
+ WriteOperations (ms,
+ new TlsServerHello (ssl.context),
+ new TlsServerCertificate (ssl.context),
+ new TlsServerCertificateRequest
(ssl.context),
+ new TlsServerHelloDone (ssl.context));
+ else
+ WriteOperations (ms,
+ new TlsServerHello (ssl.context),
+ new TlsServerCertificate (ssl.context),
+ new TlsServerHelloDone (ssl.context));
return ms.ToArray ();
#endif
@@ -104,9 +117,14 @@
stream.Write (raw, 0, raw.Length);
stream.Seek (0, SeekOrigin.Begin);
+ if (mutual)
+ Protocol.ReceiveRecord (stream); // Certificate
Protocol.ReceiveRecord (stream); // ClientKeyExchange
Protocol.ReceiveRecord (stream); // ChangeCipherSpec
Protocol.ReceiveRecord (stream); // ClientFinished
+
+ if (stream.Position != stream.Length)
+ throw new SecurityNegotiationException
(String.Format ("Unexpected SSL negotiation binary: {0} bytes of excess in {1}
bytes of the octets", stream.Length - stream.Position, stream.Length));
}
public byte [] ProcessServerFinished ()
Modified:
trunk/olive/class/System.ServiceModel/Test/System.ServiceModel/ChangeLog
===================================================================
--- trunk/olive/class/System.ServiceModel/Test/System.ServiceModel/ChangeLog
2007-04-02 14:38:50 UTC (rev 75281)
+++ trunk/olive/class/System.ServiceModel/Test/System.ServiceModel/ChangeLog
2007-04-02 14:46:40 UTC (rev 75282)
@@ -1,3 +1,8 @@
+2007-04-02 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * ClientCredentialsSecurityTokenManagerTest.cs :
+ added mutual ssonego provider creation without client certificate.
+
2007-03-30 Atsushi Enomoto <[EMAIL PROTECTED]>
* WSHttpBindingTest.cs : added MessageSecurity test for SPNego case.
Modified:
trunk/olive/class/System.ServiceModel/Test/System.ServiceModel/ClientCredentialsSecurityTokenManagerTest.cs
===================================================================
---
trunk/olive/class/System.ServiceModel/Test/System.ServiceModel/ClientCredentialsSecurityTokenManagerTest.cs
2007-04-02 14:38:50 UTC (rev 75281)
+++
trunk/olive/class/System.ServiceModel/Test/System.ServiceModel/ClientCredentialsSecurityTokenManagerTest.cs
2007-04-02 14:46:40 UTC (rev 75282)
@@ -290,9 +290,19 @@
InitiatorServiceModelSecurityTokenRequirement
GetAnonSslProviderRequirement (bool useTransport)
{
+ return GetSslProviderRequirement (useTransport, false);
+ }
+
+ InitiatorServiceModelSecurityTokenRequirement
GetMutualSslProviderRequirement (bool useTransport)
+ {
+ return GetSslProviderRequirement (useTransport, true);
+ }
+
+ InitiatorServiceModelSecurityTokenRequirement
GetSslProviderRequirement (bool useTransport, bool mutual)
+ {
InitiatorServiceModelSecurityTokenRequirement r =
new
InitiatorServiceModelSecurityTokenRequirement ();
- new MySslSecurityTokenParameters ().InitRequirement (r);
+ new MySslSecurityTokenParameters
(mutual).InitRequirement (r);
// r.TokenType =
ServiceModelSecurityTokenTypes.AnonymousSslnego;
r.TargetAddress = new EndpointAddress
("http://localhost:8080");
// r.TargetAddress = CreateEndpointAddress
("http://localhost:8080", true);
@@ -404,6 +414,17 @@
}
[Test]
+ [ExpectedException (typeof (InvalidOperationException))]
+ public void CreateProviderMutualSslWithoutClientCert ()
+ {
+ InitiatorServiceModelSecurityTokenRequirement r =
+ GetMutualSslProviderRequirement (true);
+ SecurityTokenProvider p =
+ def_c.CreateSecurityTokenProvider (r);
+ Assert.IsNotNull (p, "#1");
+ }
+
+ [Test]
[ExpectedException (typeof (ArgumentException))]
public void CreateProviderSecureConvNoTargetAddress ()
{
@@ -675,6 +696,15 @@
class MySslSecurityTokenParameters : SslSecurityTokenParameters
{
+ public MySslSecurityTokenParameters ()
+ {
+ }
+
+ public MySslSecurityTokenParameters (bool mutual)
+ : base (mutual)
+ {
+ }
+
public void InitRequirement (SecurityTokenRequirement r)
{
InitializeSecurityTokenRequirement (r);
Modified:
trunk/olive/class/System.ServiceModel/Test/System.ServiceModel.Security.Tokens/ChangeLog
===================================================================
---
trunk/olive/class/System.ServiceModel/Test/System.ServiceModel.Security.Tokens/ChangeLog
2007-04-02 14:38:50 UTC (rev 75281)
+++
trunk/olive/class/System.ServiceModel/Test/System.ServiceModel.Security.Tokens/ChangeLog
2007-04-02 14:46:40 UTC (rev 75282)
@@ -1,3 +1,8 @@
+2007-04-02 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * SslSecurityTokenParametersTest.cs : test both anonymous and mutual
+ sslnego provider creation (error) for recipient.
+
2007-03-27 Atsushi Enomoto <[EMAIL PROTECTED]>
* SspiSecurityTokenParametersTest.cs : Added test for security
Modified:
trunk/olive/class/System.ServiceModel/Test/System.ServiceModel.Security.Tokens/SslSecurityTokenParametersTest.cs
===================================================================
---
trunk/olive/class/System.ServiceModel/Test/System.ServiceModel.Security.Tokens/SslSecurityTokenParametersTest.cs
2007-04-02 14:38:50 UTC (rev 75281)
+++
trunk/olive/class/System.ServiceModel/Test/System.ServiceModel.Security.Tokens/SslSecurityTokenParametersTest.cs
2007-04-02 14:46:40 UTC (rev 75282)
@@ -227,8 +227,20 @@
[Test]
[ExpectedException (typeof (NotSupportedException))]
- public void CreateRecipientProvider ()
+ public void CreateRecipientProviderAnonymous ()
{
+ CreateRecipientProviderCore (false);
+ }
+
+ [Test]
+ [ExpectedException (typeof (NotSupportedException))]
+ public void CreateRecipientProviderMutual ()
+ {
+ CreateRecipientProviderCore (true);
+ }
+
+ void CreateRecipientProviderCore (bool mutual)
+ {
MyParameters tp = new MyParameters ();
tp.RequireClientCertificate = true;
RecipientServiceModelSecurityTokenRequirement r =
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches