Skip to content

fix: recognize Ollama __Secure-session cookies #707

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.

Sign up for GitHub

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
ratulsarna merged 1 commit into from
Apr 13, 2026
Merged

fix: recognize Ollama __Secure-session cookies #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Sources/CodexBarCore/Providers/Ollama/OllamaUsageFetcher.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import SweetCookieKit

private let ollamaSessionCookieNames: Set<String> = [
"session",
"__Secure-session",
"ollama_session",
"__Host-ollama_session",
"__Secure-next-auth.session-token",
Expand Down
18 changes: 18 additions & 0 deletions Tests/CodexBarTests/OllamaUsageFetcherTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,14 @@ struct OllamaUsageFetcherTests {
#expect(resolved?.contains("next-auth.session-token.0=abc") == true)
}

@Test
func `manual mode accepts secure session cookie header`() throws {
let resolved = try OllamaUsageFetcher.resolveManualCookieHeader(
override: "__Secure-session=abc; theme=dark",
manualCookieMode: true)
#expect(resolved?.contains("__Secure-session=abc") == true)
}

@Test
func `retry policy retries only for auth errors`() {
#expect(OllamaUsageFetcher.shouldRetryWithNextCookieCandidate(after: OllamaUsageError.invalidCredentials))
Expand Down Expand Up @@ -124,6 +132,16 @@ struct OllamaUsageFetcherTests {
#expect(selected.sourceLabel == "Profile C")
}

@Test
func `cookie selector accepts secure session cookie`() throws {
let candidate = OllamaCookieImporter.SessionInfo(
cookies: [Self.makeCookie(name: "__Secure-session", value: "auth")],
sourceLabel: "Profile D")

let selected = try OllamaCookieImporter.selectSessionInfo(from: [candidate])
#expect(selected.sourceLabel == "Profile D")
}

@Test
func `cookie selector keeps recognized candidates in order`() throws {
let first = OllamaCookieImporter.SessionInfo(
Expand Down