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.

211 lines
6.3 KiB

10 years ago
Git LFS support v2 (#122) * Import github.com/git-lfs/lfs-test-server as lfs module base Imported commit is 3968aac269a77b73924649b9412ae03f7ccd3198 Removed: Dockerfile CONTRIBUTING.md mgmt* script/ vendor/ kvlogger.go .dockerignore .gitignore README.md * Remove config, add JWT support from github.com/mgit-at/lfs-test-server Imported commit f0cdcc5a01599c5a955dc1bbf683bb4acecdba83 * Add LFS settings * Add LFS meta object model * Add LFS routes and initialization * Import github.com/dgrijalva/jwt-go into vendor/ * Adapt LFS module: handlers, routing, meta store * Move LFS routes to /user/repo/info/lfs/* * Add request header checks to LFS BatchHandler / PostHandler * Implement LFS basic authentication * Rework JWT secret generation / load * Implement LFS SSH token authentication with JWT Specification: https://github.com/github/git-lfs/tree/master/docs/api * Integrate LFS settings into install process * Remove LFS objects when repository is deleted Only removes objects from content store when deleted repo is the only referencing repository * Make LFS module stateless Fixes bug where LFS would not work after installation without restarting Gitea * Change 500 'Internal Server Error' to 400 'Bad Request' * Change sql query to xorm call * Remove unneeded type from LFS module * Change internal imports to code.gitea.io/gitea/ * Add Gitea authors copyright * Change basic auth realm to "gitea-lfs" * Add unique indexes to LFS model * Use xorm count function in LFS check on repository delete * Return io.ReadCloser from content store and close after usage * Add LFS info to runWeb() * Export LFS content store base path * LFS file download from UI * Work around git-lfs client issue with unauthenticated requests Returning a dummy Authorization header for unauthenticated requests lets git-lfs client skip asking for auth credentials See: https://github.com/github/git-lfs/issues/1088 * Fix unauthenticated UI downloads from public repositories * Authentication check order, Finish LFS file view logic * Ignore LFS hooks if installed for current OS user Fixes Gitea UI actions for repositories tracking LFS files. Checks for minimum needed git version by parsing the semantic version string. * Hide LFS metafile diff from commit view, marking as binary * Show LFS notice if file in commit view is tracked * Add notbefore/nbf JWT claim * Correct lint suggestions - comments for structs and functions - Add comments to LFS model - Function comment for GetRandomBytesAsBase64 - LFS server function comments and lint variable suggestion * Move secret generation code out of conditional Ensures no LFS code may run with an empty secret * Do not hand out JWT tokens if LFS server support is disabled
8 years ago
10 years ago
Better logging (#6038) (#6095) * Panic don't fatal on create new logger Fixes #5854 Signed-off-by: Andrew Thornton <art27@cantab.net> * partial broken * Update the logging infrastrcture Signed-off-by: Andrew Thornton <art27@cantab.net> * Reset the skip levels for Fatal and Error Signed-off-by: Andrew Thornton <art27@cantab.net> * broken ncsa * More log.Error fixes Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove nal * set log-levels to lowercase * Make console_test test all levels * switch to lowercased levels * OK now working * Fix vetting issues * Fix lint * Fix tests * change default logging to match current gitea * Improve log testing Signed-off-by: Andrew Thornton <art27@cantab.net> * reset error skip levels to 0 * Update documentation and access logger configuration * Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE * Fix broken level caching * Refactor the router log * Add Router logger * Add colorizing options * Adjust router colors * Only create logger if they will be used * update app.ini.sample * rename Attribute ColorAttribute * Change from white to green for function * Set fatal/error levels * Restore initial trace logger * Fix Trace arguments in modules/auth/auth.go * Properly handle XORMLogger * Improve admin/config page * fix fmt * Add auto-compression of old logs * Update error log levels * Remove the unnecessary skip argument from Error, Fatal and Critical * Add stacktrace support * Fix tests * Remove x/sync from vendors? * Add stderr option to console logger * Use filepath.ToSlash to protect against Windows in tests * Remove prefixed underscores from names in colors.go * Remove not implemented database logger This was removed from Gogs on 4 Mar 2016 but left in the configuration since then. * Ensure that log paths are relative to ROOT_PATH * use path.Join * rename jsonConfig to logConfig * Rename "config" to "jsonConfig" to make it clearer * Requested changes * Requested changes: XormLogger * Try to color the windows terminal If successful default to colorizing the console logs * fixup * Colorize initially too * update vendor * Colorize logs on default and remove if this is not a colorizing logger * Fix documentation * fix test * Use go-isatty to detect if on windows we are on msys or cygwin * Fix spelling mistake * Add missing vendors * More changes * Rationalise the ANSI writer protection * Adjust colors on advice from @0x5c * Make Flags a comma separated list * Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING * Ensure matching is done on the non-colored message - to simpify EXPRESSION
5 years ago
Better logging (#6038) (#6095) * Panic don't fatal on create new logger Fixes #5854 Signed-off-by: Andrew Thornton <art27@cantab.net> * partial broken * Update the logging infrastrcture Signed-off-by: Andrew Thornton <art27@cantab.net> * Reset the skip levels for Fatal and Error Signed-off-by: Andrew Thornton <art27@cantab.net> * broken ncsa * More log.Error fixes Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove nal * set log-levels to lowercase * Make console_test test all levels * switch to lowercased levels * OK now working * Fix vetting issues * Fix lint * Fix tests * change default logging to match current gitea * Improve log testing Signed-off-by: Andrew Thornton <art27@cantab.net> * reset error skip levels to 0 * Update documentation and access logger configuration * Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE * Fix broken level caching * Refactor the router log * Add Router logger * Add colorizing options * Adjust router colors * Only create logger if they will be used * update app.ini.sample * rename Attribute ColorAttribute * Change from white to green for function * Set fatal/error levels * Restore initial trace logger * Fix Trace arguments in modules/auth/auth.go * Properly handle XORMLogger * Improve admin/config page * fix fmt * Add auto-compression of old logs * Update error log levels * Remove the unnecessary skip argument from Error, Fatal and Critical * Add stacktrace support * Fix tests * Remove x/sync from vendors? * Add stderr option to console logger * Use filepath.ToSlash to protect against Windows in tests * Remove prefixed underscores from names in colors.go * Remove not implemented database logger This was removed from Gogs on 4 Mar 2016 but left in the configuration since then. * Ensure that log paths are relative to ROOT_PATH * use path.Join * rename jsonConfig to logConfig * Rename "config" to "jsonConfig" to make it clearer * Requested changes * Requested changes: XormLogger * Try to color the windows terminal If successful default to colorizing the console logs * fixup * Colorize initially too * update vendor * Colorize logs on default and remove if this is not a colorizing logger * Fix documentation * fix test * Use go-isatty to detect if on windows we are on msys or cygwin * Fix spelling mistake * Add missing vendors * More changes * Rationalise the ANSI writer protection * Adjust colors on advice from @0x5c * Make Flags a comma separated list * Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING * Ensure matching is done on the non-colored message - to simpify EXPRESSION
5 years ago
Git LFS support v2 (#122) * Import github.com/git-lfs/lfs-test-server as lfs module base Imported commit is 3968aac269a77b73924649b9412ae03f7ccd3198 Removed: Dockerfile CONTRIBUTING.md mgmt* script/ vendor/ kvlogger.go .dockerignore .gitignore README.md * Remove config, add JWT support from github.com/mgit-at/lfs-test-server Imported commit f0cdcc5a01599c5a955dc1bbf683bb4acecdba83 * Add LFS settings * Add LFS meta object model * Add LFS routes and initialization * Import github.com/dgrijalva/jwt-go into vendor/ * Adapt LFS module: handlers, routing, meta store * Move LFS routes to /user/repo/info/lfs/* * Add request header checks to LFS BatchHandler / PostHandler * Implement LFS basic authentication * Rework JWT secret generation / load * Implement LFS SSH token authentication with JWT Specification: https://github.com/github/git-lfs/tree/master/docs/api * Integrate LFS settings into install process * Remove LFS objects when repository is deleted Only removes objects from content store when deleted repo is the only referencing repository * Make LFS module stateless Fixes bug where LFS would not work after installation without restarting Gitea * Change 500 'Internal Server Error' to 400 'Bad Request' * Change sql query to xorm call * Remove unneeded type from LFS module * Change internal imports to code.gitea.io/gitea/ * Add Gitea authors copyright * Change basic auth realm to "gitea-lfs" * Add unique indexes to LFS model * Use xorm count function in LFS check on repository delete * Return io.ReadCloser from content store and close after usage * Add LFS info to runWeb() * Export LFS content store base path * LFS file download from UI * Work around git-lfs client issue with unauthenticated requests Returning a dummy Authorization header for unauthenticated requests lets git-lfs client skip asking for auth credentials See: https://github.com/github/git-lfs/issues/1088 * Fix unauthenticated UI downloads from public repositories * Authentication check order, Finish LFS file view logic * Ignore LFS hooks if installed for current OS user Fixes Gitea UI actions for repositories tracking LFS files. Checks for minimum needed git version by parsing the semantic version string. * Hide LFS metafile diff from commit view, marking as binary * Show LFS notice if file in commit view is tracked * Add notbefore/nbf JWT claim * Correct lint suggestions - comments for structs and functions - Add comments to LFS model - Function comment for GetRandomBytesAsBase64 - LFS server function comments and lint variable suggestion * Move secret generation code out of conditional Ensures no LFS code may run with an empty secret * Do not hand out JWT tokens if LFS server support is disabled
8 years ago
10 years ago
10 years ago
10 years ago
Better logging (#6038) (#6095) * Panic don't fatal on create new logger Fixes #5854 Signed-off-by: Andrew Thornton <art27@cantab.net> * partial broken * Update the logging infrastrcture Signed-off-by: Andrew Thornton <art27@cantab.net> * Reset the skip levels for Fatal and Error Signed-off-by: Andrew Thornton <art27@cantab.net> * broken ncsa * More log.Error fixes Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove nal * set log-levels to lowercase * Make console_test test all levels * switch to lowercased levels * OK now working * Fix vetting issues * Fix lint * Fix tests * change default logging to match current gitea * Improve log testing Signed-off-by: Andrew Thornton <art27@cantab.net> * reset error skip levels to 0 * Update documentation and access logger configuration * Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE * Fix broken level caching * Refactor the router log * Add Router logger * Add colorizing options * Adjust router colors * Only create logger if they will be used * update app.ini.sample * rename Attribute ColorAttribute * Change from white to green for function * Set fatal/error levels * Restore initial trace logger * Fix Trace arguments in modules/auth/auth.go * Properly handle XORMLogger * Improve admin/config page * fix fmt * Add auto-compression of old logs * Update error log levels * Remove the unnecessary skip argument from Error, Fatal and Critical * Add stacktrace support * Fix tests * Remove x/sync from vendors? * Add stderr option to console logger * Use filepath.ToSlash to protect against Windows in tests * Remove prefixed underscores from names in colors.go * Remove not implemented database logger This was removed from Gogs on 4 Mar 2016 but left in the configuration since then. * Ensure that log paths are relative to ROOT_PATH * use path.Join * rename jsonConfig to logConfig * Rename "config" to "jsonConfig" to make it clearer * Requested changes * Requested changes: XormLogger * Try to color the windows terminal If successful default to colorizing the console logs * fixup * Colorize initially too * update vendor * Colorize logs on default and remove if this is not a colorizing logger * Fix documentation * fix test * Use go-isatty to detect if on windows we are on msys or cygwin * Fix spelling mistake * Add missing vendors * More changes * Rationalise the ANSI writer protection * Adjust colors on advice from @0x5c * Make Flags a comma separated list * Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING * Ensure matching is done on the non-colored message - to simpify EXPRESSION
5 years ago
10 years ago
10 years ago
  1. // Copyright 2014 The Gogs Authors. All rights reserved.
  2. // Use of this source code is governed by a MIT-style
  3. // license that can be found in the LICENSE file.
  4. package cmd
  5. import (
  6. "context"
  7. "fmt"
  8. "net/http"
  9. _ "net/http/pprof" // Used for debugging if enabled and a web server is running
  10. "os"
  11. "strings"
  12. "code.gitea.io/gitea/modules/graceful"
  13. "code.gitea.io/gitea/modules/log"
  14. "code.gitea.io/gitea/modules/setting"
  15. "code.gitea.io/gitea/routers"
  16. "code.gitea.io/gitea/routers/routes"
  17. context2 "github.com/gorilla/context"
  18. "github.com/unknwon/com"
  19. "github.com/urfave/cli"
  20. "golang.org/x/crypto/acme/autocert"
  21. ini "gopkg.in/ini.v1"
  22. )
  23. // CmdWeb represents the available web sub-command.
  24. var CmdWeb = cli.Command{
  25. Name: "web",
  26. Usage: "Start Gitea web server",
  27. Description: `Gitea web server is the only thing you need to run,
  28. and it takes care of all the other things for you`,
  29. Action: runWeb,
  30. Flags: []cli.Flag{
  31. cli.StringFlag{
  32. Name: "port, p",
  33. Value: "3000",
  34. Usage: "Temporary port number to prevent conflict",
  35. },
  36. cli.StringFlag{
  37. Name: "pid, P",
  38. Value: "/var/run/gitea.pid",
  39. Usage: "Custom pid file path",
  40. },
  41. },
  42. }
  43. func runHTTPRedirector() {
  44. source := fmt.Sprintf("%s:%s", setting.HTTPAddr, setting.PortToRedirect)
  45. dest := strings.TrimSuffix(setting.AppURL, "/")
  46. log.Info("Redirecting: %s to %s", source, dest)
  47. handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
  48. target := dest + r.URL.Path
  49. if len(r.URL.RawQuery) > 0 {
  50. target += "?" + r.URL.RawQuery
  51. }
  52. http.Redirect(w, r, target, http.StatusTemporaryRedirect)
  53. })
  54. var err = runHTTP("tcp", source, context2.ClearHandler(handler))
  55. if err != nil {
  56. log.Fatal("Failed to start port redirection: %v", err)
  57. }
  58. }
  59. func runLetsEncrypt(listenAddr, domain, directory, email string, m http.Handler) error {
  60. certManager := autocert.Manager{
  61. Prompt: autocert.AcceptTOS,
  62. HostPolicy: autocert.HostWhitelist(domain),
  63. Cache: autocert.DirCache(directory),
  64. Email: email,
  65. }
  66. go func() {
  67. log.Info("Running Let's Encrypt handler on %s", setting.HTTPAddr+":"+setting.PortToRedirect)
  68. // all traffic coming into HTTP will be redirect to HTTPS automatically (LE HTTP-01 validation happens here)
  69. var err = runHTTP("tcp", setting.HTTPAddr+":"+setting.PortToRedirect, certManager.HTTPHandler(http.HandlerFunc(runLetsEncryptFallbackHandler)))
  70. if err != nil {
  71. log.Fatal("Failed to start the Let's Encrypt handler on port %s: %v", setting.PortToRedirect, err)
  72. }
  73. }()
  74. return runHTTPSWithTLSConfig("tcp", listenAddr, certManager.TLSConfig(), context2.ClearHandler(m))
  75. }
  76. func runLetsEncryptFallbackHandler(w http.ResponseWriter, r *http.Request) {
  77. if r.Method != "GET" && r.Method != "HEAD" {
  78. http.Error(w, "Use HTTPS", http.StatusBadRequest)
  79. return
  80. }
  81. // Remove the trailing slash at the end of setting.AppURL, the request
  82. // URI always contains a leading slash, which would result in a double
  83. // slash
  84. target := strings.TrimRight(setting.AppURL, "/") + r.URL.RequestURI()
  85. http.Redirect(w, r, target, http.StatusFound)
  86. }
  87. func runWeb(ctx *cli.Context) error {
  88. managerCtx, cancel := context.WithCancel(context.Background())
  89. graceful.InitManager(managerCtx)
  90. defer cancel()
  91. if os.Getppid() > 1 && len(os.Getenv("LISTEN_FDS")) > 0 {
  92. log.Info("Restarting Gitea on PID: %d from parent PID: %d", os.Getpid(), os.Getppid())
  93. } else {
  94. log.Info("Starting Gitea on PID: %d", os.Getpid())
  95. }
  96. // Set pid file setting
  97. if ctx.IsSet("pid") {
  98. setting.CustomPID = ctx.String("pid")
  99. }
  100. // Perform global initialization
  101. routers.GlobalInit(graceful.GetManager().HammerContext())
  102. // Set up Macaron
  103. m := routes.NewMacaron()
  104. routes.RegisterRoutes(m)
  105. // Flag for port number in case first time run conflict.
  106. if ctx.IsSet("port") {
  107. setting.AppURL = strings.Replace(setting.AppURL, setting.HTTPPort, ctx.String("port"), 1)
  108. setting.HTTPPort = ctx.String("port")
  109. switch setting.Protocol {
  110. case setting.UnixSocket:
  111. case setting.FCGI:
  112. case setting.FCGIUnix:
  113. default:
  114. // Save LOCAL_ROOT_URL if port changed
  115. cfg := ini.Empty()
  116. if com.IsFile(setting.CustomConf) {
  117. // Keeps custom settings if there is already something.
  118. if err := cfg.Append(setting.CustomConf); err != nil {
  119. return fmt.Errorf("Failed to load custom conf '%s': %v", setting.CustomConf, err)
  120. }
  121. }
  122. defaultLocalURL := string(setting.Protocol) + "://"
  123. if setting.HTTPAddr == "0.0.0.0" {
  124. defaultLocalURL += "localhost"
  125. } else {
  126. defaultLocalURL += setting.HTTPAddr
  127. }
  128. defaultLocalURL += ":" + setting.HTTPPort + "/"
  129. cfg.Section("server").Key("LOCAL_ROOT_URL").SetValue(defaultLocalURL)
  130. if err := cfg.SaveTo(setting.CustomConf); err != nil {
  131. return fmt.Errorf("Error saving generated JWT Secret to custom config: %v", err)
  132. }
  133. }
  134. }
  135. listenAddr := setting.HTTPAddr
  136. if setting.Protocol != setting.UnixSocket && setting.Protocol != setting.FCGIUnix {
  137. listenAddr += ":" + setting.HTTPPort
  138. }
  139. log.Info("Listen: %v://%s%s", setting.Protocol, listenAddr, setting.AppSubURL)
  140. if setting.LFS.StartServer {
  141. log.Info("LFS server enabled")
  142. }
  143. if setting.EnablePprof {
  144. go func() {
  145. log.Info("Starting pprof server on localhost:6060")
  146. log.Info("%v", http.ListenAndServe("localhost:6060", nil))
  147. }()
  148. }
  149. var err error
  150. switch setting.Protocol {
  151. case setting.HTTP:
  152. NoHTTPRedirector()
  153. err = runHTTP("tcp", listenAddr, context2.ClearHandler(m))
  154. case setting.HTTPS:
  155. if setting.EnableLetsEncrypt {
  156. err = runLetsEncrypt(listenAddr, setting.Domain, setting.LetsEncryptDirectory, setting.LetsEncryptEmail, context2.ClearHandler(m))
  157. break
  158. }
  159. if setting.RedirectOtherPort {
  160. go runHTTPRedirector()
  161. } else {
  162. NoHTTPRedirector()
  163. }
  164. err = runHTTPS("tcp", listenAddr, setting.CertFile, setting.KeyFile, context2.ClearHandler(m))
  165. case setting.FCGI:
  166. NoHTTPRedirector()
  167. err = runFCGI("tcp", listenAddr, context2.ClearHandler(m))
  168. case setting.UnixSocket:
  169. NoHTTPRedirector()
  170. err = runHTTP("unix", listenAddr, context2.ClearHandler(m))
  171. case setting.FCGIUnix:
  172. NoHTTPRedirector()
  173. err = runFCGI("unix", listenAddr, context2.ClearHandler(m))
  174. default:
  175. log.Fatal("Invalid protocol: %s", setting.Protocol)
  176. }
  177. if err != nil {
  178. log.Critical("Failed to start server: %v", err)
  179. }
  180. log.Info("HTTP Listener: %s Closed", listenAddr)
  181. <-graceful.GetManager().Done()
  182. log.Info("PID: %d Gitea Web Finished", os.Getpid())
  183. log.Close()
  184. return nil
  185. }