Criado metodo para gravar dados em registro (tambem em linux). Installcacic acei…

…tando o parametro uninstall. Criada classe coleta para melhor organização no gercols.

Criado metodo para gravar dados em registro (tambem em linux). Installcacic acei…
…tando o parametro uninstall. Criada classe coleta para melhor organização no gercols.
Eric Menezes Noronha
1 parent fb73ff95
Showing 16 changed files with 107 additions and 53 deletions Show diff stats
cacic-teste/cacic-teste.pro
cacic-teste/testcacic.cpp
cacic-teste/testcacic.h
gercols/gercols.cpp
gercols/gercols.h
gercols/gercols.pro
gercols/main.cpp
install-cacic/install-cacic.pro.user
install-cacic/installcacic.cpp
install-cacic/installcacic.h
src/cacic_computer.cpp
src/ccacic.cpp
src/ccacic.h
src/ccoleta.cpp
src/ccoleta.h
src/operatingsystem.cpp
@@ -21,8 +21,7 @@ SOURCES += \
     testcacic.cpp \
     ../src/ccacic.cpp \
     ../src/cacic_computer.cpp \
-    ../src/operatingsystem.cpp \
-    ../gercols/gercols.cpp
+    ../src/operatingsystem.cpp
  
  
 HEADERS += \
@@ -31,8 +30,7 @@ HEADERS += \
     ../src/cacic_computer.h \
     ../src/cacic_comm.h \
     ../src/console.h \
-    ../src/operatingsystem.h \
-    ../gercols/gercols.cpp
+    ../src/operatingsystem.h
  
 INCLUDEPATH += ../src \
                ../src/crypto++/include/
@@ -209,24 +209,20 @@ void CTestCacic::testStartService()
 void CTestCacic::testReadConfig()
 {
  
-    // Inicializa um arquivo de configuração stub
-    // que seria parecido com o recebido do Gerente
-    QJsonObject configJson;
-    QJsonObject configHardware;
-    QJsonObject configSoftware;
+//    // Inicializa um arquivo de configuração stub
+//    // que seria parecido com o recebido do Gerente
+//    QJsonObject configJson;
+//    QJsonObject configHardware;
  
-    configHardware["network_interface"] = QJsonValue::fromVariant(QString(""));
-    configSoftware["operating_system"] = QJsonValue::fromVariant(QString(""));
+//    configHardware["computador"] = OCacicComp.toJsonObject();
  
-    configJson["hardware"] = configHardware;
-    configJson["software"] = configSoftware;
+//    configJson["hardware"] = configHardware;
  
-    OCacic.setJsonToFile(configJson,"configRequest.json");
+//    OCacic.setJsonToFile(configJson,"configRequest.json");
  
     // Leitura do arquivo de configuração
-    OGercols.readConfig();
  
-    QVERIFY(OGercols.getConfigJson() == configJson);
+    QVERIFY(false);
 }
  
 void CTestCacic::cleanupTestCase()
@@ -27,7 +27,6 @@ private:
     CacicComm OCacicComm;
     CCacic OCacic;
     CACIC_Computer OCacicComp;
-    Gercols OGercols;
     QString testPath;
     QString testIniPath;
     QJsonObject session;
 #include "gercols.h"
  
-Gercols::Gercols()
+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..)
+     */
 }
  
