Bug 1806412 - Add new skip reasons to nsITRRSkipReasons.idl for each of the heuristicsi r=necko-reviewers,valentin

Exposing additional skip reasons for fallback warning detection.




We will need these exposed to differentiate failure reasons.

Differential Revision: https://phabricator.services.mozilla.com/D165554
This commit is contained in:
Andrew Creskey 2023-01-16 13:12:03 +00:00
parent be748048c6
commit 23d39d80cb
3 changed files with 156 additions and 0 deletions

View File

@ -1589,6 +1589,22 @@ nsresult GetTRRSkipReasonName(TRRSkippedReason aReason, nsACString& aName) {
static_assert(TRRSkippedReason::ODOH_KEY_NOT_AVAILABLE == 34);
static_assert(TRRSkippedReason::ODOH_ENCRYPTION_FAILED == 35);
static_assert(TRRSkippedReason::ODOH_DECRYPTION_FAILED == 36);
static_assert(TRRSkippedReason::TRR_HEURISTIC_TRIPPED_GOOGLE_SAFESEARCH ==
37);
static_assert(TRRSkippedReason::TRR_HEURISTIC_TRIPPED_YOUTUBE_SAFESEARCH ==
38);
static_assert(TRRSkippedReason::TRR_HEURISTIC_TRIPPED_ZSCALER_CANARY == 39);
static_assert(TRRSkippedReason::TRR_HEURISTIC_TRIPPED_CANARY == 40);
static_assert(TRRSkippedReason::TRR_HEURISTIC_TRIPPED_MODIFIED_ROOTS == 41);
static_assert(TRRSkippedReason::TRR_HEURISTIC_TRIPPED_PARENTAL_CONTROLS ==
42);
static_assert(TRRSkippedReason::TRR_HEURISTIC_TRIPPED_THIRD_PARTY_ROOTS ==
43);
static_assert(TRRSkippedReason::TRR_HEURISTIC_TRIPPED_ENTERPRISE_POLICY ==
44);
static_assert(TRRSkippedReason::TRR_HEURISTIC_TRIPPED_VPN == 45);
static_assert(TRRSkippedReason::TRR_HEURISTIC_TRIPPED_PROXY == 46);
static_assert(TRRSkippedReason::TRR_HEURISTIC_TRIPPED_NRPT == 47);
switch (aReason) {
case TRRSkippedReason::TRR_UNSET:
@ -1702,6 +1718,39 @@ nsresult GetTRRSkipReasonName(TRRSkippedReason aReason, nsACString& aName) {
case TRRSkippedReason::ODOH_DECRYPTION_FAILED:
aName = "ODOH_DECRYPTION_FAILED"_ns;
break;
case TRRSkippedReason::TRR_HEURISTIC_TRIPPED_GOOGLE_SAFESEARCH:
aName = "TRR_HEURISTIC_TRIPPED_GOOGLE_SAFESEARCH"_ns;
break;
case TRRSkippedReason::TRR_HEURISTIC_TRIPPED_YOUTUBE_SAFESEARCH:
aName = "TRR_HEURISTIC_TRIPPED_YOUTUBE_SAFESEARCH"_ns;
break;
case TRRSkippedReason::TRR_HEURISTIC_TRIPPED_ZSCALER_CANARY:
aName = "TRR_HEURISTIC_TRIPPED_ZSCALER_CANARY"_ns;
break;
case TRRSkippedReason::TRR_HEURISTIC_TRIPPED_CANARY:
aName = "TRR_HEURISTIC_TRIPPED_CANARY"_ns;
break;
case TRRSkippedReason::TRR_HEURISTIC_TRIPPED_MODIFIED_ROOTS:
aName = "TRR_HEURISTIC_TRIPPED_MODIFIED_ROOTS"_ns;
break;
case TRRSkippedReason::TRR_HEURISTIC_TRIPPED_PARENTAL_CONTROLS:
aName = "TRR_HEURISTIC_TRIPPED_PARENTAL_CONTROLS"_ns;
break;
case TRRSkippedReason::TRR_HEURISTIC_TRIPPED_THIRD_PARTY_ROOTS:
aName = "TRR_HEURISTIC_TRIPPED_THIRD_PARTY_ROOTS"_ns;
break;
case TRRSkippedReason::TRR_HEURISTIC_TRIPPED_ENTERPRISE_POLICY:
aName = "TRR_HEURISTIC_TRIPPED_ENTERPRISE_POLICY"_ns;
break;
case TRRSkippedReason::TRR_HEURISTIC_TRIPPED_VPN:
aName = "TRR_HEURISTIC_TRIPPED_VPN"_ns;
break;
case TRRSkippedReason::TRR_HEURISTIC_TRIPPED_PROXY:
aName = "TRR_HEURISTIC_TRIPPED_PROXY"_ns;
break;
case TRRSkippedReason::TRR_HEURISTIC_TRIPPED_NRPT:
aName = "TRR_HEURISTIC_TRIPPED_NRPT"_ns;
break;
default:
MOZ_ASSERT(false, "Unknown value");
}

View File

@ -49,6 +49,17 @@ interface nsITRRSkipReason: nsISupports
ODOH_KEY_NOT_AVAILABLE = 34, // ODoH requests timeout because of no key.
ODOH_ENCRYPTION_FAILED = 35, // Failed to encrypt DNS packets.
ODOH_DECRYPTION_FAILED = 36, // Failed to decrypt DNS packets.
TRR_HEURISTIC_TRIPPED_GOOGLE_SAFESEARCH = 37, // The google safesearch heuristic was tripped
TRR_HEURISTIC_TRIPPED_YOUTUBE_SAFESEARCH = 38, // The youtube safesearch heuristic was tripped
TRR_HEURISTIC_TRIPPED_ZSCALER_CANARY = 39, // The zscaler canary heuristic was tripped
TRR_HEURISTIC_TRIPPED_CANARY = 40, // The global canary heuristic was tripped
TRR_HEURISTIC_TRIPPED_MODIFIED_ROOTS = 41, // The modified roots (enterprise_roots cert pref) heuristic was tripped
TRR_HEURISTIC_TRIPPED_PARENTAL_CONTROLS = 42, // The parental controls heuristic was tripped
TRR_HEURISTIC_TRIPPED_THIRD_PARTY_ROOTS = 43, // The third party roots heuristic was tripped
TRR_HEURISTIC_TRIPPED_ENTERPRISE_POLICY = 44, // The enterprise policy heuristic was tripped
TRR_HEURISTIC_TRIPPED_VPN = 45, // The heuristic was tripped due to a vpn being detected
TRR_HEURISTIC_TRIPPED_PROXY = 46, // The heuristic was tripped due to a proxy being detected
TRR_HEURISTIC_TRIPPED_NRPT = 47, // The heuristic was tripped due to a NRPT being detected
};
};

