]> git.lizzy.rs Git - minetest.git/blobdiff - src/serverenvironment.cpp
Clean up some auth packet handling related code
[minetest.git] / src / serverenvironment.cpp
index 333d32ff540d7d0414e1f61e862d620b44d30872..f8d84604b0bcc5a16077c09660c5c5ea2e79abbf 100644 (file)
@@ -17,8 +17,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include <algorithm>
 #include "serverenvironment.h"
-#include "content_sao.h"
 #include "settings.h"
 #include "log.h"
 #include "mapblock.h"
@@ -44,7 +44,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #if USE_POSTGRESQL
 #include "database/database-postgresql.h"
 #endif
-#include <algorithm>
+#if USE_LEVELDB
+#include "database/database-leveldb.h"
+#endif
+#include "server/luaentity_sao.h"
+#include "server/player_sao.h"
 
 #define LBM_NAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyz0123456789_:"
 
@@ -545,31 +549,11 @@ bool ServerEnvironment::removePlayerFromDatabase(const std::string &name)
        return m_player_database->removePlayer(name);
 }
 
-bool ServerEnvironment::line_of_sight(v3f pos1, v3f pos2, v3s16 *p)
-{
-       // Iterate trough nodes on the line
-       voxalgo::VoxelLineIterator iterator(pos1 / BS, (pos2 - pos1) / BS);
-       do {
-               MapNode n = getMap().getNode(iterator.m_current_node_pos);
-
-               // Return non-air
-               if (n.param0 != CONTENT_AIR) {
-                       if (p)
-                               *p = iterator.m_current_node_pos;
-                       return false;
-               }
-               iterator.next();
-       } while (iterator.m_current_index <= iterator.m_last_index);
-       return true;
-}
-
 void ServerEnvironment::kickAllPlayers(AccessDeniedCode reason,
        const std::string &str_reason, bool reconnect)
 {
-       for (RemotePlayer *player : m_players) {
-               m_server->DenyAccessVerCompliant(player->getPeerId(),
-                       player->protocol_version, reason, str_reason, reconnect);
-       }
+       for (RemotePlayer *player : m_players)
+               m_server->DenyAccess(player->getPeerId(), reason, str_reason, reconnect);
 }
 
 void ServerEnvironment::saveLoadedPlayers(bool force)
