20.1 (#72)

* Fix to prevent setup.py from import theonionbox; addressing PEP#517. * Housekeeping: Removed some artefacts. * Dashboard: Session 'prepared' after successful login was not accepted as valid. Fixed. * Dashboard: Truncate __HashedControlSessionPassword (alike HashedControlPassword). No need to show this in full length. * 19.3 * Adjust Copyright info to '2020' * Additional commandline parameter: --password * gitignore nodes * Fixed install path for uptime (win); removed osxtemp source files (macos). * Obsolete modules removed. * Refactored the whole import system. Tried to account for PEP328 & get rid of CurrentWorkingDirectory patching. * ... 2020. * Ignoring RapydScript cache files. * Fixed import issue. * 20.1
ralphwetzel · Jan 7, 2020 · 3a0af29 · 3a0af29
1 parent aab150c
commit 3a0af29
Show file tree

Hide file tree

Showing 59 changed files with 450 additions and 813 deletions.
diff --git a/.gitignore b/.gitignore
@@ -65,3 +65,7 @@ theonionbox/theonionbox.ltd
 # Special to The Onion Box
 # Glide Library comes with a 'dist' directory that we need!
 !theonionbox/libs/glide-*/dist/
+/node_modules/
+
+# Rapydscript
+*.pyj-cached
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 - 2019 Ralph Wetzel
+Copyright (c) 2015 - 2020 Ralph Wetzel
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/cc/ControlCenter/dialogs/about.pyj b/cc/ControlCenter/dialogs/about.pyj
@@ -53,7 +53,7 @@ class About(DialogBase):
 
         $.post({
             'url': self.base_path + "/" + self.session_id + "/cc/" + "about"
-            , 'timeout': 2000
+            , 'timeout': 5000
         })
         .done(def(data):
             $('#about').removeClass('text-center').addClass('text-left')

diff --git a/cc/ControlCenter/dialogs/launcher.pyj b/cc/ControlCenter/dialogs/launcher.pyj
@@ -27,7 +27,7 @@ class Launcher(DialogBase):
                         </div>
                         <div class="modal-footer">
                             <div style='font-family: LatoLatinWeb; font-size: 14px;'>
-                                Copyright &copy; 2015 - 2019 Ralph Wetzel
+                                Copyright &copy; 2015 - 2020 Ralph Wetzel
                             </div>
                         </div>
                     </div>

diff --git a/setup.py b/setup.py
@@ -302,14 +302,18 @@ def generate_data_files(data_files):
 }
 
 package_data = {
-    'theonionbox': ['config/*',
-                    'css/*',
-                    'libs/*',
-                    'pages/*',
-                    'scripts/*',
-                    'sections/*',
-                    'tor/*'
-                    ]
+    'theonionbox': [
+        'config/*',
+        'css/*',
+        'libs/*',
+        'pages/*',
+        'scripts/*',
+        'sections/*',
+        'tor/*'
+    ],
+    'theonionbox.tob.system.windows': [
+        'uptime/*'
+    ]
 }
 
 package_data_exclude = {
@@ -326,13 +330,13 @@ def generate_data_files(data_files):
     ('service/FreeBSD', ['FreeBSD/theonionbox.sh']),
     ('service/init.d', ['init.d/theonionbox.sh']),
     ('service/systemd', ['systemd/theonionbox.service']),
-    ('service/Docker', ['Docker/Dockerfile', 'Docker/theonionbox.cfg']),
-    ('support', []),
-    ('support/osxtemp', []),
-    ('support/osxtemp/libsmc', ['support/osxtemp/libsmc/LICENSE', 'support/osxtemp/libsmc/Makefile']),
-    ('support/osxtemp/libsmc/include', ['support/osxtemp/libsmc/include/smc.h']),
-    ('support/osxtemp/libsmc/src', ['support/osxtemp/libsmc/src/smc.c']),
-    ('theonionbox/tob/system/windows/uptime', ['theonionbox/tob/system/windows/uptime/*.*']),
+    ('service/Docker', ['Docker/Dockerfile', 'Docker/theonionbox.cfg'])
+    # , ('support', [])
+    # , ('support/osxtemp', [])
+    # , ('support/osxtemp/libsmc', ['support/osxtemp/libsmc/LICENSE', 'support/osxtemp/libsmc/Makefile'])
+    # , ('support/osxtemp/libsmc/include', ['support/osxtemp/libsmc/include/smc.h'])
+    # , ('support/osxtemp/libsmc/src', ['support/osxtemp/libsmc/src/smc.c'])
+    # , ('theonionbox/tob/system/windows/uptime', ['theonionbox/tob/system/windows/uptime/*.*']),
 ]
 # print(generate_data_files(data_files))
 
@@ -439,6 +443,6 @@ def generate_data_files(data_files):
         'Topic :: System :: Networking :: Monitoring',
         'Topic :: Utilities',
     ],
