realaravinth/forgejo-federation
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity

[API] If User is Admin, show 500 error message on PROD mode too (#13115)

Browse source 
* API: show admin 500 error message on PROD mode too

* a nit

* dont miss InternalServerError

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
This commit is contained in:
6543 2020-10-13 02:41:49 +02:00 committed by GitHub
parent f4ffe8ed54
commit ade9c8dc3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
models/migrations/migrations.go
View file

@ -320,9 +320,9 @@ Please try upgrading to a lower version first (suggested v1.6.4), then upgrade t
return nil return nil
} }
// Downgraded Gitea not supported // Downgrading Gitea's database version not supported
if int(v-minDBVersion) > len(migrations) { 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)) v, minDBVersion+len(migrations), minDBVersion+len(migrations))
fmt.Fprint(os.Stderr, msg) fmt.Fprint(os.Stderr, msg)
log.Fatal(msg) log.Fatal(msg)

4
modules/context/api.go
View file

@ -82,7 +82,7 @@ func (ctx *APIContext) Error(status int, title string, obj interface{}) {
if status == http.StatusInternalServerError { if status == http.StatusInternalServerError {
log.ErrorWithSkip(1, "%s: %s", title, message) log.ErrorWithSkip(1, "%s: %s", title, message)
if macaron.Env == macaron.PROD { if macaron.Env == macaron.PROD && !(ctx.User != nil && ctx.User.IsAdmin) {
message = "" message = ""
} }
} }
@ -99,7 +99,7 @@ func (ctx *APIContext) InternalServerError(err error) {
log.ErrorWithSkip(1, "InternalServerError: %v", err) log.ErrorWithSkip(1, "InternalServerError: %v", err)
var message string var message string
if macaron.Env != macaron.PROD { if macaron.Env != macaron.PROD || (ctx.User != nil && ctx.User.IsAdmin) {
message = err.Error() message = err.Error()
} }