From c6e12d256833095d76bbb5755261507ecbdaada9 Mon Sep 17 00:00:00 2001 From: Gogs Date: Wed, 19 Mar 2014 23:23:30 +0800 Subject: [PATCH 1/5] add up url in file list --- routers/repo/single.go | 8 ++++++++ templates/repo/single.tmpl | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/routers/repo/single.go b/routers/repo/single.go index 171b095264..0bfc8ffb24 100644 --- a/routers/repo/single.go +++ b/routers/repo/single.go @@ -5,6 +5,7 @@ package repo import ( + "fmt" "strings" "github.com/codegangsta/martini" @@ -87,6 +88,11 @@ func Single(ctx *middleware.Context, params martini.Params) { 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 @@ -126,6 +132,8 @@ func Single(ctx *middleware.Context, params martini.Params) { } } + fmt.Println(Paths) + ctx.Data["Paths"] = Paths ctx.Data["Treenames"] = treenames ctx.Data["IsRepoToolbarSource"] = true diff --git a/templates/repo/single.tmpl b/templates/repo/single.tmpl index f167444635..e18f79c293 100644 --- a/templates/repo/single.tmpl +++ b/templates/repo/single.tmpl @@ -57,6 +57,14 @@ + {{if .HasParentPath}} + + + .. + + + + {{end}} {{range .Files}} From 35d473f04ac79990a35499fbf3c4998170e655e1 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 19 Mar 2014 12:50:44 -0400 Subject: [PATCH 2/5] Finish verify email --- models/user.go | 38 ++++++++++- modules/base/conf.go | 8 +-- modules/base/template.go | 4 ++ modules/base/tool.go | 65 ++++++++++++++++--- modules/mailer/mail.go | 8 +-- modules/middleware/auth.go | 10 +-- routers/dev/template.go | 25 +++++++ routers/user/user.go | 14 ++++ templates/mail/auth/active_email.html | 25 ------- .../{base.html => auth/active_email.tmpl} | 16 +++-- templates/mail/auth/register_success.tmpl | 14 ++-- templates/user/active.tmpl | 12 +++- web.go | 5 ++ 13 files changed, 182 insertions(+), 62 deletions(-) create mode 100644 routers/dev/template.go delete mode 100644 templates/mail/auth/active_email.html rename templates/mail/{base.html => auth/active_email.tmpl} (52%) diff --git a/models/user.go b/models/user.go index 5f08f9e92d..3c31b3aff4 100644 --- a/models/user.go +++ b/models/user.go @@ -5,6 +5,7 @@ package models import ( + "encoding/hex" "errors" "fmt" "os" @@ -17,6 +18,7 @@ import ( "github.com/gogits/git" "github.com/gogits/gogs/modules/base" + "github.com/gogits/gogs/modules/log" ) // User types. @@ -139,9 +141,43 @@ func RegisterUser(user *User) (*User, error) { return user, nil } +// get user by erify code +func getVerifyUser(code string) (user *User) { + if len(code) <= base.TimeLimitCodeLength { + return nil + } + + // use tail hex username query user + hexStr := code[base.TimeLimitCodeLength:] + if b, err := hex.DecodeString(hexStr); err == nil { + if user, err = GetUserByName(string(b)); user != nil { + return user + } + log.Error("user.getVerifyUser: %v", err) + } + + return nil +} + +// verify active code when active account +func VerifyUserActiveCode(code string) (user *User) { + minutes := base.Service.ActiveCodeLives + + if user = getVerifyUser(code); user != nil { + // time limit code + prefix := code[:base.TimeLimitCodeLength] + data := base.ToStr(user.Id) + user.Email + user.LowerName + user.Passwd + user.Rands + + if base.VerifyTimeLimitCode(data, minutes, prefix) { + return user + } + } + return nil +} + // UpdateUser updates user's information. func UpdateUser(user *User) (err error) { - _, err = orm.Id(user.Id).Update(user) + _, err = orm.Id(user.Id).UseBool().Update(user) return err } diff --git a/modules/base/conf.go b/modules/base/conf.go index 64c97028b9..41226459d9 100644 --- a/modules/base/conf.go +++ b/modules/base/conf.go @@ -131,15 +131,15 @@ func newMailService() { } } -func newRegisterService() { +func newRegisterMailService() { if !Cfg.MustBool("service", "REGISTER_EMAIL_CONFIRM") { return } else if MailService == nil { - log.Warn("Register Service: Mail Service is not enabled") + log.Warn("Register Mail Service: Mail Service is not enabled") return } Service.RegisterEmailConfirm = true - log.Info("Register Service Enabled") + log.Info("Register Mail Service Enabled") } func init() { @@ -177,5 +177,5 @@ func init() { newService() newLogService() newMailService() - newRegisterService() + newRegisterMailService() } diff --git a/modules/base/template.go b/modules/base/template.go index 23d3d27713..5268da6490 100644 --- a/modules/base/template.go +++ b/modules/base/template.go @@ -8,6 +8,7 @@ import ( "container/list" "fmt" "html/template" + "strings" "time" ) @@ -54,4 +55,7 @@ var TemplateFuncs template.FuncMap = map[string]interface{}{ "ActionDesc": ActionDesc, "DateFormat": DateFormat, "List": List, + "Mail2Domain": func(mail string) string { + return "mail." + strings.Split(mail, "@")[1] + }, } diff --git a/modules/base/tool.go b/modules/base/tool.go index d0b6bfbfda..8fabb8c531 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -36,6 +36,35 @@ func GetRandomString(n int) string { return string(bytes) } +// verify time limit code +func VerifyTimeLimitCode(data string, minutes int, code string) bool { + if len(code) <= 18 { + return false + } + + // split code + start := code[:12] + lives := code[12:18] + if d, err := StrTo(lives).Int(); err == nil { + minutes = d + } + + // right active code + retCode := CreateTimeLimitCode(data, minutes, start) + if retCode == code && minutes > 0 { + // check time is expired or not + before, _ := DateParse(start, "YmdHi") + now := time.Now() + if before.Add(time.Minute*time.Duration(minutes)).Unix() > now.Unix() { + return true + } + } + + return false +} + +const TimeLimitCodeLength = 12 + 6 + 40 + // create a time limit code // code format: 12 length date time string + 6 minutes string + 40 sha1 encoded string func CreateTimeLimitCode(data string, minutes int, startInf interface{}) string { @@ -283,16 +312,24 @@ func DateFormat(t time.Time, format string) string { return t.Format(format) } -type argInt []int +// convert string to specify type -func (a argInt) Get(i int, args ...int) (r int) { - if i >= 0 && i < len(a) { - r = a[i] +type StrTo string + +func (f StrTo) Exist() bool { + return string(f) != string(0x1E) +} + +func (f StrTo) Int() (int, error) { + v, err := strconv.ParseInt(f.String(), 10, 32) + return int(v), err +} + +func (f StrTo) String() string { + if f.Exist() { + return string(f) } - if len(args) > 0 { - r = args[0] - } - return + return "" } // convert any type to string @@ -334,6 +371,18 @@ func ToStr(value interface{}, args ...int) (s string) { return s } +type argInt []int + +func (a argInt) Get(i int, args ...int) (r int) { + if i >= 0 && i < len(a) { + r = a[i] + } + if len(args) > 0 { + r = args[0] + } + return +} + type Actioner interface { GetOpType() int GetActUserName() string diff --git a/modules/mailer/mail.go b/modules/mailer/mail.go index de4f24a47d..c1d12bba45 100644 --- a/modules/mailer/mail.go +++ b/modules/mailer/mail.go @@ -37,9 +37,9 @@ func GetMailTmplData(user *models.User) map[interface{}]interface{} { // create a time limit code for user active func CreateUserActiveCode(user *models.User, startInf interface{}) string { - hours := base.Service.ActiveCodeLives / 60 + minutes := base.Service.ActiveCodeLives data := base.ToStr(user.Id) + user.Email + user.LowerName + user.Passwd + user.Rands - code := base.CreateTimeLimitCode(data, hours, startInf) + code := base.CreateTimeLimitCode(data, minutes, startInf) // add tail hex username code += hex.EncodeToString([]byte(user.LowerName)) @@ -70,11 +70,11 @@ func SendRegisterMail(r *middleware.Render, user *models.User) { func SendActiveMail(r *middleware.Render, user *models.User) { code := CreateUserActiveCode(user, nil) - subject := "Verify your email address" + subject := "Verify your e-mail address" data := GetMailTmplData(user) data["Code"] = code - body, err := r.HTMLString("mail/auth/active_email.html", data) + body, err := r.HTMLString("mail/auth/active_email", data) if err != nil { log.Error("mail.SendActiveMail(fail to render): %v", err) return diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go index ed847dd83c..d45a21e988 100644 --- a/modules/middleware/auth.go +++ b/modules/middleware/auth.go @@ -6,6 +6,8 @@ package middleware import ( "github.com/codegangsta/martini" + + "github.com/gogits/gogs/modules/base" ) // SignInRequire requires user to sign in. @@ -16,10 +18,10 @@ func SignInRequire(redirect bool) martini.Handler { ctx.Redirect("/") } return - } else if !ctx.User.IsActive { - // ctx.Data["Title"] = "Activate Your Account" - // ctx.Render.HTML(200, "user/active", ctx.Data) - // return + } else if !ctx.User.IsActive && base.Service.RegisterEmailConfirm { + ctx.Data["Title"] = "Activate Your Account" + ctx.Render.HTML(200, "user/active", ctx.Data) + return } } } diff --git a/routers/dev/template.go b/routers/dev/template.go new file mode 100644 index 0000000000..7d5225ece7 --- /dev/null +++ b/routers/dev/template.go @@ -0,0 +1,25 @@ +// 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 dev + +import ( + "github.com/codegangsta/martini" + + "github.com/gogits/gogs/models" + "github.com/gogits/gogs/modules/base" + "github.com/gogits/gogs/modules/middleware" +) + +func TemplatePreview(ctx *middleware.Context, params martini.Params) { + ctx.Data["User"] = models.User{Name: "Unknown"} + ctx.Data["AppName"] = base.AppName + ctx.Data["AppVer"] = base.AppVer + ctx.Data["AppUrl"] = base.AppUrl + ctx.Data["AppLogo"] = base.AppLogo + ctx.Data["Code"] = "2014031910370000009fff6782aadb2162b4a997acb69d4400888e0b9274657374" + ctx.Data["ActiveCodeLives"] = base.Service.ActiveCodeLives / 60 + ctx.Data["ResetPwdCodeLives"] = base.Service.ResetPwdCodeLives / 60 + ctx.HTML(200, params["_1"], ctx.Data) +} diff --git a/routers/user/user.go b/routers/user/user.go index da70ced9f5..32f458f835 100644 --- a/routers/user/user.go +++ b/routers/user/user.go @@ -243,4 +243,18 @@ func Activate(ctx *middleware.Context) { ctx.Render.HTML(200, "user/active", ctx.Data) return } + + // Verify code. + if user := models.VerifyUserActiveCode(code); user != nil { + user.IsActive = true + user.Rands = models.GetUserSalt() + models.UpdateUser(user) + ctx.Session.Set("userId", user.Id) + ctx.Session.Set("userName", user.Name) + ctx.Redirect("/", 302) + return + } + + ctx.Data["IsActivateFailed"] = true + ctx.Render.HTML(200, "user/active", ctx.Data) } diff --git a/templates/mail/auth/active_email.html b/templates/mail/auth/active_email.html deleted file mode 100644 index ccb1202680..0000000000 --- a/templates/mail/auth/active_email.html +++ /dev/null @@ -1,25 +0,0 @@ -{{template "mail/base.html" .}} -{{define "title"}} - {{if eq .Lang "zh-CN"}} - {{.User.NickName}}，激活你的账户 - {{end}} - {{if eq .Lang "en-US"}} - {{.User.NickName}}, please active your account - {{end}} -{{end}} -{{define "body"}} - {{if eq .Lang "zh-CN"}} -

点击链接验证email，{{.ActiveCodeLives}} 分钟内有效

-

- {{.AppUrl}}active/{{.Code}} -

-

如果链接点击无反应，请复制到浏览器打开。

- {{end}} - {{if eq .Lang "en-US"}} -

Please click following link to verify your e-mail in {{.ActiveCodeLives}} hours

-

- {{.AppUrl}}active/{{.Code}} -

-

Copy and paste it to your browser if it's not working.

- {{end}} -{{end}} \ No newline at end of file diff --git a/templates/mail/base.html b/templates/mail/auth/active_email.tmpl similarity index 52% rename from templates/mail/base.html rename to templates/mail/auth/active_email.tmpl index e86c2adfc2..c04ddc8a30 100644 --- a/templates/mail/base.html +++ b/templates/mail/auth/active_email.tmpl @@ -2,26 +2,30 @@ -{{.Title}} - {{AppName}} +{{.User.Name}}, please activate your account -
+
-

{{AppName}}

+

{{.AppName}}

- {{.Title}} + Hi {{.User.Name}},
- {{template "body" .}} +

Please click following link to verify your e-mail address within {{.ActiveCodeLives}} hours.

+

+ {{.AppUrl}}user/activate?code={{.Code}} +

+

Copy and paste it to your browser if the link is not working.

diff --git a/templates/mail/auth/register_success.tmpl b/templates/mail/auth/register_success.tmpl index 83c0855051..0a69280847 100644 --- a/templates/mail/auth/register_success.tmpl +++ b/templates/mail/auth/register_success.tmpl @@ -5,27 +5,27 @@ {{.User.Name}}, welcome to {{.AppName}} -
+
-

{{.AppName}}

+

{{.AppName}}

- {{.User.Name}}, welcome to {{.AppName}} + Hi {{.User.Name}}, welcome to register {{.AppName}}!
-

Please click following link to verify your e-mail in {{.ActiveCodeLives}} hours

+

Please click following link to verify your e-mail address within {{.ActiveCodeLives}} hours.

- {{.AppUrl}}active/{{.Code}} + {{.AppUrl}}user/activate?code={{.Code}}

-

Copy and paste it to your browser if it's not working.

+

Copy and paste it to your browser if the link is not working.

- © 2014 {{AppName}} + © 2014 Gogs: Go Git Service
diff --git a/templates/user/active.tmpl b/templates/user/active.tmpl index 1ee723ee07..fefd7d3aed 100644 --- a/templates/user/active.tmpl +++ b/templates/user/active.tmpl @@ -1,17 +1,23 @@ {{template "base/head" .}} {{template "base/navbar" .}}
-
+

Activate Your Account

{{if .IsActivatePage}} {{if .ServiceNotEnabled}}

Sorry, Register Mail Confirmation has been disabled.

{{else}} -

New confirmation e-mail has been sent to {{.SignedUser.Email}}, please check your inbox within {{.Hours}} hours.

+

New confirmation e-mail has been sent to {{.SignedUser.Email}}, please check your inbox within {{.Hours}} hours to complete your registeration.

+
+ Sign in to your e-mail {{end}} {{else}} {{if .IsSendRegisterMail}} -

A confirmation e-mail has been sent to {{.Email}}, please check your inbox within {{.Hours}} hours.

+

A confirmation e-mail has been sent to {{.Email}}, please check your inbox within {{.Hours}} hours to complete your registeration.

+
+ Sign in to your e-mail + {{else if .IsActivateFailed}} +

Sorry, your confirmation code has been exipired or not valid.

{{else}}

Hi, {{.SignedUser.Name}}, you have an unconfirmed email address({{.SignedUser.Email}}). If you haven't received a confirmation e-mail or need to resend a new one, please click botton below.

diff --git a/web.go b/web.go index fe3596e220..2cf3ba0932 100644 --- a/web.go +++ b/web.go @@ -21,6 +21,7 @@ import ( "github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/middleware" "github.com/gogits/gogs/routers" + "github.com/gogits/gogs/routers/dev" "github.com/gogits/gogs/routers/repo" "github.com/gogits/gogs/routers/user" ) @@ -113,6 +114,10 @@ func runWeb(*cli.Context) { m.Get("/:username/:reponame", ignSignIn, middleware.RepoAssignment(true), repo.Single) + if martini.Env == martini.Dev { + m.Get("/template/**", dev.TemplatePreview) + } + listenAddr := fmt.Sprintf("%s:%s", base.Cfg.MustValue("server", "HTTP_ADDR"), base.Cfg.MustValue("server", "HTTP_PORT", "3000")) From 757f360949989214a9161f17a82aedf2b647457a Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 19 Mar 2014 13:14:56 -0400 Subject: [PATCH 3/5] Render data in commit list page --- modules/base/template.go | 3 +++ routers/repo/repo.go | 6 +++--- routers/repo/single.go | 2 ++ templates/repo/commits.tmpl | 43 +++++++++++++------------------------ 4 files changed, 23 insertions(+), 31 deletions(-) diff --git a/modules/base/template.go b/modules/base/template.go index 5268da6490..e596d1dada 100644 --- a/modules/base/template.go +++ b/modules/base/template.go @@ -58,4 +58,7 @@ var TemplateFuncs template.FuncMap = map[string]interface{}{ "Mail2Domain": func(mail string) string { return "mail." + strings.Split(mail, "@")[1] }, + "SubStr": func(str string, start, length int) string { + return str[start : start+length] + }, } diff --git a/routers/repo/repo.go b/routers/repo/repo.go index fb54d4ef8b..b38473b18a 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -13,11 +13,11 @@ import ( func Create(ctx *middleware.Context, form auth.CreateRepoForm) { ctx.Data["Title"] = "Create repository" + ctx.Data["PageIsNewRepo"] = true // For navbar arrow. + ctx.Data["LanguageIgns"] = models.LanguageIgns + ctx.Data["Licenses"] = models.Licenses if ctx.Req.Method == "GET" { - ctx.Data["PageIsNewRepo"] = true // For navbar arrow. - ctx.Data["LanguageIgns"] = models.LanguageIgns - ctx.Data["Licenses"] = models.Licenses ctx.HTML(200, "repo/create", ctx.Data) return } diff --git a/routers/repo/single.go b/routers/repo/single.go index 0bfc8ffb24..285c5277af 100644 --- a/routers/repo/single.go +++ b/routers/repo/single.go @@ -186,6 +186,8 @@ func Commits(ctx *middleware.Context, params martini.Params) { ctx.Error(404) return } + ctx.Data["Username"] = params["username"] + ctx.Data["Reponame"] = params["reponame"] ctx.Data["Commits"] = commits ctx.HTML(200, "repo/commits", ctx.Data) } diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl index 53c14d364a..04ca19afc8 100644 --- a/templates/repo/commits.tmpl +++ b/templates/repo/commits.tmpl @@ -13,41 +13,28 @@
- - - - - - + + + + + + + {{ $username := .Username}} + {{ $reponame := .Reponame}} + {{$r := List .Commits}} + {{range $r}} - - - - - - - - - - - - - - - - + + + + + {{end}}
AuthorCommitMessageDate
AuthorCommitMessageDate
CommitUserd91b380Fix Synchronize to delete service objects in subduers upon move3 years ago
CommitUserd91b380Fix Synchronize to delete service objects in subduers upon move3 years ago
CommitUserd91b380Fix Synchronize to delete service objects in subduers upon move3 years ago{{.Committer.Name}}{{SubStr .Id.String 0 7}} {{.Message}} {{TimeSince .Committer.When}}
-
    - {{$r := List .Commits}} - {{range $r}} -
  • {{.Committer.Name}} - {{.Id}} - {{.Message}} - {{.Committer.When}}
    • - {{end}} -
{{template "base/footer" .}} \ No newline at end of file From 601c10309dd93c55c3c825c5a5c2384d46493589 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 19 Mar 2014 13:24:46 -0400 Subject: [PATCH 4/5] Bug fix --- modules/base/conf.go | 3 ++- routers/repo/single.go | 1 + templates/repo/commits.tmpl | 2 +- web.go | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/base/conf.go b/modules/base/conf.go index 41226459d9..b003dea50c 100644 --- a/modules/base/conf.go +++ b/modules/base/conf.go @@ -172,8 +172,9 @@ func init() { AppUrl = Cfg.MustValue("server", "ROOT_URL") Domain = Cfg.MustValue("server", "DOMAIN") SecretKey = Cfg.MustValue("security", "SECRET_KEY") +} - // Extensions. +func NewServices() { newService() newLogService() newMailService() diff --git a/routers/repo/single.go b/routers/repo/single.go index 285c5277af..1c9b35945d 100644 --- a/routers/repo/single.go +++ b/routers/repo/single.go @@ -188,6 +188,7 @@ func Commits(ctx *middleware.Context, params martini.Params) { } ctx.Data["Username"] = params["username"] ctx.Data["Reponame"] = params["reponame"] + ctx.Data["CommitCount"] = commits.Len() ctx.Data["Commits"] = commits ctx.HTML(200, "repo/commits", ctx.Data) } diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl index 04ca19afc8..8b4e41f748 100644 --- a/templates/repo/commits.tmpl +++ b/templates/repo/commits.tmpl @@ -9,7 +9,7 @@
-

Commits

+

{{.CommitCount}} Commits

diff --git a/web.go b/web.go index 2cf3ba0932..2a9df17c8d 100644 --- a/web.go +++ b/web.go @@ -58,6 +58,7 @@ func newMartini() *martini.ClassicMartini { } func runWeb(*cli.Context) { + base.NewServices() checkRunMode() log.Info("%s %s", base.AppName, base.AppVer) From 6f6862086047ba6902f51de3cb66eb3af04fffbd Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 19 Mar 2014 21:05:48 -0400 Subject: [PATCH 5/5] Pools limit concurrent nums --- README.md | 3 ++- conf/app.ini | 2 ++ gogs.go | 2 +- models/user.go | 4 +--- modules/base/conf.go | 4 +++- modules/mailer/mail.go | 6 ++---- modules/mailer/mailer.go | 44 ++++++++++++++++++++++++++-------------- routers/user/user.go | 3 +++ 8 files changed, 43 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index ce5fd5f6db..b43e3c98a5 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.0 Alpha +##### Current version: 0.1.1 Alpha ## Purpose @@ -26,6 +26,7 @@ There are some very good products in this category such as [gitlab](http://gitla - User profile page. - Repository viewer. - Gravatar support. +- Mail service(register). - Supports MySQL and PostgreSQL. ## Installation diff --git a/conf/app.ini b/conf/app.ini index c2c299cf63..658f7c0151 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -39,6 +39,8 @@ REGISTER_EMAIL_CONFIRM = false [mailer] ENABLED = false +; Buffer length of channel, keep it as it is if you don't know what it is. +SEND_BUFFER_LEN = 10 ; Name displayed in mail title SUBJECT = %(APP_NAME)s ; Mail server diff --git a/gogs.go b/gogs.go index 106e8b1d93..385b74217b 100644 --- a/gogs.go +++ b/gogs.go @@ -20,7 +20,7 @@ import ( // Test that go1.1 tag above is included in builds. main.go refers to this definition. const go11tag = true -const APP_VER = "0.1.0.0319.1" +const APP_VER = "0.1.1.0320.1" func init() { base.AppVer = APP_VER diff --git a/models/user.go b/models/user.go index 3c31b3aff4..76cf2d20ce 100644 --- a/models/user.go +++ b/models/user.go @@ -51,8 +51,7 @@ type User struct { Location string Website string IsActive bool - Rands string `xorm:"VARCHAR(10)"` - Expired time.Time + Rands string `xorm:"VARCHAR(10)"` Created time.Time `xorm:"created"` Updated time.Time `xorm:"updated"` } @@ -125,7 +124,6 @@ func RegisterUser(user *User) (*User, error) { user.LowerName = strings.ToLower(user.Name) user.Avatar = base.EncodeMd5(user.Email) user.AvatarEmail = user.Email - user.Expired = time.Now().Add(3 * 24 * time.Hour) user.Rands = GetUserSalt() if err = user.EncodePasswd(); err != nil { return nil, err diff --git a/modules/base/conf.go b/modules/base/conf.go index b003dea50c..17ba3b879a 100644 --- a/modules/base/conf.go +++ b/modules/base/conf.go @@ -91,9 +91,11 @@ func newLogService() { case "console": config = fmt.Sprintf(`{"level":%s}`, level) case "file": + logPath := Cfg.MustValue(modeSec, "FILE_NAME", "log/gogs.log") + os.MkdirAll(path.Dir(logPath), os.ModePerm) config = fmt.Sprintf( `{"level":%s,"filename":%s,"rotate":%v,"maxlines":%d,"maxsize",%d,"daily":%v,"maxdays":%d}`, level, - Cfg.MustValue(modeSec, "FILE_NAME", "log/gogs.log"), + logPath, Cfg.MustBool(modeSec, "LOG_ROTATE", true), Cfg.MustInt(modeSec, "MAX_LINES", 1000000), 1< 0 { + info = ", info: " + msg.Info + } + log.Error(fmt.Sprintf("Async sent email %d succeed, not send emails: %s%s err: %s", num, tos, info, err)) + return + } + log.Trace(fmt.Sprintf("Async sent email %d succeed, sent emails: %s%s", num, tos, info)) + } + } +} + // Direct Send mail message -func Send(msg Message) (int, error) { +func Send(msg *Message) (int, error) { log.Trace("Sending mails to: %s", strings.Join(msg.To, "; ")) host := strings.Split(base.MailService.Host, ":") @@ -82,21 +108,9 @@ func Send(msg Message) (int, error) { } // Async Send mail message -func SendAsync(msg Message) { - // TODO may be need pools limit concurrent nums +func SendAsync(msg *Message) { go func() { - num, err := Send(msg) - tos := strings.Join(msg.To, "; ") - info := "" - if err != nil { - if len(msg.Info) > 0 { - info = ", info: " + msg.Info - } - // log failed - log.Error(fmt.Sprintf("Async sent email %d succeed, not send emails: %s%s err: %s", num, tos, info, err)) - return - } - log.Trace(fmt.Sprintf("Async sent email %d succeed, sent emails: %s%s", num, tos, info)) + mailQueue <- msg }() } diff --git a/routers/user/user.go b/routers/user/user.go index 32f458f835..37070af3f9 100644 --- a/routers/user/user.go +++ b/routers/user/user.go @@ -249,6 +249,9 @@ func Activate(ctx *middleware.Context) { user.IsActive = true user.Rands = models.GetUserSalt() models.UpdateUser(user) + + log.Trace("%s User activated: %s", ctx.Req.RequestURI, user.LowerName) + ctx.Session.Set("userId", user.Id) ctx.Session.Set("userName", user.Name) ctx.Redirect("/", 302)