Skip to content

Commit

Permalink
Fix brave/brave-ios#8173: Update URL bar design & display origin-only…
Browse files Browse the repository at this point in the history 
… URLs (brave/brave-ios#8417)
  • Loading branch information
@kylehickinson
kylehickinson authored Nov 22, 2023
1 parent 61ccdcd commit b5cc113
Show file tree
Hide file tree
Showing 24 changed files with 861 additions and 515 deletions.
150 changes: 130 additions & 20 deletions Sources/Brave/Frontend/Browser/BrowserViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ public class BrowserViewController: UIViewController {
updateTabsBarVisibility()
}

private func updateToolbarSecureContentState(_ secureContentState: TabSecureContentState) {
func updateToolbarSecureContentState(_ secureContentState: TabSecureContentState) {
topToolbar.secureContentState = secureContentState
collapsedURLBarView.secureContentState = secureContentState
}
Expand Down Expand Up @@ -1789,8 +1789,12 @@ public class BrowserViewController: UIViewController {
break
}

if tab.secureContentState == .secure && !webView.hasOnlySecureContent {
tab.secureContentState = .insecure
if tab.secureContentState == .secure, !webView.hasOnlySecureContent,
tab.url?.origin == tab.webView?.url?.origin {
if let url = tab.webView?.url, url.isReaderModeURL {
break
}
tab.secureContentState = .mixedContent
}

if tabManager.selectedTab === tab {
Expand All @@ -1809,9 +1813,9 @@ public class BrowserViewController: UIViewController {
let internalUrl = InternalURL(url),
(internalUrl.isAboutURL || internalUrl.isAboutHomeURL) {

tab.secureContentState = .localHost
tab.secureContentState = .localhost
if tabManager.selectedTab === tab {
updateToolbarSecureContentState(.localHost)
updateToolbarSecureContentState(.localhost)
}
break
}
Expand All @@ -1821,27 +1825,29 @@ public class BrowserViewController: UIViewController {
internalUrl.isErrorPage {

if ErrorPageHelper.certificateError(for: url) != 0 {
tab.secureContentState = .insecure
if tabManager.selectedTab === tab {
updateToolbarSecureContentState(.insecure)
}
break
tab.secureContentState = .invalidCert
} else {
tab.secureContentState = .missingSSL
}
if tabManager.selectedTab === tab {
updateToolbarSecureContentState(tab.secureContentState)
}
break
}

if url.isReaderModeURL || InternalURL.isValid(url: url) {
tab.secureContentState = .unknown
tab.secureContentState = .localhost
if tabManager.selectedTab === tab {
updateToolbarSecureContentState(.unknown)
updateToolbarSecureContentState(.localhost)
}
break
}

// All our checks failed, we show the page as insecure
tab.secureContentState = .insecure
tab.secureContentState = .missingSSL
} else {
// When there is no URL, it's likely a new tab.
tab.secureContentState = .localHost
tab.secureContentState = .localhost
}

if tabManager.selectedTab === tab {
Expand All @@ -1852,7 +1858,7 @@ public class BrowserViewController: UIViewController {

guard let scheme = tab.webView?.url?.scheme,
let host = tab.webView?.url?.host else {
tab.secureContentState = .insecure
tab.secureContentState = .unknown
self.updateURLBar()
return
}
Expand Down Expand Up @@ -1880,10 +1886,10 @@ public class BrowserViewController: UIViewController {
try await BraveCertificateUtils.evaluateTrust(serverTrust, for: host)
tab.secureContentState = .secure
} else {
tab.secureContentState = .insecure
tab.secureContentState = .invalidCert
}
} catch {
tab.secureContentState = .insecure
tab.secureContentState = .invalidCert
}

Task { @MainActor in
Expand Down Expand Up @@ -1938,7 +1944,7 @@ public class BrowserViewController: UIViewController {
updateToolbarSecureContentState(tab.secureContentState)
}

let isPage = tab.url?.displayURL?.isWebPage() ?? false
let isPage = tab.url?.isWebPage() ?? false
navigationToolbar.updatePageStatus(isPage)
updateWebViewPageZoom(tab: tab)
}
Expand Down Expand Up @@ -2119,6 +2125,22 @@ public class BrowserViewController: UIViewController {
activities.append(sendTabToSelfActivity)
}

if let tab = self.tabManager.selectedTab, tab.secureContentState.shouldDisplayWarning {
if tab.readerModeAvailableOrActive {
// If the reader mode button is occluded due to a secure content state warning add it as an activity
activities.append(
BasicMenuActivity(
title: Strings.toggleReaderMode,
braveSystemImage: "leo.product.speedreader",
callback: { [weak self] in
self?.toggleReaderMode()
}
)
)
}
// Any other buttons on the leading side of the location view should be added here as well
}

let findInPageActivity = FindInPageActivity() { [unowned self] in
if #available(iOS 16.0, *), let findInteraction = self.tabManager.selectedTab?.webView?.findInteraction {
findInteraction.searchText = ""
Expand Down Expand Up @@ -2252,6 +2274,13 @@ public class BrowserViewController: UIViewController {
activities.append(addSearchEngineActivity)
}

if let secureState = tabManager.selectedTab?.secureContentState, secureState != .missingSSL && secureState != .unknown {
let displayCertificateActivity = BasicMenuActivity(title: Strings.displayCertificate, braveSystemImage: "leo.lock.plain") { [weak self] in
self?.displayPageCertificateInfo()
}
activities.append(displayCertificateActivity)
}

activities.append(ReportWebCompatibilityIssueActivity() { [weak self] in
self?.showSubmitReportView(for: url)
})
Expand Down Expand Up @@ -2463,6 +2492,20 @@ public class BrowserViewController: UIViewController {
}
}

func toggleReaderMode() {
guard let tab = tabManager.selectedTab else { return }
if let readerMode = tab.getContentScript(name: ReaderModeScriptHandler.scriptName) as? ReaderModeScriptHandler {
switch readerMode.state {
case .available:
enableReaderMode()
case .active:
disableReaderMode()
case .unavailable:
break
}
}
}

func handleToolbarVisibilityStateChange(
_ state: ToolbarVisibilityViewModel.ToolbarState,
progress: CGFloat?
Expand Down Expand Up @@ -2774,7 +2817,7 @@ extension BrowserViewController: TabDelegate {
contentController: vc,
contentSizeBehavior: .preferredContentSize)
popover.addsConvenientDismissalMargins = false
popover.present(from: topToolbar.locationView.rewardsButton, on: self)
popover.present(from: topToolbar.rewardsButton, on: self)
popover.popoverDidDismiss = { _ in
// This gets called if popover is dismissed by user gesture
// This does not conflict with 'Enable Rewards' button.
Expand All @@ -2791,7 +2834,7 @@ extension BrowserViewController: TabDelegate {
let popover2 = PopoverController(
contentController: vc2,
contentSizeBehavior: .preferredContentSize)
popover2.present(from: self.topToolbar.locationView.rewardsButton, on: self)
popover2.present(from: self.topToolbar.rewardsButton, on: self)
}

vc.linkTapped = { [unowned self] request in
Expand Down Expand Up @@ -3411,3 +3454,70 @@ extension BrowserViewController: IAPObserverDelegate {
}
}
}

// Certificate info
extension BrowserViewController {

func displayPageCertificateInfo() {
guard let webView = tabManager.selectedTab?.webView else {
Logger.module.error("Invalid WebView")
return
}

let getServerTrustForErrorPage = { () -> SecTrust? in
do {
if let url = webView.url {
return try ErrorPageHelper.serverTrust(from: url)
}
} catch {
Logger.module.error("\(error.localizedDescription)")
}

return nil
}

guard let trust = webView.serverTrust ?? getServerTrustForErrorPage() else {
return
}

let host = webView.url?.host

Task.detached {
let serverCertificates: [SecCertificate] = SecTrustCopyCertificateChain(trust) as? [SecCertificate] ?? []

// TODO: Instead of showing only the first cert in the chain,
// have a UI that allows users to select any certificate in the chain (similar to Desktop browsers)
if let serverCertificate = serverCertificates.first,
let certificate = BraveCertificateModel(certificate: serverCertificate) {

var errorDescription: String?

do {
try await BraveCertificateUtils.evaluateTrust(trust, for: host)
} catch {
Logger.module.error("\(error.localizedDescription)")

// Remove the common-name from the first part of the error message
// This is because the certificate viewer already displays it.
// If it doesn't match, it won't be removed, so this is fine.
errorDescription = error.localizedDescription
if let range = errorDescription?.range(of: "“\(certificate.subjectName.commonName)” ") ??
errorDescription?.range(of: "\"\(certificate.subjectName.commonName)\" ") {
errorDescription = errorDescription?.replacingCharacters(in: range, with: "").capitalizeFirstLetter
}
}

await MainActor.run { [errorDescription] in
if #available(iOS 16.0, *) {
// System components sit on top so we want to dismiss it
webView.findInteraction?.dismissFindNavigator()
}
let certificateViewController = CertificateViewController(certificate: certificate, evaluationError: errorDescription)
certificateViewController.modalPresentationStyle = .pageSheet
certificateViewController.sheetPresentationController?.detents = [.medium(), .large()]
self.present(certificateViewController, animated: true)
}
}
}
}
}
10 changes: 5 additions & 5 deletions Sources/Brave/Frontend/Browser/BrowserViewController/BVC+Rewards.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ extension BrowserViewController {
func updateRewardsButtonState() {
if !isViewLoaded { return }
if !BraveRewards.isAvailable {
self.topToolbar.locationView.rewardsButton.isHidden = true
self.topToolbar.rewardsButton.isHidden = true
return
}
self.topToolbar.locationView.rewardsButton.isHidden = Preferences.Rewards.hideRewardsIcon.value || privateBrowsingManager.isPrivateBrowsing
self.topToolbar.locationView.rewardsButton.iconState = Preferences.Rewards.rewardsToggledOnce.value ? (rewards.isEnabled || rewards.isCreatingWallet ? .enabled : .disabled) : .initial
self.topToolbar.rewardsButton.isHidden = Preferences.Rewards.hideRewardsIcon.value || privateBrowsingManager.isPrivateBrowsing
self.topToolbar.rewardsButton.iconState = Preferences.Rewards.rewardsToggledOnce.value ? (rewards.isEnabled || rewards.isCreatingWallet ? .enabled : .disabled) : .initial
}

func showBraveRewardsPanel() {
Expand All @@ -44,7 +44,7 @@ extension BrowserViewController {

Preferences.FullScreenCallout.rewardsCalloutCompleted.value = true
present(controller, animated: true)
topToolbar.locationView.rewardsButton.iconState = Preferences.Rewards.rewardsToggledOnce.value ? (rewards.isEnabled || rewards.isCreatingWallet ? .enabled : .disabled) : .initial
topToolbar.rewardsButton.iconState = Preferences.Rewards.rewardsToggledOnce.value ? (rewards.isEnabled || rewards.isCreatingWallet ? .enabled : .disabled) : .initial
return
}

Expand All @@ -70,7 +70,7 @@ extension BrowserViewController {

let popover = PopoverController(contentController: braveRewardsPanel)
popover.addsConvenientDismissalMargins = false
popover.present(from: topToolbar.locationView.rewardsButton, on: self)
popover.present(from: topToolbar.rewardsButton, on: self)
popover.popoverDidDismiss = { [weak self] _ in
guard let self = self else { return }
if let tabId = self.tabManager.selectedTab?.rewardsId, self.rewards.rewardsAPI?.selectedTabId == 0 {
Expand Down
12 changes: 6 additions & 6 deletions Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController+Onboarding.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@ extension BrowserViewController {
guard presentedViewController == nil else {
return
}

let frame = view.convert(
topToolbar.locationView.urlTextField.frame,
from: topToolbar.locationView).insetBy(dx: -7.0, dy: -1.0)
topToolbar.locationView.frame,
from: topToolbar.locationView).insetBy(dx: -1.0, dy: -1.0)

// Present the popover
let controller = WelcomeOmniBoxOnboardingController()
Expand All @@ -95,7 +95,7 @@ extension BrowserViewController {

presentPopoverContent(
using: controller,
with: frame, cornerRadius: 6.0,
with: frame, cornerRadius: topToolbar.locationContainer.layer.cornerRadius,
didDismiss: { [weak self] in
guard let self = self else { return }

Expand Down Expand Up @@ -275,12 +275,12 @@ extension BrowserViewController {
}

let popover = PopoverController(contentController: controller)
popover.previewForOrigin = .init(view: topToolbar.locationView.shieldsButton, action: { [weak self] popover in
popover.previewForOrigin = .init(view: topToolbar.shieldsButton, action: { [weak self] popover in
popover.dismissPopover() {
self?.presentBraveShieldsViewController()
}
})
popover.present(from: topToolbar.locationView.shieldsButton, on: self)
popover.present(from: topToolbar.shieldsButton, on: self)

popover.popoverDidDismiss = { [weak self] _ in
DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
Expand Down
4 changes: 2 additions & 2 deletions ...ve/Frontend/Browser/BrowserViewController/BrowserViewController+ProductNotification.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ extension BrowserViewController {

let popover = PopoverController(contentController: controller)
popover.addsConvenientDismissalMargins = false
popover.previewForOrigin = .init(view: topToolbar.locationView.shieldsButton)
popover.present(from: topToolbar.locationView.shieldsButton, on: self)
popover.previewForOrigin = .init(view: topToolbar.shieldsButton)
popover.present(from: topToolbar.shieldsButton, on: self)
}
}
1 change: 1 addition & 0 deletions ...ave/Frontend/Browser/BrowserViewController/BrowserViewController+TabManagerDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,7 @@ extension BrowserViewController: TabManagerDelegate {
toolbar?.searchButton.menu = UIMenu(title: "", identifier: nil, children: addTabMenuActionList)

// Update Actions for Add-Tab Button
topToolbar.addTabButton.menu = UIMenu(title: "", identifier: nil, children: addTabMenuActionList)
toolbar?.addTabButton.menu = UIMenu(title: "", identifier: nil, children: addTabMenuActionList)
}
}
Loading

0 comments on commit b5cc113

Please sign in to comment.