ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use bindValue for composing query strings for the log DB 

Event/action param values might not be escaped properly otherwise
pull/315/head
Michael Zanetti 2020-07-05 12:29:38 +02:00
parent 824d9b62d9
commit 98e5176393
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libnymea-core/logging/logengine.cpp
View File

@ -372,18 +372,19 @@ void LogEngine::removeRuleLogs(const RuleId &ruleId)
void LogEngine::appendLogEntry(const LogEntry &entry) void LogEngine::appendLogEntry(const LogEntry &entry)
{ {
QString queryString = QString("INSERT INTO entries (timestamp, loggingEventType, loggingLevel, sourceType, typeId, thingId, value, active, errorCode) values ('%1', '%2', '%3', '%4', '%5', '%6', '%7', '%8', '%9');") QString queryString = QString("INSERT INTO entries (timestamp, loggingEventType, loggingLevel, sourceType, typeId, thingId, value, active, errorCode) values (?, ?, ?, ?, ?, ?, ?, ?, ?);");
.arg(entry.timestamp().toMSecsSinceEpoch()) QVariantList bindValues;
.arg(entry.eventType()) bindValues.append(entry.timestamp().toMSecsSinceEpoch());
.arg(entry.level()) bindValues.append(entry.eventType());
.arg(entry.source()) bindValues.append(entry.level());
.arg(entry.typeId().toString()) bindValues.append(entry.source());
.arg(entry.thingId().toString()) bindValues.append(entry.typeId().toString());
.arg(entry.value().toString()) bindValues.append(entry.thingId().toString());
.arg(entry.active()) bindValues.append(entry.value());
.arg(entry.errorCode()); bindValues.append(entry.active());
bindValues.append(entry.errorCode());
DatabaseJob *job = new DatabaseJob(m_db, queryString); DatabaseJob *job = new DatabaseJob(m_db, queryString, bindValues);
// Check for log flooding. If we are exceeding the queue we'll start flagging log events of a certain type. // Check for log flooding. If we are exceeding the queue we'll start flagging log events of a certain type.
// If we'll get more log events of the same type while the queue is still exceededd, we'll discard the old // If we'll get more log events of the same type while the queue is still exceededd, we'll discard the old
@ -508,7 +509,7 @@ void LogEngine::processQueue()
QSqlQuery query(job->m_db); QSqlQuery query(job->m_db);
query.prepare(job->m_queryString); query.prepare(job->m_queryString);
foreach (const QString &value, job->m_bindValues) { foreach (const QVariant &value, job->m_bindValues) {
query.addBindValue(value); query.addBindValue(value);
} }

4
libnymea-core/logging/logengine.h
View File

@ -127,7 +127,7 @@ class DatabaseJob: public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
DatabaseJob(const QSqlDatabase &db, const QString &queryString, const QStringList &bindValues = QStringList()): DatabaseJob(const QSqlDatabase &db, const QString &queryString, const QVariantList &bindValues = QVariantList()):
m_db(db), m_db(db),
m_queryString(queryString), m_queryString(queryString),
m_bindValues(bindValues) m_bindValues(bindValues)
@ -144,7 +144,7 @@ signals:
private: private:
QSqlDatabase m_db; QSqlDatabase m_db;
QString m_queryString; QString m_queryString;
QStringList m_bindValues; QVariantList m_bindValues;
QString m_executedQuery; QString m_executedQuery;
QSqlError m_error; QSqlError m_error;

4
libnymea-core/logging/logfilter.cpp
View File

@ -182,7 +182,7 @@ void LogFilter::addValue(const QString &value)
} }
/*! Returns the list of values from this \l{LogFilter}. */ /*! Returns the list of values from this \l{LogFilter}. */
QList<QString> LogFilter::values() const QVariantList LogFilter::values() const
{ {
return m_values; return m_values;
} }
@ -393,7 +393,7 @@ QString LogFilter::createValuesString() const
query.append("value = ? "); query.append("value = ? ");
} else { } else {
query.append("( "); query.append("( ");
foreach (const QString &value, m_values) { foreach (const QVariant &value, m_values) {
query.append("value = ? "); query.append("value = ? ");
if (value != m_values.last()) if (value != m_values.last())
query.append("OR "); query.append("OR ");

4
libnymea-core/logging/logfilter.h
View File

@ -69,7 +69,7 @@ public:
// Valid for LoggingSourceStates // Valid for LoggingSourceStates
void addValue(const QString &value); void addValue(const QString &value);
QList<QString> values() const; QVariantList values() const;
void setLimit(int limit); void setLimit(int limit);
int limit() const; int limit() const;
@ -86,7 +86,7 @@ private:
QList<Logging::LoggingEventType> m_eventTypes; QList<Logging::LoggingEventType> m_eventTypes;
QList<QUuid> m_typeIds; QList<QUuid> m_typeIds;
QList<ThingId> m_thingIds; QList<ThingId> m_thingIds;
QList<QString> m_values; QVariantList m_values;
int m_limit = -1; int m_limit = -1;
int m_offset = 0; int m_offset = 0;