View File

@ -226,3 +226,99 @@ This reason is set when the DNS response contains NXDOMAIN rcode (0x03).
Value: 31
This reason is set when the request was cancelled prior to completion.
## ODOH_KEY_NOT_USABLE
Value: 32
This reason is set when we don't have a valid ODoHConfig to use.
## ODOH_UPDATE_KEY_FAILED
Value: 33
This reason is set when we failed to update the ODoHConfigs.
## ODOH_KEY_NOT_AVAILABLE
Value: 34
This reason is set when ODoH requests timeout because of no key.
## ODOH_ENCRYPTION_FAILED
Value: 35
This reason is set when we failed to encrypt DNS packets.
## ODOH_DECRYPTION_FAILED
Value: 36
This reason is set when we failed to decrypt DNS packets.
## TRR_HEURISTIC_TRIPPED_GOOGLE_SAFESEARCH
Value: 37
This reason is set when the google safesearch heuristic was tripped.
## TRR_HEURISTIC_TRIPPED_YOUTUBE_SAFESEARCH
Value: 38
This reason is set when the youtube safesearch heuristic was tripped.
## TRR_HEURISTIC_TRIPPED_ZSCALER_CANARY
Value: 39
This reason is set when the zscaler canary heuristic was tripped.
## TRR_HEURISTIC_TRIPPED_CANARY
Value: 40
This reason is set when the global canary heuristic was tripped.
## TRR_HEURISTIC_TRIPPED_MODIFIED_ROOTS
Value: 41
This reason is set when the modified roots (enterprise_roots cert pref) heuristic was tripped.
## TRR_HEURISTIC_TRIPPED_PARENTAL_CONTROLS
Value: 42
This reason is set when parental controls are detected.
## TRR_HEURISTIC_TRIPPED_THIRD_PARTY_ROOTS
Value: 43
This reason is set when the third party roots heuristic was tripped.
## TRR_HEURISTIC_TRIPPED_ENTERPRISE_POLICY
Value: 44
This reason is set when enterprise policy heuristic was tripped.
## TRR_HEURISTIC_TRIPPED_VPN
Value: 45
This reason is set when the heuristic was tripped by a vpn being detected.
## TRR_HEURISTIC_TRIPPED_PROXY
Value: 46
This reason is set when the heuristic was tripped by a proxy being detected.
## TRR_HEURISTIC_TRIPPED_NRPT
Value: 47
This reason is set when the heuristic was tripped by a NRPT being detected.