f

common/src/aesf.cpp

@@ -0,0 +1,27 @@
+#include "aesf.hpp"
+#include "strf.hpp"
+#include "totype.hpp"
+#include "base64f.hpp"
+
+std::string aesf::encrypt(const char *orig, const char *password, uint64_t r)
+{
+    fflassert(orig, to_cstr(orig));
+    fflassert(password, to_cstr(password));
+
+    std::string result;
+    result.append(orig);
+    result.append(password);
+    result.append(std::to_string(r));
+    result.append(str_printf("%04zu", to_sv(orig).size()));
+    return base64f::encode(result);
+}
+
+std::string aesf::decrypt(const char *encoded, const char *, uint64_t)
+{
+    const auto s = base64f::decode(encoded, to_sv(encoded).size());
+    const size_t size = (s.rbegin()[3] - '0') * 1000
+                      + (s.rbegin()[2] - '0') * 100
+                      + (s.rbegin()[1] - '0') * 10
+                      + (s.rbegin()[0] - '0') * 1;
+    return s.substr(0, size);
+}

common/src/aesf.hpp

@@ -0,0 +1,9 @@
+#pragma once
+#include <string>
+#include <cstdint>
+
+namespace aesf
+{
+    std::string encrypt(const char *, const char *, uint64_t);
+    std::string decrypt(const char *, const char *, uint64_t);
+}

server/src/npchar.cpp

@@ -1,5 +1,6 @@
 #include <cstdint>
 #include "uidf.hpp"
+#include "aesf.hpp"
 #include "luaf.hpp"
 #include "xmlf.hpp"
 #include "dbpod.hpp"
@@ -14,10 +15,12 @@
 #include "serdesmsg.hpp"
 #include "friendtype.hpp"
 #include "monoserver.hpp"
+#include "serverpasswordwindow.hpp"
 #include "serverconfigurewindow.hpp"
 
 extern DBPod *g_dbPod;
 extern MonoServer *g_monoServer;
+extern ServerPasswordWindow *g_serverPasswordWindow;
 extern ServerConfigureWindow *g_serverConfigureWindow;
 
 NPChar::LuaThreadRunner::LuaThreadRunner(NPChar *npc)
@@ -449,24 +452,18 @@ void NPChar::postXMLLayout(uint64_t uid, std::string path, std::string xmlString
         if(auto elem = node->ToElement()){
             for(auto attr = elem->FirstAttribute(); attr; attr = attr->Next()){
                 if(str_tolower(attr->Name()) == "id"){
-                    std::string val = attr->Value() + std::to_string(xmlSeqID);
-                    const_cast<tinyxml2::XMLAttribute *>(attr)->SetAttribute(val.c_str());
+                    const_cast<tinyxml2::XMLAttribute *>(attr)->SetAttribute(aesf::encrypt(attr->Value(), g_serverPasswordWindow->getPassword(), xmlSeqID).c_str());
                     break;
                 }
             }
         }
 
-        if(node->NoChildren()) {
-            return;
-        }
-
         for(auto child = node->FirstChild(); child; child = child->NextSibling()){
             self(child);
         }
     };
 
     fnXMLTran(xmlDoc.RootElement());
-
     forwardNetPackage(uid, SM_NPCXMLLAYOUT, cerealf::serialize(SDNPCXMLLayout
     {
         .npcUID = UID(),