dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix password change for certain usernames

Browse source 
This fixes the ability for users with uppercase letters in their
username to change their passwords, which wasn't possible before on
non-Windows platforms. The underlying issue for that is
https://github.com/processone/ejabberd/issues/4377 and in addition some
inconsistent normalization of usernames in password change requests
by gloox. This commit works around that by always using the local JID
part as username for password requests, which got the nodeprep string
profile already applied.

It also fixes a problem that Windows users which were able to change
their passwords, weren't able to login afterwards anymore, unless they
typed their username in all lowercase in the login form. This was caused
by using the all lowercase username as input for the password hash
function, instead of using the username in the user supplied case.

Fixes #7796

(cherry picked from commit 638391d7ab)
Signed-off-by: Itms <itms@wildfiregames.com>
This commit is contained in:
Dunedan 2025-05-19 16:51:33 +02:00 committed by Itms
parent 68d99b3944
commit 38e4cdc755
No known key found for this signature in database
GPG key ID: C7E52BD14CE14E09
5 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
binaries/data/mods/public/gui/lobby/AccountSettingsPage/AccountSettingsPage.js
View file

@ -98,14 +98,6 @@ var AccountSettingsPage = {
if (Engine.GetGUIObjectByName("as_PasswordInputConfirm").caption !== newPass)
throw new SetPasswordError(translate("Passwords do not match"));
let usn = Engine.LobbyGetJID();
let atIndex = usn.indexOf("@");
if (atIndex == -1)
{
// Probably can't happen too easily, so error out.
error("Invalid JID");
throw new SetPasswordError(translate("Invalid JID, cannot change password."));
}
return Engine.EncryptPassword(newPass, usn.substring(0, atIndex).toLowerCase());
return Engine.EncryptPassword(newPass, Engine.LobbyGetUsername());
}
};

3
source/lobby/IXmppClient.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2024 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -43,6 +43,7 @@ public:
virtual void SetNick(const std::string& nick) = 0;
virtual std::string GetNick() const = 0;
virtual std::string GetJID() const = 0;
virtual std::string GetUsername() const = 0;
virtual void ChangePassword(const std::string& newPassword) = 0;
virtual void kick(const std::string& nick, const std::string& reason) = 0;
virtual void ban(const std::string& nick, const std::string& reason) = 0;

19
source/lobby/XmppClient.cpp
View file

@ -1185,9 +1185,9 @@ const std::wstring& XmppClient::GetSubject()
}
/**
* Request nick change, real change via mucRoomHandler.
* Request MUC nick change, real change via mucRoomHandler.
*
* @param nick Desired nickname
* @param nick Desired MUC nickname
*/
void XmppClient::SetNick(const std::string& nick)
{
@ -1195,7 +1195,7 @@ void XmppClient::SetNick(const std::string& nick)
}
/**
* Get current nickname.
* Get current MUC nickname.
*/
std::string XmppClient::GetNick() const
{
@ -1207,6 +1207,17 @@ std::string XmppClient::GetJID() const
return m_client->jid().full();
}
/**
* Get the XMPP username.
*
* @return current XMPP username
*/
std::string XmppClient::GetUsername() const
{
return m_username;
}
/**
* Change password for authenticated user.
*
@ -1214,7 +1225,7 @@ std::string XmppClient::GetJID() const
*/
void XmppClient::ChangePassword(const std::string& newPassword)
{
m_registration->changePassword(m_username, newPassword);
m_registration->changePassword(m_client->jid().username(), newPassword);
}
/**

3
source/lobby/XmppClient.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2024 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -88,6 +88,7 @@ public:
void SetNick(const std::string& nick) override;
std::string GetNick() const override;
std::string GetJID() const override;
std::string GetUsername() const override;
void ChangePassword(const std::string& newPassword) override;
void kick(const std::string& nick, const std::string& reason) override;
void ban(const std::string& nick, const std::string& reason) override;

3
source/lobby/scripting/JSInterface_Lobby.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2024 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -218,6 +218,7 @@ void RegisterScriptFunctions(const ScriptRequest& rq)
REGISTER_XMPP(SetNick, "LobbySetNick");
REGISTER_XMPP(GetNick, "LobbyGetNick");
REGISTER_XMPP(GetJID, "LobbyGetJID");
REGISTER_XMPP(GetUsername, "LobbyGetUsername");
REGISTER_XMPP(ChangePassword, "LobbyChangePassword");
REGISTER_XMPP(kick, "LobbyKick");
REGISTER_XMPP(ban, "LobbyBan");