Fix ssl version to allow Android to use ssl. SSL is now auto negotiated. Fix SeriveManager service theme hiding. Bug since 1.9 series. Fix missing check dependancies for six, Fix PEP 8 errors

bzr-revno: 2665

openlp/core/ui/servicemanager.py

@@ -1324,8 +1324,8 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtWidgets.QWidget, Ui_ServiceMa
         The theme may have changed in the settings dialog so make sure the theme combo box is in the correct state.
         """
         visible = not self.renderer.theme_level == ThemeLevel.Global
-        self.theme_label.setVisible(visible)
-        self.theme_combo_box.setVisible(visible)
+        self.toolbar.actions['theme_combo_box'].setVisible(visible)
+        self.toolbar.actions['theme_label'].setVisible(visible)
         self.regenerate_service_items()
 
     def regenerate_service_items(self, changed=False):

openlp/plugins/remotes/lib/httprouter.py

@@ -221,9 +221,13 @@ class HttpRouter(RegistryProperties):
         self.request_data = None
         url_path_split = urlparse(url_path)
         url_query = parse_qs(url_path_split.query)
-        # GET
+        # Get data from HTTP request
+        if self.command == 'GET':
             if 'data' in url_query.keys():
                 self.request_data = url_query['data'][0]
+        elif self.command == 'POST':
+            content_len = int(self.headers['content-length'])
+            self.request_data = self.rfile.read(content_len).decode("utf-8")
         for route, func in self.routes:
             match = re.match(route, url_path_split.path)
             if match:
@@ -401,10 +405,8 @@ class HttpRouter(RegistryProperties):
         log.debug('serve file request %s' % file_name)
         if not file_name:
             file_name = 'index.html'
-        elif file_name == 'stage':
-            file_name = 'stage.html'
-        elif file_name == 'main':
-            file_name = 'main.html'
+        if '.' not in file_name:
+            file_name += '.html'
         if file_name.startswith('/'):
             file_name = file_name[1:]
         path = os.path.normpath(os.path.join(self.html_dir, file_name))

openlp/plugins/remotes/lib/httpserver.py

@@ -167,7 +167,6 @@ class HTTPSServer(HTTPServer):
         local_data = AppLocation.get_directory(AppLocation.DataDir)
         self.socket = ssl.SSLSocket(
             sock=socket.socket(self.address_family, self.socket_type),
-            ssl_version=ssl.PROTOCOL_TLSv1_2,
             certfile=os.path.join(local_data, 'remotes', 'openlp.crt'),
             keyfile=os.path.join(local_data, 'remotes', 'openlp.key'),
             server_side=True)

scripts/check_dependencies.py

@@ -93,6 +93,7 @@ MODULES = [
     'bs4',
     'mako',
     'uno',
+    'six'
 ]
 
 

tests/functional/openlp_core_lib/test_lib.py

@@ -432,7 +432,6 @@ class TestLib(TestCase):
         expected_size_1 = QtCore.QSize(88, 88)
         expected_size_2 = QtCore.QSize(100, 100)
 
-
         # Remove the thumb so that the test actually tests if the thumb will be created. Maybe it was not deleted in the
         # last test.
         try:

tests/functional/openlp_plugins/remotes/test_router.py

@@ -94,6 +94,7 @@ class TestRouter(TestCase, TestMixin):
             (r'^/stage/api/poll$', {'function': mocked_function, 'secure': False}),
         ]
         self.router.routes = test_route
+        self.router.command = 'GET'
 
         # WHEN: called with a poll route
         function, args = self.router.process_http_request('/stage/api/poll', None)
@@ -121,6 +122,7 @@ class TestRouter(TestCase, TestMixin):
         self.router.send_header = MagicMock()
         self.router.end_headers = MagicMock()
         self.router.wfile = MagicMock()
+        self.router.command = 'GET'
 
         # WHEN: called with a poll route
         self.router.do_post_processor()
@@ -211,6 +213,29 @@ class TestRouter(TestCase, TestMixin):
             self.router.send_header.assert_called_once_with('Content-type', 'text/html')
             self.assertEqual(self.router.end_headers.call_count, 1, 'end_headers called once')
 
+    def serve_file_with_partial_params_test(self):
+        """
+        Test the serve_file method with an existing file
+        """
+        # GIVEN: mocked environment
+        self.router.send_response = MagicMock()
+        self.router.send_header = MagicMock()
+        self.router.end_headers = MagicMock()
+        self.router.wfile = MagicMock()
+        self.router.html_dir = os.path.normpath('test/dir')
+        self.router.template_vars = MagicMock()
+        with patch('openlp.core.lib.os.path.exists') as mocked_exists, \
+                patch('builtins.open', mock_open(read_data='123')):
+            mocked_exists.return_value = True
+
+            # WHEN: call serve_file with an existing html file
+            self.router.serve_file(os.path.normpath('test/dir/test'))
+
+            # THEN: it should return a 200 and the file
+            self.router.send_response.assert_called_once_with(200)
+            self.router.send_header.assert_called_once_with('Content-type', 'text/html')
+            self.assertEqual(self.router.end_headers.call_count, 1, 'end_headers called once')
+
     def serve_thumbnail_without_params_test(self):
         """
         Test the serve_thumbnail routine without params