Skip to content

Commit

Permalink
Merge pull request #93 from ChillarAnand:master
Browse files Browse the repository at this point in the history
[issue-92] Unquote url characters in password
  • Loading branch information
mar10 committed Apr 28, 2024
2 parents 161274e + 2d75598 commit 36eec66
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions ftpsync/targets.py
Expand Up @@ -12,7 +12,7 @@
import threading
from posixpath import join as join_url
from posixpath import normpath as normpath_url
from urllib.parse import urlparse
from urllib.parse import urlparse, unquote

from ftpsync.metadata import DirMetadata
from ftpsync.resources import DirectoryEntry, FileEntry
Expand All @@ -36,6 +36,7 @@ def make_target(url, extra_opts=None):
"""
# debug = extra_opts.get("debug", 1)
parts = urlparse(url, allow_fragments=False)
password = unquote(parts.password) if parts.password else None
# scheme is case-insensitive according to https://tools.ietf.org/html/rfc3986
scheme = parts.scheme.lower()
if scheme in ("ftp", "ftps"):
Expand All @@ -46,7 +47,7 @@ def make_target(url, extra_opts=None):
parts.hostname,
parts.port,
username=parts.username,
password=parts.password,
password=password,
tls=(scheme == "ftps"),
timeout=None,
extra_opts=extra_opts,
Expand All @@ -59,7 +60,7 @@ def make_target(url, extra_opts=None):
parts.hostname,
parts.port,
username=parts.username,
password=parts.password,
password=password,
timeout=None,
extra_opts=extra_opts,
)
Expand Down

0 comments on commit 36eec66

Please sign in to comment.