X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/58c44b8153f2164b07be44e463bf7b92044098bd..f6aeba07ab90a20378c84c89f46afb9e85738612:/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp index e9f50e48..c06b99da 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp @@ -14,29 +14,21 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/******************************************************************* -* -* DESCRIPTION: æÁÊÌ Ó ÏÓÎÏ×ÎÙÍÉ ÆÕÎËÃÉÑÍÉ ÄÌÑ ÓÅÔÅ×ÏÇÏ ÏÂÍÅÎÁ ÄÁÎÎÙÍÉ -* Ó ÍÅÎÅÄÖÅÒÏÍ ËÌÉÅÎÔÏ×. ðÒÉÅÍ, ÐÅÒÅÄÁÞÁ É ÛÉÆÒÏ×ÁÎÉÅ ÓÏÏÂÝÅÎÉÊ. -* -* AUTHOR: Boris Mikhailenko -* -* $Revision: 1.24 $ -* $Date: 2010/10/04 20:24:54 $ -* -*******************************************************************/ +/* + * Author : Boris Mikhailenko + */ #include "configproto.h" #include "parser.h" +#include "stg/admins.h" #include "stg/logger.h" #include "stg/common.h" #include "stg/blowfish.h" #include #include -#include // snprintf #include // strerror #include // close @@ -67,9 +59,6 @@ enum //----------------------------------------------------------------------------- int CONFIGPROTO::Prepare() { -int res; -struct sockaddr_in listenAddr; - sigset_t sigmask, oldmask; sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); @@ -82,11 +71,12 @@ listenSocket = socket(PF_INET, SOCK_STREAM, 0); if (listenSocket < 0) { - errorStr = "Create NET_CONFIGURATOR socket failed."; + errorStr = "Create socket failed."; logger("Cannot create a socket: %s", strerror(errno)); return -1; } +struct sockaddr_in listenAddr; listenAddr.sin_family = PF_INET; listenAddr.sin_port = htons(port); listenAddr.sin_addr.s_addr = inet_addr("0.0.0.0"); @@ -100,17 +90,14 @@ if (0 != setsockopt(listenSocket, SOL_SOCKET, SO_REUSEADDR, &lng, 4)) return -1; } -res = bind(listenSocket, (struct sockaddr*)&listenAddr, sizeof(listenAddr)); - -if (res == -1) +if (bind(listenSocket, (struct sockaddr*)&listenAddr, sizeof(listenAddr)) == -1) { errorStr = "Bind admin socket failed"; logger("Cannot bind the socket: %s", strerror(errno)); return -1; } -res = listen(listenSocket, 0); -if (res == -1) +if (listen(listenSocket, 0) == -1) { errorStr = "Listen admin socket failed"; logger("Cannot listen the socket: %s", strerror(errno)); @@ -125,18 +112,18 @@ return 0; int CONFIGPROTO::Stop() { nonstop = false; +shutdown(listenSocket, SHUT_RDWR); close(listenSocket); //TODO: Idiotism -int sock; struct sockaddr_in addr; -socklen_t addrLen; addr.sin_family = PF_INET; addr.sin_port = htons(port); addr.sin_addr.s_addr = inet_addr("127.0.0.1"); -addrLen = sizeof(addr); -sock = socket(PF_INET, SOCK_STREAM, 0); +socklen_t addrLen = sizeof(addr); +int sock = socket(PF_INET, SOCK_STREAM, 0); connect(sock, (sockaddr*)&addr, addrLen); +shutdown(sock, SHUT_RDWR); close(sock); //Idiotism end return 0; @@ -144,8 +131,6 @@ return 0; //----------------------------------------------------------------------------- void CONFIGPROTO::Run() { -state = confHdr; - while (nonstop) { state = confHdr; @@ -171,6 +156,7 @@ while (nonstop) { if (RecvHdr(outerSocket) < 0) { + shutdown(outerSocket, SHUT_RDWR); close(outerSocket); continue; } @@ -178,11 +164,13 @@ while (nonstop) { if (SendHdrAnswer(outerSocket, ans_ok) < 0) { + shutdown(outerSocket, SHUT_RDWR); close(outerSocket); continue; } if (RecvLogin(outerSocket) < 0) { + shutdown(outerSocket, SHUT_RDWR); close(outerSocket); continue; } @@ -190,11 +178,13 @@ while (nonstop) { if (SendLoginAnswer(outerSocket) < 0) { + shutdown(outerSocket, SHUT_RDWR); close(outerSocket); continue; } if (RecvLoginS(outerSocket) < 0) { + shutdown(outerSocket, SHUT_RDWR); close(outerSocket); continue; } @@ -202,11 +192,13 @@ while (nonstop) { if (SendLoginSAnswer(outerSocket, ans_ok) < 0) { + shutdown(outerSocket, SHUT_RDWR); close(outerSocket); continue; } if (RecvData(outerSocket) < 0) { + shutdown(outerSocket, SHUT_RDWR); close(outerSocket); continue; } @@ -216,6 +208,7 @@ while (nonstop) { if (SendLoginSAnswer(outerSocket, ans_err) < 0) { + shutdown(outerSocket, SHUT_RDWR); close(outerSocket); continue; } @@ -232,6 +225,7 @@ while (nonstop) WriteLogAccessFailed(adminIP); if (SendHdrAnswer(outerSocket, ans_err) < 0) { + shutdown(outerSocket, SHUT_RDWR); close(outerSocket); continue; } @@ -242,6 +236,7 @@ while (nonstop) WriteLogAccessFailed(adminIP); } printfd(__FILE__, "Successfull connection from %s\n", inet_ntostring(outerAddr.sin_addr.s_addr).c_str()); + shutdown(outerSocket, SHUT_RDWR); close(outerSocket); } } @@ -392,11 +387,11 @@ if (currAdmin->GetLogin().empty()) } BLOWFISH_CTX ctx; -EnDecodeInit(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx); +InitContext(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx); char login[ADM_LOGIN_LEN + 1]; for (size_t i = 0; i < ADM_LOGIN_LEN / 8; i++) - DecodeString(login + i * 8, loginS + i * 8, &ctx); + DecryptBlock(login + i * 8, loginS + i * 8, &ctx); if (currAdmin == admins->GetNoAdmin()) { @@ -442,7 +437,7 @@ int CONFIGPROTO::RecvData(int sock) requestList.clear(); BLOWFISH_CTX ctx; -EnDecodeInit(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx); +InitContext(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx); while (1) { @@ -478,7 +473,7 @@ while (1) char buffer[8]; buffer[7] = 0; - DecodeString(buffer, bufferS, &ctx); + DecryptBlock(buffer, bufferS, &ctx); requestList.push_back(std::string(buffer, pos)); if (done || memchr(buffer, 0, pos) != NULL) @@ -487,7 +482,7 @@ while (1) if (ParseCommand()) return SendError(sock, "Bad command"); else - return SendDataAnswer(sock, currParser->GetAnswer()); + return SendDataAnswer(sock, GetDataAnswer()); } } //return 0; @@ -499,16 +494,16 @@ if (answer.empty()) return 0; BLOWFISH_CTX ctx; -EnDecodeInit(adminPassword.c_str(), ADM_PASSWD_LEN, &ctx); +InitContext(adminPassword.c_str(), ADM_PASSWD_LEN, &ctx); std::string::size_type pos = 0; -std::string::size_type length = answer.length(); +std::string::size_type length = answer.length() + 1; while (pos < length) { char buffer[1024]; std::string::size_type chunkLength = std::min(length - pos, sizeof(buffer)); - EncodeFullString(buffer, answer.c_str() + pos, chunkLength, ctx); - if (send(sock, buffer, chunkLength, 0) < 0) + EncryptString(buffer, answer.c_str() + pos, chunkLength, &ctx); + if (send(sock, buffer, (chunkLength & ~7) < chunkLength ? chunkLength + 8 : chunkLength, 0) < 0) // Need to send data adjusted to the 8-byte boundary. return -1; pos += chunkLength; }