simono41/pyicloud
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Create safe cookiejar directory per user (#320)

Browse source
This commit is contained in:
Richie B2B 2021-02-01 08:16:19 +01:00 committed by GitHub
parent 68566dc3a5
commit 8671cc6e2c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
pyicloud/base.py
View file

@ -9,6 +9,7 @@ from tempfile import gettempdir
from os import path, mkdir from os import path, mkdir
from re import match from re import match
import http.cookiejar as cookielib import http.cookiejar as cookielib
import getpass
from pyicloud.exceptions import ( from pyicloud.exceptions import (
PyiCloudFailedLoginException, PyiCloudFailedLoginException,
@ -205,7 +206,6 @@ class PyiCloudService(object):
apple_id, apple_id,
password=None, password=None,
cookie_directory=None, cookie_directory=None,
session_directory=None,
verify=True, verify=True,
client_id=None, client_id=None,
with_family=True, with_family=True,
@ -219,33 +219,29 @@ class PyiCloudService(object):
self.client_id = client_id or ("auth-%s" % str(uuid1()).lower()) self.client_id = client_id or ("auth-%s" % str(uuid1()).lower())
self.with_family = with_family self.with_family = with_family
self.session_data = {}
if session_directory:
self._session_directory = session_directory
else:
self._session_directory = path.join(gettempdir(), "pyicloud-session")
LOGGER.debug("Using session file %s" % self.session_path)
try:
with open(self.session_path) as session_f:
self.session_data = json.load(session_f)
except: # pylint: disable=bare-except
LOGGER.info("Session file does not exist")
if not path.exists(self._session_directory):
mkdir(self._session_directory)
self.password_filter = PyiCloudPasswordFilter(password) self.password_filter = PyiCloudPasswordFilter(password)
LOGGER.addFilter(self.password_filter) LOGGER.addFilter(self.password_filter)
if cookie_directory: if cookie_directory:
self._cookie_directory = path.expanduser(path.normpath(cookie_directory)) self._cookie_directory = path.expanduser(path.normpath(cookie_directory))
if not path.exists(self._cookie_directory):
mkdir(self._cookie_directory, 0o700)
else: else:
self._cookie_directory = path.join(gettempdir(), "pyicloud") topdir = path.join(gettempdir(), "pyicloud")
self._cookie_directory = path.join(topdir, getpass.getuser())
if not path.exists(topdir):
mkdir(topdir, 0o777)
if not path.exists(self._cookie_directory):
mkdir(self._cookie_directory, 0o700)
if not path.exists(self._cookie_directory): LOGGER.debug("Using session file %s" % self.session_path)
mkdir(self._cookie_directory)
self.session_data = {}
try:
with open(self.session_path) as session_f:
self.session_data = json.load(session_f)
except: # pylint: disable=bare-except
LOGGER.info("Session file does not exist")
if self.session_data.get("client_id"): if self.session_data.get("client_id"):
self.client_id = self.session_data.get("client_id") self.client_id = self.session_data.get("client_id")
else: else:
@ -411,8 +407,8 @@ class PyiCloudService(object):
def session_path(self): def session_path(self):
"""Get path for session data file.""" """Get path for session data file."""
return path.join( return path.join(
self._session_directory, self._cookie_directory,
"".join([c for c in self.user.get("accountName") if match(r"\w", c)]), "".join([c for c in self.user.get("accountName") if match(r"\w", c)]) + '.session',
) )
@property @property