diff options
author | enahum <nahumhbl@gmail.com> | 2017-03-22 18:26:00 -0300 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2017-03-22 21:26:00 +0000 |
commit | 8ec37570742b67fd640bb3434ea226c655dbf408 (patch) | |
tree | fad125f44ceb0b4ffecef62bb9368fb916e9c136 /app | |
parent | 0d917b08ed819a6dc1fdfb9f1388d074a979e499 (diff) | |
download | chat-8ec37570742b67fd640bb3434ea226c655dbf408.tar.gz chat-8ec37570742b67fd640bb3434ea226c655dbf408.tar.bz2 chat-8ec37570742b67fd640bb3434ea226c655dbf408.zip |
PLT-5905 Fix saml certificates for 3.7 (#5843)
Diffstat (limited to 'app')
-rw-r--r-- | app/saml.go | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/app/saml.go b/app/saml.go index cc39d4540..3c205d8f5 100644 --- a/app/saml.go +++ b/app/saml.go @@ -12,6 +12,7 @@ import ( "github.com/mattermost/platform/einterfaces" "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" + "path/filepath" ) func GetSamlMetadata() (string, *model.AppError) { @@ -31,13 +32,19 @@ func GetSamlMetadata() (string, *model.AppError) { } func AddSamlCertificate(fileData *multipart.FileHeader) *model.AppError { + filename := filepath.Base(fileData.Filename) + + if filename == "." || filename == string(filepath.Separator) { + return model.NewLocAppError("AddSamlCertificate", "api.admin.add_certificate.saving.app_error", nil, "") + } + file, err := fileData.Open() defer file.Close() if err != nil { return model.NewLocAppError("AddSamlCertificate", "api.admin.add_certificate.open.app_error", nil, err.Error()) } - out, err := os.Create(utils.FindDir("config") + fileData.Filename) + out, err := os.Create(utils.FindDir("config") + filename) if err != nil { return model.NewLocAppError("AddSamlCertificate", "api.admin.add_certificate.saving.app_error", nil, err.Error()) } @@ -48,6 +55,12 @@ func AddSamlCertificate(fileData *multipart.FileHeader) *model.AppError { } func RemoveSamlCertificate(filename string) *model.AppError { + filename = filepath.Base(filename) + + if filename == "." || filename == string(filepath.Separator) { + return model.NewLocAppError("AddSamlCertificate", "api.admin.remove_certificate.delete.app_error", nil, "") + } + if err := os.Remove(utils.FindConfigFile(filename)); err != nil { return model.NewLocAppError("removeCertificate", "api.admin.remove_certificate.delete.app_error", map[string]interface{}{"Filename": filename}, err.Error()) |