Browse Source

Log SSL-Context check and show when Cryptograhypy is missing

pull/745/head
Safihre 9 years ago
parent
commit
96fc743f6a
  1. 5
      SABnzbd.py
  2. 15
      interfaces/Config/templates/config.tmpl
  3. 1
      sabnzbd/downloader.py
  4. 1
      sabnzbd/interface.py

5
SABnzbd.py

@ -473,6 +473,11 @@ def print_modules():
else: else:
logging.info("_yenc module... NOT found!") logging.info("_yenc module... NOT found!")
if sabnzbd.HAVE_CRYPTOGRAPHY:
logging.info('Cryptography module... found!')
else:
logging.info('Cryptography module... NOT found!')
if sabnzbd.newsunpack.PAR2_COMMAND: if sabnzbd.newsunpack.PAR2_COMMAND:
logging.info("par2 binary... found (%s)", sabnzbd.newsunpack.PAR2_COMMAND) logging.info("par2 binary... found (%s)", sabnzbd.newsunpack.PAR2_COMMAND)
else: else:

15
interfaces/Config/templates/config.tmpl

@ -50,17 +50,24 @@
</td> </td>
</tr> </tr>
<!--#end if#--> <!--#end if#-->
<!--#if not $have_cryptography #-->
<tr>
<th scope="row">Python Cryptography:</th>
<td>
<span class="label label-warning">$T('notAvailable')</span>
<a href="$helpuri$help_uri#no_cryptography" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
</td>
</tr>
<!--#end if#-->
<!--#if not $have_yenc#-->
<tr> <tr>
<th scope="row">yEnc:</th> <th scope="row">yEnc:</th>
<td> <td>
<!--#if $have_yenc#-->
<span class="glyphicon glyphicon-ok"></span>
<!--#else#-->
<span class="label label-danger">$T('notAvailable')</span> <span class="label label-danger">$T('notAvailable')</span>
<a href="$helpuri$help_uri#no_yenc" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a> <a href="$helpuri$help_uri#no_yenc" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
<!--#end if#-->
</td> </td>
</tr> </tr>
<!--#end if#-->
<!--#if not $have_unzip #--> <!--#if not $have_unzip #-->
<tr> <tr>
<th scope="row">$T('opt-enable_unzip'):</th> <th scope="row">$T('opt-enable_unzip'):</th>

1
sabnzbd/downloader.py

@ -395,6 +395,7 @@ class Downloader(Thread):
# Seems something is still wrong # Seems something is still wrong
sabnzbd.set_https_verification(0) sabnzbd.set_https_verification(0)
sabnzbd.HAVE_SSL_CONTEXT = False sabnzbd.HAVE_SSL_CONTEXT = False
logging.debug('SSL verification test: %s', sabnzbd.HAVE_SSL_CONTEXT)
# Start decoder # Start decoder
self.decoder.start() self.decoder.start()

1
sabnzbd/interface.py

@ -1264,6 +1264,7 @@ class ConfigPage(object):
conf['have_unzip'] = bool(sabnzbd.newsunpack.ZIP_COMMAND) conf['have_unzip'] = bool(sabnzbd.newsunpack.ZIP_COMMAND)
conf['have_7zip'] = bool(sabnzbd.newsunpack.SEVEN_COMMAND) conf['have_7zip'] = bool(sabnzbd.newsunpack.SEVEN_COMMAND)
conf['have_cryptography'] = sabnzbd.HAVE_CRYPTOGRAPHY
conf['have_yenc'] = HAVE_YENC conf['have_yenc'] = HAVE_YENC
if sabnzbd.HAVE_SSL: if sabnzbd.HAVE_SSL:

Loading…
Cancel
Save