extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2024-11-22 08:23:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmd: handler: privatise & rename variables

Browse Source
This commit is contained in:
Christian Schwarz 2017-09-16 20:27:08 +02:00
parent e3ec093d53
commit cd4e09ebb3
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
cmd/handler.go
View File

@ -33,9 +33,9 @@ type IncrementalTransferRequest struct {
} }
type Handler struct { type Handler struct {
Logger Logger logger Logger
PullACL zfs.DatasetFilter dsf zfs.DatasetFilter
VersionFilter zfs.FilesystemVersionFilter fsvf zfs.FilesystemVersionFilter
} }
func NewHandler(logger Logger, dsfilter zfs.DatasetFilter, snapfilter zfs.FilesystemVersionFilter) (h Handler) { func NewHandler(logger Logger, dsfilter zfs.DatasetFilter, snapfilter zfs.FilesystemVersionFilter) (h Handler) {
@ -64,24 +64,24 @@ func registerEndpoints(server rpc.RPCServer, handler Handler) (err error) {
func (h Handler) HandleFilesystemRequest(r *FilesystemRequest, roots *[]*zfs.DatasetPath) (err error) { func (h Handler) HandleFilesystemRequest(r *FilesystemRequest, roots *[]*zfs.DatasetPath) (err error) {
h.Logger.Printf("handling fsr: %#v", r) h.logger.Printf("handling fsr: %#v", r)
h.Logger.Printf("using PullACL: %#v", h.PullACL) h.logger.Printf("using dsf: %#v", h.dsf)
allowed, err := zfs.ZFSListMapping(h.PullACL) allowed, err := zfs.ZFSListMapping(h.dsf)
if err != nil { if err != nil {
h.Logger.Printf("handle fsr err: %v\n", err) h.logger.Printf("handle fsr err: %v\n", err)
return return
} }
h.Logger.Printf("returning: %#v", allowed) h.logger.Printf("returning: %#v", allowed)
*roots = allowed *roots = allowed
return return
} }
func (h Handler) HandleFilesystemVersionsRequest(r *FilesystemVersionsRequest, versions *[]zfs.FilesystemVersion) (err error) { func (h Handler) HandleFilesystemVersionsRequest(r *FilesystemVersionsRequest, versions *[]zfs.FilesystemVersion) (err error) {
h.Logger.Printf("handling filesystem versions request: %#v", r) h.logger.Printf("handling filesystem versions request: %#v", r)
// allowed to request that? // allowed to request that?
if h.pullACLCheck(r.Filesystem, nil); err != nil { if h.pullACLCheck(r.Filesystem, nil); err != nil {
@ -89,13 +89,13 @@ func (h Handler) HandleFilesystemVersionsRequest(r *FilesystemVersionsRequest, v
} }
// find our versions // find our versions
vs, err := zfs.ZFSListFilesystemVersions(r.Filesystem, h.VersionFilter) vs, err := zfs.ZFSListFilesystemVersions(r.Filesystem, h.fsvf)
if err != nil { if err != nil {
h.Logger.Printf("our versions error: %#v\n", err) h.logger.Printf("our versions error: %#v\n", err)
return return
} }
h.Logger.Printf("our versions: %#v\n", vs) h.logger.Printf("our versions: %#v\n", vs)
*versions = vs *versions = vs
return return
@ -104,16 +104,16 @@ func (h Handler) HandleFilesystemVersionsRequest(r *FilesystemVersionsRequest, v
func (h Handler) HandleInitialTransferRequest(r *InitialTransferRequest, stream *io.Reader) (err error) { func (h Handler) HandleInitialTransferRequest(r *InitialTransferRequest, stream *io.Reader) (err error) {
h.Logger.Printf("handling initial transfer request: %#v", r) h.logger.Printf("handling initial transfer request: %#v", r)
if err = h.pullACLCheck(r.Filesystem, &r.FilesystemVersion); err != nil { if err = h.pullACLCheck(r.Filesystem, &r.FilesystemVersion); err != nil {
return return
} }
h.Logger.Printf("invoking zfs send") h.logger.Printf("invoking zfs send")
s, err := zfs.ZFSSend(r.Filesystem, &r.FilesystemVersion, nil) s, err := zfs.ZFSSend(r.Filesystem, &r.FilesystemVersion, nil)
if err != nil { if err != nil {
h.Logger.Printf("error sending filesystem: %#v", err) h.logger.Printf("error sending filesystem: %#v", err)
} }
*stream = s *stream = s
@ -123,7 +123,7 @@ func (h Handler) HandleInitialTransferRequest(r *InitialTransferRequest, stream
func (h Handler) HandleIncrementalTransferRequest(r *IncrementalTransferRequest, stream *io.Reader) (err error) { func (h Handler) HandleIncrementalTransferRequest(r *IncrementalTransferRequest, stream *io.Reader) (err error) {
h.Logger.Printf("handling incremental transfer request: %#v", r) h.logger.Printf("handling incremental transfer request: %#v", r)
if err = h.pullACLCheck(r.Filesystem, &r.From); err != nil { if err = h.pullACLCheck(r.Filesystem, &r.From); err != nil {
return return
} }
@ -131,11 +131,11 @@ func (h Handler) HandleIncrementalTransferRequest(r *IncrementalTransferRequest,
return return
} }
h.Logger.Printf("invoking zfs send") h.logger.Printf("invoking zfs send")
s, err := zfs.ZFSSend(r.Filesystem, &r.From, &r.To) s, err := zfs.ZFSSend(r.Filesystem, &r.From, &r.To)
if err != nil { if err != nil {
h.Logger.Printf("error sending filesystem: %#v", err) h.logger.Printf("error sending filesystem: %#v", err)
} }
*stream = s *stream = s
@ -145,30 +145,30 @@ func (h Handler) HandleIncrementalTransferRequest(r *IncrementalTransferRequest,
func (h Handler) pullACLCheck(p *zfs.DatasetPath, v *zfs.FilesystemVersion) (err error) { func (h Handler) pullACLCheck(p *zfs.DatasetPath, v *zfs.FilesystemVersion) (err error) {
var fsAllowed, vAllowed bool var fsAllowed, vAllowed bool
fsAllowed, err = h.PullACL.Filter(p) fsAllowed, err = h.dsf.Filter(p)
if err != nil { if err != nil {
err = fmt.Errorf("error evaluating ACL: %s", err) err = fmt.Errorf("error evaluating ACL: %s", err)
h.Logger.Printf(err.Error()) h.logger.Printf(err.Error())
return return
} }
if !fsAllowed { if !fsAllowed {
err = fmt.Errorf("ACL prohibits access to %s", p.ToString()) err = fmt.Errorf("ACL prohibits access to %s", p.ToString())
h.Logger.Printf(err.Error()) h.logger.Printf(err.Error())
return return
} }
if v == nil { if v == nil {
return return
} }
vAllowed, err = h.VersionFilter.Filter(*v) vAllowed, err = h.fsvf.Filter(*v)
if err != nil { if err != nil {
err = errors.Wrap(err, "error evaluating version filter") err = errors.Wrap(err, "error evaluating version filter")
h.Logger.Printf(err.Error()) h.logger.Printf(err.Error())
return return
} }
if !vAllowed { if !vAllowed {
err = fmt.Errorf("ACL prohibits access to %s", v.ToAbsPath(p)) err = fmt.Errorf("ACL prohibits access to %s", v.ToAbsPath(p))
h.Logger.Printf(err.Error()) h.logger.Printf(err.Error())
return return
} }
return return