Skip to content

fix(ios): preserve protected endpoint ordering #2

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
lightcloud00 wants to merge 1 commit into
base: fix/ios-trust-ratchet-survives-restart
Choose a base branch
from
Open

fix(ios): preserve protected endpoint ordering #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions ios/Sources/CompanionCore/Failover.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,11 +313,11 @@ extension Connection {
/// either walks that complete typed set or, for an older desktop, derives
/// direct routes from the legacy fields — never a lossy mixture of both.
///
/// A protected route that already carried the bearer leads regardless of
/// a lower advertised priority. Otherwise a hand-typed LAN origin
/// (`priority: 0`) would win the sort after restart and the rotation
/// would hand the token to cleartext again. Typing a local address
/// resets `activeEndpoint`, so the priority order remains the escape hatch.
/// When the active route already protected the bearer, all protected
/// routes lead while retaining their advertised priority. Otherwise a
/// hand-typed LAN origin (`priority: 0`) could win after restart and the
/// rotation would hand the token to cleartext again. Typing a local
/// address resets `activeEndpoint`, so priority remains the escape hatch.
public var orderedEndpoints: [CompanionEndpoint] {
var candidates = endpoints ?? []
if !candidates.isEmpty {
Expand All @@ -329,8 +329,9 @@ extension Connection {
? $0.offset < $1.offset
: $0.element.priority < $1.element.priority
}.map(\.element)
if let activeEndpoint, activeEndpoint.protectsCredentials {
candidates = [activeEndpoint] + candidates.filter { $0.url != activeEndpoint.url }
if activeEndpoint?.protectsCredentials == true {
candidates = candidates.filter(\.protectsCredentials)
+ candidates.filter { !$0.protectsCredentials }
}
} else {
candidates = orderedHosts.enumerated().compactMap { offset, candidate in
Expand Down