diff options
| author | Chris <ccbrown112@gmail.com> | 2017-10-31 09:39:31 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-10-31 10:39:31 -0400 |
| commit | ce2b2be5de578bd9eb44b26e04db75ca61d67ca5 (patch) | |
| tree | 54203a18ecfb167dcf1d7e0742cea0ed9aab220a /api4/saml.go | |
| parent | b446d0aa0aa2bd3d87028b0543752eb539507481 (diff) | |
| download | chat-ce2b2be5de578bd9eb44b26e04db75ca61d67ca5.tar.gz chat-ce2b2be5de578bd9eb44b26e04db75ca61d67ca5.tar.bz2 chat-ce2b2be5de578bd9eb44b26e04db75ca61d67ca5.zip | |
Refactoring cfg refs and load / save functions (#7749)
* refactoring cfg refs and load / save functions
* improve error output
Diffstat (limited to 'api4/saml.go')
| -rw-r--r-- | api4/saml.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/api4/saml.go b/api4/saml.go index b2f2b3eef..469576943 100644 --- a/api4/saml.go +++ b/api4/saml.go @@ -40,8 +40,8 @@ func getSamlMetadata(c *Context, w http.ResponseWriter, r *http.Request) { w.Write([]byte(metadata)) } -func parseSamlCertificateRequest(r *http.Request) (*multipart.FileHeader, *model.AppError) { - err := r.ParseMultipartForm(*utils.Cfg.FileSettings.MaxFileSize) +func parseSamlCertificateRequest(r *http.Request, maxFileSize int64) (*multipart.FileHeader, *model.AppError) { + err := r.ParseMultipartForm(maxFileSize) if err != nil { return nil, model.NewAppError("addSamlCertificate", "api.admin.add_certificate.no_file.app_error", nil, err.Error(), http.StatusBadRequest) } @@ -66,7 +66,7 @@ func addSamlPublicCertificate(c *Context, w http.ResponseWriter, r *http.Request return } - fileData, err := parseSamlCertificateRequest(r) + fileData, err := parseSamlCertificateRequest(r, *c.App.Config().FileSettings.MaxFileSize) if err != nil { c.Err = err return @@ -85,7 +85,7 @@ func addSamlPrivateCertificate(c *Context, w http.ResponseWriter, r *http.Reques return } - fileData, err := parseSamlCertificateRequest(r) + fileData, err := parseSamlCertificateRequest(r, *c.App.Config().FileSettings.MaxFileSize) if err != nil { c.Err = err return @@ -104,7 +104,7 @@ func addSamlIdpCertificate(c *Context, w http.ResponseWriter, r *http.Request) { return } - fileData, err := parseSamlCertificateRequest(r) + fileData, err := parseSamlCertificateRequest(r, *c.App.Config().FileSettings.MaxFileSize) if err != nil { c.Err = err return |