Merge branch 'master' of http://github.com/lightbase/cacic-agente

Thiago Rocha
2 parents 7c631fe5 a3b6f923
Showing 6 changed files with 24 additions and 33 deletions Show diff stats
cacic-teste/testcacic.cpp
gercols/gercols.cpp
gercols/gercols.pro
install-cacic/installcacic.cpp
src/cacic_comm.h
src/cacic_hardware.cpp
@@ -266,6 +266,7 @@ void CTestCacic::testColeta()
 void CTestCacic::testLogger()
 {
     QLogger::QLoggerManager *logManager = QLogger::QLoggerManager::getInstance();
+    logManager->addDestination("./log.txt","teste",QLogger::DebugLevel);
     logManager->addDestination("log01.txt","teste01",QLogger::DebugLevel);
     logManager->addDestination("./log02.txt","teste02",QLogger::DebugLevel);
     logManager->addDestination("../log03.txt","teste03",QLogger::DebugLevel);
@@ -2,14 +2,9 @@
 Gercols::Gercols(QObject *parent)
 {
-    /*Aqui vamos conectar o slot principal. Acho que algo do tipo:
-     * sinal iniciaColeta() chama o slot configuraColetas() que verifica
-     * quais coletas serao necessárias e realiza a conexão dos sinais com
-     * slots de coletas (coletaHardware, coletaSoftware, etc..)
-     */
     /* Cria um json de configuração para teste.
-     ******************************************/
+     *************************************************************************/
     QJsonObject configTeste;
     QJsonObject configComputer;
     configComputer["operating_system"] = QJsonValue::fromVariant(QString(""));
@@ -19,8 +14,9 @@ Gercols::Gercols(QObject *parent)
     configTeste["hardware"] = QJsonValue::fromVariant(QString(""));
     configTeste["software"] = QJsonValue::fromVariant(QString(""));
-    oColeta = new CColeta();
     oCacic.setJsonToFile(configTeste,"configReq.json");
+    /*************************************************************************/
+    oColeta = new CColeta;
     //Pega chave do registro, que será pega na instalação.
     oCacic.setChaveCrypt(oCacic.getValueFromRegistry("Lightbase", "Cacic", "key").toString());
@@ -32,14 +28,6 @@ Gercols::Gercols(QObject *parent)
 void Gercols::run()
 {
-    /* Pega configurações do Json de configurações localizado
-     * na pasta principal do cacic (deverá ser pega do registro,
-     * estou tentando implementar isso no installcacic).
-     */
-
-    //Inicializa as classes e seta valores necessários oCacic.setCacicMainFolder(), por exemplo.
-    // ... ainda a ser pensado
-
     emit iniciaConfiguracao();
     //emite sinal para começar a coleta
     emit iniciaColeta();
@@ -52,18 +40,7 @@ void Gercols::run()
     else
         qDebug() << "Erro ao realizar coleta.";
-    //O processo de criptografia e IV será tratado depois. Vamos começar a ajudar o Eli, depois vemos esse lance.
-//    oCacic.deleteFile("coleta.json");
-
-    //IV sendo gerado como uma string de 32 caracteres
-//    std::string strIv = oCacic.genRandomString();
-
-//    QString coletaEncriptada = oCacic.enCrypt(coletaString.toStdString(), strIv);
-
-//    QJsonObject gercolsJson;
-//    gercolsJson["coleta"] = QJsonValue::fromVariant(coletaEncriptada);
-//    gercolsJson["iv"] = QJsonValue::fromVariant( QString::fromStdString(strIv) );
-//    oCacic.setJsonToFile(gercolsJson, "gercols.json");
+    //O processo de criptografia e IV será tratado depois.
     //emite sinal "finished" pra finalizar a aplicação
     emit finished();
@@ -25,18 +25,19 @@ TEMPLATE = app
 SOURCES += \
     main.cpp \
+    ./gercols.cpp \
     ../src/ccacic.cpp \
     ../src/cacic_computer.cpp \
     ../src/cacic_software.cpp \
     ../src/cacic_hardware.cpp \
     ../src/operatingsystem.cpp \
     ../src/ccoleta.cpp \
-    ./gercols.cpp \
     ../src/vregistry.cpp \
     ../src/vqtconvert.cpp \
     ../src/wmi.cpp \
 HEADERS += \
+    ./gercols.h \
     ../src/ccacic.h \
     ../src/cacic_computer.h \
     ../src/cacic_software.h \
@@ -44,7 +45,6 @@ HEADERS += \
     ../src/operatingsystem.h \
     ../src/console.h \
     ../src/ccoleta.h \
-    ./gercols.h \
     ../src/vregistry.h \
     ../src/vqtconvert.h \
     ../src/wmi.h \
@@ -23,7 +23,7 @@ void InstallCacic::run(QStringList argv, int argc) {
             //conectado, grava a chave na classe;
             oCacic.setChaveCrypt(jsonLogin["reply"].toObject()["chavecrip"].toString());
 #ifdef Q_OS_WIN
-            oCacic.setCacicMainFolder("c:/cacic");
+            oCacic.setCacicMainFolder("c:/cacic/");
 #elif defined(Q_OS_LINUX)
             oCacic.setCacicMainFolder("/home/cacic");
 #endif
@@ -35,10 +35,12 @@ void InstallCacic::run(QStringList argv, int argc) {
             registro["mainFolder"] = oCacic.getCacicMainFolder();
             oCacic.setValueToRegistry("Lightbase", "Cacic", registro);
             //starta o processo do cacic.
+
+            //TO DO: Fazer download do serviço
 #ifdef Q_OS_WIN
-            QString exitStatus = oCacic.startProcess(oCacic.getCacicMainFolder() + "cacic.exe", true, &ok);
+            QString exitStatus = oCacic.startProcess(oCacic.getCacicMainFolder() + "cacic.exe", false, &ok);
 #else
-            QString exitStatus = oCacic.startProcess("cacic", true, &ok);
+            QString exitStatus = oCacic.startProcess(oCacic.getCacicMainFolder() + "cacic", false, &ok);
 #endif
             if (!ok)
                 std::cout << "Erro ao iniciar o processo: "
@@ -61,6 +61,10 @@ public:
         QJsonObject jsonObj;
         if (isSsl){
             url = urlSsl.isEmpty() ? "https://" + this->urlGerente + route : this->urlSsl + route;
+            if (!url.isValid()){
+                jsonObj["error"] = QVariant("Invalid Url");
+                return jsonObj;
+            }
             req.setSslConfiguration(QSslConfiguration::defaultConfiguration());
         } else
             url = "http://" + urlGerente + route;
@@ -152,6 +156,13 @@ public:
         return retorno;
     }
+    bool ftpDownload(QString path){
+        QUrl url(urlGerente);
+        url.setScheme("ftp");
+        url.setPath(path);
+
+    }
+
     QString getUrlSsl (){
         return this->urlSsl;
     }
@@ -47,8 +47,8 @@ QJsonObject cacic_hardware::coletaWin()
     //  (Verifica se é notebook)
     params.clear();
     wmiResult = wmi::wmiSearch("Win32_PortableBattery", params);
+    hardware["IsNotebook"] = QJsonValue::fromVariant(!wmiResult.isNull());
     if (!wmiResult.isNull()){
-        hardware["IsNotebook"] = QJsonValue::fromVariant(!wmiResult.isNull());
         hardware["PortableBattery"] = wmiResult;
     }
     //Win32_Bios
	@@ -61,6 +61,10 @@ public:		@@ -61,6 +61,10 @@ public:
61	QJsonObject jsonObj;	61	QJsonObject jsonObj;
62	if (isSsl){	62	if (isSsl){
63	url = urlSsl.isEmpty() ? "https://" + this->urlGerente + route : this->urlSsl + route;	63	url = urlSsl.isEmpty() ? "https://" + this->urlGerente + route : this->urlSsl + route;
		64	+ if (!url.isValid()){
		65	+ jsonObj["error"] = QVariant("Invalid Url");
		66	+ return jsonObj;
		67	+ }
64	req.setSslConfiguration(QSslConfiguration::defaultConfiguration());	68	req.setSslConfiguration(QSslConfiguration::defaultConfiguration());
65	} else	69	} else
66	url = "http://" + urlGerente + route;	70	url = "http://" + urlGerente + route;
	@@ -152,6 +156,13 @@ public:		@@ -152,6 +156,13 @@ public:
152	return retorno;	156	return retorno;
153	}	157	}
154		158
		159	+ bool ftpDownload(QString path){
		160	+ QUrl url(urlGerente);
		161	+ url.setScheme("ftp");
		162	+ url.setPath(path);
		163	+
		164	+ }
		165	+
155	QString getUrlSsl (){	166	QString getUrlSsl (){
156	return this->urlSsl;	167	return this->urlSsl;
157	}	168	}