Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Webserver: -fix: problems setting the password and login

Browse Source
This commit is contained in:
lukeIam committed 2013-12-13 18:03:20 +01:00
1 parent 304529f396
commit ad717ea56e
2 files changed
+11 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Base/Server/CVocaluxeServer.cs
+1
View File
@@ -178,6 +178,7 @@ namespace Vocaluxe.Base.Server
{ {
newProfile = new CProfile newProfile = new CProfile
{ {
ID = existingProfile.ID,
Active = existingProfile.Active, Active = existingProfile.Active,
AvatarFileName = existingProfile.AvatarFileName, AvatarFileName = existingProfile.AvatarFileName,
Avatar = existingProfile.Avatar, Avatar = existingProfile.Avatar,
VocaluxeLib/Profile/CProfile.cs
+10 -4
View File
@@ -92,10 +92,10 @@ namespace VocaluxeLib.Profile
xmlReader.TryGetEnumValue("//root/Info/Active", ref Active); xmlReader.TryGetEnumValue("//root/Info/Active", ref Active);
string passwordHash; string passwordHash;
xmlReader.GetValue("//root/Info/PasswordHash", out passwordHash, ""); xmlReader.GetValue("//root/Info/PasswordHash", out passwordHash, "");
PasswordHash = Encoding.UTF8.GetBytes(passwordHash); PasswordHash = !string.IsNullOrEmpty(passwordHash) ? Convert.FromBase64String(passwordHash) : null;
string passwordSalt; string passwordSalt;
xmlReader.GetValue("//root/Info/PasswordHash", out passwordSalt, ""); xmlReader.GetValue("//root/Info/PasswordHash", out passwordSalt, "");
PasswordSalt = Encoding.UTF8.GetBytes(passwordSalt); PasswordSalt = !string.IsNullOrEmpty(passwordSalt) ? Convert.FromBase64String(passwordSalt) : null;
string userRoles; string userRoles;
xmlReader.GetValue("//root/Info/UserRoles", out userRoles, "0"); xmlReader.GetValue("//root/Info/UserRoles", out userRoles, "0");
Int32.TryParse(userRoles, out UserRoles); Int32.TryParse(userRoles, out UserRoles);
@@ -159,8 +159,14 @@ namespace VocaluxeLib.Profile
writer.WriteElementString("Avatar", Path.GetFileName(Avatar.FileName)); writer.WriteElementString("Avatar", Path.GetFileName(Avatar.FileName));
writer.WriteElementString("GuestProfile", Enum.GetName(typeof(EOffOn), GuestProfile)); writer.WriteElementString("GuestProfile", Enum.GetName(typeof(EOffOn), GuestProfile));
writer.WriteElementString("Active", Enum.GetName(typeof(EOffOn), Active)); writer.WriteElementString("Active", Enum.GetName(typeof(EOffOn), Active));
writer.WriteElementString("PasswordHash", Encoding.UTF8.GetString(PasswordHash)); if (PasswordHash != null)
writer.WriteElementString("PasswordSalt", Encoding.UTF8.GetString(PasswordSalt)); {
writer.WriteElementString("PasswordHash", Convert.ToBase64String(PasswordHash));
}
if (PasswordSalt != null)
{
writer.WriteElementString("PasswordSalt", Convert.ToBase64String(PasswordSalt));
}
writer.WriteElementString("UserRoles", UserRoles.ToString()); writer.WriteElementString("UserRoles", UserRoles.ToString());
writer.WriteEndElement(); writer.WriteEndElement();