* fix #203 NetworkTransport race, with main-isolated variables (#206)

Co-authored-by: wti <wti@users.noreply.github.com>

* feat/auth: Authentication implementation (#205)

* feat: added authentication

* feat(auth): improvement to error handling

* feat(auth): updated errors and tests in OAuthClientRegistrar

* feat(auth): updated ci conformance package version

* feat(auth): bumped node version

* feat(auth): updated ci conformance step

* feat(auth): improvement to Linux support

* chore: added docc plugin

* chore: added spi yml

* chore: added documentation step to ci

* chore: increased timeout for test from 5 to 10m

---------

Co-authored-by: Paal Øye-Strømme <paal.o.eye@gmail.com>
Co-authored-by: wti <wti@users.noreply.github.com>
Co-authored-by: yehorsobko <yehorsobko@macpaw.com>
This commit is contained in:
Maksym Mova 2026-03-24 11:05:22 +02:00 • committed by GitHub
commit 6132fd4b5b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -48,7 +48,11 @@ private func makeResponseBody(id: String = "2") -> Data {
return try! JSONSerialization.data(withJSONObject: json)
}
private func makeStatefulPOSTRequest(body: Data, sessionID: String? = nil) -> HTTPRequest {
private func makeStatefulPOSTRequest(
body: Data,
sessionID: String? = nil,
authorization: String? = nil
) -> HTTPRequest {
var headers: [String: String] = [
"Content-Type": "application/json",
"Accept": "application/json, text/event-stream",
@ -56,6 +60,9 @@ private func makeStatefulPOSTRequest(body: Data, sessionID: String? = nil) -> HT
if let sessionID {
headers["Mcp-Session-Id"] = sessionID
}
if let authorization {
headers[HTTPHeaderName.authorization] = authorization
}
return HTTPRequest(method: "POST", headers: headers, body: body)
}
@ -65,7 +72,7 @@ private func makeGETRequest(sessionID: String, lastEventID: String? = nil) -> HT
"Mcp-Session-Id": sessionID,
]
if let lastEventID {
headers["Last-Event-Id"] = lastEventID
headers["Last-Event-ID"] = lastEventID
}
return HTTPRequest(method: "GET", headers: headers)
}
@ -97,6 +104,28 @@ private func makeStatefulTransport(
)
}
private let authResourceMetadataURL =
URL(string: "https://mcp.example.com/.well-known/oauth-protected-resource/mcp")!
private let authResourceIdentifier = URL(string: "https://mcp.example.com/mcp")!
private func makeAuthenticatedStatefulTransport(
challengeScopes: Set<String>? = nil,
tokenValidator: @escaping BearerTokenValidator.TokenValidator
) -> StatefulHTTPServerTransport {
let validator = BearerTokenValidator(
resourceMetadataURL: authResourceMetadataURL,
resourceIdentifier: authResourceIdentifier,
tokenValidator: tokenValidator,
challengeScopeProvider: { _, _ in challengeScopes }
)
return StatefulHTTPServerTransport(
validationPipeline: StandardValidationPipeline(validators: [
validator,
SessionValidator(),
])
)
}
private func makeStatelessTransport() -> StatelessHTTPServerTransport {
StatelessHTTPServerTransport(
validationPipeline: StandardValidationPipeline(validators: [])
@ -628,6 +657,132 @@ struct StatefulHTTPServerTransportTests {
await transport.disconnect()
}
// MARK: - OAuth Bearer Validation
@Test("Bearer auth validator returns 401 with challenge when authorization is missing")
func testBearerAuthValidatorMissingAuthorizationReturns401() async throws {
let transport = makeAuthenticatedStatefulTransport(
challengeScopes: ["files:read"]
) { _, _, _ in
.valid(BearerTokenInfo())
}
try await transport.connect()
let response = await transport.handleRequest(
makeStatefulPOSTRequest(body: makeInitializeBody())
)
#expect(response.statusCode == 401)
let challenge = response.headers[HTTPHeaderName.wwwAuthenticate]
#expect(challenge?.contains("Bearer ") == true)
#expect(
challenge?.contains("resource_metadata=\"\(authResourceMetadataURL.absoluteString)\"")
== true
)
#expect(challenge?.contains("scope=\"files:read\"") == true)
await transport.disconnect()
}
@Test("Bearer auth validator returns 400 when authorization header is malformed")
func testBearerAuthValidatorMalformedAuthorizationReturns400() async throws {
let transport = makeAuthenticatedStatefulTransport { _, _, _ in .valid(BearerTokenInfo()) }
try await transport.connect()
let response = await transport.handleRequest(
makeStatefulPOSTRequest(
body: makeInitializeBody(),
authorization: "Basic dGVzdA=="
)
)
#expect(response.statusCode == 400)
#expect(response.headers[HTTPHeaderName.wwwAuthenticate] == nil)
await transport.disconnect()
}
@Test("Bearer auth validator returns 401 invalid_token for rejected token")
func testBearerAuthValidatorInvalidTokenReturns401() async throws {
let transport = makeAuthenticatedStatefulTransport { _, _, _ in
.invalidToken(errorDescription: "Token expired")
}
try await transport.connect()
let response = await transport.handleRequest(
makeStatefulPOSTRequest(
body: makeInitializeBody(),
authorization: "Bearer expired-token"
)
)
#expect(response.statusCode == 401)
let challenge = response.headers[HTTPHeaderName.wwwAuthenticate]
#expect(challenge?.contains("error=\"invalid_token\"") == true)
#expect(challenge?.contains("error_description=\"Token expired\"") == true)
#expect(
challenge?.contains("resource_metadata=\"\(authResourceMetadataURL.absoluteString)\"")
== true
)
await transport.disconnect()
}
@Test("Bearer auth validator returns 403 insufficient_scope with scope challenge")
func testBearerAuthValidatorInsufficientScopeReturns403() async throws {
let transport = makeAuthenticatedStatefulTransport { token, _, context in
if context.isInitializationRequest, token == "init-token" {
return .valid(BearerTokenInfo())
}
if token == "read-only-token" {
return .insufficientScope(
requiredScopes: ["files:read", "files:write"],
errorDescription: "Additional file write permission required"
)
}
return .invalidToken(errorDescription: "Unknown token")
}
try await transport.connect()
let initResponse = await transport.handleRequest(
makeStatefulPOSTRequest(
body: makeInitializeBody(),
authorization: "Bearer init-token"
)
)
let sessionID = initResponse.headers[HTTPHeaderName.sessionID]
#expect(sessionID != nil)
guard let sessionID else {
await transport.disconnect()
return
}
let response = await transport.handleRequest(
makeStatefulPOSTRequest(
body: makeNotificationBody(),
sessionID: sessionID,
authorization: "Bearer read-only-token"
)
)
#expect(response.statusCode == 403)
let challenge = response.headers[HTTPHeaderName.wwwAuthenticate]
#expect(challenge?.contains("error=\"insufficient_scope\"") == true)
#expect(challenge?.contains("scope=\"files:read files:write\"") == true)
#expect(
challenge?.contains("resource_metadata=\"\(authResourceMetadataURL.absoluteString)\"")
== true
)
#expect(
challenge?.contains(
"error_description=\"Additional file write permission required\""
) == true
)
await transport.disconnect()
}
// MARK: - Resumability
@Test("GET with Last-Event-ID replays stored events")