diff options
Diffstat (limited to 'services')
-rw-r--r-- | services/auth/sspi_windows.go | 2 | ||||
-rw-r--r-- | services/lfs/locks.go | 12 | ||||
-rw-r--r-- | services/migrations/gitea_downloader_test.go | 2 | ||||
-rw-r--r-- | services/migrations/gitlab.go | 4 | ||||
-rw-r--r-- | services/migrations/gitlab_test.go | 2 | ||||
-rw-r--r-- | services/migrations/onedev_test.go | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/services/auth/sspi_windows.go b/services/auth/sspi_windows.go index cadf721796..3a8c8bed44 100644 --- a/services/auth/sspi_windows.go +++ b/services/auth/sspi_windows.go @@ -109,7 +109,7 @@ func (s *SSPI) Verify(req *http.Request, w http.ResponseWriter, store DataStore, store.GetData()["EnableOpenIDSignIn"] = setting.Service.EnableOpenIDSignIn store.GetData()["EnableSSPI"] = true - err := s.rnd.HTML(w, 401, string(tplSignIn), templates.BaseVars().Merge(store.GetData())) + err := s.rnd.HTML(w, http.StatusUnauthorized, string(tplSignIn), templates.BaseVars().Merge(store.GetData())) if err != nil { log.Error("%v", err) } diff --git a/services/lfs/locks.go b/services/lfs/locks.go index a96e931fd9..fa51470d62 100644 --- a/services/lfs/locks.go +++ b/services/lfs/locks.go @@ -52,7 +52,7 @@ func GetListLockHandler(ctx *context.Context) { if err != nil { log.Debug("Could not find repository: %s/%s - %s", rv.User, rv.Repo, err) ctx.Resp.Header().Set("WWW-Authenticate", "Basic realm=gitea-lfs") - ctx.JSON(401, api.LFSLockError{ + ctx.JSON(http.StatusUnauthorized, api.LFSLockError{ Message: "You must have pull access to list locks", }) return @@ -139,7 +139,7 @@ func PostLockHandler(ctx *context.Context) { if err != nil { log.Error("Unable to get repository: %s/%s Error: %v", userName, repoName, err) ctx.Resp.Header().Set("WWW-Authenticate", "Basic realm=gitea-lfs") - ctx.JSON(401, api.LFSLockError{ + ctx.JSON(http.StatusUnauthorized, api.LFSLockError{ Message: "You must have push access to create locks", }) return @@ -164,7 +164,7 @@ func PostLockHandler(ctx *context.Context) { dec := json.NewDecoder(bodyReader) if err := dec.Decode(&req); err != nil { log.Warn("Failed to decode lock request as json. Error: %v", err) - writeStatus(ctx, 400) + writeStatus(ctx, http.StatusBadRequest) return } @@ -206,7 +206,7 @@ func VerifyLockHandler(ctx *context.Context) { if err != nil { log.Error("Unable to get repository: %s/%s Error: %v", userName, repoName, err) ctx.Resp.Header().Set("WWW-Authenticate", "Basic realm=gitea-lfs") - ctx.JSON(401, api.LFSLockError{ + ctx.JSON(http.StatusUnauthorized, api.LFSLockError{ Message: "You must have push access to verify locks", }) return @@ -272,7 +272,7 @@ func UnLockHandler(ctx *context.Context) { if err != nil { log.Error("Unable to get repository: %s/%s Error: %v", userName, repoName, err) ctx.Resp.Header().Set("WWW-Authenticate", "Basic realm=gitea-lfs") - ctx.JSON(401, api.LFSLockError{ + ctx.JSON(http.StatusUnauthorized, api.LFSLockError{ Message: "You must have push access to delete locks", }) return @@ -297,7 +297,7 @@ func UnLockHandler(ctx *context.Context) { dec := json.NewDecoder(bodyReader) if err := dec.Decode(&req); err != nil { log.Warn("Failed to decode lock request as json. Error: %v", err) - writeStatus(ctx, 400) + writeStatus(ctx, http.StatusBadRequest) return } diff --git a/services/migrations/gitea_downloader_test.go b/services/migrations/gitea_downloader_test.go index dc6903e854..601b0a7c79 100644 --- a/services/migrations/gitea_downloader_test.go +++ b/services/migrations/gitea_downloader_test.go @@ -25,7 +25,7 @@ func TestGiteaDownloadRepo(t *testing.T) { } resp, err := http.Get("https://gitea.com/gitea") - if err != nil || resp.StatusCode != 200 { + if err != nil || resp.StatusCode != http.StatusOK { t.Skipf("Can't reach https://gitea.com, skipping %s", t.Name()) } diff --git a/services/migrations/gitlab.go b/services/migrations/gitlab.go index d3a034e27c..549e3cb659 100644 --- a/services/migrations/gitlab.go +++ b/services/migrations/gitlab.go @@ -91,7 +91,7 @@ func NewGitlabDownloader(ctx context.Context, baseURL, repoPath, username, passw u, _ := url.Parse(baseURL) for len(pathParts) >= 2 { _, resp, err = gitlabClient.Version.GetVersion() - if err == nil || resp != nil && resp.StatusCode == 401 { + if err == nil || resp != nil && resp.StatusCode == http.StatusUnauthorized { err = nil // if no authentication given, this still should work break } @@ -619,7 +619,7 @@ func (g *GitlabDownloader) GetPullRequests(page, perPage int) ([]*base.PullReque func (g *GitlabDownloader) GetReviews(reviewable base.Reviewable) ([]*base.Review, error) { approvals, resp, err := g.client.MergeRequestApprovals.GetConfiguration(g.repoID, int(reviewable.GetForeignIndex()), gitlab.WithContext(g.ctx)) if err != nil { - if resp != nil && resp.StatusCode == 404 { + if resp != nil && resp.StatusCode == http.StatusNotFound { log.Error(fmt.Sprintf("GitlabDownloader: while migrating a error occurred: '%s'", err.Error())) return []*base.Review{}, nil } diff --git a/services/migrations/gitlab_test.go b/services/migrations/gitlab_test.go index 52edb2af8f..e63d674186 100644 --- a/services/migrations/gitlab_test.go +++ b/services/migrations/gitlab_test.go @@ -28,7 +28,7 @@ func TestGitlabDownloadRepo(t *testing.T) { } resp, err := http.Get("https://gitlab.com/gitea/test_repo") - if err != nil || resp.StatusCode != 200 { + if err != nil || resp.StatusCode != http.StatusOK { t.Skipf("Can't access test repo, skipping %s", t.Name()) } diff --git a/services/migrations/onedev_test.go b/services/migrations/onedev_test.go index 55ae7da1fc..0cf1ab852c 100644 --- a/services/migrations/onedev_test.go +++ b/services/migrations/onedev_test.go @@ -19,7 +19,7 @@ import ( func TestOneDevDownloadRepo(t *testing.T) { resp, err := http.Get("https://code.onedev.io/projects/go-gitea-test_repo") - if err != nil || resp.StatusCode != 200 { + if err != nil || resp.StatusCode != http.StatusOK { t.Skipf("Can't access test repo, skipping %s", t.Name()) } |