feat: add allowedIpRanges widgets config #833
Open
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
Half-Shot
approved these changes
Oct 24, 2023
megheaiulian
force-pushed
the
feat/widgets-allowed-ip-ranges
branch
from
2853bd0
to
93d8dc9
Compare
auto-merge was automatically disabled
October 24, 2023 13:21
Head branch was pushed to by a user without write access
megheaiulian
force-pushed
the
feat/widgets-allowed-ip-ranges
branch
from
7a6c160
to
f31822e
Compare
megheaiulian
force-pushed
the
feat/widgets-allowed-ip-ranges
branch
from
f31822e
to
1bf7673
Compare
megheaiulian
force-pushed
the
feat/widgets-allowed-ip-ranges
branch
from
1bf7673
to
0b52f5d
Compare
Adds `allowedIpRanges` widgets config that can be used specifically allow some ip ranges even if its in `disallowedIpRanges`. Signed-off-by: Iulian Meghea <iulian@plumelo.com>
Co-authored-by: Will Hunt <will@half-shot.uk>
megheaiulian
force-pushed
the
feat/widgets-allowed-ip-ranges
branch
from
0b52f5d
to
be5e734
Compare
Half-Shot
requested changes
Dec 29, 2023
| this.roomSetupWidget = yaml.roomSetupWidget; | ||
| if (yaml.disallowedIpRanges !== undefined && (!Array.isArray(yaml.disallowedIpRanges) || !yaml.disallowedIpRanges.every(s => typeof s === "string"))) { | ||
| throw new ConfigError("widgets.disallowedIpRanges", "must be a string array"); | ||
| } | ||
| if (yaml.allowedIpRanges !== undefined && (!Array.isArray(yaml.allowedIpRanges) || !yaml.allowedIpRanges.every(s => typeof s === "string"))) { |
There was a problem hiding this comment.
N.B. An empty array would skip this, would we allow empty values for allowedIpRanges (effectively blocking the feature entirely, seems a bit pointless :) )
| @@ -40,6 +40,7 @@ export const DefaultConfigRoot: BridgeConfigRoot = { | |||
| roomSetupWidget: { | |||
| addOnInvite: false, | |||
| }, | |||
| allowedIpRanges: [], | |||
There was a problem hiding this comment.
Wondering if we want this to actually show up as a default, because the default value would block everything currently :)
| @@ -39,6 +39,7 @@ widgets: | |||
| # - 2001:db8::/32 | |||
| # - ff00::/8 | |||
| # - fec0::/10 | |||
| # allowedIpRanges: [] | |||
There was a problem hiding this comment.
Ideally we would put in some examples of values here?
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.
Adds
allowedIpRangeswidgets config that can be used specificallyallow some ip ranges even if its in
disallowedIpRanges.