X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/c3d4d096451b5c683492e81574b302e5486950e1..250a7d6e7a4c8ffd644931b7b3964289a8f99151:/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp?ds=sidebyside

diff --git a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp
index 03e30422..f64211d0 100644
--- a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp
+++ b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp
@@ -57,8 +57,6 @@ namespace
 PLUGIN_CREATOR<AUTH_IA> iac;
 
 void InitEncrypt(BLOWFISH_CTX * ctx, const std::string & password);
-void Decrypt(BLOWFISH_CTX * ctx, void * dst, const void * src, size_t len8);
-void Encrypt(BLOWFISH_CTX * ctx, void * dst, const void * src, size_t len8);
 }
 
 extern "C" PLUGIN * GetPlugin();
@@ -334,7 +332,7 @@ AUTH_IA::AUTH_IA()
       onDelUserNotifier(*this),
       logger(GetPluginLogger(GetStgLogger(), "auth_ia"))
 {
-InitEncrypt(&ctxS, "pr7Hhen");
+InitContext("pr7Hhen", 7, &ctxS);
 
 pthread_mutexattr_t attr;
 pthread_mutexattr_init(&attr);
@@ -603,7 +601,7 @@ if (CheckHeader(buffer, sip, &protoVer))
 char login[PASSWD_LEN];  //TODO why PASSWD_LEN ?
 memset(login, 0, PASSWD_LEN);
 
-Decrypt(&ctxS, login, buffer + 8, PASSWD_LEN / 8);
+DecryptString(login, buffer + 8, PASSWD_LEN, &ctxS);
 
 USER_PTR user;
 if (users->FindByName(login, &user))
@@ -612,7 +610,7 @@ if (users->FindByName(login, &user))
            login,
            inet_ntostring(sip).c_str());
     printfd(__FILE__, "User '%s' NOT found!\n", login);
-    SendError(sip, sport, protoVer, "îÅÐÒÁ×ÉÌØÎÙÊ ÌÏÇÉÎ!");
+    SendError(sip, sport, protoVer, IconvString("Неправильный логин.", "utf8", "koi8-ru"));
     return -1;
     }
 
@@ -621,14 +619,14 @@ printfd(__FILE__, "User '%s' FOUND!\n", user->GetLogin().c_str());
 if (user->GetProperty().disabled.Get())
     {
     logger("Cannont authorize '%s', user is disabled.", login);
-    SendError(sip, sport, protoVer, "õÞÅÔÎÁÑ ÚÁÐÉÓØ ÚÁÂÌÏËÉÒÏ×ÁÎÁ");
+    SendError(sip, sport, protoVer, IconvString("Учетная запись заблокирована.", "utf8", "koi8-ru"));
     return 0;
     }
 
 if (user->GetProperty().passive.Get())
     {
     logger("Cannont authorize '%s', user is passive.", login);
-    SendError(sip, sport, protoVer, "õÞÅÔÎÁÑ ÚÁÐÉÓØ ÚÁÍÏÒÏÖÅÎÁ");
+    SendError(sip, sport, protoVer, IconvString("Учетная запись заморожена.", "utf8", "koi8-ru"));
     return 0;
     }
 
@@ -638,7 +636,7 @@ if (!user->GetProperty().ips.Get().IsIPInIPS(sip))
             user->GetLogin().c_str(), inet_ntostring(sip).c_str());
     logger("User %s. IP address is incorrect. IP %s",
            user->GetLogin().c_str(), inet_ntostring(sip).c_str());
-    SendError(sip, sport, protoVer, "ðÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÏÐÏÚÎÁÎ! ðÒÏ×ÅÒØÔÅ IP ÁÄÒÅÓ.");
+    SendError(sip, sport, protoVer, IconvString("Пользователь не опознан. Проверьте IP-адрес.", "utf8", "koi8-ru"));
     return 0;
     }
 
