bug fixed & permission management in progress

Author: lunny

templates/base/foot.html

@@ -1 +1 @@
-<div class="container">Copyright @ 2014 GoFtp Authors</div>
+<div class="container">Copyright @ 2014 - 2015 GoFtp Authors</div>

templates/base/nav.html

@@ -10,7 +10,7 @@
                 </a>
                 <a class="hidden-xs logo" href="/">
                     <a class="navbar-brand" href="/">
-                    <img style="height:36px;" src="/img/favicon.png">
+                    <img style="height:36px;" src="/public/img/favicon.png">
                         Go Ftp
                     </a>
                 </a>

templates/login.html

@@ -41,9 +41,12 @@
 	<form class="form-signin" method="post">
       {{.XsrfFormHtml}}
         <h2 class="form-signin-heading">GoFtp管理系统</h2>
+        {{if .Flash.error}}
+  <font style="color:red">{{.Flash.error}}</font>
+  {{end}}
         <input name="name" type="text" class="input-block-level" placeholder="账号">
         <input name="pass" type="password" class="input-block-level" placeholder="密码">
-			<input type="submit" value="登录" class="btn btn-large btn-primary">&nbsp; <font color=red>{{.msg}}</font>
+			<input type="submit" value="登录" class="btn btn-large btn-primary">
 			</form>
 	</div>
 </body>

templates/perm/list.html

@@ -71,7 +71,7 @@
     <thead>
         <th>文件夹</th><th>创建时间</th><th>拥有者</th><th>拥有组</th>
         <th>权限(Owner)</th><th>权限(Group)</th>
-        <th>权限(Others)</th><th>操作</th>
+        <th>权限(Others)</th>
     </thead>
     <tbody>
     {{$parent := .parent}}
@@ -87,9 +87,9 @@
 {{$owner := .Owner}}
 {{$group := .Group}}
 {{if .IsDir}}
-<span class="glyphicon glyphicon-folder-open"></span>&nbsp; <a href="/perm/?path={{$parent}}/{{$name}}">{{$name}}</a>
+<span class="glyphicon glyphicon-folder-open"></span>&nbsp; <a href="/perm/?path={{call $.subPath $name}}">{{$name}}</a>
 {{else}}
-<a href="/down?path={{$parent}}/{{$name}}">{{$name}}</a>
+<a href="/down?path={{call $.subPath $name}}">{{$name}}</a>
 {{end}}</td><td>{{.ModTime}}</td>
 <td><select class="owner" id="owner_{{$name}}">
     {{range $users}}
@@ -107,8 +107,7 @@
 <td><input id="group_r_{{$name}}" class="check" type="checkbox"{{if call $.hasPerm .Mode 4 "r"}} checked{{end}}> r
 <input id="group_w_{{$name}}" class="check" type="checkbox"{{if call $.hasPerm .Mode 5 "w"}} checked{{end}}> w</td>
 <td><input id="other_r_{{$name}}" class="check" type="checkbox"{{if call $.hasPerm .Mode 7 "r"}} checked{{end}}> r
-<input id="other_w_{{$name}}" class="check" type="checkbox"{{if call $.hasPerm .Mode 8 "w"}} checked{{end}}> w</td>
-<td> </td></tr>
+<input id="other_w_{{$name}}" class="check" type="checkbox"{{if call $.hasPerm .Mode 8 "w"}} checked{{end}}> w</td></tr>
 {{end}}
 </tbody>
 </table>

templates/user/chgpass.html

@@ -3,6 +3,11 @@
 
 {{define "body"}}
 <div style="padding:10px;padding-top:60px">
+<div>
+{{if .Flash.info}}
+	<span class="bg-info">{{.Flash.info}}</span>
+{{end}}
+	</div>
     <form class="form-horizontal" method="post">
     	{{.XsrfFormHtml}}
 	<legend>修改密码</legend>

web/actions.go

