Fix for absent user ID in RPC context (unauthenticated calls).

kbase · Mar 30, 2017 · 9e8629d · 9e8629d
1 parent c50f0fd
commit 9e8629d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/biokbase/catalog/Impl.py b/lib/biokbase/catalog/Impl.py
@@ -1377,7 +1377,7 @@ def set_secure_config_params(self, ctx, params):
         """
         # ctx is the context object
         #BEGIN set_secure_config_params
-        self.cc.set_secure_config_params(ctx['user_id'], params)
+        self.cc.set_secure_config_params(ctx.get('user_id'), params)
         #END set_secure_config_params
         pass
 
@@ -1397,7 +1397,7 @@ def remove_secure_config_params(self, ctx, params):
         """
         # ctx is the context object
         #BEGIN remove_secure_config_params
-        self.cc.remove_secure_config_params(ctx['user_id'], params)
+        self.cc.remove_secure_config_params(ctx.get('user_id'), params)
         #END remove_secure_config_params
         pass
 
@@ -1418,7 +1418,7 @@ def get_secure_config_params(self, ctx, params):
         # ctx is the context object
         # return variables are: returnVal
         #BEGIN get_secure_config_params
-        returnVal = self.cc.get_secure_config_params(ctx['user_id'], params)
+        returnVal = self.cc.get_secure_config_params(ctx.get('user_id'), params)
         #END get_secure_config_params
 
         # At some point might do deeper type checking...

diff --git a/lib/biokbase/catalog/controller.py b/lib/biokbase/catalog/controller.py
@@ -1445,7 +1445,7 @@ def list_volume_mounts(self, username, filter):
 
 
     def set_secure_config_params(self, username, params):
-        if not self.is_admin(username):
+        if username is None or not self.is_admin(username):
             raise ValueError('You do not have permission to work with hidden configuration ' +
                              'parameters.')
 
@@ -1458,7 +1458,7 @@ def set_secure_config_params(self, username, params):
 
 
     def remove_secure_config_params(self, username, params):
-        if not self.is_admin(username):
+        if username is None or not self.is_admin(username):
             raise ValueError('You do not have permission to work with hidden configuration ' +
                              'parameters.')
 
@@ -1471,7 +1471,7 @@ def remove_secure_config_params(self, username, params):
 
 
     def get_secure_config_params(self, username, params):
-        if not self.is_admin(username):
+        if username is None or not self.is_admin(username):
             raise ValueError('You do not have permission to work with hidden configuration ' +
                              'parameters.')