This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
Add is_public to groups table to allow for private groups #2582
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
Prevent group API access to non-members for private groups Also make all the group code paths consistent with `requester_user_id` always being the User ID of the requesting user.
erikjohnston
suggested changes
Oct 26, 2017
There was a problem hiding this comment.
PEP8 is sad
synapse/groups/groups_server.py:52:91: E501 line too long (100 > 90 characters)
synapse/groups/groups_server.py:160:91: E501 line too long (100 > 90 characters)
synapse/groups/groups_server.py:163:91: E501 line too long (116 > 90 characters)
synapse/groups/groups_server.py:182:91: E501 line too long (91 > 90 characters)
synapse/groups/groups_server.py:185:91: E501 line too long (116 > 90 characters)
synapse/groups/groups_server.py:223:91: E501 line too long (116 > 90 characters)
synapse/groups/groups_server.py:241:91: E501 line too long (116 > 90 characters)
synapse/groups/groups_server.py:277:91: E501 line too long (116 > 90 characters)
synapse/groups/groups_server.py:296:91: E501 line too long (116 > 90 characters)
synapse/groups/groups_server.py:626:91: E501 line too long (93 > 90 characters)
synapse/groups/groups_server.py:750:91: E501 line too long (97 > 90 characters)
synapse/rest/client/v2_alpha/groups.py:44:91: E501 line too long (100 > 90 characters)
synapse/rest/client/v2_alpha/groups.py:77:91: E501 line too long (100 > 90 characters)
synapse/rest/client/v2_alpha/groups.py:390:91: E501 line too long (98 > 90 characters)
synapse/rest/client/v2_alpha/groups.py:417:91: E501 line too long (93 > 90 characters)
synapse/groups/groups_server.py
Outdated
| @@ -67,6 +67,10 @@ def check_group_is_ours(self, group_id, and_exists=False, and_is_admin=None): | |||
| if and_exists and not group: | |||
| raise SynapseError(404, "Unknown group") | |||
|
|
|||
| is_user_in_group = yield self.store.is_user_in_group(requester_user_id, group_id) | |||
| if is_user_in_group or not group.is_public: | |||
| raise SynapseError(404, "Unknown group") | |||
There was a problem hiding this comment.
We should probably only do this if the group exists, in particular this currently doesn't work well with create_group. (Speaking of which, you forgot to add requester_user_id to create_group, which is why its failing)
There was a problem hiding this comment.
Shouldn't that also be if not is_user_in_group...?
| */ | ||
|
|
||
| -- whether non-members can access group APIs | ||
| ALTER TABLE groups ADD COLUMN is_public BOOL DEFAULT 1 NOT NULL; |
There was a problem hiding this comment.
You'll need to change the schema version in synapse.storage.prepare_database
There was a problem hiding this comment.
You'll need to add this to the scripts/synapse_port_db list of tables with boolean columns
lukebarnard1
force-pushed
the
luke/group-is-public
branch
from
2ca5d07
to
ee730ee
Compare
added 2 commits
October 26, 2017 17:55
Adding a column with non-constant default not possible in sqlite3
lukebarnard1
force-pushed
the
luke/group-is-public
branch
from
ee730ee
to
69e8a05
Compare
erikjohnston
approved these changes
Oct 27, 2017
|
(Ideally we should also add a sytest for this) |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Prevent group API access to non-members for private groups
Also make all the group code paths consistent with
requester_user_idalways being the User ID of the requesting user.