-void Gercols::readConfig()
+void Gercols::run()
 {
+    QJsonObject coleta;
+    /* 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.
  
-QJsonObject Gercols::getConfigJson()
-{
-    return QJsonObject();
+    //emite sinal para começar a coleta
+
+    //aguarda todas as coletas serem realizadas
+
+    //salva coleta em json
+    coleta["computador"] = oColeta.getOComputer().toJsonObject();
+    coleta["software"] = QJsonValue::fromVariant(QString("Aqui vai coleta de software"));
+    coleta["hardware"] = QJsonValue::fromVariant(QString("Aqui vai coleta de hardware"));
+    qDebug() << coleta;
+    //salva json em arquivo
+    oCacic.setJsonToFile(coleta, "coleta.json");
+    //emite sinal "finished" pra finalizar a aplicação
+    emit finished();
 }
 #ifndef GERCOLS_H
 #define GERCOLS_H
+#include <QtCore>
+#include <ccoleta.h>
+#include <ccacic.h>
  
-#include <QJsonObject>
-
-class Gercols
+class Gercols : public QObject
 {
+    Q_OBJECT
+private:
+    CCacic oCacic;
+    CColeta oColeta;
 public:
-    Gercols();
+    explicit Gercols(QObject *parent = 0);
+
+public slots:
+    void run();
  
-    void readConfig();
-    QJsonObject getConfigJson();
+signals:
+    void finished();
+    void fimColeta();
 };
  
 #endif // GERCOLS_H
@@ -25,6 +25,7 @@ SOURCES += \
     ../src/ccacic.cpp \
     ../src/cacic_computer.cpp \
     ../src/operatingsystem.cpp \
+    ../src/ccoleta.cpp \
     ./gercols.cpp
  
  
@@ -33,6 +34,7 @@ HEADERS += \
     ../src/cacic_computer.h \
     ../src/operatingsystem.h \
     ../src/console.h \
+    ../src/ccoleta.h \
     ./gercols.h
  
 INCLUDEPATH += ../src \
 #include <QCoreApplication>
+#include <gercols.h>
  
 int main(int argc, char *argv[])
 {
     QCoreApplication a(argc, argv);
-
+    //crio o objeto que será responsável pela execução
+    Gercols *oGercols = new Gercols(&a);
+    //conecto o sinal "finished" do objeto oGercols ao slot "quit" do objeto a(QCoreApplication)
+    //ou seja, quando o finished for chamado, a aplicacao é encerrada.
+    a.connect(oGercols, SIGNAL(finished()), &a, SLOT(quit()));
+    //invoco o metodo "run" do objeto oGercols assim que o loop (a.exec()) comecar
+    QMetaObject::invokeMethod(oGercols, "run", Qt::QueuedConnection);
     return a.exec();
 }
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.1.2, 2014-08-15T13:57:58. -->
+<!-- Written by QtCreator 3.1.2, 2014-08-15T17:35:14. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -9,7 +9,7 @@ InstallCacic::InstallCacic(QObject *parent) :
 void InstallCacic::run(QStringList argv, int argc) {
     bool ok;
     //valida os parametros repassados
-    validaParametros(argv, argc, &ok);
+    QMap<QString, QString> param = validaParametros(argv, argc, &ok);
     //se tiver usuario, senha e url
     if (ok){
         oCacicComm.setUrlGerente(this->argumentos["host"]);
@@ -21,13 +21,11 @@ void InstallCacic::run(QStringList argv, int argc) {
             oCacic.setChaveCrypt(jsonLogin["reply"].toObject()["chavecrip"].toString());
             oCacic.setCacicMainFolder("c:/cacic");
             oCacic.createFolder(oCacic.getCacicMainFolder());
-            //grava chave em arquivo json;
-            QJsonObject configJson = oCacic.getJsonFromFile(oCacic.getCacicMainFolder() + "/cacicTeste.json");
-            QJsonObject configToSave = configJson["configs"].toObject();
-            configToSave["chaveCrypt"] = QJsonValue::fromVariant(oCacic.getChaveCrypt());
-            configJson["configs"] = configToSave;
-            oCacic.setJsonToFile(configJson, oCacic.getCacicMainFolder() + "/cacicTeste.json");
+            //grava chave em registro;
  
+            QVariantMap registro;
+            registro["key"] = oCacic.getChaveCrypt();
+            oCacic.setValueToRegistry("Lightbase", "Cacic", registro);
             //starta o processo do cacic.
 #ifdef Q_OS_WIN
             QString exitStatus = oCacic.startProcess("cacic.exe", true, &ok);
@@ -39,10 +37,13 @@ void InstallCacic::run(QStringList argv, int argc) {
             if (!ok)
                 qDebug() << "Erro ao iniciar o processo.";
 #endif
-        }
-        else
+        } else
             std::cout << "Nao foi possivel realizar o login.\n  "
                       << jsonLogin["error"].toString().toStdString();
+    } else if ((param.contains("default")) && (param["default"] == "uninstall")){
+        oCacic.deleteFolder("c:/cacic");
+        oCacic.removeRegistry("Lightbase", "Cacic");
+
     } else {
         std::cout << "\nInstalador do Agente Cacic.\n\n"
                   << "Parametros incorretos. (<obrigatorios> [opcional])\n\n"
@@ -64,6 +65,8 @@ QMap&lt;QString, QString&gt; InstallCacic::validaParametros(QStringList argv, int argc
         QStringList auxList = aux.split("=");
         if ((auxList.at(0).at(0) == '-') && (auxList.size() > 1))
             map[auxList.at(0).mid(1)] = auxList.at(1);
+        else if (aux.at(0)== '-')
+            map["default"] = aux.mid(1);
     }
     *ok = (bool) map.contains("host") && map.contains("user") && map.contains("password");
     if (*ok){
@@ -19,6 +19,7 @@ public:
     QMap<QString, QString> validaParametros(QStringList argv, int argc, bool *ok);
     bool startProcess(QString pathprogram, bool wait, QStringList arguments);
  
+    void registro();
 private:
     QMap<QString, QString> argumentos;
     CacicComm oCacicComm;
@@ -20,11 +20,9 @@ QList&lt;QVariantMap&gt; CACIC_Computer::networkInterfacesRunning(){
  
     foreach (QNetworkInterface in, interface.allInterfaces()) {
         if (!(bool)(in.flags() & QNetworkInterface::IsLoopBack) &&
-                !(bool)(in.flags() & QNetworkInterface::IsPointToPoint) &&
-                (bool)(in.flags() & QNetworkInterface::IsRunning)){
-            //            qDebug() << in.humanReadableName() << "\n";
+            !(bool)(in.flags() & QNetworkInterface::IsPointToPoint) &&
+            (bool)(in.flags() & QNetworkInterface::IsRunning)){
             mapInterface["nome"] = in.humanReadableName();
-            //            qDebug() << in.hardwareAddress() << "\n";
             mapInterface["mac"]  = in.hardwareAddress();
             foreach (QNetworkAddressEntry ae, in.addressEntries()){
                 if (ae.ip().scopeId() == ""){
@@ -34,18 +32,11 @@ QList&lt;QVariantMap&gt; CACIC_Computer::networkInterfacesRunning(){
                     mapInterface["ipv6"] = ae.ip().toString();
                     mapInterface["netmask_ipv6"] = ae.netmask().toString();
                 }
-                //                qDebug() << ae.ip().toString() << "\n";
             }
             listaMap.append(mapInterface);
             mapInterface.clear();
         }
     }
-//    foreach (QVariantMap each, listaMap){
-
-//        foreach (QVariant eachValue, each.values())
-//            qDebug() << eachValue.toString();
-//    }
-
     return listaMap;
 }
  
@@ -61,7 +52,6 @@ QJsonObject CACIC_Computer::toJsonObject()
         count++;
     }
     json["networkDevices"] = network;
-//    qDebug() << json;
     return json;
 }
  
@@ -204,6 +204,21 @@ QString CCacic::startProcess(QString pathprogram, bool wait, bool *ok, QStringLi
     return process.errorString();
 }
  
+void CCacic::setValueToRegistry(QString organization, QString application, QVariantMap values)
+{
+    QSettings registry(organization, application);
+    for (QVariantMap::const_iterator i = values.constBegin(); i != values.constEnd(); i++)
+        registry.setValue(i.key(), i.value());
+    registry.sync();
+}
+
+void CCacic::removeRegistry(QString organization, QString application)
+{
+    QSettings registry(organization, application);
+    registry.clear();
+    registry.sync();
+}
+
 /*Getters/Setters
  * Begin:
  */
@@ -36,6 +36,9 @@ public:
     bool setJsonToFile(QJsonObject json, QString filepath);
     QJsonObject getJsonFromFile(QString filepath);
     QString startProcess(QString pathprogram, bool wait, bool *ok, QStringList arguments = QStringList());
+    void setValueToRegistry(QString organization, QString application, QVariantMap values);
+    void removeRegistry(QString organization, QString application);
+
  
 //Geters/seters:
  
@@ -3,3 +3,9 @@
 CColeta::CColeta()
 {
 }
+
+
+CACIC_Computer CColeta::getOComputer() const
+{
+    return oComputer;
+}
 #ifndef CCOLETA_H
 #define CCOLETA_H
+#include <cacic_computer.h>
  
 class CColeta
 {
+private:
+    CACIC_Computer oComputer;
 public:
     CColeta();
+    CACIC_Computer getOComputer() const;
 };
  
 #endif // CCOLETA_H
@@ -2,8 +2,8 @@
  
 OperatingSystem::OperatingSystem()
 {
-    this->idOs = this->coletaIdOs();
     this->nomeOs = this->coletaNomeOs();
+    this->idOs = this->coletaIdOs();
 }
  
  
@@ -47,6 +47,7 @@ QString OperatingSystem::coletaNomeOs()
     QString text;
     QStringList environment = QProcessEnvironment::systemEnvironment().toStringList();
     foreach (text, environment) {
+//        qDebug() << text;
         if (text.contains("OS="    , Qt::CaseInsensitive) ||
             text.contains("SESSION=", Qt::CaseInsensitive) ){
             QStringList split = text.split("=");
...	...	@@ -21,8 +21,7 @@ SOURCES += \
21	21	testcacic.cpp \
22	22	../src/ccacic.cpp \
23	23	../src/cacic_computer.cpp \
24		- ../src/operatingsystem.cpp \
25		- ../gercols/gercols.cpp
	24	+ ../src/operatingsystem.cpp
26	25
27	26
28	27	HEADERS += \
...	...	@@ -31,8 +30,7 @@ HEADERS += \
31	30	../src/cacic_computer.h \
32	31	../src/cacic_comm.h \
33	32	../src/console.h \
34		- ../src/operatingsystem.h \
35		- ../gercols/gercols.cpp
	33	+ ../src/operatingsystem.h
36	34
37	35	INCLUDEPATH += ../src \
38	36	../src/crypto++/include/
...	...
...	...	@@ -209,24 +209,20 @@ void CTestCacic::testStartService()
209	209	void CTestCacic::testReadConfig()
210	210	{
211	211
212		- // Inicializa um arquivo de configuração stub
213		- // que seria parecido com o recebido do Gerente
214		- QJsonObject configJson;
215		- QJsonObject configHardware;
216		- QJsonObject configSoftware;
	212	+// // Inicializa um arquivo de configuração stub
	213	+// // que seria parecido com o recebido do Gerente
	214	+// QJsonObject configJson;
	215	+// QJsonObject configHardware;
217	216
218		- configHardware["network_interface"] = QJsonValue::fromVariant(QString(""));
219		- configSoftware["operating_system"] = QJsonValue::fromVariant(QString(""));
	217	+// configHardware["computador"] = OCacicComp.toJsonObject();
220	218
221		- configJson["hardware"] = configHardware;
222		- configJson["software"] = configSoftware;
	219	+// configJson["hardware"] = configHardware;
223	220
224		- OCacic.setJsonToFile(configJson,"configRequest.json");
	221	+// OCacic.setJsonToFile(configJson,"configRequest.json");
225	222
226	223	// Leitura do arquivo de configuração
227		- OGercols.readConfig();
228	224
229		- QVERIFY(OGercols.getConfigJson() == configJson);
	225	+ QVERIFY(false);
230	226	}
231	227
232	228	void CTestCacic::cleanupTestCase()
...	...
...	...	@@ -27,7 +27,6 @@ private:
27	27	CacicComm OCacicComm;
28	28	CCacic OCacic;
29	29	CACIC_Computer OCacicComp;
30		- Gercols OGercols;
31	30	QString testPath;
32	31	QString testIniPath;
33	32	QJsonObject session;
...	...
1	1	#include "gercols.h"
2	2
3		-Gercols::Gercols()
	3	+Gercols::Gercols(QObject *parent)
4	4	{
	5	+ /*Aqui vamos conectar o slot principal. Acho que algo do tipo:
	6	+ * sinal iniciaColeta() chama o slot configuraColetas() que verifica
	7	+ * quais coletas serao necessárias e realiza a conexão dos sinais com
	8	+ * slots de coletas (coletaHardware, coletaSoftware, etc..)
	9	+ */
5	10	}
6	11
7		-void Gercols::readConfig()
	12	+void Gercols::run()
8	13	{
	14	+ QJsonObject coleta;
	15	+ /* Pega configurações do Json de configurações localizado
	16	+ * na pasta principal do cacic (deverá ser pega do registro,
	17	+ * estou tentando implementar isso no installcacic).
	18	+ */
9	19
10		-}
	20	+ //Inicializa as classes e seta valores necessários oCacic.setCacicMainFolder(), por exemplo.
11	21
12		-QJsonObject Gercols::getConfigJson()
13		-{
14		- return QJsonObject();
	22	+ //emite sinal para começar a coleta
	23	+
	24	+ //aguarda todas as coletas serem realizadas
	25	+
	26	+ //salva coleta em json
	27	+ coleta["computador"] = oColeta.getOComputer().toJsonObject();
	28	+ coleta["software"] = QJsonValue::fromVariant(QString("Aqui vai coleta de software"));
	29	+ coleta["hardware"] = QJsonValue::fromVariant(QString("Aqui vai coleta de hardware"));
	30	+ qDebug() << coleta;
	31	+ //salva json em arquivo
	32	+ oCacic.setJsonToFile(coleta, "coleta.json");
	33	+ //emite sinal "finished" pra finalizar a aplicação
	34	+ emit finished();
15	35	}
...	...
1	1	#ifndef GERCOLS_H
2	2	#define GERCOLS_H
	3	+#include <QtCore>
	4	+#include <ccoleta.h>
	5	+#include <ccacic.h>
3	6
4		-#include <QJsonObject>
5		-
6		-class Gercols
	7	+class Gercols : public QObject
7	8	{
	9	+ Q_OBJECT
	10	+private:
	11	+ CCacic oCacic;
	12	+ CColeta oColeta;
8	13	public:
9		- Gercols();
	14	+ explicit Gercols(QObject *parent = 0);
	15	+
	16	+public slots:
	17	+ void run();
10	18
11		- void readConfig();
12		- QJsonObject getConfigJson();
	19	+signals:
	20	+ void finished();
	21	+ void fimColeta();
13	22	};
14	23
15	24	#endif // GERCOLS_H
...	...
...	...	@@ -25,6 +25,7 @@ SOURCES += \
25	25	../src/ccacic.cpp \
26	26	../src/cacic_computer.cpp \
27	27	../src/operatingsystem.cpp \
	28	+ ../src/ccoleta.cpp \
28	29	./gercols.cpp
29	30
30	31
...	...	@@ -33,6 +34,7 @@ HEADERS += \
33	34	../src/cacic_computer.h \
34	35	../src/operatingsystem.h \
35	36	../src/console.h \
	37	+ ../src/ccoleta.h \
36	38	./gercols.h
37	39
38	40	INCLUDEPATH += ../src \
...	...
1	1	#include <QCoreApplication>
	2	+#include <gercols.h>
2	3
3	4	int main(int argc, char *argv[])
4	5	{
5	6	QCoreApplication a(argc, argv);
6		-
	7	+ //crio o objeto que será responsável pela execução
	8	+ Gercols *oGercols = new Gercols(&a);
	9	+ //conecto o sinal "finished" do objeto oGercols ao slot "quit" do objeto a(QCoreApplication)
	10	+ //ou seja, quando o finished for chamado, a aplicacao é encerrada.
	11	+ a.connect(oGercols, SIGNAL(finished()), &a, SLOT(quit()));
	12	+ //invoco o metodo "run" do objeto oGercols assim que o loop (a.exec()) comecar
	13	+ QMetaObject::invokeMethod(oGercols, "run", Qt::QueuedConnection);
7	14	return a.exec();
8	15	}
...	...
1	1	<?xml version="1.0" encoding="UTF-8"?>
2	2	<!DOCTYPE QtCreatorProject>
3		-<!-- Written by QtCreator 3.1.2, 2014-08-15T13:57:58. -->
	3	+<!-- Written by QtCreator 3.1.2, 2014-08-15T17:35:14. -->
4	4	<qtcreator>
5	5	<data>
6	6	<variable>ProjectExplorer.Project.ActiveTarget</variable>
...	...
...	...	@@ -9,7 +9,7 @@ InstallCacic::InstallCacic(QObject *parent) :
9	9	void InstallCacic::run(QStringList argv, int argc) {
10	10	bool ok;
11	11	//valida os parametros repassados
12		- validaParametros(argv, argc, &ok);
	12	+ QMap<QString, QString> param = validaParametros(argv, argc, &ok);
13	13	//se tiver usuario, senha e url
14	14	if (ok){
15	15	oCacicComm.setUrlGerente(this->argumentos["host"]);
...	...	@@ -21,13 +21,11 @@ void InstallCacic::run(QStringList argv, int argc) {
21	21	oCacic.setChaveCrypt(jsonLogin["reply"].toObject()["chavecrip"].toString());
22	22	oCacic.setCacicMainFolder("c:/cacic");
23	23	oCacic.createFolder(oCacic.getCacicMainFolder());
24		- //grava chave em arquivo json;
25		- QJsonObject configJson = oCacic.getJsonFromFile(oCacic.getCacicMainFolder() + "/cacicTeste.json");
26		- QJsonObject configToSave = configJson["configs"].toObject();
27		- configToSave["chaveCrypt"] = QJsonValue::fromVariant(oCacic.getChaveCrypt());
28		- configJson["configs"] = configToSave;
29		- oCacic.setJsonToFile(configJson, oCacic.getCacicMainFolder() + "/cacicTeste.json");
	24	+ //grava chave em registro;
30	25
	26	+ QVariantMap registro;
	27	+ registro["key"] = oCacic.getChaveCrypt();
	28	+ oCacic.setValueToRegistry("Lightbase", "Cacic", registro);
31	29	//starta o processo do cacic.
32	30	#ifdef Q_OS_WIN
33	31	QString exitStatus = oCacic.startProcess("cacic.exe", true, &ok);
...	...	@@ -39,10 +37,13 @@ void InstallCacic::run(QStringList argv, int argc) {
39	37	if (!ok)
40	38	qDebug() << "Erro ao iniciar o processo.";
41	39	#endif
42		- }
43		- else
	40	+ } else
44	41	std::cout << "Nao foi possivel realizar o login.\n "
45	42	<< jsonLogin["error"].toString().toStdString();
	43	+ } else if ((param.contains("default")) && (param["default"] == "uninstall")){
	44	+ oCacic.deleteFolder("c:/cacic");
	45	+ oCacic.removeRegistry("Lightbase", "Cacic");
	46	+
46	47	} else {
47	48	std::cout << "\nInstalador do Agente Cacic.\n\n"
48	49	<< "Parametros incorretos. (<obrigatorios> [opcional])\n\n"
...	...	@@ -64,6 +65,8 @@ QMap<QString, QString> InstallCacic::validaParametros(QStringList argv, int argc
64	65	QStringList auxList = aux.split("=");
65	66	if ((auxList.at(0).at(0) == '-') && (auxList.size() > 1))
66	67	map[auxList.at(0).mid(1)] = auxList.at(1);
	68	+ else if (aux.at(0)== '-')
	69	+ map["default"] = aux.mid(1);
67	70	}
68	71	*ok = (bool) map.contains("host") && map.contains("user") && map.contains("password");
69	72	if (*ok){
...	...
...	...	@@ -19,6 +19,7 @@ public:
19	19	QMap<QString, QString> validaParametros(QStringList argv, int argc, bool *ok);
20	20	bool startProcess(QString pathprogram, bool wait, QStringList arguments);
21	21
	22	+ void registro();
22	23	private:
23	24	QMap<QString, QString> argumentos;
24	25	CacicComm oCacicComm;
...	...