Commit c197a4f6 authored by Steven Bingler's avatar Steven Bingler Committed by Commit Bot

Add new Schemeful blocked cookie enums

Add enums to the browser protocol in prep for the devtools frontend
work.

This CL also updates the network_handler to insert the new values.

Bug: 1136839
Change-Id: I23f9d47bffde3dce3917d41d5c01070646b3d366
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2461595Reviewed-by: default avatarMike West <mkwst@chromium.org>
Reviewed-by: default avatarSigurd Schneider <sigurds@chromium.org>
Commit-Queue: Steven Bingler <bingler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816666}
parent fb2fea16
...@@ -583,18 +583,34 @@ GetProtocolBlockedSetCookieReason(net::CookieInclusionStatus status) { ...@@ -583,18 +583,34 @@ GetProtocolBlockedSetCookieReason(net::CookieInclusionStatus status) {
} }
if (status.HasExclusionReason( if (status.HasExclusionReason(
net::CookieInclusionStatus::EXCLUDE_SAMESITE_STRICT)) { net::CookieInclusionStatus::EXCLUDE_SAMESITE_STRICT)) {
blockedReasons->push_back( if (status.HasDowngradeWarning()) {
Network::SetCookieBlockedReasonEnum::SameSiteStrict); blockedReasons->push_back(
Network::SetCookieBlockedReasonEnum::SchemefulSameSiteStrict);
} else {
blockedReasons->push_back(
Network::SetCookieBlockedReasonEnum::SameSiteStrict);
}
} }
if (status.HasExclusionReason( if (status.HasExclusionReason(
net::CookieInclusionStatus::EXCLUDE_SAMESITE_LAX)) { net::CookieInclusionStatus::EXCLUDE_SAMESITE_LAX)) {
blockedReasons->push_back(Network::SetCookieBlockedReasonEnum::SameSiteLax); if (status.HasDowngradeWarning()) {
blockedReasons->push_back(
Network::SetCookieBlockedReasonEnum::SchemefulSameSiteLax);
} else {
blockedReasons->push_back(
Network::SetCookieBlockedReasonEnum::SameSiteLax);
}
} }
if (status.HasExclusionReason( if (status.HasExclusionReason(
net::CookieInclusionStatus:: net::CookieInclusionStatus::
EXCLUDE_SAMESITE_UNSPECIFIED_TREATED_AS_LAX)) { EXCLUDE_SAMESITE_UNSPECIFIED_TREATED_AS_LAX)) {
blockedReasons->push_back( if (status.HasDowngradeWarning()) {
Network::SetCookieBlockedReasonEnum::SameSiteUnspecifiedTreatedAsLax); blockedReasons->push_back(Network::SetCookieBlockedReasonEnum::
SchemefulSameSiteUnspecifiedTreatedAsLax);
} else {
blockedReasons->push_back(
Network::SetCookieBlockedReasonEnum::SameSiteUnspecifiedTreatedAsLax);
}
} }
if (status.HasExclusionReason( if (status.HasExclusionReason(
net::CookieInclusionStatus::EXCLUDE_SAMESITE_NONE_INSECURE)) { net::CookieInclusionStatus::EXCLUDE_SAMESITE_NONE_INSECURE)) {
...@@ -658,17 +674,33 @@ GetProtocolBlockedCookieReason(net::CookieInclusionStatus status) { ...@@ -658,17 +674,33 @@ GetProtocolBlockedCookieReason(net::CookieInclusionStatus status) {
} }
if (status.HasExclusionReason( if (status.HasExclusionReason(
net::CookieInclusionStatus::EXCLUDE_SAMESITE_STRICT)) { net::CookieInclusionStatus::EXCLUDE_SAMESITE_STRICT)) {
blockedReasons->push_back(Network::CookieBlockedReasonEnum::SameSiteStrict); if (status.HasDowngradeWarning()) {
blockedReasons->push_back(
Network::CookieBlockedReasonEnum::SchemefulSameSiteStrict);
} else {
blockedReasons->push_back(
Network::CookieBlockedReasonEnum::SameSiteStrict);
}
} }
if (status.HasExclusionReason( if (status.HasExclusionReason(
net::CookieInclusionStatus::EXCLUDE_SAMESITE_LAX)) { net::CookieInclusionStatus::EXCLUDE_SAMESITE_LAX)) {
blockedReasons->push_back(Network::CookieBlockedReasonEnum::SameSiteLax); if (status.HasDowngradeWarning()) {
blockedReasons->push_back(
Network::CookieBlockedReasonEnum::SchemefulSameSiteLax);
} else {
blockedReasons->push_back(Network::CookieBlockedReasonEnum::SameSiteLax);
}
} }
if (status.HasExclusionReason( if (status.HasExclusionReason(
net::CookieInclusionStatus:: net::CookieInclusionStatus::
EXCLUDE_SAMESITE_UNSPECIFIED_TREATED_AS_LAX)) { EXCLUDE_SAMESITE_UNSPECIFIED_TREATED_AS_LAX)) {
blockedReasons->push_back( if (status.HasDowngradeWarning()) {
Network::CookieBlockedReasonEnum::SameSiteUnspecifiedTreatedAsLax); blockedReasons->push_back(Network::CookieBlockedReasonEnum::
SchemefulSameSiteUnspecifiedTreatedAsLax);
} else {
blockedReasons->push_back(
Network::CookieBlockedReasonEnum::SameSiteUnspecifiedTreatedAsLax);
}
} }
if (status.HasExclusionReason( if (status.HasExclusionReason(
net::CookieInclusionStatus::EXCLUDE_SAMESITE_NONE_INSECURE)) { net::CookieInclusionStatus::EXCLUDE_SAMESITE_NONE_INSECURE)) {
......
...@@ -4664,6 +4664,20 @@ domain Network ...@@ -4664,6 +4664,20 @@ domain Network
InvalidPrefix InvalidPrefix
# An unknown error was encountered when trying to store this cookie. # An unknown error was encountered when trying to store this cookie.
UnknownError UnknownError
# The cookie had the "SameSite=Strict" attribute but came from a response
# with the same registrable domain but a different scheme.
# This includes navigation requests intitiated by other origins.
# This is the "Schemeful Same-Site" version of the blocked reason.
SchemefulSameSiteStrict
# The cookie had the "SameSite=Lax" attribute but came from a response
# with the same registrable domain but a different scheme.
# This is the "Schemeful Same-Site" version of the blocked reason.
SchemefulSameSiteLax
# The cookie didn't specify a "SameSite" attribute and was defaulted to
# "SameSite=Lax" and broke the same rules specified in the SchemefulSameSiteLax
# value.
# This is the "Schemeful Same-Site" version of the blocked reason.
SchemefulSameSiteUnspecifiedTreatedAsLax
# Types of reasons why a cookie may not be sent with a request. # Types of reasons why a cookie may not be sent with a request.
experimental type CookieBlockedReason extends string experimental type CookieBlockedReason extends string
...@@ -4692,6 +4706,20 @@ domain Network ...@@ -4692,6 +4706,20 @@ domain Network
UserPreferences UserPreferences
# An unknown error was encountered when trying to send this cookie. # An unknown error was encountered when trying to send this cookie.
UnknownError UnknownError
# The cookie had the "SameSite=Strict" attribute but came from a response
# with the same registrable domain but a different scheme.
# This includes navigation requests intitiated by other origins.
# This is the "Schemeful Same-Site" version of the blocked reason.
SchemefulSameSiteStrict
# The cookie had the "SameSite=Lax" attribute but came from a response
# with the same registrable domain but a different scheme.
# This is the "Schemeful Same-Site" version of the blocked reason.
SchemefulSameSiteLax
# The cookie didn't specify a "SameSite" attribute and was defaulted to
# "SameSite=Lax" and broke the same rules specified in the SchemefulSameSiteLax
# value.
# This is the "Schemeful Same-Site" version of the blocked reason.
SchemefulSameSiteUnspecifiedTreatedAsLax
# A cookie which was not stored from a response with the corresponding reason. # A cookie which was not stored from a response with the corresponding reason.
experimental type BlockedSetCookieWithReason extends object experimental type BlockedSetCookieWithReason extends object
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment