Skip to content

Refactor FXIOS-15399 [Native Error Pages] NativeErrorPageHelper review nits #33025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ananyashreesharma wants to merge 2 commits into
base: main
Choose a base branch
from
+10 −4
Open

Refactor FXIOS-15399 [Native Error Pages] NativeErrorPageHelper review nits #33025

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c84ee68
NativeErrorPageHelper: addressed post merge review nits
ananyashreesharma Apr 10, 2026
99ebc8e
Swiftlint error fixed
ananyashreesharma Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions firefox-ios/Client/Frontend/NativeErrorPage/NativeErrorPageHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,18 @@ let CertErrors: [Int] = [
]

class NativeErrorPageHelper {
enum Constants {
private enum Constants {
static let certErrorQueryParam = "certerror"
static let badCertQueryParam = "badcert"
static let codeQueryParam = "code"
static let cfStreamErrorCodeKey = "_kCFStreamErrorCodeKey"
static let peerCertificateChainKey = "NSErrorPeerCertificateChainKey"
static let defaultBadCertDomainError = "SSL_ERROR_BAD_CERT_DOMAIN"
static let sslErrorBadCertDomainCode = -9843
static let wrongHostMarker = "wrong.host"
static let badSSLHostMarker = "badssl"
static let domainDescriptionMarker = "domain"
static let hostnameDescriptionMarker = "hostname"
}

/// Holds the parsed certificate details extracted from an NSError.
Expand Down Expand Up @@ -189,8 +193,9 @@ class NativeErrorPageHelper {
let desc = error.localizedDescription.lowercased()
if let failingURL = error.userInfo[NSURLErrorFailingURLErrorKey] as? URL,
let host = failingURL.host,
host.contains("wrong.host") || host.contains("badssl")
|| desc.contains("domain") || desc.contains("hostname") {
host.contains(Constants.wrongHostMarker) || host.contains(Constants.badSSLHostMarker)
|| desc.contains(Constants.domainDescriptionMarker)
|| desc.contains(Constants.hostnameDescriptionMarker) {
queryItems.append(URLQueryItem(
name: Constants.certErrorQueryParam,
value: Constants.defaultBadCertDomainError
Expand Down Expand Up @@ -227,7 +232,8 @@ class NativeErrorPageHelper {
)
}

// TODO: FXIOS-14569
// TODO: FXIOS-14569 — Investigate using SecTrustEvaluateWithError to evaluate TLS trust
// errors instead of private APIs.
if let underlyingError = error.userInfo[NSUnderlyingErrorKey] as? NSError,
let certErrorCode = underlyingError.userInfo[Constants.cfStreamErrorCodeKey] as? Int,
certErrorCode == Constants.sslErrorBadCertDomainCode {
Expand Down
Loading