Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -1,98 +0,0 @@
//
// System.Security.Principal.GenericIdentity.cs
//
// Authors:
// Miguel de Icaza (miguel@ximian.com)
// Marek Safar (marek.safar@gmail.com)
//
// (C) Ximian, Inc. http://www.ximian.com
// Copyright (C) 2004-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.
//
using System.Runtime.InteropServices;
using System.Collections.Generic;
using System.Security.Claims;
namespace System.Security.Principal {
[Serializable]
[ComVisible (true)]
public class GenericIdentity :
ClaimsIdentity
{
// field names are serialization compatible with .net
private string m_name;
private string m_type;
public GenericIdentity (string name, string type)
{
if (name == null)
throw new ArgumentNullException ("name");
if (type == null)
throw new ArgumentNullException ("type");
m_name = name;
m_type = type;
AddDefaultClaim (name);
}
public GenericIdentity (string name)
: this (name, String.Empty)
{
}
protected GenericIdentity (GenericIdentity identity)
: base (identity)
{
}
override
public string AuthenticationType {
get {
return m_type;
}
}
override
public string Name {
get {
return m_name;
}
}
override
public bool IsAuthenticated {
get {
return (m_name.Length > 0);
}
}
public override IEnumerable<Claim> Claims {
get {
return base.Claims;
}
}
}
}

View File

@@ -33,6 +33,7 @@ using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
using System.Security.Permissions;
using System.Security.Claims;
namespace System.Security.Principal {
@@ -113,6 +114,15 @@ namespace System.Security.Principal {
_info = info;
}
internal WindowsIdentity (ClaimsIdentity claimsIdentity, IntPtr userToken)
: base (claimsIdentity)
{
if (userToken != IntPtr.Zero && userToken.ToInt64() > 0)
{
SetToken (userToken);
}
}
[ComVisible (false)]
public void Dispose ()
{
@@ -269,6 +279,16 @@ namespace System.Security.Principal {
info.AddValue ("m_isAuthenticated", _authenticated);
}
internal ClaimsIdentity CloneAsBase ()
{
return base.Clone();
}
internal IntPtr GetTokenInternal ()
{
return _token;
}
private void SetToken (IntPtr token)
{
if (Environment.IsUnix) {