Skip to content

Commit

Permalink
[API] If User is Admin, show 500 error message on PROD mode too (#13115)
Browse files Browse the repository at this point in the history
* API: show admin 500 error message on PROD mode too

* a nit

* dont miss InternalServerError

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
  • Loading branch information
6543 and techknowlogick authored Oct 13, 2020
1 parent f4ffe8e commit ade9c8d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions models/migrations/migrations.go
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,9 @@ Please try upgrading to a lower version first (suggested v1.6.4), then upgrade t
return nil
}

// Downgraded Gitea not supported
// Downgrading Gitea's database version not supported
if int(v-minDBVersion) > len(migrations) {
msg := fmt.Sprintf("Downgrading Gitea from '%d' to '%d' is not supported and may result in loss of data integrity.\nIf you really know what you're doing, execute `UPDATE version SET version=%d WHERE id=1;`\n",
msg := fmt.Sprintf("Downgrading database version from '%d' to '%d' is not supported and may result in loss of data integrity.\nIf you really know what you're doing, execute `UPDATE version SET version=%d WHERE id=1;`\n",
v, minDBVersion+len(migrations), minDBVersion+len(migrations))
fmt.Fprint(os.Stderr, msg)
log.Fatal(msg)
Expand Down
4 changes: 2 additions & 2 deletions modules/context/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func (ctx *APIContext) Error(status int, title string, obj interface{}) {
if status == http.StatusInternalServerError {
log.ErrorWithSkip(1, "%s: %s", title, message)

if macaron.Env == macaron.PROD {
if macaron.Env == macaron.PROD && !(ctx.User != nil && ctx.User.IsAdmin) {
message = ""
}
}
Expand All @@ -99,7 +99,7 @@ func (ctx *APIContext) InternalServerError(err error) {
log.ErrorWithSkip(1, "InternalServerError: %v", err)

var message string
if macaron.Env != macaron.PROD {
if macaron.Env != macaron.PROD || (ctx.User != nil && ctx.User.IsAdmin) {
message = err.Error()
}

Expand Down

0 comments on commit ade9c8d

Please sign in to comment.