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
14 changes: 7 additions & 7 deletions src-tauri/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,17 @@ pub async fn get_window_cookies(
let cookies: Vec<_> = all_cookies
.into_iter()
.filter(|cookie| {
if target_is_ip {
return true;
}

let domain_opt = cookie.domain();
let domain = domain_opt.unwrap_or("");
let cd = domain.trim_start_matches('.');
let domain = domain_opt.unwrap_or("").trim_start_matches('.').to_string();
let td = target_domain.as_str();

if target_is_ip {
// IP 站点只接受 host-only cookie 或者域名与 IP 完全一致的 cookie,避免捞到其他站点的凭据
return domain_opt.is_none() || (!domain.is_empty() && domain == td);
}

let exact_or_subdomain =
!cd.is_empty() && (cd == td || cd.ends_with(&format!(".{}", td)) || td.ends_with(&format!(".{}", cd)));
!domain.is_empty() && (domain == td || domain.ends_with(&format!(".{}", td)) || td.ends_with(&format!(".{}", domain)));
let host_only_cookie = domain_opt.is_none() && !td.is_empty();

exact_or_subdomain || host_only_cookie
Expand Down
2 changes: 1 addition & 1 deletion ui/components/SideBar/profile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ onMounted(async () => {
org: currentOrgData,
system_roles: profileData.system_roles,
availableOrgs,
xpackLicenseValid: xpack_license_valid ?? true,
xpackLicenseValid: xpack_license_valid ?? false,
language,
connectionInfo: {
protocol: "",
Expand Down