Feature 9015: check quotas for admin and return Unauthorize

[osm/NBI.git] / osm_nbi / authconn_internal.py

diff --git a/osm_nbi/authconn_internal.py b/osm_nbi/authconn_internal.py
index 1977aca..b8cfe5b 100644 (file)
--- a/osm_nbi/authconn_internal.py
+++ b/osm_nbi/authconn_internal.py
@@ -28,12 +28,13 @@ __author__ = "Pedro de la Cruz Ramos <pdelacruzramos@altran.com>, " \
              "Alfonso Tierno <alfonso.tiernosepulveda@telefoncia.com"
 __date__ = "$06-jun-2019 11:16:08$"
 
              "Alfonso Tierno <alfonso.tiernosepulveda@telefoncia.com"
 __date__ = "$06-jun-2019 11:16:08$"
 

+import logging
+import re
+

 from osm_nbi.authconn import Authconn, AuthException   # , AuthconnOperationException
 from osm_common.dbbase import DbException
 from osm_nbi.base_topic import BaseTopic
 from osm_nbi.authconn import Authconn, AuthException   # , AuthconnOperationException
 from osm_common.dbbase import DbException
 from osm_nbi.base_topic import BaseTopic

-
-import logging
-import re
+from osm_nbi.validation import is_valid_uuid

 from time import time, sleep
 from http import HTTPStatus
 from uuid import uuid4
 from time import time, sleep
 from http import HTTPStatus
 from uuid import uuid4


@@ -46,8 +47,8 @@ class AuthconnInternal(Authconn):
     token_time_window = 2   # seconds
     token_delay = 1   # seconds to wait upon second request within time window
 
     token_time_window = 2   # seconds
     token_delay = 1   # seconds to wait upon second request within time window
 

-    def __init__(self, config, db):
-        Authconn.__init__(self, config, db)
+    def __init__(self, config, db, role_permissions):
+        Authconn.__init__(self, config, db, role_permissions)

         self.logger = logging.getLogger("nbi.authenticator.internal")
 
         self.db = db
         self.logger = logging.getLogger("nbi.authenticator.internal")
 
         self.db = db


@@ -346,13 +347,17 @@ class AuthconnInternal(Authconn):
         """
         Get user list.
 
         """
         Get user list.
 

-        :param filter_q: dictionary to filter user list by name (username is also admited) and/or _id
+        :param filter_q: dictionary to filter user list by:
+            name (username is also admitted).  If a user id is equal to the filter name, it is also provided
+            other

         :return: returns a list of users.
         """
         filt = filter_q or {}
         :return: returns a list of users.
         """
         filt = filter_q or {}

-        if "name" in filt:
-            filt["username"] = filt["name"]
-            del filt["name"]
+        if "name" in filt:  # backward compatibility
+            filt["username"] = filt.pop("name")
+        if filt.get("username") and is_valid_uuid(filt["username"]):
+            # username cannot be a uuid. If this is the case, change from username to _id
+            filt["_id"] = filt.pop("username")

         users = self.db.get_list("users", filt)
         project_id_name = {}
         role_id_name = {}
         users = self.db.get_list("users", filt)
         project_id_name = {}
         role_id_name = {}