EZPPFarm/pep.py
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

.BANCHO. .FIX. Match passwords are in plain text again, fixed match invites for password protected matches

Browse Source
This commit is contained in:
Nyo 2016-10-08 20:24:16 +02:00
parent 2eb7fb609c
commit 7c54df6586
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
events/joinMatchEvent.py
View File

@ -22,8 +22,8 @@ def handle(userToken, packetData):
match = glob.matches.matches[matchID] match = glob.matches.matches[matchID]
# Hash password if needed # Hash password if needed
if password != "": #if password != "":
password = generalUtils.stringMd5(password) # password = generalUtils.stringMd5(password)
# Check password # Check password
# TODO: Admins can enter every match # TODO: Admins can enter every match

20
objects/match.py
View File

@ -47,10 +47,13 @@ class match:
self.inProgress = False self.inProgress = False
self.mods = 0 self.mods = 0
self.matchName = matchName self.matchName = matchName
if matchPassword != "": self.matchPassword = matchPassword
self.matchPassword = generalUtils.stringMd5(matchPassword) # NOTE: Password used to be md5-hashed, but the client doesn't like that.
else: # So we're back to plain text passwords, like in normal osu!
self.matchPassword = "" #if matchPassword != "":
# self.matchPassword = generalUtils.stringMd5(matchPassword)
#else:
# self.matchPassword = ""
self.beatmapID = beatmapID self.beatmapID = beatmapID
self.beatmapName = beatmapName self.beatmapName = beatmapName
self.beatmapMD5 = beatmapMD5 self.beatmapMD5 = beatmapMD5
@ -446,10 +449,11 @@ class match:
newPassword -- new password string newPassword -- new password string
""" """
if newPassword != "": self.matchPassword = newPassword
self.matchPassword = generalUtils.stringMd5(newPassword) #if newPassword != "":
else: # self.matchPassword = generalUtils.stringMd5(newPassword)
self.matchPassword = "" #else:
# self.matchPassword = ""
# Send password change to every user in match # Send password change to every user in match
glob.streams.broadcast(self.streamName, serverPackets.changeMatchPassword(self.matchPassword)) glob.streams.broadcast(self.streamName, serverPackets.changeMatchPassword(self.matchPassword))