Use old password for enciphering password change answer.

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / rsconf.cpp

diff --git a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
index 9ec72a1c1aa67f628c45e7af0dc72d9f1de23f37..a4915e397cc950c4a1e8f095f64f998a7db06d46 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
@@ -26,7 +26,7 @@
 *
 *******************************************************************/
 
 *
 *******************************************************************/
 

-#include <unistd.h> // cloase, usleep
+#include <unistd.h> // close

 
 #include <cerrno>
 #include <csignal>
 
 #include <cerrno>
 #include <csignal>


@@ -74,6 +74,7 @@ listenSocket = socket(PF_INET, SOCK_STREAM, 0);
 if (listenSocket < 0)
     {
     errorStr = "Create NET_CONFIGURATOR socket failed.";
 if (listenSocket < 0)
     {
     errorStr = "Create NET_CONFIGURATOR socket failed.";

+    logger("Cannot create a socket: %s", strerror(errno));

     return -1;
     }
 
     return -1;
     }
 


@@ -86,6 +87,7 @@ int lng = 1;
 if (0 != setsockopt(listenSocket, SOL_SOCKET, SO_REUSEADDR, &lng, 4))
     {
     errorStr = "Setsockopt failed. " + string(strerror(errno));
 if (0 != setsockopt(listenSocket, SOL_SOCKET, SO_REUSEADDR, &lng, 4))
     {
     errorStr = "Setsockopt failed. " + string(strerror(errno));

+    logger("setsockopt error: %s", strerror(errno));

     return -1;
     }
 
     return -1;
     }
 


@@ -94,6 +96,7 @@ res = bind(listenSocket, (struct sockaddr*)&listenAddr, sizeof(listenAddr));
 if (res == -1)
     {
     errorStr = "Bind admin socket failed";
 if (res == -1)
     {
     errorStr = "Bind admin socket failed";

+    logger("Cannot bind the socket: %s", strerror(errno));

     return -1;
     }
 
     return -1;
     }
 


@@ -101,6 +104,7 @@ res = listen(listenSocket, 0);
 if (res == -1)
     {
     errorStr = "Listen admin socket failed";
 if (res == -1)
     {
     errorStr = "Listen admin socket failed";

+    logger("Cannot listen the socket: %s", strerror(errno));

     return -1;
     }
 
     return -1;
     }
 


@@ -147,16 +151,15 @@ while (nonstop)
         break;
         }
 
         break;
         }
 

-    if (outerSocket == -1)
+    if (outerSocket < 0)

         {
         {

+       logger("accept error: %s", strerror(errno));

         printfd(__FILE__, "accept failed\n");
         continue;
         }
 
     adminIP = *(unsigned int*)&(outerAddr.sin_addr);
 
         printfd(__FILE__, "accept failed\n");
         continue;
         }
 
     adminIP = *(unsigned int*)&(outerAddr.sin_addr);
 

-    printfd(__FILE__, "Connection accepted from %s\n", inet_ntostring(outerAddr.sin_addr.s_addr).c_str());
-

     if (state == confHdr)
         {
         if (RecvHdr(outerSocket) < 0)
     if (state == confHdr)
         {
         if (RecvHdr(outerSocket) < 0)


@@ -231,6 +234,7 @@ while (nonstop)
         {
         WriteLogAccessFailed(adminIP);
         }
         {
         WriteLogAccessFailed(adminIP);
         }

+    printfd(__FILE__, "Successfull connection from %s\n", inet_ntostring(outerAddr.sin_addr.s_addr).c_str());

     close(outerSocket);
     }
 }
     close(outerSocket);
     }
 }


@@ -250,8 +254,10 @@ while (pos < stgHdrLen)
         return -1;
         }
     int ret = recv(sock, &buf[pos], stgHdrLen - pos, 0);
         return -1;
         }
     int ret = recv(sock, &buf[pos], stgHdrLen - pos, 0);

-    if (ret < 0)
+    if (ret <= 0)

         {
         {

+       if (ret < 0)
+           logger("recv error: %s", strerror(errno));

         state = confHdr;
         return -1;
         }
         state = confHdr;
         return -1;
         }


@@ -278,7 +284,7 @@ if (err)
     {
     if (send(sock, ERR_HEADER, sizeof(ERR_HEADER) - 1, 0) < 0)
         {
     {
     if (send(sock, ERR_HEADER, sizeof(ERR_HEADER) - 1, 0) < 0)
         {

-        WriteServLog("send ERR_HEADER error in SendHdrAnswer.");
+        logger("send error: %s", strerror(errno));

         return -1;
         }
     }
         return -1;
         }
     }


@@ -286,7 +292,7 @@ else
     {
     if (send(sock, OK_HEADER, sizeof(OK_HEADER) - 1, 0) < 0)
         {
     {
     if (send(sock, OK_HEADER, sizeof(OK_HEADER) - 1, 0) < 0)
         {

-        WriteServLog("send OK_HEADER error in SendHdrAnswer.");
+        logger("send error: %s", strerror(errno));

         return -1;
         }
     }
         return -1;
         }
     }


