You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

embedded.go 7.3KB

Rewrite logger system (#24726) ## ⚠️ Breaking The `log.<mode>.<logger>` style config has been dropped. If you used it, please check the new config manual & app.example.ini to make your instance output logs as expected. Although many legacy options still work, it's encouraged to upgrade to the new options. The SMTP logger is deleted because SMTP is not suitable to collect logs. If you have manually configured Gitea log options, please confirm the logger system works as expected after upgrading. ## Description Close #12082 and maybe more log-related issues, resolve some related FIXMEs in old code (which seems unfixable before) Just like rewriting queue #24505 : make code maintainable, clear legacy bugs, and add the ability to support more writers (eg: JSON, structured log) There is a new document (with examples): `logging-config.en-us.md` This PR is safer than the queue rewriting, because it's just for logging, it won't break other logic. ## The old problems The logging system is quite old and difficult to maintain: * Unclear concepts: Logger, NamedLogger, MultiChannelledLogger, SubLogger, EventLogger, WriterLogger etc * Some code is diffuclt to konw whether it is right: `log.DelNamedLogger("console")` vs `log.DelNamedLogger(log.DEFAULT)` vs `log.DelLogger("console")` * The old system heavily depends on ini config system, it's difficult to create new logger for different purpose, and it's very fragile. * The "color" trick is difficult to use and read, many colors are unnecessary, and in the future structured log could help * It's difficult to add other log formats, eg: JSON format * The log outputer doesn't have full control of its goroutine, it's difficult to make outputer have advanced behaviors * The logs could be lost in some cases: eg: no Fatal error when using CLI. * Config options are passed by JSON, which is quite fragile. * INI package makes the KEY in `[log]` section visible in `[log.sub1]` and `[log.sub1.subA]`, this behavior is quite fragile and would cause more unclear problems, and there is no strong requirement to support `log.<mode>.<logger>` syntax. ## The new design See `logger.go` for documents. ## Screenshot <details> ![image](https://github.com/go-gitea/gitea/assets/2114189/4462d713-ba39-41f5-bb08-de912e67e1ff) ![image](https://github.com/go-gitea/gitea/assets/2114189/b188035e-f691-428b-8b2d-ff7b2199b2f9) ![image](https://github.com/go-gitea/gitea/assets/2114189/132e9745-1c3b-4e00-9e0d-15eaea495dee) </details> ## TODO * [x] add some new tests * [x] fix some tests * [x] test some sub-commands (manually ....) --------- Co-authored-by: Jason Song <i@wolfogre.com> Co-authored-by: delvh <dev.lh@web.de> Co-authored-by: Giteabot <teabot@gitea.io>
1 year ago
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310
  1. // Copyright 2020 The Gitea Authors. All rights reserved.
  2. // SPDX-License-Identifier: MIT
  3. package cmd
  4. import (
  5. "errors"
  6. "fmt"
  7. "os"
  8. "path/filepath"
  9. "strings"
  10. "code.gitea.io/gitea/modules/assetfs"
  11. "code.gitea.io/gitea/modules/log"
  12. "code.gitea.io/gitea/modules/options"
  13. "code.gitea.io/gitea/modules/public"
  14. "code.gitea.io/gitea/modules/setting"
  15. "code.gitea.io/gitea/modules/templates"
  16. "code.gitea.io/gitea/modules/util"
  17. "github.com/gobwas/glob"
  18. "github.com/urfave/cli/v2"
  19. )
  20. // CmdEmbedded represents the available extract sub-command.
  21. var (
  22. CmdEmbedded = &cli.Command{
  23. Name: "embedded",
  24. Usage: "Extract embedded resources",
  25. Description: "A command for extracting embedded resources, like templates and images",
  26. Subcommands: []*cli.Command{
  27. subcmdList,
  28. subcmdView,
  29. subcmdExtract,
  30. },
  31. }
  32. subcmdList = &cli.Command{
  33. Name: "list",
  34. Usage: "List files matching the given pattern",
  35. Action: runList,
  36. Flags: []cli.Flag{
  37. &cli.BoolFlag{
  38. Name: "include-vendored",
  39. Aliases: []string{"vendor"},
  40. Usage: "Include files under public/vendor as well",
  41. },
  42. },
  43. }
  44. subcmdView = &cli.Command{
  45. Name: "view",
  46. Usage: "View a file matching the given pattern",
  47. Action: runView,
  48. Flags: []cli.Flag{
  49. &cli.BoolFlag{
  50. Name: "include-vendored",
  51. Aliases: []string{"vendor"},
  52. Usage: "Include files under public/vendor as well",
  53. },
  54. },
  55. }
  56. subcmdExtract = &cli.Command{
  57. Name: "extract",
  58. Usage: "Extract resources",
  59. Action: runExtract,
  60. Flags: []cli.Flag{
  61. &cli.BoolFlag{
  62. Name: "include-vendored",
  63. Aliases: []string{"vendor"},
  64. Usage: "Include files under public/vendor as well",
  65. },
  66. &cli.BoolFlag{
  67. Name: "overwrite",
  68. Usage: "Overwrite files if they already exist",
  69. },
  70. &cli.BoolFlag{
  71. Name: "rename",
  72. Usage: "Rename files as {name}.bak if they already exist (overwrites previous .bak)",
  73. },
  74. &cli.BoolFlag{
  75. Name: "custom",
  76. Usage: "Extract to the 'custom' directory as per app.ini",
  77. },
  78. &cli.StringFlag{
  79. Name: "destination",
  80. Aliases: []string{"dest-dir"},
  81. Usage: "Extract to the specified directory",
  82. },
  83. },
  84. }
  85. matchedAssetFiles []assetFile
  86. )
  87. type assetFile struct {
  88. fs *assetfs.LayeredFS
  89. name string
  90. path string
  91. }
  92. func initEmbeddedExtractor(c *cli.Context) error {
  93. setupConsoleLogger(log.ERROR, log.CanColorStderr, os.Stderr)
  94. patterns, err := compileCollectPatterns(c.Args().Slice())
  95. if err != nil {
  96. return err
  97. }
  98. collectAssetFilesByPattern(c, patterns, "options", options.BuiltinAssets())
  99. collectAssetFilesByPattern(c, patterns, "public", public.BuiltinAssets())
  100. collectAssetFilesByPattern(c, patterns, "templates", templates.BuiltinAssets())
  101. return nil
  102. }
  103. func runList(c *cli.Context) error {
  104. if err := runListDo(c); err != nil {
  105. fmt.Fprintf(os.Stderr, "%v\n", err)
  106. return err
  107. }
  108. return nil
  109. }
  110. func runView(c *cli.Context) error {
  111. if err := runViewDo(c); err != nil {
  112. fmt.Fprintf(os.Stderr, "%v\n", err)
  113. return err
  114. }
  115. return nil
  116. }
  117. func runExtract(c *cli.Context) error {
  118. if err := runExtractDo(c); err != nil {
  119. fmt.Fprintf(os.Stderr, "%v\n", err)
  120. return err
  121. }
  122. return nil
  123. }
  124. func runListDo(c *cli.Context) error {
  125. if err := initEmbeddedExtractor(c); err != nil {
  126. return err
  127. }
  128. for _, a := range matchedAssetFiles {
  129. fmt.Println(a.path)
  130. }
  131. return nil
  132. }
  133. func runViewDo(c *cli.Context) error {
  134. if err := initEmbeddedExtractor(c); err != nil {
  135. return err
  136. }
  137. if len(matchedAssetFiles) == 0 {
  138. return fmt.Errorf("no files matched the given pattern")
  139. } else if len(matchedAssetFiles) > 1 {
  140. return fmt.Errorf("too many files matched the given pattern, try to be more specific")
  141. }
  142. data, err := matchedAssetFiles[0].fs.ReadFile(matchedAssetFiles[0].name)
  143. if err != nil {
  144. return fmt.Errorf("%s: %w", matchedAssetFiles[0].path, err)
  145. }
  146. if _, err = os.Stdout.Write(data); err != nil {
  147. return fmt.Errorf("%s: %w", matchedAssetFiles[0].path, err)
  148. }
  149. return nil
  150. }
  151. func runExtractDo(c *cli.Context) error {
  152. if err := initEmbeddedExtractor(c); err != nil {
  153. return err
  154. }
  155. if c.NArg() == 0 {
  156. return fmt.Errorf("a list of pattern of files to extract is mandatory (e.g. '**' for all)")
  157. }
  158. destdir := "."
  159. if c.IsSet("destination") {
  160. destdir = c.String("destination")
  161. } else if c.Bool("custom") {
  162. destdir = setting.CustomPath
  163. fmt.Println("Using app.ini at", setting.CustomConf)
  164. }
  165. fi, err := os.Stat(destdir)
  166. if errors.Is(err, os.ErrNotExist) {
  167. // In case Windows users attempt to provide a forward-slash path
  168. wdestdir := filepath.FromSlash(destdir)
  169. if wfi, werr := os.Stat(wdestdir); werr == nil {
  170. destdir = wdestdir
  171. fi = wfi
  172. err = nil
  173. }
  174. }
  175. if err != nil {
  176. return fmt.Errorf("%s: %s", destdir, err)
  177. } else if !fi.IsDir() {
  178. return fmt.Errorf("destination %q is not a directory", destdir)
  179. }
  180. fmt.Printf("Extracting to %s:\n", destdir)
  181. overwrite := c.Bool("overwrite")
  182. rename := c.Bool("rename")
  183. for _, a := range matchedAssetFiles {
  184. if err := extractAsset(destdir, a, overwrite, rename); err != nil {
  185. // Non-fatal error
  186. fmt.Fprintf(os.Stderr, "%s: %v", a.path, err)
  187. }
  188. }
  189. return nil
  190. }
  191. func extractAsset(d string, a assetFile, overwrite, rename bool) error {
  192. dest := filepath.Join(d, filepath.FromSlash(a.path))
  193. dir := filepath.Dir(dest)
  194. data, err := a.fs.ReadFile(a.name)
  195. if err != nil {
  196. return fmt.Errorf("%s: %w", a.path, err)
  197. }
  198. if err := os.MkdirAll(dir, os.ModePerm); err != nil {
  199. return fmt.Errorf("%s: %w", dir, err)
  200. }
  201. perms := os.ModePerm & 0o666
  202. fi, err := os.Lstat(dest)
  203. if err != nil {
  204. if !errors.Is(err, os.ErrNotExist) {
  205. return fmt.Errorf("%s: %w", dest, err)
  206. }
  207. } else if !overwrite && !rename {
  208. fmt.Printf("%s already exists; skipped.\n", dest)
  209. return nil
  210. } else if !fi.Mode().IsRegular() {
  211. return fmt.Errorf("%s already exists, but it's not a regular file", dest)
  212. } else if rename {
  213. if err := util.Rename(dest, dest+".bak"); err != nil {
  214. return fmt.Errorf("error creating backup for %s: %w", dest, err)
  215. }
  216. // Attempt to respect file permissions mask (even if user:group will be set anew)
  217. perms = fi.Mode()
  218. }
  219. file, err := os.OpenFile(dest, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, perms)
  220. if err != nil {
  221. return fmt.Errorf("%s: %w", dest, err)
  222. }
  223. defer file.Close()
  224. if _, err = file.Write(data); err != nil {
  225. return fmt.Errorf("%s: %w", dest, err)
  226. }
  227. fmt.Println(dest)
  228. return nil
  229. }
  230. func collectAssetFilesByPattern(c *cli.Context, globs []glob.Glob, path string, layer *assetfs.Layer) {
  231. fs := assetfs.Layered(layer)
  232. files, err := fs.ListAllFiles(".", true)
  233. if err != nil {
  234. log.Error("Error listing files in %q: %v", path, err)
  235. return
  236. }
  237. for _, name := range files {
  238. if path == "public" &&
  239. strings.HasPrefix(name, "vendor/") &&
  240. !c.Bool("include-vendored") {
  241. continue
  242. }
  243. matchName := path + "/" + name
  244. for _, g := range globs {
  245. if g.Match(matchName) {
  246. matchedAssetFiles = append(matchedAssetFiles, assetFile{fs: fs, name: name, path: path + "/" + name})
  247. break
  248. }
  249. }
  250. }
  251. }
  252. func compileCollectPatterns(args []string) ([]glob.Glob, error) {
  253. if len(args) == 0 {
  254. args = []string{"**"}
  255. }
  256. pat := make([]glob.Glob, len(args))
  257. for i := range args {
  258. if g, err := glob.Compile(args[i], '/'); err != nil {
  259. return nil, fmt.Errorf("'%s': Invalid glob pattern: %w", args[i], err)
  260. } else { //nolint:revive
  261. pat[i] = g
  262. }
  263. }
  264. return pat, nil
  265. }