Commit 5475af12 authored by pm22d12's avatar pm22d12
Browse files

Fix to allow passwords including characters /,?, #, @, and:

parent c659235e
......@@ -383,7 +383,7 @@ class DCheck(object):
obj = sftp.Protocol_sftp()
elif protocolname == "webdav":
obj = webdav.Protocol_webdav()
elif protocolname[:4] == "ftps":
elif protocolname == "ftps":
obj = ftps.Protocol_ftps(option)
elif protocolname == "https_directorylist":
classFileExtractor = https_directorylist.FileExtractor
......@@ -525,7 +525,7 @@ class DCheck(object):
if len(args) > 0:
url = args[0]
setConfigFromUrl(config, url)
#setConfigFromUrl(config, url)
if options.debug_mode:
config.debug = True
......
......@@ -316,12 +316,48 @@ class DCheckReportListingBuilder(IListingBuilder):
self.__download.configuration.source.opensearch_requestFormat),
"RESULT_FORMAT",
"")
self.__writeLineDCheckFileConfig(
configFile,
self.__makeStringParameter(
self.__download.configuration.source.protocol).lower(),
"PROTOCOL",
"")
self.__writeLineDCheckFileConfig(
configFile,
self.__makeDictParameter(
self.__download.configuration.source.protocol_option),
"PROTOCOL_OPTION",
"")
self.__writeLineDCheckFileConfig(
configFile,
self.__makeStringParameter(
self.__download.configuration.source.server),
"SERVER_ADDRESS",
"")
self.__writeLineDCheckFileConfig(
configFile,
self.__makeStringParameter(
self.__download.configuration.source.port),
"SERVER_PORT",
"")
self.__writeLineDCheckFileConfig(
configFile,
self.__makeStringParameter(
self.__download.configuration.source.rootPath),
"PATH",
"")
self.__writeLineDCheckFileConfig(
configFile,
self.__makeStringParameter(
self.__download.configuration.source.login),
"AUTH_USERNAME",
"")
self.__writeLineDCheckFileConfig(
configFile,
self.__makeStringParameter(
self.__download.configuration.source.password),
"AUTH_PASSWORD",
"")
configFile.close()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment