dockeruser
/
sabnzbd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Add pyOpenSSL info to startup/utility/config base. Add OpenSSL & yEnc to config base as well.

tags/1.0.0RC2
Jonathon Saine 9 years ago
committed by shypike
parent
be646ae6ab
commit
399cfee594
4 changed files with 76 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      SABnzbd.py
  2. 82
      interfaces/Config/templates/config.tmpl
  3. 3
      interfaces/Config/templates/staticcfg/css/style.css
  4. 16
      sabnzbd/utils/sslinfo.py

1
SABnzbd.py
View File

@ -1365,6 +1365,7 @@ def main():
import sabnzbd.utils.sslinfo import sabnzbd.utils.sslinfo
logging.info("SSL version %s", sabnzbd.utils.sslinfo.ssl_version()) logging.info("SSL version %s", sabnzbd.utils.sslinfo.ssl_version())
logging.info("pyOpenSSL version %s", sabnzbd.utils.sslinfo.pyopenssl_version())
logging.info("SSL potentially supported protocols %s", str(sabnzbd.utils.sslinfo.ssl_potential())) logging.info("SSL potentially supported protocols %s", str(sabnzbd.utils.sslinfo.ssl_potential()))
logging.info("SSL actually supported protocols %s", str(sabnzbd.utils.sslinfo.ssl_protocols())) logging.info("SSL actually supported protocols %s", str(sabnzbd.utils.sslinfo.ssl_protocols()))

82
interfaces/Config/templates/config.tmpl
View File

@ -1,64 +1,82 @@
<!--#set global $pane="Config"#--> <!--#set global $pane="Config"#-->
<!--#set global $help_uri="configure-1-0"#--> <!--#set global $help_uri="configure-1-0"#-->
<!--#include $webdir + "/_inc_header_uc.tmpl"#--> <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
<!--#from sabnzbd.newswrapper import HAVE_SSL#-->
<!--#import sabnzbd.utils.sslinfo#-->
<!--#from sabnzbd.decoder import HAVE_YENC#-->
<!--#from sabnzbd.newsunpack import PAR2_COMMAND, PAR2C_COMMAND, RAR_COMMAND, ZIP_COMMAND, SEVEN_COMMAND, NICE_COMMAND, IONICE_COMMAND#-->
<div class="colmask"> <div class="colmask">
<div class="section padTable"> <div class="table-responsive section padTable" style="padding-bottom: 0;">
<table id="infoTable"> <table cellspacing="1" cellpadding="1" class="table table-striped">
<tbody> <tbody>
<tr class="alt"> <tr>
<td class="infoTableHeader">$T('version'): </td> <th scope="row">$T('version'): </th>
<td class="infoTableCell">$version [$build]</td> <td>$version [$build]</td>
</tr>
<tr>
<th scope="row">$T('uptime'): </th>
<td>$uptime</td>
</tr>
<tr>
<th scope="row">$T('confgFile'): </th>
<td>$configfn</td>
</tr> </tr>
<tr> <tr>
<td class="infoTableHeader">$T('uptime'): </td> <th scope="row">$T('cache').capitalize(): </th>
<td class="infoTableCell">$uptime</td> <td><!--#set $msg=$T('ft-buffer@2')%($cache_art, $cache_size)#-->$msg</td>
</tr> </tr>
<tr class="alt"> <tr>
<td class="infoTableHeader">$T('confgFile'): </td> <th scope="row">$T('parameters'): </th>
<td class="infoTableCell">$configfn</td> <td>$cmdline</td>
</tr> </tr>
<tr> <tr>
<td class="infoTableHeader">$T('cache').capitalize(): </td> <th scope="row">$T('pythonVersion'): </th>
<td class="infoTableCell"><!--#set $msg=$T('ft-buffer@2')%($cache_art, $cache_size)#-->$msg</td> <td>$sys.version[:120]</td>
</tr> </tr>
<tr class="alt"> <tr>
<td class="infoTableHeader">$T('parameters'): </td> <th scope="row">OpenSSL:</th>
<td class="infoTableCell">$cmdline</td> <td><!--#if HAVE_SSL then sabnzbd.utils.sslinfo.ssl_version() + ' [' + ', '.join(sabnzbd.utils.sslinfo.ssl_protocols()) + ']' else "NOT found"#--></td>
</tr> </tr>
<tr> <tr>
<td class="infoTableHeader">$T('pythonVersion'): </td> <th scope="row">pyOpenSSL:</th>
<td class="infoTableCell">$sys.version[:120]</td> <td><!--#if HAVE_SSL then sabnzbd.utils.sslinfo.pyopenssl_version() else "NOT found"#--></td>
</tr> </tr>
<tr class="infoTableSeperator alt"> <tr>
<td class="infoTableHeader">$T('homePage') </td> <th scope="row">yEnc:</th>
<td class="infoTableCell"><a href="http://sabnzbd.org/" target="_blank">http://sabnzbd.org/</a></td> <td><!--#if HAVE_YENC then "Found" else "NOT found"#--></td>
</tr> </tr>
<tr class="separator" colspan="2"><th></th><td></td></tr>
<tr> <tr>
<td class="infoTableHeader">$T('menu-wiki') </td> <th scope="row">$T('homePage') </th>
<td class="infoTableCell"><a href="http://wiki.sabnzbd.org/faq" target="_blank">http://wiki.sabnzbd.org/faq</a></td> <td><a href="http://sabnzbd.org/" target="_blank">http://sabnzbd.org/</a></td>
</tr> </tr>
<tr class="alt"> <tr>
<td class="infoTableHeader">$T('menu-forums') </td> <th scope="row">$T('menu-wiki') </th>
<td class="infoTableCell"><a href="http://forums.sabnzbd.org/" target="_blank">http://forums.sabnzbd.org/</a></td> <td><a href="http://wiki.sabnzbd.org/faq" target="_blank">http://wiki.sabnzbd.org/faq</a></td>
</tr> </tr>
<tr> <tr>
<td class="infoTableHeader">$T('source') </td> <th scope="row">$T('menu-forums') </th>
<td class="infoTableCell"><a href="https://github.com/sabnzbd/sabnzbd" target="_blank">https://github.com/sabnzbd/sabnzbd</a></td> <td><a href="http://forums.sabnzbd.org/" target="_blank">http://forums.sabnzbd.org/</a></td>
</tr> </tr>
<tr class="alt"> <tr>
<td class="infoTableHeader">$T('menu-irc') </td> <th scope="row">$T('source') </th>
<td class="infoTableCell"><a href="irc://irc.synirc.net/#sabnzbd"><i>#sabnzbd</i> on <i>irc.synirc.net</i></a> $T('or') (<a href="http://sabnzbd.org/live-chat/" target="_blank">webchat</a>)</td> <td><a href="https://github.com/sabnzbd/sabnzbd" target="_blank">https://github.com/sabnzbd/sabnzbd</a></td>
</tr> </tr>
<tr> <tr>
<td class="infoTableHeader">$T('menu-issues') </td> <th scope="row">$T('menu-irc') </th>
<td class="infoTableCell"><a href="http://wiki.sabnzbd.org/issues-1-0-0" target="_blank">http://wiki.sabnzbd.org/issues-1-0-0</a></td> <td><a href="irc://irc.synirc.net/#sabnzbd"><i>#sabnzbd</i> on <i>irc.synirc.net</i></a> $T('or') (<a href="http://sabnzbd.org/live-chat/" target="_blank">webchat</a>)</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="padding alt"> <div class="padding alt">
<h5 class="copyright">Copyright &copy; 2008-2016 The SABnzbd Team &lt;<a href="mailto:team@sabnzbd.org">team@sabnzbd.org</a>&gt;</h5> <h5 class="copyright">Copyright &copy; 2008-2016 The SABnzbd Team &lt;<a href="mailto:team@sabnzbd.org">team@sabnzbd.org</a>&gt;</h5>
<p class="copyright"><small>$T('yourRights')</small></p> <p class="copyright"><small>$T('yourRights')</small></p>
</div> </div>
</div> </div>
<!--#include $webdir + "/_inc_footer_uc.tmpl"#--> <!--#include $webdir + "/_inc_footer_uc.tmpl"#-->

