diff options
author | Corey Hulen <corey@hulen.com> | 2017-03-31 06:54:30 -0700 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-03-31 09:54:30 -0400 |
commit | 00bb4799899cbbcdf48b147639dee3cee7ea199b (patch) | |
tree | 74881150207ae980b1703644da265fed6886d65d /utils/license.go | |
parent | fa40bfb9e6f3bcdfe631301be2ee3ce755cbef0e (diff) | |
download | chat-00bb4799899cbbcdf48b147639dee3cee7ea199b.tar.gz chat-00bb4799899cbbcdf48b147639dee3cee7ea199b.tar.bz2 chat-00bb4799899cbbcdf48b147639dee3cee7ea199b.zip |
PLT-6090 adding ability to read license file from disk (#5895)
* PLT-6090 adding ability to read license file from disk
* Fixing unit test that fails only sometimes
* Fixing test that fails randomly
Diffstat (limited to 'utils/license.go')
-rw-r--r-- | utils/license.go | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/utils/license.go b/utils/license.go index 5ec94386d..f0763d741 100644 --- a/utils/license.go +++ b/utils/license.go @@ -12,6 +12,8 @@ import ( "encoding/base64" "encoding/pem" "fmt" + "io/ioutil" + "os" "strconv" "strings" @@ -112,6 +114,31 @@ func ValidateLicense(signed []byte) (bool, string) { return true, string(plaintext) } +func GetLicenseFileFromDisk(fileName string) []byte { + file, err := os.Open(fileName) + if err != nil { + l4g.Error("Failed to open license key from disk at %v err=%v", fileName, err.Error()) + return nil + } + defer file.Close() + + licenseBytes, err := ioutil.ReadAll(file) + if err != nil { + l4g.Error("Failed to read license key from disk at %v err=%v", fileName, err.Error()) + return nil + } + + return licenseBytes +} + +func GetLicenseFileLocation(fileLocation string) string { + if fileLocation == "" { + return FindDir("config") + "mattermost.mattermost-license" + } else { + return fileLocation + } +} + func getClientLicense(l *model.License) map[string]string { props := make(map[string]string) |