nas/synology-drive-api
1
0
Fork 0
mirror of https://github.com/zbjdonald/synology-drive-api.git synced 2025-07-29 12:13:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat:support 2fa

Browse Source 
pump 1.0.11
This commit is contained in:
zbjdonald
2022-12-01 23:49:54 +08:00
parent df0aed234e
commit f84471e47d
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -30,6 +30,9 @@ with SynologyDrive(NAS_USER, NAS_PASS, NAS_IP, NAS_PORT) as synd:
# use http instead of https. https: default is True. # use http instead of https. https: default is True.
with SynologyDrive(NAS_USER, NAS_PASS, NAS_IP, https=False) as synd: with SynologyDrive(NAS_USER, NAS_PASS, NAS_IP, https=False) as synd:
pass pass
# Enable 2fa.
with SynologyDrive(NAS_USER, NAS_PASS, otp_code='XXXXXX') as synd:
pass
# use domain name or name + path access drive # use domain name or name + path access drive
# Enabled in Application Portal | Application | Drive | General | Enable customized alias # Enabled in Application Portal | Application | Drive | General | Enable customized alias
drive_path_demo = 'your_nas_domain/drive' drive_path_demo = 'your_nas_domain/drive'

2
pyproject.toml
View File

@ -1,6 +1,6 @@
[tool.poetry] [tool.poetry]
name = "synology_drive_api" name = "synology_drive_api"
version = "1.0.10" version = "1.0.11"
description = "synology drive api python wrapper" description = "synology drive api python wrapper"
authors = ["zbjdonald <zbjdonald@qq.com>"] authors = ["zbjdonald <zbjdonald@qq.com>"]
license = "MIT" license = "MIT"

10
synology_drive_api/base.py
View File

@ -131,6 +131,7 @@ class SynologySession:
""" """
_username: str _username: str
_password: str _password: str
_otp_code: str
# api base url # api base url
_base_url: str _base_url: str
# sid token # sid token
@ -139,7 +140,7 @@ class SynologySession:
_session_expire: bool = True _session_expire: bool = True
# dsm version, used for login api version # dsm version, used for login api version
dsm_version: str = '6' dsm_version: str = '6'
max_retry: int = 3 max_retry: int = 2
def __init__(self, def __init__(self,
username: str, username: str,
@ -149,12 +150,14 @@ class SynologySession:
nas_domain: Optional[str] = None, nas_domain: Optional[str] = None,
https: Optional[bool] = True, https: Optional[bool] = True,
dsm_version: str = '6', dsm_version: str = '6',
max_retry: int = 3) -> None: max_retry: int = 2,
otp_code: Optional[str] = None) -> None:
assert dsm_version in ('6', '7'), "dsm_version should be either '6' or '7'." assert dsm_version in ('6', '7'), "dsm_version should be either '6' or '7'."
nas_address = concat_nas_address(ip_address, port, nas_domain, https) nas_address = concat_nas_address(ip_address, port, nas_domain, https)
self._username = username self._username = username
self._password = password self._password = password
self._otp_code = otp_code
self.dsm_version = dsm_version self.dsm_version = dsm_version
self._base_url = f"{nas_address}/webapi/" self._base_url = f"{nas_address}/webapi/"
self.req_session.cookies.set_policy(BlockAll()) self.req_session.cookies.set_policy(BlockAll())
@ -243,6 +246,9 @@ class SynologySession:
login_api_version = '2' if self.dsm_version == '6' else '3' login_api_version = '2' if self.dsm_version == '6' else '3'
params = {'api': 'SYNO.API.Auth', 'version': login_api_version, 'method': 'login', 'account': self._username, params = {'api': 'SYNO.API.Auth', 'version': login_api_version, 'method': 'login', 'account': self._username,
'passwd': self._password, 'session': application, 'format': 'cookie'} 'passwd': self._password, 'session': application, 'format': 'cookie'}
if self._otp_code is not None:
params['otp_code'] = self._otp_code
if not self._session_expire: if not self._session_expire:
if self._sid is not None: if self._sid is not None:
self._session_expire = False self._session_expire = False

6
synology_drive_api/drive.py
View File

@ -21,8 +21,10 @@ class SynologyDrive(LabelsMixin, FilesMixin, TasksMixin):
https: bool = True, https: bool = True,
enable_label_cache: bool = True, enable_label_cache: bool = True,
dsm_version: str = '6', dsm_version: str = '6',
max_retry: int = 10) -> None: max_retry: int = 2,
self.session = SynologySession(username, password, ip_address, port, nas_domain, https, dsm_version, max_retry) otp_code: Optional[str] = None) -> None:
self.session = SynologySession(username, password, ip_address, port, nas_domain, https, dsm_version, max_retry,
otp_code)
self.enable_label_cache = enable_label_cache self.enable_label_cache = enable_label_cache
def __enter__(self): def __enter__(self):