Chain certificates not loaded in all situations of extra servers

Causing failed starts

INSTALL.txt

@@ -1,4 +1,4 @@
-                                SABnzbd 1.2.1
+                                SABnzbd 1.2.3
 
 -------------------------------------------------------------------------------
 0) LICENSE

PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 1.0
 Name: SABnzbd
-Version: 1.2.2
-Summary: SABnzbd-1.2.2
+Version: 1.2.3
+Summary: SABnzbd-1.2.3
 Home-page: http://sabnzbd.org
 Author: The SABnzbd Team
 Author-email: team@sabnzbd.org

README.mkd

@@ -1,6 +1,15 @@
-Release Notes  -  SABnzbd 1.2.2
+Release Notes  -  SABnzbd 1.2.3
 ==============================================
 
+## Bug fixes in 1.2.3
+- Fix crashing Downloader when Quota were set
+- Fix broken webserver HTTPS for extra bound ports (e.g. IPv6)
+- Windows: Fix hanging Unrar
+- Windows: Unzip was not working
+- Windows: Incomplete folders would sometimes end in a dot
+- Starting with "-w" parameter fail
+- Unblock Server button did not work
+
 ## Bug fix in 1.2.2
 - Windows: job-directory incorrectly passed to PostProcessing-script
 

SABnzbd.py

@@ -651,7 +651,7 @@ def attach_server(host, port, cert=None, key=None, chain=None):
         http_server = cherrypy._cpserver.Server()
         http_server.bind_addr = (host, port)
         if cert and key:
-            http_server.ssl_provider = 'builtin'
+            http_server.ssl_module = 'builtin'
             http_server.ssl_certificate = cert
             http_server.ssl_private_key = key
             http_server.ssl_certificate_chain = chain
@@ -778,7 +778,7 @@ def commandline_handler(frozen=True):
     info.extend(sys.argv[slice:])
 
     try:
-        opts, args = getopt.getopt(info, "phdvncw:l:s:f:t:b:2:",
+        opts, args = getopt.getopt(info, "phdvncwl:s:f:t:b:2:",
                                    ['pause', 'help', 'daemon', 'nobrowser', 'clean', 'logging=',
                                     'weblogging=', 'server=', 'templates', 'ipv6_hosting=',
                                     'template2', 'browser=', 'config-file=', 'force',
@@ -1360,7 +1360,7 @@ def main():
             cherryport = https_port
         elif multilocal:
             # Extra HTTPS port for secondary localhost
-            attach_server(hosts[1], cherryport, https_cert, https_key)
+            attach_server(hosts[1], cherryport, https_cert, https_key, https_chain)
 
         cherrypy.config.update({'server.ssl_module': 'builtin',
                                 'server.ssl_certificate': https_cert,

interfaces/Glitter/templates/include_overlays.tmpl

@@ -208,7 +208,7 @@
                                 <div class="row" data-bind="visible: servererror()">
                                     <div class="col-sm-12">
                                         <div class="alert alert-danger">
-                                            <a href="#" data-bind="visible: !serveractive(), click: function() { \$parent.unblockServer(servername()) }" class="btn btn-default"><span class="glyphicon glyphicon-share-alt"></span> $T('Glitter-unblockServer')</a>
+                                            <a href="#" data-bind="visible: !serveractive(), click: function() { \$parent.unblockServer(servername) }" class="btn btn-default"><span class="glyphicon glyphicon-share-alt"></span> $T('Glitter-unblockServer')</a>
                                             <span class="glyphicon glyphicon-exclamation-sign"></span>
                                             <span data-bind="text: servererror()"></span>
                                         </div>

sabnzbd/bpsmeter.py

@@ -244,7 +244,7 @@ class BPSMeter(object):
             if self.have_quota and self.quota_enabled:
                 self.left -= amount
                 if self.left <= 0.0:
-                    if sabnzbd.downloader.Downloader.do and not Downloader.do.paused:
+                    if sabnzbd.downloader.Downloader.do and not sabnzbd.downloader.Downloader.do.paused:
                         sabnzbd.downloader.Downloader.do.pause()
                         logging.warning(T('Quota spent, pausing downloading'))
 

sabnzbd/interface.py

@@ -2569,9 +2569,9 @@ class ConfigSorting(object):
 ##############################################################################
 LOG_API_RE = re.compile(r"(apikey|api)(=|:)[\w]+", re.I)
 LOG_API_JSON_RE = re.compile(r"u'(apikey|api)': u'[\w]+'", re.I)
-LOG_USER_RE = re.compile(r"(user|username)\s?=\s?[\w]+", re.I)
-LOG_PASS_RE = re.compile(r"(password)\s?=\s?[\w]+", re.I)
-LOG_INI_HIDE_RE = re.compile(r"(email_pwd|rating_api_key|pushover_token|pushover_userkey|pushbullet_apikey|prowl_apikey|growl_password|growl_server)\s?=\s?[\w]+", re.I)
+LOG_USER_RE = re.compile(r"(user|username)\s?=\s?[\S]+", re.I)
+LOG_PASS_RE = re.compile(r"(password)\s?=\s?[\S]+", re.I)
+LOG_INI_HIDE_RE = re.compile(r"(email_pwd|rating_api_key|pushover_token|pushover_userkey|pushbullet_apikey|prowl_apikey|growl_password|growl_server)\s?=\s?[\S]+", re.I)
 LOG_HASH_RE = re.compile(r"([a-fA-F\d]{25})", re.I)
 
 class Status(object):

sabnzbd/misc.py

@@ -342,7 +342,8 @@ def sanitize_foldername(name, limit=True):
 
     maxlen = cfg.folder_max_length()
     if limit and len(name) > maxlen:
-        name = name[:maxlen]
+        # Folders can't end on a dot in Windows
+        name = name[:maxlen].strip('.')
 
     return name
 

sabnzbd/newsunpack.py

@@ -646,6 +646,8 @@ def rar_extract_core(rarfile_path, numrars, one_folder, nzo, setname, extraction
         elif line.startswith('Cannot create') and sabnzbd.WIN32 and extraction_path.startswith('\\\\?\\'):
             # Can be due to Unicode problems on Windows, let's retry
             fail = 4
+            # Kill the process (can stay in endless loop on Windows Server)
+            p.kill()
 
         elif line.startswith('Cannot create'):
             line2 = proc.readline()
@@ -804,13 +806,12 @@ def unzip(nzo, workdir, workdir_complete, delete, one_folder, zips):
 
 def ZIP_Extract(zipfile, extraction_path, one_folder):
     """ Unzip single zip set 'zipfile' to 'extraction_path' """
-    if one_folder or cfg.flat_unpack():
-        option = '-j'  # Unpack without folders
-    else:
-        option = '-qq'  # Dummy option
-    command = ['%s' % ZIP_COMMAND, '-o', '-qq', option, '-Pnone', '%s' % zipfile,
+    command = ['%s' % ZIP_COMMAND, '-o', '-Pnone', '%s' % clip_path(zipfile),
                '-d%s' % extraction_path]
 
+    if one_folder or cfg.flat_unpack():
+        command.insert(3, '-j')  # Unpack without folders
+
     stup, need_shell, command, creationflags = build_command(command)
     logging.debug('Starting unzip: %s', command)
     p = subprocess.Popen(command, shell=need_shell, stdin=subprocess.PIPE,