commit 4bfed06837d574530c9c33130b97aa805914d07e
Author: Wim <wim@42.be>
Date: Fri Oct 26 16:47:56 2018 +0000
Split up cookie token and personal token (mattermost). Fixes #530 (#540)
diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go
index 12b5097..2fed284 100644
--- a/bridge/mattermost/mattermost.go
+++ b/bridge/mattermost/mattermost.go
@@ -2737 +2737 @@ func (b *Bmattermost) handleMatterHook(messages chan *config.Message) {
func (b *Bmattermost) apiLogin() error {
password := b.GetString("Password")
if b.GetString("Token") != "" {
- password = "MMAUTHTOKEN=" + b.GetString("Token")
+ password = "token=" + b.GetString("Token")
}
b.mc = matterclient.New(b.GetString("Login"), password, b.GetString("Team"), b.GetString("Server"))
diff --git a/matterclient/matterclient.go b/matterclient/matterclient.go
index 117a2fe..6ea9950 100644
--- a/matterclient/matterclient.go
+++ b/matterclient/matterclient.go
@@ -266 +268 @@ type Credentials struct {
Login string
Team string
Pass string
+ Token string
+ CookieToken bool
Server string
NoTLS bool
SkipTLSVerify bool
@@ -1176 +11923 @@ func (m *MMClient) Login() error {
m.Client.HttpClient.Transport = &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: m.SkipTLSVerify}, Proxy: http.ProxyFromEnvironment}
m.Client.HttpClient.Timeout = time.Second * 10
+ if strings.Contains(m.Credentials.Pass, model.SESSION_COOKIE_TOKEN) {
+ token := strings.Split(m.Credentials.Pass, model.SESSION_COOKIE_TOKEN+"=")
+ if len(token) != 2 {
+ return errors.New("incorrect MMAUTHTOKEN. valid input is MMAUTHTOKEN=yourtoken")
+ }
+ m.Credentials.Token = token[1]
+ m.Credentials.CookieToken = true
+ }
+
+ if strings.Contains(m.Credentials.Pass, "token=") {
+ token := strings.Split(m.Credentials.Pass, "token=")
+ if len(token) != 2 {
+ return errors.New("incorrect personal token. valid input is token=yourtoken")
+ }
+ m.Credentials.Token = token[1]
+ }
+
for {
d := b.Duration()
// bogus call to get the serverversion
@@ -14422 +16322 @@ func (m *MMClient) Login() error {
var logmsg = "trying login"
for {
m.log.Debugf("%s %s %s %s", logmsg, m.Credentials.Team, m.Credentials.Login, m.Credentials.Server)
- if strings.Contains(m.Credentials.Pass, model.SESSION_COOKIE_TOKEN) {
- m.log.Debugf(logmsg + " with token")
- token := strings.Split(m.Credentials.Pass, model.SESSION_COOKIE_TOKEN+"=")
- if len(token) != 2 {
- return errors.New("incorrect MMAUTHTOKEN. valid input is MMAUTHTOKEN=yourtoken")
- }
- m.Client.HttpClient.Jar = m.createCookieJar(token[1])
- m.Client.AuthToken = token[1]
+ if m.Credentials.Token != "" {
m.Client.AuthType = model.HEADER_BEARER
+ m.Client.AuthToken = m.Credentials.Token
+ if m.Credentials.CookieToken {
+ m.log.Debugf(logmsg + " with cookie (MMAUTH) token")
+ m.Client.HttpClient.Jar = m.createCookieJar(m.Credentials.Token)
+ } else {
+ m.log.Debugf(logmsg + " with personal token")
+ }
m.User, resp = m.Client.GetMe("")
if resp.Error != nil {
return resp.Error
}
if m.User == nil {
m.log.Errorf("LOGIN TOKEN: %s is invalid", m.Credentials.Pass)
- return errors.New("invalid " + model.SESSION_COOKIE_TOKEN)
+ return errors.New("invalid token")
}
} else {
m.User, resp = m.Client.Login(m.Credentials.Login, m.Credentials.Pass)
