frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues 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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 56 deletions
Show Stats 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) 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_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() void CgiHandler::cmd_cfg_jsonserver()
{ {
if ( _args.at(0) == "cfg_jsonserver" ) quint16 jsonPort = 19444;
{ // send result as reply
quint16 jsonPort = 19444; _reply->addHeader ("Content-Type", "text/plain" );
// send result as reply _reply->appendRawData (QByteArrayLiteral(":") % QString::number(jsonPort).toUtf8() );
_reply->addHeader ("Content-Type", "text/plain" );
_reply->appendRawData (QByteArrayLiteral(":") % QString::number(jsonPort).toUtf8() );
throw 0;
}
} }
void CgiHandler::cmd_runscript() 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); throw std::runtime_error("[cmd_runscript] Relative path not allowed : %s" + scriptFilePath.toStdString());
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;
} }
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);
} }

4
libsrc/webserver/CgiHandler.h
View File

@ -19,11 +19,11 @@ public:
void setBaseUrl(const QString& url); void setBaseUrl(const QString& url);
void exec(const QStringList & args,QtHttpRequest * request, QtHttpReply * reply); void exec(const QStringList & args,QtHttpRequest * request, QtHttpReply * reply);
// cgi commands private:
// CGI commands
void cmd_cfg_jsonserver(); void cmd_cfg_jsonserver();
void cmd_runscript (); void cmd_runscript ();
private:
QtHttpReply * _reply; QtHttpReply * _reply;
QtHttpRequest * _request; QtHttpRequest * _request;
QStringList _args; QStringList _args;

5
libsrc/webserver/StaticFileServing.cpp
View File

@ -93,11 +93,6 @@ void StaticFileServing::onRequestNeedsReply (QtHttpRequest * request, QtHttpRepl
{ {
_cgi.exec(uri_parts, request, reply); _cgi.exec(uri_parts, request, reply);
} }
catch(int err)
{
Error(_log,"Exception while executing cgi %s : %d", path.toStdString().c_str(), err);
printErrorToReply (reply, QtHttpReply::InternalError, "script failed (" % path % ")");
}
catch(std::exception &e) catch(std::exception &e)
{ {
Error(_log,"Exception while executing cgi %s : %s", path.toStdString().c_str(), e.what()); Error(_log,"Exception while executing cgi %s : %s", path.toStdString().c_str(), e.what());