LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-08-06 21:20:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

things

Browse Source
This commit is contained in:
Lonami 2018-03-27 17:32:23 +02:00 committed by GitHub
parent 624b18d032
commit 03b237ec14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
telethon/telegram_client.py
View File

@ -2474,52 +2474,53 @@ class TelegramClient(TelegramBareClient):
def edit_2fa(self, current_password=None, new_password=None, hint='', email=None): def edit_2fa(self, current_password=None, new_password=None, hint='', email=None):
""" """
Changes the 2FA settings of the logged in user, according to the Changes the 2FA settings of the logged in user, according to the
passed parameters. Take note of the parameter explanations passed parameters. Take note of the parameter explanations.
This method has no effect if both current and new password are omitted.
current_password (:obj:`str`, optional): current_password (:obj:`str`, optional):
The current password, to authorize changing to ``new_password`` The current password, to authorize changing to ``new_password``.
Must be set if changing existing 2FA settings. Must be set if changing existing 2FA settings.
Must not be set if 2FA is currently disabled. Must **not** be set if 2FA is currently disabled.
Passing this by itself will remove 2FA (if correct) Passing this by itself will remove 2FA (if correct).
new_password (:obj:`str`, optional): new_password (:obj:`str`, optional):
The password to set as 2FA. If 2FA was already enabled, ``current_password`` The password to set as 2FA. If 2FA was already enabled, ``current_password``
must be set. Leaving this blank or ``None`` will remove the password **must** be set. Leaving this blank or ``None`` will remove the password.
hint (:obj:`str`, optional): hint (:obj:`str`, optional):
Hint to be displayed by Telegram when it asks for 2FA. Hint to be displayed by Telegram when it asks for 2FA.
Leaving unspecified is highly discouraged. Leaving unspecified is highly discouraged.
Has no effect if ``new_password`` is not set Has no effect if ``new_password`` is not set.
email (:obj:`str`, optional): email (:obj:`str`, optional):
Recovery and verification email. Recovery and verification email.
Throws ``EmailUnconfirmedError`` if value differs from current one Raises ``EmailUnconfirmedError`` if value differs from current one
Has no effect if ``new_password`` is not set Has no effect if ``new_password`` is not set.
Returns: Returns:
``True`` if successful, ``False`` otherwise ``True`` if successful, ``False`` otherwise.
Raises:
:obj:`PasswordEmptyError` if
""" """
if new_password is None and current_password is None: if new_password is None and current_password is None:
raise PasswordEmptyError('Both new_password and current_password '\
'were not specified')
return False return False
pass_result = self(GetPasswordRequest()) pass_result = self(GetPasswordRequest())
if isinstance(pass_result, NoPassword) and current_password: if isinstance(pass_result, NoPassword) and current_password:
__log__.warn('You supplied current_password even though this '\
'account does not have one set')
current_password = None current_password = None
salt_random = os.urandom(8) salt_random = os.urandom(8)
salt = pass_result.new_salt + salt_random salt = pass_result.new_salt + salt_random
if not current_password:
if current_password: current_password_hash = salt
else:
current_password = pass_result.current_salt +\ current_password = pass_result.current_salt +\
current_password.encode() + pass_result.current_salt current_password.encode() + pass_result.current_salt
current_password_hash = hashlib.sha256(current_password).digest() current_password_hash = hashlib.sha256(current_password).digest()
else:
current_password_hash = salt
if new_password: # setting new password if new_password: # Setting new password
new_password = salt + new_password.encode('utf-8') + salt new_password = salt + new_password.encode('utf-8') + salt
new_password_hash = hashlib.sha256(new_password).digest() new_password_hash = hashlib.sha256(new_password).digest()
new_settings = PasswordInputSettings( new_settings = PasswordInputSettings(
@ -2527,12 +2528,12 @@ class TelegramClient(TelegramBareClient):
new_password_hash=new_password_hash, new_password_hash=new_password_hash,
hint=hint hint=hint
) )
if email: # if enabling 2FA or changing email if email: # If enabling 2FA or changing email
new_settings.email = email # TG counts empty string as None new_settings.email = email # TG counts empty string as None
return self(UpdatePasswordSettingsRequest( return self(UpdatePasswordSettingsRequest(
current_password_hash, new_settings=new_settings current_password_hash, new_settings=new_settings
)) ))
else: # removing password else: # Removing existing password
return self(UpdatePasswordSettingsRequest( return self(UpdatePasswordSettingsRequest(
current_password_hash, current_password_hash,
new_settings=PasswordInputSettings( new_settings=PasswordInputSettings(