mirror/bazarr
1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr synced 2025-03-19 02:05:25 +00:00
Code Issues Releases Wiki Activity

Fix for #1212. Disabling password reset during upgrade.

Browse source
This commit is contained in:
morpheus65535 2020-12-10 10:41:12 -05:00
parent ab5dd535e9
commit e3b63d90de
1 changed files with 32 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
bazarr/init.py
View file

@ -126,36 +126,39 @@ if not os.path.exists(os.path.join(args.config_dir, 'config', 'releases.txt')):
config_file = os.path.normpath(os.path.join(args.config_dir, 'config', 'config.ini'))
# Commenting out the password reset process as it could be having unwanted effects and most of the users have already
# moved to new password hashing algorithm.
# Reset form login password for Bazarr after migration from 0.8.x to 0.9. Password will be equal to username.
if settings.auth.type == 'form' and \
os.path.exists(os.path.normpath(os.path.join(args.config_dir, 'config', 'users.json'))):
username = False
with open(os.path.normpath(os.path.join(args.config_dir, 'config', 'users.json'))) as json_file:
try:
data = json.load(json_file)
username = next(iter(data))
except:
logging.error('BAZARR is unable to migrate credentials. You should disable login by modifying config.ini '
'file and settings [auth]-->type = None')
if username:
settings.auth.username = username
settings.auth.password = hashlib.md5(username.encode('utf-8')).hexdigest()
with open(os.path.join(args.config_dir, 'config', 'config.ini'), 'w+') as handle:
settings.write(handle)
os.remove(os.path.normpath(os.path.join(args.config_dir, 'config', 'users.json')))
os.remove(os.path.normpath(os.path.join(args.config_dir, 'config', 'roles.json')))
os.remove(os.path.normpath(os.path.join(args.config_dir, 'config', 'register.json')))
logging.info('BAZARR your login credentials have been migrated successfully and your password is now equal '
'to your username. Please change it as soon as possible in settings.')
else:
if os.path.exists(os.path.normpath(os.path.join(args.config_dir, 'config', 'users.json'))):
try:
os.remove(os.path.normpath(os.path.join(args.config_dir, 'config', 'users.json')))
os.remove(os.path.normpath(os.path.join(args.config_dir, 'config', 'roles.json')))
os.remove(os.path.normpath(os.path.join(args.config_dir, 'config', 'register.json')))
except:
logging.error("BAZARR cannot delete those file. Please do it manually: users.json, roles.json, "
"register.json")
# if settings.auth.type == 'form' and \
# os.path.exists(os.path.normpath(os.path.join(args.config_dir, 'config', 'users.json'))):
# username = False
# with open(os.path.normpath(os.path.join(args.config_dir, 'config', 'users.json'))) as json_file:
# try:
# data = json.load(json_file)
# username = next(iter(data))
# except:
# logging.error('BAZARR is unable to migrate credentials. You should disable login by modifying config.ini '
# 'file and settings [auth]-->type = None')
# if username:
# settings.auth.username = username
# settings.auth.password = hashlib.md5(username.encode('utf-8')).hexdigest()
# with open(os.path.join(args.config_dir, 'config', 'config.ini'), 'w+') as handle:
# settings.write(handle)
# os.remove(os.path.normpath(os.path.join(args.config_dir, 'config', 'users.json')))
# os.remove(os.path.normpath(os.path.join(args.config_dir, 'config', 'roles.json')))
# os.remove(os.path.normpath(os.path.join(args.config_dir, 'config', 'register.json')))
# logging.info('BAZARR your login credentials have been migrated successfully and your password is now equal '
# 'to your username. Please change it as soon as possible in settings.')
# else:
# if os.path.exists(os.path.normpath(os.path.join(args.config_dir, 'config', 'users.json'))):
# try:
# os.remove(os.path.normpath(os.path.join(args.config_dir, 'config', 'users.json')))
# os.remove(os.path.normpath(os.path.join(args.config_dir, 'config', 'roles.json')))
# os.remove(os.path.normpath(os.path.join(args.config_dir, 'config', 'register.json')))
# except:
# logging.error("BAZARR cannot delete those file. Please do it manually: users.json, roles.json, "
# "register.json")
def init_binaries():