Paul Fitzpatrick
3 months ago
commit
919cff0398
@ -0,0 +1,18 @@
|
|||||||
|
import {MigrationInterface, QueryRunner, TableColumn} from 'typeorm';
|
||||||
|
|
||||||
|
export class UserLastConnection1713186031023 implements MigrationInterface {
|
||||||
|
|
||||||
|
public async up(queryRunner: QueryRunner): Promise<any> {
|
||||||
|
const sqlite = queryRunner.connection.driver.options.type === 'sqlite';
|
||||||
|
const datetime = sqlite ? "datetime" : "timestamp with time zone";
|
||||||
|
await queryRunner.addColumn('users', new TableColumn({
|
||||||
|
name: 'last_connection_at',
|
||||||
|
type: datetime,
|
||||||
|
isNullable: true
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
public async down(queryRunner: QueryRunner): Promise<any> {
|
||||||
|
await queryRunner.dropColumn('users', 'last_connection_at');
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1 @@
|
|||||||
|
0.9.2
|
||||||
@ -0,0 +1,18 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# This checks out the ext/ directory from the extra repo (e.g.
|
||||||
|
# grist-ee or grist-desktop) depending on the supplied repo name.
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
repo=$1
|
||||||
|
dir=$(dirname $0)
|
||||||
|
ref=$(cat $dir/.$repo-version)
|
||||||
|
|
||||||
|
git clone --branch $ref --depth 1 --filter=tree:0 "https://github.com/gristlabs/$repo"
|
||||||
|
pushd $repo
|
||||||
|
git sparse-checkout set ext
|
||||||
|
git checkout
|
||||||
|
popd
|
||||||
|
mv $repo/ext .
|
||||||
|
rm -rf $repo
|
||||||
@ -0,0 +1,297 @@
|
|||||||
|
# Database
|
||||||
|
|
||||||
|
> [!WARNING]
|
||||||
|
> This documentation is meant to describe the state of the database. The reader should be aware that some undocumented changes may have been done after its last updates, and for this purpose should check the git history of this file.
|
||||||
|
>
|
||||||
|
> Also contributions are welcome! :heart:
|
||||||
|
|
||||||
|
Grist manages two databases:
|
||||||
|
1. The Home Database;
|
||||||
|
2. The Document Database (also known as "the grist document");
|
||||||
|
|
||||||
|
The Home database is responsible for things related to the instance, such as:
|
||||||
|
- the users and the groups registered on the instance,
|
||||||
|
- the billing,
|
||||||
|
- the organisations (also called sites), the workspaces,
|
||||||
|
- the documents' metadata (such as ID, name, or workspace under which it is located);
|
||||||
|
- the access permissions (ACLs) to organisations, workspaces and documents (access to the content of the document is controlled by the document itself);
|
||||||
|
|
||||||
|
A Grist Document contains data such as:
|
||||||
|
- The tables, pages, views data;
|
||||||
|
- The ACL *inside* to access to all or part of tables (rows or columns);
|
||||||
|
|
||||||
|
## The Document Database
|
||||||
|
|
||||||
|
### Inspecting the Document
|
||||||
|
|
||||||
|
A Grist Document (with the `.grist` extension) is actually a SQLite database. You may download a document like [this one](https://api.getgrist.com/o/templates/api/docs/keLK5sVeyfPkxyaXqijz2x/download?template=false&nohistory=false) and inspect its content using a tool such as the `sqlite3` command:
|
||||||
|
|
||||||
|
````
|
||||||
|
$ sqlite3 Flashcards.grist
|
||||||
|
sqlite> .tables
|
||||||
|
Flashcards_Data _grist_TabBar
|
||||||
|
Flashcards_Data_summary_Card_Set _grist_TabItems
|
||||||
|
GristDocTour _grist_TableViews
|
||||||
|
_grist_ACLMemberships _grist_Tables
|
||||||
|
_grist_ACLPrincipals _grist_Tables_column
|
||||||
|
_grist_ACLResources _grist_Triggers
|
||||||
|
_grist_ACLRules _grist_Validations
|
||||||
|
_grist_Attachments _grist_Views
|
||||||
|
_grist_Cells _grist_Views_section
|
||||||
|
_grist_DocInfo _grist_Views_section_field
|
||||||
|
_grist_External_database _gristsys_Action
|
||||||
|
_grist_External_table _gristsys_ActionHistory
|
||||||
|
_grist_Filters _gristsys_ActionHistoryBranch
|
||||||
|
_grist_Imports _gristsys_Action_step
|
||||||
|
_grist_Pages _gristsys_FileInfo
|
||||||
|
_grist_REPL_Hist _gristsys_Files
|
||||||
|
_grist_Shares _gristsys_PluginData
|
||||||
|
````
|
||||||
|
|
||||||
|
:warning: If you want to ensure that you will not alter a document's contents, make a backup copy beforehand.
|
||||||
|
|
||||||
|
### The migrations
|
||||||
|
|
||||||
|
The migrations are handled in the Python sandbox in this code:
|
||||||
|
https://github.com/gristlabs/grist-core/blob/main/sandbox/grist/migrations.py
|
||||||
|
|
||||||
|
For more information, please consult [the documentation for migrations](./migrations.md).
|
||||||
|
|
||||||
|
## The Home Database
|
||||||
|
|
||||||
|
The home database may either be a SQLite or a PostgreSQL database depending on how the Grist instance has been installed. For details, please refer to the `TYPEORM_*` env variables in the [README](https://github.com/gristlabs/grist-core/blob/main/README.md#database-variables).
|
||||||
|
|
||||||
|
Unless otherwise configured, the home database is a SQLite file. In the default Docker image, it is stored at this location: `/persist/home.sqlite3`.
|
||||||
|
|
||||||
|
The schema below is the same (except for minor differences in the column types), regardless of what the database type is.
|
||||||
|
|
||||||
|
### The Schema
|
||||||
|
|
||||||
|
The database schema is the following:
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
> [!NOTE]
|
||||||
|
> For simplicity's sake, we have removed tables related to the billing and to the migrations.
|
||||||
|
|
||||||
|
If you want to generate the above schema by yourself, you may run the following command using [SchemaCrawler](https://www.schemacrawler.com/) ([a docker image is available for a quick run](https://www.schemacrawler.com/docker-image.html)):
|
||||||
|
````bash
|
||||||
|
# You may adapt the --database argument to fit with the actual file name
|
||||||
|
# You may also remove the `--grep-tables` option and all that follows to get the full schema.
|
||||||
|
$ schemacrawler --server=sqlite --database=landing.db --info-level=standard \
|
||||||
|
--portable-names --command=schema --output-format=svg \
|
||||||
|
--output-file=/tmp/graph.svg \
|
||||||
|
--grep-tables="products|billing_accounts|limits|billing_account_managers|activations|migrations" \
|
||||||
|
--invert-match
|
||||||
|
````
|
||||||
|
|
||||||
|
### `orgs` table
|
||||||
|
|
||||||
|
Stores organisations (also called "Team sites") information.
|
||||||
|
|
||||||
|
| Column name | Description |
|
||||||
|
| ------------- | -------------- |
|
||||||
|
| id | The primary key |
|
||||||
|
| name | The name as displayed in the UI |
|
||||||
|
| domain | The part that should be added in the URL |
|
||||||
|
| owner | The id of the user who owns the org |
|
||||||
|
| host | ??? |
|
||||||
|
|
||||||
|
### `workspaces` table
|
||||||
|
|
||||||
|
Stores workspaces information.
|
||||||
|
|
||||||
|
| Column name | Description |
|
||||||
|
| ------------- | -------------- |
|
||||||
|
| id | The primary key |
|
||||||
|
| name | The name as displayed in the UI |
|
||||||
|
| org_id | The organisation to which the workspace belongs |
|
||||||
|
| removed_at | If not null, stores the date when the workspaces has been placed in the trash (it will be hard deleted after 30 days) |
|
||||||
|
|
||||||
|
|
||||||
|
### `docs` table
|
||||||
|
|
||||||
|
Stores document information that is not portable, which means that it does not store the document data nor the ACL rules (see the "Document Database" section).
|
||||||
|
|
||||||
|
| Column name | Description |
|
||||||
|
| ------------- | -------------- |
|
||||||
|
| id | The primary key |
|
||||||
|
| name | The name as displayed in the UI |
|
||||||
|
| workspace_id | The workspace the document belongs to |
|
||||||
|
| is_pinned | Whether the document has been pinned or not |
|
||||||
|
| url_id | Short version of the `id`, as displayed in the URL |
|
||||||
|
| removed_at | If not null, stores the date when the workspaces has been placed in the trash (it will be hard deleted after 30 days) |
|
||||||
|
| options | Serialized options as described in the [DocumentOptions](https://github.com/gristlabs/grist-core/blob/4567fad94787c20f65db68e744c47d5f44b932e4/app/common/UserAPI.ts#L125-L135) interface |
|
||||||
|
| grace_period_start | Specific to getgrist.com (TODO describe it) |
|
||||||
|
| usage | stats about the document (see [DocumentUsage](https://github.com/gristlabs/grist-core/blob/4567fad94787c20f65db68e744c47d5f44b932e4/app/common/DocUsage.ts)) |
|
||||||
|
| trunk_id | If set, the current document is a fork (only from a tutorial), and this column references the original document |
|
||||||
|
| type | If set, the current document is a special one (as specified in [DocumentType](https://github.com/gristlabs/grist-core/blob/4567fad94787c20f65db68e744c47d5f44b932e4/app/common/UserAPI.ts#L123)) |
|
||||||
|
|
||||||
|
### `aliases` table
|
||||||
|
|
||||||
|
Aliases for documents.
|
||||||
|
|
||||||
|
FIXME: What's the difference between `docs.url_id` and `alias.url_id`?
|
||||||
|
|
||||||
|
| Column name | Description |
|
||||||
|
| ------------- | -------------- |
|
||||||
|
| url_id | The URL alias for the doc_id |
|
||||||
|
| org_id | The organisation the document belongs to |
|
||||||
|
| doc_id | The document id |
|
||||||
|
|
||||||
|
### `acl_rules` table
|
||||||
|
|
||||||
|
Permissions to access either a document, workspace or an organisation.
|
||||||
|
|
||||||
|
| Column name | Description |
|
||||||
|
| ------------- | -------------- |
|
||||||
|
| id | The primary key |
|
||||||
|
| permissions | The permissions granted to the group. See below. |
|
||||||
|
| type | Either equals to `ACLRuleOrg`, `ACLRuleWs` or `ACLRuleDoc` |
|
||||||
|
| org_id | The org id associated to this ACL (if set, workspace_id and doc_id are null) |
|
||||||
|
| workspace_id | The workspace id associated to this ACL (if set, doc_id and org_id are null) |
|
||||||
|
| doc_id | The document id associated to this ACL (if set, workspace_id and org_id are null) |
|
||||||
|
| group_id | The group of users for which the ACL applies |
|
||||||
|
|
||||||
|
<a name="acl-permissions"></a>
|
||||||
|
The permissions are stored as an integer which is read in its binary form which allows to make bitwise operations:
|
||||||
|
|
||||||
|
| Name | Value (binary) | Description |
|
||||||
|
| --------------- | --------------- | --------------- |
|
||||||
|
| VIEW | +0b00000001 | can view |
|
||||||
|
| UPDATE | +0b00000010 | can update |
|
||||||
|
| ADD | +0b00000100 | can add |
|
||||||
|
| REMOVE | +0b00001000 | can remove |
|
||||||
|
| SCHEMA_EDIT | +0b00010000 | can change schema of tables |
|
||||||
|
| ACL_EDIT | +0b00100000 | can edit the ACL (docs) or manage the teams (orgs and workspaces) of the resource |
|
||||||
|
| (reserved) | +0b01000000 | (reserved bit for the future) |
|
||||||
|
| PUBLIC | +0b10000000 | virtual bit meaning that the resource is shared publicly (not currently used) |
|
||||||
|
|
||||||
|
You notice that the permissions can be then composed:
|
||||||
|
- EDITOR permissions = `VIEW | UPDATE | ADD | REMOVE` = `0b00000001+0b00000010+0b00000100+0b00001000` = `0b00001111` = `15`
|
||||||
|
- ADMIN permissions = `EDITOR | SCHEMA_EDIT` = `0b00001111+0b00010000` = `0b00011111` = `31`
|
||||||
|
- OWNER permissions = `ADMIN | ACL_EDIT` = `0b00011111+0b00100000` = `0b0011111` = `63`
|
||||||
|
|
||||||
|
For more details about that part, please refer [to the code](https://github.com/gristlabs/grist-core/blob/192e2f36ba77ec67069c58035d35205978b9215e/app/gen-server/lib/Permissions.ts).
|
||||||
|
|
||||||
|
### `secrets` table
|
||||||
|
|
||||||
|
Stores secret informations related to documents, so the document may not store them (otherwise someone who downloads a doc may access them). Used to store the unsubscribe key and the target url of Webhooks.
|
||||||
|
|
||||||
|
| Column name | Description |
|
||||||
|
| ------------- | -------------- |
|
||||||
|
| id | The primary key |
|
||||||
|
| value | The value of the secret (despite the table name, its stored unencrypted) |
|
||||||
|
| doc_id | The document id |
|
||||||
|
|
||||||
|
### `prefs` table
|
||||||
|
|
||||||
|
Stores special grants for documents for anyone having the key.
|
||||||
|
|
||||||
|
| Column name | Description |
|
||||||
|
| ------------- | -------------- |
|
||||||
|
| id | The primary key |
|
||||||
|
| key | A long string secret to identify the share. Suitable for URLs. Unique across the database / installation. |
|
||||||
|
| link_id | A string to identify the share. This identifier is common to the home database and the document specified by docId. It need only be unique within that document, and is not a secret. | doc_id | The document to which the share belongs |
|
||||||
|
| options | Any overall qualifiers on the share |
|
||||||
|
|
||||||
|
For more information, please refer [to the comments in the code](https://github.com/gristlabs/grist-core/blob/192e2f36ba77ec67069c58035d35205978b9215e/app/gen-server/entity/Share.ts).
|
||||||
|
|
||||||
|
### `groups` table
|
||||||
|
|
||||||
|
The groups are entities that may contain either other groups and/or users.
|
||||||
|
|
||||||
|
| Column name | Description |
|
||||||
|
|--------------- | --------------- |
|
||||||
|
| id | The primary key |
|
||||||
|
| name | The name (see the 5 types of groups below) |
|
||||||
|
|
||||||
|
Only 5 types of groups exist, which corresponds actually to Roles (for the permissions, please refer to the [ACL rules permissions details](#acl-permissions)):
|
||||||
|
- `owners` (see the `OWNERS` permissions)
|
||||||
|
- `editors` (see the `EDITORS` permissions)
|
||||||
|
- `viewers` (see the `VIEWS` permissions)
|
||||||
|
- `members`
|
||||||
|
- `guests`
|
||||||
|
|
||||||
|
`viewers`, `members` and `guests` have basically the same rights (like viewers), the only difference between them is that:
|
||||||
|
- `viewers` are explicitly allowed to view the resource and its descendants;
|
||||||
|
- `members` are specific to the organisations and are meant to allow access to be granted to individual documents or workspaces, rather than the full team site.
|
||||||
|
- `guests` are (FIXME: help please on this one :))
|
||||||
|
|
||||||
|
Each time a resource is created, the groups corresponding to the roles above are created (except the `members` which are specific to organisations).
|
||||||
|
|
||||||
|
### `group_groups` table
|
||||||
|
|
||||||
|
The table which allows groups to contain other groups. It is also used for the inheritance mechanism (see below).
|
||||||
|
|
||||||
|
| Column name | Description |
|
||||||
|
|--------------- | --------------- |
|
||||||
|
| group_id | The id of the group containing the subgroup |
|
||||||
|
| subgroup_id | The id of the subgroup |
|
||||||
|
|
||||||
|
### `group_users` table
|
||||||
|
|
||||||
|
The table which assigns users to groups.
|
||||||
|
|
||||||
|
| Column name | Description |
|
||||||
|
|--------------- | --------------- |
|
||||||
|
| group_id | The id of the group containing the user |
|
||||||
|
| user_id | The id of the user |
|
||||||
|
|
||||||
|
### `groups`, `group_groups`, `group_users` and inheritances
|
||||||
|
|
||||||
|
We mentioned earlier that the groups currently holds the roles with the associated permissions.
|
||||||
|
|
||||||
|
The database stores the inheritances of rights as described below.
|
||||||
|
|
||||||
|
Let's imagine that a user is granted the role of *Owner* for the "Org1" organisation, s/he therefore belongs to the group "Org1 Owners" (whose ID is `id_org1_owner_grp`) which also belongs to the "WS1 Owners" (whose ID is `id_ws1_owner_grp`) by default. In other words, this user is by default owner of both the Org1 organization and of the WS1 workspace.
|
||||||
|
|
||||||
|
The below schema illustrates both the inheritance of between the groups and the state of the database:
|
||||||
|
|
||||||
|
 <!-- Use diagrams.net and import ./images/BDD.drawio to edit this image -->
|
||||||
|
|
||||||
|
This inheritance can be changed through the Users management popup in the Contextual Menu for the Workspaces:
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
If you change the inherit access to "View Only", here is what happens:
|
||||||
|
|
||||||
|
 <!-- Use diagrams.net and import ./images/BDD.drawio to edit this image -->
|
||||||
|
|
||||||
|
The Org1 owners now belongs to the "WS1 Viewers" group, and the user despite being *Owner* of "Org1" can only view the workspace WS1 and its documents because s/he only gets the Viewer role for this workspace. Regarding the database, `group_groups` which holds the group inheritance has been updated, so the parent group for `id_org1_owner_grp` is now `id_ws1_viewers_grp`.
|
||||||
|
|
||||||
|
### `users` table
|
||||||
|
|
||||||
|
Stores `users` information.
|
||||||
|
|
||||||
|
| Column name | Description |
|
||||||
|
|--------------- | --------------- |
|
||||||
|
| id | The primary key |
|
||||||
|
| name | The user's name |
|
||||||
|
| api_key | If generated, the [HTTP API Key](https://support.getgrist.com/rest-api/) used to authenticate the user |
|
||||||
|
| picture | The URL to the user's picture (must be provided by the SSO Identity Provider) |
|
||||||
|
| first_login_at | The date of the first login |
|
||||||
|
| is_first_time_user | Whether the user discovers Grist (used to trigger the Welcome Tour) |
|
||||||
|
| options | Serialized options as described in [UserOptions](https://github.com/gristlabs/grist-core/blob/513e13e6ab57c918c0e396b1d56686e45644ee1a/app/common/UserAPI.ts#L169-L179) interface |
|
||||||
|
| connect_id | Used by [GristConnect](https://github.com/gristlabs/grist-ee/blob/5ae19a7dfb436c8a3d67470b993076e51cf83f21/ext/app/server/lib/GristConnect.ts) in Enterprise Edition to identify user in external provider |
|
||||||
|
| ref | Used to identify a user in the automated tests |
|
||||||
|
|
||||||
|
### `logins` table
|
||||||
|
|
||||||
|
Stores information related to the identification.
|
||||||
|
|
||||||
|
> [!NOTE]
|
||||||
|
> A user may have many `logins` records associated to him/her, like several emails used for identification.
|
||||||
|
|
||||||
|
|
||||||
|
| Column name | Description |
|
||||||
|
|--------------- | --------------- |
|
||||||
|
| id | The primary key |
|
||||||
|
| user_id | The user's id |
|
||||||
|
| email | The normalized email address used for equality and indexing (specifically converted to lower case) |
|
||||||
|
| display_email | The user's email address as displayed in the UI |
|
||||||
|
|
||||||
|
### The migrations
|
||||||
|
|
||||||
|
The database migrations are handled by TypeORM ([documentation](https://typeorm.io/migrations)). The migration files are located at `app/gen-server/migration` and are run at startup (so you don't have to worry about running them yourself).
|
||||||
|
|
||||||
|
After Width: | Height: | Size: 238 KiB |
|
After Width: | Height: | Size: 191 KiB |
@ -0,0 +1,234 @@
|
|||||||
|
<mxfile host="app.diagrams.net" modified="2024-05-03T07:57:06.222Z" agent="Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/115.0" etag="d5mpqxfjE_YjavJEgyO5" version="24.3.1" type="device" pages="2">
|
||||||
|
<diagram name="doc - Inheritance : default" id="HMcLKXGEOIWPtuluTPJ-">
|
||||||
|
<mxGraphModel dx="1654" dy="872" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
|
||||||
|
<root>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-0" />
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-1" parent="uSf0n1dOcknmwi0iKCrK-0" />
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-2" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="uSf0n1dOcknmwi0iKCrK-1" source="uSf0n1dOcknmwi0iKCrK-3" target="uSf0n1dOcknmwi0iKCrK-4" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-3" value="Org1" style="rounded=0;whiteSpace=wrap;html=1;" parent="uSf0n1dOcknmwi0iKCrK-1" vertex="1">
|
||||||
|
<mxGeometry x="109" y="493.5" width="120" height="60" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-4" value="Workspace1" style="rounded=0;whiteSpace=wrap;html=1;" parent="uSf0n1dOcknmwi0iKCrK-1" vertex="1">
|
||||||
|
<mxGeometry x="109" y="317" width="120" height="60" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-12" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="uSf0n1dOcknmwi0iKCrK-1" source="uSf0n1dOcknmwi0iKCrK-6" target="uSf0n1dOcknmwi0iKCrK-10" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-20" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;entryPerimeter=0;" parent="uSf0n1dOcknmwi0iKCrK-1" source="uSf0n1dOcknmwi0iKCrK-22" target="uSf0n1dOcknmwi0iKCrK-6" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry">
|
||||||
|
<Array as="points">
|
||||||
|
<mxPoint x="459" y="595" />
|
||||||
|
<mxPoint x="548" y="595" />
|
||||||
|
</Array>
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-21" value="" style="group;fontSize=16;" parent="uSf0n1dOcknmwi0iKCrK-1" vertex="1" connectable="0">
|
||||||
|
<mxGeometry x="437.5" y="611" width="43" height="65" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-22" value="Some user" style="html=1;verticalLabelPosition=bottom;align=center;labelBackgroundColor=#ffffff;verticalAlign=top;strokeWidth=2;strokeColor=#0080F0;shadow=0;dashed=0;shape=mxgraph.ios7.icons.user;" parent="uSf0n1dOcknmwi0iKCrK-21" vertex="1">
|
||||||
|
<mxGeometry x="6.5" y="35" width="30" height="30" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-24" value="group_users" style="shape=table;startSize=30;container=1;collapsible=0;childLayout=tableLayout;strokeColor=default;fontSize=16;fontStyle=1" parent="uSf0n1dOcknmwi0iKCrK-1" vertex="1">
|
||||||
|
<mxGeometry x="713" y="593" width="359" height="118" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-25" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;strokeColor=inherit;top=0;left=0;bottom=0;right=0;collapsible=0;dropTarget=0;fillColor=none;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=16;" parent="uSf0n1dOcknmwi0iKCrK-24" vertex="1">
|
||||||
|
<mxGeometry y="30" width="359" height="44" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-26" value="<b>group_id</b>" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;strokeColor=inherit;overflow=hidden;fillColor=none;top=0;left=0;bottom=0;right=0;pointerEvents=1;fontSize=16;" parent="uSf0n1dOcknmwi0iKCrK-25" vertex="1">
|
||||||
|
<mxGeometry width="179" height="44" as="geometry">
|
||||||
|
<mxRectangle width="179" height="44" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-27" value="<b>user_id</b>" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;strokeColor=inherit;overflow=hidden;fillColor=none;top=0;left=0;bottom=0;right=0;pointerEvents=1;fontSize=16;" parent="uSf0n1dOcknmwi0iKCrK-25" vertex="1">
|
||||||
|
<mxGeometry x="179" width="180" height="44" as="geometry">
|
||||||
|
<mxRectangle width="180" height="44" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-28" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;strokeColor=inherit;top=0;left=0;bottom=0;right=0;collapsible=0;dropTarget=0;fillColor=none;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=16;" parent="uSf0n1dOcknmwi0iKCrK-24" vertex="1">
|
||||||
|
<mxGeometry y="74" width="359" height="44" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-29" value="id_org1_owner_grp" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;strokeColor=inherit;overflow=hidden;fillColor=none;top=0;left=0;bottom=0;right=0;pointerEvents=1;fontSize=16;" parent="uSf0n1dOcknmwi0iKCrK-28" vertex="1">
|
||||||
|
<mxGeometry width="179" height="44" as="geometry">
|
||||||
|
<mxRectangle width="179" height="44" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-30" value="id_some_user" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;strokeColor=inherit;overflow=hidden;fillColor=none;top=0;left=0;bottom=0;right=0;pointerEvents=1;fontSize=16;" parent="uSf0n1dOcknmwi0iKCrK-28" vertex="1">
|
||||||
|
<mxGeometry x="179" width="180" height="44" as="geometry">
|
||||||
|
<mxRectangle width="180" height="44" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-31" value="group_groups" style="shape=table;startSize=30;container=1;collapsible=0;childLayout=tableLayout;strokeColor=default;fontSize=16;fontStyle=1" parent="uSf0n1dOcknmwi0iKCrK-1" vertex="1">
|
||||||
|
<mxGeometry x="711" y="288" width="359" height="118" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-32" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;strokeColor=inherit;top=0;left=0;bottom=0;right=0;collapsible=0;dropTarget=0;fillColor=none;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=16;" parent="uSf0n1dOcknmwi0iKCrK-31" vertex="1">
|
||||||
|
<mxGeometry y="30" width="359" height="44" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-33" value="<b>group_id</b>" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;strokeColor=inherit;overflow=hidden;fillColor=none;top=0;left=0;bottom=0;right=0;pointerEvents=1;fontSize=16;" parent="uSf0n1dOcknmwi0iKCrK-32" vertex="1">
|
||||||
|
<mxGeometry width="179" height="44" as="geometry">
|
||||||
|
<mxRectangle width="179" height="44" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-34" value="<b>subgroup_id</b>" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;strokeColor=inherit;overflow=hidden;fillColor=none;top=0;left=0;bottom=0;right=0;pointerEvents=1;fontSize=16;" parent="uSf0n1dOcknmwi0iKCrK-32" vertex="1">
|
||||||
|
<mxGeometry x="179" width="180" height="44" as="geometry">
|
||||||
|
<mxRectangle width="180" height="44" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-35" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;strokeColor=inherit;top=0;left=0;bottom=0;right=0;collapsible=0;dropTarget=0;fillColor=none;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=16;" parent="uSf0n1dOcknmwi0iKCrK-31" vertex="1">
|
||||||
|
<mxGeometry y="74" width="359" height="44" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-36" value="<div>id_ws1_owner_grp</div>" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;strokeColor=inherit;overflow=hidden;fillColor=none;top=0;left=0;bottom=0;right=0;pointerEvents=1;fontSize=16;" parent="uSf0n1dOcknmwi0iKCrK-35" vertex="1">
|
||||||
|
<mxGeometry width="179" height="44" as="geometry">
|
||||||
|
<mxRectangle width="179" height="44" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-37" value="id_org1_owner_grp" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;strokeColor=inherit;overflow=hidden;fillColor=none;top=0;left=0;bottom=0;right=0;pointerEvents=1;fontSize=16;" parent="uSf0n1dOcknmwi0iKCrK-35" vertex="1">
|
||||||
|
<mxGeometry x="179" width="180" height="44" as="geometry">
|
||||||
|
<mxRectangle width="180" height="44" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-5" value="" style="group;labelBackgroundColor=default;labelBorderColor=none;" parent="uSf0n1dOcknmwi0iKCrK-1" vertex="1" connectable="0">
|
||||||
|
<mxGeometry x="523" y="464" width="50" height="78" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-6" value="<font style="font-size: 16px;">Org1 Owners</font>" style="sketch=0;pointerEvents=1;shadow=0;dashed=0;html=1;strokeColor=none;labelPosition=center;verticalLabelPosition=bottom;verticalAlign=top;align=center;fillColor=#505050;shape=mxgraph.mscae.intune.user_group;labelBackgroundColor=default;spacingTop=9;" parent="uSf0n1dOcknmwi0iKCrK-5" vertex="1">
|
||||||
|
<mxGeometry y="41" width="50" height="37" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-7" value="" style="shape=image;html=1;verticalAlign=top;verticalLabelPosition=bottom;labelBackgroundColor=#ffffff;imageAspect=0;aspect=fixed;image=https://cdn0.iconfinder.com/data/icons/phosphor-fill-vol-2/256/crown-simple-fill-128.png" parent="uSf0n1dOcknmwi0iKCrK-5" vertex="1">
|
||||||
|
<mxGeometry x="3.5" width="43" height="43" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-9" value="" style="group" parent="uSf0n1dOcknmwi0iKCrK-1" vertex="1" connectable="0">
|
||||||
|
<mxGeometry x="523" y="281" width="50" height="83" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-10" value="<div style="font-size: 16px; padding-left: 0px; margin-top: 10px;"><font style="font-size: 16px;"><span style="background-color: rgb(255, 255, 255);">Ws1 Owners</span></font></div>" style="sketch=0;pointerEvents=1;shadow=0;dashed=0;html=1;strokeColor=none;labelPosition=center;verticalLabelPosition=bottom;verticalAlign=top;align=center;fillColor=#505050;shape=mxgraph.mscae.intune.user_group" parent="uSf0n1dOcknmwi0iKCrK-9" vertex="1">
|
||||||
|
<mxGeometry y="46" width="50" height="37" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="uSf0n1dOcknmwi0iKCrK-11" value="" style="shape=image;html=1;verticalAlign=top;verticalLabelPosition=bottom;labelBackgroundColor=#ffffff;imageAspect=0;aspect=fixed;image=https://cdn0.iconfinder.com/data/icons/phosphor-fill-vol-2/256/crown-simple-fill-128.png" parent="uSf0n1dOcknmwi0iKCrK-9" vertex="1">
|
||||||
|
<mxGeometry x="3.5" width="43" height="43" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
</root>
|
||||||
|
</mxGraphModel>
|
||||||
|
</diagram>
|
||||||
|
<diagram name="doc - inheritance : after change" id="ejp4Dg6iXyrIoHg3_VKk">
|
||||||
|
<mxGraphModel dx="1654" dy="872" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
|
||||||
|
<root>
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-0" />
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-1" parent="cy84TbzhjBedF44X58Xk-0" />
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-2" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="cy84TbzhjBedF44X58Xk-1" source="cy84TbzhjBedF44X58Xk-3" target="cy84TbzhjBedF44X58Xk-4" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-3" value="Org1" style="rounded=0;whiteSpace=wrap;html=1;" parent="cy84TbzhjBedF44X58Xk-1" vertex="1">
|
||||||
|
<mxGeometry x="109" y="493.5" width="120" height="60" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-4" value="Workspace1" style="rounded=0;whiteSpace=wrap;html=1;" parent="cy84TbzhjBedF44X58Xk-1" vertex="1">
|
||||||
|
<mxGeometry x="109" y="317" width="120" height="60" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-5" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;dashed=1;" parent="cy84TbzhjBedF44X58Xk-1" source="cy84TbzhjBedF44X58Xk-24" target="cy84TbzhjBedF44X58Xk-27" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;entryPerimeter=0;" parent="cy84TbzhjBedF44X58Xk-1" source="cy84TbzhjBedF44X58Xk-8" target="cy84TbzhjBedF44X58Xk-24" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry">
|
||||||
|
<Array as="points">
|
||||||
|
<mxPoint x="459" y="595" />
|
||||||
|
<mxPoint x="548" y="595" />
|
||||||
|
</Array>
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-7" value="" style="group" parent="cy84TbzhjBedF44X58Xk-1" vertex="1" connectable="0">
|
||||||
|
<mxGeometry x="437.5" y="611" width="43" height="65" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-8" value="Some user" style="html=1;verticalLabelPosition=bottom;align=center;labelBackgroundColor=#ffffff;verticalAlign=top;strokeWidth=2;strokeColor=#0080F0;shadow=0;dashed=0;shape=mxgraph.ios7.icons.user;" parent="cy84TbzhjBedF44X58Xk-7" vertex="1">
|
||||||
|
<mxGeometry x="6.5" y="35" width="30" height="30" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-9" value="group_users" style="shape=table;startSize=30;container=1;collapsible=0;childLayout=tableLayout;strokeColor=default;fontSize=16;fontStyle=1" parent="cy84TbzhjBedF44X58Xk-1" vertex="1">
|
||||||
|
<mxGeometry x="758" y="589" width="359" height="118" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-10" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;strokeColor=inherit;top=0;left=0;bottom=0;right=0;collapsible=0;dropTarget=0;fillColor=none;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=16;" parent="cy84TbzhjBedF44X58Xk-9" vertex="1">
|
||||||
|
<mxGeometry y="30" width="359" height="44" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-11" value="<b>group_id</b>" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;strokeColor=inherit;overflow=hidden;fillColor=none;top=0;left=0;bottom=0;right=0;pointerEvents=1;fontSize=16;" parent="cy84TbzhjBedF44X58Xk-10" vertex="1">
|
||||||
|
<mxGeometry width="179" height="44" as="geometry">
|
||||||
|
<mxRectangle width="179" height="44" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-12" value="<b>user_id</b>" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;strokeColor=inherit;overflow=hidden;fillColor=none;top=0;left=0;bottom=0;right=0;pointerEvents=1;fontSize=16;" parent="cy84TbzhjBedF44X58Xk-10" vertex="1">
|
||||||
|
<mxGeometry x="179" width="180" height="44" as="geometry">
|
||||||
|
<mxRectangle width="180" height="44" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-13" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;strokeColor=inherit;top=0;left=0;bottom=0;right=0;collapsible=0;dropTarget=0;fillColor=none;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=16;" parent="cy84TbzhjBedF44X58Xk-9" vertex="1">
|
||||||
|
<mxGeometry y="74" width="359" height="44" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-14" value="id_org1_owner_grp" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;strokeColor=inherit;overflow=hidden;fillColor=none;top=0;left=0;bottom=0;right=0;pointerEvents=1;fontSize=16;" parent="cy84TbzhjBedF44X58Xk-13" vertex="1">
|
||||||
|
<mxGeometry width="179" height="44" as="geometry">
|
||||||
|
<mxRectangle width="179" height="44" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-15" value="id_some_user" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;strokeColor=inherit;overflow=hidden;fillColor=none;top=0;left=0;bottom=0;right=0;pointerEvents=1;fontSize=16;" parent="cy84TbzhjBedF44X58Xk-13" vertex="1">
|
||||||
|
<mxGeometry x="179" width="180" height="44" as="geometry">
|
||||||
|
<mxRectangle width="180" height="44" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-23" value="" style="group;labelBackgroundColor=default;labelBorderColor=none;" parent="cy84TbzhjBedF44X58Xk-1" vertex="1" connectable="0">
|
||||||
|
<mxGeometry x="523" y="464" width="50" height="78" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-24" value="<font style="font-size: 16px;">Org1 Owners</font>" style="sketch=0;pointerEvents=1;shadow=0;dashed=0;html=1;strokeColor=none;labelPosition=center;verticalLabelPosition=bottom;verticalAlign=top;align=center;fillColor=#505050;shape=mxgraph.mscae.intune.user_group;labelBackgroundColor=default;spacingTop=9;" parent="cy84TbzhjBedF44X58Xk-23" vertex="1">
|
||||||
|
<mxGeometry y="41" width="50" height="37" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-25" value="" style="shape=image;html=1;verticalAlign=top;verticalLabelPosition=bottom;labelBackgroundColor=#ffffff;imageAspect=0;aspect=fixed;image=https://cdn0.iconfinder.com/data/icons/phosphor-fill-vol-2/256/crown-simple-fill-128.png" parent="cy84TbzhjBedF44X58Xk-23" vertex="1">
|
||||||
|
<mxGeometry x="3.5" width="43" height="43" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-26" value="" style="group" parent="cy84TbzhjBedF44X58Xk-1" vertex="1" connectable="0">
|
||||||
|
<mxGeometry x="401" y="281" width="50" height="83" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-27" value="<div style="font-size: 16px; padding-left: 0px; margin-top: 10px;"><font style="font-size: 16px;"><span style="background-color: rgb(255, 255, 255);">Ws1 Owners</span></font></div>" style="sketch=0;pointerEvents=1;shadow=0;dashed=0;html=1;strokeColor=none;labelPosition=center;verticalLabelPosition=bottom;verticalAlign=top;align=center;fillColor=#505050;shape=mxgraph.mscae.intune.user_group" parent="cy84TbzhjBedF44X58Xk-26" vertex="1">
|
||||||
|
<mxGeometry y="46" width="50" height="37" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="cy84TbzhjBedF44X58Xk-28" value="" style="shape=image;html=1;verticalAlign=top;verticalLabelPosition=bottom;labelBackgroundColor=#ffffff;imageAspect=0;aspect=fixed;image=https://cdn0.iconfinder.com/data/icons/phosphor-fill-vol-2/256/crown-simple-fill-128.png" parent="cy84TbzhjBedF44X58Xk-26" vertex="1">
|
||||||
|
<mxGeometry x="3.5" width="43" height="43" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Cej_1C5x5ezJ23L6Zn-K-0" value="" style="shape=image;html=1;verticalAlign=top;verticalLabelPosition=bottom;labelBackgroundColor=#ffffff;imageAspect=0;aspect=fixed;image=https://cdn4.iconfinder.com/data/icons/essentials-72/24/039_-_Cross-128.png" parent="cy84TbzhjBedF44X58Xk-1" vertex="1">
|
||||||
|
<mxGeometry x="406" y="434.5" width="41" height="41" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Cej_1C5x5ezJ23L6Zn-K-2" value="NEW" style="dashed=0;html=1;rounded=1;strokeColor=#6554C0;fontSize=12;align=center;fontStyle=1;strokeWidth=2;fontColor=#6554C0" parent="cy84TbzhjBedF44X58Xk-1" vertex="1">
|
||||||
|
<mxGeometry x="668" y="445" width="50" height="20" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Cej_1C5x5ezJ23L6Zn-K-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="cy84TbzhjBedF44X58Xk-1" source="cy84TbzhjBedF44X58Xk-24" target="Cej_1C5x5ezJ23L6Zn-K-5" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Cej_1C5x5ezJ23L6Zn-K-5" value="<div style="font-size: 16px; padding-left: 0px; margin-top: 10px;"><font style="font-size: 16px;"><span style="background-color: rgb(255, 255, 255);">Ws1 Viewers</span></font></div><div style="font-size: 16px; padding-left: 0px; margin-top: 10px;"><font style="font-size: 16px;"><span style="background-color: rgb(255, 255, 255);"><br></span></font></div>" style="sketch=0;pointerEvents=1;shadow=0;dashed=0;html=1;strokeColor=none;labelPosition=center;verticalLabelPosition=bottom;verticalAlign=top;align=center;fillColor=#505050;shape=mxgraph.mscae.intune.user_group" parent="cy84TbzhjBedF44X58Xk-1" vertex="1">
|
||||||
|
<mxGeometry x="634" y="327" width="50" height="37" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="rRc6SIQjJta77vA1fWc8-0" value="group_groups" style="shape=table;startSize=30;container=1;collapsible=0;childLayout=tableLayout;strokeColor=default;fontSize=16;fontStyle=1" parent="cy84TbzhjBedF44X58Xk-1" vertex="1">
|
||||||
|
<mxGeometry x="758" y="288" width="359" height="118" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="rRc6SIQjJta77vA1fWc8-1" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;strokeColor=inherit;top=0;left=0;bottom=0;right=0;collapsible=0;dropTarget=0;fillColor=none;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=16;" parent="rRc6SIQjJta77vA1fWc8-0" vertex="1">
|
||||||
|
<mxGeometry y="30" width="359" height="44" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="rRc6SIQjJta77vA1fWc8-2" value="<b>group_id</b>" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;strokeColor=inherit;overflow=hidden;fillColor=none;top=0;left=0;bottom=0;right=0;pointerEvents=1;fontSize=16;" parent="rRc6SIQjJta77vA1fWc8-1" vertex="1">
|
||||||
|
<mxGeometry width="179" height="44" as="geometry">
|
||||||
|
<mxRectangle width="179" height="44" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="rRc6SIQjJta77vA1fWc8-3" value="<b>subgroup_id</b>" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;strokeColor=inherit;overflow=hidden;fillColor=none;top=0;left=0;bottom=0;right=0;pointerEvents=1;fontSize=16;" parent="rRc6SIQjJta77vA1fWc8-1" vertex="1">
|
||||||
|
<mxGeometry x="179" width="180" height="44" as="geometry">
|
||||||
|
<mxRectangle width="180" height="44" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="rRc6SIQjJta77vA1fWc8-4" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;strokeColor=inherit;top=0;left=0;bottom=0;right=0;collapsible=0;dropTarget=0;fillColor=none;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=16;" parent="rRc6SIQjJta77vA1fWc8-0" vertex="1">
|
||||||
|
<mxGeometry y="74" width="359" height="44" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="rRc6SIQjJta77vA1fWc8-5" value="<div><strike><b><font color="#ff3333">id_ws1_owner_grp</font></b></strike></div><b><font color="#00cc00">id_ws1_viewers_grp</font></b>" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;strokeColor=inherit;overflow=hidden;fillColor=none;top=0;left=0;bottom=0;right=0;pointerEvents=1;fontSize=16;" parent="rRc6SIQjJta77vA1fWc8-4" vertex="1">
|
||||||
|
<mxGeometry width="179" height="44" as="geometry">
|
||||||
|
<mxRectangle width="179" height="44" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="rRc6SIQjJta77vA1fWc8-6" value="id_org1_owner_grp" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;strokeColor=inherit;overflow=hidden;fillColor=none;top=0;left=0;bottom=0;right=0;pointerEvents=1;fontSize=16;" parent="rRc6SIQjJta77vA1fWc8-4" vertex="1">
|
||||||
|
<mxGeometry x="179" width="180" height="44" as="geometry">
|
||||||
|
<mxRectangle width="180" height="44" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
</root>
|
||||||
|
</mxGraphModel>
|
||||||
|
</diagram>
|
||||||
|
</mxfile>
|
||||||
|
After Width: | Height: | Size: 56 KiB |
|
After Width: | Height: | Size: 31 KiB |
@ -0,0 +1,40 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -Eeuo pipefail
|
||||||
|
|
||||||
|
# Runs the command provided as arguments, but attempts to configure permissions first.
|
||||||
|
|
||||||
|
important_read_dirs=("/grist" "/persist")
|
||||||
|
write_dir="/persist"
|
||||||
|
current_user_id=$(id -u)
|
||||||
|
|
||||||
|
# We want to avoid running Grist as root if possible.
|
||||||
|
# Try to setup permissions and de-elevate to a normal user.
|
||||||
|
if [[ $current_user_id == 0 ]]; then
|
||||||
|
target_user=${GRIST_DOCKER_USER:-grist}
|
||||||
|
target_group=${GRIST_DOCKER_GROUP:-grist}
|
||||||
|
|
||||||
|
# Make sure the target user owns everything that Grist needs write access to.
|
||||||
|
find $write_dir ! -user "$target_user" -exec chown "$target_user" "{}" +
|
||||||
|
|
||||||
|
# Restart as the target user, replacing the current process (replacement is needed for security).
|
||||||
|
# Alternative tools to setpriv are: chroot, gosu.
|
||||||
|
# Need to use `exec` to close the parent shell, to avoid vulnerabilities: https://github.com/tianon/gosu/issues/37
|
||||||
|
exec setpriv --reuid "$target_user" --regid "$target_group" --init-groups /usr/bin/env bash "$0" "$@"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Validate that this user has access to the top level of each important directory.
|
||||||
|
# There might be a benefit to testing individual files, but this is simpler as the dir may start empty.
|
||||||
|
for dir in "${important_read_dirs[@]}"; do
|
||||||
|
if ! { test -r "$dir" ;} ; then
|
||||||
|
echo "Invalid permissions, cannot read '$dir'. Aborting." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
for dir in "${important_write_dirs[@]}"; do
|
||||||
|
if ! { test -r "$dir" && test -w "$dir" ;} ; then
|
||||||
|
echo "Invalid permissions, cannot write '$dir'. Aborting." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
exec /usr/bin/tini -s -- "$@"
|
||||||
@ -0,0 +1,35 @@
|
|||||||
|
import {spawn} from 'child_process';
|
||||||
|
|
||||||
|
let grist;
|
||||||
|
|
||||||
|
function startGrist(newConfig={}) {
|
||||||
|
saveNewConfig(newConfig);
|
||||||
|
// H/T https://stackoverflow.com/a/36995148/11352427
|
||||||
|
grist = spawn('./sandbox/run.sh', {
|
||||||
|
stdio: ['inherit', 'inherit', 'inherit', 'ipc']
|
||||||
|
});
|
||||||
|
grist.on('message', function(data) {
|
||||||
|
if (data.action === 'restart') {
|
||||||
|
console.log('Restarting Grist with new environment');
|
||||||
|
|
||||||
|
// Note that we only set this event handler here, after we have
|
||||||
|
// a new environment to reload with. Small chance of a race here
|
||||||
|
// in case something else sends a SIGINT before we do it
|
||||||
|
// ourselves further below.
|
||||||
|
grist.on('exit', () => {
|
||||||
|
grist = startGrist(data.newConfig);
|
||||||
|
});
|
||||||
|
|
||||||
|
grist.kill('SIGINT');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return grist;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Stub function
|
||||||
|
function saveNewConfig(newConfig) {
|
||||||
|
// TODO: something here to actually persist the new config before
|
||||||
|
// restarting Grist.
|
||||||
|
}
|
||||||
|
|
||||||
|
startGrist();
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue