aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/asn1-ber/ber.go8
-rw-r--r--modules/auth/repo_form.go3
-rw-r--r--modules/auth/user_form.go2
-rw-r--r--modules/base/markdown.go5
-rw-r--r--modules/base/template.go14
-rw-r--r--modules/base/tool.go67
-rw-r--r--modules/cron/manager.go2
-rw-r--r--modules/git/signature.go29
-rw-r--r--modules/mailer/mailer.go10
-rw-r--r--modules/middleware/auth.go5
-rw-r--r--modules/middleware/context.go12
-rw-r--r--modules/middleware/repo.go3
-rw-r--r--modules/setting/setting.go33
13 files changed, 95 insertions, 98 deletions
diff --git a/modules/asn1-ber/ber.go b/modules/asn1-ber/ber.go
index 3e99a273..52b9a591 100644
--- a/modules/asn1-ber/ber.go
+++ b/modules/asn1-ber/ber.go
@@ -256,11 +256,11 @@ func ReadPacket(reader io.Reader) (*Packet, error) {
}
func DecodeString(data []byte) (ret string) {
- for _, c := range data {
- ret += fmt.Sprintf("%c", c)
- }
+ // for _, c := range data {
+ // ret += fmt.Sprintf("%c", c)
+ // }
- return
+ return string(data)
}
func DecodeInteger(data []byte) (ret uint64) {
diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go
index 36e62f04..2902a92f 100644
--- a/modules/auth/repo_form.go
+++ b/modules/auth/repo_form.go
@@ -31,7 +31,7 @@ func (f *CreateRepoForm) Validate(ctx *macaron.Context, errs binding.Errors) bin
}
type MigrateRepoForm struct {
- HttpsUrl string `form:"url" binding:"Required;Url"`
+ CloneAddr string `binding:"Required"`
AuthUserName string `form:"auth_username"`
AuthPasswd string `form:"auth_password"`
Uid int64 `form:"uid" binding:"Required"`
@@ -52,7 +52,6 @@ type RepoSettingForm struct {
Branch string `form:"branch"`
Interval int `form:"interval"`
Private bool `form:"private"`
- GoGet bool `form:"goget"`
}
func (f *RepoSettingForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
diff --git a/modules/auth/user_form.go b/modules/auth/user_form.go
index 3c0ff651..b616a460 100644
--- a/modules/auth/user_form.go
+++ b/modules/auth/user_form.go
@@ -99,7 +99,7 @@ func (f *UploadAvatarForm) Validate(ctx *macaron.Context, errs binding.Errors) b
}
type AddEmailForm struct {
- Email string `form:"email" binding:"Required;Email;MaxSize(50)"`
+ Email string `binding:"Required;Email;MaxSize(50)"`
}
func (f *AddEmailForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
diff --git a/modules/base/markdown.go b/modules/base/markdown.go
index b5f397dc..4a7adc8a 100644
--- a/modules/base/markdown.go
+++ b/modules/base/markdown.go
@@ -106,7 +106,7 @@ func (options *CustomRender) Image(out *bytes.Buffer, link []byte, title []byte,
}
var (
- MentionPattern = regexp.MustCompile(`((^|\s)@)[0-9a-zA-Z_]{1,}`)
+ MentionPattern = regexp.MustCompile(`(\s|^)@[0-9a-zA-Z_]+`)
commitPattern = regexp.MustCompile(`(\s|^)https?.*commit/[0-9a-zA-Z]+(#+[0-9a-zA-Z-]*)?`)
issueFullPattern = regexp.MustCompile(`(\s|^)https?.*issues/[0-9]+(#+[0-9a-zA-Z-]*)?`)
issueIndexPattern = regexp.MustCompile(`( |^)#[0-9]+`)
@@ -128,8 +128,9 @@ func RenderSpecialLink(rawBytes []byte, urlPrefix string) []byte {
if !inCodeBlock && !bytes.HasPrefix(line, tab) {
ms := MentionPattern.FindAll(line, -1)
for _, m := range ms {
+ m = bytes.TrimSpace(m)
line = bytes.Replace(line, m,
- []byte(fmt.Sprintf(`<a href="%s/%s">%s</a>`, setting.AppSubUrl, m[2:], m)), -1)
+ []byte(fmt.Sprintf(`<a href="%s/%s">%s</a>`, setting.AppSubUrl, m[1:], m)), -1)
}
}
diff --git a/modules/base/template.go b/modules/base/template.go
index f3fa1385..cfcabb71 100644
--- a/modules/base/template.go
+++ b/modules/base/template.go
@@ -41,6 +41,10 @@ func List(l *list.List) chan interface{} {
return c
}
+func Sha1(str string) string {
+ return EncodeSha1(str)
+}
+
func ShortSha(sha1 string) string {
if len(sha1) == 40 {
return sha1[:10]
@@ -126,8 +130,13 @@ var TemplateFuncs template.FuncMap = map[string]interface{}{
return a + b
},
"ActionIcon": ActionIcon,
- "DateFormat": DateFormat,
- "List": List,
+ "DateFmtLong": func(t time.Time) string {
+ return t.Format(time.RFC1123Z)
+ },
+ "DateFmtShort": func(t time.Time) string {
+ return t.Format("Jan 02, 2006")
+ },
+ "List": List,
"Mail2Domain": func(mail string) string {
if !strings.Contains(mail, "@") {
return "try.gogs.io"
@@ -155,6 +164,7 @@ var TemplateFuncs template.FuncMap = map[string]interface{}{
},
"DiffTypeToStr": DiffTypeToStr,
"DiffLineTypeToStr": DiffLineTypeToStr,
+ "Sha1": Sha1,
"ShortSha": ShortSha,
"Md5": EncodeMd5,
"ActionContent2Commits": ActionContent2Commits,
diff --git a/modules/base/tool.go b/modules/base/tool.go
index 5043364c..55e6dffd 100644
--- a/modules/base/tool.go
+++ b/modules/base/tool.go
@@ -126,7 +126,7 @@ func VerifyTimeLimitCode(data string, minutes int, code string) bool {
retCode := CreateTimeLimitCode(data, minutes, start)
if retCode == code && minutes > 0 {
// check time is expired or not
- before, _ := DateParse(start, "YmdHi")
+ before, _ := time.ParseInLocation("200601021504", start, time.Local)
now := time.Now()
if before.Add(time.Minute*time.Duration(minutes)).Unix() > now.Unix() {
return true
@@ -141,7 +141,7 @@ 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 {
- format := "YmdHi"
+ format := "200601021504"
var start, end time.Time
var startStr, endStr string
@@ -149,16 +149,16 @@ func CreateTimeLimitCode(data string, minutes int, startInf interface{}) string
if startInf == nil {
// Use now time create code
start = time.Now()
- startStr = DateFormat(start, format)
+ startStr = start.Format(format)
} else {
// use start string create code
startStr = startInf.(string)
- start, _ = DateParse(startStr, format)
- startStr = DateFormat(start, format)
+ start, _ = time.ParseInLocation(format, startStr, time.Local)
+ startStr = start.Format(format)
}
end = start.Add(time.Minute * time.Duration(minutes))
- endStr = DateFormat(end, format)
+ endStr = end.Format(format)
// create sha1 encode string
sh := sha1.New()
@@ -420,58 +420,3 @@ func Subtract(left interface{}, right interface{}) interface{} {
return fleft + float64(rleft) - (fright + float64(rright))
}
}
-
-// DateFormat pattern rules.
-var datePatterns = []string{
- // year
- "Y", "2006", // A full numeric representation of a year, 4 digits Examples: 1999 or 2003
- "y", "06", //A two digit representation of a year Examples: 99 or 03
-
- // month
- "m", "01", // Numeric representation of a month, with leading zeros 01 through 12
- "n", "1", // Numeric representation of a month, without leading zeros 1 through 12
- "M", "Jan", // A short textual representation of a month, three letters Jan through Dec
- "F", "January", // A full textual representation of a month, such as January or March January through December
-
- // day
- "d", "02", // Day of the month, 2 digits with leading zeros 01 to 31
- "j", "2", // Day of the month without leading zeros 1 to 31
-
- // week
- "D", "Mon", // A textual representation of a day, three letters Mon through Sun
- "l", "Monday", // A full textual representation of the day of the week Sunday through Saturday
-
- // time
- "g", "3", // 12-hour format of an hour without leading zeros 1 through 12
- "G", "15", // 24-hour format of an hour without leading zeros 0 through 23
- "h", "03", // 12-hour format of an hour with leading zeros 01 through 12
- "H", "15", // 24-hour format of an hour with leading zeros 00 through 23
-
- "a", "pm", // Lowercase Ante meridiem and Post meridiem am or pm
- "A", "PM", // Uppercase Ante meridiem and Post meridiem AM or PM
-
- "i", "04", // Minutes with leading zeros 00 to 59
- "s", "05", // Seconds, with leading zeros 00 through 59
-
- // time zone
- "T", "MST",
- "P", "-07:00",
- "O", "-0700",
-
- // RFC 2822
- "r", time.RFC1123Z,
-}
-
-// Parse Date use PHP time format.
-func DateParse(dateString, format string) (time.Time, error) {
- replacer := strings.NewReplacer(datePatterns...)
- format = replacer.Replace(format)
- return time.ParseInLocation(format, dateString, time.Local)
-}
-
-// Date takes a PHP like date func to Go's time format.
-func DateFormat(t time.Time, format string) string {
- replacer := strings.NewReplacer(datePatterns...)
- format = replacer.Replace(format)
- return t.Format(format)
-}
diff --git a/modules/cron/manager.go b/modules/cron/manager.go
index 135fec4f..2990ab06 100644
--- a/modules/cron/manager.go
+++ b/modules/cron/manager.go
@@ -15,7 +15,7 @@ var c = New()
func NewCronContext() {
c.AddFunc("Update mirrors", "@every 1h", models.MirrorUpdate)
- c.AddFunc("Deliver hooks", fmt.Sprintf("@every %dm", setting.WebhookTaskInterval), models.DeliverHooks)
+ c.AddFunc("Deliver hooks", fmt.Sprintf("@every %dm", setting.Webhook.TaskInterval), models.DeliverHooks)
if setting.Git.Fsck.Enable {
c.AddFunc("Repository health check", fmt.Sprintf("@every %dh", setting.Git.Fsck.Interval), models.GitFsck)
}
diff --git a/modules/git/signature.go b/modules/git/signature.go
index 20f647d2..ad9c1b39 100644
--- a/modules/git/signature.go
+++ b/modules/git/signature.go
@@ -17,24 +17,35 @@ type Signature struct {
When time.Time
}
-// Helper to get a signature from the commit line, which looks like this:
+// Helper to get a signature from the commit line, which looks like these:
// author Patrick Gundlach <gundlach@speedata.de> 1378823654 +0200
+// author Patrick Gundlach <gundlach@speedata.de> Thu, 07 Apr 2005 22:13:13 +0200
// but without the "author " at the beginning (this method should)
// be used for author and committer.
//
-// FIXME: include timezone!
-func newSignatureFromCommitline(line []byte) (*Signature, error) {
+// FIXME: include timezone for timestamp!
+func newSignatureFromCommitline(line []byte) (_ *Signature, err error) {
sig := new(Signature)
emailstart := bytes.IndexByte(line, '<')
sig.Name = string(line[:emailstart-1])
emailstop := bytes.IndexByte(line, '>')
sig.Email = string(line[emailstart+1 : emailstop])
- timestop := bytes.IndexByte(line[emailstop+2:], ' ')
- timestring := string(line[emailstop+2 : emailstop+2+timestop])
- seconds, err := strconv.ParseInt(timestring, 10, 64)
- if err != nil {
- return nil, err
+
+ // Check date format.
+ firstChar := line[emailstop+2]
+ if firstChar >= 48 && firstChar <= 57 {
+ timestop := bytes.IndexByte(line[emailstop+2:], ' ')
+ timestring := string(line[emailstop+2 : emailstop+2+timestop])
+ seconds, err := strconv.ParseInt(timestring, 10, 64)
+ if err != nil {
+ return nil, err
+ }
+ sig.When = time.Unix(seconds, 0)
+ } else {
+ sig.When, err = time.Parse(time.RFC1123Z, string(line[emailstop+2:]))
+ if err != nil {
+ return nil, err
+ }
}
- sig.When = time.Unix(seconds, 0)
return sig, nil
}
diff --git a/modules/mailer/mailer.go b/modules/mailer/mailer.go
index 6a23e5d0..fc6ec2fa 100644
--- a/modules/mailer/mailer.go
+++ b/modules/mailer/mailer.go
@@ -10,6 +10,7 @@ import (
"net"
"net/mail"
"net/smtp"
+ "os"
"strings"
"github.com/gogits/gogs/modules/log"
@@ -95,6 +96,15 @@ func sendMail(settings *setting.Mailer, recipients []string, msgContent []byte)
return err
}
+ hostname, err := os.Hostname()
+ if err != nil {
+ return err
+ }
+
+ if err = client.Hello(hostname); err != nil {
+ return err
+ }
+
// If not using SMTPS, alway use STARTTLS if available
hasStartTLS, _ := client.Extension("STARTTLS")
if !isSecureConn && hasStartTLS {
diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go
index b0bcd87f..3c06c69f 100644
--- a/modules/middleware/auth.go
+++ b/modules/middleware/auth.go
@@ -6,7 +6,6 @@ package middleware
import (
"net/url"
- "strings"
"github.com/Unknwon/macaron"
"github.com/macaron-contrib/csrf"
@@ -50,10 +49,6 @@ func Toggle(options *ToggleOptions) macaron.Handler {
if options.SignInRequire {
if !ctx.IsSigned {
- // Ignore watch repository operation.
- if strings.HasSuffix(ctx.Req.RequestURI, "watch") {
- return
- }
ctx.SetCookie("redirect_to", url.QueryEscape(setting.AppSubUrl+ctx.Req.RequestURI), 0, setting.AppSubUrl)
ctx.Redirect(setting.AppSubUrl + "/user/login")
return
diff --git a/modules/middleware/context.go b/modules/middleware/context.go
index 28be3a30..45779d58 100644
--- a/modules/middleware/context.go
+++ b/modules/middleware/context.go
@@ -130,6 +130,18 @@ func (ctx *Context) Handle(status int, title string, err error) {
ctx.HTML(status, base.TplName(fmt.Sprintf("status/%d", status)))
}
+func (ctx *Context) HandleAPI(status int, obj interface{}) {
+ var message string
+ if err, ok := obj.(error); ok {
+ message = err.Error()
+ } else {
+ message = obj.(string)
+ }
+ ctx.JSON(status, map[string]string{
+ "message": message,
+ })
+}
+
func (ctx *Context) ServeContent(name string, r io.ReadSeeker, params ...interface{}) {
modtime := time.Now()
for _, p := range params {
diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go
index 1ab158dd..67a9eda6 100644
--- a/modules/middleware/repo.go
+++ b/modules/middleware/repo.go
@@ -394,8 +394,7 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler {
}
ctx.Data["CloneLink"] = ctx.Repo.CloneLink
- if ctx.Repo.Repository.IsGoget {
- ctx.Data["GoGetLink"] = fmt.Sprintf("%s%s/%s", setting.AppUrl, u.LowerName, repo.LowerName)
+ if ctx.Query("go-get") == "1" {
ctx.Data["GoGetImport"] = fmt.Sprintf("%s/%s/%s", setting.Domain, u.LowerName, repo.LowerName)
}
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 6a205921..52dca3f0 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -68,8 +68,11 @@ var (
ReverseProxyAuthUser string
// Webhook settings.
- WebhookTaskInterval int
- WebhookDeliverTimeout int
+ Webhook struct {
+ TaskInterval int
+ DeliverTimeout int
+ SkipTLSVerify bool
+ }
// Repository settings.
RepoRootPath string
@@ -125,6 +128,7 @@ var (
Cfg *ini.File
ConfRootPath string
CustomPath string // Custom directory path.
+ CustomConf string
ProdMode bool
RunUser string
IsWindows bool
@@ -173,13 +177,16 @@ func NewConfigContext() {
CustomPath = path.Join(workDir, "custom")
}
- cfgPath := path.Join(CustomPath, "conf/app.ini")
- if com.IsFile(cfgPath) {
- if err = Cfg.Append(cfgPath); err != nil {
- log.Fatal(4, "Fail to load custom 'conf/app.ini': %v", err)
+ if len(CustomConf) == 0 {
+ CustomConf = path.Join(CustomPath, "conf/app.ini")
+ }
+
+ if com.IsFile(CustomConf) {
+ if err = Cfg.Append(CustomConf); err != nil {
+ log.Fatal(4, "Fail to load custom conf '%s': %v", CustomConf, err)
}
} else {
- log.Warn("No custom 'conf/app.ini' found, ignore this if you're running first time")
+ log.Warn("Custom config (%s) not found, ignore this if you're running first time", CustomConf)
}
Cfg.NameMapper = ini.AllCapsUnderscore
@@ -234,6 +241,9 @@ func NewConfigContext() {
sec = Cfg.Section("attachment")
AttachmentPath = sec.Key("PATH").MustString("data/attachments")
+ if !filepath.IsAbs(AttachmentPath) {
+ AttachmentPath = path.Join(workDir, AttachmentPath)
+ }
AttachmentAllowedTypes = sec.Key("ALLOWED_TYPES").MustString("image/jpeg|image/png")
AttachmentMaxSize = sec.Key("MAX_SIZE").MustInt64(32)
AttachmentMaxFiles = sec.Key("MAX_FILES").MustInt(10)
@@ -291,6 +301,9 @@ func NewConfigContext() {
sec = Cfg.Section("picture")
PictureService = sec.Key("SERVICE").In("server", []string{"server"})
AvatarUploadPath = sec.Key("AVATAR_UPLOAD_PATH").MustString("data/avatars")
+ if !filepath.IsAbs(AvatarUploadPath) {
+ AvatarUploadPath = path.Join(workDir, AvatarUploadPath)
+ }
os.MkdirAll(AvatarUploadPath, os.ModePerm)
switch sec.Key("GRAVATAR_SOURCE").MustString("gravatar") {
case "duoshuo":
@@ -504,8 +517,10 @@ func newNotifyMailService() {
}
func newWebhookService() {
- WebhookTaskInterval = Cfg.Section("webhook").Key("TASK_INTERVAL").MustInt(1)
- WebhookDeliverTimeout = Cfg.Section("webhook").Key("DELIVER_TIMEOUT").MustInt(5)
+ sec := Cfg.Section("webhook")
+ Webhook.TaskInterval = sec.Key("TASK_INTERVAL").MustInt(1)
+ Webhook.DeliverTimeout = sec.Key("DELIVER_TIMEOUT").MustInt(5)
+ Webhook.SkipTLSVerify = sec.Key("SKIP_TLS_VERIFY").MustBool()
}
func NewServices() {
Powered by cgit, Themed by Ted Yin.