Skip to content

Commit 43a22ae

Browse files
TratcherTratcher
committed
Rename compat flag
1 parent 67f93c3 commit 43a22ae

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

‎src/Http/Headers/src/SetCookieHeaderValue.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class SetCookieHeaderValue
2525

2626
// True (old): https://tools.ietf.org/html/draft-west-first-party-cookies-07#section-3.1
2727
// False (new): https://tools.ietf.org/html/draft-ietf-httpbis-rfc6265bis-03#section-4.1.1
28-
internal static bool UseSameSite2016Compat;
28+
internal static bool SuppressSameSiteNone;
2929

3030
private const string HttpOnlyToken = "httponly";
3131
private const string SeparatorToken = "; ";
@@ -42,9 +42,9 @@ private static readonly HttpHeaderParser<SetCookieHeaderValue> MultipleValuePars
4242

4343
static SetCookieHeaderValue()
4444
{
45-
if (AppContext.TryGetSwitch("Microsoft.Net.Http.Headers.SetCookieHeaderValue.UseSameSite2016Compat", out var enabled))
45+
if (AppContext.TryGetSwitch("Microsoft.Net.Http.Headers.SetCookieHeaderValue.SuppressSameSiteNone", out var enabled))
4646
{
47-
UseSameSite2016Compat = enabled;
47+
SuppressSameSiteNone = enabled;
4848
}
4949
}
5050

@@ -104,7 +104,7 @@ public StringSegment Value
104104

105105
public bool Secure { get; set; }
106106

107-
public SameSiteMode SameSite { get; set; } = UseSameSite2016Compat ? SameSiteMode.None : (SameSiteMode)(-1); // Unspecified
107+
public SameSiteMode SameSite { get; set; } = SuppressSameSiteNone ? SameSiteMode.None : (SameSiteMode)(-1); // Unspecified
108108

109109
public bool HttpOnly { get; set; }
110110

@@ -145,7 +145,7 @@ public override string ToString()
145145
}
146146

147147
// Allow for Unspecified (-1) to skip SameSite
148-
if (SameSite == SameSiteMode.None && !UseSameSite2016Compat)
148+
if (SameSite == SameSiteMode.None && !SuppressSameSiteNone)
149149
{
150150
sameSite = SameSiteNoneToken;
151151
length += SeparatorToken.Length + SameSiteToken.Length + EqualsToken.Length + sameSite.Length;
@@ -261,7 +261,7 @@ public void AppendToStringBuilder(StringBuilder builder)
261261
}
262262

