Fixed post-processing (including perms check) on Unix

src/libslic3r/GCode/PostProcessor.cpp

@@ -1,7 +1,6 @@
 #include "PostProcessor.hpp"
 
-#if 1
+#ifdef WIN32
-//#ifdef WIN32
 
 namespace Slic3r {
 
@@ -15,6 +14,10 @@ void run_post_process_scripts(const std::string &path, const PrintConfig &config
 #else
 
 #include <boost/process/system.hpp>
+#ifndef WIN32
+    #include <sys/stat.h> //for getting filesystem UID/GID
+    #include <unistd.h> //for getting current UID/GID
+#endif
 
 namespace Slic3r {
 
@@ -22,19 +25,29 @@ void run_post_process_scripts(const std::string &path, const PrintConfig &config
 {
     if (config.post_process.values.empty())
         return;
-    config.setenv_();
+    //config.setenv_();
+    auto gcode_file = boost::filesystem::path(path);
+    if (!boost::filesystem::exists(gcode_file))
+        throw std::runtime_error(std::string("Post-processor can't find exported gcode file"));
+
     for (std::string script: config.post_process.values) {
         // Ignore empty post processing script lines.
         boost::trim(script);
         if (script.empty())
             continue;
         BOOST_LOG_TRIVIAL(info) << "Executing script " << script << " on file " << path;
-        if (! boost::filesystem::exists(boost::filesystem::path(path)))
+        if (! boost::filesystem::exists(boost::filesystem::path(script)))
-            throw std::runtime_exception(std::string("The configured post-processing script does not exist: ") + path);
+            throw std::runtime_error(std::string("The configured post-processing script does not exist: ") + script);
 #ifndef WIN32
-        file_status fs = boost::filesystem::status(path);
+        struct stat info;
-        //FIXME test if executible by the effective UID / GID.
+        if (stat(script.c_str(), &info))
-        // throw std::runtime_exception(std::string("The configured post-processing script is not executable: check permissions. ") + path));
+            throw std::runtime_error(std::string("Cannot read information for post-processing script: ") + script);
+        boost::filesystem::perms script_perms = boost::filesystem::status(script).permissions();
+        //if UID matches, check UID perm. else if GID matches, check GID perm. Otherwise check other perm.
+        if (!(script_perms & ((info.st_uid == geteuid()) ? boost::filesystem::perms::owner_exe
+                           : ((info.st_gid == getegid()) ? boost::filesystem::perms::group_exe
+                                                         : boost::filesystem::perms::others_exe))))
+            throw std::runtime_error(std::string("The configured post-processing script is not executable: check permissions. ") + script);
 #endif
         int result = 0;
 #ifdef WIN32
@@ -45,10 +58,10 @@ void run_post_process_scripts(const std::string &path, const PrintConfig &config
             ::GetModuleFileNameW(nullptr, wpath_exe, _MAX_PATH);
             boost::filesystem::path path_exe(wpath_exe);
             // Replace it with the current perl interpreter.
-            result = boost::process::system((path_exe.parent_path() / "perl5.24.0.exe").string(), script, output_file);
+            result = boost::process::system((path_exe.parent_path() / "perl5.24.0.exe").string(), script, gcode_file);
         } else
 #else
-        result = boost::process::system(script, output_file);
+        result = boost::process::system(script, gcode_file);
 #endif
         if (result < 0)
             BOOST_LOG_TRIVIAL(error) << "Script " << script << " on file " << path << " failed. Negative error code returned.";