-    platforms=['Linux', 'Windows', 'MacOS X', 'FreeBSD'],
+    platforms=['Linux', 'Windows', 'MacOSX', 'FreeBSD'],
     # ext_modules=extensions(),
 )
diff --git a/theonionbox/__main__.py b/theonionbox/__main__.py
@@ -1,29 +1,31 @@
 #!/usr/bin/env python
-from __future__ import absolute_import
-import sys, os
+import os
+import pathlib
+import site
+import sys
 
 
 def main():
 
-    # the import executes the scripting part...
-    if __name__ == '__main__':
-        # we can't use relative imports here!!
-        # get an absolute path to the directory that contains mypackage
-        this_dir = os.path.dirname(os.path.join(os.getcwd(), __file__))
-        sys.path.append(os.path.normpath(os.path.join(this_dir, '..')))
+    if __name__ == '__main__' and __package__ in ['', None]:
 
-        from theonionbox import main as onion_main
+        # Being __main__, we need to add the current dir to the site-dirs, to allow ABSOLUTE import
+        # We resolve this Path, as __file__ might be relative, if __name__ == __main__.
+        cp = pathlib.Path(__file__).resolve()
+        cp = cp.parent
+        assert cp.exists()
 
+        # Add the current dir to the site-dirs, to allow ABSOLUTE import
+        site.addsitedir(cp)
+        from theonionbox import main as onion_main
     else:
+        # we're in a package => RELATIVE should work.
         from .theonionbox import main as onion_main
 
-    # ... and main() launches the server!
+    # The scripting part of theonionbox is being executed as we 'import'.
+    # Now we launch the server:
     onion_main()
 
 
 if __name__ == '__main__':
-
-    # args = sys.argv[1:]
     main()
