From 932f717adb1cb1738415fcddaf5eb3c0e4a60fc2 Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Sat, 22 Mar 2014 04:44:57 -0400
Subject: [PATCH 01/19] Fixing bug
---
models/action.go | 10 ++++++++++
models/repo.go | 9 +++++++--
models/user.go | 4 +---
modules/middleware/repo.go | 2 +-
serve.go | 2 +-
5 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/models/action.go b/models/action.go
index 107d4b1057f..89751b97791 100644
--- a/models/action.go
+++ b/models/action.go
@@ -79,6 +79,16 @@ func CommitRepoAction(userId int64, userName string,
})
return err
}
+
+ // Update repository last update time.
+ repo, err := GetRepositoryByName(userId, repoName)
+ if err != nil {
+ return err
+ }
+ repo.Updated = time.Now()
+ if err = UpdateRepository(repo); err != nil {
+ return err
+ }
return nil
}
diff --git a/models/repo.go b/models/repo.go
index 918e5dc84ca..6a764e6c318 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -358,6 +358,11 @@ func RepoPath(userName, repoName string) string {
return filepath.Join(UserPath(userName), repoName+".git")
}
+func UpdateRepository(repo *Repository) error {
+ _, err := orm.Id(repo.Id).UseBool().Update(repo)
+ return err
+}
+
// DeleteRepository deletes a repository for a user or orgnaztion.
func DeleteRepository(userId, repoId int64, userName string) (err error) {
repo := &Repository{Id: repoId, OwnerId: userId}
@@ -402,9 +407,9 @@ func DeleteRepository(userId, repoId int64, userName string) (err error) {
}
// GetRepositoryByName returns the repository by given name under user if exists.
-func GetRepositoryByName(user *User, repoName string) (*Repository, error) {
+func GetRepositoryByName(userId int64, repoName string) (*Repository, error) {
repo := &Repository{
- OwnerId: user.Id,
+ OwnerId: userId,
LowerName: strings.ToLower(repoName),
}
has, err := orm.Get(repo)
diff --git a/models/user.go b/models/user.go
index 3c110912858..d6dc0414907 100644
--- a/models/user.go
+++ b/models/user.go
@@ -279,9 +279,7 @@ func GetUserByName(name string) (*User, error) {
if len(name) == 0 {
return nil, ErrUserNotExist
}
- user := &User{
- LowerName: strings.ToLower(name),
- }
+ user := &User{LowerName: strings.ToLower(name)}
has, err := orm.Get(user)
if err != nil {
return nil, err
diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go
index a9a90e3ff57..3864caaf800 100644
--- a/modules/middleware/repo.go
+++ b/modules/middleware/repo.go
@@ -54,7 +54,7 @@ func RepoAssignment(redirect bool) martini.Handler {
ctx.Repo.Owner = user
// get repository
- repo, err := models.GetRepositoryByName(user, params["reponame"])
+ repo, err := models.GetRepositoryByName(user.Id, params["reponame"])
if err != nil {
if redirect {
ctx.Redirect("/")
diff --git a/serve.go b/serve.go
index 3ce8f9046cb..be8dedc9855 100644
--- a/serve.go
+++ b/serve.go
@@ -86,7 +86,7 @@ func runServ(*cli.Context) {
os.Setenv("userName", user.Name)
os.Setenv("userId", strconv.Itoa(int(user.Id)))
- repo, err := models.GetRepositoryByName(user, repoName)
+ repo, err := models.GetRepositoryByName(user.Id, repoName)
if err != nil {
println("Unavilable repository", err)
return
From 76cd448e7925997b60a54e8d9431ffd0826cc24e Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Sat, 22 Mar 2014 06:20:00 -0400
Subject: [PATCH 02/19] Add admin delete user
---
gogs.go | 2 +-
models/action.go | 6 ++++++
routers/admin/user.go | 35 +++++++++++++++++++++++++++++++++
templates/admin/users/edit.tmpl | 2 +-
web.go | 1 +
5 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/gogs.go b/gogs.go
index 41df79280a1..8ec4fd42f1d 100644
--- a/gogs.go
+++ b/gogs.go
@@ -20,7 +20,7 @@ import (
// Test that go1.2 tag above is included in builds. main.go refers to this definition.
const go12tag = true
-const APP_VER = "0.1.5.0321"
+const APP_VER = "0.1.5.0322"
func init() {
base.AppVer = APP_VER
diff --git a/models/action.go b/models/action.go
index 89751b97791..12122ae240f 100644
--- a/models/action.go
+++ b/models/action.go
@@ -7,6 +7,8 @@ package models
import (
"encoding/json"
"time"
+
+ "github.com/gogits/gogs/modules/log"
)
// Operation types of user action.
@@ -89,6 +91,8 @@ func CommitRepoAction(userId int64, userName string,
if err = UpdateRepository(repo); err != nil {
return err
}
+
+ log.Trace("action.CommitRepoAction: %d/%s", userId, repo.LowerName)
return nil
}
@@ -102,6 +106,8 @@ func NewRepoAction(user *User, repo *Repository) error {
RepoId: repo.Id,
RepoName: repo.Name,
})
+
+ log.Trace("action.NewRepoAction: %s/%s", user.LowerName, repo.LowerName)
return err
}
diff --git a/routers/admin/user.go b/routers/admin/user.go
index d6f85232186..fa27d116648 100644
--- a/routers/admin/user.go
+++ b/routers/admin/user.go
@@ -107,3 +107,38 @@ func EditUser(ctx *middleware.Context, params martini.Params, form auth.AdminEdi
log.Trace("%s User profile updated by admin(%s): %s", ctx.Req.RequestURI,
ctx.User.LowerName, ctx.User.LowerName)
}
+
+func DeleteUser(ctx *middleware.Context, params martini.Params) {
+ ctx.Data["Title"] = "Edit Account"
+ ctx.Data["PageIsUsers"] = true
+
+ uid, err := base.StrTo(params["userid"]).Int()
+ if err != nil {
+ ctx.Handle(200, "admin.user.EditUser", err)
+ return
+ }
+
+ u, err := models.GetUserById(int64(uid))
+ if err != nil {
+ ctx.Handle(200, "admin.user.EditUser", err)
+ return
+ }
+
+ if err = models.DeleteUser(u); err != nil {
+ ctx.Data["HasError"] = true
+ switch err {
+ case models.ErrUserOwnRepos:
+ ctx.Data["ErrorMsg"] = "This account still has ownership of repository, owner has to delete or transfer them first."
+ ctx.Data["User"] = u
+ ctx.HTML(200, "admin/users/edit")
+ default:
+ ctx.Handle(200, "admin.user.DeleteUser", err)
+ }
+ return
+ }
+
+ log.Trace("%s User deleted by admin(%s): %s", ctx.Req.RequestURI,
+ ctx.User.LowerName, ctx.User.LowerName)
+
+ ctx.Redirect("/admin/users", 302)
+}
diff --git a/templates/admin/users/edit.tmpl b/templates/admin/users/edit.tmpl
index 415bcedc92a..2a9882423a8 100644
--- a/templates/admin/users/edit.tmpl
+++ b/templates/admin/users/edit.tmpl
@@ -71,7 +71,7 @@
<div class="form-group">
<div class="col-md-offset-3 col-md-6">
<button type="submit" class="btn btn-lg btn-primary btn-block">Update account profile</button>
- <!-- <a type="button" href="/admin/users/{{.User.Id}}/delete" class="btn btn-lg btn-danger btn-block">Delete this account</a> -->
+ <a type="button" href="/admin/users/{{.User.Id}}/delete" class="btn btn-lg btn-danger btn-block">Delete this account</a>
</div>
</div>
</form>
diff --git a/web.go b/web.go
index bb316a67246..595b8f74ed9 100644
--- a/web.go
+++ b/web.go
@@ -119,6 +119,7 @@ func runWeb(*cli.Context) {
m.Get("/admin/users", reqSignIn, adminReq, admin.Users)
m.Any("/admin/users/new", reqSignIn, adminReq, binding.BindIgnErr(auth.RegisterForm{}), admin.NewUser)
m.Any("/admin/users/:userid", reqSignIn, adminReq, binding.BindIgnErr(auth.AdminEditUserForm{}), admin.EditUser)
+ m.Any("/admin/users/:userid/delete", reqSignIn, adminReq, admin.DeleteUser)
m.Get("/admin/repos", reqSignIn, adminReq, admin.Repositories)
m.Get("/admin/config", reqSignIn, adminReq, admin.Config)
From 7a1ff8636c01844a501dd9cdca2c436d1b7826b7 Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Sat, 22 Mar 2014 06:42:19 -0400
Subject: [PATCH 03/19] Add config option: Picture cache path
---
conf/app.ini | 8 ++++++++
modules/base/conf.go | 8 ++++++++
routers/admin/admin.go | 3 +++
templates/admin/config.tmpl | 12 ++++++++++++
4 files changed, 31 insertions(+)
diff --git a/conf/app.ini b/conf/app.ini
index ecb0d2511f4..cf99c9da09c 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -44,6 +44,8 @@ REGISTER_EMAIL_CONFIRM = false
DISENABLE_REGISTERATION = false
; User must sign in to view anything.
REQUIRE_SIGNIN_VIEW = false
+; Cache avatar as picture
+ENABLE_CACHE_AVATAR = false
[mailer]
ENABLED = false
@@ -70,6 +72,12 @@ INTERVAL = 60
; memcache: "127.0.0.1:11211"
HOST =
+[picture]
+; The place to picture data, either "server" or "qiniu", default is "server"
+SERVICE = server
+; For "server" only, root path of picture data, default is "data/pictures"
+PATH = data/pictures
+
[log]
; Either "console", "file", "conn" or "smtp", default is "console"
MODE = console
diff --git a/modules/base/conf.go b/modules/base/conf.go
index 863daca6445..8c6ee628189 100644
--- a/modules/base/conf.go
+++ b/modules/base/conf.go
@@ -44,6 +44,9 @@ var (
CacheAdapter string
CacheConfig string
+ PictureService string
+ PictureRootPath string
+
LogMode string
LogConfig string
)
@@ -52,6 +55,7 @@ var Service struct {
RegisterEmailConfirm bool
DisenableRegisteration bool
RequireSignInView bool
+ EnableCacheAvatar bool
ActiveCodeLives int
ResetPwdCodeLives int
}
@@ -82,6 +86,7 @@ func newService() {
Service.ResetPwdCodeLives = Cfg.MustInt("service", "RESET_PASSWD_CODE_LIVE_MINUTES", 180)
Service.DisenableRegisteration = Cfg.MustBool("service", "DISENABLE_REGISTERATION", false)
Service.RequireSignInView = Cfg.MustBool("service", "REQUIRE_SIGNIN_VIEW", false)
+ Service.EnableCacheAvatar = Cfg.MustBool("service", "ENABLE_CACHE_AVATAR", false)
}
func newLogService() {
@@ -214,6 +219,9 @@ func NewConfigContext() {
SecretKey = Cfg.MustValue("security", "SECRET_KEY")
RunUser = Cfg.MustValue("", "RUN_USER")
+ PictureService = Cfg.MustValue("picture", "SERVICE")
+ PictureRootPath = Cfg.MustValue("picture", "PATH")
+
// Determine and create root git reposiroty path.
RepoRootPath = Cfg.MustValue("repository", "ROOT")
if err = os.MkdirAll(RepoRootPath, os.ModePerm); err != nil {
diff --git a/routers/admin/admin.go b/routers/admin/admin.go
index 2e19b99c10e..25ed8981e0f 100644
--- a/routers/admin/admin.go
+++ b/routers/admin/admin.go
@@ -70,6 +70,9 @@ func Config(ctx *middleware.Context) {
ctx.Data["CacheAdapter"] = base.CacheAdapter
ctx.Data["CacheConfig"] = base.CacheConfig
+ ctx.Data["PictureService"] = base.PictureService
+ ctx.Data["PictureRootPath"] = base.PictureRootPath
+
ctx.Data["LogMode"] = base.LogMode
ctx.Data["LogConfig"] = base.LogConfig
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index 6906f2409d0..e3f69ee6eab 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -45,6 +45,7 @@
<div><b>Register Email Confirmation:</b> <i class="fa fa{{if .Service.RegisterEmailConfirm}}-check{{end}}-square-o"></i></div>
<div><b>Disenable Registeration:</b> <i class="fa fa{{if .Service.DisenableRegisteration}}-check{{end}}-square-o"></i></div>
<div><b>Require Sign In View:</b> <i class="fa fa{{if .Service.RequireSignInView}}-check{{end}}-square-o"></i></div>
+ <div><b>Enable Cache Avatar:</b> <i class="fa fa{{if .Service.EnableCacheAvatar}}-check{{end}}-square-o"></i></div>
<hr/>
<div><b>Active Code Lives:</b> {{.Service.ActiveCodeLives}} minutes</div>
<div><b>Reset Password Code Lives:</b> {{.Service.ResetPwdCodeLives}} minutes</div>
@@ -76,6 +77,17 @@
</div>
</div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Picture Configuration
+ </div>
+
+ <div class="panel-body">
+ <div><b>Picture Service:</b> {{.PictureService}}</div>
+ <div><b>Picture Root Path:</b> {{.PictureRootPath}}</div>
+ </div>
+ </div>
+
<div class="panel panel-default">
<div class="panel-heading">
Log Configuration
From 0d1872ebe3f11c14f31f454ed8d719a22c0884d0 Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Sat, 22 Mar 2014 07:42:24 -0400
Subject: [PATCH 04/19] Add admin memStatus panel
---
README.md | 3 +-
routers/admin/admin.go | 81 ++++++++++++++++++++++++++++++++++
templates/admin/dashboard.tmpl | 33 +++++++++++++-
3 files changed, 115 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index cbd1f588df5..a9ab7fe4981 100644
--- a/README.md
+++ b/README.md
@@ -42,8 +42,9 @@ There are two ways to install Gogs:
## Acknowledgments
-- Mail service is based on [WeTalk](https://github.com/beego/wetalk).
- Logo is inspired by [martini](https://github.com/martini-contrib).
+- Mail service is based on [WeTalk](https://github.com/beego/wetalk).
+- System Monitor Status is based on [GoBlog](https://github.com/fuxiaohei/goblog).
## Contributors
diff --git a/routers/admin/admin.go b/routers/admin/admin.go
index 25ed8981e0f..57a46d1dfec 100644
--- a/routers/admin/admin.go
+++ b/routers/admin/admin.go
@@ -5,7 +5,10 @@
package admin
import (
+ "fmt"
+ "runtime"
"strings"
+ "time"
"github.com/codegangsta/martini"
@@ -14,10 +17,88 @@ import (
"github.com/gogits/gogs/modules/middleware"
)
+var sysStatus struct {
+ NumGoroutine int
+
+ // General statistics.
+ MemAllocated string // bytes allocated and still in use
+ MemTotal string // bytes allocated (even if freed)
+ MemSys string // bytes obtained from system (sum of XxxSys below)
+ Lookups uint64 // number of pointer lookups
+ MemMallocs uint64 // number of mallocs
+ MemFrees uint64 // number of frees
+
+ // Main allocation heap statistics.
+ HeapAlloc string // bytes allocated and still in use
+ HeapSys string // bytes obtained from system
+ HeapIdle string // bytes in idle spans
+ HeapInuse string // bytes in non-idle span
+ HeapReleased string // bytes released to the OS
+ HeapObjects uint64 // total number of allocated objects
+
+ // Low-level fixed-size structure allocator statistics.
+ // Inuse is bytes used now.
+ // Sys is bytes obtained from system.
+ StackInuse string // bootstrap stacks
+ StackSys string
+ MSpanInuse string // mspan structures
+ MSpanSys string
+ MCacheInuse string // mcache structures
+ MCacheSys string
+ BuckHashSys string // profiling bucket hash table
+ GCSys string // GC metadata
+ OtherSys string // other system allocations
+
+ // Garbage collector statistics.
+ NextGC string // next run in HeapAlloc time (bytes)
+ LastGC string // last run in absolute time (ns)
+ PauseTotalNs string
+ PauseNs string // circular buffer of recent GC pause times, most recent at [(NumGC+255)%256]
+ NumGC uint32
+}
+
+func updateSystemStatus() {
+ m := new(runtime.MemStats)
+ runtime.ReadMemStats(m)
+ sysStatus.NumGoroutine = runtime.NumGoroutine()
+
+ sysStatus.MemAllocated = base.FileSize(int64(m.Alloc))
+ sysStatus.MemTotal = base.FileSize(int64(m.TotalAlloc))
+ sysStatus.MemSys = base.FileSize(int64(m.Sys))
+ sysStatus.Lookups = m.Lookups
+ sysStatus.MemMallocs = m.Mallocs
+ sysStatus.MemFrees = m.Frees
+
+ sysStatus.HeapAlloc = base.FileSize(int64(m.HeapAlloc))
+ sysStatus.HeapSys = base.FileSize(int64(m.HeapSys))
+ sysStatus.HeapIdle = base.FileSize(int64(m.HeapIdle))
+ sysStatus.HeapInuse = base.FileSize(int64(m.HeapInuse))
+ sysStatus.HeapReleased = base.FileSize(int64(m.HeapReleased))
+ sysStatus.HeapObjects = m.HeapObjects
+
+ sysStatus.StackInuse = base.FileSize(int64(m.StackInuse))
+ sysStatus.StackSys = base.FileSize(int64(m.StackSys))
+ sysStatus.MSpanInuse = base.FileSize(int64(m.MSpanInuse))
+ sysStatus.MSpanSys = base.FileSize(int64(m.MSpanSys))
+ sysStatus.MCacheInuse = base.FileSize(int64(m.MCacheInuse))
+ sysStatus.MCacheSys = base.FileSize(int64(m.MCacheSys))
+ sysStatus.BuckHashSys = base.FileSize(int64(m.BuckHashSys))
+ sysStatus.GCSys = base.FileSize(int64(m.GCSys))
+ sysStatus.OtherSys = base.FileSize(int64(m.OtherSys))
+
+ sysStatus.NextGC = base.FileSize(int64(m.NextGC))
+ sysStatus.LastGC = fmt.Sprintf("%.1fs", float64(time.Now().UnixNano()-int64(m.LastGC))/1000/1000/1000)
+ sysStatus.PauseTotalNs = fmt.Sprintf("%.1fs", float64(m.PauseTotalNs/1000/1000/1000))
+ sysStatus.PauseNs = fmt.Sprintf("%.3fs", float64(m.PauseNs[(m.NumGC+255)%256]/1000/1000/1000))
+ sysStatus.NumGC = m.NumGC
+}
+
func Dashboard(ctx *middleware.Context) {
ctx.Data["Title"] = "Admin Dashboard"
ctx.Data["PageIsDashboard"] = true
ctx.Data["Stats"] = models.GetStatistic()
+ updateSystemStatus()
+ ctx.Data["SysStatus"] = sysStatus
ctx.HTML(200, "admin/dashboard")
}
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl
index 6088487d62e..0bebf8318f6 100644
--- a/templates/admin/dashboard.tmpl
+++ b/templates/admin/dashboard.tmpl
@@ -15,10 +15,41 @@
<div class="panel panel-default">
<div class="panel-heading">
- System Status
+ System Monitor Status
</div>
<div class="panel-body">
+ <div>Current Goroutines: <b>{{.SysStatus.NumGoroutine}}</b></div>
+ <hr/>
+ <div>Current Memory Usage: <b>{{.SysStatus.MemAllocated}}</b></div>
+ <div>Total Memory Allocated: <b>{{.SysStatus.MemTotal}}</b></div>
+ <div>Memory Obtained: <b>{{.SysStatus.MemSys}}</b></div>
+ <div>Pointer Lookup Times: <b>{{.SysStatus.Lookups}}</b></div>
+ <div>Memory Allocate Times: <b>{{.SysStatus.MemMallocs}}</b></div>
+ <div>Memory Free Times: <b>{{.SysStatus.MemFrees}}</b></div>
+ <hr/>
+ <div>Current Heap Usage: <b>{{.SysStatus.HeapAlloc}}</b></div>
+ <div>Heap Memory Obtained: <b>{{.SysStatus.HeapSys}}</b></div>
+ <div>Heap Memory Idle: <b>{{.SysStatus.HeapIdle}}</b></div>
+ <div>Heap Memory In Use: <b>{{.SysStatus.HeapInuse}}</b></div>
+ <div>Heap Memory Released: <b>{{.SysStatus.HeapReleased}}</b></div>
+ <div>Heap Objects: <b>{{.SysStatus.HeapObjects}}</b></div>
+ <hr/>
+ <div>Bootstrap Stack Usage: <b>{{.SysStatus.StackInuse}}</b></div>
+ <div>Stack Memory Obtained: <b>{{.SysStatus.StackSys}}</b></div>
+ <div>MSpan Structures Usage: <b>{{.SysStatus.MSpanInuse}}</b></div>
+ <div>MSpan Structures Obtained: <b>{{.SysStatus.HeapSys}}</b></div>
+ <div>MCache Structures Usage: <b>{{.SysStatus.MCacheInuse}}</b></div>
+ <div>MCache Structures Obtained: <b>{{.SysStatus.MCacheSys}}</b></div>
+ <div>Profiling Bucket Hash Table Obtained: <b>{{.SysStatus.BuckHashSys}}</b></div>
+ <div>GC Metadada Obtained: <b>{{.SysStatus.GCSys}}</b></div>
+ <div>Other System Allocation Obtained: <b>{{.SysStatus.OtherSys}}</b></div>
+ <hr/>
+ <div>Next GC Recycle: <b>{{.SysStatus.NextGC}}</b></div>
+ <div>Last GC Time: <b>{{.SysStatus.LastGC}} ago</b></div>
+ <div>Total GC Pause: <b>{{.SysStatus.PauseTotalNs}}</b></div>
+ <div>Last GC Pause: <b>{{.SysStatus.PauseNs}}</b></div>
+ <div>GC Times: <b>{{.SysStatus.NumGC}}</b></div>
</div>
</div>
</div>
From f9c07c4186b61a1548d9a908fe6228bd130f4f92 Mon Sep 17 00:00:00 2001
From: slene <vslene@gmail.com>
Date: Sat, 22 Mar 2014 20:49:53 +0800
Subject: [PATCH 05/19] update session
---
.gitignore | 1 +
conf/app.ini | 27 +++++++++++++++++++++++++++
modules/auth/user.go | 11 ++++++-----
modules/base/conf.go | 30 ++++++++++++++++++++++++++++++
modules/middleware/context.go | 24 ++++++++++++++----------
routers/user/user.go | 2 +-
web.go | 5 -----
7 files changed, 79 insertions(+), 21 deletions(-)
diff --git a/.gitignore b/.gitignore
index ad27cc8be8e..d201223ef97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ gogs
*.db
*.log
custom/
+data/
.vendor/
.idea/
*.iml
\ No newline at end of file
diff --git a/conf/app.ini b/conf/app.ini
index cf99c9da09c..cf2ae31d836 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -72,6 +72,33 @@ INTERVAL = 60
; memcache: "127.0.0.1:11211"
HOST =
+[session]
+; Either "memory", "file", "redis" or "mysql", default is "memory"
+PROVIDER = file
+; provider config
+; memory: not have any config yet
+; file: session file path
+; e.g. tmp/sessions
+; redis: config like redis server addr,poolSize,password
+; e.g. 127.0.0.1:6379,100,astaxie
+; mysql: go-sql-driver/mysql dsn config string
+; e.g. root:password@/session_table
+PROVIDER_CONFIG = data/sessions
+; session cookie name
+COOKIE_NAME = i_like_gogits
+; if you use session in https only, default is false
+COOKIE_SECURE = false
+; enable set cookie, default is true
+ENABLE_SET_COOKIE = true
+; session gc time interval, default is 86400
+GC_INTERVAL_TIME = 86400
+; session life time, default is 86400
+SESSION_LIFE_TIME = 86400
+; session id hash func, default is sha1
+SESSION_ID_HASHFUNC = sha1
+; session hash key, default is use random string
+SESSION_ID_HASHKEY =
+
[picture]
; The place to picture data, either "server" or "qiniu", default is "server"
SERVICE = server
diff --git a/modules/auth/user.go b/modules/auth/user.go
index f8d8f661490..cb8db1b29ab 100644
--- a/modules/auth/user.go
+++ b/modules/auth/user.go
@@ -9,7 +9,8 @@ import (
"reflect"
"github.com/codegangsta/martini"
- "github.com/martini-contrib/sessions"
+
+ "github.com/gogits/session"
"github.com/gogits/binding"
@@ -19,7 +20,7 @@ import (
)
// SignedInId returns the id of signed in user.
-func SignedInId(session sessions.Session) int64 {
+func SignedInId(session session.SessionStore) int64 {
userId := session.Get("userId")
if userId == nil {
return 0
@@ -34,7 +35,7 @@ func SignedInId(session sessions.Session) int64 {
}
// SignedInName returns the name of signed in user.
-func SignedInName(session sessions.Session) string {
+func SignedInName(session session.SessionStore) string {
userName := session.Get("userName")
if userName == nil {
return ""
@@ -46,7 +47,7 @@ func SignedInName(session sessions.Session) string {
}
// SignedInUser returns the user object of signed user.
-func SignedInUser(session sessions.Session) *models.User {
+func SignedInUser(session session.SessionStore) *models.User {
id := SignedInId(session)
if id <= 0 {
return nil
@@ -61,7 +62,7 @@ func SignedInUser(session sessions.Session) *models.User {
}
// IsSignedIn check if any user has signed in.
-func IsSignedIn(session sessions.Session) bool {
+func IsSignedIn(session session.SessionStore) bool {
return SignedInId(session) > 0
}
diff --git a/modules/base/conf.go b/modules/base/conf.go
index 8c6ee628189..d5e27d043b5 100644
--- a/modules/base/conf.go
+++ b/modules/base/conf.go
@@ -16,6 +16,7 @@ import (
"github.com/Unknwon/goconfig"
"github.com/gogits/cache"
+ "github.com/gogits/session"
"github.com/gogits/gogs/modules/log"
)
@@ -49,6 +50,10 @@ var (
LogMode string
LogConfig string
+
+ SessionProvider string
+ SessionConfig *session.Config
+ SessionManager *session.Manager
)
var Service struct {
@@ -164,6 +169,30 @@ func newCacheService() {
log.Info("Cache Service Enabled")
}
+func newSessionService() {
+ SessionProvider = Cfg.MustValue("session", "PROVIDER", "memory")
+
+ SessionConfig = new(session.Config)
+ SessionConfig.ProviderConfig = Cfg.MustValue("session", "PROVIDER_CONFIG")
+ SessionConfig.CookieName = Cfg.MustValue("session", "COOKIE_NAME", "i_like_gogits")
+ SessionConfig.CookieSecure = Cfg.MustBool("session", "COOKIE_SECURE")
+ SessionConfig.EnableSetCookie = Cfg.MustBool("session", "ENABLE_SET_COOKIE", true)
+ SessionConfig.GcIntervalTime = Cfg.MustInt64("session", "GC_INTERVAL_TIME", 86400)
+ SessionConfig.SessionLifeTime = Cfg.MustInt64("session", "SESSION_LIFE_TIME", 86400)
+ SessionConfig.SessionIDHashFunc = Cfg.MustValue("session", "SESSION_ID_HASHFUNC", "sha1")
+ SessionConfig.SessionIDHashKey = Cfg.MustValue("session", "SESSION_ID_HASHKEY")
+
+ var err error
+ SessionManager, err = session.NewManager(SessionProvider, *SessionConfig)
+ if err != nil {
+ fmt.Printf("Init session system failed, provider: %s, %v\n",
+ SessionProvider, err)
+ os.Exit(2)
+ }
+
+ log.Info("Session Service Enabled")
+}
+
func newMailService() {
// Check mailer setting.
if Cfg.MustBool("mailer", "ENABLED") {
@@ -234,6 +263,7 @@ func NewServices() {
newService()
newLogService()
newCacheService()
+ newSessionService()
newMailService()
newRegisterMailService()
}
diff --git a/modules/middleware/context.go b/modules/middleware/context.go
index a25a3dbbebf..c958c1d6cd8 100644
--- a/modules/middleware/context.go
+++ b/modules/middleware/context.go
@@ -10,9 +10,9 @@ import (
"time"
"github.com/codegangsta/martini"
- "github.com/martini-contrib/sessions"
"github.com/gogits/cache"
+ "github.com/gogits/session"
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
@@ -27,7 +27,7 @@ type Context struct {
p martini.Params
Req *http.Request
Res http.ResponseWriter
- Session sessions.Session
+ Session session.SessionStore
Cache cache.Cache
User *models.User
IsSigned bool
@@ -92,21 +92,25 @@ func (ctx *Context) Handle(status int, title string, err error) {
// InitContext initializes a classic context for a request.
func InitContext() martini.Handler {
- return func(res http.ResponseWriter, r *http.Request, c martini.Context,
- session sessions.Session, rd *Render) {
+ return func(res http.ResponseWriter, r *http.Request, c martini.Context, rd *Render) {
ctx := &Context{
c: c,
// p: p,
- Req: r,
- Res: res,
- Session: session,
- Cache: base.Cache,
- Render: rd,
+ Req: r,
+ Res: res,
+ Cache: base.Cache,
+ Render: rd,
}
+ // start session
+ ctx.Session = base.SessionManager.SessionStart(res, r)
+ defer func() {
+ ctx.Session.SessionRelease(res)
+ }()
+
// Get user from session if logined.
- user := auth.SignedInUser(session)
+ user := auth.SignedInUser(ctx.Session)
ctx.User = user
ctx.IsSigned = user != nil
diff --git a/routers/user/user.go b/routers/user/user.go
index d38eb1ceb35..22446977143 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -88,7 +88,7 @@ func SignIn(ctx *middleware.Context, form auth.LogInForm) {
user, err := models.LoginUserPlain(form.UserName, form.Password)
if err != nil {
- if err.Error() == models.ErrUserNotExist.Error() {
+ if err == models.ErrUserNotExist {
ctx.RenderWithErr("Username or password is not correct", "user/signin", &form)
return
}
diff --git a/web.go b/web.go
index 595b8f74ed9..ac5761d720e 100644
--- a/web.go
+++ b/web.go
@@ -12,7 +12,6 @@ import (
"github.com/codegangsta/cli"
"github.com/codegangsta/martini"
- "github.com/martini-contrib/sessions"
"github.com/gogits/binding"
@@ -81,10 +80,6 @@ func runWeb(*cli.Context) {
// Middlewares.
m.Use(middleware.Renderer(middleware.RenderOptions{Funcs: []template.FuncMap{base.TemplateFuncs}}))
- // TODO: should use other store because cookie store is not secure.
- store := sessions.NewCookieStore([]byte("secret123"))
- m.Use(sessions.Sessions("my_session", store))
-
m.Use(middleware.InitContext())
reqSignIn := middleware.SignInRequire(true)
From 01e781dedb3c6d48349516de0eee5cea41c077e1 Mon Sep 17 00:00:00 2001
From: slene <vslene@gmail.com>
Date: Sat, 22 Mar 2014 21:19:27 +0800
Subject: [PATCH 06/19] add comment
---
conf/app.ini | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/app.ini b/conf/app.ini
index cf2ae31d836..6b3ce8d2406 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -94,7 +94,7 @@ ENABLE_SET_COOKIE = true
GC_INTERVAL_TIME = 86400
; session life time, default is 86400
SESSION_LIFE_TIME = 86400
-; session id hash func, default is sha1
+; session id hash func, Either "sha1", "sha256" or "md5" default is sha1
SESSION_ID_HASHFUNC = sha1
; session hash key, default is use random string
SESSION_ID_HASHKEY =
From fd1831052c3a79492643b89512282fc66f34dd8d Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Sat, 22 Mar 2014 09:21:57 -0400
Subject: [PATCH 07/19] Update session
---
.gopmfile | 1 -
README.md | 2 +-
conf/app.ini | 25 +++++-----
gogs.go | 2 +-
modules/base/conf.go | 16 ++++---
modules/base/tool.go | 84 +++++++++++++++++++++++++++++++++-
routers/admin/admin.go | 12 ++++-
templates/admin/config.tmpl | 19 ++++++++
templates/admin/dashboard.tmpl | 1 +
9 files changed, 135 insertions(+), 27 deletions(-)
diff --git a/.gopmfile b/.gopmfile
index 5b690a06a79..6e6b59c6202 100644
--- a/.gopmfile
+++ b/.gopmfile
@@ -4,7 +4,6 @@ path=github.com/gogits/gogs
[deps]
github.com/codegangsta/cli=
github.com/codegangsta/martini=
-github.com/martini-contrib/sessions=
github.com/Unknwon/com=
github.com/Unknwon/cae=
github.com/Unknwon/goconfig=
diff --git a/README.md b/README.md
index a9ab7fe4981..35044927ffa 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ There are two ways to install Gogs:
## Acknowledgments
- Logo is inspired by [martini](https://github.com/martini-contrib).
-- Mail service is based on [WeTalk](https://github.com/beego/wetalk).
+- Mail Service is based on [WeTalk](https://github.com/beego/wetalk).
- System Monitor Status is based on [GoBlog](https://github.com/fuxiaohei/goblog).
## Contributors
diff --git a/conf/app.ini b/conf/app.ini
index cf2ae31d836..30d6c7d4832 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -75,28 +75,25 @@ HOST =
[session]
; Either "memory", "file", "redis" or "mysql", default is "memory"
PROVIDER = file
-; provider config
+; Provider config options
; memory: not have any config yet
-; file: session file path
-; e.g. tmp/sessions
-; redis: config like redis server addr,poolSize,password
-; e.g. 127.0.0.1:6379,100,astaxie
-; mysql: go-sql-driver/mysql dsn config string
-; e.g. root:password@/session_table
+; file: session file path, e.g. data/sessions
+; redis: config like redis server addr, poolSize, password, e.g. 127.0.0.1:6379,100,astaxie
+; mysql: go-sql-driver/mysql dsn config string, e.g. root:password@/session_table
PROVIDER_CONFIG = data/sessions
-; session cookie name
+; Session cookie name
COOKIE_NAME = i_like_gogits
-; if you use session in https only, default is false
+; If you use session in https only, default is false
COOKIE_SECURE = false
-; enable set cookie, default is true
+; Enable set cookie, default is true
ENABLE_SET_COOKIE = true
-; session gc time interval, default is 86400
+; Session GC time interval, default is 86400
GC_INTERVAL_TIME = 86400
-; session life time, default is 86400
+; Session life time, default is 86400
SESSION_LIFE_TIME = 86400
-; session id hash func, default is sha1
+; Session id hash func, default is sha1
SESSION_ID_HASHFUNC = sha1
-; session hash key, default is use random string
+; Session hash key, default is use random string
SESSION_ID_HASHKEY =
[picture]
diff --git a/gogs.go b/gogs.go
index 8ec4fd42f1d..a609032093b 100644
--- a/gogs.go
+++ b/gogs.go
@@ -20,7 +20,7 @@ import (
// Test that go1.2 tag above is included in builds. main.go refers to this definition.
const go12tag = true
-const APP_VER = "0.1.5.0322"
+const APP_VER = "0.1.5.0322.2"
func init() {
base.AppVer = APP_VER
diff --git a/modules/base/conf.go b/modules/base/conf.go
index d5e27d043b5..7c8ed936548 100644
--- a/modules/base/conf.go
+++ b/modules/base/conf.go
@@ -41,19 +41,19 @@ var (
Cfg *goconfig.ConfigFile
MailService *Mailer
+ LogMode string
+ LogConfig string
+
Cache cache.Cache
CacheAdapter string
CacheConfig string
- PictureService string
- PictureRootPath string
-
- LogMode string
- LogConfig string
-
SessionProvider string
SessionConfig *session.Config
SessionManager *session.Manager
+
+ PictureService string
+ PictureRootPath string
)
var Service struct {
@@ -182,6 +182,10 @@ func newSessionService() {
SessionConfig.SessionIDHashFunc = Cfg.MustValue("session", "SESSION_ID_HASHFUNC", "sha1")
SessionConfig.SessionIDHashKey = Cfg.MustValue("session", "SESSION_ID_HASHKEY")
+ if SessionProvider == "file" {
+ os.MkdirAll(path.Dir(SessionConfig.ProviderConfig), os.ModePerm)
+ }
+
var err error
SessionManager, err = session.NewManager(SessionProvider, *SessionConfig)
if err != nil {
diff --git a/modules/base/tool.go b/modules/base/tool.go
index 8fabb8c531d..4f368aa58c1 100644
--- a/modules/base/tool.go
+++ b/modules/base/tool.go
@@ -111,6 +111,85 @@ const (
Year = 12 * Month
)
+func computeTimeDiff(diff int64) (int64, string) {
+ diffStr := ""
+ switch {
+ case diff <= 0:
+ diff = 0
+ diffStr = "now"
+ case diff < 2:
+ diff = 0
+ diffStr = "1 second"
+ case diff < 1*Minute:
+ diffStr = fmt.Sprintf("%d seconds", diff)
+ diff = 0
+
+ case diff < 2*Minute:
+ diff -= 1 * Minute
+ diffStr = "1 minute"
+ case diff < 1*Hour:
+ diffStr = fmt.Sprintf("%d minutes", diff/Minute)
+ diff -= diff / Minute * Minute
+
+ case diff < 2*Hour:
+ diff -= 1 * Hour
+ diffStr = "1 hour"
+ case diff < 1*Day:
+ diffStr = fmt.Sprintf("%d hours", diff/Hour)
+ diff -= diff / Hour * Hour
+
+ case diff < 2*Day:
+ diff -= 1 * Day
+ diffStr = "1 day"
+ case diff < 1*Week:
+ diffStr = fmt.Sprintf("%d days", diff/Day)
+ diff -= diff / Day * Day
+
+ case diff < 2*Week:
+ diff -= 1 * Week
+ diffStr = "1 week"
+ case diff < 1*Month:
+ diffStr = fmt.Sprintf("%d weeks", diff/Week)
+ diff -= diff / Week * Week
+
+ case diff < 2*Month:
+ diff -= 1 * Month
+ diffStr = "1 month"
+ case diff < 1*Year:
+ diffStr = fmt.Sprintf("%d months", diff/Month)
+ diff -= diff / Month * Month
+
+ case diff < 2*Year:
+ diff -= 1 * Year
+ diffStr = "1 year"
+ default:
+ diffStr = fmt.Sprintf("%d years", diff/Year)
+ diff = 0
+ }
+ return diff, diffStr
+}
+
+// TimeSincePro calculates the time interval and generate full user-friendly string.
+func TimeSincePro(then time.Time) string {
+ now := time.Now()
+ diff := now.Unix() - then.Unix()
+
+ if then.After(now) {
+ return "future"
+ }
+
+ var timeStr, diffStr string
+ for {
+ if diff == 0 {
+ break
+ }
+
+ diff, diffStr = computeTimeDiff(diff)
+ timeStr += ", " + diffStr
+ }
+ return strings.TrimPrefix(timeStr, ", ")
+}
+
// TimeSince calculates the time interval and generate user-friendly string.
func TimeSince(then time.Time) string {
now := time.Now()
@@ -123,7 +202,6 @@ func TimeSince(then time.Time) string {
}
switch {
-
case diff <= 0:
return "now"
case diff <= 2:
@@ -156,8 +234,10 @@ func TimeSince(then time.Time) string {
case diff < 1*Year:
return fmt.Sprintf("%d months %s", diff/Month, lbl)
- case diff < 18*Month:
+ case diff < 2*Year:
return fmt.Sprintf("1 year %s", lbl)
+ default:
+ return fmt.Sprintf("%d years %s", diff/Year, lbl)
}
return then.String()
}
diff --git a/routers/admin/admin.go b/routers/admin/admin.go
index 57a46d1dfec..c0f39f71592 100644
--- a/routers/admin/admin.go
+++ b/routers/admin/admin.go
@@ -17,7 +17,10 @@ import (
"github.com/gogits/gogs/modules/middleware"
)
+var startTime = time.Now()
+
var sysStatus struct {
+ Uptime string
NumGoroutine int
// General statistics.
@@ -58,6 +61,8 @@ var sysStatus struct {
}
func updateSystemStatus() {
+ sysStatus.Uptime = base.TimeSincePro(startTime)
+
m := new(runtime.MemStats)
runtime.ReadMemStats(m)
sysStatus.NumGoroutine = runtime.NumGoroutine()
@@ -88,8 +93,8 @@ func updateSystemStatus() {
sysStatus.NextGC = base.FileSize(int64(m.NextGC))
sysStatus.LastGC = fmt.Sprintf("%.1fs", float64(time.Now().UnixNano()-int64(m.LastGC))/1000/1000/1000)
- sysStatus.PauseTotalNs = fmt.Sprintf("%.1fs", float64(m.PauseTotalNs/1000/1000/1000))
- sysStatus.PauseNs = fmt.Sprintf("%.3fs", float64(m.PauseNs[(m.NumGC+255)%256]/1000/1000/1000))
+ sysStatus.PauseTotalNs = fmt.Sprintf("%.1fs", float64(m.PauseTotalNs)/1000/1000/1000)
+ sysStatus.PauseNs = fmt.Sprintf("%.3fs", float64(m.PauseNs[(m.NumGC+255)%256])/1000/1000/1000)
sysStatus.NumGC = m.NumGC
}
@@ -151,6 +156,9 @@ func Config(ctx *middleware.Context) {
ctx.Data["CacheAdapter"] = base.CacheAdapter
ctx.Data["CacheConfig"] = base.CacheConfig
+ ctx.Data["SessionProvider"] = base.SessionProvider
+ ctx.Data["SessionConfig"] = base.SessionConfig
+
ctx.Data["PictureService"] = base.PictureService
ctx.Data["PictureRootPath"] = base.PictureRootPath
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index e3f69ee6eab..048740e617b 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -77,6 +77,25 @@
</div>
</div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Session Configuration
+ </div>
+
+ <div class="panel-body">
+ <div><b>Session Provider:</b> {{.SessionProvider}}</div>
+ <div><b>Cookie Name:</b> {{.SessionConfig.CookieName}}</div>
+ <div><b>Enable Set Cookie:</b> <i class="fa fa{{if .SessionConfig.EnableSetCookie}}-check{{end}}-square-o"></i></div>
+ <div><b>GC Interval Time:</b> {{.SessionConfig.GcIntervalTime}} seconds</div>
+ <div><b>Session Life Time:</b> {{.SessionConfig.SessionLifeTime}} seconds</div>
+ <div><b>HTTPS Only:</b> <i class="fa fa{{if .SessionConfig.CookieSecure}}-check{{end}}-square-o"></i></div>
+ <div><b>Cookie Life Time:</b> {{.SessionConfig.CookieLifeTime}} seconds</div>
+ <div><b>Session ID Hash Function:</b> {{.SessionConfig.SessionIDHashFunc}}</div>
+ <div><b>Session ID Hash Key:</b> {{.SessionConfig.SessionIDHashKey}}</div>
+ <div><b>Provider Config:</b> {{.SessionConfig.ProviderConfig}}</div>
+ </div>
+ </div>
+
<div class="panel panel-default">
<div class="panel-heading">
Picture Configuration
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl
index 0bebf8318f6..2a5a161e03b 100644
--- a/templates/admin/dashboard.tmpl
+++ b/templates/admin/dashboard.tmpl
@@ -19,6 +19,7 @@
</div>
<div class="panel-body">
+ <div>Server Uptime: <b>{{.SysStatus.Uptime}}</b></div>
<div>Current Goroutines: <b>{{.SysStatus.NumGoroutine}}</b></div>
<hr/>
<div>Current Memory Usage: <b>{{.SysStatus.MemAllocated}}</b></div>
From e3f55ca0fb0c8aee84f2935b76353ef8ce66384f Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Sat, 22 Mar 2014 11:59:14 -0400
Subject: [PATCH 08/19] Need a field to specify if repository is bare
---
models/action.go | 1 +
models/repo.go | 6 ++++--
routers/repo/single.go | 10 ++--------
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/models/action.go b/models/action.go
index 12122ae240f..4e1107f891c 100644
--- a/models/action.go
+++ b/models/action.go
@@ -87,6 +87,7 @@ func CommitRepoAction(userId int64, userName string,
if err != nil {
return err
}
+ repo.IsBare = false
repo.Updated = time.Now()
if err = UpdateRepository(repo); err != nil {
return err
diff --git a/models/repo.go b/models/repo.go
index 1961b31e949..fb115de5909 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -83,10 +83,11 @@ type Repository struct {
Name string `xorm:"index not null"`
Description string
Website string
- Private bool
NumWatches int
NumStars int
NumForks int
+ IsPrivate bool
+ IsBare bool
Created time.Time `xorm:"created"`
Updated time.Time `xorm:"updated"`
}
@@ -139,7 +140,8 @@ func CreateRepository(user *User, repoName, desc, repoLang, license string, priv
Name: repoName,
LowerName: strings.ToLower(repoName),
Description: desc,
- Private: private,
+ IsPrivate: private,
+ IsBare: repoLang == "" && license == "" && !initReadme,
}
repoPath := RepoPath(user.Name, repoName)
diff --git a/routers/repo/single.go b/routers/repo/single.go
index 37c0fabd797..5906e64fb97 100644
--- a/routers/repo/single.go
+++ b/routers/repo/single.go
@@ -69,7 +69,7 @@ func Single(ctx *middleware.Context, params martini.Params) {
log.Error("repo.Single(GetBranches): %v", err)
ctx.Error(404)
return
- } else if len(brs) == 0 {
+ } else if ctx.Repo.Repository.IsBare {
ctx.Data["IsBareRepo"] = true
ctx.HTML(200, "repo/single")
return
@@ -224,13 +224,7 @@ func Setting(ctx *middleware.Context, params martini.Params) {
ctx.Data["IsRepoToolbarSetting"] = true
- // Branches.
- brs, err := models.GetBranches(params["username"], params["reponame"])
- if err != nil {
- log.Error("repo.Setting(GetBranches): %v", err)
- ctx.Error(404)
- return
- } else if len(brs) == 0 {
+ if ctx.Repo.Repository.IsBare {
ctx.Data["IsBareRepo"] = true
ctx.HTML(200, "repo/setting")
return
From 076fc98d981aea3533eea363ca1c7e43f77b9802 Mon Sep 17 00:00:00 2001
From: slene <vslene@gmail.com>
Date: Sun, 23 Mar 2014 01:44:02 +0800
Subject: [PATCH 09/19] add csrf check
---
modules/base/tool.go | 10 ++-
modules/middleware/auth.go | 58 +++++++++--------
modules/middleware/context.go | 107 +++++++++++++++++++++++++++++++-
modules/middleware/render.go | 5 +-
public/js/app.js | 33 ++++++++++
templates/admin/users/edit.tmpl | 1 +
templates/admin/users/new.tmpl | 1 +
templates/base/head.tmpl | 1 +
templates/repo/create.tmpl | 1 +
templates/repo/setting.tmpl | 1 +
templates/user/active.tmpl | 3 +-
templates/user/delete.tmpl | 1 +
templates/user/password.tmpl | 4 +-
templates/user/publickey.tmpl | 1 +
templates/user/setting.tmpl | 1 +
templates/user/signin.tmpl | 1 +
templates/user/signup.tmpl | 1 +
web.go | 24 +++----
18 files changed, 208 insertions(+), 46 deletions(-)
diff --git a/modules/base/tool.go b/modules/base/tool.go
index 8fabb8c531d..a2aeebf1b81 100644
--- a/modules/base/tool.go
+++ b/modules/base/tool.go
@@ -25,13 +25,17 @@ func EncodeMd5(str string) string {
return hex.EncodeToString(m.Sum(nil))
}
-// Random generate string
-func GetRandomString(n int) string {
+// GetRandomString generate random string by specify chars.
+func GetRandomString(n int, alphabets ...byte) string {
const alphanum = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
var bytes = make([]byte, n)
rand.Read(bytes)
for i, b := range bytes {
- bytes[i] = alphanum[b%byte(len(alphanum))]
+ if len(alphabets) == 0 {
+ bytes[i] = alphanum[b%byte(len(alphanum))]
+ } else {
+ bytes[i] = alphabets[b%byte(len(alphabets))]
+ }
}
return string(bytes)
}
diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go
index f211de32b90..b557188ee92 100644
--- a/modules/middleware/auth.go
+++ b/modules/middleware/auth.go
@@ -10,39 +10,45 @@ import (
"github.com/gogits/gogs/modules/base"
)
-// SignInRequire requires user to sign in.
-func SignInRequire(redirect bool) martini.Handler {
- return func(ctx *Context) {
- if !ctx.IsSigned {
- if redirect {
- ctx.Redirect("/user/login")
- }
- return
- } else if !ctx.User.IsActive && base.Service.RegisterEmailConfirm {
- ctx.Data["Title"] = "Activate Your Account"
- ctx.HTML(200, "user/active")
- return
- }
- }
+type ToggleOptions struct {
+ SignInRequire bool
+ SignOutRequire bool
+ AdminRequire bool
+ DisableCsrf bool
}
-// SignOutRequire requires user to sign out.
-func SignOutRequire() martini.Handler {
+func Toggle(options *ToggleOptions) martini.Handler {
return func(ctx *Context) {
- if ctx.IsSigned {
+ if options.SignOutRequire && ctx.IsSigned {
ctx.Redirect("/")
return
}
- }
-}
-// AdminRequire requires user signed in as administor.
-func AdminRequire() martini.Handler {
- return func(ctx *Context) {
- if !ctx.User.IsAdmin {
- ctx.Error(403)
- return
+ if !options.DisableCsrf {
+ if ctx.Req.Method == "POST" {
+ if !ctx.CsrfTokenValid() {
+ ctx.Error(403, "CSRF token does not match")
+ return
+ }
+ }
+ }
+
+ if options.SignInRequire {
+ if !ctx.IsSigned {
+ ctx.Redirect("/user/login")
+ return
+ } else if !ctx.User.IsActive && base.Service.RegisterEmailConfirm {
+ ctx.Data["Title"] = "Activate Your Account"
+ ctx.HTML(200, "user/active")
+ return
+ }
+ }
+
+ if options.AdminRequire {
+ if !ctx.User.IsAdmin {
+ ctx.Error(403)
+ return
+ }
}
- ctx.Data["PageIsAdmin"] = true
}
}
diff --git a/modules/middleware/context.go b/modules/middleware/context.go
index c958c1d6cd8..b28953fc0ed 100644
--- a/modules/middleware/context.go
+++ b/modules/middleware/context.go
@@ -6,6 +6,7 @@ package middleware
import (
"fmt"
+ "html/template"
"net/http"
"time"
@@ -32,6 +33,8 @@ type Context struct {
User *models.User
IsSigned bool
+ csrfToken string
+
Repo struct {
IsValid bool
IsOwner bool
@@ -90,6 +93,95 @@ func (ctx *Context) Handle(status int, title string, err error) {
ctx.HTML(status, fmt.Sprintf("status/%d", status))
}
+func (ctx *Context) GetCookie(name string) string {
+ cookie, err := ctx.Req.Cookie(name)
+ if err != nil {
+ return ""
+ }
+ return cookie.Value
+}
+
+func (ctx *Context) SetCookie(name string, value string, others ...interface{}) {
+ cookie := http.Cookie{}
+ cookie.Name = name
+ cookie.Value = value
+
+ if len(others) > 0 {
+ switch v := others[0].(type) {
+ case int:
+ cookie.MaxAge = v
+ case int64:
+ cookie.MaxAge = int(v)
+ case int32:
+ cookie.MaxAge = int(v)
+ }
+ }
+
+ // default "/"
+ if len(others) > 1 {
+ if v, ok := others[1].(string); ok && len(v) > 0 {
+ cookie.Path = v
+ }
+ } else {
+ cookie.Path = "/"
+ }
+
+ // default empty
+ if len(others) > 2 {
+ if v, ok := others[2].(string); ok && len(v) > 0 {
+ cookie.Domain = v
+ }
+ }
+
+ // default empty
+ if len(others) > 3 {
+ switch v := others[3].(type) {
+ case bool:
+ cookie.Secure = v
+ default:
+ if others[3] != nil {
+ cookie.Secure = true
+ }
+ }
+ }
+
+ // default false. for session cookie default true
+ if len(others) > 4 {
+ if v, ok := others[4].(bool); ok && v {
+ cookie.HttpOnly = true
+ }
+ }
+
+ ctx.Res.Header().Add("Set-Cookie", cookie.String())
+}
+
+func (ctx *Context) CsrfToken() string {
+ if len(ctx.csrfToken) > 0 {
+ return ctx.csrfToken
+ }
+
+ token := ctx.GetCookie("_csrf")
+ if len(token) == 0 {
+ token = base.GetRandomString(30)
+ ctx.SetCookie("_csrf", token)
+ }
+ ctx.csrfToken = token
+ return token
+}
+
+func (ctx *Context) CsrfTokenValid() bool {
+ token := ctx.Query("_csrf")
+ if token == "" {
+ token = ctx.Req.Header.Get("X-Csrf-Token")
+ }
+ if token == "" {
+ return false
+ } else if ctx.csrfToken != token {
+ return false
+ }
+ return true
+}
+
// InitContext initializes a classic context for a request.
func InitContext() martini.Handler {
return func(res http.ResponseWriter, r *http.Request, c martini.Context, rd *Render) {
@@ -103,11 +195,14 @@ func InitContext() martini.Handler {
Render: rd,
}
+ ctx.Data["PageStartTime"] = time.Now()
+
// start session
ctx.Session = base.SessionManager.SessionStart(res, r)
- defer func() {
+ rw := res.(martini.ResponseWriter)
+ rw.Before(func(martini.ResponseWriter) {
ctx.Session.SessionRelease(res)
- }()
+ })
// Get user from session if logined.
user := auth.SignedInUser(ctx.Session)
@@ -121,9 +216,15 @@ func InitContext() martini.Handler {
ctx.Data["SignedUserId"] = user.Id
ctx.Data["SignedUserName"] = user.LowerName
ctx.Data["IsAdmin"] = ctx.User.IsAdmin
+
+ if ctx.User.IsAdmin {
+ ctx.Data["PageIsAdmin"] = true
+ }
}
- ctx.Data["PageStartTime"] = time.Now()
+ // get or create csrf token
+ ctx.Data["CsrfToken"] = ctx.CsrfToken()
+ ctx.Data["CsrfTokenHtml"] = template.HTML(`<input type="hidden" name="_csrf" value="` + ctx.csrfToken + `">`)
c.Map(ctx)
diff --git a/modules/middleware/render.go b/modules/middleware/render.go
index 8a541831350..869ef9abaa8 100644
--- a/modules/middleware/render.go
+++ b/modules/middleware/render.go
@@ -242,8 +242,11 @@ func (r *Render) HTMLString(name string, binding interface{}, htmlOpt ...HTMLOpt
}
}
-func (r *Render) Error(status int) {
+func (r *Render) Error(status int, message ...string) {
r.WriteHeader(status)
+ if len(message) > 0 {
+ r.Write([]byte(message[0]))
+ }
}
func (r *Render) Redirect(location string, status ...int) {
diff --git a/public/js/app.js b/public/js/app.js
index f179342f4b4..df755727b50 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -2,6 +2,39 @@ var Gogits = {
"PageIsSignup": false
};
+(function($){
+ // extend jQuery ajax, set csrf token value
+ var ajax = $.ajax;
+ $.extend({
+ ajax: function(url, options) {
+ if (typeof url === 'object') {
+ options = url;
+ url = undefined;
+ }
+ options = options || {};
+ url = options.url;
+ var csrftoken = $('meta[name=_csrf]').attr('content');
+ var headers = options.headers || {};
+ var domain = document.domain.replace(/\./ig, '\\.');
+ if (!/^(http:|https:).*/.test(url) || eval('/^(http:|https:)\\/\\/(.+\\.)*' + domain + '.*/').test(url)) {
+ headers = $.extend(headers, {'X-Csrf-Token':csrftoken});
+ }
+ options.headers = headers;
+ var callback = options.success;
+ options.success = function(data){
+ if(data.once){
+ // change all _once value if ajax data.once exist
+ $('[name=_once]').val(data.once);
+ }
+ if(callback){
+ callback.apply(this, arguments);
+ }
+ };
+ return ajax(url, options);
+ }
+ });
+}(jQuery));
+
(function ($) {
Gogits.showTab = function (selector, index) {
diff --git a/templates/admin/users/edit.tmpl b/templates/admin/users/edit.tmpl
index 2a9882423a8..08f11fcb128 100644
--- a/templates/admin/users/edit.tmpl
+++ b/templates/admin/users/edit.tmpl
@@ -12,6 +12,7 @@
<br/>
<form action="/admin/users/{{.User.Id}}" method="post" class="form-horizontal">
{{if .IsSuccess}}<p class="alert alert-success">Account profile has been successfully updated.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}}
+ {{.CsrfTokenHtml}}
<input type="hidden" value="{{.User.Id}}" name="userId"/>
<div class="form-group">
<label class="col-md-3 control-label">Username: </label>
diff --git a/templates/admin/users/new.tmpl b/templates/admin/users/new.tmpl
index 01d976caa0b..7b41ae43a7a 100644
--- a/templates/admin/users/new.tmpl
+++ b/templates/admin/users/new.tmpl
@@ -11,6 +11,7 @@
<div class="panel-body">
<br/>
<form action="/admin/users/new" method="post" class="form-horizontal">
+ {{.CsrfTokenHtml}}
<div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
<div class="form-group {{if .Err_UserName}}has-error has-feedback{{end}}">
<label class="col-md-3 control-label">Username: </label>
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index f02ea095caf..7f56ed70806 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -8,6 +8,7 @@
<meta name="author" content="Gogs - Go Git Service" />
<meta name="description" content="Gogs(Go Git Service) is a GitHub-like clone in the Go Programming Language" />
<meta name="keywords" content="go, git">
+ <meta name="_csrf" content="{{.CsrfToken}}" />
<!-- Stylesheets -->
<link href="/css/bootstrap.min.css" rel="stylesheet" />
diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl
index 2de92f515fd..a43f5104845 100644
--- a/templates/repo/create.tmpl
+++ b/templates/repo/create.tmpl
@@ -2,6 +2,7 @@
{{template "base/navbar" .}}
<div class="container" id="gogs-body">
<form action="/repo/create" method="post" class="form-horizontal gogs-card" id="gogs-repo-create">
+ {{.CsrfTokenHtml}}
<h3>Create New Repository</h3>
<div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
<div class="form-group">
diff --git a/templates/repo/setting.tmpl b/templates/repo/setting.tmpl
index a2fb1771d44..38c3fd3bcc7 100644
--- a/templates/repo/setting.tmpl
+++ b/templates/repo/setting.tmpl
@@ -40,6 +40,7 @@
<div class="modal fade" id="delete-repository-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<form action="/{{.Owner.Name}}/{{.Repository.Name}}/settings" method="post" class="modal-content">
+ {{.CsrfTokenHtml}}
<input type="hidden" name="action" value="delete">
<div class="modal-header">
diff --git a/templates/user/active.tmpl b/templates/user/active.tmpl
index 47c87a591c6..0df116cb405 100644
--- a/templates/user/active.tmpl
+++ b/templates/user/active.tmpl
@@ -1,7 +1,8 @@
{{template "base/head" .}}
{{template "base/navbar" .}}
<div id="gogs-body" class="container">
- <form action="/user/activate" method="get" class="form-horizontal gogs-card" id="gogs-login-card">
+ <form action="/user/activate" method="post" class="form-horizontal gogs-card" id="gogs-login-card">
+ {{.CsrfTokenHtml}}
<h3>Activate Your Account</h3>
{{if .IsActivatePage}}
{{if .ServiceNotEnabled}}
diff --git a/templates/user/delete.tmpl b/templates/user/delete.tmpl
index 397ea8cc09c..46376672d4e 100644
--- a/templates/user/delete.tmpl
+++ b/templates/user/delete.tmpl
@@ -22,6 +22,7 @@
<div class="modal fade" id="delete-account-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<form action="/user/delete" method="post" class="modal-content" id="gogs-user-delete">
+ {{.CsrfTokenHtml}}
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h4 class="modal-title" id="myModalLabel">Delete Account</h4>
diff --git a/templates/user/password.tmpl b/templates/user/password.tmpl
index 2ee178a3fc7..936ec4b1242 100644
--- a/templates/user/password.tmpl
+++ b/templates/user/password.tmpl
@@ -5,7 +5,9 @@
<div id="gogs-user-setting-container" class="col-md-9">
<div id="gogs-setting-pwd">
<h4>Password</h4>
- <form class="form-horizontal" id="gogs-password-form" method="post" action="/user/setting/password">{{if .IsSuccess}}
+ <form class="form-horizontal" id="gogs-password-form" method="post" action="/user/setting/password">
+ {{.CsrfTokenHtml}}
+ {{if .IsSuccess}}
<p class="alert alert-success">Password is changed successfully. You can now sign in via new password.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}}
<div class="form-group">
<label class="col-md-3 control-label">Old Password<strong class="text-danger">*</strong></label>
diff --git a/templates/user/publickey.tmpl b/templates/user/publickey.tmpl
index 72467659bef..e645e1a84b0 100644
--- a/templates/user/publickey.tmpl
+++ b/templates/user/publickey.tmpl
@@ -22,6 +22,7 @@
<div class="modal fade" id="ssh-add-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<form class="modal-content form-horizontal" id="gogs-ssh-form" method="post" action="/user/setting/ssh/">
+ {{.CsrfTokenHtml}}
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h4 class="modal-title" id="myModalLabel">Add SSH Key</h4>
diff --git a/templates/user/setting.tmpl b/templates/user/setting.tmpl
index 222ddd895b9..30c9529b126 100644
--- a/templates/user/setting.tmpl
+++ b/templates/user/setting.tmpl
@@ -6,6 +6,7 @@
<div id="gogs-setting-pwd">
<h4>Account Profile</h4>
<form class="form-horizontal" id="gogs-password-form" method="post" action="/user/setting">
+ {{.CsrfTokenHtml}}
{{if .IsSuccess}}<p class="alert alert-success">Your profile has been successfully updated.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}}
<p>Your Email will be public and used for Account related notifications and any web based operations made via the web.</p>
<div class="form-group">
diff --git a/templates/user/signin.tmpl b/templates/user/signin.tmpl
index a49bf11405d..8dc7292ff8b 100644
--- a/templates/user/signin.tmpl
+++ b/templates/user/signin.tmpl
@@ -2,6 +2,7 @@
{{template "base/navbar" .}}
<div class="container" id="gogs-body" data-page="user-signin">
<form action="/user/login" method="post" class="form-horizontal gogs-card" id="gogs-login-card">
+ {{.CsrfTokenHtml}}
<h3>Log in</h3>
<div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
<div class="form-group {{if .Err_UserName}}has-error has-feedback{{end}}">
diff --git a/templates/user/signup.tmpl b/templates/user/signup.tmpl
index 069d34a5b2c..fbfc4cadccf 100644
--- a/templates/user/signup.tmpl
+++ b/templates/user/signup.tmpl
@@ -2,6 +2,7 @@
{{template "base/navbar" .}}
<div class="container" id="gogs-body" data-page="user-signup">
<form action="/user/sign_up" method="post" class="form-horizontal gogs-card" id="gogs-login-card">
+ {{.CsrfTokenHtml}}
{{if .DisenableRegisteration}}
Sorry, registeration has been disenabled, you can only get account from administrator.
{{else}}
diff --git a/web.go b/web.go
index ac5761d720e..0da2d129d09 100644
--- a/web.go
+++ b/web.go
@@ -82,9 +82,10 @@ func runWeb(*cli.Context) {
m.Use(middleware.InitContext())
- reqSignIn := middleware.SignInRequire(true)
- ignSignIn := middleware.SignInRequire(base.Service.RequireSignInView)
- reqSignOut := middleware.SignOutRequire()
+ reqSignIn := middleware.Toggle(&middleware.ToggleOptions{SignInRequire: true})
+ ignSignIn := middleware.Toggle(&middleware.ToggleOptions{SignInRequire: base.Service.RequireSignInView})
+ reqSignOut := middleware.Toggle(&middleware.ToggleOptions{SignOutRequire: true})
+
// Routers.
m.Get("/", ignSignIn, routers.Home)
m.Get("/issues", reqSignIn, user.Issues)
@@ -109,14 +110,15 @@ func runWeb(*cli.Context) {
m.Get("/help", routers.Help)
- adminReq := middleware.AdminRequire()
- m.Get("/admin", reqSignIn, adminReq, admin.Dashboard)
- m.Get("/admin/users", reqSignIn, adminReq, admin.Users)
- m.Any("/admin/users/new", reqSignIn, adminReq, binding.BindIgnErr(auth.RegisterForm{}), admin.NewUser)
- m.Any("/admin/users/:userid", reqSignIn, adminReq, binding.BindIgnErr(auth.AdminEditUserForm{}), admin.EditUser)
- m.Any("/admin/users/:userid/delete", reqSignIn, adminReq, admin.DeleteUser)
- m.Get("/admin/repos", reqSignIn, adminReq, admin.Repositories)
- m.Get("/admin/config", reqSignIn, adminReq, admin.Config)
+ adminReq := middleware.Toggle(&middleware.ToggleOptions{SignInRequire: true, AdminRequire: true})
+
+ m.Get("/admin", adminReq, admin.Dashboard)
+ m.Get("/admin/users", adminReq, admin.Users)
+ m.Any("/admin/users/new", adminReq, binding.BindIgnErr(auth.RegisterForm{}), admin.NewUser)
+ m.Any("/admin/users/:userid", adminReq, binding.BindIgnErr(auth.AdminEditUserForm{}), admin.EditUser)
+ m.Any("/admin/users/:userid/delete", adminReq, admin.DeleteUser)
+ m.Get("/admin/repos", adminReq, admin.Repositories)
+ m.Get("/admin/config", adminReq, admin.Config)
m.Post("/:username/:reponame/settings", reqSignIn, middleware.RepoAssignment(true), repo.SettingPost)
m.Get("/:username/:reponame/settings", reqSignIn, middleware.RepoAssignment(true), repo.Setting)
From 61e29226015fad6451281035948c3d8d1364880c Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Sat, 22 Mar 2014 13:50:50 -0400
Subject: [PATCH 10/19] Working on issues
---
gogs.go | 2 +-
models/action.go | 1 -
models/issue.go | 123 ++++++++++++++++-
models/models.go | 2 +-
routers/repo/issue.go | 30 ++++
routers/repo/repo.go | 294 ++++++++++++++++++++++++++++++++++++++++
routers/repo/single.go | 301 -----------------------------------------
7 files changed, 443 insertions(+), 310 deletions(-)
create mode 100644 routers/repo/issue.go
delete mode 100644 routers/repo/single.go
diff --git a/gogs.go b/gogs.go
index a609032093b..2bb80a66443 100644
--- a/gogs.go
+++ b/gogs.go
@@ -20,7 +20,7 @@ import (
// Test that go1.2 tag above is included in builds. main.go refers to this definition.
const go12tag = true
-const APP_VER = "0.1.5.0322.2"
+const APP_VER = "0.1.6.0323.1"
func init() {
base.AppVer = APP_VER
diff --git a/models/action.go b/models/action.go
index 4e1107f891c..a996e16aa81 100644
--- a/models/action.go
+++ b/models/action.go
@@ -88,7 +88,6 @@ func CommitRepoAction(userId int64, userName string,
return err
}
repo.IsBare = false
- repo.Updated = time.Now()
if err = UpdateRepository(repo); err != nil {
return err
}
diff --git a/models/issue.go b/models/issue.go
index c669d201f6e..0b6ca4c323a 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -4,16 +4,127 @@
package models
+import (
+ "strings"
+ "time"
+
+ "github.com/gogits/gogs/modules/base"
+)
+
+// Issue represents an issue or pull request of repository.
type Issue struct {
- Id int64
- RepoId int64 `xorm:"index"`
- PosterId int64
+ Id int64
+ Index int64 // Index in one repository.
+ Name string
+ RepoId int64 `xorm:"index"`
+ PosterId int64
+ MilestoneId int64
+ AssigneeId int64
+ IsPull bool // Indicates whether is a pull request or not.
+ IsClosed bool
+ Labels string
+ Mentions string
+ Content string
+ NumComments int
+ Created time.Time `xorm:"created"`
+ Updated time.Time `xorm:"updated"`
}
-type PullRequest struct {
- Id int64
+// CreateIssue creates new issue for repository.
+func CreateIssue(userId, repoId, milestoneId, assigneeId int64, name, labels, mentions, content string, isPull bool) error {
+ count, err := GetIssueCount(repoId)
+ if err != nil {
+ return err
+ }
+
+ _, err = orm.Insert(&Issue{
+ Index: count + 1,
+ Name: name,
+ RepoId: repoId,
+ PosterId: userId,
+ MilestoneId: milestoneId,
+ AssigneeId: assigneeId,
+ IsPull: isPull,
+ Labels: labels,
+ Mentions: mentions,
+ Content: content,
+ })
+ return err
}
+// GetIssueCount returns count of issues in the repository.
+func GetIssueCount(repoId int64) (int64, error) {
+ return orm.Count(&Issue{RepoId: repoId})
+}
+
+// GetIssues returns a list of issues by given conditions.
+func GetIssues(userId, repoId, posterId, milestoneId int64, page int, isClosed, isMention bool, labels, sortType string) ([]Issue, error) {
+ sess := orm.Limit(20, (page-1)*20).Where("repo_id=?", repoId).And("is_closed=?", isClosed)
+ if userId > 0 {
+ sess = sess.And("assignee_id=?", userId)
+ } else if posterId > 0 {
+ sess = sess.And("poster_id=?", posterId)
+ } else if isMention {
+ sess = sess.And("mentions like '%$" + base.ToStr(userId) + "|%'")
+ }
+
+ if milestoneId > 0 {
+ sess = sess.And("milestone_id=?", milestoneId)
+ }
+
+ if len(labels) > 0 {
+ for _, label := range strings.Split(labels, ",") {
+ sess = sess.And("mentions like '%$" + label + "|%'")
+ }
+ }
+
+ switch sortType {
+ case "oldest":
+ sess = sess.Asc("created")
+ case "recentupdate":
+ sess = sess.Desc("updated")
+ case "leastupdate":
+ sess = sess.Asc("updated")
+ case "mostcomment":
+ sess = sess.Desc("num_comments")
+ case "leastcomment":
+ sess = sess.Asc("num_comments")
+ default:
+ sess = sess.Desc("created")
+ }
+
+ var issues []Issue
+ err := sess.Find(&issues)
+ return issues, err
+}
+
+// Label represents a list of labels of repository for issues.
+type Label struct {
+ Id int64
+ RepoId int64 `xorm:"index"`
+ Names string
+ Colors string
+}
+
+// Milestone represents a milestone of repository.
+type Milestone struct {
+ Id int64
+ Name string
+ RepoId int64 `xorm:"index"`
+ IsClosed bool
+ Content string
+ NumIssues int
+ DueDate time.Time
+ Created time.Time `xorm:"created"`
+}
+
+// Comment represents a comment in commit and issue page.
type Comment struct {
- Id int64
+ Id int64
+ PosterId int64
+ IssueId int64
+ CommitId int64
+ Line int
+ Content string
+ Created time.Time `xorm:"created"`
}
diff --git a/models/models.go b/models/models.go
index 8713ff2896a..fb749c5d8a6 100644
--- a/models/models.go
+++ b/models/models.go
@@ -72,7 +72,7 @@ func setEngine() {
func NewEngine() {
setEngine()
if err := orm.Sync(new(User), new(PublicKey), new(Repository), new(Watch),
- new(Action), new(Access)); err != nil {
+ new(Action), new(Access), new(Issue)); err != nil {
fmt.Printf("sync database struct error: %v\n", err)
os.Exit(2)
}
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
new file mode 100644
index 00000000000..c6af8ca0bc4
--- /dev/null
+++ b/routers/repo/issue.go
@@ -0,0 +1,30 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package repo
+
+import (
+ "github.com/codegangsta/martini"
+
+ "github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/modules/base"
+ "github.com/gogits/gogs/modules/middleware"
+)
+
+func Issues(ctx *middleware.Context, params martini.Params) {
+ ctx.Data["IsRepoToolbarIssues"] = true
+
+ milestoneId, _ := base.StrTo(params["milestone"]).Int()
+ page, _ := base.StrTo(params["page"]).Int()
+
+ var err error
+ ctx.Data["Issues"], err = models.GetIssues(0, ctx.Repo.Repository.Id, 0,
+ int64(milestoneId), page, params["state"] == "closed", false, params["labels"], params["sortType"])
+ if err != nil {
+ ctx.Handle(200, "issue.Issues: %v", err)
+ return
+ }
+
+ ctx.HTML(200, "repo/issues")
+}
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index c83a6df5225..ff0fa85dde8 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -5,8 +5,17 @@
package repo
import (
+ "path"
+ "strings"
+
+ "github.com/codegangsta/martini"
+
+ "github.com/gogits/git"
+ "github.com/gogits/webdav"
+
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
+ "github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/middleware"
)
@@ -61,3 +70,288 @@ func SettingPost(ctx *middleware.Context) {
log.Trace("%s Repository deleted: %s/%s", ctx.Req.RequestURI, ctx.User.LowerName, ctx.Repo.Repository.LowerName)
ctx.Redirect("/", 302)
}
+
+func Branches(ctx *middleware.Context, params martini.Params) {
+ if !ctx.Repo.IsValid {
+ return
+ }
+
+ brs, err := models.GetBranches(params["username"], params["reponame"])
+ if err != nil {
+ ctx.Handle(200, "repo.Branches", err)
+ return
+ } else if len(brs) == 0 {
+ ctx.Error(404)
+ return
+ }
+
+ ctx.Data["Username"] = params["username"]
+ ctx.Data["Reponame"] = params["reponame"]
+
+ ctx.Data["Branchname"] = brs[0]
+ ctx.Data["Branches"] = brs
+ ctx.Data["IsRepoToolbarBranches"] = true
+
+ ctx.HTML(200, "repo/branches")
+}
+
+func Single(ctx *middleware.Context, params martini.Params) {
+ if !ctx.Repo.IsValid {
+ return
+ }
+
+ if len(params["branchname"]) == 0 {
+ params["branchname"] = "master"
+ }
+
+ // Get tree path
+ treename := params["_1"]
+
+ if len(treename) > 0 && treename[len(treename)-1] == '/' {
+ ctx.Redirect("/"+ctx.Repo.Owner.LowerName+"/"+
+ ctx.Repo.Repository.Name+"/src/"+params["branchname"]+"/"+treename[:len(treename)-1], 302)
+ return
+ }
+
+ ctx.Data["IsRepoToolbarSource"] = true
+
+ // Branches.
+ brs, err := models.GetBranches(params["username"], params["reponame"])
+ if err != nil {
+ log.Error("repo.Single(GetBranches): %v", err)
+ ctx.Error(404)
+ return
+ } else if ctx.Repo.Repository.IsBare {
+ ctx.Data["IsBareRepo"] = true
+ ctx.HTML(200, "repo/single")
+ return
+ }
+
+ ctx.Data["Branches"] = brs
+
+ repoFile, err := models.GetTargetFile(params["username"], params["reponame"],
+ params["branchname"], params["commitid"], treename)
+
+ if err != nil && err != models.ErrRepoFileNotExist {
+ log.Error("repo.Single(GetTargetFile): %v", err)
+ ctx.Error(404)
+ return
+ }
+
+ branchLink := "/" + ctx.Repo.Owner.LowerName + "/" + ctx.Repo.Repository.Name + "/src/" + params["branchname"]
+
+ if len(treename) != 0 && repoFile == nil {
+ ctx.Error(404)
+ return
+ }
+
+ if repoFile != nil && repoFile.IsFile() {
+ if repoFile.Size > 1024*1024 || repoFile.Filemode != git.FileModeBlob {
+ ctx.Data["FileIsLarge"] = true
+ } else if blob, err := repoFile.LookupBlob(); err != nil {
+ log.Error("repo.Single(repoFile.LookupBlob): %v", err)
+ ctx.Error(404)
+ } else {
+ ctx.Data["IsFile"] = true
+ ctx.Data["FileName"] = repoFile.Name
+ ext := path.Ext(repoFile.Name)
+ if len(ext) > 0 {
+ ext = ext[1:]
+ }
+ ctx.Data["FileExt"] = ext
+
+ readmeExist := base.IsMarkdownFile(repoFile.Name) || base.IsReadmeFile(repoFile.Name)
+ ctx.Data["ReadmeExist"] = readmeExist
+ if readmeExist {
+ ctx.Data["FileContent"] = string(base.RenderMarkdown(blob.Contents(), ""))
+ } else {
+ ctx.Data["FileContent"] = string(blob.Contents())
+ }
+ }
+
+ } else {
+ // Directory and file list.
+ files, err := models.GetReposFiles(params["username"], params["reponame"],
+ params["branchname"], params["commitid"], treename)
+ if err != nil {
+ log.Error("repo.Single(GetReposFiles): %v", err)
+ ctx.Error(404)
+ return
+ }
+
+ ctx.Data["Files"] = files
+
+ var readmeFile *models.RepoFile
+
+ for _, f := range files {
+ if !f.IsFile() || !base.IsReadmeFile(f.Name) {
+ continue
+ } else {
+ readmeFile = f
+ break
+ }
+ }
+
+ if readmeFile != nil {
+ ctx.Data["ReadmeExist"] = true
+ // if file large than 1M not show it
+ if readmeFile.Size > 1024*1024 || readmeFile.Filemode != git.FileModeBlob {
+ ctx.Data["FileIsLarge"] = true
+ } else if blob, err := readmeFile.LookupBlob(); err != nil {
+ log.Error("repo.Single(readmeFile.LookupBlob): %v", err)
+ ctx.Error(404)
+ return
+ } else {
+ // current repo branch link
+
+ ctx.Data["FileName"] = readmeFile.Name
+ ctx.Data["FileContent"] = string(base.RenderMarkdown(blob.Contents(), branchLink))
+ }
+ }
+ }
+
+ ctx.Data["Username"] = params["username"]
+ ctx.Data["Reponame"] = params["reponame"]
+ ctx.Data["Branchname"] = params["branchname"]
+
+ var treenames []string
+ Paths := make([]string, 0)
+
+ if len(treename) > 0 {
+ treenames = strings.Split(treename, "/")
+ for i, _ := range treenames {
+ Paths = append(Paths, strings.Join(treenames[0:i+1], "/"))
+ }
+
+ ctx.Data["HasParentPath"] = true
+ if len(Paths)-2 >= 0 {
+ ctx.Data["ParentPath"] = "/" + Paths[len(Paths)-2]
+ }
+ }
+
+ // Get latest commit according username and repo name
+ commit, err := models.GetCommit(params["username"], params["reponame"],
+ params["branchname"], params["commitid"])
+ if err != nil {
+ log.Error("repo.Single(GetCommit): %v", err)
+ ctx.Error(404)
+ return
+ }
+ ctx.Data["LastCommit"] = commit
+
+ ctx.Data["Paths"] = Paths
+ ctx.Data["Treenames"] = treenames
+ ctx.Data["BranchLink"] = branchLink
+ ctx.HTML(200, "repo/single")
+}
+
+func Http(ctx *middleware.Context, params martini.Params) {
+ /*if !ctx.Repo.IsValid {
+ return
+ }*/
+
+ // TODO: access check
+
+ username := params["username"]
+ reponame := params["reponame"]
+ if strings.HasSuffix(reponame, ".git") {
+ reponame = reponame[:len(reponame)-4]
+ }
+
+ prefix := path.Join("/", username, params["reponame"])
+ server := &webdav.Server{
+ Fs: webdav.Dir(models.RepoPath(username, reponame)),
+ TrimPrefix: prefix,
+ Listings: true,
+ }
+
+ server.ServeHTTP(ctx.ResponseWriter, ctx.Req)
+}
+
+func Setting(ctx *middleware.Context, params martini.Params) {
+ if !ctx.Repo.IsOwner {
+ ctx.Error(404)
+ return
+ }
+
+ ctx.Data["IsRepoToolbarSetting"] = true
+
+ if ctx.Repo.Repository.IsBare {
+ ctx.Data["IsBareRepo"] = true
+ ctx.HTML(200, "repo/setting")
+ return
+ }
+
+ var title string
+ if t, ok := ctx.Data["Title"].(string); ok {
+ title = t
+ }
+
+ if len(params["branchname"]) == 0 {
+ params["branchname"] = "master"
+ }
+
+ ctx.Data["Branchname"] = params["branchname"]
+ ctx.Data["Title"] = title + " - settings"
+ ctx.HTML(200, "repo/setting")
+}
+
+func Commits(ctx *middleware.Context, params martini.Params) {
+ brs, err := models.GetBranches(params["username"], params["reponame"])
+ if err != nil {
+ ctx.Handle(200, "repo.Commits", err)
+ return
+ } else if len(brs) == 0 {
+ ctx.Error(404)
+ return
+ }
+
+ ctx.Data["IsRepoToolbarCommits"] = true
+ commits, err := models.GetCommits(params["username"],
+ params["reponame"], params["branchname"])
+ if err != nil {
+ ctx.Error(404)
+ return
+ }
+ ctx.Data["Username"] = params["username"]
+ ctx.Data["Reponame"] = params["reponame"]
+ ctx.Data["CommitCount"] = commits.Len()
+ ctx.Data["Commits"] = commits
+ ctx.HTML(200, "repo/commits")
+}
+
+func Pulls(ctx *middleware.Context) {
+ ctx.Data["IsRepoToolbarPulls"] = true
+ ctx.HTML(200, "repo/pulls")
+}
+
+func Action(ctx *middleware.Context, params martini.Params) {
+ var err error
+ switch params["action"] {
+ case "watch":
+ err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, true)
+ case "unwatch":
+ err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, false)
+ case "desc":
+ if !ctx.Repo.IsOwner {
+ ctx.Error(404)
+ return
+ }
+
+ ctx.Repo.Repository.Description = ctx.Query("desc")
+ ctx.Repo.Repository.Website = ctx.Query("site")
+ err = models.UpdateRepository(ctx.Repo.Repository)
+ }
+
+ if err != nil {
+ log.Error("repo.Action(%s): %v", params["action"], err)
+ ctx.JSON(200, map[string]interface{}{
+ "ok": false,
+ "err": err.Error(),
+ })
+ return
+ }
+ ctx.JSON(200, map[string]interface{}{
+ "ok": true,
+ })
+}
diff --git a/routers/repo/single.go b/routers/repo/single.go
deleted file mode 100644
index 5906e64fb97..00000000000
--- a/routers/repo/single.go
+++ /dev/null
@@ -1,301 +0,0 @@
-// Copyright 2014 The Gogs Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package repo
-
-import (
- "path"
- "strings"
-
- "github.com/codegangsta/martini"
-
- "github.com/gogits/git"
- "github.com/gogits/webdav"
-
- "github.com/gogits/gogs/models"
- "github.com/gogits/gogs/modules/base"
- "github.com/gogits/gogs/modules/log"
- "github.com/gogits/gogs/modules/middleware"
-)
-
-func Branches(ctx *middleware.Context, params martini.Params) {
- if !ctx.Repo.IsValid {
- return
- }
-
- brs, err := models.GetBranches(params["username"], params["reponame"])
- if err != nil {
- ctx.Handle(200, "repo.Branches", err)
- return
- } else if len(brs) == 0 {
- ctx.Error(404)
- return
- }
-
- ctx.Data["Username"] = params["username"]
- ctx.Data["Reponame"] = params["reponame"]
-
- ctx.Data["Branchname"] = brs[0]
- ctx.Data["Branches"] = brs
- ctx.Data["IsRepoToolbarBranches"] = true
-
- ctx.HTML(200, "repo/branches")
-}
-
-func Single(ctx *middleware.Context, params martini.Params) {
- if !ctx.Repo.IsValid {
- return
- }
-
- if len(params["branchname"]) == 0 {
- params["branchname"] = "master"
- }
-
- // Get tree path
- treename := params["_1"]
-
- if len(treename) > 0 && treename[len(treename)-1] == '/' {
- ctx.Redirect("/"+ctx.Repo.Owner.LowerName+"/"+
- ctx.Repo.Repository.Name+"/src/"+params["branchname"]+"/"+treename[:len(treename)-1], 302)
- return
- }
-
- ctx.Data["IsRepoToolbarSource"] = true
-
- // Branches.
- brs, err := models.GetBranches(params["username"], params["reponame"])
- if err != nil {
- log.Error("repo.Single(GetBranches): %v", err)
- ctx.Error(404)
- return
- } else if ctx.Repo.Repository.IsBare {
- ctx.Data["IsBareRepo"] = true
- ctx.HTML(200, "repo/single")
- return
- }
-
- ctx.Data["Branches"] = brs
-
- repoFile, err := models.GetTargetFile(params["username"], params["reponame"],
- params["branchname"], params["commitid"], treename)
-
- if err != nil && err != models.ErrRepoFileNotExist {
- log.Error("repo.Single(GetTargetFile): %v", err)
- ctx.Error(404)
- return
- }
-
- branchLink := "/" + ctx.Repo.Owner.LowerName + "/" + ctx.Repo.Repository.Name + "/src/" + params["branchname"]
-
- if len(treename) != 0 && repoFile == nil {
- ctx.Error(404)
- return
- }
-
- if repoFile != nil && repoFile.IsFile() {
- if repoFile.Size > 1024*1024 || repoFile.Filemode != git.FileModeBlob {
- ctx.Data["FileIsLarge"] = true
- } else if blob, err := repoFile.LookupBlob(); err != nil {
- log.Error("repo.Single(repoFile.LookupBlob): %v", err)
- ctx.Error(404)
- } else {
- ctx.Data["IsFile"] = true
- ctx.Data["FileName"] = repoFile.Name
- ext := path.Ext(repoFile.Name)
- if len(ext) > 0 {
- ext = ext[1:]
- }
- ctx.Data["FileExt"] = ext
-
- readmeExist := base.IsMarkdownFile(repoFile.Name) || base.IsReadmeFile(repoFile.Name)
- ctx.Data["ReadmeExist"] = readmeExist
- if readmeExist {
- ctx.Data["FileContent"] = string(base.RenderMarkdown(blob.Contents(), ""))
- } else {
- ctx.Data["FileContent"] = string(blob.Contents())
- }
- }
-
- } else {
- // Directory and file list.
- files, err := models.GetReposFiles(params["username"], params["reponame"],
- params["branchname"], params["commitid"], treename)
- if err != nil {
- log.Error("repo.Single(GetReposFiles): %v", err)
- ctx.Error(404)
- return
- }
-
- ctx.Data["Files"] = files
-
- var readmeFile *models.RepoFile
-
- for _, f := range files {
- if !f.IsFile() || !base.IsReadmeFile(f.Name) {
- continue
- } else {
- readmeFile = f
- break
- }
- }
-
- if readmeFile != nil {
- ctx.Data["ReadmeExist"] = true
- // if file large than 1M not show it
- if readmeFile.Size > 1024*1024 || readmeFile.Filemode != git.FileModeBlob {
- ctx.Data["FileIsLarge"] = true
- } else if blob, err := readmeFile.LookupBlob(); err != nil {
- log.Error("repo.Single(readmeFile.LookupBlob): %v", err)
- ctx.Error(404)
- return
- } else {
- // current repo branch link
-
- ctx.Data["FileName"] = readmeFile.Name
- ctx.Data["FileContent"] = string(base.RenderMarkdown(blob.Contents(), branchLink))
- }
- }
- }
-
- ctx.Data["Username"] = params["username"]
- ctx.Data["Reponame"] = params["reponame"]
- ctx.Data["Branchname"] = params["branchname"]
-
- var treenames []string
- Paths := make([]string, 0)
-
- if len(treename) > 0 {
- treenames = strings.Split(treename, "/")
- for i, _ := range treenames {
- Paths = append(Paths, strings.Join(treenames[0:i+1], "/"))
- }
-
- ctx.Data["HasParentPath"] = true
- if len(Paths)-2 >= 0 {
- ctx.Data["ParentPath"] = "/" + Paths[len(Paths)-2]
- }
- }
-
- // Get latest commit according username and repo name
- commit, err := models.GetCommit(params["username"], params["reponame"],
- params["branchname"], params["commitid"])
- if err != nil {
- log.Error("repo.Single(GetCommit): %v", err)
- ctx.Error(404)
- return
- }
- ctx.Data["LastCommit"] = commit
-
- ctx.Data["Paths"] = Paths
- ctx.Data["Treenames"] = treenames
- ctx.Data["BranchLink"] = branchLink
- ctx.HTML(200, "repo/single")
-}
-
-func Http(ctx *middleware.Context, params martini.Params) {
- /*if !ctx.Repo.IsValid {
- return
- }*/
-
- // TODO: access check
-
- username := params["username"]
- reponame := params["reponame"]
- if strings.HasSuffix(reponame, ".git") {
- reponame = reponame[:len(reponame)-4]
- }
-
- prefix := path.Join("/", username, params["reponame"])
- server := &webdav.Server{
- Fs: webdav.Dir(models.RepoPath(username, reponame)),
- TrimPrefix: prefix,
- Listings: true,
- }
-
- server.ServeHTTP(ctx.ResponseWriter, ctx.Req)
-}
-
-func Setting(ctx *middleware.Context, params martini.Params) {
- if !ctx.Repo.IsOwner {
- ctx.Error(404)
- return
- }
-
- ctx.Data["IsRepoToolbarSetting"] = true
-
- if ctx.Repo.Repository.IsBare {
- ctx.Data["IsBareRepo"] = true
- ctx.HTML(200, "repo/setting")
- return
- }
-
- var title string
- if t, ok := ctx.Data["Title"].(string); ok {
- title = t
- }
-
- if len(params["branchname"]) == 0 {
- params["branchname"] = "master"
- }
-
- ctx.Data["Branchname"] = params["branchname"]
- ctx.Data["Title"] = title + " - settings"
- ctx.HTML(200, "repo/setting")
-}
-
-func Commits(ctx *middleware.Context, params martini.Params) {
- brs, err := models.GetBranches(params["username"], params["reponame"])
- if err != nil {
- ctx.Handle(200, "repo.Commits", err)
- return
- } else if len(brs) == 0 {
- ctx.Error(404)
- return
- }
-
- ctx.Data["IsRepoToolbarCommits"] = true
- commits, err := models.GetCommits(params["username"],
- params["reponame"], params["branchname"])
- if err != nil {
- ctx.Error(404)
- return
- }
- ctx.Data["Username"] = params["username"]
- ctx.Data["Reponame"] = params["reponame"]
- ctx.Data["CommitCount"] = commits.Len()
- ctx.Data["Commits"] = commits
- ctx.HTML(200, "repo/commits")
-}
-
-func Issues(ctx *middleware.Context) {
- ctx.Data["IsRepoToolbarIssues"] = true
- ctx.HTML(200, "repo/issues")
-}
-
-func Pulls(ctx *middleware.Context) {
- ctx.Data["IsRepoToolbarPulls"] = true
- ctx.HTML(200, "repo/pulls")
-}
-
-func Action(ctx *middleware.Context, params martini.Params) {
- var err error
- switch params["action"] {
- case "watch":
- err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, true)
- case "unwatch":
- err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, false)
- }
-
- if err != nil {
- log.Error("repo.Action(%s): %v", params["action"], err)
- ctx.JSON(200, map[string]interface{}{
- "ok": false,
- "err": err.Error(),
- })
- return
- }
- ctx.JSON(200, map[string]interface{}{
- "ok": true,
- })
-}
From b3cfd9fe0c293ba9d84d38ec140db2c01b1e3109 Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Sat, 22 Mar 2014 14:27:03 -0400
Subject: [PATCH 11/19] Fix SSH key bug in windows
---
models/publickey.go | 45 +++++++++++++++++++++--------------
models/repo.go | 2 +-
models/user.go | 2 +-
modules/middleware/auth.go | 1 +
modules/middleware/context.go | 4 ----
routers/repo/issue.go | 10 ++++++++
6 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/models/publickey.go b/models/publickey.go
index c69bca681d6..9e7cc6f740c 100644
--- a/models/publickey.go
+++ b/models/publickey.go
@@ -19,6 +19,8 @@ import (
"time"
"github.com/Unknwon/com"
+
+ "github.com/gogits/gogs/modules/log"
)
const (
@@ -99,8 +101,8 @@ func AddPublicKey(key *PublicKey) (err error) {
}
// Calculate fingerprint.
- tmpPath := filepath.Join(os.TempDir(), fmt.Sprintf("%d", time.Now().Nanosecond()),
- "id_rsa.pub")
+ tmpPath := strings.Replace(filepath.Join(os.TempDir(), fmt.Sprintf("%d", time.Now().Nanosecond()),
+ "id_rsa.pub"), "\\", "/", -1)
os.MkdirAll(path.Dir(tmpPath), os.ModePerm)
if err = ioutil.WriteFile(tmpPath, []byte(key.Content), os.ModePerm); err != nil {
return err
@@ -127,25 +129,11 @@ func AddPublicKey(key *PublicKey) (err error) {
return nil
}
-// DeletePublicKey deletes SSH key information both in database and authorized_keys file.
-func DeletePublicKey(key *PublicKey) (err error) {
- // Delete SSH key in database.
- has, err := orm.Id(key.Id).Get(key)
- if err != nil {
- return err
- } else if !has {
- return errors.New("Public key does not exist")
- }
- if _, err = orm.Delete(key); err != nil {
- return err
- }
-
+func rewriteAuthorizedKeys(key *PublicKey, p, tmpP string) error {
// Delete SSH key in SSH key file.
sshOpLocker.Lock()
defer sshOpLocker.Unlock()
- p := filepath.Join(sshPath, "authorized_keys")
- tmpP := filepath.Join(sshPath, "authorized_keys.tmp")
fr, err := os.Open(p)
if err != nil {
return err
@@ -188,8 +176,29 @@ func DeletePublicKey(key *PublicKey) (err error) {
break
}
}
+ return nil
+}
- if err = os.Remove(p); err != nil {
+// DeletePublicKey deletes SSH key information both in database and authorized_keys file.
+func DeletePublicKey(key *PublicKey) (err error) {
+ // Delete SSH key in database.
+ has, err := orm.Id(key.Id).Get(key)
+ if err != nil {
+ return err
+ } else if !has {
+ return errors.New("Public key does not exist")
+ }
+ if _, err = orm.Delete(key); err != nil {
+ return err
+ }
+
+ p := filepath.Join(sshPath, "authorized_keys")
+ tmpP := filepath.Join(sshPath, "authorized_keys.tmp")
+ log.Trace("ssh.DeletePublicKey(authorized_keys): %s", p)
+
+ if err = rewriteAuthorizedKeys(key, p, tmpP); err != nil {
+ return err
+ } else if err = os.Remove(p); err != nil {
return err
}
return os.Rename(tmpP, p)
diff --git a/models/repo.go b/models/repo.go
index fb115de5909..317f936ece2 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -372,7 +372,7 @@ func RepoPath(userName, repoName string) string {
}
func UpdateRepository(repo *Repository) error {
- _, err := orm.Id(repo.Id).UseBool().Update(repo)
+ _, err := orm.Id(repo.Id).UseBool().Cols("description", "website").Update(repo)
return err
}
diff --git a/models/user.go b/models/user.go
index d6dc0414907..88c29ae43e7 100644
--- a/models/user.go
+++ b/models/user.go
@@ -201,7 +201,7 @@ func VerifyUserActiveCode(code string) (user *User) {
// UpdateUser updates user's information.
func UpdateUser(user *User) (err error) {
- _, err = orm.Id(user.Id).UseBool().Update(user)
+ _, err = orm.Id(user.Id).UseBool().Cols("website", "location").Update(user)
return err
}
diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go
index b557188ee92..3224b3df91a 100644
--- a/modules/middleware/auth.go
+++ b/modules/middleware/auth.go
@@ -49,6 +49,7 @@ func Toggle(options *ToggleOptions) martini.Handler {
ctx.Error(403)
return
}
+ ctx.Data["PageIsAdmin"] = true
}
}
}
diff --git a/modules/middleware/context.go b/modules/middleware/context.go
index b28953fc0ed..5727b4f094a 100644
--- a/modules/middleware/context.go
+++ b/modules/middleware/context.go
@@ -216,10 +216,6 @@ func InitContext() martini.Handler {
ctx.Data["SignedUserId"] = user.Id
ctx.Data["SignedUserName"] = user.LowerName
ctx.Data["IsAdmin"] = ctx.User.IsAdmin
-
- if ctx.User.IsAdmin {
- ctx.Data["PageIsAdmin"] = true
- }
}
// get or create csrf token
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index c6af8ca0bc4..eee55c6fdae 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -28,3 +28,13 @@ func Issues(ctx *middleware.Context, params martini.Params) {
ctx.HTML(200, "repo/issues")
}
+
+func CreateIssue(ctx *middleware.Context, params martini.Params) {
+ if !ctx.Repo.IsOwner {
+ ctx.Error(404)
+ return
+ }
+ // else if err = models.CreateIssue(userId, repoId, milestoneId, assigneeId, name, labels, mentions, content, isPull); err != nil {
+
+ // }
+}
From 59ffdbf6f80328f9b9074930444dedd936aeae51 Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Sat, 22 Mar 2014 16:00:46 -0400
Subject: [PATCH 12/19] Add create, list, view issue
---
README.md | 2 +-
models/action.go | 2 +-
models/issue.go | 46 +++++++++++++++----
models/publickey.go | 2 +-
models/repo.go | 7 +++
models/user.go | 7 +++
modules/auth/issue.go | 54 +++++++++++++++++++++++
routers/repo/issue.go | 51 +++++++++++++++++++--
routers/repo/repo.go | 5 +++
templates/admin/repos.tmpl | 2 +-
web.go | 90 +++++++++++++++++++++++---------------
11 files changed, 217 insertions(+), 51 deletions(-)
create mode 100644 modules/auth/issue.go
diff --git a/README.md b/README.md
index 35044927ffa..89a346d6027 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Gogs(Go Git Service) is a GitHub-like clone in the Go Programming Language.
Since we choose to use pure Go implementation of Git manipulation, Gogs certainly supports **ALL platforms** that Go supports, including Linux, Max OS X, and Windows with **ZERO** dependency.
-##### Current version: 0.1.5 Alpha
+##### Current version: 0.1.6 Alpha
## Purpose
diff --git a/models/action.go b/models/action.go
index a996e16aa81..cfb124363cd 100644
--- a/models/action.go
+++ b/models/action.go
@@ -30,7 +30,7 @@ type Action struct {
ActUserName string // Action user name.
RepoId int64
RepoName string
- Content string
+ Content string `xorm:"TEXT"`
Created time.Time `xorm:"created"`
}
diff --git a/models/issue.go b/models/issue.go
index 0b6ca4c323a..f78c240cbc4 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -5,12 +5,17 @@
package models
import (
+ "errors"
"strings"
"time"
"github.com/gogits/gogs/modules/base"
)
+var (
+ ErrIssueNotExist = errors.New("Issue does not exist")
+)
+
// Issue represents an issue or pull request of repository.
type Issue struct {
Id int64
@@ -22,22 +27,25 @@ type Issue struct {
AssigneeId int64
IsPull bool // Indicates whether is a pull request or not.
IsClosed bool
- Labels string
- Mentions string
- Content string
+ Labels string `xorm:"TEXT"`
+ Mentions string `xorm:"TEXT"`
+ Content string `xorm:"TEXT"`
NumComments int
Created time.Time `xorm:"created"`
Updated time.Time `xorm:"updated"`
}
// CreateIssue creates new issue for repository.
-func CreateIssue(userId, repoId, milestoneId, assigneeId int64, name, labels, mentions, content string, isPull bool) error {
+func CreateIssue(userId, repoId, milestoneId, assigneeId int64, name, labels, content string, isPull bool) (*Issue, error) {
count, err := GetIssueCount(repoId)
if err != nil {
- return err
+ return nil, err
}
- _, err = orm.Insert(&Issue{
+ // TODO: find out mentions
+ mentions := ""
+
+ issue := &Issue{
Index: count + 1,
Name: name,
RepoId: repoId,
@@ -48,8 +56,9 @@ func CreateIssue(userId, repoId, milestoneId, assigneeId int64, name, labels, me
Labels: labels,
Mentions: mentions,
Content: content,
- })
- return err
+ }
+ _, err = orm.Insert(issue)
+ return issue, err
}
// GetIssueCount returns count of issues in the repository.
@@ -57,9 +66,28 @@ func GetIssueCount(repoId int64) (int64, error) {
return orm.Count(&Issue{RepoId: repoId})
}
+// GetIssueById returns issue object by given id.
+func GetIssueById(id int64) (*Issue, error) {
+ issue := new(Issue)
+ has, err := orm.Id(id).Get(issue)
+ if err != nil {
+ return nil, err
+ } else if !has {
+ return nil, ErrIssueNotExist
+ }
+ return issue, nil
+}
+
// GetIssues returns a list of issues by given conditions.
func GetIssues(userId, repoId, posterId, milestoneId int64, page int, isClosed, isMention bool, labels, sortType string) ([]Issue, error) {
- sess := orm.Limit(20, (page-1)*20).Where("repo_id=?", repoId).And("is_closed=?", isClosed)
+ sess := orm.Limit(20, (page-1)*20)
+
+ if repoId > 0 {
+ sess = sess.Where("repo_id=?", repoId).And("is_closed=?", isClosed)
+ } else {
+ sess = sess.Where("is_closed=?", isClosed)
+ }
+
if userId > 0 {
sess = sess.And("assignee_id=?", userId)
} else if posterId > 0 {
diff --git a/models/publickey.go b/models/publickey.go
index 9e7cc6f740c..3f2fcabd3b4 100644
--- a/models/publickey.go
+++ b/models/publickey.go
@@ -80,7 +80,7 @@ type PublicKey struct {
OwnerId int64 `xorm:"index"`
Name string `xorm:"unique not null"`
Fingerprint string
- Content string `xorm:"text not null"`
+ Content string `xorm:"TEXT not null"`
Created time.Time `xorm:"created"`
Updated time.Time `xorm:"updated"`
}
diff --git a/models/repo.go b/models/repo.go
index 317f936ece2..a37923c8b1f 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -372,6 +372,13 @@ func RepoPath(userName, repoName string) string {
}
func UpdateRepository(repo *Repository) error {
+ if len(repo.Description) > 255 {
+ repo.Description = repo.Description[:255]
+ }
+ if len(repo.Website) > 255 {
+ repo.Website = repo.Website[:255]
+ }
+
_, err := orm.Id(repo.Id).UseBool().Cols("description", "website").Update(repo)
return err
}
diff --git a/models/user.go b/models/user.go
index 88c29ae43e7..9333d1ee678 100644
--- a/models/user.go
+++ b/models/user.go
@@ -201,6 +201,13 @@ func VerifyUserActiveCode(code string) (user *User) {
// UpdateUser updates user's information.
func UpdateUser(user *User) (err error) {
+ if len(user.Location) > 255 {
+ user.Location = user.Location[:255]
+ }
+ if len(user.Website) > 255 {
+ user.Website = user.Website[:255]
+ }
+
_, err = orm.Id(user.Id).UseBool().Cols("website", "location").Update(user)
return err
}
diff --git a/modules/auth/issue.go b/modules/auth/issue.go
new file mode 100644
index 00000000000..e2b1f9f2a73
--- /dev/null
+++ b/modules/auth/issue.go
@@ -0,0 +1,54 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package auth
+
+import (
+ "net/http"
+ "reflect"
+
+ "github.com/codegangsta/martini"
+
+ "github.com/gogits/binding"
+
+ "github.com/gogits/gogs/modules/base"
+ "github.com/gogits/gogs/modules/log"
+)
+
+type CreateIssueForm struct {
+ IssueName string `form:"name" binding:"Required;MaxSize(50)"`
+ RepoId int64 `form:"repoid" binding:"Required"`
+ MilestoneId int64 `form:"milestoneid" binding:"Required"`
+ AssigneeId int64 `form:"assigneeid"`
+ Labels string `form:"labels"`
+ Content string `form:"content"`
+}
+
+func (f *CreateIssueForm) Name(field string) string {
+ names := map[string]string{
+ "IssueName": "Issue name",
+ "RepoId": "Repository ID",
+ "MilestoneId": "Milestone ID",
+ }
+ return names[field]
+}
+
+func (f *CreateIssueForm) Validate(errors *binding.Errors, req *http.Request, context martini.Context) {
+ if req.Method == "GET" || errors.Count() == 0 {
+ return
+ }
+
+ data := context.Get(reflect.TypeOf(base.TmplData{})).Interface().(base.TmplData)
+ data["HasError"] = true
+ AssignForm(f, data)
+
+ if len(errors.Overall) > 0 {
+ for _, err := range errors.Overall {
+ log.Error("CreateIssueForm.Validate: %v", err)
+ }
+ return
+ }
+
+ validate(errors, data, f)
+}
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index eee55c6fdae..154e8308aba 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -5,14 +5,19 @@
package repo
import (
+ "fmt"
+
"github.com/codegangsta/martini"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/modules/auth"
"github.com/gogits/gogs/modules/base"
+ "github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/middleware"
)
func Issues(ctx *middleware.Context, params martini.Params) {
+ ctx.Data["Title"] = "Issues"
ctx.Data["IsRepoToolbarIssues"] = true
milestoneId, _ := base.StrTo(params["milestone"]).Int()
@@ -29,12 +34,52 @@ func Issues(ctx *middleware.Context, params martini.Params) {
ctx.HTML(200, "repo/issues")
}
-func CreateIssue(ctx *middleware.Context, params martini.Params) {
+func CreateIssue(ctx *middleware.Context, params martini.Params, form auth.CreateIssueForm) {
if !ctx.Repo.IsOwner {
ctx.Error(404)
return
}
- // else if err = models.CreateIssue(userId, repoId, milestoneId, assigneeId, name, labels, mentions, content, isPull); err != nil {
- // }
+ ctx.Data["Title"] = "Create issue"
+
+ if ctx.Req.Method == "GET" {
+ ctx.HTML(200, "issue/create")
+ return
+ }
+
+ if ctx.HasError() {
+ ctx.HTML(200, "issue/create")
+ return
+ }
+
+ issue, err := models.CreateIssue(ctx.User.Id, form.RepoId, form.MilestoneId, form.AssigneeId,
+ form.IssueName, form.Labels, form.Content, false)
+ if err == nil {
+ log.Trace("%s Issue created: %d", form.RepoId, issue.Id)
+ ctx.Redirect(fmt.Sprintf("/%s/%s/issues/%d", params["username"], params["reponame"], issue.Index), 302)
+ return
+ }
+ ctx.Handle(200, "issue.CreateIssue", err)
+}
+
+func ViewIssue(ctx *middleware.Context, params martini.Params) {
+ issueid, err := base.StrTo(params["issueid"]).Int()
+ if err != nil {
+ ctx.Error(404)
+ return
+ }
+
+ issue, err := models.GetIssueById(int64(issueid))
+ if err != nil {
+ if err == models.ErrIssueNotExist {
+ ctx.Error(404)
+ } else {
+ ctx.Handle(200, "issue.ViewIssue", err)
+ }
+ return
+ }
+
+ ctx.Data["Title"] = issue.Name
+ ctx.Data["Issue"] = issue
+ ctx.HTML(200, "issue/view")
}
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index ff0fa85dde8..c436d387145 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -31,6 +31,11 @@ func Create(ctx *middleware.Context, form auth.CreateRepoForm) {
return
}
+ if ctx.HasError() {
+ ctx.HTML(200, "repo/create")
+ return
+ }
+
_, err := models.CreateRepository(ctx.User, form.RepoName, form.Description,
form.Language, form.License, form.Visibility == "private", form.InitReadme == "on")
if err == nil {
diff --git a/templates/admin/repos.tmpl b/templates/admin/repos.tmpl
index a1f41d8365a..2c91ccc0965 100644
--- a/templates/admin/repos.tmpl
+++ b/templates/admin/repos.tmpl
@@ -27,7 +27,7 @@
<td>{{.Id}}</td>
<th>{{.UserName}}</th>
<td><a href="/{{.UserName}}/{{.Name}}">{{.Name}}</a></td>
- <td><i class="fa fa{{if .Private}}-check{{end}}-square-o"></i></td>
+ <td><i class="fa fa{{if .IsPrivate}}-check{{end}}-square-o"></i></td>
<td>{{.NumWatches}}</td>
<td>{{.NumForks}}</td>
<td>{{DateFormat .Created "M d, Y"}}</td>
diff --git a/web.go b/web.go
index 0da2d129d09..bf654aace2a 100644
--- a/web.go
+++ b/web.go
@@ -91,53 +91,73 @@ func runWeb(*cli.Context) {
m.Get("/issues", reqSignIn, user.Issues)
m.Get("/pulls", reqSignIn, user.Pulls)
m.Get("/stars", reqSignIn, user.Stars)
- m.Any("/user/login", reqSignOut, binding.BindIgnErr(auth.LogInForm{}), user.SignIn)
- m.Any("/user/logout", reqSignIn, user.SignOut)
- m.Any("/user/sign_up", reqSignOut, binding.BindIgnErr(auth.RegisterForm{}), user.SignUp)
- m.Any("/user/delete", reqSignIn, user.Delete)
- m.Get("/user/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds)
- m.Get("/user/activate", user.Activate)
+ m.Get("/help", routers.Help)
- m.Any("/user/setting", reqSignIn, binding.BindIgnErr(auth.UpdateProfileForm{}), user.Setting)
- m.Any("/user/setting/password", reqSignIn, binding.BindIgnErr(auth.UpdatePasswdForm{}), user.SettingPassword)
- m.Any("/user/setting/ssh", reqSignIn, binding.BindIgnErr(auth.AddSSHKeyForm{}), user.SettingSSHKeys)
- m.Any("/user/setting/notification", reqSignIn, user.SettingNotification)
- m.Any("/user/setting/security", reqSignIn, user.SettingSecurity)
+ m.Group("/user", func(r martini.Router) {
+ r.Any("/login", binding.BindIgnErr(auth.LogInForm{}), user.SignIn)
+ r.Any("/sign_up", reqSignOut, binding.BindIgnErr(auth.RegisterForm{}), user.SignUp)
+ }, reqSignOut)
+ m.Group("/user", func(r martini.Router) {
+ r.Any("/logout", user.SignOut)
+ r.Any("/delete", user.Delete)
+ r.Any("/setting", binding.BindIgnErr(auth.UpdateProfileForm{}), user.Setting)
+ }, reqSignIn)
+ m.Group("/user", func(r martini.Router) {
+ r.Get("/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds)
+ r.Get("/activate", user.Activate)
+ })
+
+ m.Group("/user/setting", func(r martini.Router) {
+ r.Any("/password", binding.BindIgnErr(auth.UpdatePasswdForm{}), user.SettingPassword)
+ r.Any("/ssh", binding.BindIgnErr(auth.AddSSHKeyForm{}), user.SettingSSHKeys)
+ r.Any("/notification", user.SettingNotification)
+ r.Any("/security", user.SettingSecurity)
+ }, reqSignIn)
m.Get("/user/:username", ignSignIn, user.Profile)
m.Any("/repo/create", reqSignIn, binding.BindIgnErr(auth.CreateRepoForm{}), repo.Create)
- m.Get("/help", routers.Help)
-
adminReq := middleware.Toggle(&middleware.ToggleOptions{SignInRequire: true, AdminRequire: true})
m.Get("/admin", adminReq, admin.Dashboard)
- m.Get("/admin/users", adminReq, admin.Users)
- m.Any("/admin/users/new", adminReq, binding.BindIgnErr(auth.RegisterForm{}), admin.NewUser)
- m.Any("/admin/users/:userid", adminReq, binding.BindIgnErr(auth.AdminEditUserForm{}), admin.EditUser)
- m.Any("/admin/users/:userid/delete", adminReq, admin.DeleteUser)
- m.Get("/admin/repos", adminReq, admin.Repositories)
- m.Get("/admin/config", adminReq, admin.Config)
+ m.Group("/admin", func(r martini.Router) {
+ r.Get("/users", admin.Users)
+ r.Get("/repos", admin.Repositories)
+ r.Get("/config", admin.Config)
+ }, adminReq)
+ m.Group("/admin/users", func(r martini.Router) {
+ r.Any("/new", binding.BindIgnErr(auth.RegisterForm{}), admin.NewUser)
+ r.Any("/:userid", binding.BindIgnErr(auth.AdminEditUserForm{}), admin.EditUser)
+ r.Any("/:userid/delete", admin.DeleteUser)
+ }, adminReq)
- m.Post("/:username/:reponame/settings", reqSignIn, middleware.RepoAssignment(true), repo.SettingPost)
- m.Get("/:username/:reponame/settings", reqSignIn, middleware.RepoAssignment(true), repo.Setting)
+ m.Group("/:username/:reponame", func(r martini.Router) {
+ r.Post("/settings", repo.SettingPost)
+ r.Get("/settings", repo.Setting)
+ r.Get("/action/:action", repo.Action)
+ }, reqSignIn, middleware.RepoAssignment(true))
+ m.Group("/:username/:reponame", func(r martini.Router) {
+ r.Get("/commits/:branchname", repo.Commits)
+ r.Get("/issues", repo.Issues)
+ r.Any("/issues/new", binding.BindIgnErr(auth.CreateIssueForm{}), repo.CreateIssue)
+ r.Get("/issues/:issueid", repo.ViewIssue)
+ r.Get("/pulls", repo.Pulls)
+ r.Get("/branches", repo.Branches)
+ r.Get("/src/:branchname", repo.Single)
+ r.Get("/src/:branchname/**", repo.Single)
+ r.Get("/commits/:branchname", repo.Commits)
+ r.Get("/commits/:branchname", repo.Commits)
+ }, ignSignIn, middleware.RepoAssignment(true))
- m.Get("/:username/:reponame/commits/:branchname", ignSignIn, middleware.RepoAssignment(true), repo.Commits)
- m.Get("/:username/:reponame/issues", ignSignIn, middleware.RepoAssignment(true), repo.Issues)
- m.Get("/:username/:reponame/pulls", ignSignIn, middleware.RepoAssignment(true), repo.Pulls)
- m.Get("/:username/:reponame/branches", ignSignIn, middleware.RepoAssignment(true), repo.Branches)
- m.Get("/:username/:reponame/action/:action", reqSignIn, middleware.RepoAssignment(true), repo.Action)
- m.Get("/:username/:reponame/src/:branchname/**",
- ignSignIn, middleware.RepoAssignment(true), repo.Single)
- m.Get("/:username/:reponame/src/:branchname",
- ignSignIn, middleware.RepoAssignment(true), repo.Single)
- m.Get("/:username/:reponame/commit/:commitid/**", ignSignIn, middleware.RepoAssignment(true), repo.Single)
- m.Get("/:username/:reponame/commit/:commitid", ignSignIn, middleware.RepoAssignment(true), repo.Single)
+ // TODO: implement single commit page
+ // m.Get("/:username/:reponame/commit/:commitid/**", ignSignIn, middleware.RepoAssignment(true), repo.Single)
+ // m.Get("/:username/:reponame/commit/:commitid", ignSignIn, middleware.RepoAssignment(true), repo.Single)
- m.Get("/:username/:reponame", ignSignIn, middleware.RepoAssignment(true), repo.Single)
-
- m.Any("/:username/:reponame/**", ignSignIn, repo.Http)
+ m.Group("/:username", func(r martini.Router) {
+ r.Get("/:reponame", middleware.RepoAssignment(true), repo.Single)
+ r.Any("/:reponame/**", repo.Http)
+ }, ignSignIn)
if martini.Env == martini.Dev {
m.Get("/template/**", dev.TemplatePreview)
From cb52f6d07d62925a31185fedf591d0241ee2bf63 Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Sat, 22 Mar 2014 16:40:09 -0400
Subject: [PATCH 13/19] Add auto-login
---
conf/app.ini | 4 ++++
modules/auth/auth.go | 1 +
modules/base/conf.go | 8 +++++++
modules/middleware/context.go | 43 +++++++++++++++++++++++++++++++++++
routers/user/user.go | 42 +++++++++++++++++++++++++++++++++-
templates/user/signin.tmpl | 11 +++++++++
6 files changed, 108 insertions(+), 1 deletion(-)
diff --git a/conf/app.ini b/conf/app.ini
index ec5fcb23b34..7f283012fde 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -34,6 +34,10 @@ PATH = data/gogs.db
[security]
; !!CHANGE THIS TO KEEP YOUR USER DATA SAFE!!
SECRET_KEY = !#@FDEWREWR&*(
+; Auto-login remember days
+LOGIN_REMEMBER_DAYS = 7
+COOKIE_USERNAME = gogs_awesome
+COOKIE_REMEMBER_NAME = gogs_incredible
[service]
ACTIVE_CODE_LIVE_MINUTES = 180
diff --git a/modules/auth/auth.go b/modules/auth/auth.go
index 0e87168891f..2e0555f6df3 100644
--- a/modules/auth/auth.go
+++ b/modules/auth/auth.go
@@ -61,6 +61,7 @@ func (f *RegisterForm) Validate(errors *binding.Errors, req *http.Request, conte
type LogInForm struct {
UserName string `form:"username" binding:"Required;AlphaDash;MaxSize(30)"`
Password string `form:"passwd" binding:"Required;MinSize(6);MaxSize(30)"`
+ Remember string `form:"remember"`
}
func (f *LogInForm) Name(field string) string {
diff --git a/modules/base/conf.go b/modules/base/conf.go
index 7c8ed936548..cdbe2b36ce7 100644
--- a/modules/base/conf.go
+++ b/modules/base/conf.go
@@ -38,6 +38,10 @@ var (
RunUser string
RepoRootPath string
+ LogInRememberDays int
+ CookieUserName string
+ CookieRememberName string
+
Cfg *goconfig.ConfigFile
MailService *Mailer
@@ -252,6 +256,10 @@ func NewConfigContext() {
SecretKey = Cfg.MustValue("security", "SECRET_KEY")
RunUser = Cfg.MustValue("", "RUN_USER")
+ LogInRememberDays = Cfg.MustInt("security", "LOGIN_REMEMBER_DAYS")
+ CookieUserName = Cfg.MustValue("security", "COOKIE_USERNAME")
+ CookieRememberName = Cfg.MustValue("security", "COOKIE_REMEMBER_NAME")
+
PictureService = Cfg.MustValue("picture", "SERVICE")
PictureRootPath = Cfg.MustValue("picture", "PATH")
diff --git a/modules/middleware/context.go b/modules/middleware/context.go
index 5727b4f094a..d81ab999bfb 100644
--- a/modules/middleware/context.go
+++ b/modules/middleware/context.go
@@ -5,9 +5,14 @@
package middleware
import (
+ "crypto/hmac"
+ "crypto/sha1"
+ "encoding/base64"
"fmt"
"html/template"
"net/http"
+ "strconv"
+ "strings"
"time"
"github.com/codegangsta/martini"
@@ -155,6 +160,44 @@ func (ctx *Context) SetCookie(name string, value string, others ...interface{})
ctx.Res.Header().Add("Set-Cookie", cookie.String())
}
+// Get secure cookie from request by a given key.
+func (ctx *Context) GetSecureCookie(Secret, key string) (string, bool) {
+ val := ctx.GetCookie(key)
+ if val == "" {
+ return "", false
+ }
+
+ parts := strings.SplitN(val, "|", 3)
+
+ if len(parts) != 3 {
+ return "", false
+ }
+
+ vs := parts[0]
+ timestamp := parts[1]
+ sig := parts[2]
+
+ h := hmac.New(sha1.New, []byte(Secret))
+ fmt.Fprintf(h, "%s%s", vs, timestamp)
+
+ if fmt.Sprintf("%02x", h.Sum(nil)) != sig {
+ return "", false
+ }
+ res, _ := base64.URLEncoding.DecodeString(vs)
+ return string(res), true
+}
+
+// Set Secure cookie for response.
+func (ctx *Context) SetSecureCookie(Secret, name, value string, others ...interface{}) {
+ vs := base64.URLEncoding.EncodeToString([]byte(value))
+ timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
+ h := hmac.New(sha1.New, []byte(Secret))
+ fmt.Fprintf(h, "%s%s", vs, timestamp)
+ sig := fmt.Sprintf("%02x", h.Sum(nil))
+ cookie := strings.Join([]string{vs, timestamp, sig}, "|")
+ ctx.SetCookie(name, cookie, others...)
+}
+
func (ctx *Context) CsrfToken() string {
if len(ctx.csrfToken) > 0 {
return ctx.csrfToken
diff --git a/routers/user/user.go b/routers/user/user.go
index 22446977143..56bc5f8e375 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -77,7 +77,39 @@ func SignIn(ctx *middleware.Context, form auth.LogInForm) {
ctx.Data["Title"] = "Log In"
if ctx.Req.Method == "GET" {
- ctx.HTML(200, "user/signin")
+ // Check auto-login.
+ userName := ctx.GetCookie(base.CookieUserName)
+ if len(userName) == 0 {
+ ctx.HTML(200, "user/signin")
+ return
+ }
+
+ isSucceed := false
+ defer func() {
+ if !isSucceed {
+ log.Trace("%s auto-login cookie cleared: %s", ctx.Req.RequestURI, userName)
+ ctx.SetCookie(base.CookieUserName, "", -1)
+ ctx.SetCookie(base.CookieRememberName, "", -1)
+ }
+ }()
+
+ user, err := models.GetUserByName(userName)
+ if err != nil {
+ ctx.HTML(200, "user/signin")
+ return
+ }
+
+ secret := base.EncodeMd5(user.Rands + user.Passwd)
+ value, _ := ctx.GetSecureCookie(secret, base.CookieRememberName)
+ if value != user.Name {
+ ctx.HTML(200, "user/signin")
+ return
+ }
+
+ isSucceed = true
+ ctx.Session.Set("userId", user.Id)
+ ctx.Session.Set("userName", user.Name)
+ ctx.Redirect("/")
return
}
@@ -89,6 +121,7 @@ func SignIn(ctx *middleware.Context, form auth.LogInForm) {
user, err := models.LoginUserPlain(form.UserName, form.Password)
if err != nil {
if err == models.ErrUserNotExist {
+ log.Trace("%s Log in failed: %s/%s", ctx.Req.RequestURI, form.UserName, form.Password)
ctx.RenderWithErr("Username or password is not correct", "user/signin", &form)
return
}
@@ -97,6 +130,13 @@ func SignIn(ctx *middleware.Context, form auth.LogInForm) {
return
}
+ if form.Remember == "on" {
+ secret := base.EncodeMd5(user.Rands + user.Passwd)
+ days := 86400 * base.LogInRememberDays
+ ctx.SetCookie(base.CookieUserName, user.Name, days)
+ ctx.SetSecureCookie(secret, base.CookieRememberName, user.Name, days)
+ }
+
ctx.Session.Set("userId", user.Id)
ctx.Session.Set("userName", user.Name)
ctx.Redirect("/")
diff --git a/templates/user/signin.tmpl b/templates/user/signin.tmpl
index 8dc7292ff8b..1cd3275cce1 100644
--- a/templates/user/signin.tmpl
+++ b/templates/user/signin.tmpl
@@ -19,6 +19,17 @@
</div>
</div>
+ <div class="form-group">
+ <div class="col-md-6 col-md-offset-4">
+ <div class="checkbox">
+ <label>
+ <input type="checkbox" name="remember" {{if .remember}}checked{{end}}>
+ <strong>Remember me</strong>
+ </label>
+ </div>
+ </div>
+ </div>
+
<div class="form-group">
<div class="col-md-offset-4 col-md-6">
<button type="submit" class="btn btn-lg btn-primary">Log In</button>
From 7356153ba3c19ff49f3ecfa28bac0b8bb38eccb9 Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Sat, 22 Mar 2014 17:59:22 -0400
Subject: [PATCH 14/19] Batch updates
---
README.md | 4 ++--
conf/app.ini | 10 ++++++++--
modules/base/conf.go | 4 ++++
modules/middleware/auth.go | 3 +++
routers/admin/user.go | 2 +-
routers/repo/issue.go | 2 +-
routers/repo/repo.go | 8 ++++----
routers/user/user.go | 21 ++++++++++++++++++---
8 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/README.md b/README.md
index 89a346d6027..325c3a97369 100644
--- a/README.md
+++ b/README.md
@@ -43,8 +43,8 @@ There are two ways to install Gogs:
## Acknowledgments
- Logo is inspired by [martini](https://github.com/martini-contrib).
-- Mail Service is based on [WeTalk](https://github.com/beego/wetalk).
-- System Monitor Status is based on [GoBlog](https://github.com/fuxiaohei/goblog).
+- Mail Service, modules design is inspired by [WeTalk](https://github.com/beego/wetalk).
+- System Monitor Status is inspired by [GoBlog](https://github.com/fuxiaohei/goblog).
## Contributors
diff --git a/conf/app.ini b/conf/app.ini
index 7f283012fde..b051557f41b 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -107,7 +107,7 @@ SERVICE = server
PATH = data/pictures
[log]
-; Either "console", "file", "conn" or "smtp", default is "console"
+; Either "console", "file", "conn", "smtp" or "database", default is "console"
MODE = console
; Buffer length of channel, keep it as it is if you don't know what it is.
BUFFER_LEN = 10000
@@ -156,4 +156,10 @@ HOST =
USER =
PASSWD =
; Receivers, can be one or more, e.g. ["1@example.com","2@example.com"]
-RECEIVERS =
\ No newline at end of file
+RECEIVERS =
+
+; For "database" mode only
+[log.database]
+LEVEL =
+Driver =
+CONN =
\ No newline at end of file
diff --git a/modules/base/conf.go b/modules/base/conf.go
index cdbe2b36ce7..19f587077b1 100644
--- a/modules/base/conf.go
+++ b/modules/base/conf.go
@@ -143,6 +143,10 @@ func newLogService() {
Cfg.MustValue(modeSec, "HOST", "127.0.0.1:25"),
Cfg.MustValue(modeSec, "RECEIVERS", "[]"),
Cfg.MustValue(modeSec, "SUBJECT", "Diagnostic message from serve"))
+ case "database":
+ LogConfig = fmt.Sprintf(`{"level":%s,"driver":%s,"conn":%s}`, level,
+ Cfg.MustValue(modeSec, "Driver"),
+ Cfg.MustValue(modeSec, "CONN"))
}
log.NewLogger(Cfg.MustInt64("log", "BUFFER_LEN", 10000), LogMode, LogConfig)
diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go
index 3224b3df91a..82c3367c48a 100644
--- a/modules/middleware/auth.go
+++ b/modules/middleware/auth.go
@@ -5,6 +5,8 @@
package middleware
import (
+ "net/url"
+
"github.com/codegangsta/martini"
"github.com/gogits/gogs/modules/base"
@@ -35,6 +37,7 @@ func Toggle(options *ToggleOptions) martini.Handler {
if options.SignInRequire {
if !ctx.IsSigned {
+ ctx.SetCookie("redirect_to", "/"+url.QueryEscape(ctx.Req.RequestURI))
ctx.Redirect("/user/login")
return
} else if !ctx.User.IsActive && base.Service.RegisterEmailConfirm {
diff --git a/routers/admin/user.go b/routers/admin/user.go
index fa27d116648..7f66c5528ca 100644
--- a/routers/admin/user.go
+++ b/routers/admin/user.go
@@ -140,5 +140,5 @@ func DeleteUser(ctx *middleware.Context, params martini.Params) {
log.Trace("%s User deleted by admin(%s): %s", ctx.Req.RequestURI,
ctx.User.LowerName, ctx.User.LowerName)
- ctx.Redirect("/admin/users", 302)
+ ctx.Redirect("/admin/users")
}
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index 154e8308aba..4cc007e9eee 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -56,7 +56,7 @@ func CreateIssue(ctx *middleware.Context, params martini.Params, form auth.Creat
form.IssueName, form.Labels, form.Content, false)
if err == nil {
log.Trace("%s Issue created: %d", form.RepoId, issue.Id)
- ctx.Redirect(fmt.Sprintf("/%s/%s/issues/%d", params["username"], params["reponame"], issue.Index), 302)
+ ctx.Redirect(fmt.Sprintf("/%s/%s/issues/%d", params["username"], params["reponame"], issue.Index))
return
}
ctx.Handle(200, "issue.CreateIssue", err)
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index c436d387145..4782d64f70c 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -40,7 +40,7 @@ func Create(ctx *middleware.Context, form auth.CreateRepoForm) {
form.Language, form.License, form.Visibility == "private", form.InitReadme == "on")
if err == nil {
log.Trace("%s Repository created: %s/%s", ctx.Req.RequestURI, ctx.User.LowerName, form.RepoName)
- ctx.Redirect("/"+ctx.User.Name+"/"+form.RepoName, 302)
+ ctx.Redirect("/" + ctx.User.Name + "/" + form.RepoName)
return
} else if err == models.ErrRepoAlreadyExist {
ctx.RenderWithErr("Repository name has already been used", "repo/create", &form)
@@ -73,7 +73,7 @@ func SettingPost(ctx *middleware.Context) {
}
log.Trace("%s Repository deleted: %s/%s", ctx.Req.RequestURI, ctx.User.LowerName, ctx.Repo.Repository.LowerName)
- ctx.Redirect("/", 302)
+ ctx.Redirect("/")
}
func Branches(ctx *middleware.Context, params martini.Params) {
@@ -113,8 +113,8 @@ func Single(ctx *middleware.Context, params martini.Params) {
treename := params["_1"]
if len(treename) > 0 && treename[len(treename)-1] == '/' {
- ctx.Redirect("/"+ctx.Repo.Owner.LowerName+"/"+
- ctx.Repo.Repository.Name+"/src/"+params["branchname"]+"/"+treename[:len(treename)-1], 302)
+ ctx.Redirect("/" + ctx.Repo.Owner.LowerName + "/" +
+ ctx.Repo.Repository.Name + "/src/" + params["branchname"] + "/" + treename[:len(treename)-1])
return
}
diff --git a/routers/user/user.go b/routers/user/user.go
index 56bc5f8e375..c34b529ec33 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -6,6 +6,7 @@ package user
import (
"fmt"
+ "net/url"
"strings"
"github.com/codegangsta/martini"
@@ -109,7 +110,13 @@ func SignIn(ctx *middleware.Context, form auth.LogInForm) {
isSucceed = true
ctx.Session.Set("userId", user.Id)
ctx.Session.Set("userName", user.Name)
- ctx.Redirect("/")
+ redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to"))
+ if len(redirectTo) > 0 {
+ ctx.SetCookie("redirect_to", "", -1)
+ ctx.Redirect(redirectTo)
+ } else {
+ ctx.Redirect("/")
+ }
return
}
@@ -139,12 +146,20 @@ func SignIn(ctx *middleware.Context, form auth.LogInForm) {
ctx.Session.Set("userId", user.Id)
ctx.Session.Set("userName", user.Name)
- ctx.Redirect("/")
+ redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to"))
+ if len(redirectTo) > 0 {
+ ctx.SetCookie("redirect_to", "", -1)
+ ctx.Redirect(redirectTo)
+ } else {
+ ctx.Redirect("/")
+ }
}
func SignOut(ctx *middleware.Context) {
ctx.Session.Delete("userId")
ctx.Session.Delete("userName")
+ ctx.SetCookie(base.CookieUserName, "", -1)
+ ctx.SetCookie(base.CookieRememberName, "", -1)
ctx.Redirect("/")
}
@@ -314,7 +329,7 @@ func Activate(ctx *middleware.Context) {
ctx.Session.Set("userId", user.Id)
ctx.Session.Set("userName", user.Name)
- ctx.Redirect("/", 302)
+ ctx.Redirect("/")
return
}
From ad31893bbbb1479f6801235ddca44b5bae2cc5c2 Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Sat, 22 Mar 2014 20:25:39 -0400
Subject: [PATCH 15/19] Update README
---
README.md | 14 +++++++----
README_ZH.md | 53 +++++++++++++++++++++++++++++++++++++++++
gogs.go | 2 +-
templates/repo/nav.tmpl | 4 ++--
4 files changed, 65 insertions(+), 8 deletions(-)
create mode 100644 README_ZH.md
diff --git a/README.md b/README.md
index 325c3a97369..504c21975ba 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,19 @@
-Gogs - Go Git Service [](https://app.wercker.com/project/bykey/ad0bdb0bc450ac6f09bc56b9640a50aa) [](https://gowalker.org/github.com/gogits/gogs)
+Gogs - Go Git Service [](https://app.wercker.com/project/bykey/ad0bdb0bc450ac6f09bc56b9640a50aa) [](https://drone.io/github.com/gogits/gogs/latest)
=====================
-Gogs(Go Git Service) is a GitHub-like clone in the Go Programming Language.
+Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language.
-Since we choose to use pure Go implementation of Git manipulation, Gogs certainly supports **ALL platforms** that Go supports, including Linux, Max OS X, and Windows with **ZERO** dependency.
+
##### Current version: 0.1.6 Alpha
+[简体中文](README_ZH.md)
+
## Purpose
-There are some very good products in this category such as [gitlab](http://gitlab.com), but the environment setup steps often make us crazy. So our goal of Gogs is to build a GitHub-like clone with very easy setup steps, which take advantages of the Go Programming Language.
+Since we choose to use pure Go implementation of Git manipulation, Gogs certainly supports **ALL platforms** that Go supports, including Linux, Mac OS X, and Windows with **ZERO** dependency.
+
+More importantly, Gogs only needs one binary to setup your own project hosting on the fly!
## Overview
@@ -23,7 +27,7 @@ There are some very good products in this category such as [gitlab](http://gitla
- Activity timeline
- SSH protocol support.
- Register/delete account.
-- Create/delete public repository.
+- Create/delete/watch public repository.
- User profile page.
- Repository viewer.
- Gravatar support.
diff --git a/README_ZH.md b/README_ZH.md
new file mode 100644
index 00000000000..0ab8dfdd072
--- /dev/null
+++ b/README_ZH.md
@@ -0,0 +1,53 @@
+Gogs - Go Git Service [](https://app.wercker.com/project/bykey/ad0bdb0bc450ac6f09bc56b9640a50aa) [](https://drone.io/github.com/gogits/gogs/latest)
+=====================
+
+Gogs(Go Git Service) 是一个由 Go 语言编写的自助 Git 托管服务。
+
+
+
+##### 当前版本：0.1.6 Alpha
+
+## 开发目的
+
+Gogs 完全使用 Go 语言来实现对 Git 数据的操作，实现 **零** 依赖，并且支持 Go 语言所支持的 **所有平台**，包括 Linux、Mac OS X 以及 Windows。
+
+更重要的是，您只需要一个可执行文件就能借助 Gogs 快速搭建属于您自己的代码托管服务！
+
+## 项目概览
+
+- 有关项目设计、开发说明、变更日志和路线图，请通过 [Wiki](https://github.com/gogits/gogs/wiki) 查看。
+- 您可以到 [Trello Broad](https://trello.com/b/uxAoeLUl/gogs-go-git-service) 跟随开发团队的脚步。
+- 想要先睹为快？通过 [在线体验](http://try.gogits.org/Unknown/gogs) 或查看 **安装部署 -> 二进制安装** 小节。
+- 使用过程中遇到问题？尝试从 [故障排查](https://github.com/gogits/gogs/wiki/Troubleshooting) 页面获取帮助。
+
+## 功能特性
+
+- 活动时间线
+- SSH 协议支持
+- 注册/删除用户
+- 创建/删除/关注公开仓库
+- 用户个人信息页面
+- 仓库浏览器
+- Gravatar 支持
+- 邮件服务（注册）
+- 管理员面板
+- 支持 MySQL、PostgreSQL 以及 SQLite3（仅限二进制版本）
+
+## 安装部署
+
+在安装 Gogs 之前，您需要先安装 [基本环境](https://github.com/gogits/gogs/wiki/Prerequirements)。
+
+然后，您可以通过以下两种方式来安装 Gogs：
+
+- [二进制安装](https://github.com/gogits/gogs/wiki/Install-from-binary): **强烈推荐** 适合体验者和实际部署
+- [源码安装](https://github.com/gogits/gogs/wiki/Install-from-source)
+
+## 特别鸣谢
+
+- Logo 基于 [martini](https://github.com/martini-contrib) 修改而来。
+- 邮件服务、模块设计基于 [WeTalk](https://github.com/beego/wetalk) 修改而来。
+- 系统监视状态基于 [GoBlog](https://github.com/fuxiaohei/goblog) 修改而来。
+
+## 贡献成员
+
+本项目最初由 [Unknown](https://github.com/Unknwon) 和 [lunny](https://github.com/lunny) 发起，随后 [fuxiaohei](https://github.com/fuxiaohei) 与 [slene](https://github.com/slene) 加入到开发团队。您可以通过查看 [贡献者页面](https://github.com/gogits/gogs/graphs/contributors) 获取完整的贡献者列表。
\ No newline at end of file
diff --git a/gogs.go b/gogs.go
index 2bb80a66443..0bdbbc0697e 100644
--- a/gogs.go
+++ b/gogs.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
-// gogs(Go Git Service) is a Go clone of Github.
+// Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language.
package main
import (
diff --git a/templates/repo/nav.tmpl b/templates/repo/nav.tmpl
index d4a692fd034..cf1b7d03892 100644
--- a/templates/repo/nav.tmpl
+++ b/templates/repo/nav.tmpl
@@ -1,11 +1,11 @@
<div id="gogs-body-nav" class="gogs-repo-nav">
<div class="container">
<div class="row">
- <div class="col-md-6">
+ <div class="col-md-7">
<h3 class="name"><i class="fa fa-book fa-lg"></i><a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a> / {{.Repository.Name}}</h3>
<p class="desc">{{.Repository.Description}}{{if .Repository.Website}}<a href="{{.Repository.Website}}">{{.Repository.Website}}</a>{{end}}</p>
</div>
- <div class="col-md-6 actions text-right clone-group-btn">
+ <div class="col-md-5 actions text-right clone-group-btn">
{{if not .IsBareRepo}}
<!--<div class="btn-group" id="gogs-repo-clone">
<button type="button" class="btn btn-default"><i class="fa fa-download fa-lg fa-m"></i></button>
From 47493a0191f3de8aa4e80bce1911f14623cfa46a Mon Sep 17 00:00:00 2001
From: FuXiaoHei <fuxiaohei@hexiaz.com>
Date: Sun, 23 Mar 2014 13:12:55 +0800
Subject: [PATCH 16/19] use ctx.Handle to handle 404 page
---
routers/repo/issue.go | 6 +++---
routers/repo/repo.go | 32 ++++++++++++++++----------------
routers/user/user.go | 2 +-
templates/status/404.tmpl | 7 +++++++
templates/status/500.tmpl | 7 +++++++
5 files changed, 34 insertions(+), 20 deletions(-)
create mode 100644 templates/status/404.tmpl
create mode 100644 templates/status/500.tmpl
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index 4cc007e9eee..78fe4b25d02 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -36,7 +36,7 @@ func Issues(ctx *middleware.Context, params martini.Params) {
func CreateIssue(ctx *middleware.Context, params martini.Params, form auth.CreateIssueForm) {
if !ctx.Repo.IsOwner {
- ctx.Error(404)
+ ctx.Handle(404, "issue.CreateIssue", nil)
return
}
@@ -65,14 +65,14 @@ func CreateIssue(ctx *middleware.Context, params martini.Params, form auth.Creat
func ViewIssue(ctx *middleware.Context, params martini.Params) {
issueid, err := base.StrTo(params["issueid"]).Int()
if err != nil {
- ctx.Error(404)
+ ctx.Handle(404, "issue.ViewIssue", err)
return
}
issue, err := models.GetIssueById(int64(issueid))
if err != nil {
if err == models.ErrIssueNotExist {
- ctx.Error(404)
+ ctx.Handle(404, "issue.ViewIssue", err)
} else {
ctx.Handle(200, "issue.ViewIssue", err)
}
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index 4782d64f70c..0f1ea31235d 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -86,7 +86,7 @@ func Branches(ctx *middleware.Context, params martini.Params) {
ctx.Handle(200, "repo.Branches", err)
return
} else if len(brs) == 0 {
- ctx.Error(404)
+ ctx.Handle(404, "repo.Branches", nil)
return
}
@@ -123,8 +123,8 @@ func Single(ctx *middleware.Context, params martini.Params) {
// Branches.
brs, err := models.GetBranches(params["username"], params["reponame"])
if err != nil {
- log.Error("repo.Single(GetBranches): %v", err)
- ctx.Error(404)
+ //log.Error("repo.Single(GetBranches): %v", err)
+ ctx.Handle(404, "repo.Single(GetBranches)", err)
return
} else if ctx.Repo.Repository.IsBare {
ctx.Data["IsBareRepo"] = true
@@ -138,15 +138,15 @@ func Single(ctx *middleware.Context, params martini.Params) {
params["branchname"], params["commitid"], treename)
if err != nil && err != models.ErrRepoFileNotExist {
- log.Error("repo.Single(GetTargetFile): %v", err)
- ctx.Error(404)
+ //log.Error("repo.Single(GetTargetFile): %v", err)
+ ctx.Handle(404, "repo.Single(GetTargetFile)", err)
return
}
branchLink := "/" + ctx.Repo.Owner.LowerName + "/" + ctx.Repo.Repository.Name + "/src/" + params["branchname"]
if len(treename) != 0 && repoFile == nil {
- ctx.Error(404)
+ ctx.Handle(404, "repo.Single", nil)
return
}
@@ -154,8 +154,8 @@ func Single(ctx *middleware.Context, params martini.Params) {
if repoFile.Size > 1024*1024 || repoFile.Filemode != git.FileModeBlob {
ctx.Data["FileIsLarge"] = true
} else if blob, err := repoFile.LookupBlob(); err != nil {
- log.Error("repo.Single(repoFile.LookupBlob): %v", err)
- ctx.Error(404)
+ //log.Error("repo.Single(repoFile.LookupBlob): %v", err)
+ ctx.Handle(404, "repo.Single(repoFile.LookupBlob)", err)
} else {
ctx.Data["IsFile"] = true
ctx.Data["FileName"] = repoFile.Name
@@ -179,8 +179,8 @@ func Single(ctx *middleware.Context, params martini.Params) {
files, err := models.GetReposFiles(params["username"], params["reponame"],
params["branchname"], params["commitid"], treename)
if err != nil {
- log.Error("repo.Single(GetReposFiles): %v", err)
- ctx.Error(404)
+ //log.Error("repo.Single(GetReposFiles): %v", err)
+ ctx.Handle(404, "repo.Single(GetReposFiles)", err)
return
}
@@ -203,8 +203,8 @@ func Single(ctx *middleware.Context, params martini.Params) {
if readmeFile.Size > 1024*1024 || readmeFile.Filemode != git.FileModeBlob {
ctx.Data["FileIsLarge"] = true
} else if blob, err := readmeFile.LookupBlob(); err != nil {
- log.Error("repo.Single(readmeFile.LookupBlob): %v", err)
- ctx.Error(404)
+ //log.Error("repo.Single(readmeFile.LookupBlob): %v", err)
+ ctx.Handle(404, "repo.Single(readmeFile.LookupBlob)", err)
return
} else {
// current repo branch link
@@ -239,7 +239,7 @@ func Single(ctx *middleware.Context, params martini.Params) {
params["branchname"], params["commitid"])
if err != nil {
log.Error("repo.Single(GetCommit): %v", err)
- ctx.Error(404)
+ ctx.Handle(404, "repo.Single(GetCommit)", err)
return
}
ctx.Data["LastCommit"] = commit
@@ -275,7 +275,7 @@ func Http(ctx *middleware.Context, params martini.Params) {
func Setting(ctx *middleware.Context, params martini.Params) {
if !ctx.Repo.IsOwner {
- ctx.Error(404)
+ ctx.Handle(404, "repo.Setting", nil)
return
}
@@ -307,7 +307,7 @@ func Commits(ctx *middleware.Context, params martini.Params) {
ctx.Handle(200, "repo.Commits", err)
return
} else if len(brs) == 0 {
- ctx.Error(404)
+ ctx.Handle(404, "repo.Commits", nil)
return
}
@@ -315,7 +315,7 @@ func Commits(ctx *middleware.Context, params martini.Params) {
commits, err := models.GetCommits(params["username"],
params["reponame"], params["branchname"])
if err != nil {
- ctx.Error(404)
+ ctx.Handle(404, "repo.Commits", nil)
return
}
ctx.Data["Username"] = params["username"]
diff --git a/routers/user/user.go b/routers/user/user.go
index c34b529ec33..a0321f187bb 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -301,7 +301,7 @@ func Activate(ctx *middleware.Context) {
if len(code) == 0 {
ctx.Data["IsActivatePage"] = true
if ctx.User.IsActive {
- ctx.Error(404)
+ ctx.Handle(404, "user.Activate", nil)
return
}
// Resend confirmation e-mail.
diff --git a/templates/status/404.tmpl b/templates/status/404.tmpl
new file mode 100644
index 00000000000..4e836b228d6
--- /dev/null
+++ b/templates/status/404.tmpl
@@ -0,0 +1,7 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div id="gogs-body" class="container">
+ <h4>This page is not found !</h4>
+ <p>Application Version: {{AppVer}}</p>
+</div>
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl
new file mode 100644
index 00000000000..9a00eb1ff74
--- /dev/null
+++ b/templates/status/500.tmpl
@@ -0,0 +1,7 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div id="gogs-body" class="container">
+ <p>An error is occurred : {{.ErrorMsg}}</p>
+ <p>Application Version: {{AppVer}}</p>
+</div>
+{{template "base/footer" .}}
\ No newline at end of file
From bdd32f152d73f31beffa854fb7382072043ef235 Mon Sep 17 00:00:00 2001
From: FuXiaoHei <fuxiaohei@hexiaz.com>
Date: Sun, 23 Mar 2014 13:48:01 +0800
Subject: [PATCH 17/19] add m.NotFound handler
---
routers/dashboard.go | 7 +++++++
web.go | 3 +++
2 files changed, 10 insertions(+)
diff --git a/routers/dashboard.go b/routers/dashboard.go
index f61d67b7de8..dafe9f31ec9 100644
--- a/routers/dashboard.go
+++ b/routers/dashboard.go
@@ -20,5 +20,12 @@ func Home(ctx *middleware.Context) {
func Help(ctx *middleware.Context) {
ctx.Data["PageIsHelp"] = true
+ ctx.Data["Title"] = "Help"
ctx.HTML(200, "help")
}
+
+func NotFound(ctx *middleware.Context) {
+ ctx.Data["PageIsNotFound"] = true
+ ctx.Data["Title"] = 404
+ ctx.Handle(404, "home.NotFound", nil)
+}
diff --git a/web.go b/web.go
index bf654aace2a..a0f9f7051a7 100644
--- a/web.go
+++ b/web.go
@@ -163,6 +163,9 @@ func runWeb(*cli.Context) {
m.Get("/template/**", dev.TemplatePreview)
}
+ // not found handler
+ m.NotFound(routers.NotFound)
+
listenAddr := fmt.Sprintf("%s:%s",
base.Cfg.MustValue("server", "HTTP_ADDR"),
base.Cfg.MustValue("server", "HTTP_PORT", "3000"))
From 1c01db4019abc2460ac1743f9675c9effd211e3f Mon Sep 17 00:00:00 2001
From: slene <vslene@gmail.com>
Date: Sun, 23 Mar 2014 15:21:34 +0800
Subject: [PATCH 18/19] minor fix
---
web.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web.go b/web.go
index bf654aace2a..0d311618543 100644
--- a/web.go
+++ b/web.go
@@ -95,7 +95,7 @@ func runWeb(*cli.Context) {
m.Group("/user", func(r martini.Router) {
r.Any("/login", binding.BindIgnErr(auth.LogInForm{}), user.SignIn)
- r.Any("/sign_up", reqSignOut, binding.BindIgnErr(auth.RegisterForm{}), user.SignUp)
+ r.Any("/sign_up", binding.BindIgnErr(auth.RegisterForm{}), user.SignUp)
}, reqSignOut)
m.Group("/user", func(r martini.Router) {
r.Any("/logout", user.SignOut)
From 1a16b3e99a0be7dbfeba1e683d253a22db5d1af5 Mon Sep 17 00:00:00 2001
From: FuXiaoHei <fuxiaohei@hexiaz.com>
Date: Sun, 23 Mar 2014 16:06:07 +0800
Subject: [PATCH 19/19] repo options ui
---
public/css/gogs.css | 8 ++++++--
templates/repo/setting.tmpl | 36 +++++++++++++++++++++++++++++++++++-
2 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/public/css/gogs.css b/public/css/gogs.css
index 78040bee51c..65a6c03d71f 100755
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -346,6 +346,10 @@ html, body {
border-left: 4px solid #DD4B39;
}
+#gogs-repo-setting-container .form-horizontal label {
+ line-height: 30px;
+}
+
/* gogits user ssh keys */
#gogs-ssh-keys .list-group-item {
@@ -575,12 +579,12 @@ html, body {
min-width: 200px;
}
-#gogs-repo-clone .dropdown-menu{
+#gogs-repo-clone .dropdown-menu {
width: 400px;
padding: 20px;
}
-#gogs-repo-clone .input-group{
+#gogs-repo-clone .input-group {
margin-bottom: 15px;
}
diff --git a/templates/repo/setting.tmpl b/templates/repo/setting.tmpl
index 38c3fd3bcc7..719547b1a99 100644
--- a/templates/repo/setting.tmpl
+++ b/templates/repo/setting.tmpl
@@ -19,7 +19,41 @@
</div>
<div class="panel-body">
-
+ <form action="/{{.Owner.Name}}/{{.Repository.Name}}/settings" method="post" class="form-horizontal">
+ {{.CsrfTokenHtml}}
+ <input type="hidden" name="action" value="update">
+ <div class="form-group">
+ <label class="col-md-3 text-right">Repository Name <strong class="text-danger">*</strong></label>
+ <div class="col-md-9">
+ <input type="text" class="form-control" name="repo-name" required="required" value="{{.Repository.Name}}"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-md-3 text-right">Description</label>
+ <div class="col-md-9">
+ <textarea class="form-control" name="desc" id="repo-desc" rows="6"></textarea>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-md-3 text-right">Official Site</label>
+ <div class="col-md-9">
+ <input type="url" class="form-control" name="repo-site"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-md-3 text-right">Default Branch</label>
+ <div class="col-md-9">
+ <select name="branch" id="repo-default-branch" class="form-control">
+ <option value="">Branch</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-md-9 col-md-offset-3">
+ <button class="btn btn-primary" type="submit">Save Options</button>
+ </div>
+ </div>
+ </form>
</div>
</div>