-
-
Notifications
You must be signed in to change notification settings - Fork 335
fix(ios): support None as an SSH tunnel auth method #1931
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
Packages/TableProCore/Tests/TableProModelsTests/SSHConfigurationTests.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| import Foundation | ||
| import Testing | ||
|
|
||
| @testable import TableProModels | ||
|
|
||
| @Suite("iOS SSHConfiguration auth method decoding") | ||
| struct SSHConfigurationTests { | ||
| private func decode(authMethod raw: String) throws -> SSHConfiguration { | ||
| let json = """ | ||
| {"host":"ssh.example.com","port":22,"username":"tailscale","authMethod":"\(raw)","jumpHosts":[]} | ||
| """ | ||
| return try JSONDecoder().decode(SSHConfiguration.self, from: Data(json.utf8)) | ||
| } | ||
|
|
||
| @Test("decodes the macOS None raw value") | ||
| func decodesMacOSNone() throws { | ||
| #expect(try decode(authMethod: "None").authMethod == .none) | ||
| } | ||
|
|
||
| @Test("decodes the lowercase none raw value") | ||
| func decodesLowercaseNone() throws { | ||
| #expect(try decode(authMethod: "none").authMethod == .none) | ||
| } | ||
|
|
||
| @Test("None survives an encode and decode round trip") | ||
| func roundTripsNone() throws { | ||
| let config = SSHConfiguration(host: "ssh.example.com", username: "tailscale", authMethod: .none) | ||
| let data = try JSONEncoder().encode(config) | ||
| let decoded = try JSONDecoder().decode(SSHConfiguration.self, from: data) | ||
| #expect(decoded.authMethod == .none) | ||
| } | ||
|
|
||
| @Test("an unrecognized auth method still falls back to password") | ||
| func unknownFallsBackToPassword() throws { | ||
| #expect(try decode(authMethod: "totp-only").authMethod == .password) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| // | ||
| // SSHAuthMethodTests.swift | ||
| // TableProTests | ||
| // | ||
|
|
||
| import Foundation | ||
| import Testing | ||
|
|
||
| @testable import TablePro | ||
|
|
||
| @Suite("SSHAuthMethod form contract") | ||
| struct SSHAuthMethodTests { | ||
| @Test("None is the only method without two-factor authentication") | ||
| func noneHidesTwoFactor() { | ||
| #expect(SSHAuthMethod.none.supportsTwoFactorAuthentication == false) | ||
|
|
||
| for method in SSHAuthMethod.allCases where method != .none { | ||
| #expect(method.supportsTwoFactorAuthentication, "\(method.rawValue) should support two-factor") | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When a synced or imported connection uses this newly supported
.nonevalue,ConnectionInfoView.swift:107treats every non-password method as"Private Key". The tunnel can now authenticate successfully without a key, but its connection details misleadingly report Private Key; add an explicit None display case (and ideally handle the other enum cases rather than collapsing them).Useful? React with 👍 / 👎.