From 34145c990d4fd9f278f29cdf9c61378a75e9b934 Mon Sep 17 00:00:00 2001 From: ᴜɴᴋɴᴡᴏɴ Date: Sat, 4 Apr 2020 21:14:15 +0800 Subject: lfs: implement HTTP routes (#6035) * Bootstrap with GORM * Fix lint error * Set conn max lifetime to one minute * Fallback to use gorm v1 * Define HTTP routes * Finish authentication * Save token updated * Add docstring * Finish authorization * serveBatch rundown * Define types in lfsutil * Finish Batch * authutil * Finish basic * Formalize response error * Fix lint errors * authutil: add tests * dbutil: add tests * lfsutil: add tests * strutil: add tests * Formalize 401 response --- internal/context/org.go | 2 +- internal/context/repo.go | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'internal/context') diff --git a/internal/context/org.go b/internal/context/org.go index 6ed35835..c56bca53 100644 --- a/internal/context/org.go +++ b/internal/context/org.go @@ -133,7 +133,7 @@ func HandleOrgAssignment(c *Context, args ...bool) { return } - c.Org.IsTeamAdmin = c.Org.Team.IsOwnerTeam() || c.Org.Team.Authorize >= db.ACCESS_MODE_ADMIN + c.Org.IsTeamAdmin = c.Org.Team.IsOwnerTeam() || c.Org.Team.Authorize >= db.AccessModeAdmin c.Data["IsTeamAdmin"] = c.Org.IsTeamAdmin if requireTeamAdmin && !c.Org.IsTeamAdmin { c.NotFound() diff --git a/internal/context/repo.go b/internal/context/repo.go index f2cac277..871b35bc 100644 --- a/internal/context/repo.go +++ b/internal/context/repo.go @@ -52,22 +52,22 @@ type Repository struct { // IsOwner returns true if current user is the owner of repository. func (r *Repository) IsOwner() bool { - return r.AccessMode >= db.ACCESS_MODE_OWNER + return r.AccessMode >= db.AccessModeOwner } // IsAdmin returns true if current user has admin or higher access of repository. func (r *Repository) IsAdmin() bool { - return r.AccessMode >= db.ACCESS_MODE_ADMIN + return r.AccessMode >= db.AccessModeAdmin } // IsWriter returns true if current user has write or higher access of repository. func (r *Repository) IsWriter() bool { - return r.AccessMode >= db.ACCESS_MODE_WRITE + return r.AccessMode >= db.AccessModeWrite } // HasAccess returns true if the current user has at least read access for this repository func (r *Repository) HasAccess() bool { - return r.AccessMode >= db.ACCESS_MODE_READ + return r.AccessMode >= db.AccessModeRead } // CanEnableEditor returns true if repository is editable and user has proper access level. @@ -168,7 +168,7 @@ func RepoAssignment(pages ...bool) macaron.Handler { // Admin has super access. if c.IsLogged && c.User.IsAdmin { - c.Repo.AccessMode = db.ACCESS_MODE_OWNER + c.Repo.AccessMode = db.AccessModeOwner } else { mode, err := db.UserAccessMode(c.UserID(), repo) if err != nil { @@ -179,7 +179,7 @@ func RepoAssignment(pages ...bool) macaron.Handler { } // Check access - if c.Repo.AccessMode == db.ACCESS_MODE_NONE { + if c.Repo.AccessMode == db.AccessModeNone { // Redirect to any accessible page if not yet on it if repo.IsPartialPublic() && (!(isIssuesPage || isWikiPage) || -- cgit v1.2.3