Skip to content

Commit 0eb1d11

Browse files
Apply suggestions from code review
Co-authored-by: Ronnie Dutta <[email protected]>
1 parent 982152c commit 0eb1d11

File tree

3 files changed

+22
-22
lines changed

3 files changed

+22
-22
lines changed

src/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
autosummary_imported_members = False
111111

112112
# Mapping to other Sphinx projects we want to import references from.
113-
# NOTE: To work search available references, use:
113+
# NOTE: To search available references, use:
114114
# $ python -m sphinx.ext.intersphinx <url>/objects.inv | less
115115
intersphinx_mapping = {
116116
'rose': (

src/reference/architecture/ui-server.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ permission.
9595
*Authentication* is provided by either `Jupyter Server`_ or `Jupyter Hub`_.
9696

9797
*Authorization* in the `Cylc UI Server`_ is provided by Cylc. In
98-
multi-user mode this allows users to connect to each others UI Servers for
98+
multi-user mode this allows users to connect to each other's UI Servers for
9999
monitoring or control purposes.
100100

101101
For more information on security and configuration see

src/user-guide/sharing-access-to-workflows.rst

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ must be configured:
3636
3. Cylc must be configured with user permissions.
3737

3838
This configuration can all be performed in the same Jupyter / Cylc UI Server
39-
configuration file see :ref:`UI_Server_config` for more details.
39+
configuration file. See :ref:`UI_Server_config` for more details.
4040

4141
.. rubric:: Quick Example:
4242

@@ -46,7 +46,7 @@ configuration file see :ref:`UI_Server_config` for more details.
4646
4747
# 1. Jupyter Hub
4848
# Allow all authenticated users to access, start and stop
49-
# eachothers servers
49+
# each other's servers
5050
c.JupyterHub.load_roles = [
5151
{
5252
"name": "user",
@@ -67,7 +67,7 @@ configuration file see :ref:`UI_Server_config` for more details.
6767
# 3. Cylc
6868
# Delegate permissions to users
6969
c.CylcUIServer.user_authorization = {
70-
# proivide all authenticated users with read-only access to eachothers
70+
# provide all authenticated users with read-only access to each other's
7171
# servers
7272
"*": ["READ"],
7373
}
@@ -83,12 +83,12 @@ Jupyter Hub Authorisation
8383

8484
By default, `Jupyter Hub`_ only allows users to access their own servers.
8585

86-
In order to allow access to other users servers, two scopes must be configured:
86+
In order to allow access to other users' servers, two scopes must be configured:
8787

8888
``access:servers``
89-
Permits us to connect to another users server.
89+
Permits us to connect to another user's server.
9090
``servers``
91-
Permits us to start another users server.
91+
Permits us to start another user's server.
9292

9393
This is done using the
9494
:py:attr:`c.JupyterHub.load_roles <jupyterhub.app.JupyterHub.load_roles>`
@@ -105,7 +105,7 @@ Example:
105105
c.JupyterHub.load_roles = [
106106
{
107107
# allow all authenticated users to access, start and stop
108-
# eachother's servers
108+
# each other's servers
109109
"name": "user",
110110
"scopes": ["self", "access:servers", "servers"],
111111
}
@@ -137,7 +137,7 @@ not on a per-workflow basis.
137137

138138
By default users can only see and interact with their own workflows.
139139

140-
Sites can restrict the permissions which users are allowed to delegate to each
140+
Sites can restrict the permissions that users are allowed to grant each
141141
other and can configure default permissions (see :ref:`site_configuration`).
142142

143143
Authorization is configured by these two configurations:
@@ -170,7 +170,7 @@ Users
170170
There are three methods of identifying a user to grant access to:
171171

172172
``<username>``
173-
Configures permissions for a singe user.
173+
Configures permissions for a single user.
174174
``group:<groupname>``
175175
Configures a user group. For more information, see :ref:`group_support`.
176176
``*``
@@ -180,7 +180,7 @@ There are three methods of identifying a user to grant access to:
180180

181181
.. note::
182182

183-
Using glob patterns (e.g. ``*``) to pattern match user and group names is
183+
Using glob patterns to match user and group names is
184184
not currently supported.
185185

186186

@@ -190,7 +190,7 @@ Permissions
190190
.. TODO: autogenerate this permission list
191191
https://github.com/cylc/cylc-uiserver/issues/466
192192
193-
Permissions can be granted for each Cylc command individually, for convenience
193+
Permissions can be granted for each Cylc command individually. For convenience,
194194
commands are arranged into groups to avoid having to list them individually:
195195

196196
``READ`` (i.e. read-only access)
@@ -238,11 +238,11 @@ commands are arranged into groups to avoid having to list them individually:
238238

239239
To find out more about a command, see the GraphQL or CLI documentation.
240240

241-
By default, users have ``ALL`` permissions for their own workflows and no
242-
permissions to other users workflows.
241+
By default, users have full permissions (``READ``, ``CONTROL`` and ``ALL``) for their own workflows and no
242+
permissions for other users' workflows.
243243

244-
Permissions are additive, so delegating both ``READ`` and ``CONTROL`` would
245-
provide all permission in both groups.
244+
Permissions are additive, so for example, granting ``READ`` and ``CONTROL``
245+
would provide all of the permissions from those two groups.
246246

247247
The ``!`` character can be used to subtract permissions, e.g. delegating
248248
``CONTROL`` and ``!Stop`` would provide all control permissions except stop.
@@ -271,10 +271,10 @@ Examples
271271
In this scenario:
272272

273273
- ``"*"`` represents any authenticated user. They have permission to view all
274-
workflows, and view them on the GUI.
274+
workflows on the GUI.
275275
- ``"group:groupA"`` applies ``CONTROL`` permissions to any member of system
276276
``groupA``.
277-
Note that, since permissions are additive, these users will gain ``READ`` access
277+
Note that, since permissions are inherited, these users will gain ``READ`` access
278278
from the ``"*":["READ"]`` assignment.
279279
- ``"user1"`` will have permission to view workflows, ``pause`` but not ``play``
280280
workflows, even if ``user1`` is a member of the system ``groupA``. This is due
@@ -287,10 +287,10 @@ In this scenario:
287287
Cylc Site Configuration
288288
-----------------------
289289

290-
The :py:attr:`c.CylcUIServer.site authorization
290+
The :py:attr:`c.CylcUIServer.site_authorization
291291
<cylc.uiserver.app.CylcUIServer.site_authorization>` configuration allows sites
292292
to configure sensible defaults and limits for the permissions users can
293-
delegate.
293+
grant.
294294

295295
It takes the form:
296296

@@ -300,7 +300,7 @@ It takes the form:
300300
"<owner>": {
301301
"<user>": {
302302
"default": [],
303-
"limit", []
303+
"limit": []
304304
}
305305
}
306306
}

0 commit comments

Comments
 (0)