rbeesoft 2.0.2__tar.gz → 2.0.4__tar.gz

{rbeesoft-2.0.2 → rbeesoft-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rbeesoft
-Version: 2.0.2
+Version: 2.0.4
 Summary: 
 Author: Brecheisen
 Author-email: r.brecheisen@maastrichtuniversity.nl

{rbeesoft-2.0.2 → rbeesoft-2.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "rbeesoft"
-version = "2.0.2"
+version = "2.0.4"
 description = ""
 authors = [
     {name = "Brecheisen", email = "r.brecheisen@maastrichtuniversity.nl"}

rbeesoft-2.0.4/src/rbeesoft/app/generatekeys.py

@@ -0,0 +1,37 @@
+import os
+import base64
+from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey
+from cryptography.hazmat.primitives import serialization
+from pathlib import Path
+
+# RUN THIS ONLY ONCE!!! You can distribute the public key to clients
+
+
+def main():
+    output_dir = Path.home() / 'keys'
+    os.makedirs(output_dir, exist_ok=True)
+    priv = Ed25519PrivateKey.generate()
+    pub = priv.public_key()
+    priv_bytes = priv.private_bytes(
+        encoding=serialization.Encoding.Raw,
+        format=serialization.PrivateFormat.Raw,
+        encryption_algorithm=serialization.NoEncryption(),
+    )
+    pub_bytes = pub.public_bytes(
+        encoding=serialization.Encoding.Raw,
+        format=serialization.PublicFormat.Raw,
+    )
+    priv_file = output_dir / 'ed25519_private.key'
+    priv_file.write_bytes(priv_bytes)
+    pub_file = output_dir / 'ed25519_public.key'
+    pub_file.write_bytes(pub_bytes)
+    print("Wrote:")
+    print(" - $HOME/keys/ed25519_private.key  (KEEP SECRET)")
+    print(" - $HOME/keys/ed25519_public.key   (embed in app)")
+    print("\nPublic key (base64) to embed:")
+    print(base64.b64encode(pub_bytes).decode("ascii"))
+
+
+if __name__ == '__main__':
+    main()
+

rbeesoft-2.0.4/src/rbeesoft/app/license.json

@@ -0,0 +1,15 @@
+{
+  "payload": {
+    "customer": "Ralph Example",
+    "product": "MyPySideApp Pro",
+    "features": [
+      "pro",
+      "export_pdf"
+    ],
+    "issued_at": 1770031472,
+    "exp": 1772623472,
+    "license_id": "LIC-1770031472"
+  },
+  "signature": "2NPw5sb9zeOF3b6Sm5hrxWcne/cX0G0vJwVJ+bG+0i7/WY6SJyCNcmN5v+2eBe7WZjs+E+c33JOA7mX8BLTmBA==",
+  "alg": "Ed25519"
+}

{rbeesoft-2.0.2 → rbeesoft-2.0.4}/src/rbeesoft/app/main.py

@@ -12,8 +12,8 @@ class MainWindow(RbeesoftMainWindow):
             bundle_identifier='rbeesoft.nl',
             app_name='example',
             app_title='Rbeesoft App Example',
-            width=800,
-            height=600,
+            app_width=800,
+            app_height=600,
             app_icon=app_icon,
         )
         self.add_page(HomePage(self.settings()), home_page=True)

rbeesoft-2.0.4/src/rbeesoft/app/signlicense.py

@@ -0,0 +1,76 @@
+import base64
+import argparse
+import json
+import time
+from pathlib import Path
+from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey
+
+def canonical_json_bytes(obj: dict) -> bytes:
+    # Deterministic JSON -> same bytes everywhere
+    return json.dumps(
+        obj,
+        sort_keys=True,
+        separators=(",", ":"),
+        ensure_ascii=False
+    ).encode("utf-8")
+
+def load_private_key(path: Path) -> Ed25519PrivateKey:
+    key_bytes = path.read_bytes()
+    return Ed25519PrivateKey.from_private_bytes(key_bytes)
+
+def make_license_payload(
+    customer: str,
+    product: str,
+    expires_days_from_now: int,
+    features: list[str],
+    machine_fp: str | None = None,
+) -> dict:
+    now = int(time.time())
+    exp = now + expires_days_from_now * 24 * 3600
+    payload = {
+        "customer": customer,
+        "product": product,
+        "features": features,
+        "issued_at": now,
+        "exp": exp,
+        "license_id": f"LIC-{now}",
+    }
+    # Optional machine binding (keep None for portable)
+    if machine_fp:
+        payload["machine_fp"] = machine_fp
+    return payload
+
+def sign_license(payload: dict, priv: Ed25519PrivateKey) -> dict:
+    msg = canonical_json_bytes(payload)
+    sig = priv.sign(msg)
+    return {
+        "payload": payload,
+        "signature": base64.b64encode(sig).decode("ascii"),
+        "alg": "Ed25519",
+    }
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('private_key_path', help='Path to private key file')
+    parser.add_argument('output_dir', help='Path to output directory where license.json is written')
+    parser.add_argument('product', help='Name of product')
+    parser.add_argument('expires_days_from_now', help='Number of days to expire', type=int)
+    parser.add_argument('--features', help='Feature list', default='')
+    args = parser.parse_args()
+    priv_path = Path(args.private_key_path) # Path.home() / 'keys/ed25519_private.key'
+    out_path = Path(args.output_dir) / 'license.json'
+    priv = load_private_key(priv_path)
+    payload = make_license_payload(
+        customer='Default customer',
+        product=args.product,
+        expires_days_from_now=args.expires_days_from_now,
+        features=[x.strip() for x in args.features.split(',')],
+        machine_fp=None,  # set to a fingerprint to bind to a device
+    )
+    signed = sign_license(payload, priv)
+    out_path.write_text(json.dumps(signed, indent=2, ensure_ascii=False), encoding="utf-8")
+    print(f"Wrote signed license to: {out_path.resolve()}")
+    print(f"Expires at (unix): {payload['exp']}")
+
+if __name__ == "__main__":
+    main()

rbeesoft-2.0.4/src/rbeesoft/app/ui/rbeesoftmainwindow.py

@@ -0,0 +1,147 @@
+import os
+from PySide6.QtCore import Qt, QByteArray
+from PySide6.QtWidgets import QMainWindow, QStyle, QFileDialog
+from PySide6.QtGui import QGuiApplication, QAction
+from rbeesoft.app.ui.settings import Settings
+from rbeesoft.app.ui.widgets.centraldockwidget import CentralDockWidget
+from rbeesoft.app.ui.widgets.logdockwidget import LogDockWidget
+from rbeesoft.common.licensemanager import LicenseManager
+from rbeesoft.common.licenseexception import LicenseException
+from rbeesoft.common.logmanager import LogManager
+
+LOG = LogManager()
+
+PUBLIC_KEY_B64 = 'C7yBmGtvBkvnvGtWiey4PKXZWo7Lza61+FwV2UyAu34='
+
+
+class RbeesoftMainWindow(QMainWindow):
+    def __init__(self, bundle_identifier, app_name, app_title, app_width=1024, app_height=1024, app_icon=None):
+        super(RbeesoftMainWindow, self).__init__()
+        self._settings = Settings(bundle_identifier, app_name)
+        self._settings.set('public_key', PUBLIC_KEY_B64)
+        self._app_title = app_title
+        self._app_width = app_width
+        self._app_height = app_height
+        self._app_icon = app_icon
+        self._central_dockwidget = None
+        self._log_dockwidget = None
+        self._license_manager = None
+        self._license = None
+        self.init()
+
+    # INITIALIZATION
+
+    def init(self):
+        self.setWindowTitle(self.app_title())
+        self.addDockWidget(Qt.DockWidgetArea.TopDockWidgetArea, self.central_dockwidget())
+        self.addDockWidget(Qt.DockWidgetArea.BottomDockWidgetArea, self.log_dockwidget())
+        LOG.info(f'Settings path: {self.settings().fileName()}')
+        if self.app_icon():
+            self.setWindowIcon(self.app_icon())
+        self.load_geometry_and_state()
+        self.init_default_menus()
+        self.check_license()
+        self.statusBar().showMessage('Ready')
+
+    def init_default_menus(self):
+        # Application menu
+        icon = self.style().standardIcon(QStyle.StandardPixmap.SP_MessageBoxCritical)
+        exit_action = QAction(icon, 'E&xit', self)
+        exit_action.triggered.connect(self.close)
+        application_menu = self.menuBar().addMenu('Application')
+        application_menu.addAction(exit_action)
+        # Settings menu
+        icon = self.style().standardIcon(QStyle.StandardPixmap.SP_VistaShield)
+        open_license_file_action = QAction(icon, 'Open license file...', self)
+        open_license_file_action.triggered.connect(self.handle_open_license_file_action)
+        settings_menu = self.menuBar().addMenu('Settings')
+        settings_menu.addAction(open_license_file_action)
+
+    # GETTERS
+
+    def settings(self):
+        return self._settings
+    
+    def app_title(self):
+        return self._app_title
+    
+    def app_width(self):
+        return self._app_width
+    
+    def app_height(self):
+        return self._app_height
+    
+    def app_icon(self):
+        return self._app_icon
+    
+    def central_dockwidget(self):
+        if not self._central_dockwidget:
+            self._central_dockwidget = CentralDockWidget(self, self.settings())
+        return self._central_dockwidget
+    
+    def log_dockwidget(self):
+        if not self._log_dockwidget:
+            self._log_dockwidget = LogDockWidget(self)
+            LOG.add_listener(self._log_dockwidget)
+        return self._log_dockwidget
+    
+    def license_manager(self):
+        if not self._license_manager:
+            self._license_manager = LicenseManager(self.settings().get('public_key', None))
+        return self._license_manager
+    
+    def license(self):
+        return self._license
+    
+    # EVENT HANDLERS
+
+    def closeEvent(self, event):
+        self.save_geometry_and_state()
+        return super().closeEvent(event)
+
+    def handle_open_license_file_action(self):
+        last_directory = self.settings().get('mainwindow/last_directory', None)
+        file_path, _ = QFileDialog.getOpenFileName(dir=last_directory)
+        if file_path:
+            self.settings().set('mainwindow/last_directory', os.path.split(file_path)[0])
+            self.settings().set('mainwindow/license_file', file_path)
+            self.check_license()
+
+    # HELPERS
+
+    def add_page(self, page, home_page=False):
+        self.central_dockwidget().add_page(page, home_page)
+
+    def check_license(self):
+        file_path = self.settings().get('mainwindow/license_file', None)
+        if file_path:
+            try:
+                self._license = self.license_manager().verify(file_path)
+                LOG.info(f'License found at {file_path}')
+                LOG.info('License OK')
+                return True
+            except LicenseException as e:
+                LOG.error(e)
+                return False
+        LOG.warning('No license found')
+        return False
+
+    def load_geometry_and_state(self):
+        geometry = self.settings().get('mainwindow/geometry')
+        state = self.settings().get('mainwindow/state')
+        if isinstance(geometry, QByteArray) and self.restoreGeometry(geometry):
+            if isinstance(state, QByteArray):
+                self.restoreState(state)
+            return
+        self.resize(self.app_width(), self.app_height())
+        self.center_window()        
+
+    def save_geometry_and_state(self):
+        self.settings().set('mainwindow/geometry', self.saveGeometry())
+        self.settings().set('mainwindow/state', self.saveState())
+
+    def center_window(self):
+        screen = QGuiApplication.primaryScreen().geometry()
+        x = (screen.width() - self.geometry().width()) / 2
+        y = (screen.height() - self.geometry().height()) / 2
+        self.move(int(x), int(y))

{rbeesoft-2.0.2 → rbeesoft-2.0.4}/src/rbeesoft/app/ui/settings.py

@@ -12,6 +12,12 @@ class Settings(QSettings):
         self._bundle_identifier = bundle_identifier
         self._app_name = app_name
 
+    def bundle_identifier(self):
+        return self._bundle_identifier
+    
+    def app_name(self):
+        return self._app_name
+
     def _prepend_bundle_identifier_and_name(self, name):
         return '{}.{}.{}'.format(self._bundle_identifier, self._app_name, name)
 

{rbeesoft-2.0.2 → rbeesoft-2.0.4}/src/rbeesoft/app/ui/widgets/pages/page.py

@@ -5,11 +5,12 @@ from PySide6.QtWidgets import QWidget
 class Page(QWidget):
     page_changed = Signal(str)
 
-    def __init__(self, name, title, settings):
+    def __init__(self, name, title, settings, license=None):
         super(Page, self).__init__()
         self._name = name
         self._title = title
         self._settings = settings
+        self._license = license
 
     def name(self):
         return self._name
@@ -20,5 +21,8 @@ class Page(QWidget):
     def settings(self):
         return self._settings
     
+    def license(self):
+        return self._license
+    
     def switch_to_page(self, name):
         self.page_changed.emit(name)

rbeesoft-2.0.4/src/rbeesoft/common/licenseexception.py

@@ -0,0 +1,2 @@
+class LicenseException(Exception):
+    pass

rbeesoft-2.0.4/src/rbeesoft/common/licensemanager.py

@@ -0,0 +1,47 @@
+import json
+import time
+import base64
+from pathlib import Path
+from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PublicKey
+from rbeesoft.common.licenseexception import LicenseException
+
+
+class LicenseManager:
+    def __init__(self, public_key):
+        self._file_path = None
+        self._public_key = public_key
+
+    def file_path(self):
+        return self._file_path
+    
+    def public_key(self):
+        return self._public_key
+
+    def canonical_json_bytes(self, obj: dict) -> bytes:
+        return json.dumps(
+            obj,
+            sort_keys=True,
+            separators=(",", ":"),
+            ensure_ascii=False
+        ).encode("utf-8")
+
+    def verify(self, file_path):
+        if isinstance(file_path, str):
+            file_path = Path(file_path)
+        try:
+            signed = json.loads(file_path.read_text(encoding='utf-8'))
+            payload = signed['payload']
+            sig_b64 = signed['signature']
+            sig = base64.b64decode(sig_b64)
+            msg = self.canonical_json_bytes(payload)
+            pub_bytes = base64.b64decode(self.public_key())
+            pub = Ed25519PublicKey.from_public_bytes(pub_bytes)
+            pub.verify(sig, msg)
+            # expiry check
+            now = int(time.time())
+            exp = int(payload["exp"])
+            if now > exp:
+                raise LicenseException('License expired')
+            return payload
+        except Exception as e:
+            raise LicenseException(f'Invalid license: {e}')

rbeesoft-2.0.2/src/rbeesoft/app/ui/rbeesoftmainwindow.py

@@ -1,77 +0,0 @@
-from PySide6.QtCore import Qt, QByteArray
-from PySide6.QtWidgets import QMainWindow, QStyle
-from PySide6.QtGui import QGuiApplication, QAction
-from rbeesoft.app.ui.settings import Settings
-from rbeesoft.app.ui.widgets.centraldockwidget import CentralDockWidget
-from rbeesoft.app.ui.widgets.logdockwidget import LogDockWidget
-from rbeesoft.common.logmanager import LogManager
-
-LOG = LogManager()
-
-
-class RbeesoftMainWindow(QMainWindow):
-    def __init__(self, bundle_identifier, app_name, app_title, width=1024, height=1024, app_icon=None):
-        super(RbeesoftMainWindow, self).__init__()
-        self._settings = Settings(bundle_identifier, app_name)
-        self._app_title = app_title
-        self._width = width
-        self._height = height
-        self._app_icon = app_icon
-        self._central_dockwidget = CentralDockWidget(self, self._settings)
-        self._log_dockwidget = LogDockWidget(self)
-        self.init()
-
-    # INITIALIZATION
-
-    def init(self):
-        self.setWindowTitle(self._app_title)
-        self.addDockWidget(Qt.DockWidgetArea.TopDockWidgetArea, self._central_dockwidget)
-        self.addDockWidget(Qt.DockWidgetArea.BottomDockWidgetArea, self._log_dockwidget)
-        if self._app_icon:
-            self.setWindowIcon(self._app_icon)
-        self.load_geometry_and_state()
-        self.init_default_menus()
-        self.statusBar().showMessage('Ready')
-        LOG.info(f'Settings path: {self.settings().fileName()}')
-
-    def init_default_menus(self):
-        exit_action_icon = self.style().standardIcon(QStyle.StandardPixmap.SP_DialogCloseButton)
-        exit_action = QAction(exit_action_icon, 'E&xit', self)
-        exit_action.triggered.connect(self.close)
-        application_menu = self.menuBar().addMenu('Application')
-        application_menu.addAction(exit_action)
-
-    # GETTERS
-
-    def settings(self):
-        return self._settings
-    
-    # EVENT HANDLERS
-
-    def closeEvent(self, _):
-        self.save_geometry_and_state()
-
-    # HELPERS
-
-    def add_page(self, page, home_page=False):
-        self._central_dockwidget.add_page(page, home_page)
-
-    def load_geometry_and_state(self):
-        geometry = self.settings().get('mainwindow/geometry')
-        state = self.settings().get('mainwindow/state')
-        if isinstance(geometry, QByteArray) and self.restoreGeometry(geometry):
-            if isinstance(state, QByteArray):
-                self.restoreState(state)
-            return
-        self.resize(self._width, self._height)
-        self.center_window()        
-
-    def save_geometry_and_state(self):
-        self.settings().set('mainwindow/geometry', self.saveGeometry())
-        self.settings().set('mainwindow/state', self.saveState())
-
-    def center_window(self):
-        screen = QGuiApplication.primaryScreen().geometry()
-        x = (screen.width() - self.geometry().width()) / 2
-        y = (screen.height() - self.geometry().height()) / 2
-        self.move(int(x), int(y))