-
-
diff --git a/theonionbox/css/box.css b/theonionbox/css/box.css
@@ -139,7 +139,9 @@ body {
 <%
     from bottle import TemplateError
     import logging
+
     css_log = logging.getLogger('theonionbox')
+
     for section in sections:
 
         special = section[0]

diff --git a/theonionbox/pages/cc.html b/theonionbox/pages/cc.html
@@ -1,7 +1,12 @@
 <!DOCTYPE html>
 
 <%
-    from tob.template_tools import *
+    try:
+       from tob.template_tools import *
+    except ModuleNotFoundError:
+        from theonionbox.tob.template_tools import *
+    end
+
     base_path = get('virtual_basepath', '') + '/'
 %>
 

diff --git a/theonionbox/pages/index.html b/theonionbox/pages/index.html
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 
 <%
-    from tob.template_tools import *
+    try:
+       from tob.template_tools import *
+    except ModuleNotFoundError:
+        from theonionbox.tob.template_tools import *
+    end
 
     base_path = get('virtual_basepath', '') + '/'
     session = get('session')
@@ -42,6 +46,7 @@
         import logging
         bL = logging.getLogger('theonionbox')
         div_open = False
+
         for section in sections:
 
             if section == '-':
@@ -69,16 +74,12 @@
 
             file = 'sections/{0}/{0}.html'.format(section)
 
-            if os.path.exists(file):
-                try:
-                    include(file)
-                except Exception as exc:
-                    import sys, traceback
-                    exc_type, exc_val, exc_tb = sys.exc_info()
-                    bL.warning("While including '{}' into 'index_page.html':\n{}".format(file, traceback.format_exc()))
-                end
-            else:
-                bL.debug("While including '{0}' into 'index_page.html': '{0}' does not exist!".format(file))
+            try:
+                include(file)
+            except Exception as exc:
+                import logging
+                bL = logging.getLogger('theonionbox')
+                bL.debug("While including '{}' into 'index_page.html': {}".format(file, exc))
             end
         end
         out = ('<' + '/div>') if div_open else ''

diff --git a/theonionbox/scripts/box.js b/theonionbox/scripts/box.js
@@ -7,7 +7,12 @@
 <%
     base_path = get('virtual_basepath', '') + '/'
     sections = get('sections', [])
-    from tob.template_tools import *
+
+    try:
+       from tob.template_tools import *
+    except ModuleNotFoundError:
+        from theonionbox.tob.template_tools import *
+    end
 
     login = get('box.js_login', False)
     token = get('token', 'ThisIsAnError')

diff --git a/theonionbox/scripts/cc.js b/theonionbox/scripts/cc.js
@@ -8072,7 +8072,7 @@ return this.__repr__();
         Launcher.prototype.create = function create() {
             var self = this;
             var html;
-            html = "\n            <div class=\"modal fade tobcc-font\" id=\"login_modal\" tabindex=\"-1\" role=\"dialog\"\n                aria-labelledby=\"exampleModalLabel\" aria-hidden=\"true\">\n                <div class=\"modal-dialog modal-dialog-centered\" role=\"document\">\n                    <div class=\"modal-content\">\n                        <div class=\"modal-header cc-dialog-header\">\n                            <h5 class=\"modal-title cc-dialog-title\" style=\"text-shadow: none\"><i class=\"fas fa-circle-notch fa-spin\"></i></h5>\n                        </div>\n                        <div class=\"modal-body text-center\" id='about'>\n                            <div style='font-family: LatoLatinWeb; font-size: 24px;'>\n                                {{stamp.__title__}} <span style='font-family: LatoLatinWeb; font-size: 18px;'> {{stamp.__version__}}\n                            </div>\n                            <div style='font-family: LatoLatinWebLight; font-size: 18px;'>\n                                {{stamp.__description__}}\n                            </div>\n                        </div>\n                        <div class=\"modal-footer\">\n                            <div style='font-family: LatoLatinWeb; font-size: 14px;'>\n                                Copyright &copy; 2015 - 2019 Ralph Wetzel\n                            </div>\n                        </div>\n                    </div>\n                </div>\n            </div>\n        ";
+            html = "\n            <div class=\"modal fade tobcc-font\" id=\"login_modal\" tabindex=\"-1\" role=\"dialog\"\n                aria-labelledby=\"exampleModalLabel\" aria-hidden=\"true\">\n                <div class=\"modal-dialog modal-dialog-centered\" role=\"document\">\n                    <div class=\"modal-content\">\n                        <div class=\"modal-header cc-dialog-header\">\n                            <h5 class=\"modal-title cc-dialog-title\" style=\"text-shadow: none\"><i class=\"fas fa-circle-notch fa-spin\"></i></h5>\n                        </div>\n                        <div class=\"modal-body text-center\" id='about'>\n                            <div style='font-family: LatoLatinWeb; font-size: 24px;'>\n                                {{stamp.__title__}} <span style='font-family: LatoLatinWeb; font-size: 18px;'> {{stamp.__version__}}\n                            </div>\n                            <div style='font-family: LatoLatinWebLight; font-size: 18px;'>\n                                {{stamp.__description__}}\n                            </div>\n                        </div>\n                        <div class=\"modal-footer\">\n                            <div style='font-family: LatoLatinWeb; font-size: 14px;'>\n                                Copyright &copy; 2015 - 2020 Ralph Wetzel\n                            </div>\n                        </div>\n                    </div>\n                </div>\n            </div>\n        ";
             DialogBase.prototype.create.call(self, html);
         };
         Launcher.prototype.show = function show() {
@@ -8222,7 +8222,7 @@ return this.__repr__();
             $.post((function(){
                 var ρσ_d = {};
                 ρσ_d["url"] = self.base_path + "/" + self.session_id + "/cc/" + "about";
-                ρσ_d["timeout"] = 2e3;
+                ρσ_d["timeout"] = 5e3;
                 return ρσ_d;
             }).call(this)).done((function() {
                 var ρσ_anonfunc = function (data) {

diff --git a/theonionbox/sections/accounting/accounting.html b/theonionbox/sections/accounting/accounting.html
@@ -3,7 +3,11 @@
 %# used for the scripting part of TheOnionBox!
 
 <%
-    from tob.template_tools import *
+    try:
+       from tob.template_tools import *
+    except ModuleNotFoundError:
+        from theonionbox.tob.template_tools import *
+    end
 
     #tor = get('tor', None)
     #accounting_on = tor.get_isAccountingEnabled() if tor else False

diff --git a/theonionbox/sections/config/config.html b/theonionbox/sections/config/config.html
@@ -5,12 +5,13 @@
 # used for the scripting part of TheOnionBox!
 
 import os
+import psutil
 
 
-from tob.configcollector import ConfigCollector
-cfgcoll = ConfigCollector(tor)
+# from tob.configcollector import ConfigCollector
+# cfgcoll = ConfigCollector(tor)
 
-configs_used = []
+configs_used = get('configs_used', [])
 configs_all = []
 
 try:
@@ -56,7 +57,6 @@
 {{!header_row('Tor', 'Configuration', 'config')}}
 
 <%
-    import psutil
     cmd_line = []
 
     if tor.is_localhost():
@@ -138,7 +138,7 @@
 </div>
 <%
 
-    configs_used = cfgcoll.collect_configs_used()
+    # configs_used = cfgcoll.collect_configs_used()
 
     manpg = get('manpage', None)
 

diff --git a/theonionbox/sections/license/license.html b/theonionbox/sections/license/license.html
@@ -3,7 +3,12 @@
     # It is intended to be a bottlepy - style template
     # used for the scripting part of TheOnionBox!
 
-    from tob.license import License
+    try:
+       from tob.license import License
+    except ModuleNotFoundError:
+        from theonionbox.tob.license import License
+    end
+
     license = License()
 %>
 <div class="row">
@@ -12,7 +17,7 @@
     <div class="{{box_value_grid}}">
         <div style="color: grey; font-size: 10px; font-weight: 300">
             <a href="http://www.theonionbox.com/#readme" target="_blank">The Onion Box</a> |
-            Version v{{box_stamp}} | Copyright &copy; 2015 - 2019 Ralph Wetzel | License:
+            Version v{{box_stamp}} | Copyright &copy; 2015 - 2020 Ralph Wetzel | License:
             <a role="button" data-toggle="collapse" href="#MIT"
                aria-expanded="false" aria-controls="MIT">MIT</a>
         </div>
@@ -60,7 +65,12 @@
     <hr>
 
     {{!header_row('', license.get('header'))}}
-    {{!standard_row('', license.get('copyright'))}}
+    <div class='row'>
+        <div class='{{box_datum_grid}}'></div>
+        <div class='{{box_value_grid}} box_value_margin'>
+            {{!license.get('copyright')}}
+        </div>
+    </div>
     <div class="row">
         <div class="{{box_datum_grid}}">
         </div>

diff --git a/theonionbox/sections/monitor/monitor.js b/theonionbox/sections/monitor/monitor.js
@@ -1,4 +1,11 @@
-% from tob.livedata import intervals
+<%
+    try:
+       from tob.livedata import intervals
+    except ModuleNotFoundError:
+        from theonionbox.tob.livedata import intervals
+    end
+%>
+
 var monitor_intervals = {{!intervals}};
 
 var monitor_keys = ['1s', '1m', '5m', '1h', '4h', 'Ch', 'm6', 'y1', 'y5'];

diff --git a/theonionbox/sections/network/network.html b/theonionbox/sections/network/network.html
@@ -2,9 +2,15 @@
 %# It is intended to be a bottlepy - style template
 %# used for the scripting part of TheOnionBox!
 
-% from tob.log import sanitize_for_html
-
 <%
+
+    try:
+       from tob.log import sanitize_for_html
+    except ModuleNotFoundError:
+        from theonionbox.tob.log import sanitize_for_html
+    end
+
+
 tor = get('tor') if tor is None else tor
 oo_details = get('oo_details') if oo_details is None else oo_details
 oo_bw = get('oo_bw')

diff --git a/theonionbox/sections/network_bandwidth/network_bandwidth.js b/theonionbox/sections/network_bandwidth/network_bandwidth.js
@@ -1,4 +1,11 @@
-% from tob.livedata import intervals
+<%
+    try:
+       from tob.livedata import intervals
+    except ModuleNotFoundError:
+        from theonionbox.tob.livedata import intervals
+    end
+%>
+
 var history_intervals = {{!intervals}};
 
 var history_keys = ['1s', '1m', '5m', '1h', '4h', 'Ch', 'm6', 'y1', 'y5'];

diff --git a/theonionbox/stamp.py b/theonionbox/stamp.py
@@ -1,4 +1,4 @@
 __title__ = 'The Onion Box'
 __description__ = 'Dashboard to monitor Tor node operations.'
-__version__ = '19.3'
-__stamp__ = '20191229|232641'
+__version__ = '20.1'
+__stamp__ = '20200105|230447'