mirrors/object-browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed prometheus URL from error responses to avoid data leak (#986)

Browse Source
This commit is contained in:
Alex
2021-08-26 16:36:57 -05:00
committed by GitHub
parent bb8460a118
commit 48313d6cd9
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
restapi/admin_info.go
View File

@@ -874,18 +874,18 @@ func unmarshalPrometheus(endpoint string, data interface{}) bool {
httpClnt := GetConsoleHTTPClient()
resp, err := httpClnt.Get(endpoint)
if err != nil {
LogError("Unable to fetch labels from prometheus %s, %v", endpoint, err)
LogError("Unable to fetch labels from prometheus (%s)", resp.Status)
return true
}
defer resp.Body.Close()
if resp.StatusCode != 200 {
LogError("Unexpected error from prometheus %s (%s)", endpoint, resp.Status)
LogError("Unexpected error from prometheus (%s)", resp.Status)
return true
}
if err = json.NewDecoder(resp.Body).Decode(data); err != nil {
LogError("Unexpected error reading response from prometheus %s, %v", endpoint, err)
LogError("Unexpected error reading response from prometheus, %v", err)
return true
}
@@ -906,7 +906,7 @@ func testPrometheusURL(url string) bool {
response, err := GetConsoleHTTPClient().Do(req)
if err != nil {
LogError("Non reachable Prometheus URL: %s (%v)", url, err)
LogError("Non reachable Prometheus URL: (%v)", err)
return false
}

6
restapi/user_log_search.go
View File

@@ -66,7 +66,11 @@ func logSearch(endpoint string) (*models.LogSearchResponse, *models.Error) {
httpClnt := GetConsoleHTTPClient()
resp, err := httpClnt.Get(endpoint)
if err != nil {
return nil, prepareError(err)
return nil, &models.Error{
Code: int32(500),
Message: swag.String("Log Search API not available."),
DetailedMessage: swag.String("The Log Search API cannot be reached. Please review the URL and try again."),
}
}
defer resp.Body.Close()