@@ -310,9 +316,10 @@ while (pos < ADM_LOGIN_LEN) {
 
     int ret = recv(sock, &login[pos], ADM_LOGIN_LEN - pos, 0);
 
 
     int ret = recv(sock, &login[pos], ADM_LOGIN_LEN - pos, 0);
 

-    if (ret < 0)
+    if (ret <= 0)

         {
         // Error in network
         {
         // Error in network

+       logger("recv error: %s", strerror(errno));

         state = confHdr;
         return ENODATA;
         }
         state = confHdr;
         return ENODATA;
         }


@@ -337,7 +344,7 @@ int CONFIGPROTO::SendLoginAnswer(int sock)
 {
 if (send(sock, OK_LOGIN, sizeof(OK_LOGIN) - 1, 0) < 0)
     {
 {
 if (send(sock, OK_LOGIN, sizeof(OK_LOGIN) - 1, 0) < 0)
     {

-    WriteServLog("Send OK_LOGIN error in SendLoginAnswer.");
+    logger("Send OK_LOGIN error in SendLoginAnswer.");

     return -1;
     }
 return 0;
     return -1;
     }
 return 0;


@@ -359,10 +366,11 @@ while (pos < ADM_LOGIN_LEN)
 
     int ret = recv(sock, &loginS[pos], ADM_LOGIN_LEN - pos, 0);
 
 
     int ret = recv(sock, &loginS[pos], ADM_LOGIN_LEN - pos, 0);
 

-    if (ret < 0)
+    if (ret <= 0)

         {
         // Network error
         printfd(__FILE__, "recv error: '%s'\n", strerror(errno));
         {
         // Network error
         printfd(__FILE__, "recv error: '%s'\n", strerror(errno));

+       logger("recv error: %s", strerror(errno));

         state = confHdr;
         return ENODATA;
         }
         state = confHdr;
         return ENODATA;
         }


@@ -399,6 +407,7 @@ if (strncmp(currAdmin->GetLogin().c_str(), login, ADM_LOGIN_LEN) != 0)
     }
 
 state = confData;
     }
 
 state = confData;

+adminPassword = currAdmin->GetPassword();

 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------


@@ -408,7 +417,7 @@ if (err)
     {
     if (send(sock, ERR_LOGINS, sizeof(ERR_LOGINS) - 1, 0) < 0)
         {
     {
     if (send(sock, ERR_LOGINS, sizeof(ERR_LOGINS) - 1, 0) < 0)
         {

-        WriteServLog("send ERR_LOGIN error in SendLoginAnswer.");
+        logger("send error: %s", strerror(errno));

         return -1;
         }
     }
         return -1;
         }
     }


@@ -416,7 +425,7 @@ else
     {
     if (send(sock, OK_LOGINS, sizeof(OK_LOGINS) - 1, 0) < 0)
         {
     {
     if (send(sock, OK_LOGINS, sizeof(OK_LOGINS) - 1, 0) < 0)
         {

-        WriteServLog("send OK_LOGINS error in SendLoginSAnswer.");
+        logger("send error: %s", strerror(errno));

         return -1;
         }
     }
         return -1;
         }
     }


@@ -447,6 +456,7 @@ while (1)
         if (ret < 0)
             {
             // Network error
         if (ret < 0)
             {
             // Network error

+           logger("recv error: %s", strerror(errno));

             printfd(__FILE__, "recv error: '%s'\n", strerror(errno));
             return -1;
             }
             printfd(__FILE__, "recv error: '%s'\n", strerror(errno));
             return -1;
             }


@@ -461,7 +471,7 @@ while (1)
         }
 
     char buffer[8];
         }
 
     char buffer[8];

-    buffer[8] = 0;
+    buffer[7] = 0;

 
     DecodeString(buffer, bufferS, &ctx);
     requestList.push_back(std::string(buffer, pos));
 
     DecodeString(buffer, bufferS, &ctx);
     requestList.push_back(std::string(buffer, pos));


@@ -491,7 +501,7 @@ char buffS[8];
 int n = 0;
 int k = 0;
 
 int n = 0;
 int k = 0;
 

-EnDecodeInit(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx);
+EnDecodeInit(adminPassword.c_str(), ADM_PASSWD_LEN, &ctx);

 
 while (li != answerList.end())
     {
 
 while (li != answerList.end())
     {


@@ -537,6 +547,6 @@ answerList.push_back(s);
 //-----------------------------------------------------------------------------
 void CONFIGPROTO::WriteLogAccessFailed(uint32_t ip)
 {
 //-----------------------------------------------------------------------------
 void CONFIGPROTO::WriteLogAccessFailed(uint32_t ip)
 {

-WriteServLog("Admin's connect failed. IP %s", inet_ntostring(ip).c_str());
+logger("Admin's connection failed. IP %s", inet_ntostring(ip).c_str());

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------