cornflow 1.3.2__tar.gz → 1.3.4__tar.gz

{cornflow-1.3.2/cornflow.egg-info → cornflow-1.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cornflow
-Version: 1.3.2
+Version: 1.3.4
 Summary: cornflow is an open source multi-solver optimization server with a REST API built using flask.
 Home-page: https://github.com/baobabsoluciones/cornflow
 Author: baobab soluciones
@@ -14,7 +14,7 @@ Requires-Dist: alembic==1.9.2
 Requires-Dist: apispec==6.3.0
 Requires-Dist: cachetools==5.3.3
 Requires-Dist: click==8.1.7
-Requires-Dist: cornflow-client==1.3.2
+Requires-Dist: cornflow-client==1.3.4
 Requires-Dist: cryptography==46.0.5
 Requires-Dist: disposable-email-domains==0.0.162
 Requires-Dist: Flask==2.3.2

{cornflow-1.3.2 → cornflow-1.3.4}/cornflow/endpoints/user_role.py

@@ -18,6 +18,10 @@ from cornflow.shared.exceptions import EndpointNotImplemented, ObjectAlreadyExis
 
 class UserRoleListEndpoint(BaseMetaResource):
     ROLES_WITH_ACCESS = [ADMIN_ROLE]
+    # Other roles can get their own roles, but not all roles
+    # This is because the admin role is the only one that can get all roles
+    # and the other roles can only get their own roles
+
     DESCRIPTION = (
         "Endpoint to get the list of roles assigned to users and create new assignments"
     )
@@ -34,16 +38,22 @@ class UserRoleListEndpoint(BaseMetaResource):
         API method to get the assigned roles to the users defined in the application.
         It requires authentication to be passed in the form of a token that has to be linked to
         an existing session (login) made by a user.
+        Admin users receive every assignment; other users receive only their own.
 
         :return: A dictionary with the response (data of the user assigned roles or an error message)
         and an integer with the HTTP status code.
         :rtype: Tuple(dict, integer)
 
         """
+        if self.is_admin():
+            current_app.logger.info(
+                f"User {self.get_user()} gets all user roles assignments"
+            )
+            return self.get_list()
         current_app.logger.info(
-            f"User {self.get_user()} gets all user roles assignments"
+            f"User {self.get_user()} gets their own user role assignments"
         )
-        return self.get_list()
+        return self.get_list(user_id=self.get_user_id())
 
     @doc(description="Creates a new role assignment", tags=["User roles"])
     @authenticate(auth_class=Auth())

{cornflow-1.3.2 → cornflow-1.3.4}/cornflow/shared/const.py

@@ -7,7 +7,7 @@ AIRFLOW_BACKEND = 1
 DATABRICKS_BACKEND = 2
 
 
-CORNFLOW_VERSION = "1.3.2"
+CORNFLOW_VERSION = "1.3.4"
 INTERNAL_TOKEN_ISSUER = "cornflow"
 
 # endpoints responses for health check
@@ -150,6 +150,9 @@ BASE_PERMISSION_ASSIGNATION = [
 
 EXTRA_PERMISSION_ASSIGNATION = [
     (VIEWER_ROLE, PUT_ACTION, "user-detail"),
+    (VIEWER_ROLE, GET_ACTION, "user-roles"),
+    (PLANNER_ROLE, GET_ACTION, "user-roles"),
+    (SERVICE_ROLE, GET_ACTION, "user-roles"),
 ]
 
 # Costants for messages that are given back on exceptions

{cornflow-1.3.2 → cornflow-1.3.4}/cornflow/tests/unit/test_cli.py

@@ -327,7 +327,7 @@ class CLITests(TestCase):
         self.assertEqual(len(actions), 5)
         self.assertEqual(len(roles), 4)
         self.assertEqual(len(views), (len(resources) + len(alarms_resources)))
-        self.assertEqual(len(permissions), 583)
+        self.assertEqual(len(permissions), 586)
 
     def test_permissions_base_command(self):
         """
@@ -353,7 +353,7 @@ class CLITests(TestCase):
         self.assertEqual(len(actions), 5)
         self.assertEqual(len(roles), 4)
         self.assertEqual(len(views), (len(resources) + len(alarms_resources)))
-        self.assertEqual(len(permissions), 583)
+        self.assertEqual(len(permissions), 586)
 
     def test_service_entrypoint(self):
         """

{cornflow-1.3.2 → cornflow-1.3.4}/cornflow/tests/unit/test_roles.py

@@ -21,6 +21,7 @@ from cornflow.shared.const import (
     ADMIN_ROLE,
     PLANNER_ROLE,
     ROLES_MAP,
+    SERVICE_ROLE,
     VIEWER_ROLE,
 )
 from cornflow.tests.const import ROLES_URL, USER_ROLE_URL
@@ -253,20 +254,24 @@ class TestUserRolesListEndpoint(CustomTestCase):
             self.assertEqual(200, response.status_code)
             self.assertCountEqual(self.payload, response.json)
 
-
-    def test_get_user_roles_not_authorized_user(self):
-        for role in ROLES_MAP:
-            if role not in self.roles_with_access:
-                self.token = self.create_user_with_role(role)
-                response = self.client.get(
-                    self.url,
-                    follow_redirects=True,
-                    headers={
-                        "Content-Type": "application/json",
-                        "Authorization": f"Bearer {self.token}",
-                    },
+        for role in (VIEWER_ROLE, PLANNER_ROLE, SERVICE_ROLE):
+            self.token = self.create_user_with_role(role)
+            user = UserModel.get_one_object(username=f"testuser{role}")
+            response = self.client.get(
+                self.url,
+                follow_redirects=True,
+                headers={
+                    "Content-Type": "application/json",
+                    "Authorization": f"Bearer {self.token}",
+                },
+            )
+            self.assertEqual(200, response.status_code)
+            self.assertTrue(
+                any(
+                    r["user_id"] == user.id and r["role_id"] == role
+                    for r in response.json
                 )
-                self.assertEqual(403, response.status_code)
+            )
 
     def test_post_role_assignment_authorized_user(self):
         for role in self.roles_with_access:

{cornflow-1.3.2 → cornflow-1.3.4/cornflow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cornflow
-Version: 1.3.2
+Version: 1.3.4
 Summary: cornflow is an open source multi-solver optimization server with a REST API built using flask.
 Home-page: https://github.com/baobabsoluciones/cornflow
 Author: baobab soluciones
@@ -14,7 +14,7 @@ Requires-Dist: alembic==1.9.2
 Requires-Dist: apispec==6.3.0
 Requires-Dist: cachetools==5.3.3
 Requires-Dist: click==8.1.7
-Requires-Dist: cornflow-client==1.3.2
+Requires-Dist: cornflow-client==1.3.4
 Requires-Dist: cryptography==46.0.5
 Requires-Dist: disposable-email-domains==0.0.162
 Requires-Dist: Flask==2.3.2

{cornflow-1.3.2 → cornflow-1.3.4}/cornflow.egg-info/requires.txt

@@ -2,7 +2,7 @@ alembic==1.9.2
 apispec==6.3.0
 cachetools==5.3.3
 click==8.1.7
-cornflow-client==1.3.2
+cornflow-client==1.3.4
 cryptography==46.0.5
 disposable-email-domains==0.0.162
 Flask==2.3.2

{cornflow-1.3.2 → cornflow-1.3.4}/requirements.txt

@@ -2,7 +2,7 @@ alembic==1.9.2
 apispec==6.3.0
 cachetools==5.3.3
 click==8.1.7
-cornflow-client==1.3.2
+cornflow-client==1.3.4
 cryptography==46.0.5
 disposable-email-domains==0.0.162
 Flask==2.3.2

{cornflow-1.3.2 → cornflow-1.3.4}/setup.py

@@ -9,7 +9,7 @@ with open("requirements.txt", "r") as fh:
 
 setuptools.setup(
     name="cornflow",
-    version="1.3.2",
+    version="1.3.4",
     author="baobab soluciones",
     author_email="cornflow@baobabsoluciones.es",
     description="cornflow is an open source multi-solver optimization server with a REST API built using flask.",