Merge branch 'main' into dudantas/fix-container-iterator-crash

opentibiabr · Sep 19, 2024 · eb613dd · eb613dd
2 parents 137c8fd + ae39682
commit eb613dd
Show file tree

Hide file tree

Showing 11 changed files with 97 additions and 4 deletions.
diff --git a/data/items/items.xml b/data/items/items.xml
@@ -4027,6 +4027,9 @@
 			<attribute key="count" value="2"/>
 			<attribute key="damage" value="20"/>
 		</attribute>
+		<attribute key="script" value="moveevent">
+			<attribute key="eventType" value="stepin"/>
+		</attribute>
 	</item>
 	<item id="2001" article="an" name="unlit campfire">
 		<attribute key="primarytype" value="illumination"/>
@@ -4342,6 +4345,9 @@
 		</attribute>
 		<attribute key="duration" value="120"/>
 		<attribute key="decayTo" value="2132"/>
+		<attribute key="script" value="moveevent">
+			<attribute key="eventType" value="stepin"/>
+		</attribute>
 	</item>
 	<item id="2132" article="a" name="fire field">
 		<attribute key="type" value="magicfield"/>
@@ -20590,6 +20596,9 @@
 		<attribute key="field" value="fire">
 			<attribute key="damage" value="300"/>
 		</attribute>
+		<attribute key="script" value="moveevent">
+			<attribute key="eventType" value="stepin"/>
+		</attribute>
 		<attribute key="replaceable" value="0"/>
 	</item>
 	<item fromid="7474" toid="7475" article="a" name="sarcophagus">
@@ -26310,6 +26319,9 @@
 			<attribute key="count" value="7"/>
 			<attribute key="damage" value="10"/>
 		</attribute>
+		<attribute key="script" value="moveevent">
+			<attribute key="eventType" value="stepin"/>
+		</attribute>
 		<attribute key="replaceable" value="0"/>
 	</item>
 	<item id="10070" article="a" name="fire field">
@@ -26319,6 +26331,9 @@
 			<attribute key="count" value="7"/>
 			<attribute key="damage" value="10"/>
 		</attribute>
+		<attribute key="script" value="moveevent">
+			<attribute key="eventType" value="stepin"/>
+		</attribute>
 		<attribute key="replaceable" value="0"/>
 	</item>
 	<item id="10071" article="a" name="fire field">
@@ -26328,6 +26343,9 @@
 			<attribute key="count" value="7"/>
 			<attribute key="damage" value="10"/>
 		</attribute>
+		<attribute key="script" value="moveevent">
+			<attribute key="eventType" value="stepin"/>
+		</attribute>
 		<attribute key="replaceable" value="0"/>
 	</item>
 	<item fromid="10072" toid="10081" name="zaoan decoration"/>
@@ -45774,20 +45792,29 @@ hands of its owner. Granted by TibiaRoyal.com"/>
 			<attribute key="ticks" value="10000"/>
 			<attribute key="damage" value="25"/>
 		</attribute>
+		<attribute key="script" value="moveevent">
+			<attribute key="eventType" value="stepin"/>
+		</attribute>
 	</item>
 	<item id="23366" article="an" name="energy trap">
 		<attribute key="type" value="magicfield"/>
 		<attribute key="field" value="energy">
 			<attribute key="ticks" value="10000"/>
 			<attribute key="damage" value="25"/>
 		</attribute>
+		<attribute key="script" value="moveevent">
+			<attribute key="eventType" value="stepin"/>
+		</attribute>
 	</item>
 	<item id="23367" article="a" name="toxic trap">
 		<attribute key="type" value="magicfield"/>
 		<attribute key="field" value="poison">
 			<attribute key="ticks" value="10000"/>
 			<attribute key="damage" value="25"/>
 		</attribute>
+		<attribute key="script" value="moveevent">
+			<attribute key="eventType" value="stepin"/>
+		</attribute>
 	</item>
 	<item id="23368" article="a" name="poison trap">
 		<attribute key="type" value="magicfield"/>
@@ -45796,6 +45823,9 @@ hands of its owner. Granted by TibiaRoyal.com"/>
 			<attribute key="damage" value="100"/>
 			<attribute key="start" value="5"/>
 		</attribute>
+		<attribute key="script" value="moveevent">
+			<attribute key="eventType" value="stepin"/>
+		</attribute>
 	</item>
 	<item id="23369" article="a" name="blade trap"/>
 	<item id="23370" article="a" name="spike trap"/>
