Conexão ssl, test ssl, nova funcao de auxilio json, tipo de lista de networkInterfaces alterada

Eric Menezes Noronha
1 parent 237ed6cf
Showing 7 changed files with 53 additions and 29 deletions Show diff stats
cacic-teste/testcacic.cpp
cacic-teste/testcacic.h
src/cacic_comm.h
src/cacic_computer.cpp
src/cacic_computer.h
src/ccacic.cpp
src/ccacic.h
@@ -24,6 +24,7 @@ void CTestCacic::initTestCase()
                                  "2.5.1.1.256.32",
                                  "2.8.1.7",
                                  "2.8.1.6");
+    OCacicComm.setUrlSsl("https://10.1.0.137/cacic/web/app_dev.php");
     this->testPath = QDir::currentPath() + "/teste";
     this->testIniPath = testPath + "/teste.ini";
     QVariantMap json;
@@ -92,7 +93,7 @@ void CTestCacic::testDeCrypt(){
 }
 void CTestCacic::testInterfaceDeRede(){
-    //    qDebug() << QString::fromStdString(OCacicComp.getNetworkInterface().at(0).at(0));
+//    qDebug() << OCacicComp.getNetworkInterface().at(0)["nome"].toString();
     QVERIFY2(!OCacicComp.getNetworkInterface().empty(), "Nenhuma interface de rede encontrada.");
 }
@@ -105,22 +106,28 @@ void CTestCacic::testPegarUsu(){
 }
 void CTestCacic::testLogin(){
-    QJsonObject sessionjson = OCacicComm.login();
-    QJsonValue session_str = sessionjson["codestatus"];
-    //    qDebug() << session_str.toVariant().toString();
-    QVERIFY(!session_str.isNull());
+
+    QVariantMap login;
+    login["user"] = "eric";
+    login["password"] = "612ef9b1";
+    OCacicComm.setUrlSsl("https://10.1.0.137/cacic/web/app_dev.php");
+    QJsonObject json = OCacicComm.comm("/ws/neo/login", QJsonObject::fromVariantMap(login), true);
+    QJsonValue sessionvalue = OCacic.jsonValueFromJsonString(json["reply"].toString(), "session");
+//    qDebug() << sessionvalue.toString();
+    QVERIFY(!sessionvalue.isNull());
 }
 void CTestCacic::testSslConnection()
 {
-    QVariantMap login;
-    login["user"] = "cacic";
-    login["password"] = "cacic";
-    OCacicComm.setUrlSsl("https://teste.cacic.cc");
-    QJsonObject json = OCacicComm.comm("", QJsonObject::fromVariantMap(login), true);
-    QJsonValue jsonvalue = json["reply"];
-//    qDebug() << jsonvalue.toVariant().toString();
-    QVERIFY(!jsonvalue.isNull());
+    QJsonObject json = OCacicComm.comm("", QJsonObject(), true);
+    QJsonValue jsonvalue = json["codestatus"];
+//    qDebug() << jsonvalue.toString();
+    QVERIFY(jsonvalue.toString() == "200" || jsonvalue.toString() == "302");
+}
+
+void CTestCacic::testJsonValueFromJsonString()
+{
+    QVERIFY(OCacic.jsonValueFromJsonString("{\"nome\":\"teste\"}", "nome").toString() == "teste");
 }
 void CTestCacic::cleanupTestCase()
@@ -47,6 +47,7 @@ private slots:
   void testpegarOS();
   void testLogin();
   void testSslConnection();
+  void testJsonValueFromJsonString();
   void cleanupTestCase();
 };
@@ -22,6 +22,7 @@ private:
     // FIXME: Get from configuration
     QString usuario = "user";
     QString password = "123456";
