Pequenas alterações

Eric Menezes Noronha
1 parent e9c282ff
Showing 4 changed files with 40 additions and 6 deletions Show diff stats
cacic-teste/cacic-teste.pro
cacic-teste/testcacic.cpp
cacic-teste/testcacic.h
src/cacic_comm.h
@@ -20,13 +20,16 @@ win32 {
 SOURCES += \
     testcacic.cpp \
     ../src/ccacic.cpp \
-    ../src/cacic_computer.cpp
+    ../src/cacic_computer.cpp \
+    ../src/sslclient.cpp
 HEADERS += \
     testcacic.h \
     ../src/ccacic.h \
     ../src/cacic_computer.h \
-    ../src/cacic_comm.h
+    ../src/cacic_comm.h \
+    ../src/sslclient.h
-INCLUDEPATH += ../src
+INCLUDEPATH += ../src \
+               ../src/crypto++/include/
@@ -108,6 +108,17 @@ void CTestCacic::testLogin(){
     QVERIFY(!session_str.isNull());
 }
+void CTestCacic::testSslConnection()
+{
+    QVariantMap login;
+    login["user"] = "cacic";
+    login["password"] = "cacic";
+    QJsonObject json = OCacicComm.comm("/ws/get/test", QJsonObject::fromVariantMap(login), true);
+    QJsonValue jsonvalue = json["key"];
+//    qDebug() << jsonvalue.toVariant().toString();
+    QVERIFY(!jsonvalue.isNull());
+}
+
 void CTestCacic::cleanupTestCase()
 {
@@ -45,6 +45,7 @@ private slots:
     void testInterfaceDeRede();
     void testpegarOS();
     void testLogin();
+    void testSslConnection();
     void cleanupTestCase();
 };
@@ -12,6 +12,7 @@
 #include <QUrlQuery>
 #include <QJsonObject>
 #include <QJsonDocument>
+#include <sslclient.h>
 class CacicComm {
@@ -49,14 +50,18 @@ public:
         params.addQueryItem("te_so",so);
         params.addQueryItem("te_versao_cacic",cacicVersion);
         params.addQueryItem("te_versao_gercols",gercolsVersion);
+
+
     }
-    QJsonObject comm(QString route, const QJsonObject &json = QJsonObject())
+    QJsonObject comm(QString route, const QJsonObject &json = QJsonObject(), bool isSsl = false)
     {
         QByteArray data;
         QUrl url = urlGerente + route;
         QNetworkRequest req(url);
         req.setHeader(QNetworkRequest::LocationHeader, "Cacic Agente");
+        if (isSsl)
+            req.setSslConfiguration(QSslConfiguration::defaultConfiguration());
         if (json.empty())
         {
             //se não for passado QJson, será mandado os valores do get/test antigo. (Será retirado depois)
@@ -79,11 +84,12 @@ public:
         QNetworkReply *reply = mgr.post(req, data);
         eventLoop.exec(); // sai do looping chamando o "finished()".
-
         QVariantMap replyValue;
+        //grava o código de retorno
         replyValue["codestatus"] = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toString();
         if (reply->error() == QNetworkReply::NoError) {
+            //se não houver erro, grava o retorno;
             QString strReply = (QString)reply->readAll();
             replyValue["reply"] = strReply;
             //parse json
@@ -98,6 +104,7 @@ public:
         }
+        //retorna o json;
         QJsonObject jsonObj = QJsonObject::fromVariantMap(replyValue);
         return jsonObj;
     }
@@ -117,6 +124,7 @@ public:
         // a requisição HTTP
         QUrl url = urlGerente;
         QNetworkRequest req( url );
+        req.setHeader(QNetworkRequest::LocationHeader, "Cacic Agente");
         QNetworkReply *reply = mgr.get(req);
         eventLoop.exec(); // sai do looping chamando o "finished()".
@@ -145,8 +153,19 @@ public:
     }
+    bool sslConnection(QString host, int port) {
+        //cria dados para conexão
+        SslClient client;
+        client.setHost(host);
+        client.setPort(port);
+
+        return client.start();
+        //cria conexão e retorna json
+
+    }
+
 signals:
     void finished(QNetworkReply* reply);
-};
+};
 #endif // CACIC_COMM_H
	@@ -108,6 +108,17 @@ void CTestCacic::testLogin(){		@@ -108,6 +108,17 @@ void CTestCacic::testLogin(){
108	QVERIFY(!session_str.isNull());	108	QVERIFY(!session_str.isNull());
109	}	109	}
110		110
		111	+void CTestCacic::testSslConnection()
		112	+{
		113	+ QVariantMap login;
		114	+ login["user"] = "cacic";
		115	+ login["password"] = "cacic";
		116	+ QJsonObject json = OCacicComm.comm("/ws/get/test", QJsonObject::fromVariantMap(login), true);
		117	+ QJsonValue jsonvalue = json["key"];
		118	+// qDebug() << jsonvalue.toVariant().toString();
		119	+ QVERIFY(!jsonvalue.isNull());
		120	+}
		121	+
111	void CTestCacic::cleanupTestCase()	122	void CTestCacic::cleanupTestCase()
112	{	123	{
113		124
	@@ -45,6 +45,7 @@ private slots:		@@ -45,6 +45,7 @@ private slots:
45	void testInterfaceDeRede();	45	void testInterfaceDeRede();
46	void testpegarOS();	46	void testpegarOS();
47	void testLogin();	47	void testLogin();
		48	+ void testSslConnection();
48	void cleanupTestCase();	49	void cleanupTestCase();
49	};	50	};
50		51