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.

213 lines
6.4 KiB

9 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
7 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
7 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"
  9. "net/http"
  10. _ "net/http/pprof" // Used for debugging if enabled and a web server is running
  11. "os"
  12. "strings"
  13. "code.gitea.io/gitea/modules/graceful"
  14. "code.gitea.io/gitea/modules/log"
  15. "code.gitea.io/gitea/modules/setting"
  16. "code.gitea.io/gitea/routers"
  17. "code.gitea.io/gitea/routers/routes"
  18. context2 "github.com/gorilla/context"
  19. "github.com/unknwon/com"
  20. "github.com/urfave/cli"
  21. "golang.org/x/crypto/acme/autocert"
  22. ini "gopkg.in/ini.v1"
  23. )
  24. // CmdWeb represents the available web sub-command.
  25. var CmdWeb = cli.Command{
  26. Name: "web",
  27. Usage: "Start Gitea web server",
  28. Description: `Gitea web server is the only thing you need to run,
  29. and it takes care of all the other things for you`,
  30. Action: runWeb,
  31. Flags: []cli.Flag{
  32. cli.StringFlag{
  33. Name: "port, p",
  34. Value: "3000",
  35. Usage: "Temporary port number to prevent conflict",
  36. },
  37. cli.StringFlag{
  38. Name: "pid, P",
  39. Value: setting.PIDFile,
  40. Usage: "Custom pid file path",
  41. },
  42. },
  43. }
  44. func runHTTPRedirector() {
  45. source := fmt.Sprintf("%s:%s", setting.HTTPAddr, setting.PortToRedirect)
  46. dest := strings.TrimSuffix(setting.AppURL, "/")
  47. log.Info("Redirecting: %s to %s", source, dest)
  48. handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
  49. target := dest + r.URL.Path
  50. if len(r.URL.RawQuery) > 0 {
  51. target += "?" + r.URL.RawQuery
  52. }
  53. http.Redirect(w, r, target, http.StatusTemporaryRedirect)
  54. })
  55. var err = runHTTP("tcp", source, context2.ClearHandler(handler))
  56. if err != nil {
  57. log.Fatal("Failed to start port redirection: %v", err)
  58. }
  59. }
  60. func runLetsEncrypt(listenAddr, domain, directory, email string, m http.Handler) error {
  61. certManager := autocert.Manager{
  62. Prompt: autocert.AcceptTOS,
  63. HostPolicy: autocert.HostWhitelist(domain),
  64. Cache: autocert.DirCache(directory),
  65. Email: email,
  66. }
  67. go func() {
  68. log.Info("Running Let's Encrypt handler on %s", setting.HTTPAddr+":"+setting.PortToRedirect)
  69. // all traffic coming into HTTP will be redirect to HTTPS automatically (LE HTTP-01 validation happens here)
  70. var err = runHTTP("tcp", setting.HTTPAddr+":"+setting.PortToRedirect, certManager.HTTPHandler(http.HandlerFunc(runLetsEncryptFallbackHandler)))
  71. if err != nil {
  72. log.Fatal("Failed to start the Let's Encrypt handler on port %s: %v", setting.PortToRedirect, err)
  73. }
  74. }()
  75. return runHTTPSWithTLSConfig("tcp", listenAddr, certManager.TLSConfig(), context2.ClearHandler(m))
  76. }
  77. func runLetsEncryptFallbackHandler(w http.ResponseWriter, r *http.Request) {
  78. if r.Method != "GET" && r.Method != "HEAD" {
  79. http.Error(w, "Use HTTPS", http.StatusBadRequest)
  80. return
  81. }
  82. // Remove the trailing slash at the end of setting.AppURL, the request
  83. // URI always contains a leading slash, which would result in a double
  84. // slash
  85. target := strings.TrimRight(setting.AppURL, "/") + r.URL.RequestURI()
  86. http.Redirect(w, r, target, http.StatusFound)
  87. }
  88. func runWeb(ctx *cli.Context) error {
  89. managerCtx, cancel := context.WithCancel(context.Background())
  90. graceful.InitManager(managerCtx)
  91. defer cancel()
  92. if os.Getppid() > 1 && len(os.Getenv("LISTEN_FDS")) > 0 {
  93. log.Info("Restarting Gitea on PID: %d from parent PID: %d", os.Getpid(), os.Getppid())
  94. } else {
  95. log.Info("Starting Gitea on PID: %d", os.Getpid())
  96. }
  97. // Set pid file setting
  98. if ctx.IsSet("pid") {
  99. setting.PIDFile = ctx.String("pid")
  100. setting.WritePIDFile = true
  101. }
  102. // Perform global initialization
  103. routers.GlobalInit(graceful.GetManager().HammerContext())
  104. // Set up Macaron
  105. m := routes.NewMacaron()
  106. routes.RegisterRoutes(m)
  107. // Flag for port number in case first time run conflict.
  108. if ctx.IsSet("port") {
  109. setting.AppURL = strings.Replace(setting.AppURL, setting.HTTPPort, ctx.String("port"), 1)
  110. setting.HTTPPort = ctx.String("port")
  111. switch setting.Protocol {
  112. case setting.UnixSocket:
  113. case setting.FCGI:
  114. case setting.FCGIUnix:
  115. default:
  116. // Save LOCAL_ROOT_URL if port changed
  117. cfg := ini.Empty()
  118. if com.IsFile(setting.CustomConf) {
  119. // Keeps custom settings if there is already something.
  120. if err := cfg.Append(setting.CustomConf); err != nil {
  121. return fmt.Errorf("Failed to load custom conf '%s': %v", setting.CustomConf, err)
  122. }
  123. }
  124. defaultLocalURL := string(setting.Protocol) + "://"
  125. if setting.HTTPAddr == "0.0.0.0" {
  126. defaultLocalURL += "localhost"
  127. } else {
  128. defaultLocalURL += setting.HTTPAddr
  129. }
  130. defaultLocalURL += ":" + setting.HTTPPort + "/"
  131. cfg.Section("server").Key("LOCAL_ROOT_URL").SetValue(defaultLocalURL)
  132. if err := cfg.SaveTo(setting.CustomConf); err != nil {
  133. return fmt.Errorf("Error saving generated JWT Secret to custom config: %v", err)
  134. }
  135. }
  136. }
  137. listenAddr := setting.HTTPAddr
  138. if setting.Protocol != setting.UnixSocket && setting.Protocol != setting.FCGIUnix {
  139. listenAddr = net.JoinHostPort(listenAddr, setting.HTTPPort)
  140. }
  141. log.Info("Listen: %v://%s%s", setting.Protocol, listenAddr, setting.AppSubURL)
  142. if setting.LFS.StartServer {
  143. log.Info("LFS server enabled")
  144. }
  145. if setting.EnablePprof {
  146. go func() {
  147. log.Info("Starting pprof server on localhost:6060")
  148. log.Info("%v", http.ListenAndServe("localhost:6060", nil))
  149. }()
  150. }
  151. var err error
  152. switch setting.Protocol {
  153. case setting.HTTP:
  154. NoHTTPRedirector()
  155. err = runHTTP("tcp", listenAddr, context2.ClearHandler(m))
  156. case setting.HTTPS:
  157. if setting.EnableLetsEncrypt {
  158. err = runLetsEncrypt(listenAddr, setting.Domain, setting.LetsEncryptDirectory, setting.LetsEncryptEmail, context2.ClearHandler(m))
  159. break
  160. }
  161. if setting.RedirectOtherPort {
  162. go runHTTPRedirector()
  163. } else {
  164. NoHTTPRedirector()
  165. }
  166. err = runHTTPS("tcp", listenAddr, setting.CertFile, setting.KeyFile, context2.ClearHandler(m))
  167. case setting.FCGI:
  168. NoHTTPRedirector()
  169. err = runFCGI("tcp", listenAddr, context2.ClearHandler(m))
  170. case setting.UnixSocket:
  171. NoHTTPRedirector()
  172. err = runHTTP("unix", listenAddr, context2.ClearHandler(m))
  173. case setting.FCGIUnix:
  174. NoHTTPRedirector()
  175. err = runFCGI("unix", listenAddr, context2.ClearHandler(m))
  176. default:
  177. log.Fatal("Invalid protocol: %s", setting.Protocol)
  178. }
  179. if err != nil {
  180. log.Critical("Failed to start server: %v", err)
  181. }
  182. log.Info("HTTP Listener: %s Closed", listenAddr)
  183. <-graceful.GetManager().Done()
  184. log.Info("PID: %d Gitea Web Finished", os.Getpid())
  185. log.Close()
  186. return nil
  187. }