@@ -58245,6 +58275,9 @@ hands of its owner. Granted by TibiaRoyal.com"/>
 			<attribute key="ticks" value="10000"/>
 			<attribute key="damage" value="25"/>
 		</attribute>
+		<attribute key="script" value="moveevent">
+			<attribute key="eventType" value="stepin"/>
+		</attribute>
 	</item>
 	<item id="31381" name="nothing">
 		<attribute key="primarytype" value="natural tiles"/>

diff --git a/qodana.yml b/qodana.yml
@@ -3,6 +3,8 @@ version: "1.0"
 profile:
   name: qodana.recommended
 
+linter: jetbrains/qodana-clang:latest
+
 bootstrap: |
   set -e
   sudo apt-get update && sudo apt-get -y dist-upgrade

diff --git a/src/account/account_repository.hpp b/src/account/account_repository.hpp
@@ -27,6 +27,8 @@ class AccountRepository {
 	virtual bool loadBySession(const std::string &email, AccountInfo &acc) = 0;
 	virtual bool save(const AccountInfo &accInfo) = 0;
 
+	virtual bool getCharacterByAccountIdAndName(const uint32_t &id, const std::string &name) = 0;
+
 	virtual bool getPassword(const uint32_t &id, std::string &password) = 0;
 
 	virtual bool getCoins(const uint32_t &id, const uint8_t &type, uint32_t &coins) = 0;

diff --git a/src/account/account_repository_db.cpp b/src/account/account_repository_db.cpp
@@ -64,6 +64,16 @@ bool AccountRepositoryDB::save(const AccountInfo &accInfo) {
 	return successful;
 };
 
+bool AccountRepositoryDB::getCharacterByAccountIdAndName(const uint32_t &id, const std::string &name) {
+	auto result = g_database().storeQuery(fmt::format("SELECT `id` FROM `players` WHERE `account_id` = {} AND `name` = {}", id, g_database().escapeString(name)));
+	if (!result) {
+		g_logger().error("Failed to get character: [{}] from account: [{}]!", name, id);
+		return false;
+	}
+
+	return result->countResults() == 1;
+}
+
 bool AccountRepositoryDB::getPassword(const uint32_t &id, std::string &password) {
 	auto result = g_database().storeQuery(fmt::format("SELECT * FROM `accounts` WHERE `id` = {}", id));
 	if (!result) {

diff --git a/src/account/account_repository_db.hpp b/src/account/account_repository_db.hpp
@@ -20,6 +20,8 @@ class AccountRepositoryDB final : public AccountRepository {
 	bool loadBySession(const std::string &esseionKey, AccountInfo &acc) override;
 	bool save(const AccountInfo &accInfo) override;
 
+	bool getCharacterByAccountIdAndName(const uint32_t &id, const std::string &name) override;
+
 	bool getPassword(const uint32_t &id, std::string &password) override;
 
 	bool getCoins(const uint32_t &id, const uint8_t &type, uint32_t &coins) override;

diff --git a/src/game/game.cpp b/src/game/game.cpp
@@ -3909,7 +3909,7 @@ void Game::playerUseWithCreature(uint32_t playerId, const Position &fromPos, uin
 	}
 
 	const std::shared_ptr<Monster> monster = creature->getMonster();
-	if (monster && monster->isFamiliar() && creature->getMaster()->getPlayer() == player && (it.isRune() || it.type == ITEM_TYPE_POTION)) {
+	if (monster && monster->isFamiliar() && creature->getMaster() && creature->getMaster()->getPlayer() == player && (it.isRune() || it.type == ITEM_TYPE_POTION)) {
 		player->setNextPotionAction(OTSYS_TIME() + g_configManager().getNumber(EX_ACTIONS_DELAY_INTERVAL, __FUNCTION__));
 
 		if (it.isMultiUse()) {

diff --git a/src/io/iologindata.cpp b/src/io/iologindata.cpp
@@ -19,7 +19,7 @@
 #include "enums/account_type.hpp"
 #include "enums/account_errors.hpp"
 
-bool IOLoginData::gameWorldAuthentication(const std::string &accountDescriptor, const std::string &password, std::string &characterName, uint32_t &accountId, bool oldProtocol) {
+bool IOLoginData::gameWorldAuthentication(const std::string &accountDescriptor, const std::string &password, std::string &characterName, uint32_t &accountId, bool oldProtocol, const uint32_t ip) {
 	Account account(accountDescriptor);
 	account.setProtocolCompat(oldProtocol);
 
@@ -38,6 +38,11 @@ bool IOLoginData::gameWorldAuthentication(const std::string &accountDescriptor,
 		}
 	}
 
+	if (!g_accountRepository().getCharacterByAccountIdAndName(account.getID(), characterName)) {
+		g_logger().warn("IP [{}] trying to connect into another account character", convertIPToString(ip));
+		return false;
+	}
+
 	if (AccountErrors_t::Ok != enumFromValue<AccountErrors_t>(account.load())) {
 		g_logger().error("Failed to load account [{}]", accountDescriptor);
 		return false;

diff --git a/src/io/iologindata.hpp b/src/io/iologindata.hpp
@@ -17,7 +17,7 @@ using ItemBlockList = std::list<std::pair<int32_t, std::shared_ptr<Item>>>;
 
 class IOLoginData {
 public:
-	static bool gameWorldAuthentication(const std::string &accountDescriptor, const std::string &sessionOrPassword, std::string &characterName, uint32_t &accountId, bool oldProcotol);
+	static bool gameWorldAuthentication(const std::string &accountDescriptor, const std::string &sessionOrPassword, std::string &characterName, uint32_t &accountId, bool oldProcotol, const uint32_t ip);
 	static uint8_t getAccountType(uint32_t accountId);
 	static void updateOnlineStatus(uint32_t guid, bool login);
 	static bool loadPlayerById(std::shared_ptr<Player> player, uint32_t id, bool disableIrrelevantInfo = true);

diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp
@@ -841,7 +841,7 @@ void ProtocolGame::onRecvFirstMessage(NetworkMessage &msg) {
 	}
 
 	uint32_t accountId;
-	if (!IOLoginData::gameWorldAuthentication(accountDescriptor, password, characterName, accountId, oldProtocol)) {
+	if (!IOLoginData::gameWorldAuthentication(accountDescriptor, password, characterName, accountId, oldProtocol, getIP())) {
 		ss.str(std::string());
 		if (authType == "session") {
 			ss << "Your session has expired. Please log in again.";

diff --git a/tests/fixture/account/in_memory_account_repository.hpp b/tests/fixture/account/in_memory_account_repository.hpp
@@ -120,6 +120,17 @@ namespace tests {
 			return true;
 		}
 
+		bool getCharacterByAccountIdAndName(const uint32_t &id, const std::string &name) final {
+			for (auto it = accounts.begin(); it != accounts.end(); ++it) {
+				if (it->second.id == id) {
+					if (it->second.players.find(name) != it->second.players.end()) {
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+
 		InMemoryAccountRepository &reset() {
 			accounts.clear();
 			coins_.clear();

diff --git a/tests/unit/account/account_test.cpp b/tests/unit/account/account_test.cpp
@@ -592,4 +592,32 @@ suite<"account"> accountTest = [] {
 		expect(acc.load() == enumToValue(AccountErrors_t::Ok));
 		expect(acc.authenticate());
 	};
+
+	test("Account::getCharacterByAccountIdAndName using an account with the given character.") = [&injectionFixture] {
+		auto [accountRepository] = injectionFixture.get<AccountRepository>();
+
+		Account acc { 1 };
+		accountRepository.addAccount(
+			"session-key",
+			AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD, { { "Canary", 1 }, { "Canary2", 2 } }, false, getTimeNow() + 24 * 60 * 60 * 1000 }
+		);
+
+		const auto hasCharacter = accountRepository.getCharacterByAccountIdAndName(1, "Canary");
+
+		expect(hasCharacter);
+	};
+
+	test("Account::getCharacterByAccountIdAndName using an account without the given character.") = [&injectionFixture] {
+		auto [accountRepository] = injectionFixture.get<AccountRepository>();
+
+		Account acc { 1 };
+		accountRepository.addAccount(
+			"session-key",
+			AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD, { { "Canary", 1 }, { "Canary2", 2 } }, false, getTimeNow() + 24 * 60 * 60 * 1000 }
+		);
+
+		const auto hasCharacter = accountRepository.getCharacterByAccountIdAndName(1, "Invalid");
+
+		expect(!hasCharacter);
+	};
 };