Finish implementing "allow_remote_requests" config option. also some code cleanup.

Author: lots0logs

whither/base/config_loader.py

@@ -67,6 +67,14 @@ def load_config(self, key: str) -> dict:
 
         return {key: value for key, value in config.items()}
 
+    def load_default_config(self) -> dict:
+        load_from_orig = self.load_from
+        self.load_from = __file__
+        default_config = self.load_config('Example')
+        self.load_from = load_from_orig
+
+        return default_config
+
     @classmethod
     def remove_filter(cls, callback: Callable[[str, str], None]) -> None:
         cls._filters.remove(callback)

whither/base/objects.py

@@ -148,7 +148,7 @@ def _maybe_start_accessibility_service(self):
 
     def run(self) -> int:
         self._maybe_start_accessibility_service()
-        raise NotImplementedError()
+        return 0
 
 
 class WebContainer(BaseObject):

whither/toolkits/qt/application.py

@@ -53,6 +53,8 @@ def _set_window_size_position(self) -> None:
         self._main_window.widget.setGeometry(self.desktop.availableGeometry())
 
     def run(self) -> int:
+        super().run()
+
         self.logger.debug('Setting window size and position')
         self._set_window_size_position()
 

whither/toolkits/qt/interceptor.py

@@ -25,10 +25,9 @@
 # You should have received a copy of the GNU General Public License
 # along with whither; If not, see <http://www.gnu.org/licenses/>.
 
-""" Wrapper for QMainWindow """
+""" Request Interceptor """
 
 # 3rd-Party Libs
-from PyQt5.QtCore import QObject
 from PyQt5.QtWebEngineCore import (
     QWebEngineUrlRequestInterceptor,
     QWebEngineUrlRequestInfo,
@@ -38,7 +37,17 @@
 class QtUrlRequestInterceptor(QWebEngineUrlRequestInterceptor):
 
     def intercept_request(self, info: QWebEngineUrlRequestInfo) -> None:
-        pass
+        url = info.requestUrl().toString()
+        not_data_uri = 'data' != info.requestUrl().scheme()
+        not_local_file = not info.requestUrl().isLocalFile()
+
+        not_devtools = (
+            not url.startswith('http://127.0.0.1') and not url.startswith('ws://127.0.0.1')
+        )
+
+        block_request = not_devtools and not_data_uri and not_local_file
+
+        info.block(block_request)
 
     def interceptRequest(self, info: QWebEngineUrlRequestInfo) -> None:
         self.intercept_request(info)

whither/toolkits/qt/web_container.py

@@ -39,6 +39,7 @@
     QWebEngineView,
     QWebEngineSettings,
     QWebEngineScript,
+    QWebEngineProfile,
 )
 from PyQt5.QtCore import (
     Qt,
@@ -49,6 +50,8 @@
 # This Library
 from whither.base.objects import WebContainer
 from .devtools import DevTools
+from .interceptor import QtUrlRequestInterceptor
+
 
 # Typing Helpers
 BridgeObjects = Tuple['BridgeObject']
@@ -78,8 +81,12 @@ def __init__(self, bridge_objs: BridgeObjects = None, *args, **kwargs) -> None:
         if self._config.debug_mode:
             os.environ['QTWEBENGINE_REMOTE_DEBUGGING'] = '12345'
 
+        self.profile = QWebEngineProfile.defaultProfile()
+        self.interceptor = QtUrlRequestInterceptor()
+
         self.view = QWebEngineView(parent=self._main_window.widget)
         self.page = self.view.page()
+
         self.channel = QWebChannel(self.page)
         self.bridge_initialized = False
 
@@ -91,6 +98,9 @@ def __init__(self, bridge_objs: BridgeObjects = None, *args, **kwargs) -> None:
         if not self._config.context_menu.enabled:
             self.view.setContextMenuPolicy(Qt.PreventContextMenu)
 
+        if not self._config.allow_remote_urls:
+            self.profile.setRequestInterceptor(self.interceptor)
+
         if self._config.entry_point.autoload:
             self.initialize_bridge_objects()
             self.load()

whither/toolkits/qt/window.py

@@ -46,24 +46,21 @@
 # This Library
 from whither.base.objects import Window
 
-# Typing Helpers
-QtWindowStatesT = Dict[str, Qt.WindowState]
-
 
 WINDOW_STATES = {
     'NORMAL': Qt.WindowNoState,
     'MINIMIZED': Qt.WindowMinimized,
     'MAXIMIZED': Qt.WindowMaximized,
     'FULLSCREEN': Qt.WindowFullScreen,
-}  # type: QtWindowStatesT
+}  # type: Dict[str, Qt.WindowState]
 
 
 class QtWindow(Window):
 
     def __init__(self, name: str = '_window', *args, **kwargs) -> None:
         super().__init__(name=name, *args, **kwargs)
 
-        self.states = WINDOW_STATES  # type: dict
+        self.states = WINDOW_STATES  # type: Dict[str, Qt.WindowState]
         self.widget = None           # type: QWidget
 
         self._initialize()