summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kanakarakis <ivan.kanak@gmail.com>2020-05-04 00:17:45 +0300
committerGitHub <noreply@github.com>2020-05-04 00:17:45 +0300
commitdcb6cd6ae74aeb85065dfd8d2334ee0435d23760 (patch)
treee0fdf8b892f97b87e7fc2969cd3ec2ed9fc6aded
parentbdaf5bf266c7c4e4be8b53ea39b42cc797aef155 (diff)
parent73d3d279e2ea25420d6999ebe30bcdce3214421f (diff)
downloadpysaml2-dcb6cd6ae74aeb85065dfd8d2334ee0435d23760.tar.gz
Merge pull request #680 from tauceti2/fix_disco_url_creation
Disco URL can already contain parameters
-rw-r--r--src/saml2/client_base.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/saml2/client_base.py b/src/saml2/client_base.py
index 93845ff6..ea0c86f9 100644
--- a/src/saml2/client_base.py
+++ b/src/saml2/client_base.py
@@ -925,7 +925,11 @@ class Base(Entity):
}
params = urlencode({k: v for k, v in args.items() if v})
- return "%s?%s" % (url, params)
+ # url can already contain some parameters
+ if '?' in url:
+ return "%s&%s" % (url, params)
+ else:
+ return "%s?%s" % (url, params)
@staticmethod
def parse_discovery_service_response(url="", query="",