feat(security): restrict admin actions to IP ranges#46473
Merged
AndyScherzinger merged 3 commits intomasterfrom Jul 22, 2024
Merged
feat(security): restrict admin actions to IP ranges#46473AndyScherzinger merged 3 commits intomasterfrom
AndyScherzinger merged 3 commits intomasterfrom
Conversation
Altahrim
added
2. developing
Altahrim
force-pushed
the
feat/restrict_admin_to_ips
branch
from
71c789d to
5fff029
Compare
kesselb
reviewed
Jul 12, 2024
lib/private/AppFramework/Middleware/Security/Exceptions/AdminIpNotAllowedException.php
Show resolved
Hide resolved
Altahrim
force-pushed
the
feat/restrict_admin_to_ips
branch
from
5fff029 to
741dca0
Compare
nickvergessen
requested changes
Jul 15, 2024
Member
nickvergessen
left a comment
nickvergessen
left a comment
There was a problem hiding this comment.
No in-if assignments please
Altahrim
force-pushed
the
feat/restrict_admin_to_ips
branch
4 times, most recently
from
90da5d8 to
8b24270
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Altahrim
force-pushed
the
feat/restrict_admin_to_ips
branch
5 times, most recently
from
f534588 to
da6dd95
Compare
Altahrim
added
3. to review
nickvergessen
approved these changes
Jul 17, 2024
Member
nickvergessen
left a comment
nickvergessen
left a comment
There was a problem hiding this comment.
Definitely needs documentation, so that other "admin alike endpoints" are aware and can integrate it and use IGroupManager::isAdmin() instead of checking for the admin group.
Altahrim
added
the
pending documentation
Altahrim
force-pushed
the
feat/restrict_admin_to_ips
branch
from
da6dd95 to
d1007db
Compare
nickvergessen
force-pushed
the
feat/restrict_admin_to_ips
branch
from
3391801 to
791b066
Compare
Altahrim
force-pushed
the
feat/restrict_admin_to_ips
branch
3 times, most recently
from
17a6845 to
fb9866d
Compare
Altahrim
force-pushed
the
feat/restrict_admin_to_ips
branch
from
6682c99 to
6cdb1c7
Compare
lib/public/Security/Ip/IFactory.php
Outdated
| * Creates a range from string | ||
| * | ||
| * @since 30.0.0 | ||
| * @throws on invalid range |
Check failure
Code scanning / Psalm
UndefinedDocblockClass
lib/public/Security/Ip/IFactory.php
Outdated
| * Creates a address from string | ||
| * | ||
| * @since 30.0.0 | ||
| * @throws on invalid IP |
Check failure
Code scanning / Psalm
UndefinedDocblockClass
Altahrim
force-pushed
the
feat/restrict_admin_to_ips
branch
from
6cdb1c7 to
e511bab
Compare
Member
lib/private/Server.php
Outdated
|
|
||
| $this->registerAlias(IRemoteAddress::class, RemoteAddress::class); | ||
|
|
||
| $this->registerAlias(\OCP\Security\Ip\Factory::class, \OC\Security\Ip\Factory::class); |
Check failure
Code scanning / Psalm
UndefinedClass
nickvergessen
requested changes
Jul 19, 2024
Altahrim
force-pushed
the
feat/restrict_admin_to_ips
branch
from
e511bab to
07264dd
Compare
Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
…king for "in range" Signed-off-by: Joas Schilling <coding@schilljs.com> Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
Altahrim
force-pushed
the
feat/restrict_admin_to_ips
branch
from
07264dd to
f1d97a3
Compare
nickvergessen
approved these changes
Jul 22, 2024
sorbaugh
approved these changes
Jul 22, 2024
Contributor
|
Cool feature 🎉🎉🎉🎉🎉 I wonder, would it make sense to document this under https://docs.nextcloud.com/server/latest/admin_manual/installation/harden_server.html? |
Member
Yes, exactly there. I think @sorbaugh already discusses this with @Altahrim - we talked about this 30 minutes ago 😁 |
Collaborator
Author
|
Added here: nextcloud/documentation#12059 |
Altahrim
removed
3. to review
Merged
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
Summary
Restrict admin actions to IP ranges
When administrator IP address is not in specified range, all admin actions are hidden/forbidden.
Checklist