rbeesoft 2.0.6__tar.gz → 2.0.7__tar.gz

{rbeesoft-2.0.6 → rbeesoft-2.0.7}/PKG-INFO

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

{rbeesoft-2.0.6 → rbeesoft-2.0.7}/pyproject.toml

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

{rbeesoft-2.0.6 → rbeesoft-2.0.7}/src/rbeesoft/app/main.py

@@ -4,6 +4,7 @@ from rbeesoft.app.ui import RbeesoftMainWindow
 from rbeesoft.app.ui.widgets.pages import Page
 from rbeesoft.app.ui.processes import Process
 from rbeesoft.app.ui.processes import ProcessRunner
+from rbeesoft.common import LicenseManager
 
 
 class MainWindow(RbeesoftMainWindow):
@@ -32,7 +33,10 @@ class HomePage(Page):
         layout.setAlignment(QtCore.Qt.AlignmentFlag.AlignTop)
         layout.addWidget(QtWidgets.QLabel(self.title()))
         layout.addWidget(button)
-        layout.addWidget(process_button)
+        manager = LicenseManager(settings)
+        license = manager.license()
+        if license.has_all_features('x'):
+            layout.addWidget(process_button)
         self.setLayout(layout)
 
     def handle_button(self):

{rbeesoft-2.0.6 → rbeesoft-2.0.7}/src/rbeesoft/app/ui/processes/processrunner.py

@@ -1,4 +1,4 @@
-from rbeesoft.common.singleton import singleton
+from rbeesoft.common.decorators import singleton
 from rbeesoft.common.logmanager import LogManager
 
 LOG = LogManager()

{rbeesoft-2.0.6 → rbeesoft-2.0.7}/src/rbeesoft/app/ui/rbeesoftmainwindow.py

@@ -3,11 +3,11 @@ 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 import CentralDockWidget
-from rbeesoft.app.ui.widgets import LogDockWidget
-from rbeesoft.common import LicenseManager
-from rbeesoft.common.exceptions import LicenseException
-from rbeesoft.common import LogManager
+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.exceptions.licenseexception import LicenseException
+from rbeesoft.common.logmanager import LogManager
 
 LOG = LogManager()
 
@@ -87,7 +87,7 @@ class RbeesoftMainWindow(QMainWindow):
     
     def license_manager(self):
         if not self._license_manager:
-            self._license_manager = LicenseManager(self.settings().get('public_key', None))
+            self._license_manager = LicenseManager(self.settings())
         return self._license_manager
     
     def license(self):
@@ -116,7 +116,7 @@ class RbeesoftMainWindow(QMainWindow):
         file_path = self.settings().get('mainwindow/license_file', None)
         if file_path:
             try:
-                self._license = self.license_manager().verify(file_path)
+                self._license = self.license_manager().check_license(file_path)
                 LOG.info(f'License found at {file_path}')
                 LOG.info('License OK')
                 return True

{rbeesoft-2.0.6 → rbeesoft-2.0.7}/src/rbeesoft/common/__init__.py

@@ -1,3 +1,4 @@
 from rbeesoft.common.logmanager import LogManager
 from rbeesoft.common.logmanagerlistener import LogManagerListener
-from rbeesoft.common.licensemanager import LicenseManager
+from rbeesoft.common.licensemanager import LicenseManager
+from rbeesoft.common.license import License

rbeesoft-2.0.7/src/rbeesoft/common/license.py

@@ -0,0 +1,38 @@
+import time
+
+
+class License:
+    def __init__(self, payload):
+        self._payload = payload
+
+    def customer(self):
+        return self._payload['customer']
+    
+    def product(self):
+        return self._payload['product']
+    
+    def feature_list(self):
+        return self._payload['features']
+    
+    def expiry_days(self):
+        return int(self._payload['exp'])
+    
+    def id(self):
+        return self._payload['license_id']
+    
+    # CHECKS
+
+    def is_expired(self):
+        now = int(time.time())
+        if now > self.expiry_days():
+            return True
+        return False
+    
+    def is_valid(self):
+        return not self.is_expired()
+    
+    def has_all_features(self):
+        return 'all' in self.feature_list()
+    
+    def has_feature(self, name):
+        return name in self.feature_list()

{rbeesoft-2.0.6 → rbeesoft-2.0.7}/src/rbeesoft/common/licensemanager.py

@@ -3,19 +3,26 @@ import time
 import base64
 from pathlib import Path
 from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PublicKey
-from rbeesoft.common.exceptions.licenseexception import LicenseException
+from rbeesoft.common.exceptions import LicenseException
+from rbeesoft.common.license import License
+from rbeesoft.common.decorators import singleton
 
 
+@singleton
 class LicenseManager:
-    def __init__(self, public_key):
+    def __init__(self, settings):
         self._file_path = None
-        self._public_key = public_key
+        self._public_key = settings.get('public_key', None)
+        self._license = None
 
     def file_path(self):
         return self._file_path
     
     def public_key(self):
         return self._public_key
+    
+    def license(self):
+        return self._license
 
     def canonical_json_bytes(self, obj: dict) -> bytes:
         return json.dumps(
@@ -25,7 +32,7 @@ class LicenseManager:
             ensure_ascii=False
         ).encode("utf-8")
 
-    def verify(self, file_path):
+    def check_license(self, file_path):
         if isinstance(file_path, str):
             file_path = Path(file_path)
         if not file_path.exists():
@@ -44,6 +51,7 @@ class LicenseManager:
             exp = int(payload["exp"])
             if now > exp:
                 raise LicenseException('License expired')
-            return payload
+            self._license = License(payload)
+            return self._license
         except Exception as e:
             raise LicenseException(f'Invalid license: {e}')

{rbeesoft-2.0.6 → rbeesoft-2.0.7}/src/rbeesoft/common/logmanager.py

@@ -2,7 +2,7 @@ import os
 import atexit
 import datetime
 from pathlib import Path
-from rbeesoft.common.singleton import singleton
+from rbeesoft.common.decorators import singleton
 
 
 @singleton

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

@@ -1,37 +0,0 @@
-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.6/src/rbeesoft/app/license.json

@@ -1,15 +0,0 @@
-{
-  "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.6/src/rbeesoft/app/signlicense.py

@@ -1,76 +0,0 @@
-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()