reactivate before save and after save commands
Former-commit-id: 2dec129907798e92540fb81713a65960a0ede9f5 [formerly a17ec66b7f60d7a51509e7fad5acccca7a20ad94] [formerly 4f39f952b2b3c1351510692fc6ecc1dc6536ddbd [formerly 9f51b1fcb4d297b0bbc2543adedf446cca5e6f8c]] Former-commit-id: 4dede793a862b5a99725b239dad4674b50e1a438 [formerly aac290e2927cd47ce4d773ff00e7c2d368739671] Former-commit-id: 4106fdfa34d0865a18d7fb19706d8fc4ae89495b
This commit is contained in:
227
filemanager.go
227
filemanager.go
@@ -4,12 +4,29 @@
|
||||
package filemanager
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"log"
|
||||
"net/http"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/hacdias/filemanager"
|
||||
"github.com/mholt/caddy"
|
||||
"github.com/mholt/caddy/caddyhttp/httpserver"
|
||||
)
|
||||
|
||||
func init() {
|
||||
caddy.RegisterPlugin("filemanager", caddy.Plugin{
|
||||
ServerType: "http",
|
||||
Action: setup,
|
||||
})
|
||||
}
|
||||
|
||||
// FileManager is an http.Handler that can show a file listing when
|
||||
// directories in the given paths are specified.
|
||||
type FileManager struct {
|
||||
@@ -30,3 +47,213 @@ func (f FileManager) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, err
|
||||
|
||||
return f.Next.ServeHTTP(w, r)
|
||||
}
|
||||
|
||||
// setup configures a new FileManager middleware instance.
|
||||
func setup(c *caddy.Controller) error {
|
||||
configs, err := parse(c)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
httpserver.GetConfig(c).AddMiddleware(func(next httpserver.Handler) httpserver.Handler {
|
||||
return FileManager{Configs: configs, Next: next}
|
||||
})
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func parse(c *caddy.Controller) ([]*filemanager.FileManager, error) {
|
||||
var (
|
||||
configs []*filemanager.FileManager
|
||||
err error
|
||||
)
|
||||
|
||||
for c.Next() {
|
||||
var (
|
||||
m = filemanager.New(".")
|
||||
u = m.User
|
||||
name = ""
|
||||
)
|
||||
|
||||
// Get the baseURL
|
||||
args := c.RemainingArgs()
|
||||
|
||||
if len(args) > 0 {
|
||||
m.SetBaseURL(args[0])
|
||||
m.SetWebDavURL("/webdav")
|
||||
}
|
||||
|
||||
for c.NextBlock() {
|
||||
switch c.Val() {
|
||||
case "before_save":
|
||||
if m.BeforeSave, err = CommandRunner(c); err != nil {
|
||||
return configs, err
|
||||
}
|
||||
case "after_save":
|
||||
if m.AfterSave, err = CommandRunner(c); err != nil {
|
||||
return configs, err
|
||||
}
|
||||
case "webdav":
|
||||
if !c.NextArg() {
|
||||
return configs, c.ArgErr()
|
||||
}
|
||||
|
||||
m.SetWebDavURL(c.Val())
|
||||
case "show":
|
||||
if !c.NextArg() {
|
||||
return configs, c.ArgErr()
|
||||
}
|
||||
|
||||
m.SetScope(c.Val(), name)
|
||||
case "styles":
|
||||
if !c.NextArg() {
|
||||
return configs, c.ArgErr()
|
||||
}
|
||||
|
||||
var tplBytes []byte
|
||||
tplBytes, err = ioutil.ReadFile(c.Val())
|
||||
if err != nil {
|
||||
return configs, err
|
||||
}
|
||||
|
||||
u.StyleSheet = string(tplBytes)
|
||||
case "allow_new":
|
||||
if !c.NextArg() {
|
||||
return configs, c.ArgErr()
|
||||
}
|
||||
|
||||
u.AllowNew, err = strconv.ParseBool(c.Val())
|
||||
if err != nil {
|
||||
return configs, err
|
||||
}
|
||||
case "allow_edit":
|
||||
if !c.NextArg() {
|
||||
return configs, c.ArgErr()
|
||||
}
|
||||
|
||||
u.AllowEdit, err = strconv.ParseBool(c.Val())
|
||||
if err != nil {
|
||||
return configs, err
|
||||
}
|
||||
case "allow_commands":
|
||||
if !c.NextArg() {
|
||||
return configs, c.ArgErr()
|
||||
}
|
||||
|
||||
u.AllowCommands, err = strconv.ParseBool(c.Val())
|
||||
if err != nil {
|
||||
return configs, err
|
||||
}
|
||||
case "allow_command":
|
||||
if !c.NextArg() {
|
||||
return configs, c.ArgErr()
|
||||
}
|
||||
|
||||
u.Commands = append(u.Commands, c.Val())
|
||||
case "block_command":
|
||||
if !c.NextArg() {
|
||||
return configs, c.ArgErr()
|
||||
}
|
||||
|
||||
index := 0
|
||||
|
||||
for i, val := range u.Commands {
|
||||
if val == c.Val() {
|
||||
index = i
|
||||
}
|
||||
}
|
||||
|
||||
u.Commands = append(u.Commands[:index], u.Commands[index+1:]...)
|
||||
case "allow", "allow_r", "block", "block_r":
|
||||
ruleType := c.Val()
|
||||
|
||||
if !c.NextArg() {
|
||||
return configs, c.ArgErr()
|
||||
}
|
||||
|
||||
if c.Val() == "dotfiles" && !strings.HasSuffix(ruleType, "_r") {
|
||||
ruleType += "_r"
|
||||
}
|
||||
|
||||
rule := &filemanager.Rule{
|
||||
Allow: ruleType == "allow" || ruleType == "allow_r",
|
||||
Regex: ruleType == "allow_r" || ruleType == "block_r",
|
||||
}
|
||||
|
||||
if rule.Regex && c.Val() == "dotfiles" {
|
||||
rule.Regexp = regexp.MustCompile("\\/\\..+")
|
||||
} else if rule.Regex {
|
||||
rule.Regexp = regexp.MustCompile(c.Val())
|
||||
} else {
|
||||
rule.Path = c.Val()
|
||||
}
|
||||
|
||||
u.Rules = append(u.Rules, rule)
|
||||
default:
|
||||
// Is it a new user? Is it?
|
||||
val := c.Val()
|
||||
|
||||
// Checks if it's a new user!
|
||||
if !strings.HasSuffix(val, ":") {
|
||||
fmt.Println("Unknown option " + val)
|
||||
}
|
||||
|
||||
// Get the username, sets the current user, and initializes it
|
||||
val = strings.TrimSuffix(val, ":")
|
||||
m.NewUser(val)
|
||||
name = val
|
||||
}
|
||||
}
|
||||
|
||||
configs = append(configs, m)
|
||||
}
|
||||
|
||||
return configs, nil
|
||||
}
|
||||
|
||||
// CommandRunner ...
|
||||
func CommandRunner(c *caddy.Controller) (filemanager.Command, error) {
|
||||
fn := func(r *http.Request, c *filemanager.FileManager, u *filemanager.User) error { return nil }
|
||||
|
||||
args := c.RemainingArgs()
|
||||
if len(args) == 0 {
|
||||
return fn, c.ArgErr()
|
||||
}
|
||||
|
||||
nonblock := false
|
||||
if len(args) > 1 && args[len(args)-1] == "&" {
|
||||
// Run command in background; non-blocking
|
||||
nonblock = true
|
||||
args = args[:len(args)-1]
|
||||
}
|
||||
|
||||
command, args, err := caddy.SplitCommandAndArgs(strings.Join(args, " "))
|
||||
if err != nil {
|
||||
return fn, c.Err(err.Error())
|
||||
}
|
||||
|
||||
fn = func(r *http.Request, c *filemanager.FileManager, u *filemanager.User) error {
|
||||
path := strings.Replace(r.URL.Path, c.WebDavURL, "", 1)
|
||||
path = u.Scope() + "/" + path
|
||||
path = filepath.Clean(path)
|
||||
|
||||
for i := range args {
|
||||
args[i] = strings.Replace(args[i], "{path}", path, -1)
|
||||
}
|
||||
|
||||
cmd := exec.Command(command, args...)
|
||||
cmd.Stdin = os.Stdin
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
|
||||
if nonblock {
|
||||
log.Printf("[INFO] Nonblocking Command:\"%s %s\"", command, strings.Join(args, " "))
|
||||
return cmd.Start()
|
||||
}
|
||||
|
||||
log.Printf("[INFO] Blocking Command:\"%s %s\"", command, strings.Join(args, " "))
|
||||
return cmd.Run()
|
||||
}
|
||||
|
||||
return fn, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user