Skip to content

fix a missing getindex on a variable made into a Ref #200

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

Closed
KristofferC wants to merge 1 commit into from
Closed

fix a missing getindex on a variable made into a Ref #200

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
33 changes: 16 additions & 17 deletions src/UserNSRunner.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ function UserNSRunner(workspace_root::String;

# If runner_override is not yet set, let's probe to see if we can use
# unprivileged containers, and if we can't, switch over to privileged.
if isempty(runner_override[])
if runner_override == ""
if !probe_unprivileged_containers()
msg = strip("""
Unable to run unprivileged containers on this system!
Expand All @@ -95,14 +95,14 @@ function UserNSRunner(workspace_root::String;
environment variable to "privileged" before starting Julia.
""")
@warn(replace(msg, "\n" => " "))
runner_override[] = "privileged"
runner_override = "privileged"
else
runner_override[] = "userns"
runner_override = "userns"
end
end

# Check to see if we need to run privileged containers.
if runner_override[] == "privileged"
if runner_override == "privileged"
# Next, prefer `sudo`, but allow fallback to `su`. Also, force-set
# our environmental mappings with sudo, because it is typically
# lost and forgotten. :(
Expand All @@ -129,7 +129,7 @@ end
prompted_userns_run_privileged = false
function warn_priviledged()
global prompted_userns_run_privileged
if runner_override[] == "privileged" && !prompted_userns_run_privileged
if runner_override == "privileged" && !prompted_userns_run_privileged
@info("Running privileged container via `sudo`, may ask for your password:")
prompted_userns_run_privileged = true
end
Expand Down Expand Up @@ -183,7 +183,8 @@ function Base.read(ur::UserNSRunner, cmd; verbose=false)
end

const AnyRedirectable = Union{Base.AbstractCmd, Base.TTY, IOStream}
function run_interactive(ur::UserNSRunner, user_cmd::Cmd; stdin = nothing, stdout = nothing, stderr = nothing, verbose::Bool = false)

function get_interactive_cmd(ur::UserNSRunner, user_cmd::Cmd; stdin = nothing, stdout = nothing, stderr = nothing, verbose::Bool = false)
warn_priviledged()

cmd = setenv(`$(ur.sandbox_cmd) -- $(user_cmd.exec)`, ur.env)
Expand All @@ -202,14 +203,13 @@ function run_interactive(ur::UserNSRunner, user_cmd::Cmd; stdin = nothing, stdou
cmd = pipeline(cmd, stderr=stderr)
end

try
mount_shards(ur; verbose=verbose)
return success(run(cmd))
finally
unmount_shards(ur)
end
return cmd
end

setup_runner(ur::UserNSRunner; verbose::Bool=false) = mount_shards(ur; verbose)
teardown_runner(ur::UserNSRunner; verbose::Bool=false) = unmount_shards(ur; verbose)


"""
uname()

Expand All @@ -222,7 +222,7 @@ function uname()
error("Could not find libc, unable to call uname()")
end
libc = dlopen(first(libcs))
uname_hdl = dlsym(libc::Ptr{Cvoid}, :uname)
uname_hdl = dlsym(libc, :uname)

# The uname struct can have wildly differing layouts; we take advantage
# of the fact that it is just a bunch of NULL-terminated strings laid out
Expand Down Expand Up @@ -393,7 +393,7 @@ to make that decision.
function is_ecryptfs(path::AbstractString; verbose::Bool=false)
# Canonicalize `path` immediately, and if it's a directory, add a "/" so
# as to be consistent with the rest of this function
path::AbstractString = abspath(path)
path = abspath(path)
if isdir(path)
path = abspath(path * "/")
end
Expand All @@ -418,7 +418,7 @@ function is_ecryptfs(path::AbstractString; verbose::Bool=false)
mounts = [(abspath(m[1]*"/"), m[2]) for m in mounts]

# Fast-path asking for a mountpoint directly (e.g. not a subdirectory)
direct_path = Bool[m[1] == path for m in mounts]
direct_path = [m[1] == path for m in mounts]
local parent
if any(direct_path)
parent = mounts[findfirst(direct_path)]
Expand All @@ -440,11 +440,10 @@ end
function check_encryption(workspace_root::AbstractString;
verbose::Bool = false)
# If we've explicitly allowed ecryptfs, just quit out immediately
global allow_ecryptfs
if allow_ecryptfs[]
return
end
msg = String[]
msg = []

is_encrypted, mountpoint = is_ecryptfs(workspace_root; verbose=verbose)
if is_encrypted
Expand Down