cacic-teste: adicionado 4 novos testes;

install-cacic: pegando chave do login e gravando em arquivo; caciccomm: carregando sessao em atributo privado da classe ao logar; ccacic: novos métodos de auxilio ao json (setJsonToFile e getJsonFromFile); caciccomp: pegando nome do so tambem, modificado o nome das variaveis; criado metodo toJsonObject nas classes cacicomp e operatingsystem;

cacic-teste: adicionado 4 novos testes;
install-cacic: pegando chave do login e gravando em arquivo; caciccomm: carregando sessao em atributo privado da classe ao logar; ccacic: novos métodos de auxilio ao json (setJsonToFile e getJsonFromFile); caciccomp: pegando nome do so tambem, modificado o nome das variaveis; criado metodo toJsonObject nas classes cacicomp e operatingsystem;
Eric Menezes Noronha
1 parent 2586f1df
Showing 12 changed files with 117 additions and 25 deletions Show diff stats
cacic-teste/cacic-teste.pro
cacic-teste/testcacic.cpp
cacic-teste/testcacic.h
install-cacic/install-cacic.pro
install-cacic/installcacic.cpp
src/cacic_comm.h
src/cacic_computer.cpp
src/cacic_computer.h
src/ccacic.cpp
src/ccacic.h
src/operatingsystem.cpp
src/operatingsystem.h
@@ -20,7 +20,8 @@ win32 {
 SOURCES += \
     testcacic.cpp \
     ../src/ccacic.cpp \
-    ../src/cacic_computer.cpp
+    ../src/cacic_computer.cpp \
+    ../src/operatingsystem.cpp
 HEADERS += \
@@ -28,7 +29,8 @@ HEADERS += \
     ../src/ccacic.h \
     ../src/cacic_computer.h \
     ../src/cacic_comm.h \
-    ../src/console.h
+    ../src/console.h \
+    ../src/operatingsystem.h
 INCLUDEPATH += ../src \
                ../src/crypto++/include/
@@ -88,14 +88,15 @@ void CTestCacic::testInterfaceDeRede(){
 void CTestCacic::testpegarOS(){
     //basta que seja um retorno válido, não precisa validar todos.
-    QVERIFY(OCacicComp.getOs().getIdSo() != -1 );
+    QVERIFY(OCacicComp.getOs().getIdOs() != -1 );
 }
 void CTestCacic::testConsole()
 {
     ConsoleObject console;
-    QVERIFY(console("echo teste").toStdString() == "teste\n");
+//    QVERIFY(console("echo teste").toStdString() == "teste\n");
+    QVERIFY(false);
 }
 void CTestCacic::testPegarUsu(){
@@ -165,7 +166,24 @@ void CTestCacic::testCacicCompToJsonObject()
     QVERIFY(!OCacicComp.toJsonObject().empty());
 }
-void CTestCacic::cleanupTestCase()
+void CTestCacic::testOperatingSystemToJsonObject()
+{
+    QVERIFY(!OCacicComp.getOs().toJsonObject().empty());
+}
+
+void CTestCacic::testJsonToFile()
 {
+    QJsonObject json;
+    json["teste"] = QJsonValue::fromVariant(QString("teste"));
+    QVERIFY(OCacic.setJsonToFile(json, "teste.json"));
+}
+void CTestCacic::testJsonFromFile()
+{
+    QVERIFY(OCacic.getJsonFromFile("teste.json")["teste"].toString() == "teste");
+}
+
+void CTestCacic::cleanupTestCase()
+{
+    OCacic.deleteFile("teste.json");
 }
@@ -53,6 +53,9 @@ private slots:
   void testDeCrypt();
   void testInstallCacicStart();
   void testCacicCompToJsonObject();
+  void testOperatingSystemToJsonObject();
+  void testJsonToFile();
+  void testJsonFromFile();
   void cleanupTestCase();
 };
@@ -24,13 +24,15 @@ TEMPLATE = app
 SOURCES += main.cpp \
     installcacic.cpp \
     ../src/ccacic.cpp \
-    ../src/cacic_computer.cpp
+    ../src/cacic_computer.cpp \
+    ../src/operatingsystem.cpp
 HEADERS += \
     installcacic.h \
     ../src/ccacic.h \
     ../src/cacic_computer.h \
-    ../src/cacic_comm.h
+    ../src/cacic_comm.h \
+    ../src/operatingsystem.h
 INCLUDEPATH += ../src \
                ../src/crypto++/include/
@@ -19,7 +19,10 @@ void InstallCacic::run(QStringList argv, int argc) {
         QJsonObject jsonLogin = oCacicComm.login(&ok);
         if (ok){
             //TODO: Conectado. armazenar chave em arquivo e sessao na comm;
-            qDebug() << "Logado";
+            oCacic.setChaveCrypt(jsonLogin["reply"].toObject()["chavecrip"].toString());
+            QJsonObject configToSave;
+            configToSave["chaveCrypt"] = QJsonValue::fromVariant(oCacic.getChaveCrypt());
+            oCacic.setJsonToFile(configToSave, "cacicTeste.json");
         }
         else
             qDebug() << "falha no login";
@@ -22,7 +22,7 @@ private:
     // FIXME: Get from configuration
     QString usuario;
     QString password;
-    std::string session;
+    QString session;
 public:
     CacicComm (){
@@ -166,6 +166,7 @@ public:
         // Cria conexão e retorna Json da sessão
 //        qDebug() << "Conectando.";
         QJsonObject retorno = this->comm("/ws/neo/login", ok, QJsonObject::fromVariantMap(login), true);
+        this->session = retorno["reply"].toObject()["session"].toString();
         return retorno;
     }
@@ -2,7 +2,6 @@
 CACIC_Computer::CACIC_Computer()
 {
-    operatingSystem  = OperatingSystem();
     networkInterface = networkInterfacesRunning();
     usuario = pegarUsu();
 }
@@ -56,6 +55,7 @@ QJsonObject CACIC_Computer::toJsonObject()
     QJsonObject network;
     int count = 1;
     json["usuario"] = QJsonValue::fromVariant(QString::fromStdString(this->usuario));
+    json["operatingSystem"] = this->oOperatingSystem.toJsonObject();
     foreach(QVariantMap auxMap, this->getNetworkInterface()){
         network["network" + QVariant::fromValue(count).toString()] = QJsonObject::fromVariantMap(auxMap);
         count++;
@@ -89,7 +89,7 @@ std::string CACIC_Computer::pegarUsu(){
 */
 OperatingSystem CACIC_Computer::getOs() const
 {
-    return operatingSystem;
+    return oOperatingSystem;
 }
 std::string CACIC_Computer::getUser() const {
@@ -7,7 +7,6 @@
 #include <QtSerialPort/QSerialPortInfo>
 #include <QtNetwork/QtNetwork>
 #include <QSysInfo>
-
 #include <operatingsystem.h>
 class CACIC_Computer
@@ -23,7 +22,7 @@ public:
 private:
-    OperatingSystem operatingSystem;
+    OperatingSystem oOperatingSystem;
     int pegarOS();
     std::string pegarUsu();
@@ -113,6 +113,26 @@ QJsonValue CCacic::jsonValueFromJsonString(QString json, QString key)
     return QJsonDocument::fromJson(json.toUtf8()).object()[key];
 }
+bool CCacic::setJsonToFile(QJsonObject json, QString filepath)
+{
+    QFile configFile(filepath);
+    if (!configFile.open(QIODevice::WriteOnly)){
+        qDebug() << "Não foi possivel abrir o arquivo.";
+    }
+    QJsonDocument docJson(json);
+    return (configFile.write(docJson.toJson()) != -1);
+}
+
+QJsonObject CCacic::getJsonFromFile(QString filepath)
+{
+    QFile configFile(filepath);
+    QJsonObject json;
+    if (!configFile.open(QIODevice::ReadOnly))
+        qDebug() << "Nao foi possivel ler o arquivo";
+    json = QJsonDocument::fromJson(configFile.readAll()).object();
+    return json;
+}
+
 /*enCrypt
  * @parameter std::string str_in: string que será encriptada (url).
  *            std::string key: chave utilizada na encriptação (32 caracteres) 32*8 = 256 bits
@@ -208,6 +228,16 @@ void CCacic::setChksisInfFilePath(const QString &amp;value)
 {
     chksisInfFilePath = value;
 }
+QString CCacic::getChaveCrypt() const
+{
+    return chaveCrypt;
+}
+
+void CCacic::setChaveCrypt(const QString &value)
+{
+    chaveCrypt = value;
+}
+
 /*Getters/Setters
  * End.
@@ -32,6 +32,8 @@ public:
     bool deleteFolder(QString path);
     bool deleteFile(QString path);
     QJsonValue jsonValueFromJsonString(QString json, QString key);
+    bool setJsonToFile(QJsonObject json, QString filepath);
+    QJsonObject getJsonFromFile(QString filepath);
 //Geters/seters:
@@ -50,12 +52,16 @@ public:
     QString getChksisInfFilePath() const;
     void setChksisInfFilePath(const QString &value);
+    QString getChaveCrypt() const;
+    void setChaveCrypt(const QString &value);
+
 private:
     QString cacicMainFolder;
     QString mainModuleName;
     QString urlGerente;
     QString gerColsInfFilePath;
     QString chksisInfFilePath;
+    QString chaveCrypt;
 signals:
 #include "operatingsystem.h"
+OperatingSystem::OperatingSystem()
+{
+    this->idOs = this->coletaIdOs();
+    this->nomeOs = this->coletaNomeOs();
+}
+
 /*pegarOS
  * @return: int;
  *      retorna um id referente a versão do SO.
@@ -10,7 +16,7 @@
  * 176 = Windows 8.1
  * 200 = Linux
  */
-int OperatingSystem::pegarOS(){
+int OperatingSystem::coletaIdOs(){
 #if defined (Q_OS_WIN)
     return QSysInfo::WindowsVersion;
 #elif defined (Q_OS_LINUX)
@@ -20,16 +26,36 @@ int OperatingSystem::pegarOS(){
 #endif
 }
-int OperatingSystem::getIdSo() const
+QString OperatingSystem::coletaNomeOs()
 {
-    return idSo;
+    QString text;
+    QStringList environment = QProcessEnvironment::systemEnvironment().toStringList();
+    foreach (text, environment) {
+        if (text.contains("OS="    , Qt::CaseInsensitive) ||
+            text.contains("SESSION=", Qt::CaseInsensitive) ){
+            QStringList split = text.split("=");
+  //          qDebug() << split[1];
+            return split[1];
+          }
+      }
+      return "";
 }
-void OperatingSystem::setIdSo(int value)
+QJsonObject OperatingSystem::toJsonObject()
 {
-    idSo = value;
+    QJsonObject json;
+    json["idOs"] = QJsonValue::fromVariant(QVariant::fromValue(this->idOs));
+    json["nomeOs"] = QJsonValue::fromVariant(this->nomeOs);
+//    qDebug() << json;
+    return json;
 }
-OperatingSystem::OperatingSystem()
+QString OperatingSystem::getNomeOs()
+{
+    return this->nomeOs;
+}
+
+int OperatingSystem::getIdOs() const
 {
+    return this->idOs;
 }
@@ -3,16 +3,18 @@
 #include <QtCore>
 #include <QSysInfo>
+#include <ccacic.h>
 class OperatingSystem
 {
 private:
-    int idSo;
-
-    int pegarOS();
+    int idOs;
+    int coletaIdOs();
+    QString nomeOs;
+    QString coletaNomeOs();
 public:
     OperatingSystem();
-
+    QJsonObject toJsonObject();
     enum OsList {
         MAC,
         LINUX_DEBIAN,
@@ -21,8 +23,8 @@ public:
     };
     static const enum OsList OsList;
-    int getIdSo() const;
-    void setIdSo(int value);
+    QString getNomeOs();
+    int getIdOs() const;
 };
 #endif // OPERATINGSYSTEM_H
	@@ -113,6 +113,26 @@ QJsonValue CCacic::jsonValueFromJsonString(QString json, QString key)		@@ -113,6 +113,26 @@ QJsonValue CCacic::jsonValueFromJsonString(QString json, QString key)
113	return QJsonDocument::fromJson(json.toUtf8()).object()[key];	113	return QJsonDocument::fromJson(json.toUtf8()).object()[key];
114	}	114	}
115		115
		116	+bool CCacic::setJsonToFile(QJsonObject json, QString filepath)
		117	+{
		118	+ QFile configFile(filepath);
		119	+ if (!configFile.open(QIODevice::WriteOnly)){
		120	+ qDebug() << "Não foi possivel abrir o arquivo.";
		121	+ }
		122	+ QJsonDocument docJson(json);
		123	+ return (configFile.write(docJson.toJson()) != -1);
		124	+}
		125	+
		126	+QJsonObject CCacic::getJsonFromFile(QString filepath)
		127	+{
		128	+ QFile configFile(filepath);
		129	+ QJsonObject json;
		130	+ if (!configFile.open(QIODevice::ReadOnly))
		131	+ qDebug() << "Nao foi possivel ler o arquivo";
		132	+ json = QJsonDocument::fromJson(configFile.readAll()).object();
		133	+ return json;
		134	+}
		135	+
116	/*enCrypt	136	/*enCrypt
117	* @parameter std::string str_in: string que será encriptada (url).	137	* @parameter std::string str_in: string que será encriptada (url).
118	* std::string key: chave utilizada na encriptação (32 caracteres) 32*8 = 256 bits	138	* std::string key: chave utilizada na encriptação (32 caracteres) 32*8 = 256 bits
	@@ -208,6 +228,16 @@ void CCacic::setChksisInfFilePath(const QString &value)		@@ -208,6 +228,16 @@ void CCacic::setChksisInfFilePath(const QString &value)
208	{	228	{
209	chksisInfFilePath = value;	229	chksisInfFilePath = value;
210	}	230	}
		231	+QString CCacic::getChaveCrypt() const
		232	+{
		233	+ return chaveCrypt;
		234	+}
		235	+
		236	+void CCacic::setChaveCrypt(const QString &value)
		237	+{
		238	+ chaveCrypt = value;
		239	+}
		240	+
211		241
212	/*Getters/Setters	242	/*Getters/Setters
213	* End.	243	* End.