@@ -638,12 +622,15 @@ PlayerSAO *ServerEnvironment::loadPlayer(RemotePlayer *player, bool *new_player,
 
 void ServerEnvironment::saveMeta()
 {
+       if (!m_meta_loaded)
+               return;
+
        std::string path = m_path_world + DIR_DELIM "env_meta.txt";
 
        // Open file and serialize
        std::ostringstream ss(std::ios_base::binary);
 
-       Settings args;
+       Settings args("EnvArgsEnd");
        args.setU64("game_time", m_game_time);
        args.setU64("time_of_day", getTimeOfDay());
        args.setU64("last_clear_objects_time", m_last_clear_objects_time);
@@ -652,7 +639,6 @@ void ServerEnvironment::saveMeta()
                m_lbm_mgr.createIntroductionTimesString());
        args.setU64("day_count", m_day_count);
        args.writeLines(ss);
-       ss<<"EnvArgsEnd\n";
 
        if(!fs::safeWriteToFile(path, ss.str()))
        {
@@ -664,6 +650,9 @@ void ServerEnvironment::saveMeta()
 
 void ServerEnvironment::loadMeta()
 {
+       SANITY_CHECK(!m_meta_loaded);
+       m_meta_loaded = true;
+
        // If file doesn't exist, load default environment metadata
        if (!fs::PathExists(m_path_world + DIR_DELIM "env_meta.txt")) {
                infostream << "ServerEnvironment: Loading default environment metadata"
@@ -684,9 +673,9 @@ void ServerEnvironment::loadMeta()
                throw SerializationError("Couldn't load env meta");
        }
 
-       Settings args;
+       Settings args("EnvArgsEnd");
 
-       if (!args.parseConfigLines(is, "EnvArgsEnd")) {
+       if (!args.parseConfigLines(is)) {
                throw SerializationError("ServerEnvironment::loadMeta(): "
                        "EnvArgsEnd not found!");
        }
@@ -738,6 +727,8 @@ struct ActiveABM
        int chance;
        std::vector<content_t> required_neighbors;
        bool check_required_neighbors; // false if required_neighbors is known to be empty
+       s16 min_y;
+       s16 max_y;
 };
 
 class ABMHandler
@@ -782,6 +773,9 @@ class ABMHandler
                        } else {
                                aabm.chance = chance;
                        }
+                       // y limits
+                       aabm.min_y = abm->getMinY();
+                       aabm.max_y = abm->getMaxY();
 
                        // Trigger neighbors
                        const std::vector<std::string> &required_neighbors_s =
@@ -894,6 +888,9 @@ class ABMHandler
 
                        v3s16 p = p0 + block->getPosRelative();
                        for (ActiveABM &aabm : *m_aabms[c]) {
+                               if ((p.Y < aabm.min_y) || (p.Y > aabm.max_y))
+                                       continue;
+
                                if (myrand() % aabm.chance != 0)
                                        continue;
 
@@ -1074,6 +1071,91 @@ bool ServerEnvironment::swapNode(v3s16 p, const MapNode &n)
        return true;
 }
 
+u8 ServerEnvironment::findSunlight(v3s16 pos) const
+{
+       // Directions for neighbouring nodes with specified order
+       static const v3s16 dirs[] = {
+               v3s16(-1, 0, 0), v3s16(1, 0, 0), v3s16(0, 0, -1), v3s16(0, 0, 1),
+               v3s16(0, -1, 0), v3s16(0, 1, 0)
+       };
+
+       const NodeDefManager *ndef = m_server->ndef();
+
+       // found_light remembers the highest known sunlight value at pos
+       u8 found_light = 0;
+
+       struct stack_entry {
+               v3s16 pos;
+               s16 dist;
+       };
+       std::stack<stack_entry> stack;
+       stack.push({pos, 0});
+
+       std::unordered_map<s64, s8> dists;
+       dists[MapDatabase::getBlockAsInteger(pos)] = 0;
+
+       while (!stack.empty()) {
+               struct stack_entry e = stack.top();
+               stack.pop();
+
+               v3s16 currentPos = e.pos;
+               s8 dist = e.dist + 1;
+
+               for (const v3s16& off : dirs) {
+                       v3s16 neighborPos = currentPos + off;
+                       s64 neighborHash = MapDatabase::getBlockAsInteger(neighborPos);
+
+                       // Do not walk neighborPos multiple times unless the distance to the start
+                       // position is shorter
+                       auto it = dists.find(neighborHash);
+                       if (it != dists.end() && dist >= it->second)
+                               continue;
+
+                       // Position to walk
+                       bool is_position_ok;
+                       MapNode node = m_map->getNode(neighborPos, &is_position_ok);
+                       if (!is_position_ok) {
+                               // This happens very rarely because the map at currentPos is loaded
+                               m_map->emergeBlock(neighborPos, false);
+                               node = m_map->getNode(neighborPos, &is_position_ok);
+                               if (!is_position_ok)
+                                       continue;  // not generated
+                       }
+
+                       const ContentFeatures &def = ndef->get(node);
+                       if (!def.sunlight_propagates) {
+                               // Do not test propagation here again
+                               dists[neighborHash] = -1;
+                               continue;
+                       }
+
+                       // Sunlight could have come from here
+                       dists[neighborHash] = dist;
+                       u8 daylight = node.param1 & 0x0f;
+
+                       // In the special case where sunlight shines from above and thus
+                       // does not decrease with upwards distance, daylight is always
+                       // bigger than nightlight, which never reaches 15
+                       int possible_finlight = daylight - dist;
+                       if (possible_finlight <= found_light) {
+                               // Light from here cannot make a brighter light at currentPos than
+                               // found_light
+                               continue;
+                       }
+
+                       u8 nightlight = node.param1 >> 4;
+                       if (daylight > nightlight) {
+                               // Found a valid daylight
+                               found_light = possible_finlight;
+                       } else {
+                               // Sunlight may be darker, so walk the neighbours
+                               stack.push({neighborPos, dist});
+                       }
+               }
+       }
+       return found_light;
+}
+
 void ServerEnvironment::clearObjects(ClearObjectsMode mode)
 {
        infostream << "ServerEnvironment::clearObjects(): "
@@ -1087,7 +1169,7 @@ void ServerEnvironment::clearObjects(ClearObjectsMode mode)
 
                // If known by some client, don't delete immediately
                if (obj->m_known_by_count > 0) {
-                       obj->m_pending_removal = true;
+                       obj->markForRemoval();
                        return false;
                }
 
@@ -1362,8 +1444,8 @@ void ServerEnvironment::step(float dtime)
                std::shuffle(output.begin(), output.end(), m_rgen);
 
                int i = 0;
-               // The time budget for ABMs is 20%.
-               u32 max_time_ms = m_cache_abm_interval * 1000 / 5;
+               // determine the time budget for ABMs
+               u32 max_time_ms = m_cache_abm_interval * 1000 * m_cache_abm_time_budget;
                for (const v3s16 &p : output) {
                        MapBlock *block = m_map->getBlockNoCreateNoEx(p);
                        if (!block)
@@ -1420,10 +1502,7 @@ void ServerEnvironment::step(float dtime)
                        // Step object
                        obj->step(dtime, send_recommended);
                        // Read messages from object
-                       while (!obj->m_messages_out.empty()) {
-                               this->m_active_object_messages.push(obj->m_messages_out.front());
-                               obj->m_messages_out.pop();
-                       }
+                       obj->dumpAOMessagesToQueue(m_active_object_messages);
                };
                m_ao_manager.step(dtime, cb_state);
        }
@@ -1469,6 +1548,21 @@ void ServerEnvironment::step(float dtime)
        m_server->sendDetachedInventories(PEER_ID_INEXISTENT, true);
 }
 
+ServerEnvironment::BlockStatus ServerEnvironment::getBlockStatus(v3s16 blockpos)
+{
+       if (m_active_blocks.contains(blockpos))
+               return BS_ACTIVE;
+
+       const MapBlock *block = m_map->getBlockNoCreateNoEx(blockpos);
+       if (block && !block->isDummy())
+               return BS_LOADED;
+
+       if (m_map->isBlockInQueue(blockpos))
+               return BS_EMERGING;
+
+       return BS_UNKNOWN;
+}
+
 u32 ServerEnvironment::addParticleSpawner(float exptime)
 {
        // Timers with lifetime 0 do not expire
@@ -1609,28 +1703,28 @@ void ServerEnvironment::setStaticForActiveObjectsInBlock(
        }
 }
 
-ActiveObjectMessage ServerEnvironment::getActiveObjectMessage()
+bool ServerEnvironment::getActiveObjectMessage(ActiveObjectMessage *dest)
 {
        if(m_active_object_messages.empty())
-               return ActiveObjectMessage(0);
+               return false;
 
-       ActiveObjectMessage message = m_active_object_messages.front();
+       *dest = std::move(m_active_object_messages.front());
        m_active_object_messages.pop();
-       return message;
+       return true;
 }
 
 void ServerEnvironment::getSelectedActiveObjects(
        const core::line3d<f32> &shootline_on_map,
        std::vector<PointedThing> &objects)
 {
-       std::vector<u16> objectIds;
-       getObjectsInsideRadius(objectIds, shootline_on_map.start,
-               shootline_on_map.getLength() + 10.0f);
+       std::vector<ServerActiveObject *> objs;
+       getObjectsInsideRadius(objs, shootline_on_map.start,
+               shootline_on_map.getLength() + 10.0f, nullptr);
        const v3f line_vector = shootline_on_map.getVector();
 
-       for (u16 objectId : objectIds) {
-               ServerActiveObject* obj = getActiveObject(objectId);
-
+       for (auto obj : objs) {
+               if (obj->isGone())
+                       continue;
                aabb3f selection_box;
                if (!obj->getSelectionBox(&selection_box))
                        continue;
@@ -1645,7 +1739,7 @@ void ServerEnvironment::getSelectedActiveObjects(
                if (boxLineCollision(offsetted_box, shootline_on_map.start, line_vector,
                                &current_intersection, &current_normal)) {
                        objects.emplace_back(
-                               (s16) objectId, current_intersection, current_normal,
+                               (s16) obj->getId(), current_intersection, current_normal,
                                (current_intersection - shootline_on_map.start).getLengthSQ());
                }
        }
@@ -1718,7 +1812,7 @@ void ServerEnvironment::removeRemovedObjects()
                /*
                        Delete static data from block if removed
                */
-               if (obj->m_pending_removal)
+               if (obj->isPendingRemoval())
                        deleteStaticFromBlock(obj, id, MOD_REASON_REMOVE_OBJECTS_REMOVE, false);
 
                // If still known by clients, don't actually remove. On some future
@@ -1729,7 +1823,7 @@ void ServerEnvironment::removeRemovedObjects()
                /*
                        Move static data from active to stored if deactivated
                */
-               if (!obj->m_pending_removal && obj->m_static_exists) {
+               if (!obj->isPendingRemoval() && obj->m_static_exists) {
                        MapBlock *block = m_map->emergeBlock(obj->m_static_block, false);
                        if (block) {
                                const auto i = block->m_static_objects.m_active.find(id);
@@ -1799,6 +1893,18 @@ static void print_hexdump(std::ostream &o, const std::string &data)
        }
 }
 
+ServerActiveObject* ServerEnvironment::createSAO(ActiveObjectType type, v3f pos,
+               const std::string &data)
+{
+       switch (type) {
+               case ACTIVEOBJECT_TYPE_LUAENTITY:
+                       return new LuaEntitySAO(this, pos, data);
+               default:
+                       warningstream << "ServerActiveObject: No factory for type=" << type << std::endl;
+       }
+       return nullptr;
+}
+
 /*
        Convert stored objects from blocks near the players to active.
 */
@@ -1832,10 +1938,10 @@ void ServerEnvironment::activateObjects(MapBlock *block, u32 dtime_s)
        std::vector<StaticObject> new_stored;
        for (const StaticObject &s_obj : block->m_static_objects.m_stored) {
                // Create an active object from the data
-               ServerActiveObject *obj = ServerActiveObject::create
-                       ((ActiveObjectType) s_obj.type, this, 0, s_obj.pos, s_obj.data);
+               ServerActiveObject *obj = createSAO((ActiveObjectType) s_obj.type, s_obj.pos,
+                       s_obj.data);
                // If couldn't create object, store static data back.
-               if(obj == NULL) {
+               if (!obj) {
                        errorstream<<"ServerEnvironment::activateObjects(): "
                                <<"failed to create active object from static object "
                                <<"in block "<<PP(s_obj.pos/BS)
@@ -1886,8 +1992,8 @@ void ServerEnvironment::deactivateFarObjects(bool _force_delete)
                // force_delete might be overriden per object
                bool force_delete = _force_delete;
 
-               // Do not deactivate if static data creation not allowed
-               if (!force_delete && !obj->isStaticAllowed())
+               // Do not deactivate if disallowed
+               if (!force_delete && !obj->shouldUnload())
                        return false;
 
                // removeRemovedObjects() is responsible for these
@@ -1905,6 +2011,7 @@ void ServerEnvironment::deactivateFarObjects(bool _force_delete)
                if (!force_delete && obj->m_static_exists &&
                   !m_active_blocks.contains(obj->m_static_block) &&
                   m_active_blocks.contains(blockpos_o)) {
+
                        // Delete from block where object was located
                        deleteStaticFromBlock(obj, id, MOD_REASON_STATIC_DATA_REMOVED, false);
 
@@ -1916,7 +2023,10 @@ void ServerEnvironment::deactivateFarObjects(bool _force_delete)
                }
 
                // If block is still active, don't remove
-               if (!force_delete && m_active_blocks.contains(blockpos_o))
+               bool still_active = obj->isStaticAllowed() ?
+                       m_active_blocks.contains(blockpos_o) :
+                       getMap().getBlockNoCreateNoEx(blockpos_o) != nullptr;
+               if (!force_delete && still_active)
                        return false;
 
                verbosestream << "ServerEnvironment::deactivateFarObjects(): "
@@ -1979,6 +2089,10 @@ void ServerEnvironment::deactivateFarObjects(bool _force_delete)
                                force_delete = true;
                }
 
+               // Regardless of what happens to the object at this point, deactivate it first.
+               // This ensures that LuaEntity on_deactivate is always called.
+               obj->markForDeactivation();
+
                /*
                        If known by some client, set pending deactivation.
                        Otherwise delete it immediately.
@@ -1988,7 +2102,6 @@ void ServerEnvironment::deactivateFarObjects(bool _force_delete)
                                                  << "object id=" << id << " is known by clients"
                                                  << "; not deleting yet" << std::endl;
 
-                       obj->m_pending_deactivation = true;
                        return false;
                }
 
@@ -2083,6 +2196,7 @@ PlayerDatabase *ServerEnvironment::openPlayerDatabase(const std::string &name,
 
        if (name == "dummy")
                return new Database_Dummy();
+
 #if USE_POSTGRESQL
        if (name == "postgresql") {
                std::string connect_string;
@@ -2090,6 +2204,12 @@ PlayerDatabase *ServerEnvironment::openPlayerDatabase(const std::string &name,
                return new PlayerDatabasePostgreSQL(connect_string);
        }
 #endif
+
+#if USE_LEVELDB
+       if (name == "leveldb")
+               return new PlayerDatabaseLevelDB(savedir);
+#endif
+
        if (name == "files")
                return new PlayerDatabaseFiles(savedir + DIR_DELIM + "players");
 
@@ -2110,7 +2230,7 @@ bool ServerEnvironment::migratePlayersDatabase(const GameParams &game_params,
        if (!world_mt.exists("player_backend")) {
                errorstream << "Please specify your current backend in world.mt:"
                        << std::endl
-                       << "    player_backend = {files|sqlite3|postgresql}"
+                       << "    player_backend = {files|sqlite3|leveldb|postgresql}"
                        << std::endl;
                return false;
        }
@@ -2189,9 +2309,22 @@ AuthDatabase *ServerEnvironment::openAuthDatabase(
        if (name == "sqlite3")
                return new AuthDatabaseSQLite3(savedir);
 
+#if USE_POSTGRESQL
+       if (name == "postgresql") {
+               std::string connect_string;
+               conf.getNoEx("pgsql_auth_connection", connect_string);
+               return new AuthDatabasePostgreSQL(connect_string);
+       }
+#endif
+
        if (name == "files")
                return new AuthDatabaseFiles(savedir);
 
+#if USE_LEVELDB
+       if (name == "leveldb")
+               return new AuthDatabaseLevelDB(savedir);
+#endif
+
        throw BaseException(std::string("Database backend ") + name + " not supported.");
 }