Skip to content
This repository has been archived by the owner on Nov 20, 2018. It is now read-only.

Commit

Permalink
Rename
Browse files Browse the repository at this point in the history
  • Loading branch information
@JunTaoLuo
JunTaoLuo committed May 22, 2017
1 parent b2643f3 commit fbf4b79
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 25 deletions.
6 changes: 3 additions & 3 deletions src/Microsoft.AspNetCore.Http.Features/CookieOptions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ public CookieOptions()


/// <summary>
/// Gets or sets the value for the SameSite attribute of the cookie. The default value is <see cref="SameSiteEnforcementMode.Lax"/>
/// Gets or sets the value for the SameSite attribute of the cookie. The default value is <see cref="SameSiteMode.Lax"/>
/// </summary>
/// <returns>The <see cref="SameSiteEnforcementMode"/> representing the enforcement mode of the cookie.</returns>
public SameSiteEnforcementMode SameSite { get; set; } = SameSiteEnforcementMode.Lax;
/// <returns>The <see cref="SameSiteMode"/> representing the enforcement mode of the cookie.</returns>
public SameSiteMode SameSite { get; set; } = SameSiteMode.Lax;

/// <summary>
/// Gets or sets a value that indicates whether a cookie is accessible by client-side script.
Expand Down
4 changes: 2 additions & 2 deletions ....Http.Features/SameSiteEnforcementMode.cs → ....AspNetCore.Http.Features/SameSiteMode.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
namespace Microsoft.AspNetCore.Http
{
// RFC Draft: https://tools.ietf.org/html/draft-ietf-httpbis-cookie-same-site-00
// This mirrors Microsoft.Net.Http.Headers.SameSiteEnforcementMode
public enum SameSiteEnforcementMode
// This mirrors Microsoft.Net.Http.Headers.SameSiteMode
public enum SameSiteMode
{
None = 0,
Lax,
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.AspNetCore.Http/Internal/ResponseCookies.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public void Append(string key, string value, CookieOptions options)
Path = options.Path,
Expires = options.Expires,
Secure = options.Secure,
SameSite = (Net.Http.Headers.SameSiteEnforcementMode)options.SameSite,
SameSite = (Net.Http.Headers.SameSiteMode)options.SameSite,
HttpOnly = options.HttpOnly
};

Expand Down
2 changes: 1 addition & 1 deletion ...t.Http.Headers/SameSiteEnforcementMode.cs → ...icrosoft.Net.Http.Headers/SameSiteMode.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
namespace Microsoft.Net.Http.Headers
{
// RFC Draft: https://tools.ietf.org/html/draft-ietf-httpbis-cookie-same-site-00
public enum SameSiteEnforcementMode
public enum SameSiteMode
{
None = 0,
Lax,
Expand Down
22 changes: 11 additions & 11 deletions src/Microsoft.Net.Http.Headers/SetCookieHeaderValue.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ public class SetCookieHeaderValue
private const string SecureToken = "secure";
// RFC Draft: https://tools.ietf.org/html/draft-ietf-httpbis-cookie-same-site-00
private const string SameSiteToken = "samesite";
private static readonly string SameSiteLaxToken = SameSiteEnforcementMode.Lax.ToString().ToLower();
private static readonly string SameSiteStrictToken = SameSiteEnforcementMode.Strict.ToString().ToLower();
private static readonly string SameSiteLaxToken = SameSiteMode.Lax.ToString().ToLower();
private static readonly string SameSiteStrictToken = SameSiteMode.Strict.ToString().ToLower();
private const string HttpOnlyToken = "httponly";
private const string SeparatorToken = "; ";
private const string EqualsToken = "=";
Expand Down Expand Up @@ -91,7 +91,7 @@ public string Value

public bool Secure { get; set; }

public SameSiteEnforcementMode SameSite { get; set; }
public SameSiteMode SameSite { get; set; }

public bool HttpOnly { get; set; }

Expand Down Expand Up @@ -131,9 +131,9 @@ public override string ToString()
length += SeparatorToken.Length + SecureToken.Length;
}

if (SameSite != SameSiteEnforcementMode.None)
if (SameSite != SameSiteMode.None)
{
sameSite = SameSite == SameSiteEnforcementMode.Lax ? SameSiteLaxToken : SameSiteStrictToken;
sameSite = SameSite == SameSiteMode.Lax ? SameSiteLaxToken : SameSiteStrictToken;
length += SeparatorToken.Length + SameSiteToken.Length + EqualsToken.Length + sameSite.Length;
}

Expand Down Expand Up @@ -173,7 +173,7 @@ public override string ToString()
AppendSegment(ref sb, SecureToken, null);
}

if (SameSite != SameSiteEnforcementMode.None)
if (SameSite != SameSiteMode.None)
{
AppendSegment(ref sb, SameSiteToken, sameSite);
}
Expand Down Expand Up @@ -236,9 +236,9 @@ public void AppendToStringBuilder(StringBuilder builder)
AppendSegment(builder, SecureToken, null);
}