@@ -1,10 +1,12 @@
 package web
 
 import (
-	"fmt"
+	"io"
+	"net/url"
 
 	"github.com/lunny/tango"
 	"github.com/tango-contrib/binding"
+	"github.com/tango-contrib/flash"
 	"github.com/tango-contrib/renders"
 	"github.com/tango-contrib/session"
 	"github.com/tango-contrib/xsrf"
@@ -34,7 +36,6 @@ func (a *BaseAuthAction) AskLogin() bool {
 
 func (a *BaseAction) IsLogin() bool {
 	id := a.Session.Get("userId")
-	fmt.Println(id)
 	return id != nil
 }
 
@@ -84,11 +85,13 @@ func (a *MainAction) Get() {
 type LoginAction struct {
 	BaseAction
 	xsrf.Checker
+	flash.Flash
 }
 
 func (a *LoginAction) Get() error {
 	return a.Render("login.html", renders.T{
 		"XsrfFormHtml": a.Checker.XsrfFormHtml(),
+		"Flash":        a.Flash.Data(),
 	})
 }
 
@@ -100,19 +103,21 @@ func (a *LoginAction) Post() error {
 	}
 
 	if user.Name == "" || user.Pass == "" {
-		return a.Render("login.html", renders.T{
-			"msg": "用户名或者密码错误",
-		})
+		a.Flash.Set("error", "用户名或者密码错误")
+		a.Redirect("/login")
+		return nil
 	}
 
 	p, err := DB.GetUser(user.Name)
 	if err != nil {
-		return err
+		a.Flash.Set("error", err.Error())
+		a.Redirect("/login")
+		return nil
 	}
 	if p != user.Pass {
-		return a.Render("login.html", renders.T{
-			"msg": "用户名或者密码错误",
-		})
+		a.Flash.Set("error", "用户名或者密码错误")
+		a.Redirect("/login")
+		return nil
 	}
 
 	a.SetLogin(user.Name)
@@ -132,3 +137,29 @@ func (a *LogoutAction) Get() {
 	a.Logout()
 	a.Redirect("/")
 }
+
+type DownAction struct {
+	BaseAuthAction
+}
+
+func (d *DownAction) Get() error {
+	var err error
+	p := d.Form("path")
+	p, err = url.QueryUnescape(p)
+	if err != nil {
+		return err
+	}
+
+	driver, err := Factory.NewDriver()
+	if err != nil {
+		return err
+	}
+
+	_, rd, err := driver.GetFile(p, 0)
+	if err != nil {
+		return err
+	}
+
+	_, err = io.Copy(d.ResponseWriter, rd)
+	return err
+}

web/perm.go

@@ -45,7 +45,9 @@ func (c *PermAction) Get() error {
 	}
 	var pathinfos []server.FileInfo
 	err = driver.ListDir(p, func(f server.FileInfo) error {
-		pathinfos = append(pathinfos, f)
+		if f.Name() != "." {
+			pathinfos = append(pathinfos, f)
+		}
 		return nil
 	})
 	if err != nil {
@@ -69,6 +71,9 @@ func (c *PermAction) Get() error {
 		"hasPerm": hasPerm,
 		"users":   users,
 		"groups":  groups,
+		"subPath": func(subPath string) string {
+			return url.QueryEscape(path.Join(parent, subPath))
+		},
 	})
 }
 

web/user.go

@@ -1,6 +1,7 @@
 package web
 
 import (
+	"github.com/tango-contrib/flash"
 	"github.com/tango-contrib/renders"
 	"github.com/tango-contrib/xsrf"
 )
@@ -33,6 +34,7 @@ func (a *UserAction) Get() error {
 type ChgPassAction struct {
 	UserBaseAction
 	xsrf.Checker
+	flash.Flash
 }
 
 func (c *ChgPassAction) Before() {
@@ -50,6 +52,7 @@ func (c *ChgPassAction) Get() error {
 		"user":         user,
 		"userId":       c.LoginUserId(),
 		"XsrfFormHtml": c.Checker.XsrfFormHtml(),
+		"Flash":        c.Flash.Data(),
 	})
 }
 
@@ -63,6 +66,7 @@ func (c *ChgPassAction) Post() error {
 	if err != nil {
 		return err
 	}
+	c.Flash.Set("info", "修改密码成功")
 	c.Redirect("/user/chgpass")
 	return nil
 }

web/web.go

@@ -7,6 +7,7 @@ import (
 	"github.com/lunny/tango"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/tango-contrib/binding"
+	"github.com/tango-contrib/flash"
 	"github.com/tango-contrib/renders"
 	"github.com/tango-contrib/session"
 	"github.com/tango-contrib/xsrf"
@@ -63,25 +64,31 @@ func Web(listen, static, templates, admin, pass string, tls bool, certFile, keyF
 	adminUser = admin
 
 	t := tango.Classic()
-	t.Use(tango.Static(tango.StaticOptions{
-		RootPath: static,
-	}))
-	t.Use(renders.New(renders.Options{
-		Reload:    true, // if reload when template is changed
-		Directory: templates,
-	}))
-	t.Use(session.New(session.Options{
+	sess := session.New(session.Options{
 		MaxAge: timeout,
-	}))
-	t.Use(auth())
-	t.Use(binding.Bind())
-	t.Use(xsrf.New(timeout))
+	})
+	t.Use(
+		tango.Static(tango.StaticOptions{
+			RootPath: static,
+		}),
+		renders.New(renders.Options{
+			Reload:    true, // if reload when template is changed
+			Directory: templates,
+		}),
+		sess,
+		auth(),
+		binding.Bind(),
+		xsrf.New(timeout),
+		flash.Flashes(sess),
+	)
 
 	t.Get("/", new(MainAction))
 	t.Any("/login", new(LoginAction))
 	t.Get("/logout", new(LogoutAction))
+	t.Get("/down", new(DownAction))
 	t.Group("/user", func(g *tango.Group) {
 		g.Get("/", new(UserAction))
+		g.Any("/chgpass", new(ChgPassAction))
 		g.Any("/add", new(UserAddAction))
 		g.Any("/edit", new(UserEditAction))
 		g.Any("/del", new(UserDelAction))