frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use exceptions as part of normal flow (#872)

Browse Source
This commit is contained in:
Murat Seker
2020-07-19 14:44:59 +02:00
committed by GitHub
parent a8954f2cc0
commit c85b4c530c
3 changed files with 37 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
libsrc/webserver/CgiHandler.cpp
View File

@@ -28,68 +28,54 @@ void CgiHandler::setBaseUrl(const QString& url)
void CgiHandler::exec(const QStringList & args, QtHttpRequest * request, QtHttpReply * reply)
{
try
_args = args;
_request = request;
_reply = reply;
if ( _args.at(0) == "cfg_jsonserver" )
{
// QByteArray header = reply->getHeader(QtHttpHeader::Host);
// QtHttpRequest::ClientInfo info = request->getClientInfo();
_args = args;
_request = request;
_reply = reply;
cmd_cfg_jsonserver();
// cmd_cfg_set();
cmd_runscript();
throw 1;
}
catch(int e)
else if ( _args.at(0) == "run" )
{
if (e != 0) throw 1;
cmd_runscript();
}
else
{
throw std::runtime_error("CGI command not found");
}
}
void CgiHandler::cmd_cfg_jsonserver()
{
if ( _args.at(0) == "cfg_jsonserver" )
{
quint16 jsonPort = 19444;
// send result as reply
_reply->addHeader ("Content-Type", "text/plain" );
_reply->appendRawData (QByteArrayLiteral(":") % QString::number(jsonPort).toUtf8() );
throw 0;
}
quint16 jsonPort = 19444;
// send result as reply
_reply->addHeader ("Content-Type", "text/plain" );
_reply->appendRawData (QByteArrayLiteral(":") % QString::number(jsonPort).toUtf8() );
}
void CgiHandler::cmd_runscript()
{
if ( _args.at(0) == "run" )
QStringList scriptFilePathList(_args);
scriptFilePathList.removeAt(0);
QString scriptFilePath = scriptFilePathList.join('/');
// relative path not allowed
if ( scriptFilePath.indexOf("..") >=0 )
{
QStringList scriptFilePathList(_args);
scriptFilePathList.removeAt(0);
QString scriptFilePath = scriptFilePathList.join('/');
// relative path not allowed
if (scriptFilePath.indexOf("..") >=0)
{
Error( _log, "relative path not allowed (%s)", scriptFilePath.toStdString().c_str());
throw 1;
}
scriptFilePath = _baseUrl+"/server_scripts/"+scriptFilePath;
if (QFile::exists(scriptFilePath) && scriptFilePath.endsWith(".py") )
{
QtHttpPostData postData = _request->getPostData();
QByteArray inputData; // should be filled with post data
QByteArray data = Process::command_exec("python " + scriptFilePath, inputData);
_reply->addHeader ("Content-Type", "text/plain");
_reply->appendRawData (data);
throw 0;
}
else
{
Error( _log, "script %s doesn't exists or is no python file", scriptFilePath.toStdString().c_str());
}
throw 1;
throw std::runtime_error("[cmd_runscript] Relative path not allowed : %s" + scriptFilePath.toStdString());
}
scriptFilePath = _baseUrl+"/server_scripts/"+scriptFilePath;
if ( !QFile::exists(scriptFilePath) || !scriptFilePath.endsWith(".py") )
{
throw std::runtime_error("[cmd_runscript] Script %s doesn't exists or is no python file : " + scriptFilePath.toStdString());
}
QtHttpPostData postData = _request->getPostData();
QByteArray inputData; // should be filled with post data
QByteArray data = Process::command_exec("python " + scriptFilePath, inputData);
_reply->addHeader ("Content-Type", "text/plain");
_reply->appendRawData (data);
}