-
Notifications
You must be signed in to change notification settings - Fork 163
Toggle group ownership on projects #4792
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
Changes from all commits
7062548
9bca1b2
934a2fc
0d2b0fe
5a31c92
28fa47f
463fc20
62aa0b8
c1ab282
deed11a
99eee99
b081b2c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -111,7 +111,7 @@ def importable_directories | |
| end | ||
| end | ||
|
|
||
| attr_reader :id, :name, :description, :icon, :directory, :template, :files | ||
| attr_reader :id, :name, :description, :icon, :directory, :template, :files, :group_owner | ||
|
|
||
| validates :name, presence: { message: :required }, on: [:create, :update] | ||
| validates :id, :directory, :icon, presence: { message: :required }, on: [:update] | ||
|
|
@@ -128,6 +128,7 @@ def initialize(attributes = {}) | |
| @directory = attributes[:directory] | ||
| @directory = File.expand_path(@directory) unless @directory.blank? | ||
| @template = attributes[:template] | ||
| @group_owner = attributes[:group_owner] || directory_group_owner | ||
|
|
||
| return if new_record? | ||
|
|
||
|
|
@@ -160,7 +161,7 @@ def save | |
| @directory = Project.dataroot.join(id.to_s).to_s if directory.blank? | ||
| @icon = 'fas://cog' if icon.blank? | ||
|
|
||
| make_dir && update_permission && sync_template && store_manifest(:save) | ||
| make_root && update_permission && make_dir && sync_template && store_manifest(:save) | ||
| end | ||
|
|
||
| def update(attributes) | ||
|
|
@@ -203,6 +204,30 @@ def remove_from_lookup | |
| false | ||
| end | ||
|
|
||
| def private? | ||
| project_dataroot.to_s.start_with?(CurrentUser.home) | ||
| end | ||
|
|
||
| def directory_group_owner | ||
| if project_dataroot != Project.dataroot && project_dataroot.grpowned? | ||
| Etc.getgrgid(project_dataroot.stat.gid).name | ||
| else | ||
| nil | ||
| end | ||
| end | ||
|
|
||
| def chgrp_directory | ||
| return true if private? || group_owner == directory_group_owner | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
I already thought of this and covered that case here. While some client-side js might make this more clear to the end user, we at least keep them safe from actually doing it.
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yea I think we should just reinforce it for the end user - or we'll get questions about why the value they supply does nothing. |
||
|
|
||
| begin | ||
| group_gid = group_owner.nil? ? nil : Etc.getgrnam(group_owner).gid | ||
| FileUtils.chown(nil, group_gid, project_dataroot) | ||
| rescue StandardError => e | ||
| errors.add(:save, "Unable to set group with error #{e.class}:#{e.message}") | ||
| false | ||
| end | ||
| end | ||
|
|
||
| def editable? | ||
| File.writable?(manifest_path) | ||
| end | ||
|
|
@@ -303,8 +328,15 @@ def update_attrs(attributes) | |
| end | ||
| end | ||
|
|
||
| def make_root | ||
| project_dataroot.mkpath unless project_dataroot.exist? | ||
| true | ||
| rescue StandardError => e | ||
| errors.add(:save, "Failed to initialize project directory: #{e.message}") | ||
| false | ||
| end | ||
|
|
||
| def make_dir | ||
| project_dataroot.mkpath unless project_dataroot.exist? | ||
| configuration_directory.mkpath unless configuration_directory.exist? | ||
| workflow_directory = Workflow.workflow_dir(project_dataroot) | ||
| workflow_directory.mkpath unless workflow_directory.exist? | ||
|
|
@@ -318,7 +350,7 @@ def make_dir | |
|
|
||
| def update_permission | ||
| project_dataroot.chmod(0750) | ||
| true | ||
| chgrp_directory | ||
| rescue StandardError => e | ||
| errors.add(:save, "Failed to update permissions of the directory: #{e.message}") | ||
| false | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.