From ba93504804c6eff08cae095931befc35f5e5ddb2 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Fri, 17 Feb 2017 12:28:23 -0500 Subject: [PATCH] setting: check mailService.From only if it has value (#4134) --- modules/base/tool.go | 4 +-- modules/setting/setting.go | 62 ++++++++++++++++++++------------------ 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/modules/base/tool.go b/modules/base/tool.go index 68257b9c..785d5090 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -182,11 +182,11 @@ func HashEmail(email string) string { // to return full URL if user enables Gravatar-like service. func AvatarLink(email string) (url string) { if setting.EnableFederatedAvatar && setting.LibravatarService != nil && - len(email) > 0 { + strings.Contains(email, "@") { var err error url, err = setting.LibravatarService.FromEmail(email) if err != nil { - log.Error(3, "LibravatarService.FromEmail [%s]: %v", email, err) + log.Error(2, "LibravatarService.FromEmail [%s]: %v", email, err) } } if len(url) == 0 && !setting.DisableGravatar { diff --git a/modules/setting/setting.go b/modules/setting/setting.go index f42d26e3..76f1e73d 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -302,7 +302,7 @@ func init() { var err error if AppPath, err = execPath(); err != nil { - log.Fatal(4, "Fail to get app path: %v\n", err) + log.Fatal(2, "Fail to get app path: %v\n", err) } // Note: we don't use path.Dir here because it does not handle case @@ -326,7 +326,7 @@ func WorkDir() (string, error) { func forcePathSeparator(path string) { if strings.Contains(path, "\\") { - log.Fatal(4, "Do not use '\\' or '\\\\' in paths, instead, please use '/' in all places") + log.Fatal(2, "Do not use '\\' or '\\\\' in paths, instead, please use '/' in all places") } } @@ -348,12 +348,12 @@ func IsRunUserMatchCurrentUser(runUser string) (string, bool) { func NewContext() { workDir, err := WorkDir() if err != nil { - log.Fatal(4, "Fail to get work directory: %v", err) + log.Fatal(2, "Fail to get work directory: %v", err) } Cfg, err = ini.Load(bindata.MustAsset("conf/app.ini")) if err != nil { - log.Fatal(4, "Fail to parse 'conf/app.ini': %v", err) + log.Fatal(2, "Fail to parse 'conf/app.ini': %v", err) } CustomPath = os.Getenv("GOGS_CUSTOM") @@ -367,7 +367,7 @@ func NewContext() { if com.IsFile(CustomConf) { if err = Cfg.Append(CustomConf); err != nil { - log.Fatal(4, "Fail to load custom conf '%s': %v", CustomConf, err) + log.Fatal(2, "Fail to load custom conf '%s': %v", CustomConf, err) } } else { log.Warn("Custom config '%s' not found, ignore this if you're running first time", CustomConf) @@ -376,7 +376,7 @@ func NewContext() { homeDir, err := com.HomeDir() if err != nil { - log.Fatal(4, "Fail to get home directory: %v", err) + log.Fatal(2, "Fail to get home directory: %v", err) } homeDir = strings.Replace(homeDir, "\\", "/", -1) @@ -393,7 +393,7 @@ func NewContext() { // Check if has app suburl. url, err := url.Parse(AppUrl) if err != nil { - log.Fatal(4, "Invalid ROOT_URL '%s': %s", AppUrl, err) + log.Fatal(2, "Invalid ROOT_URL '%s': %s", AppUrl, err) } // Suburl should start with '/' and end without '/', such as '/{subpath}'. // This value is empty if site does not have sub-url. @@ -412,7 +412,7 @@ func NewContext() { UnixSocketPermissionRaw := sec.Key("UNIX_SOCKET_PERMISSION").MustString("666") UnixSocketPermissionParsed, err := strconv.ParseUint(UnixSocketPermissionRaw, 8, 32) if err != nil || UnixSocketPermissionParsed > 0777 { - log.Fatal(4, "Fail to parse unixSocketPermission: %s", UnixSocketPermissionRaw) + log.Fatal(2, "Fail to parse unixSocketPermission: %s", UnixSocketPermissionRaw) } UnixSocketPermission = uint32(UnixSocketPermissionParsed) } @@ -437,7 +437,7 @@ func NewContext() { SSH.ServerCiphers = sec.Key("SSH_SERVER_CIPHERS").Strings(",") SSH.KeyTestPath = os.TempDir() if err = Cfg.Section("server").MapTo(&SSH); err != nil { - log.Fatal(4, "Fail to map SSH settings: %v", err) + log.Fatal(2, "Fail to map SSH settings: %v", err) } // When disable SSH, start builtin server value is ignored. if SSH.Disabled { @@ -446,9 +446,9 @@ func NewContext() { if !SSH.Disabled && !SSH.StartBuiltinServer { if err := os.MkdirAll(SSH.RootPath, 0700); err != nil { - log.Fatal(4, "Fail to create '%s': %v", SSH.RootPath, err) + log.Fatal(2, "Fail to create '%s': %v", SSH.RootPath, err) } else if err = os.MkdirAll(SSH.KeyTestPath, 0644); err != nil { - log.Fatal(4, "Fail to create '%s': %v", SSH.KeyTestPath, err) + log.Fatal(2, "Fail to create '%s': %v", SSH.KeyTestPath, err) } } @@ -503,7 +503,7 @@ func NewContext() { if InstallLock { currentUser, match := IsRunUserMatchCurrentUser(RunUser) if !match { - log.Fatal(4, "Expect user '%s' but current user is: %s", RunUser, currentUser) + log.Fatal(2, "Expect user '%s' but current user is: %s", RunUser, currentUser) } } @@ -520,11 +520,11 @@ func NewContext() { } ScriptType = sec.Key("SCRIPT_TYPE").MustString("bash") if err = Cfg.Section("repository").MapTo(&Repository); err != nil { - log.Fatal(4, "Fail to map Repository settings: %v", err) + log.Fatal(2, "Fail to map Repository settings: %v", err) } else if err = Cfg.Section("repository.editor").MapTo(&Repository.Editor); err != nil { - log.Fatal(4, "Fail to map Repository.Editor settings: %v", err) + log.Fatal(2, "Fail to map Repository.Editor settings: %v", err) } else if err = Cfg.Section("repository.upload").MapTo(&Repository.Upload); err != nil { - log.Fatal(4, "Fail to map Repository.Upload settings: %v", err) + log.Fatal(2, "Fail to map Repository.Upload settings: %v", err) } if !filepath.IsAbs(Repository.Upload.TempPath) { @@ -572,21 +572,21 @@ func NewContext() { } if err = Cfg.Section("http").MapTo(&HTTP); err != nil { - log.Fatal(4, "Fail to map HTTP settings: %v", err) + log.Fatal(2, "Fail to map HTTP settings: %v", err) } else if err = Cfg.Section("markdown").MapTo(&Markdown); err != nil { - log.Fatal(4, "Fail to map Markdown settings: %v", err) + log.Fatal(2, "Fail to map Markdown settings: %v", err) } else if err = Cfg.Section("admin").MapTo(&Admin); err != nil { - log.Fatal(4, "Fail to map Admin settings: %v", err) + log.Fatal(2, "Fail to map Admin settings: %v", err) } else if err = Cfg.Section("cron").MapTo(&Cron); err != nil { - log.Fatal(4, "Fail to map Cron settings: %v", err) + log.Fatal(2, "Fail to map Cron settings: %v", err) } else if err = Cfg.Section("git").MapTo(&Git); err != nil { - log.Fatal(4, "Fail to map Git settings: %v", err) + log.Fatal(2, "Fail to map Git settings: %v", err) } else if err = Cfg.Section("mirror").MapTo(&Mirror); err != nil { - log.Fatal(4, "Fail to map Mirror settings: %v", err) + log.Fatal(2, "Fail to map Mirror settings: %v", err) } else if err = Cfg.Section("api").MapTo(&API); err != nil { - log.Fatal(4, "Fail to map API settings: %v", err) + log.Fatal(2, "Fail to map API settings: %v", err) } else if err = Cfg.Section("ui").MapTo(&UI); err != nil { - log.Fatal(4, "Fail to map UI settings: %v", err) + log.Fatal(2, "Fail to map UI settings: %v", err) } if Mirror.DefaultInterval <= 0 { @@ -653,7 +653,7 @@ func newLogService() { mode = strings.ToLower(strings.TrimSpace(mode)) sec, err := Cfg.GetSection("log." + mode) if err != nil { - log.Fatal(4, "Unknown logger mode: %s", mode) + log.Fatal(2, "Unknown logger mode: %s", mode) } validLevels := []string{"trace", "info", "warn", "error", "fatal"} @@ -678,7 +678,7 @@ func newLogService() { case log.FILE: logPath := path.Join(LogRootPath, "gogs.log") if err = os.MkdirAll(path.Dir(logPath), os.ModePerm); err != nil { - log.Fatal(4, "Fail to create log directory '%s': %v", path.Dir(logPath), err) + log.Fatal(2, "Fail to create log directory '%s': %v", path.Dir(logPath), err) } LogConfigs[i] = log.FileConfig{ @@ -721,7 +721,7 @@ func newCacheService() { case "redis", "memcache": CacheConn = strings.Trim(Cfg.Section("cache").Key("HOST").String(), "\" ") default: - log.Fatal(4, "Unknown cache adapter: %s", CacheAdapter) + log.Fatal(2, "Unknown cache adapter: %s", CacheAdapter) } log.Info("Cache Service Enabled") @@ -783,11 +783,13 @@ func newMailService() { } MailService.From = sec.Key("FROM").MustString(MailService.User) - parsed, err := mail.ParseAddress(MailService.From) - if err != nil { - log.Fatal(4, "Invalid mailer.FROM (%s): %v", MailService.From, err) + if len(MailService.From) > 0 { + parsed, err := mail.ParseAddress(MailService.From) + if err != nil { + log.Fatal(2, "Invalid mailer.FROM (%s): %v", MailService.From, err) + } + MailService.FromEmail = parsed.Address } - MailService.FromEmail = parsed.Address log.Info("Mail Service Enabled") }