diff options
| -rw-r--r-- | message.cpp | 8 | ||||
| -rw-r--r-- | message.h | 2 | ||||
| -rw-r--r-- | voice/voicemessage.cpp | 86 | ||||
| -rw-r--r-- | voice/voicemessage.h | 2 |
4 files changed, 90 insertions, 8 deletions
diff --git a/message.cpp b/message.cpp index e4cd191..3cd4bb9 100644 --- a/message.cpp +++ b/message.cpp @@ -114,13 +114,7 @@ bool Message::fromJDoc(QJsonDocument jdoc) } else if (msgid == Event) { // If event, save data object auto data_iter = payload.find("data"); - auto data = data_iter.value().toObject(); - auto data_string = data_iter.value().toString(); - if (!data_string.isEmpty()) - data_string.remove('\n'); - - QJsonDocument datadoc = QJsonDocument::fromJson(data_string.toUtf8()); - m_event_data = datadoc.object(); + m_event_data = data_iter.value().toObject(); auto event_iter = payload.find("event"); auto event_string = event_iter.value().toString(); @@ -56,7 +56,7 @@ class Message : public QObject Message(); bool fromJson(QByteArray jsonData); - bool fromJDoc(QJsonDocument jdocData); + virtual bool fromJDoc(QJsonDocument jdocData); QByteArray toJson(QJsonDocument::JsonFormat format = QJsonDocument::Compact); bool createRequest(QString api, QString verb, QJsonValue parameter = "None"); inline QString eventApi() const diff --git a/voice/voicemessage.cpp b/voice/voicemessage.cpp index 6e5c634..493b04e 100644 --- a/voice/voicemessage.cpp +++ b/voice/voicemessage.cpp @@ -27,3 +27,89 @@ bool VoiceMessage::createRequest(QString verb, QJsonObject parameter) return false; return Message::createRequest("vshl-core", verb, parameter); } + +bool VoiceMessage::fromJDoc(QJsonDocument jdoc) +{ + // Validate message is array + if (!jdoc.isArray()) { + qWarning("Invalid appfw message: not an array"); + return false; + } + QJsonArray msg = jdoc.array(); + + // Validate array is proper length + if ((msg.size() < 3) || (msg.size() > 4)) { + qWarning("Invalid appfw message: invalid array size"); + return false; + } + + // Validate msgid type + double msgid; + if (msg[0].isDouble()) { + msgid = msg[0].toDouble(); + } else { + qWarning("Invalid appfw message: invalid msgid type"); + return false; + } + + // Validate msgid element + if ((msgid < Call) || (msgid > Event)) { + qWarning("Invalid appfw message: msgid out of range"); + return false; + } + + // Validate that the payload has a request object + QJsonObject payload; + if (msg[2].isObject()) { + payload = msg[2].toObject(); + } else { + qWarning("Invalid appfw payload: no JSON object"); + return false; + } + + if ((msgid == RetOk) || (msgid == RetErr)) { + auto request_iter = payload.find("request"); + auto request = request_iter.value().toObject(); + if (request.empty()) { + qWarning("Invalid appfw reply message: empty request data"); + return false; + } + auto status_iter = request.find("status"); + auto info_iter = request.find("info"); + auto response_iter = payload.find("response"); + auto response = response_iter.value().toObject(); + m_reply_status = status_iter.value().toString(); + m_reply_info = info_iter.value().toString(); + m_reply_data = response; + m_reply = true; + } else if (msgid == Event) { + // If event, save data object + auto data_iter = payload.find("data"); + auto data = data_iter.value().toObject(); + auto data_string = data_iter.value().toString(); + if (!data_string.isEmpty()) + data_string.remove('\n'); + + QJsonDocument datadoc = QJsonDocument::fromJson(data_string.toUtf8()); + m_event_data = datadoc.object(); + + auto event_iter = payload.find("event"); + auto event_string = event_iter.value().toString(); + if (event_string.isEmpty()) { + qWarning("Invalid appfw event message: empty event name"); + return false; + } + QStringList event_strings = event_string.split(QRegExp("/")); + if (event_strings.size() != 2) { + qWarning("Invalid appfw event message: malformed event name"); + return false; + } + m_event_api = event_strings[0]; + m_event_name = event_strings[1]; + m_event = true; + } + + m_jdoc = jdoc; + m_init = true; + return m_init; +} diff --git a/voice/voicemessage.h b/voice/voicemessage.h index 27aa06d..712631e 100644 --- a/voice/voicemessage.h +++ b/voice/voicemessage.h @@ -24,6 +24,8 @@ class VoiceMessage : public Message Q_OBJECT public: virtual ~VoiceMessage() {}; + bool fromJDoc(QJsonDocument jdocData) override; + bool isAuthStateEvent() const { return (this->eventName().contains("voice_authstate_event")); }; bool isConnectionStateEvent() const { |