ishan
/
fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For #25435: Handle ERROR_BAD_HSTS_CERT error.

This commit is contained in:
mcarare 2022-05-30 15:34:12 +03:00 committed by mergify[bot]
parent 0ee911ea8c
commit d595e199c9
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/androidTest/java/org/mozilla/fenix/AppRequestInterceptor.kt
View File

@ -188,6 +188,7 @@ class AppRequestInterceptor(private val context: Context) : RequestInterceptor {
ErrorType.ERROR_UNKNOWN_PROXY_HOST,
ErrorType.ERROR_NO_INTERNET,
ErrorType.ERROR_HTTPS_ONLY,
ErrorType.ERROR_BAD_HSTS_CERT,
ErrorType.ERROR_UNKNOWN_PROTOCOL -> RiskLevel.Low
ErrorType.ERROR_SECURITY_BAD_CERT,

19
app/src/main/assets/lowMediumErrorPages.js
View File

@ -12,6 +12,7 @@ function parseQuery(queryString) {
const query = Object.fromEntries(new URLSearchParams(queryString).entries());
injectValues(query);
updateShowSSL(query);
updateShowHSTS(query);
};
/**
@ -71,6 +72,24 @@ function updateShowSSL(queryMap) {
}
};
/**
* Used to show or hide the "advanced" button based for the HSTS error page
*/
function updateShowHSTS(queryMap) {
/** @type {'true' | 'false'} */
const showHSTS = queryMap.showHSTS;
if (typeof document.addCertException === "undefined") {
document.getElementById('advancedButton').style.display='none';
} else {
if (showHSTS === 'true') {
document.getElementById('advancedButton').style.display='block';
document.getElementById('advancedPanelAcceptButton').style.display='none';
} else {
document.getElementById('advancedButton').style.display='none';
}
}
}
/**
* Used to display information about the SSL certificate in `error_pages.html`
*/

1
app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt
View File

@ -151,6 +151,7 @@ class AppRequestInterceptor(
ErrorType.ERROR_UNKNOWN_PROXY_HOST,
ErrorType.ERROR_NO_INTERNET,
ErrorType.ERROR_HTTPS_ONLY,
ErrorType.ERROR_BAD_HSTS_CERT,
ErrorType.ERROR_UNKNOWN_PROTOCOL -> RiskLevel.Low
ErrorType.ERROR_SECURITY_BAD_CERT,