DRMTalks
/
devine
mirror of https://github.com/devine-dl/devine.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Implement --no-proxy to disable all uses proxies and proxy providers 

This prevents a service from setting a proxy if geofenced, and also discards any manually provided proxy from `--proxy`.
This commit is contained in:
rlaphoenix 2024-01-09 02:40:49 +00:00
parent f28a6dc28a
commit 58cb00b18b
2 changed files with 77 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
devine/commands/dl.py
View File

@ -145,6 +145,7 @@ class dl:
def __init__( def __init__(
self, self,
ctx: click.Context, ctx: click.Context,
no_proxy: bool,
profile: Optional[str] = None, profile: Optional[str] = None,
proxy: Optional[str] = None, proxy: Optional[str] = None,
group: Optional[str] = None, group: Optional[str] = None,
@ -192,49 +193,52 @@ class dl:
self.vaults.load(vault_type, **vault) self.vaults.load(vault_type, **vault)
self.log.info(f"Loaded {len(self.vaults)} Vaults") self.log.info(f"Loaded {len(self.vaults)} Vaults")
with console.status("Loading Proxy Providers...", spinner="dots"): self.proxy_providers = []
self.proxy_providers = [] if no_proxy:
if config.proxy_providers.get("basic"): ctx.params["proxy"] = None
self.proxy_providers.append(Basic(**config.proxy_providers["basic"])) else:
if config.proxy_providers.get("nordvpn"): with console.status("Loading Proxy Providers...", spinner="dots"):
self.proxy_providers.append(NordVPN(**config.proxy_providers["nordvpn"])) if config.proxy_providers.get("basic"):
if get_binary_path("hola-proxy"): self.proxy_providers.append(Basic(**config.proxy_providers["basic"]))
self.proxy_providers.append(Hola()) if config.proxy_providers.get("nordvpn"):
for proxy_provider in self.proxy_providers: self.proxy_providers.append(NordVPN(**config.proxy_providers["nordvpn"]))
self.log.info(f"Loaded {proxy_provider.__class__.__name__}: {proxy_provider}") if get_binary_path("hola-proxy"):
self.proxy_providers.append(Hola())
for proxy_provider in self.proxy_providers:
self.log.info(f"Loaded {proxy_provider.__class__.__name__}: {proxy_provider}")
if proxy: if proxy:
requested_provider = None requested_provider = None
if re.match(r"^[a-z]+:.+$", proxy, re.IGNORECASE): if re.match(r"^[a-z]+:.+$", proxy, re.IGNORECASE):
# requesting proxy from a specific proxy provider # requesting proxy from a specific proxy provider
requested_provider, proxy = proxy.split(":", maxsplit=1) requested_provider, proxy = proxy.split(":", maxsplit=1)
if re.match(r"^[a-z]{2}(?:\d+)?$", proxy, re.IGNORECASE): if re.match(r"^[a-z]{2}(?:\d+)?$", proxy, re.IGNORECASE):
proxy = proxy.lower() proxy = proxy.lower()
with console.status(f"Getting a Proxy to {proxy}...", spinner="dots"): with console.status(f"Getting a Proxy to {proxy}...", spinner="dots"):
if requested_provider: if requested_provider:
proxy_provider = next(( proxy_provider = next((
x x
for x in self.proxy_providers for x in self.proxy_providers
if x.__class__.__name__.lower() == requested_provider if x.__class__.__name__.lower() == requested_provider
), None) ), None)
if not proxy_provider: if not proxy_provider:
self.log.error(f"The proxy provider '{requested_provider}' was not recognised.") self.log.error(f"The proxy provider '{requested_provider}' was not recognised.")
sys.exit(1) sys.exit(1)
proxy_uri = proxy_provider.get_proxy(proxy)
if not proxy_uri:
self.log.error(f"The proxy provider {requested_provider} had no proxy for {proxy}")
sys.exit(1)
proxy = ctx.params["proxy"] = proxy_uri
self.log.info(f"Using {proxy_provider.__class__.__name__} Proxy: {proxy}")
else:
for proxy_provider in self.proxy_providers:
proxy_uri = proxy_provider.get_proxy(proxy) proxy_uri = proxy_provider.get_proxy(proxy)
if proxy_uri: if not proxy_uri:
proxy = ctx.params["proxy"] = proxy_uri self.log.error(f"The proxy provider {requested_provider} had no proxy for {proxy}")
self.log.info(f"Using {proxy_provider.__class__.__name__} Proxy: {proxy}") sys.exit(1)
break proxy = ctx.params["proxy"] = proxy_uri
else: self.log.info(f"Using {proxy_provider.__class__.__name__} Proxy: {proxy}")
self.log.info(f"Using explicit Proxy: {proxy}") else:
for proxy_provider in self.proxy_providers:
proxy_uri = proxy_provider.get_proxy(proxy)
if proxy_uri:
proxy = ctx.params["proxy"] = proxy_uri
self.log.info(f"Using {proxy_provider.__class__.__name__} Proxy: {proxy}")
break
else:
self.log.info(f"Using explicit Proxy: {proxy}")
ctx.obj = ContextData( ctx.obj = ContextData(
config=self.service_config, config=self.service_config,
@ -274,6 +278,7 @@ class dl:
skip_dl: bool, skip_dl: bool,
export: Optional[Path], export: Optional[Path],
cdm_only: Optional[bool], cdm_only: Optional[bool],
no_proxy: bool,
no_folder: bool, no_folder: bool,
no_source: bool, no_source: bool,
workers: int, workers: int,

61
devine/core/service.py
View File

@ -41,39 +41,40 @@ class Service(metaclass=ABCMeta):
self.session = self.get_session() self.session = self.get_session()
self.cache = Cacher(self.__class__.__name__) self.cache = Cacher(self.__class__.__name__)
if ctx.parent: if not ctx.parent or not ctx.parent.params.get("no_proxy"):
self.proxy = ctx.parent.params["proxy"] if ctx.parent:
else: proxy = ctx.parent.params["proxy"]
self.proxy = None else:
proxy = None
if not self.proxy: if not proxy:
# don't override the explicit proxy set by the user, even if they may be geoblocked # don't override the explicit proxy set by the user, even if they may be geoblocked
with console.status("Checking if current region is Geoblocked...", spinner="dots"): with console.status("Checking if current region is Geoblocked...", spinner="dots"):
if self.GEOFENCE: if self.GEOFENCE:
# no explicit proxy, let's get one to GEOFENCE if needed # no explicit proxy, let's get one to GEOFENCE if needed
current_region = get_ip_info(self.session)["country"].lower() current_region = get_ip_info(self.session)["country"].lower()
if any(x.lower() == current_region for x in self.GEOFENCE): if any(x.lower() == current_region for x in self.GEOFENCE):
self.log.info("Service is not Geoblocked in your region") self.log.info("Service is not Geoblocked in your region")
else:
requested_proxy = self.GEOFENCE[0] # first is likely main region
self.log.info(f"Service is Geoblocked in your region, getting a Proxy to {requested_proxy}")
for proxy_provider in ctx.obj.proxy_providers:
proxy = proxy_provider.get_proxy(requested_proxy)
if proxy:
self.log.info(f"Got Proxy from {proxy_provider.__class__.__name__}")
break
else: else:
requested_proxy = self.GEOFENCE[0] # first is likely main region self.log.info("Service has no Geofence")
self.log.info(f"Service is Geoblocked in your region, getting a Proxy to {requested_proxy}")
for proxy_provider in ctx.obj.proxy_providers:
self.proxy = proxy_provider.get_proxy(requested_proxy)
if self.proxy:
self.log.info(f"Got Proxy from {proxy_provider.__class__.__name__}")
break
else:
self.log.info("Service has no Geofence")
if self.proxy: if proxy:
self.session.proxies.update({"all": self.proxy}) self.session.proxies.update({"all": proxy})
proxy_parse = urlparse(self.proxy) proxy_parse = urlparse(proxy)
if proxy_parse.username and proxy_parse.password: if proxy_parse.username and proxy_parse.password:
self.session.headers.update({ self.session.headers.update({
"Proxy-Authorization": base64.b64encode( "Proxy-Authorization": base64.b64encode(
f"{proxy_parse.username}:{proxy_parse.password}".encode("utf8") f"{proxy_parse.username}:{proxy_parse.password}".encode("utf8")
).decode() ).decode()
}) })
# Optional Abstract functions # Optional Abstract functions
# The following functions may be implemented by the Service. # The following functions may be implemented by the Service.