X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FScripting%2FNasalSys.cxx;h=8e7622eae1de75af1dbebaadaae6dc17249f4ad9;hb=79f1da6bef439b4d283b7b0ecd7707c56c12f986;hp=49cf79a36da3f9679eb21bafc5fc7fadc4a65713;hpb=d718d5f3cb90227fa126069fe9e4db3e86575165;p=flightgear.git

diff --git a/src/Scripting/NasalSys.cxx b/src/Scripting/NasalSys.cxx
index 49cf79a36..8e7622eae 100644
--- a/src/Scripting/NasalSys.cxx
+++ b/src/Scripting/NasalSys.cxx
@@ -674,8 +674,11 @@ static naRef f_open(naContext c, naRef me, int argc, naRef* args)
     std::string filename = fgValidatePath(naStr_data(file),
         strcmp(modestr, "rb") && strcmp(modestr, "r"));
     if(filename.empty()) {
-        naRuntimeError(c, "open(): reading/writing '%s' denied "
-                "(unauthorized access)", naStr_data(file));
+        SG_LOG(SG_NASAL, SG_ALERT, "open(): reading/writing '" <<
+        naStr_data(file) << "' denied (unauthorized directory - authorization"
+        " no longer follows symlinks; to authorize reading additional "
+        "directories, add them to --fg-aircraft)");
+        naRuntimeError(c, "open(): access denied (unauthorized directory)");
         return naNil();
     }
     f = fopen(filename.c_str(), modestr);
@@ -703,22 +706,25 @@ static naRef f_parsexml(naContext c, naRef me, int argc, naRef* args)
         if(!(naIsNil(args[i]) || naIsFunc(args[i])))
             naRuntimeError(c, "parsexml(): callback argument not a function");
 
-    const char* file = fgValidatePath(naStr_data(args[0]), false);
-    if(!file) {
-        naRuntimeError(c, "parsexml(): reading '%s' denied "
-                "(unauthorized access)", naStr_data(args[0]));
+    std::string file = fgValidatePath(naStr_data(args[0]), false);
+    if(file.empty()) {
+        SG_LOG(SG_NASAL, SG_ALERT, "parsexml(): reading '" <<
+        naStr_data(args[0]) << "' denied (unauthorized directory - authorization"
+        " no longer follows symlinks; to authorize reading additional "
+        "directories, add them to --fg-aircraft)");
+        naRuntimeError(c, "parsexml(): access denied (unauthorized directory)");
         return naNil();
     }
-    std::ifstream input(file);
+    std::ifstream input(file.c_str());
     NasalXMLVisitor visitor(c, argc, args);
     try {
         readXML(input, visitor);
     } catch (const sg_exception& e) {
         naRuntimeError(c, "parsexml(): file '%s' %s",
-                file, e.getFormattedMessage().c_str());
+                file.c_str(), e.getFormattedMessage().c_str());
         return naNil();
     }
-    return naStr_fromdata(naNewString(c), const_cast<char*>(file), strlen(file));
+    return naStr_fromdata(naNewString(c), file.c_str(), file.length());
 }
 
 /**
@@ -880,12 +886,6 @@ void FGNasalSys::init()
     signal->setBoolValue(s, true);
     signal->removeChildren(s);
 
-    if( !checkIOrules() )
-    {
-      SG_LOG(SG_NASAL, SG_ALERT, "Required IOrules check failed.");
-      exit(-1);
-    }
-
     // Pull scripts out of the property tree, too
     loadPropertyScripts();
   
@@ -1315,45 +1315,6 @@ void FGNasalSys::gcRelease(int key)
     naGCRelease(key);
 }
 
-//------------------------------------------------------------------------------
-bool FGNasalSys::checkIOrules()
-{
-  // Ensure IOrules and path validation are working properly by trying to
-  // access a folder/file which should never be accessible.
-  const char* no_access_path =
-#ifdef _WIN32
-    "Z:"
-#endif
-    "/do-not-access";
-
-  bool success = true;
-
-  // write access
-  if( fgValidatePath(no_access_path, true) )
-  {
-    success = false;
-    SG_LOG
-    (
-      SG_GENERAL,
-      SG_ALERT,
-      "Check your IOrules! (write to '" << no_access_path << "' is allowed)"
-    );
-  }
-
-  // read access
-  if( fgValidatePath(no_access_path, false) )
-  {
-    success = false;
-    SG_LOG
-    (
-      SG_GENERAL,
-      SG_ALERT,
-      "Check your IOrules! (read from '" << no_access_path << "' is allowed)"
-    );
-  }
-
-  return success;
-}
 
 //------------------------------------------------------------------------------
 void FGNasalSys::NasalTimer::timerExpired()