Merge branch 'main' into 16457_wiki_webhook

Author: f0086

.golangci.yml

@@ -171,3 +171,7 @@ issues:
  - path: models/user/openid.go
  linters:
  - golint
+ - path: models/user/badge.go
+ linters:
+ - revive
+ text: "exported: type name will be used as user.UserBadge by other packages, and that stutters; consider calling this Badge"

CHANGELOG.md

@@ -4,6 +4,45 @@ This changelog goes through all the changes that have been made in each release
 without substantial changes to our git log; to see the highlights of what has
 been added to each release, please refer to the [blog](https://blog.gitea.io).
 
+## [1.17.1](https://github.com/go-gitea/gitea/releases/tag/1.17.1) - 2022-08-17
+
+* SECURITY
+ * Correctly escape within tribute.js (#20831) (#20832)
+* ENHANCEMENTS
+ * Add support for NuGet API keys (#20721) (#20734)
+ * Display project in issue list (#20583)
+ * Add disable download source configuration (#20548) (#20579)
+ * Add username check to doctor (#20140) (#20671)
+ * Enable Wire 2 for Internal SSH Server (#20616) (#20617)
+* BUGFIXES
+ * Use the total issue count for UI (#20785) (#20827)
+ * Add proxy host into allow list (#20798) (#20819)
+ * Add missing translation for queue flush workers (#20791) (#20792)
+ * Improve comment header for mobile (#20781) (#20789)
+ * Fix git.Init for doctor sub-command (#20782) (#20783)
+ * Check webhooks slice length before calling xorm (#20642) (#20768)
+ * Remove manual rollback for failed generated repositories (#20639) (#20762)
+ * Use correct field name in npm template (#20675) (#20760)
+ * Keep download count on Container tag overwrite (#20728) (#20735)
+ * Fix v220 migration to be compatible for MSSQL 2008 r2 (#20702) (#20707)
+ * Use request timeout for git service rpc (#20689) (#20693)
+ * Send correct NuGet status codes (#20647) (#20677)
+ * Use correct context to get package content (#20673) (#20676)
+ * Fix the JS error "EventSource is not defined" caused by some non-standard browsers (#20584) (#20663)
+ * Add default commit messages to PR for squash merge (#20618) (#20645)
+ * Fix package upload for files >32mb (#20622) (#20635)
+ * Fix the new-line copy-paste for rendered code (#20612)
+ * Clean up and fix clone button script (#20415 & #20600) (#20599)
+ * Fix default merge style (#20564) (#20565)
+ * Add repository condition for issue count (#20454) (#20496)
+ * Make branch icon stand out more (#20726) (#20774)
+ * Fix loading button with invalid form (#20754) (#20759)
+ * Fix SecToTime edge-cases (#20610) (#20611)
+ * Executable check always returns true for windows (#20637) (#20835)
+ * Check issue labels slice length before calling xorm Insert (#20655) (#20836)
+ * Fix owners cannot create organization repos bug (#20841) (#20854)
+ * Prevent 500 is head repo does not have PullRequest unit in IsUserAllowedToUpdate (#20839) (#20848)
+
 ## [1.17.0](https://github.com/go-gitea/gitea/releases/tag/v1.17.0) - 2022-07-30
 
 * BREAKING

Makefile

@@ -242,8 +242,10 @@ clean:
 
 .PHONY: fmt
 fmt:
-@echo "Running gitea-fmt (with gofumpt)..."
 @MISSPELL_PACKAGE=$(MISSPELL_PACKAGE) GOFUMPT_PACKAGE=$(GOFUMPT_PACKAGE) $(GO) run build/code-batch-process.go gitea-fmt -w '{file-list}'
+$(eval TEMPLATES := $(wildcard templates/**/*.tmpl))
+@# strip whitespace after '{{' and before `}}` unless there is only whitespace before it 
+@$(SED_INPLACE) -e 's/{{[	]\{1,\}/{{/g' -e '/^[	]\{1,\}}}/! s/[	]\{1,\}}}/}}/g' $(TEMPLATES)
 
 .PHONY: vet
 vet:
@@ -288,13 +290,19 @@ errcheck:
 
 .PHONY: fmt-check
 fmt-check:
-# get all go files and run gitea-fmt (with gofmt) on them
+@# get all go files and run gitea-fmt (with gofmt) on them
 @diff=$$(MISSPELL_PACKAGE=$(MISSPELL_PACKAGE) GOFUMPT_PACKAGE=$(GOFUMPT_PACKAGE) $(GO) run build/code-batch-process.go gitea-fmt -l '{file-list}'); \
 if [ -n "$$diff" ]; then \
 echo "Please run 'make fmt' and commit the result:"; \
 echo "$${diff}"; \
 exit 1; \
 fi
+@diff2=$$(git diff templates); \
+if [ -n "$$diff2" ]; then \
+echo "Please run 'make fmt' and commit the result:"; \
+echo "$${diff2}"; \
+exit 1; \
+fi
 
 .PHONY: checks
 checks: checks-frontend checks-backend

build/generate-licenses.go

@@ -39,6 +39,14 @@ func main() {
 
 defer util.Remove(file.Name())
 
+if err := os.RemoveAll(destination); err != nil {
+log.Fatalf("Cannot clean destination folder: %v", err)
+}
+
+if err := os.MkdirAll(destination, 0o755); err != nil {
+log.Fatalf("Cannot create destination: %v", err)
+}
+
 req, err := http.NewRequest("GET", url, nil)
 if err != nil {
 log.Fatalf("Failed to download archive. %s", err)

build/gitea-format-imports.go

@@ -13,9 +13,8 @@ import (
 "strings"
 "text/tabwriter"
 
-"code.gitea.io/gitea/models"
 asymkey_model "code.gitea.io/gitea/models/asymkey"
-"code.gitea.io/gitea/models/auth"
+auth_model "code.gitea.io/gitea/models/auth"
 "code.gitea.io/gitea/models/db"
 repo_model "code.gitea.io/gitea/models/repo"
 user_model "code.gitea.io/gitea/models/user"
@@ -593,12 +592,12 @@ func runCreateUser(c *cli.Context) error {
 }
 
 if c.Bool("access-token") {
-t := &models.AccessToken{
+t := &auth_model.AccessToken{
 Name: "gitea-admin",
 UID: u.ID,
 }
 
-if err := models.NewAccessToken(t); err != nil {
+if err := auth_model.NewAccessToken(t); err != nil {
 return err
 }
 
@@ -700,12 +699,12 @@ func runGenerateAccessToken(c *cli.Context) error {
 return err
 }
 
-t := &models.AccessToken{
+t := &auth_model.AccessToken{
 Name: c.String("token-name"),
 UID: user.ID,
 }
 
-if err := models.NewAccessToken(t); err != nil {
+if err := auth_model.NewAccessToken(t); err != nil {
 return err
 }
 
@@ -779,9 +778,9 @@ func runRepoSyncReleases(_ *cli.Context) error {
 }
 
 func getReleaseCount(id int64) (int64, error) {
-return models.GetReleaseCountByRepoID(
+return repo_model.GetReleaseCountByRepoID(
 id,
-models.FindReleasesOptions{
+repo_model.FindReleasesOptions{
 IncludeTags: true,
 },
 )
@@ -844,8 +843,8 @@ func runAddOauth(c *cli.Context) error {
 return err
 }
 
-return auth.CreateSource(&auth.Source{
-Type: auth.OAuth2,
+return auth_model.CreateSource(&auth_model.Source{
+Type: auth_model.OAuth2,
 Name: c.String("name"),
 IsActive: true,
 Cfg: parseOAuth2Config(c),
@@ -864,7 +863,7 @@ func runUpdateOauth(c *cli.Context) error {
 return err
 }
 
-source, err := auth.GetSourceByID(c.Int64("id"))
+source, err := auth_model.GetSourceByID(c.Int64("id"))
 if err != nil {
 return err
 }
@@ -944,7 +943,7 @@ func runUpdateOauth(c *cli.Context) error {
 oAuth2Config.CustomURLMapping = customURLMapping
 source.Cfg = oAuth2Config
 
-return auth.UpdateSource(source)
+return auth_model.UpdateSource(source)
 }
 
 func parseSMTPConfig(c *cli.Context, conf *smtp.Source) error {
@@ -1015,8 +1014,8 @@ func runAddSMTP(c *cli.Context) error {
 smtpConfig.Auth = "PLAIN"
 }
 
-return auth.CreateSource(&auth.Source{
-Type: auth.SMTP,
+return auth_model.CreateSource(&auth_model.Source{
+Type: auth_model.SMTP,
 Name: c.String("name"),
 IsActive: active,
 Cfg: &smtpConfig,
@@ -1035,7 +1034,7 @@ func runUpdateSMTP(c *cli.Context) error {
 return err
 }
 
-source, err := auth.GetSourceByID(c.Int64("id"))
+source, err := auth_model.GetSourceByID(c.Int64("id"))
 if err != nil {
 return err
 }
@@ -1056,7 +1055,7 @@ func runUpdateSMTP(c *cli.Context) error {
 
 source.Cfg = smtpConfig
 
-return auth.UpdateSource(source)
+return auth_model.UpdateSource(source)
 }
 
 func runListAuth(c *cli.Context) error {
@@ -1067,7 +1066,7 @@ func runListAuth(c *cli.Context) error {
 return err
 }
 
-authSources, err := auth.Sources()
+authSources, err := auth_model.Sources()
 if err != nil {
 return err
 }
@@ -1105,7 +1104,7 @@ func runDeleteAuth(c *cli.Context) error {
 return err
 }
 
-source, err := auth.GetSourceByID(c.Int64("id"))
+source, err := auth_model.GetSourceByID(c.Int64("id"))
 if err != nil {
 return err
 }

cmd/admin.go

@@ -5,6 +5,7 @@
 package cmd
 
 import (
+"errors"
 "fmt"
 golog "log"
 "os"
@@ -123,32 +124,62 @@ func runRecreateTable(ctx *cli.Context) error {
 })
 }
 
-func runDoctor(ctx *cli.Context) error {
-stdCtx, cancel := installSignals()
-defer cancel()
-
-// Silence the default loggers
-log.DelNamedLogger("console")
-log.DelNamedLogger(log.DEFAULT)
-
-// Now setup our own
+func setDoctorLogger(ctx *cli.Context) {
 logFile := ctx.String("log-file")
 if !ctx.IsSet("log-file") {
 logFile = "doctor.log"
 }
-
 colorize := log.CanColorStdout
 if ctx.IsSet("color") {
 colorize = ctx.Bool("color")
 }
 
 if len(logFile) == 0 {
 log.NewLogger(1000, "doctor", "console", fmt.Sprintf(`{"level":"NONE","stacktracelevel":"NONE","colorize":%t}`, colorize))
-} else if logFile == "-" {
+return
+}
+
+defer func() {
+recovered := recover()
+if recovered == nil {
+return
+}
+
+err, ok := recovered.(error)
+if !ok {
+panic(recovered)
+}
+if errors.Is(err, os.ErrPermission) {
+fmt.Fprintf(os.Stderr, "ERROR: Unable to write logs to provided file due to permissions error: %s\n %v\n", logFile, err)
+} else {
+fmt.Fprintf(os.Stderr, "ERROR: Unable to write logs to provided file: %s\n %v\n", logFile, err)
+}
+fmt.Fprintf(os.Stderr, "WARN: Logging will be disabled\n Use `--log-file` to configure log file location\n")
+log.NewLogger(1000, "doctor", "console", fmt.Sprintf(`{"level":"NONE","stacktracelevel":"NONE","colorize":%t}`, colorize))
+}()
+
+if logFile == "-" {
 log.NewLogger(1000, "doctor", "console", fmt.Sprintf(`{"level":"trace","stacktracelevel":"NONE","colorize":%t}`, colorize))
 } else {
 log.NewLogger(1000, "doctor", "file", fmt.Sprintf(`{"filename":%q,"level":"trace","stacktracelevel":"NONE"}`, logFile))
 }
+}
+
+func runDoctor(ctx *cli.Context) error {
+stdCtx, cancel := installSignals()
+defer cancel()
+
+// Silence the default loggers
+log.DelNamedLogger("console")
+log.DelNamedLogger(log.DEFAULT)
+
+// Now setup our own
+setDoctorLogger(ctx)
+
+colorize := log.CanColorStdout
+if ctx.IsSet("color") {
+colorize = ctx.Bool("color")
+}
 
 // Finally redirect the default golog to here
 golog.SetFlags(0)

cmd/doctor.go

@@ -123,7 +123,7 @@ func initEmbeddedExtractor(c *cli.Context) error {
 
 sections["public"] = &section{Path: "public", Names: public.AssetNames, IsDir: public.AssetIsDir, Asset: public.Asset}
 sections["options"] = &section{Path: "options", Names: options.AssetNames, IsDir: options.AssetIsDir, Asset: options.Asset}
-sections["templates"] = &section{Path: "templates", Names: templates.AssetNames, IsDir: templates.AssetIsDir, Asset: templates.Asset}
+sections["templates"] = &section{Path: "templates", Names: templates.BuiltinAssetNames, IsDir: templates.BuiltinAssetIsDir, Asset: templates.BuiltinAsset}
 
 for _, sec := range sections {
 assets = append(assets, buildAssetList(sec, pats, c)...)

cmd/embedded.go

@@ -112,11 +112,8 @@ func migrateRepoAvatars(ctx context.Context, dstStorage storage.ObjectStorage) e
 
 func migrateRepoArchivers(ctx context.Context, dstStorage storage.ObjectStorage) error {
 return db.IterateObjects(ctx, func(archiver *repo_model.RepoArchiver) error {
-p, err := archiver.RelativePath()
-if err != nil {
-return err
-}
-_, err = storage.Copy(dstStorage, p, storage.RepoArchives, p)
+p := archiver.RelativePath()
+_, err := storage.Copy(dstStorage, p, storage.RepoArchives, p)
 return err
 })
 }