]> git.lyx.org Git - lyx.git/blobdiff - src/Converter.cpp
Extend LATEXIFY command param handling and add literal param.
[lyx.git] / src / Converter.cpp
index 6acd05a22b1b8c902138575bb9d1af700c2db187..3c04d3fa7aa7f979487575adbc9663ad9859f509 100644 (file)
@@ -21,7 +21,9 @@
 #include "Format.h"
 #include "Language.h"
 #include "LaTeX.h"
+#include "LyXRC.h"
 #include "Mover.h"
+#include "Session.h"
 
 #include "frontends/alert.h"
 
@@ -100,7 +102,7 @@ Converter::Converter(string const & f, string const & t,
                     string const & c, string const & l)
        : from_(f), to_(t), command_(c), flags_(l),
          From_(0), To_(0), latex_(false), xml_(false),
-         need_aux_(false), nice_(false)
+         need_aux_(false), nice_(false), need_auth_(false)
 {}
 
 
@@ -128,6 +130,8 @@ void Converter::readFlags()
                        parselog_ = flag_value;
                else if (flag_name == "nice")
                        nice_ = true;
+               else if (flag_name == "needauth")
+                       need_auth_ = true;
        }
        if (!result_dir_.empty() && result_file_.empty())
                result_file_ = "index." + formats.extension(to_);
@@ -275,6 +279,57 @@ OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path,
 }
 
 
