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

Sanitize filenames when using "archive_groupname" #1383

Merged
merged 2 commits into from
Jul 2, 2021
Merged

Sanitize filenames when using "archive_groupname" #1383

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27cc437
Sanitize filenames when using "archive_groupname"
lgritz Jun 22, 2021
b668235
Be even more careful with how we assemble the strings used to form
lgritz Jun 25, 2021
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
26 changes: 18 additions & 8 deletions src/liboslexec/shadingsys.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2453,8 +2453,15 @@ ShadingSystemImpl::ShaderGroupEnd (ShaderGroup& group)
ustring groupname = group.name();
if (groupname.size() && groupname == m_archive_groupname) {
std::string filename = m_archive_filename.string();
if (! filename.size())
if (! filename.size()) {
filename = OIIO::Filesystem::filename (groupname.string()) + ".tar.gz";
// Transform characters that will ruin our day when passed to
// tar as a filename.
if (OIIO::Strutil::contains(filename, ":"))
filename = OIIO::Strutil::replace(filename, ":", "_");
if (OIIO::Strutil::contains(filename, "|"))
filename = OIIO::Strutil::replace(filename, "|", "_");
}
archive_shadergroup (group, filename);
}

Expand Down Expand Up @@ -3817,26 +3824,29 @@ ShadingSystemImpl::archive_shadergroup (ShaderGroup& group, string_view filename
entries.insert (osoname);
std::string localfile = tmpdir + "/" + osoname;
OIIO::Filesystem::copy (osofile, localfile);
filename_list += " " + osoname;
filename_list += Strutil::fmt::format(" \"{}\"",
Strutil::escape_chars(osoname));
}
}
}

std::string full_filename = Strutil::fmt::format("{}{}",
Strutil::escape_chars(filename),
extension);
if (extension == ".tar" || extension == ".tar.gz" || extension == ".tgz") {
std::string z = Strutil::ends_with (extension, "gz") ? "-z" : "";
std::string cmd = Strutil::sprintf ("tar -c %s -C %s -f %s%s %s",
z, tmpdir, filename, extension,
filename_list);
std::string cmd = Strutil::sprintf("tar -c %s -C \"%s\" -f \"%s\" %s",
z, Strutil::escape_chars(tmpdir),
full_filename, filename_list);
// std::cout << "Command =\n" << cmd << "\n";
if (system (cmd.c_str()) != 0) {
error ("archive_shadergroup: executing tar command failed");
ok = false;
}

} else if (extension == ".zip") {
std::string cmd = Strutil::sprintf ("zip -q %s%s %s",
filename, extension,
filename_list);
std::string cmd = Strutil::sprintf("zip -q \"%s\" %s",
full_filename, filename_list);
// std::cout << "Command =\n" << cmd << "\n";
if (system (cmd.c_str()) != 0) {
error ("archive_shadergroup: executing zip command failed");
Expand Down