Skip to content

disallow/skip url encoded CR and LF chars decoding #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yurunhub wants to merge 1 commit into
base: master
Choose a base branch
from
Open

disallow/skip url encoded CR and LF chars decoding #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions sippy/SipURL.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@

USERNAME_SAFE = RFC3261_USER_UNRESERVED + RFC3261_MARK

#below function disallow translation of CR and LF chars:
def safe_unquote(v):
r = unquote(v)
r = r.replace("\n", "")
r = r.replace("\r", "")
return r

class SipURL(object):
scheme = None
username = None
Expand Down Expand Up @@ -110,7 +117,7 @@ def convertTelURL(self, url, relaxedparser):
self.port = SipConf.my_port
self.transport = SipConf.my_transport
parts = url.split(';')
self.username = unquote(parts[0])
self.username = safe_unquote(parts[0])
if len(parts) > 1:
# parse userparams
self.userparams = []
Expand All @@ -130,7 +137,7 @@ def parseSipURL(self, url, relaxedparser):
userdomain = userdomain[:ear] + userdomain_suff
for header in headers.split('&'):
k, v = header.split('=')
self.headers[k] = unquote(v)
self.headers[k] = safe_unquote(v)
if ear > 0:
userpass = userdomain[:ear - 1]
hostport = userdomain[ear:]
Expand All @@ -140,7 +147,7 @@ def parseSipURL(self, url, relaxedparser):
uparts = upparts[0].split(';')
if len(uparts) > 1:
self.userparams = uparts[1:]
self.username = unquote(uparts[0])
self.username = safe_unquote(uparts[0])
else:
hostport = userdomain
parseport = None
Expand Down Expand Up @@ -193,7 +200,7 @@ def parseSipURL(self, url, relaxedparser):
self.headers = {}
for header in arr[1].split('&'):
k, v = header.split('=')
self.headers[k] = unquote(v)
self.headers[k] = safe_unquote(v)

def setParams(self, params):
self.usertype = None
Expand Down