+bool Converters::checkAuth(Converter const & conv, string const & doc_fname)
+{
+       if (!conv.need_auth())
+               return true;
+       const docstring security_warning = bformat(
+             _("<p>The requested operation requires the use of a converter from "
+               "%2$s to %3$s:</p>"
+               "<blockquote><p><tt>%1$s</tt></p></blockquote>"
+               "<p>This external program can execute arbitrary commands on your "
+               "system, including dangerous ones, if instructed to do so by a "
+               "maliciously crafted .lyx document.</p>"),
+             from_utf8(conv.command()), from_utf8(conv.from()),
+             from_utf8(conv.to()));
+       if (lyxrc.use_converter_needauth_forbidden) {
+               frontend::Alert::error(
+                   _("An external converter is disabled for security reasons"),
+                   security_warning + _(
+                   "<p><b>Your current preference settings forbid its execution.</b></p>"
+                   "<p>(To change this setting, go to <i>Preferences &#x25b9; File "
+                   "Handling &#x25b9; Converters</i> and uncheck <i>Security &#x25b9; "
+                   "Forbid needauth converters</i>.)"), false);
+               return false;
+       }
+       if (!lyxrc.use_converter_needauth)
+               return true;
+       static const docstring security_title =
+               _("An external converter requires your authorization");
+       int choice;
+       const docstring security_warning2 = security_warning +
+               _("<p>Would you like to run this converter?</p>"
+                 "<p><b>Only run if you trust the origin/sender of the LyX "
+                 "document!</b></p>");
+       if (!doc_fname.empty()) {
+               LYXERR(Debug::FILES, "looking up: " << doc_fname);
+               std::set<std::string> & auth_files = theSession().authFiles().authFiles();
+               if (auth_files.find(doc_fname) == auth_files.end()) {
+                       choice = frontend::Alert::prompt(security_title, security_warning2,
+                               0, 0, _("Do &not run"), _("&Run"), _("&Always run for this document"));
+                       if (choice == 2)
+                               auth_files.insert(doc_fname);
+               } else {
+                       choice = 1;
+               }
+       } else {
+               choice = frontend::Alert::prompt(security_title, security_warning2,
+                       0, 0, _("Do &not run"), _("&Run"));
+       }
+       return choice != 0;
+}
+
+
 bool Converters::convert(Buffer const * buffer,
                         FileName const & from_file, FileName const & to_file,
                         FileName const & orig_from,
@@ -339,10 +394,11 @@ bool Converters::convert(Buffer const * buffer,
        runparams.flavor = getFlavor(edgepath, buffer);
 
        if (buffer) {
-               runparams.use_japanese = buffer->params().bufferFormat() == "platex";
+               runparams.use_japanese =
+                       buffer->params().bufferFormat() == "latex"
+                       && buffer->params().encoding().package() == Encoding::japanese;
                runparams.use_indices = buffer->params().use_indices;
-               runparams.bibtex_command = (buffer->params().bibtex_command == "default") ?
-                       string() : buffer->params().bibtex_command;
+               runparams.bibtex_command = buffer->params().bibtexCommand();
                runparams.index_command = (buffer->params().index_command == "default") ?
                        string() : buffer->params().index_command;
                runparams.document_language = buffer->params().language->babel();
@@ -400,6 +456,9 @@ bool Converters::convert(Buffer const * buffer,
                                                   "tmpfile.out"));
                }
 
+               if (!checkAuth(conv, buffer ? buffer->absFileName() : string()))
+                       return false;
+
                if (conv.latex()) {
                        run_latex = true;
                        string command = conv.command();
@@ -715,14 +774,13 @@ void Converters::buildGraph()
 }
 
 
-vector<Format const *> const
-Converters::intToFormat(vector<int> const & input)
+FormatList const Converters::intToFormat(vector<int> const & input)
 {
-       vector<Format const *> result(input.size());
+       FormatList result(input.size());
 
        vector<int>::const_iterator it = input.begin();
        vector<int>::const_iterator const end = input.end();
-       vector<Format const *>::iterator rit = result.begin();
+       FormatList::iterator rit = result.begin();
        for ( ; it != end; ++it, ++rit) {
                *rit = &formats.get(*it);
        }
@@ -730,8 +788,8 @@ Converters::intToFormat(vector<int> const & input)
 }
 
 
-vector<Format const *> const
-Converters::getReachableTo(string const & target, bool const clear_visited)
+FormatList const Converters::getReachableTo(string const & target, 
+               bool const clear_visited)
 {
        vector<int> const & reachablesto =
                G_.getReachableTo(formats.getNumber(target), clear_visited);
@@ -740,9 +798,9 @@ Converters::getReachableTo(string const & target, bool const clear_visited)
 }
 
 
-vector<Format const *> const
-Converters::getReachable(string const & from, bool const only_viewable,
-                        bool const clear_visited, set<string> const & excludes)
+FormatList const Converters::getReachable(string const & from, 
+               bool const only_viewable, bool const clear_visited, 
+               set<string> const & excludes)
 {
        set<int> excluded_numbers;
 
@@ -775,29 +833,28 @@ Graph::EdgePath Converters::getPath(string const & from, string const & to)
 }
 
 
-vector<Format const *> Converters::importableFormats()
+FormatList Converters::importableFormats()
 {
        vector<string> l = loaders();
-       vector<Format const *> result = getReachableTo(l[0], true);
+       FormatList result = getReachableTo(l[0], true);
        vector<string>::const_iterator it = l.begin() + 1;
        vector<string>::const_iterator en = l.end();
        for (; it != en; ++it) {
-               vector<Format const *> r = getReachableTo(*it, false);
+               FormatList r = getReachableTo(*it, false);
                result.insert(result.end(), r.begin(), r.end());
        }
        return result;
 }
 
 
-vector<Format const *> Converters::exportableFormats(bool only_viewable)
+FormatList Converters::exportableFormats(bool only_viewable)
 {
        vector<string> s = savers();
-       vector<Format const *> result = getReachable(s[0], only_viewable, true);
+       FormatList result = getReachable(s[0], only_viewable, true);
        vector<string>::const_iterator it = s.begin() + 1;
        vector<string>::const_iterator en = s.end();
        for (; it != en; ++it) {
-               vector<Format const *> r =
-                       getReachable(*it, only_viewable, false);
+                FormatList r = getReachable(*it, only_viewable, false);
                result.insert(result.end(), r.begin(), r.end());
        }
        return result;