+    std::string session;
 public:
     CacicComm (){
@@ -34,7 +35,6 @@ public:
                QString so,                  QString cacicVersion,        QString gercolsVersion)
     {
         this->urlGerente = urlGerente;
-
         params.addQueryItem("OperatingSystem", operatingSystem);
         params.addQueryItem("ComputerSystem",computerSystem);
         params.addQueryItem("cs_cipher",csCipher);
@@ -94,6 +94,7 @@ public:
         QVariantMap replyValue;
         //grava o código de retorno
         replyValue["codestatus"] = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toString();
+//        qDebug() << "code: " << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toString();
         if (reply->error() == QNetworkReply::NoError) {
             //se não houver erro, grava o retorno;
@@ -14,32 +14,38 @@ CACIC_Computer::CACIC_Computer()
  *      outra lista que conterá todas as interfaces.
  *
  */
-QList<QList<std::string>> CACIC_Computer::networkInterfacesRunning(){
+QList<QVariantMap> CACIC_Computer::networkInterfacesRunning(){
     QNetworkInterface interface;
-    QList<std::string> lista;
-    QList<QList<std::string>> todasInterfaces;
+    QVariantMap mapInterface;
+    QList<QVariantMap> listaMap;
     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";
-            lista.append(in.humanReadableName().toStdString());
+            mapInterface["nome"] = in.humanReadableName();
             //            qDebug() << in.hardwareAddress() << "\n";
-            lista.append(in.hardwareAddress().toStdString());
+            mapInterface["mac"]  = in.hardwareAddress();
             foreach (QNetworkAddressEntry ae, in.addressEntries()){
                 if (ae.ip().scopeId() == ""){
-                    lista.append(ae.ip().toString().toStdString());
+                    mapInterface["ipv4"] = ae.ip().toString();
                 } else {
-                    lista.append(ae.ip().toString().toStdString());
+                    mapInterface["ipv6"] = ae.ip().toString();
                 }
                 //                qDebug() << ae.ip().toString() << "\n";
             }
-            todasInterfaces.append(lista);
-            lista.clear();
+            listaMap.append(mapInterface);
+            mapInterface.clear();
         }
     }
-    return todasInterfaces;
+//    foreach (QVariantMap each, listaMap){
+
+//        foreach (QVariant eachValue, each.values())
+//            qDebug() << eachValue.toString();
+//    }
+
+    return listaMap;
 }
 /*pegarOS
@@ -93,7 +99,7 @@ std::string CACIC_Computer::getUser() const {
     return usu;
 }
-QList<QList<std::string>> CACIC_Computer::getNetworkInterface() const
+QList<QVariantMap> CACIC_Computer::getNetworkInterface() const
 {
     return networkInterface;
 }
@@ -17,11 +17,11 @@ public:
     std::string pegarUsu();
     int getOs() const;
     std::string getUser() const;
-    QList<QList<std::string>> getNetworkInterface() const;
-    QList<QList<std::string>> networkInterfacesRunning();
+    QList<QVariantMap> getNetworkInterface() const;
+    QList<QVariantMap> networkInterfacesRunning();
 private:
-    QList<QList<std::string>> networkInterface;
+    QList<QVariantMap> networkInterface;
     int os;
     std::string usu;
@@ -103,6 +103,11 @@ bool CCacic::deleteFile(QString path)
         return true;
 }
+QJsonValue CCacic::jsonValueFromJsonString(QString json, QString key)
+{
+    return QJsonDocument::fromJson(json.toUtf8()).object()[key];
+}
+
 /*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
@@ -14,7 +14,10 @@
 #include <QSettings>
 #include <QDir>
 #include <QDebug>
-//#include <jvson.h>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonValue>
+
 class CCacic : public QObject
 {
     Q_OBJECT
@@ -28,6 +31,7 @@ public:
     bool createFolder(QString path);
     bool deleteFolder(QString path);
     bool deleteFile(QString path);
+    QJsonValue jsonValueFromJsonString(QString json, QString key);
 //Geters/seters:
	@@ -47,6 +47,7 @@ private slots:		@@ -47,6 +47,7 @@ private slots:
47	void testpegarOS();	47	void testpegarOS();
48	void testLogin();	48	void testLogin();
49	void testSslConnection();	49	void testSslConnection();
		50	+ void testJsonValueFromJsonString();
50	void cleanupTestCase();	51	void cleanupTestCase();
51	};	52	};
52		53