@@ -649,11 +647,9 @@ int AUTH_IA::CheckHeader(const char * buffer, uint32_t sip, int * protoVer)
 {
 if (strncmp(IA_ID, buffer, strlen(IA_ID)) != 0)
     {
-    //SendError(userIP, updateMsg);
     printfd(__FILE__, "update needed - IA_ID\n");
     if (iaSettings.LogProtocolErrors())
         logger("IP: %s. Header: invalid packed signature.", inet_ntostring(sip).c_str());
-    //SendError(userIP, "Incorrect header!");
     return -1;
     }
 
@@ -662,14 +658,12 @@ if (buffer[6] != 0) //proto[0] shoud be 0
     printfd(__FILE__, "update needed - PROTO major: %d\n", buffer[6]);
     if (iaSettings.LogProtocolErrors())
         logger("IP: %s. Header: invalid protocol major version: %d.", inet_ntostring(sip).c_str(), buffer[6]);
-    //SendError(userIP, updateMsg);
     return -1;
     }
 
 if (buffer[7] < 6)
     {
     // need update
-    //SendError(userIP, updateMsg);
     printfd(__FILE__, "update needed - PROTO minor: %d\n", buffer[7]);
     if (iaSettings.LogProtocolErrors())
         logger("IP: %s. Header: invalid protocol minor version: %d.", inet_ntostring(sip).c_str(), buffer[7]);
@@ -789,7 +783,7 @@ if (it == ip2user.end())
                    userPtr->GetLogin().c_str(),
                    inet_ntostring(sip).c_str(),
                    login.c_str());
-            SendError(sip, sport, protoVer, "÷ÁÛ IP ÁÄÒÅÓ ÕÖÅ ÉÓÐÏÌØÚÕÅÔÓÑ!");
+            SendError(sip, sport, protoVer, IconvString("IP-адрес уже сипользуется.", "utf8", "koi8-ru"));
             return 0;
             }
         }
@@ -814,7 +808,7 @@ else if (user->GetID() != it->second.user->GetID())
            it->second.user->GetLogin().c_str(),
            inet_ntostring(sip).c_str(),
            user->GetLogin().c_str());
-    SendError(sip, sport, protoVer, "÷ÁÛ IP ÁÄÒÅÓ ÕÖÅ ÉÓÐÏÌØÚÕÅÔÓÑ!");
+    SendError(sip, sport, protoVer, IconvString("IP-адрес уже используется.", "utf8", "koi8-ru"));
     return 0;
     }
 
@@ -822,11 +816,12 @@ IA_USER * iaUser = &(it->second);
 
 if (iaUser->password != user->GetProperty().password.Get())
     {
-    InitEncrypt(&iaUser->ctx, user->GetProperty().password.Get());
+    const std::string & password = user->GetProperty().password.Get();
+    InitContext(password.c_str(), password.length(), &iaUser->ctx);
     iaUser->password = user->GetProperty().password.Get();
     }
 
-Decrypt(&iaUser->ctx, static_cast<char *>(buff) + offset, static_cast<char *>(buff) + offset, (dataLen - offset) / 8);
+DecryptString(static_cast<char *>(buff) + offset, static_cast<char *>(buff) + offset, (dataLen - offset), &iaUser->ctx);
 
 char packetName[IA_MAX_TYPE_LEN];
 strncpy(packetName,  static_cast<char *>(buff) + offset + 4, IA_MAX_TYPE_LEN);
