Auth tidy #613
Merged
Auth tidy #613
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Blacken code. * Put permissions in order. * Add comments. * Use Google-style docstrings.
* Rationalise the configuration object type earlier. * This avoids managing multiple data types throughout the code.
* Replace the `owner_user_info` dictionary (which contained two keys, one of which was duplicated) into variables. * This removes unnecessary dictionary lookups, the potential for key errors and makes typing easier.
* Also add tests covering the snake/camel case calling of the is_permitted interface.
markgrahamdawson
approved these changes
Jul 9, 2024
wxtim
approved these changes
Jul 10, 2024
MetRonnie
reviewed
Jul 12, 2024
Comment on lines
-551
to
+552
| self.config.CylcUIServer.user_authorization, | ||
| self.config.CylcUIServer.site_authorization, | ||
| self.log | ||
| self.config.CylcUIServer.user_authorization.to_dict(), | ||
| self.config.CylcUIServer.site_authorization.to_dict(), |
There was a problem hiding this comment.
I have just pulled and now getting an error when accessing cylc hub
[W 2024-07-12 14:51:13.403 CylcHubApp manager:363] cylc.uiserver | extension failed loading with message: AttributeError("'dict' object has no attribute 'to_dict'")
Traceback (most recent call last):
File "~/.conda/envs/cylc8/lib/python3.11/site-packages/jupyter_server/extension/manager.py", line 359, in load_extension
extension.load_all_points(self.serverapp)
File "~/.conda/envs/cylc8/lib/python3.11/site-packages/jupyter_server/extension/manager.py", line 231, in load_all_points
return [self.load_point(point_name, serverapp) for point_name in self.extension_points]
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "~/.conda/envs/cylc8/lib/python3.11/site-packages/jupyter_server/extension/manager.py", line 231, in <listcomp>
return [self.load_point(point_name, serverapp) for point_name in self.extension_points]
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "~/.conda/envs/cylc8/lib/python3.11/site-packages/jupyter_server/extension/manager.py", line 222, in load_point
return point.load(serverapp)
^^^^^^^^^^^^^^^^^^^^^
File "~/.conda/envs/cylc8/lib/python3.11/site-packages/jupyter_server/extension/manager.py", line 150, in load
return loader(serverapp)
^^^^^^^^^^^^^^^^^
File "~/.conda/envs/cylc8/lib/python3.11/site-packages/jupyter_server/extension/application.py", line 474, in _load_jupyter_server_extension
extension.initialize()
File "~/.conda/envs/cylc8/lib/python3.11/site-packages/jupyter_server/extension/application.py", line 436, in initialize
self._prepare_handlers()
File "~/.conda/envs/cylc8/lib/python3.11/site-packages/jupyter_server/extension/application.py", line 326, in _prepare_handlers
self.initialize_handlers()
File "~/github/cylc-uiserver/cylc/uiserver/app.py", line 464, in initialize_handlers
self.authobj = self.set_auth()
^^^^^^^^^^^^^^^
File "~/github/cylc-uiserver/cylc/uiserver/app.py", line 552, in set_auth
self.config.CylcUIServer.site_authorization.to_dict(),
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AttributeError: 'dict' object has no attribute 'to_dict'
In our site config, c.CylcUIServer.site_authorization is a dict
There was a problem hiding this comment.
I couldn't see a case where this would be a dict, no I know.
I have no idea why using the hub would cause the configuration object to differ, but an easy fix.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(low priority)
Looking into the feasibility of making a change to the auth code.
Before changing anything around, I wanted to get the coverage up.
Overview:
Full details in the individual commit messages (easier to review changes one by one).
As always with auth code changes (even ones like this which shouldn't change any functionality), please extensively test this (note you can use exvcylc17 for this)!
Plz squash merge.
Check List
CONTRIBUTING.mdand added my name as a Code Contributor.setup.cfg(andconda-environment.ymlif present).CHANGES.mdentry included if this is a change that can affect users?.?.xbranch.