Skip to content

also reset SYSTEM_CA_ROOTS from __init__ #35

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
KristofferC merged 2 commits into from
Feb 20, 2024
Merged

also reset SYSTEM_CA_ROOTS from __init__ #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5736d5e
also reset SYSTEM_CA_ROOTS from __init__
StefanKarpinski Feb 15, 2024
f1e9e9e
Update src/NetworkOptions.jl
StefanKarpinski Feb 16, 2024
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
6 changes: 6 additions & 0 deletions src/NetworkOptions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,10 @@ include("ca_roots.jl")
include("ssh_options.jl")
include("verify_host.jl")

function __init__()
SYSTEM_CA_ROOTS[] = nothing
BUNDLED_KNOWN_HOSTS_FILE[] = nothing
empty!(ENV_HOST_PATTERN_CACHE)
end

end # module
4 changes: 2 additions & 2 deletions src/ca_roots.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const BSD_CA_ROOTS = [
]

const SYSTEM_CA_ROOTS_LOCK = ReentrantLock()
const SYSTEM_CA_ROOTS = Ref{String}()
const SYSTEM_CA_ROOTS = Ref{Union{Nothing, String}}(nothing)

const BEGIN_CERT_REGULAR = "-----BEGIN CERTIFICATE-----"
const BEGIN_CERT_OPENSSL = "-----BEGIN TRUSTED CERTIFICATE-----"
Expand All @@ -84,7 +84,7 @@ NetworkOptions could only find OpenSSL-specific TLS certificates which cannot be

function system_ca_roots()
lock(SYSTEM_CA_ROOTS_LOCK) do
isassigned(SYSTEM_CA_ROOTS) && return # from lock()
SYSTEM_CA_ROOTS[] !== nothing && return # from lock()
search_path = Sys.islinux() ? LINUX_CA_ROOTS :
Sys.isbsd() && !Sys.isapple() ? BSD_CA_ROOTS : String[]
openssl_only = false
Expand Down
7 changes: 0 additions & 7 deletions src/ssh_options.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,6 @@ function bundled_known_hosts()
end
end

function __init__()
# Reset in case we serialized a value here.
lock(BUNDLED_KNOWN_HOSTS_LOCK) do
BUNDLED_KNOWN_HOSTS_FILE[] = nothing
end
end

const BUNDLED_KNOWN_HOSTS = """
github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
Expand Down