@@ -835,7 +830,7 @@ packetName[IA_MAX_TYPE_LEN - 1] = 0;
 std::map<std::string, int>::iterator pi(packetTypes.find(packetName));
 if (pi == packetTypes.end())
     {
-    SendError(sip, sport, protoVer, "îÅÐÒÁ×ÉÌØÎÙÊ ÌÏÇÉÎ ÉÌÉ ÐÁÒÏÌØ!");
+    SendError(sip, sport, protoVer, IconvString("Неправильный логин или пароль.", "utf8", "koi8-ru"));
     printfd(__FILE__, "Login or password is wrong!\n");
     logger("User's connect failed. User: '%s', ip %s. Wrong login or password",
            login.c_str(),
@@ -853,7 +848,7 @@ if (user->IsAuthorizedBy(this) && user->GetCurrIP() != sip)
            login.c_str(),
            inet_ntostring(user->GetCurrIP()).c_str(),
            inet_ntostring(sip).c_str());
-    SendError(sip, sport, protoVer, "÷ÁÛ ÌÏÇÉÎ ÕÖÅ ÉÓÐÏÌØÚÕÅÔÓÑ!");
+    SendError(sip, sport, protoVer, IconvString("Логин уже используется.", "utf8", "koi8-ru"));
     ip2user.erase(it);
     return 0;
     }
@@ -1077,7 +1072,7 @@ SwapBytes(info.len);
 
 char buffer[256];
 memcpy(buffer, &info, sizeof(INFO_6));
-Encrypt(&user.ctx, buffer, buffer, len / 8);
+EncryptString(buffer, buffer, len, &user.ctx);
 return Send(ip, iaSettings.GetUserPort(), buffer, len);
 }
 //-----------------------------------------------------------------------------
@@ -1106,7 +1101,7 @@ info.text[MAX_MSG_LEN - 1] = 0;
 char buffer[300];
 memcpy(buffer, &info, sizeof(INFO_7));
 
-Encrypt(&user.ctx, buffer, buffer, len / 8);
+EncryptString(buffer, buffer, len, &user.ctx);
 return Send(ip, iaSettings.GetUserPort(), buffer, len);
 }
 //-----------------------------------------------------------------------------
@@ -1135,7 +1130,7 @@ SwapBytes(info.sendTime);
 char buffer[1500];
 memcpy(buffer, &info, sizeof(INFO_8));
 
-Encrypt(&user.ctx, buffer, buffer, len / 8);
+EncryptString(buffer, buffer, len, &user.ctx);
 return Send(ip, user.port, buffer, len);
 }
 //-----------------------------------------------------------------------------
@@ -1414,7 +1409,7 @@ SwapBytes(connSynAck6.userTimeOut);
 SwapBytes(connSynAck6.aliveDelay);
 #endif
 
-Encrypt(&iaUser->ctx, (char*)&connSynAck6, (char*)&connSynAck6, Min8(sizeof(CONN_SYN_ACK_6))/8);
+EncryptString((char*)&connSynAck6, (char*)&connSynAck6, Min8(sizeof(CONN_SYN_ACK_6)), &iaUser->ctx);
 return Send(sip, iaSettings.GetUserPort(), (char*)&connSynAck6, Min8(sizeof(CONN_SYN_ACK_6)));;
 }
 //-----------------------------------------------------------------------------
@@ -1456,7 +1451,7 @@ SwapBytes(connSynAck8.userTimeOut);
 SwapBytes(connSynAck8.aliveDelay);
 #endif
 
-Encrypt(&iaUser->ctx, (char*)&connSynAck8, (char*)&connSynAck8, Min8(sizeof(CONN_SYN_ACK_8))/8);
+EncryptString((char*)&connSynAck8, (char*)&connSynAck8, Min8(sizeof(CONN_SYN_ACK_8)), &iaUser->ctx);
 return Send(sip, iaUser->port, (char*)&connSynAck8, Min8(sizeof(CONN_SYN_ACK_8)));
 }
 //-----------------------------------------------------------------------------
@@ -1537,7 +1532,7 @@ for (int i = 0; i < DIR_NUM; ++i)
     }
 #endif
 
-Encrypt(&(iaUser->ctx), (char*)&aliveSyn6, (char*)&aliveSyn6, Min8(sizeof(aliveSyn6))/8);
+EncryptString((char*)&aliveSyn6, (char*)&aliveSyn6, Min8(sizeof(aliveSyn6)), &iaUser->ctx);
 return Send(sip, iaSettings.GetUserPort(), (char*)&aliveSyn6, Min8(sizeof(aliveSyn6)));
 }
 //-----------------------------------------------------------------------------
