Remove duplicate SAML login error message (#29767)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
db3b72e46c
Коммит
e8beefd423
@@ -29,6 +29,6 @@ func getServerLimits(c *Context, w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if err := json.NewEncoder(w).Encode(serverLimits); err != nil {
|
if err := json.NewEncoder(w).Encode(serverLimits); err != nil {
|
||||||
c.Logger.Error("Error writing server limits response", mlog.Err(err))
|
c.Logger.Warn("Error writing server limits response", mlog.Err(err))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -450,7 +450,7 @@ func (h Handler) handleContextError(c *Context, w http.ResponseWriter, r *http.R
|
|||||||
w.Header().Set("Content-Type", "application/json")
|
w.Header().Set("Content-Type", "application/json")
|
||||||
w.WriteHeader(c.Err.StatusCode)
|
w.WriteHeader(c.Err.StatusCode)
|
||||||
if _, err := w.Write([]byte(c.Err.ToJSON())); err != nil {
|
if _, err := w.Write([]byte(c.Err.ToJSON())); err != nil {
|
||||||
c.Logger.Error("Failed to write error response", mlog.Err(err))
|
c.Logger.Warn("Failed to write error response", mlog.Err(err))
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
utils.RenderWebAppError(c.App.Config(), w, r, c.Err, c.App.AsymmetricSigningKey())
|
utils.RenderWebAppError(c.App.Config(), w, r, c.Err, c.App.AsymmetricSigningKey())
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ func authorizeOAuthApp(c *Context, w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
_, err = w.Write([]byte(model.MapToJSON(map[string]string{"redirect": redirectURL})))
|
_, err = w.Write([]byte(model.MapToJSON(map[string]string{"redirect": redirectURL})))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.Logger.Error("Error writing response", mlog.Err(err))
|
c.Logger.Warn("Error writing response", mlog.Err(err))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/mattermost/mattermost/server/public/model"
|
"github.com/mattermost/mattermost/server/public/model"
|
||||||
"github.com/mattermost/mattermost/server/public/shared/mlog"
|
|
||||||
"github.com/mattermost/mattermost/server/v8/channels/audit"
|
"github.com/mattermost/mattermost/server/v8/channels/audit"
|
||||||
"github.com/mattermost/mattermost/server/v8/channels/utils"
|
"github.com/mattermost/mattermost/server/v8/channels/utils"
|
||||||
)
|
)
|
||||||
@@ -128,8 +127,6 @@ func completeSaml(c *Context, w http.ResponseWriter, r *http.Request) {
|
|||||||
c.Err = err
|
c.Err = err
|
||||||
c.Err.StatusCode = http.StatusFound
|
c.Err.StatusCode = http.StatusFound
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Logger.Error("Failed to complete SAML login", mlog.Err(err))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(encodedXML) > maxSAMLResponseSize {
|
if len(encodedXML) > maxSAMLResponseSize {
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user