-
Notifications
You must be signed in to change notification settings - Fork 24
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
Add preliminary TLS support - needs fleshing out #111
Draft
Joannis
wants to merge
1
commit into
main
Choose a base branch
from
jo/preliminary-tls-support
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
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 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 | ||||
---|---|---|---|---|---|---|
|
@@ -16,6 +16,7 @@ import Atomics | |||||
import NIOCore | ||||||
import NIOConcurrencyHelpers | ||||||
import NIOPosix | ||||||
import NIOSSL | ||||||
import Logging | ||||||
import struct Foundation.URL | ||||||
import protocol Foundation.LocalizedError | ||||||
|
@@ -52,13 +53,15 @@ extension RedisConnection { | |||||
public var port: Int? { self.address.port } | ||||||
/// The user name used to authenticate connections with. | ||||||
/// - Warning: This property should only be provided if you are running against Redis 6 or higher. | ||||||
public let username: String? | ||||||
public var username: String? | ||||||
/// The password used to authenticate the connection. | ||||||
public let password: String? | ||||||
public var password: String? | ||||||
/// The initial database index that the connection should use. | ||||||
public let initialDatabase: Int? | ||||||
public var initialDatabase: Int? | ||||||
/// The logger prototype that will be used by the connection by default when generating logs. | ||||||
public let defaultLogger: Logger | ||||||
public var defaultLogger: Logger | ||||||
|
||||||
public var tlsConfiguration: TLSConfiguration? | ||||||
|
||||||
internal let address: SocketAddress | ||||||
|
||||||
|
@@ -186,12 +189,16 @@ extension RedisConnection { | |||||
|
||||||
let databaseID = Int(url.lastPathComponent) | ||||||
|
||||||
try self.init( | ||||||
var config = try Self( | ||||||
address: try .makeAddressResolvingHost(host, port: url.port ?? Self.defaultPort), | ||||||
password: url.password, | ||||||
initialDatabase: databaseID, | ||||||
defaultLogger: defaultLogger | ||||||
) | ||||||
|
||||||
config.tlsConfiguration = .clientDefault | ||||||
|
||||||
self = config | ||||||
} | ||||||
|
||||||
private static func validateRedisURL(_ url: URL) throws { | ||||||
|
@@ -200,7 +207,7 @@ extension RedisConnection { | |||||
!scheme.isEmpty | ||||||
else { throw ValidationError.missingURLScheme } | ||||||
|
||||||
guard scheme == "redis" else { throw ValidationError.invalidURLScheme } | ||||||
guard scheme == "redis" || scheme == "rediss" else { throw ValidationError.invalidURLScheme } | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
} | ||||||
} | ||||||
} | ||||||
|
This file contains 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
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.
Can we also add
valkey
scheme?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.
Where can I read more about
valkey
being a scheme?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.
Is it completely compatible with redis?