Skip to content
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

Jump to bottom

Cache permissions and umask issues after switch to mkstemp #255

Merged
merged 4 commits into from Apr 2, 2019
Merged

Cache permissions and umask issues after switch to mkstemp #255

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a74173f
Fixing file permissions for bootsnap cache
kpumuk Apr 2, 2019
88ceb72
Apply umask to cache files
kpumuk Apr 2, 2019
a40a1a1
No need to close the file, since fd is -1
kpumuk Apr 2, 2019
a66138b
When rename fails - do not try to chmod
kpumuk Apr 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion ext/bootsnap/bootsnap.c
View file
Open in desktop
Expand Up @@ -74,6 +74,8 @@ static uint32_t current_ruby_platform;
static uint32_t current_ruby_revision;
/* Invalidates cache when RubyVM::InstructionSequence.compile_option changes */
static uint32_t current_compile_option_crc32 = 0;
/* Current umask */
static mode_t current_umask;

/* Bootsnap::CompileCache::{Native, Uncompilable} */
static VALUE rb_mBootsnap;
Expand Down Expand Up @@ -142,6 +144,9 @@ Init_bootsnap(void)
rb_define_module_function(rb_mBootsnap_CompileCache_Native, "coverage_running?", bs_rb_coverage_running, 0);
rb_define_module_function(rb_mBootsnap_CompileCache_Native, "fetch", bs_rb_fetch, 3);
rb_define_module_function(rb_mBootsnap_CompileCache_Native, "compile_option_crc32=", bs_compile_option_crc32_set, 1);

current_umask = umask(0777);
umask(current_umask);
}

/*
Expand Down Expand Up @@ -482,7 +487,6 @@ atomic_write_cache_file(char * path, struct bs_cache_key * key, VALUE data, char
*errno_provenance = (char *)"bs_fetch:atomic_write_cache_file:mkpath";
return -1;
}
close(fd);
fd = open(tmp_path, O_WRONLY | O_CREAT, 0664);
if (fd < 0) {
*errno_provenance = (char *)"bs_fetch:atomic_write_cache_file:open";
Expand Down Expand Up @@ -517,6 +521,11 @@ atomic_write_cache_file(char * path, struct bs_cache_key * key, VALUE data, char
ret = rename(tmp_path, path);
if (ret < 0) {
*errno_provenance = (char *)"bs_fetch:atomic_write_cache_file:rename";
return -1;
}
ret = chmod(path, 0664 & ~current_umask);
if (ret < 0) {
*errno_provenance = (char *)"bs_fetch:atomic_write_cache_file:chmod";
}
return ret;
}
Expand Down