263263
// Allow for Unspecified (-1) to skip SameSite
264-
if (SameSite == SameSiteMode.None && !UseSameSite2016Compat)
264+
if (SameSite == SameSiteMode.None && !SuppressSameSiteNone)
265265
{
266266
AppendSegment(builder, SameSiteToken, SameSiteNoneToken);
267267
}
@@ -464,7 +464,7 @@ private static int GetSetCookieLength(StringSegment input, int startIndex, out S
464464
{
465465
if (!ReadEqualsSign(input, ref offset))
466466
{
467-
result.SameSite = UseSameSite2016Compat ? SameSiteMode.Strict : (SameSiteMode)(-1); // Unspecified
467+
result.SameSite = SuppressSameSiteNone ? SameSiteMode.Strict : (SameSiteMode)(-1); // Unspecified
468468
}
469469
else
470470
{
@@ -478,14 +478,14 @@ private static int GetSetCookieLength(StringSegment input, int startIndex, out S
478478
{
479479
result.SameSite = SameSiteMode.Lax;
480480
}
481-
else if (!UseSameSite2016Compat
481+
else if (!SuppressSameSiteNone
482482
&& StringSegment.Equals(enforcementMode, SameSiteNoneToken, StringComparison.OrdinalIgnoreCase))
483483
{
484484
result.SameSite = SameSiteMode.None;
485485
}
486486
else
487487
{
488-
result.SameSite = UseSameSite2016Compat ? SameSiteMode.Strict : (SameSiteMode)(-1); // Unspecified
488+
result.SameSite = SuppressSameSiteNone ? SameSiteMode.Strict : (SameSiteMode)(-1); // Unspecified
489489
}
490490
}
491491
}

‎src/Http/Headers/test/SetCookieHeaderValueTest.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -314,9 +314,9 @@ public void SetCookieHeaderValue_ToString(SetCookieHeaderValue input, string exp
314314
}
315315

316316
[Fact]
317-
public void SetCookieHeaderValue_ToString_SameSite2016Compat()
317+
public void SetCookieHeaderValue_ToString_SameSiteNoneCompat()
318318
{
319-
SetCookieHeaderValue.UseSameSite2016Compat = true;
319+
SetCookieHeaderValue.SuppressSameSiteNone = true;
320320

321321
var input = new SetCookieHeaderValue("name", "value")
322322
{
@@ -325,7 +325,7 @@ public void SetCookieHeaderValue_ToString_SameSite2016Compat()
325325

326326
Assert.Equal("name=value", input.ToString());
327327

328-
SetCookieHeaderValue.UseSameSite2016Compat = false;
328+
SetCookieHeaderValue.SuppressSameSiteNone = false;
329329

330330
var input2 = new SetCookieHeaderValue("name", "value")
331331
{
@@ -347,9 +347,9 @@ public void SetCookieHeaderValue_AppendToStringBuilder(SetCookieHeaderValue inpu
347347
}
348348

349349
[Fact]
350-
public void SetCookieHeaderValue_AppendToStringBuilder_SameSite2016Compat()
350+
public void SetCookieHeaderValue_AppendToStringBuilder_SameSiteNoneCompat()
351351
{
352-
SetCookieHeaderValue.UseSameSite2016Compat = true;
352+
SetCookieHeaderValue.SuppressSameSiteNone = true;
353353

354354
var builder = new StringBuilder();
355355
var input = new SetCookieHeaderValue("name", "value")
@@ -360,7 +360,7 @@ public void SetCookieHeaderValue_AppendToStringBuilder_SameSite2016Compat()
360360
input.AppendToStringBuilder(builder);
361361
Assert.Equal("name=value", builder.ToString());
362362

363-
SetCookieHeaderValue.UseSameSite2016Compat = false;
363+
SetCookieHeaderValue.SuppressSameSiteNone = false;
364364

365365
var builder2 = new StringBuilder();
366366
var input2 = new SetCookieHeaderValue("name", "value")
@@ -383,9 +383,9 @@ public void SetCookieHeaderValue_Parse_AcceptsValidValues(SetCookieHeaderValue c
383383
}
384384

385385
[Fact]
386-
public void SetCookieHeaderValue_Parse_AcceptsValidValues_SameSite2016Compat()
386+
public void SetCookieHeaderValue_Parse_AcceptsValidValues_SameSiteNoneCompat()
387387
{
388-
SetCookieHeaderValue.UseSameSite2016Compat = true;
388+
SetCookieHeaderValue.SuppressSameSiteNone = true;
389389
var header = SetCookieHeaderValue.Parse("name=value; samesite=none");
390390

391391
var cookie = new SetCookieHeaderValue("name", "value")
@@ -395,7 +395,7 @@ public void SetCookieHeaderValue_Parse_AcceptsValidValues_SameSite2016Compat()
395395

396396
Assert.Equal(cookie, header);
397397
Assert.Equal("name=value; samesite=strict", header.ToString());
398-
SetCookieHeaderValue.UseSameSite2016Compat = false;
398+
SetCookieHeaderValue.SuppressSameSiteNone = false;
399399

400400
var header2 = SetCookieHeaderValue.Parse("name=value; samesite=none");
401401

@@ -418,9 +418,9 @@ public void SetCookieHeaderValue_TryParse_AcceptsValidValues(SetCookieHeaderValu
418418
}
419419

420420
[Fact]
421-
public void SetCookieHeaderValue_TryParse_AcceptsValidValues_SameSite2016Compat()
421+
public void SetCookieHeaderValue_TryParse_AcceptsValidValues_SameSiteNoneCompat()
422422
{
423-
SetCookieHeaderValue.UseSameSite2016Compat = true;
423+
SetCookieHeaderValue.SuppressSameSiteNone = true;
424424
Assert.True(SetCookieHeaderValue.TryParse("name=value; samesite=none", out var header));
425425
var cookie = new SetCookieHeaderValue("name", "value")
426426
{
@@ -430,7 +430,7 @@ public void SetCookieHeaderValue_TryParse_AcceptsValidValues_SameSite2016Compat(
430430
Assert.Equal(cookie, header);
431431
Assert.Equal("name=value; samesite=strict", header.ToString());
432432

433-
SetCookieHeaderValue.UseSameSite2016Compat = false;
433+
SetCookieHeaderValue.SuppressSameSiteNone = false;
434434

435435
Assert.True(SetCookieHeaderValue.TryParse("name=value; samesite=none", out var header2));
436436
var cookie2 = new SetCookieHeaderValue("name", "value")

0 commit comments

Comments
 (0)