Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 6 commits into from
Oct 13, 2020
Merged

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
56633b4
API: show admin 500 error message on PROD mode too
6543 Oct 12, 2020
4ad2c1d
a nit
6543 Oct 12, 2020
bd43927
dont miss InternalServerError
6543 Oct 12, 2020
9852841
Merge branch 'master' into api_500-err_show-message-to-admin
6543 Oct 12, 2020
61910c5
Merge branch 'master' into api_500-err_show-message-to-admin
6543 Oct 12, 2020
abf22bf
Merge branch 'master' into api_500-err_show-message-to-admin
techknowlogick Oct 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions models/migrations/migrations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,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
View file
Open in desktop
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