Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions Sources/CodexBarCore/ProviderEndpointOverrideValidator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ struct ProviderEndpointOverrideValidator: Sendable {
guard let decodedHost = url.host(percentEncoded: false)?.lowercased(),
!decodedHost.isEmpty,
!decodedHost.contains("%"),
decodedHost.rangeOfCharacter(from: .whitespacesAndNewlines) == nil,
decodedHost.rangeOfCharacter(from: .controlCharacters) == nil,
let encodedHost = url.host(percentEncoded: true)?.lowercased(),
self.hostHasNoEncodedDelimiters(encodedHost, decodedHost: decodedHost, url: url)
else { return nil }
Expand Down
12 changes: 12 additions & 0 deletions Tests/CodexBarTests/AlibabaCodingPlanProviderTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,18 @@ struct AlibabaCodingPlanSettingsReaderTests {
]) == nil)
}

@Test
func `endpoint overrides reject whitespace and control characters in hosts`() {
for host in ["https://bad host", "https://bad%20host", "https://bad%09host"] {
#expect(AlibabaCodingPlanSettingsReader.hostOverride(environment: [
AlibabaCodingPlanSettingsReader.hostKey: host,
]) == nil)
#expect(AlibabaCodingPlanSettingsReader.quotaURL(environment: [
AlibabaCodingPlanSettingsReader.quotaURLKey: "\(host)/data/api.json",
]) == nil)
}
}

@Test
func `endpoint overrides require https and no userinfo`() {
#expect(AlibabaCodingPlanSettingsReader.hostOverride(environment: [
Expand Down
12 changes: 12 additions & 0 deletions Tests/CodexBarTests/MiniMaxProviderTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,18 @@ struct MiniMaxEndpointOverrideSettingsTests {
]) == nil)
}

@Test
func `endpoint overrides reject whitespace and control characters in hosts`() {
for host in ["https://bad host", "https://bad%20host", "https://bad%09host"] {
#expect(MiniMaxSettingsReader.hostOverride(environment: [
MiniMaxSettingsReader.hostKey: host,
]) == nil)
#expect(MiniMaxSettingsReader.remainsURL(environment: [
MiniMaxSettingsReader.remainsURLKey: "\(host)/remains",
]) == nil)
}
}

@Test
func `endpoint overrides require https and no userinfo`() {
#expect(MiniMaxSettingsReader.hostOverride(environment: [
Expand Down
Loading