#452, #453: proper URL encoding in example pp-scripts

Updated scripts to accept special characters in nzbget password and username.
nzbget · Oct 5, 2017 · a975025 · a975025
1 parent 4fa3706
commit a975025
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/scripts/EMail.py b/scripts/EMail.py
@@ -91,6 +91,8 @@
 import sys
 import datetime
 import smtplib
+from urllib2 import quote
+
 from email.mime.text import MIMEText
 try:
 	from xmlrpclib import ServerProxy # python 2
@@ -167,8 +169,8 @@
 
 	if host == '0.0.0.0': host = '127.0.0.1'
 
-	# Build an URL for XML-RPC requests
-	rpcUrl = 'http://%s:%s@%s:%s/xmlrpc' % (username, password, host, port);
+	# Build a URL for XML-RPC requests
+	rpcUrl = 'http://%s:%s@%s:%s/xmlrpc' % (quote(username), quote(password), host, port);
 
 	# Create remote server object
 	server = ServerProxy(rpcUrl)

diff --git a/scripts/Logger.py b/scripts/Logger.py
@@ -36,6 +36,8 @@
 import os
 import sys
 import datetime
+from urllib2 import quote # python 2/3
+
 try:
 	from xmlrpclib import ServerProxy # python 2
 except ImportError:
@@ -70,8 +72,8 @@
 
 if host == '0.0.0.0': host = '127.0.0.1'
 
-# Build an URL for XML-RPC requests
-rpcUrl = 'http://%s:%s@%s:%s/xmlrpc' % (username, password, host, port);
+# Build a URL for XML-RPC requests
+rpcUrl = 'http://%s:%s@%s:%s/xmlrpc' % (quote(username), quote(password), host, port);
 
 # Create remote server object
 server = ServerProxy(rpcUrl)