51 Commits
Author SHA1 Message Date
Martin Baulig 1553889bc5 Cleaning up SslStream, MobileAuthenticatedStream and TaskToApm. (#17393)
### Overview

After the removal of the Legacy TLS Provider, we can make some cleanups and improvements to the `SslStream` class.  Since both the remaining providers use the internal `MobileAuthenticatedStream` and support Task-async code, we can get rid of some of the Begin/End async logic and the the underlying
`Stream` class handle it instead.

This also fixes a nasty issue with some of those task objects leaking unobserved exceptions.  The problem was that `SslStream.Dispose()` needs to clear out all resources, but in doing so also nulls out the `Impl` handle to the `MobileAuthenticatedStream` - so a subsequent `End*()` call will not reach it's corresponding `TaskToApm.End()` method.

There are also some cleanups in the internal APIs that were only ever used internally and not intended for public consumption.

### Mono.Security.dll

* `Mono.Security.Interface`: removed internal `ICertificateValidator2` interface.

* `Mono.Security.Interface.IMonoSslStream`: this internal interface is only used by the web-tests, which only use it as a way to get the `SslStream` instance, so all those `Begin/End` async methods are now gone.

* `Mono.Security.Interface.IMonoSslStream2`: removed another internal interface.

* `Mono.Security.Interface.MonoTlsProvider`: removed some `internal abstract` methods; these have been moved into a new `Mono.Net.Security.MobileTlsProvider` inside `System.dll`.

### System.dll

* `Mono.Net.Security.MobileTlsProvider`:
  New abstract internal base class, which received the aforementioned abstract internal methods.  The naming is such to make it consistent with the already existing `MobileTlsContext` and `MobileAuthenticatedStream`.

Since both `AppleTlsProvider` and `BtlsProvider` now have an abstract internal base class inside `System.dll`, they can use the `ChainValidationHelper` class directly and we can also avoid some `Mono.Security` dances like for instance that `MonoSslPolicyErrors` enum.

This will also help make the code easier to read and maintainer.
  
* `Mono.AppleTls.AppleTlsProvider` and `Mono.Btls.MonoBtlsProvider`: change base class into `MobileTlsProvider` and reflect above mentioned overload changes.

* `Mono.AppleTls.AppleCertificateHelper`: use `ChainValidationHelper` as well.

* `Mono.Net.Security.ChainValidationHelper`: only implement `ICertificateValidator`.
  The `ICertificateValidator` interface is still required because it is in use by the web-tests, but the previous `ICertificateValidator2` was an internal dance.

* `Mono.Net.Security.MobileAuthenticatedStream`: largely cleaned up this class.
  - we now implement the current slimmer version of `IMonoSslStream`.
  - moved all those overloads into `SslStream` that only fill in default values for some of their arguments and then call another overloaded version of their own.
  - removed lots of `Begin/End` methods that are not used anymore.

* `Mono.Net.Security.MonoTlsProviderFactory`: use `MobileTlsStream` everywhere.

* `Mono.Net.Security.MonoTlsStream`: cleanup `SslStream` creation logic; instead of going throw `provider.CreateSslStream()`, we can now use an internal constructor directly, thus avoiding the `IMonoSslStream` interface while also making the code a lot easier to read and understand.

* `System.Net.Mail.SmtpClient`: same here.

* `System.Net.HttpWebRequest`: use `MobileTlsProvider`.

* `System.Net.Security.SslStream`: largely cleaned up this class.
  - we now use `MobileAuthenticatedStream` directly instead of the `IMonoSslStream` interface and therefore could also get rid of `IMonoSslStream2`.
  - cleanup constructor logic to allow the internal constructor being used with a `MobileTlsProvider` instead of going through `provider.CreateSslStream()`.
  - all those overloads that are only filling in default values for some of their arguments before calling another overloaded version of their own now live here instead of in the `MobileAuthenticatedStream` class.  The reason is to simply that `MobileAuthenticatedStream` is already quite a complex and difficult class, and removing some of that complexity out of it will make it easier to understand.
  - handle the `TaskToApm.Begin()` / `TaskToApm.End()` here to ensure that we are not leaking any task objects with unobserved exceptions.
  - removed `BeginRead()` and `BeginWrite()` overloads to let the underlying `Stream` class handle these.


* Bump API snapshot submodule

* [csproj] Update project files
2019-10-24 19:42:54 +02:00
Martin Baulig 7277e3bb5e SslStream improvements and tests
* Add server-side Server-Name-Indication (SNI) support (both AppleTls and BTLS).

* Support the new `SslServerAuthenticationOptions.ServerCertificateSelectionCallback`.

* Server certificate selection is now compatible with CoreFx behavior; first
  checking the new `ServerCertSelectionDelegate` then `LocalCertSelectionCallback`
  and finally using an explicitly provided certificate.

* Misc exception checks and fixes to make behavior consistent with CoreFx;
  any exception thrown by reading / writing the underlying stream will now be
  propagated verbatim (and not wrapped in an `AuthenticationException`);
  exceptions thrown by the handshake / TLS stack itself will still be wrapped.

* Added `System.Net.Security` xUnit tests from CoreFx.

* Misc test cleanups; moved certificate test files from `System.Net.Http` into
  `System` and embed them in the test assembly as resources, adjusting
  `test-helpers/Configuration.Certificates.cs` accordingly.
2019-02-21 20:43:25 +01:00
Egor Bogatov cf69b47259 NS2.1: System.IO, System.Reflection.Emit, etc (#12854)
* System.IO, System.Data

* lots of small ns21 improvements

* More changes (System.Reflection.Emit)

* Add IEquatable to S.R.Emit types

* bump corefx

* fix unix build

* more NS21 changes

* more changes

* bump corefx

* Fix failing tests (Sockets)

* bump corefx

* tmp workaround

* move DispatchProxyGenerator to net_4_x

* Bump API snapshot submodule

* [csproj] Update project files
2019-02-14 22:40:58 +01:00
Martin Baulig 0429856f02 [System]: Cleanup SslStream callbacks and internal validation code. (#8753)
* `SslStream`: Reject attempts of setting conflicting callbacks using both the
  Mono-specific `MonoTlsSettings` and the new `SslClientAuthenticationOptions` /
  `SslServerAuthenticationOptions`.

  This makes it consistent with CoreFx behavior where those callbacks may only be
  specified in one of the possible places.

* `ChainValidationHelper` - this internal class has received a major overhaul and
  lots of old and unused code removed.

  All callbacks are not invoked with the correct `sender` parameter to make it
  match the .NET / CoreFx behavior.

* `Mono.Security.Interface.CertificateValidationHelper`: remove unused internal code.
2018-05-18 12:35:24 -04:00
Martin Baulig dc93f55a0e [System]: New SslStream APIs from CoreFX. (#8665)
* Bring `SslClientAuthenticationOptions`, `SslServerAuthenticationOptions`
  and `SslApplicationProtocol` from CoreFX.

* SslStream: Added new public overloads from CoreFX:
  - All authentication methods have a new overload without the `SslProtocols` argument.
  - New `AuthenticateAsClientAsync(SslClientAuthenticationOptions,CancellationToken)`.
  - New `AuthenticateAsServerAsync(SslServerAuthenticationOptions,CancellationToken)`.
  - We now use `SecurityProtocol.SystemDefaultSecurityProtocols` (which is zero) as
    default value everywhere.

Everything below is internal:

* `Mono.Security.Interface`: Add internal `MonoServerCertificateSelectionCallback`,
  `IMonoAuthenticationOptions`, `IMonoSslClientAuthenticationOptions` and
  `IMonoSslServerAuthenticationOptions`.

* `Mono.Security.Interface.IMonoSslStream`: Add new overloads without the
  `SslProtocols` argument.

* `Mono.Security.Interface.IMonoSslStream2`: New internal interface, extending
  `IMonoSslStream` with the new internal APIs.

* `Mono.Net.Security`: New internal `MonoSslAuthenticationOptions`,
  `MonoSslClientAuthenticationOptions` and `MonoSslServerAuthenticationOptions`
  classes; these are just proxies for `SslClientAuthenticationOptions` and
  `SslServerAuthenticationOptions` (which unfortunately don't share a common
  base class).

* `Mono.Net.Security.MobileAuthenticatedStream`:
  - Implement `IMonoSslStream2`.
  - `ProcessAuthentication()` now takes `MonoSslAuthenticationOptions` instead
    of the old argument list, added `CancellationToken`.
  - All `IMonoSslStream` facing APIs now construct `MonoSslAuthenticationOptions`
    to pass it to `ProcessAuthentication()`.

* `Mono.Net.Security`: `MobileTlsContext` and `MobileTlsStream` now use
  `MonoSslAuthenticationOptions` to store all options.

Tests for the new APIs are in https://github.com/xamarin/web-tests/commit/fe347589326206f36d3cd42b59d305ff3c291857.
2018-05-15 13:06:17 +02:00
Martin Baulig 865e344512 [System]: Override SslStream.FlushAsync () to call the async version on the underlying stream. (#5960)
* [System]: Override `SslStream.FlushAsync ()` to call the async version on the underlying stream.

* Bump API snapshot submodule
2017-11-08 06:10:23 +01:00
Martin Baulig 56c2802ff9 [System]: SslStream.Flush() now flushes the underlying stream. Bug #57528. (#5569)
* Mono.Security.Interface.IMonoSslStream: removed Flush().

* Mono.Net.Security.MobileAuthenticatedStream: Flush() now calls `InnerStream.Flush ()'.

* System.Net.Security.SslStream: Flush() now calls `InnerStream.Flush ()'.

* System.Net.Security.SslStream: fix `CanRead`, `CanWrite` and `CanTimeout` logic.
2017-09-14 13:17:19 -04:00
Martin Baulig 21d5c9c346 [System]: Correctly implement close and shutdown in SslStream. (#4969)
* [System]: Correctly implement close and shutdown in SslStream.

* Cleanup.

* Cosmetic.

* More ReferenceSources/SR2.cs into common.sources to make it build.
2017-06-06 11:46:29 -04:00
Martin Baulig 3f779475e3 [System]: HttpListener.CreateSslStream() should always use passed-in callback. (#4835) 2017-05-11 16:20:38 -04:00
Martin Baulig 141970828e [System]: Fully stub-out SslStream on platforms where it's not supported (#4802)
* [System]: Fully stub-out SslStream on platforms where it's not supported.

* Remove 'SECURITY_DEP' conditional from LocalCertificateSelectionCallback.

* Add the internal delegates and remove 'SECURITY_DEP' from SslStream.platformnotsupported.cs.

* In SslStream.cs, we now provide the full API when '!SECURITY_DEP' using the
PlatformNotSupportedException()-based implementation from SslStream.platformnotsupported.cs

* Fix typo.
2017-05-08 12:12:08 -04:00
Martin Baulig cb885fe3e0 [Mono.Security.Interface]: Improve synergy between SslStream and IMonoSslStream (#4756)
* [Mono.Security.Interface]: Improve synergy between `MonoTlsProvider`, `SslStream` and `IMonoSslStream`.

* Add `IMonoSslStream.SslStream` property; the `IMonoSslStream` is now only created my the `SslStream`
  constructor, so `SslStream` "owns" the `IMonoSslStream`.

* Add internal `MonoTlsProvider.CreateSslStreamInternal()`.

* `SslStream` does not need to implement any additional interfaces; we can do without after
   getting rid of the wrapper classes.

* Add internal `SslStream.CreateMonoSslStream(Stream,bool,MonoTlsProvider,MonoTlsSettings)`.

* `MonoTlsProvider.CreateSslStream()` implementations should use this new method.

* Remove ancient obsolete MonoTlsProviderFactory APIs.

* `HttpListener` and `HttpConnection` now use `SslStream` instead of `IMonoSslStream`.

* [System]: Cleanup internal TLS Provider registration.

* Make it build.
2017-04-26 17:15:37 -04:00
Martin Baulig 00ef68347f [Mono.Security.Interface]: Add MonoTlsProviderFactory.GetMonoSslStream(HttpListenerContext). (#4749)
* [System]: Cleanup 'SECURITY_DEP' conditionals in the internal TLS code.

* [System]: Remove 'Mono.Net.Security.IMonoSslStream'; use 'Mono.Security.Interface.IMonoSslStream' instead.

* [System]: Remove 'Mono.Net.Security.IMonoTlsProvider'; use 'Mono.Security.Interface.MonoTlsProvider' instead.

* [System]: Cleanup internal TLS code.

* [Mono.Security]: Add MonoTlsProviderFactory.GetSslStream(HttpListenerContext).

* [System]: `SslStream' should not implement any additional interfaces.
2017-04-26 10:29:36 -04:00
Marek Safar dba0a9c566 [System] WebSockets from corefx 2017-03-30 13:24:56 +02:00
Alexander Köplinger 27b7a9f2c6 [System] Use non-obsolete API in SslStream 2017-01-10 21:45:02 +01:00
Marek Safar 95b0698304 [System] Clean up some warnings 2016-10-25 14:28:35 +02:00
Martin Baulig 6d46c3ec0b Remove all MONO_FEATURE_NEW_TLS conditionals.
(cherry picked from commit c155563d1e)
2016-09-28 13:51:52 +02:00
Alexander Köplinger 3c3ef17376 [bcl] Update to match NETStandard 1.6 members 2016-08-11 20:53:38 +02:00
Marek Safar aa77a6ddcc [System] Remove PrebuiltSystem alias (it's not needed with any modern mcs) 2016-04-16 08:37:07 +02:00
Martin Baulig ebbf7640cc [Mono.Security]: Add MonoTlsProviderFactory.GetMonoSslStream(SslStream). 2016-01-05 16:19:35 +00:00
Martin Baulig 8422335e52 [Mono.Security]: Add 'IMonoSslStream.Provider' and 'GetConnectionInfo()'. 2016-01-05 16:19:35 +00:00
Martin Baulig 2b82ffe426 [Mono.Security]: Rename 'Mono.Security.Interface.MonoSslStream' into 'IMonoSslStream' and make it an interface.
(cherry picked from commit aa2166908a)
2015-11-25 16:34:58 -05:00
Martin Baulig b48cd9b3c1 [Mono.Security]: Minor 'Mono.Security.Interface' API improvements.
* MonoTlsSettings: Add static 'DefaultSettings' and CopyDefaultSettings().

* MonoTlsProvider: Add 'ID' and 'Name' properties.

(cherry picked from commit 51226c86f9)
2015-11-24 15:15:28 -05:00
Martin Baulig 5674bdd47b [System/TLS]: Use the official API in SslStream rather than hard-coding MonoDefaultTlsProvider.
(cherry picked from commit 0bcc31e326)
2015-11-05 17:38:05 -05:00
Martin Baulig eac6301e92 Cleanup unused usings.
Mono.Net.Security/LegacySslStream.cs is the only file which should
reference the 'Mono.Security.Protocol.Tls' namespace.

(cherry picked from commit 43307ff086)
2015-11-04 15:11:24 -05:00
Martin Baulig 7a38dad045 Comment-out [HostProtection] attribute in SslStream.cs, it seems to be causing problems. 2015-10-29 13:08:18 -04:00
Martin Baulig 980ecc2c79 [System]: Replace the 'SslStream' implementation with a proxy that's using the 'MonoTlsProvider' layer.
This allows consumers of the 'SslStream' class to take full advantage of
the new TLS switcher code.
2015-10-28 20:28:09 -04:00
Martin Baulig a76f2dcb0c [Mono.Security]: Rename 'MonoTlsSettings.ServerCertificateValidationCallback' into 'RemoteCertificateValidationCallback'.
This callback is also used to validate client-certificates when using SslStream in server-mode.
2015-10-28 18:26:55 -04:00
Martin Baulig 25a206c6da [System/TLS]: Switch to the new ChainValidationHelper.
* Removed Mono.Security.Protocol.Tls.ValidationResult, use
  Mono.Security.Interface instead.  This is an API breaking
  change, but you can fix your application by simply adding
  the new using directive.

  The rationale behind this is to avoid a dependency on the
  Mono.Security.Protocol.Tls namespace when building and
  related classes when building the new TLS stack.

* Enable ChainValidationHelper in WebConnection, LegacySslStream
  and SslStream.

  The custom conditionals that were previously required for the
  mobile profiles are now gone as ChainValidationHelper already
  handles that internally.

* This is an internal API, the public front-end is
  Mono.Security.Interface.CertificateValidationHelper.

  CertificateValidationHelper can be used to access the system
  certificate validator on OS X and iOS; we do not compute the
  X509Chain on these platforms as it's not supported by the OS.

(cherry picked from commit 9713f35878dd90fe87423b5052b4f82ddc0b87f0)
2015-10-14 19:26:06 -04:00
Martin Baulig f338a141ce [System]: Add internal RemoteCertValidationCallback and LocalCertSelectionCallback.
These two internal delegates are defined and used by the referencesource's SslStream
implementation; add them to our SslStream.cs version for compatibility.

(cherry picked from commit 0fbda4c3bd)
2015-10-12 16:52:00 -04:00
Martin Baulig 57e39c1d2c [System/build]: Add two MONO_SECURITY_ALIAS and MONO_X509_ALIAS conditionals.
These should be used instead of MOBILE / MONOTOUCH / MONODROID to select
extern alias directives to make them work independently from the mobile profile.

* MONO_SECURITY_ALIAS: whether or not to use 'extern alias MonoSecurity'.

* MONO_X509_ALIAS: whether or not to use

    extern alias PrebuiltSystem;
    using X509CertificateCollection = PrebuiltSystem::System.Security.Cryptography.X509Certificates.X509CertificateCollection;

* MONO_FEATURE_NEW_TLS: ignore, this is not enabled in the default build.

(cherry picked from commit 48b95ec304)
2015-10-12 16:51:59 -04:00
Zoltan Varga c1b4366932 [bcl] Remove NET_4_5 defines from class libs. 2015-01-13 16:34:23 -05:00
Marek Habersack 34fb07d05f Include support for SSL/TLS right in System when building for the MONODROID profile
This patch builds upon commit 96a8500795 which placed parts of Mono.Security
responsible for dealing with SSL/TLS certificates for the purpose of certificate verification. The code enables
validation of the certifcates even if the user does not provide their own validation callback. The changes as related to
the original commit are few, basically consisting of enabling the same code used by MonoTouch in the MonoDroid context with
the only actual code change being the certificate validation bit mentioned above.

Since the change involves adding a subset of Mono.Security files to the monodroid version of System.dll, it is
also necessary to remove Mono.Android's dependence on Mono.Security.dll. The reason is that the code in AndroidPlatform
which looks up TLS support methods in Mono.Android.dll would use a type (X509CertificateCollection) that is now part of
System.dll but is *also* in Mono.Security.dll referenced by Mono.Android.dll and therefore the lookup would fail since
we'd have two distinct types from the reflection point of view.

Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=18962
2014-04-25 21:39:53 +02:00
Sebastien Pouliot 96a8500795 Allow the MONOTOUCH targetr to build its SSL/TLS support right inside System.dll and remove code duplication and non-required code paths. 2013-07-01 16:21:04 -04:00
Marek Safar 0647a5d16b Remove duplicated files from system.dll (saves about 100kb) 2013-02-25 19:10:09 +01:00
Rodrigo Kumpera 5007c14d62 Kill the MOONLIGHT define in System. 2013-02-11 13:01:11 -05:00
paszczi 7ce10db9e8 Don't wait for client data when authenticating server ssl stream - fix bug 457120 (novell) 2012-06-22 10:12:35 +02:00
Marek Safar 2fe2101b61 Add async methods to SslStream 2011-10-07 10:11:29 +01:00
Marek Safar b7896a8f79 Fix parameter names 2011-10-07 10:11:29 +01:00
Sebastien Pouliot 9c8cb87fe3 In .:
2010-07-21  Sebastien Pouliot  <[email protected]>

	* Makefile: Ensure SECURITY_DEP gets defined in our moonlight
	raw profile

In System.Net:
2010-07-21  Sebastien Pouliot  <[email protected]>

	* ServicePointManager.cs: Add special validation for Moonlight
	* WebConnection.cs: Change a define to NET_2_1

In System.Net.Security:
2010-07-21  Sebastien Pouliot  <[email protected]>

	* LocalCertificateSelectionCallback.cs:
	* SslStream.cs:
		Don't use alias in moonlight build (not needed and breaks
		compilation otherwise)


svn path=/trunk/mcs/; revision=160675
2010-07-21 13:36:35 +00:00
Sebastien Pouliot a392bb4d27 2010-05-10 Sebastien Pouliot <[email protected]>
* SslStream.cs: Allow Moonlight to build the non-server part
	of SslStream
	* RemoteCertificateValidationCallback.cs: Adjust visibility for
	Moonlight build


svn path=/trunk/mcs/; revision=157065
2010-05-10 20:16:50 +00:00
Gonzalo Paniagua Javier 5c20ab97e6 2010-03-01 Gonzalo Paniagua Javier <[email protected]>
* System.Net/WebConnection.cs: attach a validation callback to the new
	event in Mono.Security.
	* System.Net/ServicePointManager.cs: added a new ValidationHelper
	class that takes care of building the certificate chain and perform
	all the check that were done in Mono.Security before. This way the 2.0
	server certificate validation callback can get all the data it needs.
	* System.Net.Security/SslStream.cs: don't do anything if a chain
	element has no error.

	Fixes bug #584050.

svn path=/trunk/mcs/; revision=152654
2010-03-01 09:01:14 +00:00
Sebastien Pouliot 52a76350d1 2009-08-20 Sebastien Pouliot <[email protected]>
* SslStream.cs : Always use/provide a X509Chain even if this 
	duplicates some of the old/existing logic of Mono.Security.
	This makes it possible to provide a callback using 
	ServicePointManager.ServerCertificateValidationCallback


svn path=/trunk/mcs/; revision=140359
2009-08-20 18:26:28 +00:00
Marek Safar e61dde083e Warnings cleanup
svn path=/trunk/mcs/; revision=89678
2007-11-15 14:14:49 +00:00
Atsushi Eno 96c0ccc683 2007-08-24 Atsushi Enomoto <[email protected]>
* SslStream.cs : uh, fixed the build.


svn path=/trunk/mcs/; revision=84803
2007-08-24 12:31:11 +00:00
Atsushi Eno 4134bf5d73 2007-08-24 Atsushi Enomoto <[email protected]>
System.Net.Security:
	* SslStream.cs : implemented, based on Mono.Security.
	* LocalCertificateSelectionCallback.cs : extern alias is needed.

    System(topdir):
	* Makefile : split PREBUILT_DEP from CONFIGURATION_DEP so that the
	  prebuilt System.dll could be referenced for security stuff too.

    Test/tools/mutual:
	* Makefile, ca.pem, client.p12, client.pem, mutual.cs, server.sh,
	  server_cert.pem, server_key.pem, serveropt.sh:
	  ported from Mono.Security
	* README : forwarding.

    Test/tools/server:
	* Makefile, msslserver.cs, mutual.pem : ported from Mono.Security.
	* README : forwarding.



svn path=/trunk/mcs/; revision=84783
2007-08-24 09:42:40 +00:00
Sebastien Pouliot f849158a86 another required fix related to X509Chain via RemoteCertificateValidationCallback
svn path=/trunk/mcs/; revision=59099
2006-04-05 17:47:49 +00:00
Atsushi Eno cf41c798eb 2006-04-05 Atsushi Enomoto <[email protected]>
* System.dll.sources : added SslPolicyErrors.cs.

	* AuthenticationLevel.cs,
	  NegotiateStream.cs,
	  SslStream.cs,
	  LocalCertificateSelectionCallback.cs,
	  RemoteCertificateValidationCallback.cs :
	  Updated all unimplemented things to 2.0 RTM.


svn path=/trunk/mcs/; revision=59054
2006-04-05 08:20:48 +00:00
Miguel de Icaza beba57fc36 corcompare fixes
svn path=/trunk/mcs/; revision=57759
2006-03-10 00:40:46 +00:00
Carlos Alberto Cortez 3d7bc1eeb7 2006-03-07 Carlos Alberto Cortez <[email protected]>
* SslStream.cs, NegotiateStream.cs: Override CanTimeout,
	ReadTimeout and WriteTimeout properties, to avoid warnings.


svn path=/trunk/mcs/; revision=57685
2006-03-08 07:15:05 +00:00
Ben Maurer 0e8decdb37 remove svn:executable from .cs files
svn path=/trunk/mcs/; revision=46562
2005-06-27 15:51:40 +00:00