if (SameSite != SameSiteEnforcementMode.None)
if (SameSite != SameSiteMode.None)
{
AppendSegment(builder, SameSiteToken, SameSite == SameSiteEnforcementMode.Lax ? SameSiteLaxToken : SameSiteStrictToken);
AppendSegment(builder, SameSiteToken, SameSite == SameSiteMode.Lax ? SameSiteLaxToken : SameSiteStrictToken);
}

if (HttpOnly)
Expand Down Expand Up @@ -431,19 +431,19 @@ private static int GetSetCookieLength(string input, int startIndex, out SetCooki
{
if (!ReadEqualsSign(input, ref offset))
{
result.SameSite = SameSiteEnforcementMode.Strict;
result.SameSite = SameSiteMode.Strict;
}
else
{
var enforcementMode = ReadToSemicolonOrEnd(input, ref offset);

if (string.Equals(enforcementMode, SameSiteLaxToken, StringComparison.OrdinalIgnoreCase))
{
result.SameSite = SameSiteEnforcementMode.Lax;
result.SameSite = SameSiteMode.Lax;
}
else
{
result.SameSite = SameSiteEnforcementMode.Strict;
result.SameSite = SameSiteMode.Strict;
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions test/Microsoft.Net.Http.Headers.Tests/SetCookieHeaderValueTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public static TheoryData<SetCookieHeaderValue, string> SetCookieHeaderDataSet
{
Domain = "domain1",
Expires = new DateTimeOffset(1994, 11, 6, 8, 49, 37, TimeSpan.Zero),
SameSite = SameSiteEnforcementMode.Strict,
SameSite = SameSiteMode.Strict,
HttpOnly = true,
MaxAge = TimeSpan.FromDays(1),
Path = "path1",
Expand Down Expand Up @@ -49,13 +49,13 @@ public static TheoryData<SetCookieHeaderValue, string> SetCookieHeaderDataSet

var header6 = new SetCookieHeaderValue("name6", "value6")
{
SameSite = SameSiteEnforcementMode.Lax,
SameSite = SameSiteMode.Lax,
};
dataset.Add(header6, "name6=value6; samesite=lax");

var header7 = new SetCookieHeaderValue("name7", "value7")
{
SameSite = SameSiteEnforcementMode.None,
SameSite = SameSiteMode.None,
};
dataset.Add(header7, "name7=value7");

Expand Down Expand Up @@ -120,7 +120,7 @@ public static TheoryData<IList<SetCookieHeaderValue>, string[]> ListOfSetCookieH
{
Domain = "domain1",
Expires = new DateTimeOffset(1994, 11, 6, 8, 49, 37, TimeSpan.Zero),
SameSite = SameSiteEnforcementMode.Strict,
SameSite = SameSiteMode.Strict,
HttpOnly = true,
MaxAge = TimeSpan.FromDays(1),
Path = "path1",
Expand All @@ -146,14 +146,14 @@ public static TheoryData<IList<SetCookieHeaderValue>, string[]> ListOfSetCookieH

var header5 = new SetCookieHeaderValue("name5", "value5")
{
SameSite = SameSiteEnforcementMode.Lax
SameSite = SameSiteMode.Lax
};
var string5a = "name5=value5; samesite=lax";
var string5b = "name5=value5; samesite=Lax";

var header6 = new SetCookieHeaderValue("name6", "value6")
{
SameSite = SameSiteEnforcementMode.Strict
SameSite = SameSiteMode.Strict
};
var string6a = "name6=value6; samesite";
var string6b = "name6=value6; samesite=Strict";
Expand Down Expand Up @@ -187,7 +187,7 @@ public static TheoryData<IList<SetCookieHeaderValue>, string[]> ListWithInvalidS
{
Domain = "domain1",
Expires = new DateTimeOffset(1994, 11, 6, 8, 49, 37, TimeSpan.Zero),
SameSite = SameSiteEnforcementMode.Strict,
SameSite = SameSiteMode.Strict,
HttpOnly = true,
MaxAge = TimeSpan.FromDays(1),
Path = "path1",
Expand Down

0 comments on commit fbf4b79

Please sign in to comment.