Skip to content

set permissions to 744 for all zipped files #185

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
merged 1 commit into from
Jun 2, 2021
Merged

set permissions to 744 for all zipped files #185

Show file tree
Hide file tree
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
11 changes: 8 additions & 3 deletions tmc-langs-plugins/src/tmc_zip.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,17 @@ pub fn zip_student_files<P: StudentFilePolicy>(
.unwrap_or_else(|| entry.path());
if entry.path().is_dir() {
log::trace!("adding directory {}", path.display());
writer
.add_directory(path_to_zip_compatible_string(path), FileOptions::default())?;
writer.add_directory(
path_to_zip_compatible_string(path),
FileOptions::default().unix_permissions(0o744),
)?;
} else {
let bytes = file_util::read_file(entry.path())?;
log::trace!("writing file {}", path.display());
writer.start_file(path_to_zip_compatible_string(path), FileOptions::default())?;
writer.start_file(
path_to_zip_compatible_string(path),
FileOptions::default().unix_permissions(0o744),
)?;
writer
.write_all(&bytes)
.map_err(|e| TmcError::ZipWrite(path.to_path_buf(), e))?;
Expand Down
4 changes: 2 additions & 2 deletions tmc-langs/src/course_refresher.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,15 +399,15 @@ fn execute_zip(
if entry.path().is_file() {
writer.start_file(
relative_path.to_string_lossy(),
zip::write::FileOptions::default(),
zip::write::FileOptions::default().unix_permissions(0o744),
)?;
let bytes = file_util::read_file(entry.path())?;
writer.write_all(&bytes).map_err(LangsError::ZipWrite)?;
} else {
// java-langs expects directories to have their own entries
writer.start_file(
relative_path.join("").to_string_lossy(), // java-langs expects directory entries to have a trailing slash
zip::write::FileOptions::default(),
zip::write::FileOptions::default().unix_permissions(0o744),
)?;
}
}
Expand Down
10 changes: 8 additions & 2 deletions tmc-langs/src/submission_packaging.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,9 +294,15 @@ pub fn prepare_submission(
stripped.display()
);
if entry_path.is_dir() {
archive.add_directory(stripped.to_string_lossy(), FileOptions::default())?;
archive.add_directory(
stripped.to_string_lossy(),
FileOptions::default().unix_permissions(0o744),
)?;
} else {
archive.start_file(stripped.to_string_lossy(), FileOptions::default())?;
archive.start_file(
stripped.to_string_lossy(),
FileOptions::default().unix_permissions(0o744),
)?;
let mut file = file_util::open_file(entry_path)?;
std::io::copy(&mut file, &mut archive)
.map_err(|e| LangsError::TarAppend(entry_path.to_path_buf(), e))?;
Expand Down