Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add post create home hook for eos storage driver #3234

Merged
merged 3 commits into from
Oct 14, 2022
Merged

Add post create home hook for eos storage driver #3234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c01a4d7
add possibility to define a script to run after an home folder has be…
gmgigi96 Sep 13, 2022
231eb16
add changelog
gmgigi96 Oct 13, 2022
d5e600e
fix order of fiels in eos config for saving space in memory
gmgigi96 Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelog/unreleased/post-create-home-hook-eos.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Enhancement: Add post create home hook for eos storage driver

https://github.com/cs3org/reva/pull/3234
6 changes: 6 additions & 0 deletions pkg/storage/utils/eosfs/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@ type Config struct {
// revisions-related operations.
ImpersonateOwnerforRevisions bool `mapstructure:"impersonate_owner_for_revisions"`

// Whether to enable the post create home hook
EnablePostCreateHomeHook bool `mapstructure:"enable_post_create_home_hook"`

// HTTP connections to EOS: max number of idle conns
MaxIdleConns int `mapstructure:"max_idle_conns"`

Expand All @@ -168,4 +171,7 @@ type Config struct {
// TokenExpiry stores in seconds the time after which generated tokens will expire
// Default is 3600
TokenExpiry int

// Path of the script to run after an user home folder has been created
OnPostCreateHomeHook string `mapstructure:"on_post_create_home_hook"`
}
14 changes: 13 additions & 1 deletion pkg/storage/utils/eosfs/eosfs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"io"
"net/url"
"os"
"os/exec"
"path"
"regexp"
"strconv"
Expand Down Expand Up @@ -1478,7 +1479,13 @@ func (fs *eosfs) createNominalHome(ctx context.Context) error {
return err
}

return err
if fs.conf.EnablePostCreateHomeHook {
if err := fs.runPostCreateHomeHook(ctx); err != nil {
return errors.Wrap(err, "eosfs: error running post create home hook")
}
}

return nil
}

func (fs *eosfs) CreateHome(ctx context.Context) error {
Expand All @@ -1497,6 +1504,11 @@ func (fs *eosfs) CreateHome(ctx context.Context) error {
return nil
}

func (fs *eosfs) runPostCreateHomeHook(ctx context.Context) error {
user := ctxpkg.ContextMustGetUser(ctx)
return exec.Command(fs.conf.OnPostCreateHomeHook, user.Username).Run()
}

func (fs *eosfs) createUserDir(ctx context.Context, u *userpb.User, path string, recursiveAttr bool) error {
rootAuth, err := fs.getRootAuth(ctx)
if err != nil {
Expand Down