@@ -1630,7 +1625,7 @@ for (int i = 0; i < DIR_NUM; ++i)
     }
 #endif
 
-Encrypt(&(iaUser->ctx), (char*)&aliveSyn8, (char*)&aliveSyn8, Min8(sizeof(aliveSyn8))/8);
+EncryptString((char*)&aliveSyn8, (char*)&aliveSyn8, Min8(sizeof(aliveSyn8)), &iaUser->ctx);
 return Send(sip, iaUser->port, (char*)&aliveSyn8, Min8(sizeof(aliveSyn8)));
 }
 //-----------------------------------------------------------------------------
@@ -1645,7 +1640,7 @@ SwapBytes(disconnSynAck6.len);
 SwapBytes(disconnSynAck6.rnd);
 #endif
 
-Encrypt(&iaUser->ctx, (char*)&disconnSynAck6, (char*)&disconnSynAck6, Min8(sizeof(disconnSynAck6))/8);
+EncryptString((char*)&disconnSynAck6, (char*)&disconnSynAck6, Min8(sizeof(disconnSynAck6)), &iaUser->ctx);
 return Send(sip, iaSettings.GetUserPort(), (char*)&disconnSynAck6, Min8(sizeof(disconnSynAck6)));
 }
 //-----------------------------------------------------------------------------
@@ -1669,7 +1664,7 @@ SwapBytes(disconnSynAck8.len);
 SwapBytes(disconnSynAck8.rnd);
 #endif
 
-Encrypt(&iaUser->ctx, (char*)&disconnSynAck8, (char*)&disconnSynAck8, Min8(sizeof(disconnSynAck8))/8);
+EncryptString((char*)&disconnSynAck8, (char*)&disconnSynAck8, Min8(sizeof(disconnSynAck8)), &iaUser->ctx);
 return Send(sip, iaUser->port, (char*)&disconnSynAck8, Min8(sizeof(disconnSynAck8)));
 }
 //-----------------------------------------------------------------------------
@@ -1683,7 +1678,7 @@ strcpy((char*)fin6.ok, "OK");
 SwapBytes(fin6.len);
 #endif
 
-Encrypt(&iaUser->ctx, (char*)&fin6, (char*)&fin6, Min8(sizeof(fin6))/8);
+EncryptString((char*)&fin6, (char*)&fin6, Min8(sizeof(fin6)), &iaUser->ctx);
 
 users->Unauthorize(iaUser->login, this);
 
@@ -1713,7 +1708,7 @@ strcpy((char*)fin8.ok, "OK");
 SwapBytes(fin8.len);
 #endif
 
-Encrypt(&iaUser->ctx, (char*)&fin8, (char*)&fin8, Min8(sizeof(fin8))/8);
+EncryptString((char*)&fin8, (char*)&fin8, Min8(sizeof(fin8)), &iaUser->ctx);
 
 users->Unauthorize(iaUser->login, this);
 
@@ -1735,18 +1730,4 @@ strncpy((char *)keyL, password.c_str(), PASSWD_LEN);
 Blowfish_Init(ctx, keyL, PASSWD_LEN);
 }
 //-----------------------------------------------------------------------------
-inline
-void Decrypt(BLOWFISH_CTX * ctx, void * dst, const void * src, size_t len8)
-{
-for (size_t i = 0; i < len8; i++)
-    DecodeString(static_cast<char *>(dst) + i * 8, static_cast<const char *>(src) + i * 8, ctx);
-}
-//-----------------------------------------------------------------------------
-inline
-void Encrypt(BLOWFISH_CTX * ctx, void * dst, const void * src, size_t len8)
-{
-for (size_t i = 0; i < len8; i++)
-    EncodeString(static_cast<char *>(dst) + i * 8, static_cast<const char *>(src) + i * 8, ctx);
-}
-//-----------------------------------------------------------------------------
 }