Merge pull request #61 from CESNET/develop

This PR upgrades to version 1.1.2 by removing unused JavaScript assets, migrating to a pyproject.toml–based build, cleaning up debug statements, and enhancing type safety in API views.

Removed legacy setup.py and requirements-backup.txt in favor of pyproject.toml
Deleted unused JS files under static/js and cleaned debug print calls
Added type annotations in flowapp/views/api_common.py and updated configuration keys for rule limits

Author: jirivrany

.github/workflows/python-app.yml

@@ -28,7 +28,8 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install flake8 pytest
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+        # Install the package in editable mode with dev dependencies
+        pip install -e .[dev]
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names

README.md

@@ -59,6 +59,7 @@ The REST API is documented using Swagger (OpenAPI). After installing and running
 
 
 ## Change Log
+- 1.1.2 - minor security updates (removed unused JS files), setup.py now reads dependencies from requirements.txt
 - 1.1.1 - Machine API Key rewrited. 
     - API keys for machines are now tied to one of the existing users. If there is a need to have API access for machine, first create service user, and set the access rights. Then create machine key as Admin and assign it to this user. 
 - 1.1.0 - Major Architecture Refactoring and Whitelist Integration

flowapp/__about__.py

@@ -1 +1 @@
-__version__ = "1.1.1"
+__version__ = "1.1.2"

flowapp/models/utils.py

@@ -22,7 +22,8 @@ def check_rule_limit(org_id: int, rule_type: RuleTypes) -> bool:
     :param rule_type: RuleType rule type
     :return: boolean
     """
-    flowspec_limit = current_app.config.get("FLOWSPEC_MAX_RULES", 9000)
+    flowspec4_limit = current_app.config.get("FLOWSPEC4_MAX_RULES", 9000)
+    flowspec6_limit = current_app.config.get("FLOWSPEC6_MAX_RULES", 9000)
     rtbh_limit = current_app.config.get("RTBH_MAX_RULES", 100000)
     fs4 = db.session.query(Flowspec4).filter_by(rstate_id=1).count()
     fs6 = db.session.query(Flowspec6).filter_by(rstate_id=1).count()
@@ -32,10 +33,10 @@ def check_rule_limit(org_id: int, rule_type: RuleTypes) -> bool:
     org = Organization.query.filter_by(id=org_id).first()
     if rule_type == RuleTypes.IPv4 and org.limit_flowspec4 > 0:
         count = db.session.query(Flowspec4).filter_by(org_id=org_id, rstate_id=1).count()
-        return count >= org.limit_flowspec4 or fs4 >= flowspec_limit
+        return count >= org.limit_flowspec4 or fs4 >= flowspec4_limit
     if rule_type == RuleTypes.IPv6 and org.limit_flowspec6 > 0:
         count = db.session.query(Flowspec6).filter_by(org_id=org_id, rstate_id=1).count()
-        return count >= org.limit_flowspec6 or fs6 >= flowspec_limit
+        return count >= org.limit_flowspec6 or fs6 >= flowspec6_limit
     if rule_type == RuleTypes.RTBH and org.limit_rtbh > 0:
         count = db.session.query(RTBH).filter_by(org_id=org_id, rstate_id=1).count()
         return count >= org.limit_rtbh or rtbh >= rtbh_limit
@@ -244,13 +245,11 @@ def get_user_actions(user_roles):
     Return list of actions based on current user role
     """
     max_role = max(user_roles)
-    print(max_role)
     if max_role == 3:
         actions = db.session.query(Action).order_by("id").all()
     else:
         actions = db.session.query(Action).filter_by(role_id=max_role).order_by("id").all()
     result = [(g.id, g.name) for g in actions]
-    print(actions, result)
     return result