From 2e7ccecfe6f3d52b1dd5277a0eaf7a628164c8ac Mon Sep 17 00:00:00 2001 From: Fabian Zaremba Date: Mon, 26 Dec 2016 02:16:37 +0100 Subject: 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 --- routers/install.go | 19 +++++++++++++++++++ routers/repo/view.go | 27 +++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) (limited to 'routers') diff --git a/routers/install.go b/routers/install.go index 9553f77b35..08687612dd 100644 --- a/routers/install.go +++ b/routers/install.go @@ -79,6 +79,7 @@ func Install(ctx *context.Context) { // Application general settings form.AppName = setting.AppName form.RepoRootPath = setting.RepoRootPath + form.LFSRootPath = setting.LFS.ContentPath // Note(unknwon): it's hard for Windows users change a running user, // so just use current one if config says default. @@ -183,6 +184,16 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { return } + // Test LFS root path if not empty, empty meaning disable LFS + if form.LFSRootPath != "" { + form.LFSRootPath = strings.Replace(form.LFSRootPath, "\\", "/", -1) + if err := os.MkdirAll(form.LFSRootPath, os.ModePerm); err != nil { + ctx.Data["Err_LFSRootPath"] = true + ctx.RenderWithErr(ctx.Tr("install.invalid_lfs_path", err), tplInstall, &form) + return + } + } + // Test log root path. form.LogRootPath = strings.Replace(form.LogRootPath, "\\", "/", -1) if err = os.MkdirAll(form.LogRootPath, os.ModePerm); err != nil { @@ -254,6 +265,14 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { cfg.Section("server").Key("SSH_PORT").SetValue(com.ToStr(form.SSHPort)) } + if form.LFSRootPath != "" { + cfg.Section("server").Key("LFS_START_SERVER").SetValue("true") + cfg.Section("server").Key("LFS_CONTENT_PATH").SetValue(form.LFSRootPath) + cfg.Section("server").Key("LFS_JWT_SECRET").SetValue(base.GetRandomBytesAsBase64(32)) + } else { + cfg.Section("server").Key("LFS_START_SERVER").SetValue("false") + } + if len(strings.TrimSpace(form.SMTPHost)) > 0 { cfg.Section("mailer").Key("ENABLED").SetValue("true") cfg.Section("mailer").Key("HOST").SetValue(form.SMTPHost) diff --git a/routers/repo/view.go b/routers/repo/view.go index 7e7ad0b923..b92380d897 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -17,11 +17,14 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/highlight" + "code.gitea.io/gitea/modules/lfs" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/markdown" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/templates" + "encoding/base64" "github.com/Unknwon/paginater" + "strconv" ) const ( @@ -139,6 +142,30 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st isTextFile := base.IsTextFile(buf) ctx.Data["IsTextFile"] = isTextFile + //Check for LFS meta file + if isTextFile && setting.LFS.StartServer { + headString := string(buf) + if strings.HasPrefix(headString, models.LFSMetaFileIdentifier) { + splitLines := strings.Split(headString, "\n") + if len(splitLines) >= 3 { + oid := strings.TrimPrefix(splitLines[1], models.LFSMetaFileOidPrefix) + size, err := strconv.ParseInt(strings.TrimPrefix(splitLines[2], "size "), 10, 64) + if len(oid) == 64 && err == nil { + contentStore := &lfs.ContentStore{BasePath: setting.LFS.ContentPath} + meta := &models.LFSMetaObject{Oid: oid} + if contentStore.Exists(meta) { + ctx.Data["IsTextFile"] = false + isTextFile = false + ctx.Data["IsLFSFile"] = true + ctx.Data["FileSize"] = size + filenameBase64 := base64.RawURLEncoding.EncodeToString([]byte(blob.Name())) + ctx.Data["RawFileLink"] = fmt.Sprintf("%s%s/info/lfs/objects/%s/%s", setting.AppURL, ctx.Repo.Repository.FullName(), oid, filenameBase64) + } + } + } + } + } + // Assume file is not editable first. if !isTextFile { ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.cannot_edit_non_text_files") -- cgit v1.2.3