3
interfaces/Config/templates/staticcfg/css/style.css
View File

@ -262,6 +262,9 @@ textarea:hover, input[type="date"]:hover, input[type="datetime"]:hover, input[ty
.padTable h3 { .padTable h3 {
margin-top: 0; margin-top: 0;
} }
tr.separator {
height: 30px;
}
.catTable th, .catTable td { .catTable th, .catTable td {
padding: 5px; padding: 5px;
} }

16
sabnzbd/utils/sslinfo.py
View File

@ -1,7 +1,5 @@
_ALL_PROTOCOLS = ('t12', 't11', 't1', 'v23', 'v3', 'v2') _ALL_PROTOCOLS = ('t12', 't11', 't1', 'v23', 'v3', 'v2')
_SSL_PROTOCOLS = {} _SSL_PROTOCOLS = {}
def ssl_potential(): def ssl_potential():
''' Return a list of potentially supported SSL protocols''' ''' Return a list of potentially supported SSL protocols'''
try: try:
@ -47,6 +45,7 @@ try:
except ImportError: except ImportError:
SSL = None SSL = None
def ssl_method(method): def ssl_method(method):
''' Translate SSL acronym to a method value ''' ''' Translate SSL acronym to a method value '''
if method in _SSL_PROTOCOLS: if method in _SSL_PROTOCOLS:
@ -58,10 +57,12 @@ def ssl_method(method):
except AttributeError: except AttributeError:
return _SSL_PROTOCOLS[0] return _SSL_PROTOCOLS[0]
def ssl_protocols(): def ssl_protocols():
''' Return acronyms for SSL protocols, highest quality first ''' ''' Return acronyms for SSL protocols, highest quality first '''
return [p for p in _ALL_PROTOCOLS if p in _SSL_PROTOCOLS] return [p for p in _ALL_PROTOCOLS if p in _SSL_PROTOCOLS]
def ssl_version(): def ssl_version():
if SSL: if SSL:
try: try:
@ -76,8 +77,19 @@ def ssl_version():
return None return None
def pyopenssl_version():
if SSL:
try:
import OpenSSL
return OpenSSL.__version__
except ImportError:
return 'No pyOpenSSL installed'
else:
return None
if __name__ == '__main__': if __name__ == '__main__':
print 'SSL version: %s' % ssl_version() print 'SSL version: %s' % ssl_version()
print 'pyOpenSSL version: %s' % pyopenssl_version()
print 'Potentials: %s' % ssl_potential() print 'Potentials: %s' % ssl_potential()
print 'Actuals: %s' % ssl_protocols() print 'Actuals: %s' % ssl_protocols()

Write Preview
Loading…
Cancel
Save