Fix Ollama authentication

rust/src/core/http.rs

@@ -15,15 +15,15 @@ pub fn credentialed_http_client_builder() -> reqwest::ClientBuilder {
             return attempt.follow();
         };
 
-        if is_same_origin_redirect(last_url, attempt.url()) {
+        if is_same_origin(last_url, attempt.url()) {
             attempt.follow()
         } else {
             attempt.stop()
         }
     }))
 }
 
-fn is_same_origin_redirect(from: &Url, to: &Url) -> bool {
+pub(crate) fn is_same_origin(from: &Url, to: &Url) -> bool {
     from.scheme() == to.scheme()
         && from.host_str() == to.host_str()
         && from.port_or_known_default() == to.port_or_known_default()
@@ -39,23 +39,23 @@ mod tests {
 
     #[test]
     fn same_origin_redirect_allows_path_changes() {
-        assert!(is_same_origin_redirect(
+        assert!(is_same_origin(
             &url("https://example.com/a"),
             &url("https://example.com/b?x=1"),
         ));
     }
 
     #[test]
     fn same_origin_redirect_rejects_host_changes() {
-        assert!(!is_same_origin_redirect(
+        assert!(!is_same_origin(
             &url("https://example.com/a"),
             &url("https://evil.example/b"),
         ));
     }
 
     #[test]
     fn same_origin_redirect_rejects_scheme_changes() {
-        assert!(!is_same_origin_redirect(
+        assert!(!is_same_origin(
             &url("https://example.com/a"),
             &url("http://example.com/b"),
         ));

rust/src/providers/mod.rs

@@ -121,13 +121,26 @@ pub use zed::ZedProvider;
 pub(crate) fn browser_cookie_header(
     domains: &[&str],
 ) -> Result<String, crate::core::ProviderError> {
-    crate::browser::cookies::get_cookie_header_for_domains(domains).map_err(|error| match error {
+    crate::browser::cookies::get_cookie_header_for_domains(domains)
+        .map_err(map_browser_cookie_error)
+}
+
+pub(crate) fn browser_cookies_for_domain(
+    domain: &str,
+) -> Result<Vec<crate::browser::cookies::Cookie>, crate::core::ProviderError> {
+    crate::browser::cookies::get_cookies_for_domain(domain).map_err(map_browser_cookie_error)
+}
+
+fn map_browser_cookie_error(
+    error: crate::browser::cookies::CookieError,
+) -> crate::core::ProviderError {
+    match error {
         crate::browser::cookies::CookieError::BrowserNotInstalled
         | crate::browser::cookies::CookieError::NotFound(_) => {
             crate::core::ProviderError::NoCookies
         }
         _ => crate::core::ProviderError::Other(format!("Failed to read browser cookies: {error}")),
-    })
+    }
 }
 
 pub(crate) fn resolve_api_key(