opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-10-28 02:36:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

PLT-5905 Fix saml certificates (#5803)

Browse Source
This commit is contained in:
enahum
2017-03-22 19:24:05 +00:00
committed by George Goldberg
parent 61b1237c20
commit 7e2e823884
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/saml.go
+14 -1
View File
@@ -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) {
@@ -29,13 +30,19 @@ func GetSamlMetadata() (string, *model.AppError) {
}
func WriteSamlFile(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())
}
@@ -106,6 +113,12 @@ func AddSamlIdpCertificate(fileData *multipart.FileHeader) *model.AppError {
}
func RemoveSamlFile(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())