-
Notifications
You must be signed in to change notification settings - Fork 486
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Set permissions on the Grafana Agent [Flow] folder... #6540
Conversation
…er rather than relying on the parent folder permissions. Signed-off-by: erikbaranowski <[email protected]>
tools/make/packaging.mk
Outdated
"mkdir" -p dist | ||
curl -O https://nsis.sourceforge.io/mediawiki/images/4/4a/AccessControl.zip && unzip AccessControl.zip -d /usr/share/nsis/ && cp /usr/share/nsis/Plugins/i386-unicode/AccessControl.dll /usr/share/nsis/Plugins/x86-unicode/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This can probably be done in the build image instead.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This feels semi reasonable :)
AccessControl::ClearOnFile $INSTDIR "Administrators" "FullAccess" | ||
AccessControl::SetOnFile $INSTDIR "SYSTEM" "FullAccess" | ||
AccessControl::GrantOnFile $INSTDIR "Everyone" "ListDirectory" | ||
AccessControl::GrantOnFile $INSTDIR "Everyone" "GenericExecute" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
GenericExecute sounds scary?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I also hate that GrantOnFile is both file and directory, made me look up the docs on this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested and looks good
…on every build Signed-off-by: erikbaranowski <[email protected]>
…rafana/agent into windows-installer-security-fix
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lgtm
* Set permissions on the folder when installing via the windows installer rather than relying on the parent folder permissions. Signed-off-by: erikbaranowski <[email protected]> --------- Signed-off-by: erikbaranowski <[email protected]> (cherry picked from commit 9e4d3b5)
* Set permissions on the Grafana Agent [Flow] folder... (#6540) * Set permissions on the folder when installing via the windows installer rather than relying on the parent folder permissions. Signed-off-by: erikbaranowski <[email protected]> --------- Signed-off-by: erikbaranowski <[email protected]> (cherry picked from commit 9e4d3b5) * Loader reuse existing nodes on reload (#6288) * Move UpdateBlock from componentNode interface to blockNode interface. This change means that all blockNodes have now the possibility to update their managed block with the update River block content. * Update the loader to update the managed block of a config node on reload if it already existed in the graph. With this optimization, we re-use existing nodes and update them instead of creating a new node. This is especially useful for modules. * add two new tests to check that on reload the config nodes behave as expected * add updateblock to declare node * update loader logic to detect duplicated blocks and reuse already defined blocks * add updateblock to import config node * update changelog * move function and remove unnecessary check (cherry picked from commit 2e9d5a2) * fix(static/metrics/instance): fix duplicate metrics registration panic when recreating the instance (#6608) Signed-off-by: hainenber <[email protected]> (cherry picked from commit 7a61067) * chore(build): upgrade base image to frequently updated ECR-hosted Ubuntu (#6612) Signed-off-by: hainenber <[email protected]> (cherry picked from commit fe513a4) * prepare for 0.40.2 release (#6619) (cherry picked from commit ed54148) * Port promtail changes part 1 (#6559) * Port promtail changes part 1 * changelog (cherry picked from commit 1a642cf) * remove accidentally committed web/ui/build folder * fix issue with cherry-picking CHANGELOG.md * fix bad conflict resolution * fix test which failed due to bad merge conflict resolution * On new windows installs, remove default read permissions from agent c… (#6622) * On new windows installs, remove default read permissions from agent config Signed-off-by: erikbaranowski <[email protected]> * only apply permissions for a new install Signed-off-by: erikbaranowski <[email protected]> * Update CHANGELOG.md Co-authored-by: Robert Fratto <[email protected]> --------- Signed-off-by: erikbaranowski <[email protected]> Co-authored-by: Robert Fratto <[email protected]> (cherry picked from commit e8a3d29) --------- Co-authored-by: Erik Baranowski <[email protected]> Co-authored-by: William Dumont <[email protected]> Co-authored-by: Đỗ Trọng Hải <[email protected]> Co-authored-by: Piotr <[email protected]>
when installing via the windows installer rather than relying on the parent folder permissions.
PR Description
Which issue(s) this PR fixes
Fixes #6522
Notes to the Reviewer
PR Checklist