Skip to content

Commit 471bc67

Browse files
committed
PR changes
1 parent 0fb563a commit 471bc67

File tree

3 files changed

+326
-273
lines changed

3 files changed

+326
-273
lines changed

Sources/GRPCNIOTransportHTTP2Posix/TLSConfig.swift

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,10 +294,10 @@ extension HTTP2ClientTransport.Posix.Config {
294294
/// - serverHostname: An optional server hostname to use when verifying certificates.
295295
public init(
296296
certificateChain: [TLSConfig.CertificateSource],
297-
privateKey: TLSConfig.PrivateKeySource? = nil,
297+
privateKey: TLSConfig.PrivateKeySource?,
298298
serverCertificateVerification: TLSConfig.CertificateVerification,
299299
trustRoots: TLSConfig.TrustRootsSource,
300-
serverHostname: String? = nil
300+
serverHostname: String?
301301
) {
302302
self.certificateChain = certificateChain
303303
self.privateKey = privateKey
@@ -330,6 +330,16 @@ extension HTTP2ClientTransport.Posix.Config {
330330
return config
331331
}
332332

333+
/// Create a new HTTP2 NIO Posix transport TLS config, with some values defaulted:
334+
/// - `certificateChain` equals `[]`
335+
/// - `privateKey` equals `nil`
336+
/// - `serverCertificateVerification` equals `fullVerification`
337+
/// - `trustRoots` equals `systemDefault`
338+
/// - `serverHostname` equals `nil`
339+
public static var defaults: Self {
340+
Self.defaults()
341+
}
342+
333343
/// Create a new HTTP2 NIO Posix transport TLS config, with some values defaulted to match
334344
/// the requirements of mTLS:
335345
/// - `trustRoots` equals `systemDefault`
@@ -349,7 +359,8 @@ extension HTTP2ClientTransport.Posix.Config {
349359
certificateChain: certificateChain,
350360
privateKey: privateKey,
351361
serverCertificateVerification: .fullVerification,
352-
trustRoots: .systemDefault
362+
trustRoots: .systemDefault,
363+
serverHostname: nil
353364
)
354365
configure(&config)
355366
return config

Tests/GRPCNIOTransportHTTP2Tests/HTTP2TransportNIOPosixTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ final class HTTP2TransportNIOPosixTests: XCTestCase {
410410
}
411411

412412
func testClientTLSConfig_Defaults() throws {
413-
let grpcTLSConfig = HTTP2ClientTransport.Posix.Config.TLS.defaults()
413+
let grpcTLSConfig = HTTP2ClientTransport.Posix.Config.TLS.defaults
414414
let nioSSLTLSConfig = try TLSConfiguration(grpcTLSConfig)
415415

416416
XCTAssertEqual(nioSSLTLSConfig.certificateChain, [])
@@ -422,7 +422,7 @@ final class HTTP2TransportNIOPosixTests: XCTestCase {
422422
}
423423

424424
func testClientTLSConfig_CustomCertificateChainAndPrivateKey() throws {
425-
var grpcTLSConfig = HTTP2ClientTransport.Posix.Config.TLS.defaults()
425+
var grpcTLSConfig = HTTP2ClientTransport.Posix.Config.TLS.defaults
426426
grpcTLSConfig.certificateChain = [
427427
.bytes(Array(Self.samplePemCert.utf8), format: .pem)
428428
]
@@ -451,7 +451,7 @@ final class HTTP2TransportNIOPosixTests: XCTestCase {
451451
}
452452

453453
func testClientTLSConfig_CustomTrustRoots() throws {
454-
var grpcTLSConfig = HTTP2ClientTransport.Posix.Config.TLS.defaults()
454+
var grpcTLSConfig = HTTP2ClientTransport.Posix.Config.TLS.defaults
455455
grpcTLSConfig.trustRoots = .certificates([.bytes(Array(Self.samplePemCert.utf8), format: .pem)])
456456
let nioSSLTLSConfig = try TLSConfiguration(grpcTLSConfig)
457457

@@ -467,7 +467,7 @@ final class HTTP2TransportNIOPosixTests: XCTestCase {
467467
}
468468

469469
func testClientTLSConfig_CustomCertificateVerification() throws {
470-
var grpcTLSConfig = HTTP2ClientTransport.Posix.Config.TLS.defaults()
470+
var grpcTLSConfig = HTTP2ClientTransport.Posix.Config.TLS.defaults
471471
grpcTLSConfig.serverCertificateVerification = .noHostnameVerification
472472
let nioSSLTLSConfig = try TLSConfiguration(grpcTLSConfig)
473473

0 commit comments

Comments
 (0)