From 79e6c9fa6cfca4bfe8913fd891fd9b12bd5bb505 Mon Sep 17 00:00:00 2001 From: Wim Date: Sat, 28 Jan 2017 22:45:32 +0100 Subject: Update vendor --- .../42wim/matterbridge-plus/bridge/LICENSE | 202 ---------- .../42wim/matterbridge-plus/bridge/bridge.go | 434 -------------------- .../42wim/matterbridge-plus/bridge/config.go | 68 ---- .../42wim/matterbridge-plus/bridge/helper.go | 59 --- .../42wim/matterbridge-plus/matterclient/LICENSE | 202 ---------- .../matterbridge-plus/matterclient/matterclient.go | 441 --------------------- 6 files changed, 1406 deletions(-) delete mode 100644 vendor/github.com/42wim/matterbridge-plus/bridge/LICENSE delete mode 100644 vendor/github.com/42wim/matterbridge-plus/bridge/bridge.go delete mode 100644 vendor/github.com/42wim/matterbridge-plus/bridge/config.go delete mode 100644 vendor/github.com/42wim/matterbridge-plus/bridge/helper.go delete mode 100644 vendor/github.com/42wim/matterbridge-plus/matterclient/LICENSE delete mode 100644 vendor/github.com/42wim/matterbridge-plus/matterclient/matterclient.go (limited to 'vendor/github.com/42wim/matterbridge-plus') diff --git a/vendor/github.com/42wim/matterbridge-plus/bridge/LICENSE b/vendor/github.com/42wim/matterbridge-plus/bridge/LICENSE deleted file mode 100644 index 8f71f43f..00000000 --- a/vendor/github.com/42wim/matterbridge-plus/bridge/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - diff --git a/vendor/github.com/42wim/matterbridge-plus/bridge/bridge.go b/vendor/github.com/42wim/matterbridge-plus/bridge/bridge.go deleted file mode 100644 index ee27a65d..00000000 --- a/vendor/github.com/42wim/matterbridge-plus/bridge/bridge.go +++ /dev/null @@ -1,434 +0,0 @@ -package bridge - -import ( - "crypto/tls" - "github.com/42wim/matterbridge-plus/matterclient" - "github.com/42wim/matterbridge/matterhook" - log "github.com/Sirupsen/logrus" - "github.com/peterhellberg/giphy" - ircm "github.com/sorcix/irc" - "github.com/thoj/go-ircevent" - "regexp" - "sort" - "strconv" - "strings" - "time" -) - -//type Bridge struct { -type MMhook struct { - mh *matterhook.Client -} - -type MMapi struct { - mc *matterclient.MMClient - mmMap map[string]string - mmIgnoreNicks []string -} - -type MMirc struct { - i *irc.Connection - ircNick string - ircMap map[string]string - names map[string][]string - ircIgnoreNicks []string -} - -type MMMessage struct { - Text string - Channel string - Username string -} - -type Bridge struct { - MMhook - MMapi - MMirc - *Config - kind string -} - -type FancyLog struct { - irc *log.Entry - mm *log.Entry -} - -var flog FancyLog - -const Legacy = "legacy" - -func initFLog() { - flog.irc = log.WithFields(log.Fields{"module": "irc"}) - flog.mm = log.WithFields(log.Fields{"module": "mattermost"}) -} - -func NewBridge(name string, config *Config, kind string) *Bridge { - initFLog() - b := &Bridge{} - b.Config = config - b.kind = kind - b.ircNick = b.Config.IRC.Nick - b.ircMap = make(map[string]string) - b.MMirc.names = make(map[string][]string) - b.ircIgnoreNicks = strings.Fields(b.Config.IRC.IgnoreNicks) - b.mmIgnoreNicks = strings.Fields(b.Config.Mattermost.IgnoreNicks) - if kind == Legacy { - if len(b.Config.Token) > 0 { - for _, val := range b.Config.Token { - b.ircMap[val.IRCChannel] = val.MMChannel - } - } - - b.mh = matterhook.New(b.Config.Mattermost.URL, - matterhook.Config{Port: b.Config.Mattermost.Port, Token: b.Config.Mattermost.Token, - InsecureSkipVerify: b.Config.Mattermost.SkipTLSVerify, - BindAddress: b.Config.Mattermost.BindAddress}) - } else { - b.mmMap = make(map[string]string) - if len(b.Config.Channel) > 0 { - for _, val := range b.Config.Channel { - b.ircMap[val.IRC] = val.Mattermost - b.mmMap[val.Mattermost] = val.IRC - } - } - b.mc = matterclient.New(b.Config.Mattermost.Login, b.Config.Mattermost.Password, - b.Config.Mattermost.Team, b.Config.Mattermost.Server) - b.mc.SkipTLSVerify = b.Config.Mattermost.SkipTLSVerify - b.mc.NoTLS = b.Config.Mattermost.NoTLS - flog.mm.Infof("Trying login %s (team: %s) on %s", b.Config.Mattermost.Login, b.Config.Mattermost.Team, b.Config.Mattermost.Server) - err := b.mc.Login() - if err != nil { - flog.mm.Fatal("Can not connect", err) - } - flog.mm.Info("Login ok") - b.mc.JoinChannel(b.Config.Mattermost.Channel) - if len(b.Config.Channel) > 0 { - for _, val := range b.Config.Channel { - b.mc.JoinChannel(val.Mattermost) - } - } - go b.mc.WsReceiver() - } - flog.irc.Info("Trying IRC connection") - b.i = b.createIRC(name) - flog.irc.Info("Connection succeeded") - go b.handleMatter() - return b -} - -func (b *Bridge) createIRC(name string) *irc.Connection { - i := irc.IRC(b.Config.IRC.Nick, b.Config.IRC.Nick) - i.UseTLS = b.Config.IRC.UseTLS - i.TLSConfig = &tls.Config{InsecureSkipVerify: b.Config.IRC.SkipTLSVerify} - if b.Config.IRC.Password != "" { - i.Password = b.Config.IRC.Password - } - i.AddCallback(ircm.RPL_WELCOME, b.handleNewConnection) - i.Connect(b.Config.IRC.Server + ":" + strconv.Itoa(b.Config.IRC.Port)) - return i -} - -func (b *Bridge) handleNewConnection(event *irc.Event) { - flog.irc.Info("Registering callbacks") - i := b.i - b.ircNick = event.Arguments[0] - i.AddCallback("PRIVMSG", b.handlePrivMsg) - i.AddCallback("CTCP_ACTION", b.handlePrivMsg) - i.AddCallback(ircm.RPL_ENDOFNAMES, b.endNames) - i.AddCallback(ircm.RPL_NAMREPLY, b.storeNames) - i.AddCallback(ircm.RPL_TOPICWHOTIME, b.handleTopicWhoTime) - i.AddCallback(ircm.NOTICE, b.handleNotice) - i.AddCallback(ircm.RPL_MYINFO, func(e *irc.Event) { flog.irc.Infof("%s: %s", e.Code, strings.Join(e.Arguments[1:], " ")) }) - i.AddCallback("PING", func(e *irc.Event) { - i.SendRaw("PONG :" + e.Message()) - flog.irc.Debugf("PING/PONG") - }) - if b.Config.Mattermost.ShowJoinPart { - i.AddCallback("JOIN", b.handleJoinPart) - i.AddCallback("PART", b.handleJoinPart) - } - i.AddCallback("*", b.handleOther) - b.setupChannels() -} - -func (b *Bridge) setupChannels() { - i := b.i - if b.Config.IRC.Channel != "" { - flog.irc.Infof("Joining %s as %s", b.Config.IRC.Channel, b.ircNick) - i.Join(b.Config.IRC.Channel) - } - if b.kind == Legacy { - for _, val := range b.Config.Token { - flog.irc.Infof("Joining %s as %s", val.IRCChannel, b.ircNick) - i.Join(val.IRCChannel) - } - } else { - for _, val := range b.Config.Channel { - flog.irc.Infof("Joining %s as %s", val.IRC, b.ircNick) - i.Join(val.IRC) - } - } -} - -func (b *Bridge) handleIrcBotCommand(event *irc.Event) bool { - parts := strings.Fields(event.Message()) - exp, _ := regexp.Compile("[:,]+$") - channel := event.Arguments[0] - command := "" - if len(parts) == 2 { - command = parts[1] - } - if exp.ReplaceAllString(parts[0], "") == b.ircNick { - switch command { - case "users": - usernames := b.mc.UsernamesInChannel(b.getMMChannel(channel)) - sort.Strings(usernames) - b.i.Privmsg(channel, "Users on Mattermost: "+strings.Join(usernames, ", ")) - default: - b.i.Privmsg(channel, "Valid commands are: [users, help]") - } - return true - } - return false -} - -func (b *Bridge) ircNickFormat(nick string) string { - if nick == b.ircNick { - return nick - } - if b.Config.Mattermost.RemoteNickFormat == nil { - return "irc-" + nick - } - return strings.Replace(*b.Config.Mattermost.RemoteNickFormat, "{NICK}", nick, -1) -} - -func (b *Bridge) handlePrivMsg(event *irc.Event) { - if b.ignoreMessage(event.Nick, event.Message(), "irc") { - return - } - if b.handleIrcBotCommand(event) { - return - } - msg := "" - if event.Code == "CTCP_ACTION" { - msg = event.Nick + " " - } - msg += event.Message() - b.Send(b.ircNickFormat(event.Nick), msg, b.getMMChannel(event.Arguments[0])) -} - -func (b *Bridge) handleJoinPart(event *irc.Event) { - b.Send(b.ircNick, b.ircNickFormat(event.Nick)+" "+strings.ToLower(event.Code)+"s "+event.Message(), b.getMMChannel(event.Arguments[0])) -} - -func (b *Bridge) handleNotice(event *irc.Event) { - if strings.Contains(event.Message(), "This nickname is registered") { - b.i.Privmsg(b.Config.IRC.NickServNick, "IDENTIFY "+b.Config.IRC.NickServPassword) - } -} - -func (b *Bridge) nicksPerRow() int { - if b.Config.Mattermost.NicksPerRow < 1 { - return 4 - } - return b.Config.Mattermost.NicksPerRow -} - -func (b *Bridge) formatnicks(nicks []string, continued bool) string { - switch b.Config.Mattermost.NickFormatter { - case "table": - return tableformatter(nicks, b.nicksPerRow(), continued) - default: - return plainformatter(nicks, b.nicksPerRow()) - } -} - -func (b *Bridge) storeNames(event *irc.Event) { - channel := event.Arguments[2] - b.MMirc.names[channel] = append( - b.MMirc.names[channel], - strings.Split(strings.TrimSpace(event.Message()), " ")...) -} - -func (b *Bridge) endNames(event *irc.Event) { - channel := event.Arguments[1] - sort.Strings(b.MMirc.names[channel]) - maxNamesPerPost := (300 / b.nicksPerRow()) * b.nicksPerRow() - continued := false - for len(b.MMirc.names[channel]) > maxNamesPerPost { - b.Send( - b.ircNick, - b.formatnicks(b.MMirc.names[channel][0:maxNamesPerPost], continued), - b.getMMChannel(channel)) - b.MMirc.names[channel] = b.MMirc.names[channel][maxNamesPerPost:] - continued = true - } - b.Send(b.ircNick, b.formatnicks(b.MMirc.names[channel], continued), b.getMMChannel(channel)) - b.MMirc.names[channel] = nil -} - -func (b *Bridge) handleTopicWhoTime(event *irc.Event) { - parts := strings.Split(event.Arguments[2], "!") - t, err := strconv.ParseInt(event.Arguments[3], 10, 64) - if err != nil { - flog.irc.Errorf("Invalid time stamp: %s", event.Arguments[3]) - } - user := parts[0] - if len(parts) > 1 { - user += " [" + parts[1] + "]" - } - flog.irc.Infof("%s: Topic set by %s [%s]", event.Code, user, time.Unix(t, 0)) -} - -func (b *Bridge) handleOther(event *irc.Event) { - flog.irc.Debugf("%#v", event) -} - -func (b *Bridge) Send(nick string, message string, channel string) error { - return b.SendType(nick, message, channel, "") -} - -func (b *Bridge) SendType(nick string, message string, channel string, mtype string) error { - if b.Config.Mattermost.PrefixMessagesWithNick { - if IsMarkup(message) { - message = nick + "\n\n" + message - } else { - message = nick + " " + message - } - } - if b.kind == Legacy { - matterMessage := matterhook.OMessage{IconURL: b.Config.Mattermost.IconURL} - matterMessage.Channel = channel - matterMessage.UserName = nick - matterMessage.Type = mtype - matterMessage.Text = message - err := b.mh.Send(matterMessage) - if err != nil { - flog.mm.Info(err) - return err - } - return nil - } - flog.mm.Debug("->mattermost channel: ", channel, " ", message) - b.mc.PostMessage(channel, message) - return nil -} - -func (b *Bridge) handleMatterHook(mchan chan *MMMessage) { - for { - message := b.mh.Receive() - m := &MMMessage{} - m.Username = message.UserName - m.Text = message.Text - m.Channel = message.Token - mchan <- m - } -} - -func (b *Bridge) handleMatterClient(mchan chan *MMMessage) { - for message := range b.mc.MessageChan { - // do not post our own messages back to irc - if message.Raw.Action == "posted" && b.mc.User.Username != message.Username { - m := &MMMessage{} - m.Username = message.Username - m.Channel = message.Channel - m.Text = message.Text - flog.mm.Debugf("<-mattermost channel: %s %#v %#v", message.Channel, message.Post, message.Raw) - mchan <- m - } - } -} - -func (b *Bridge) handleMatter() { - flog.mm.Infof("Choosing Mattermost connection type %s", b.kind) - mchan := make(chan *MMMessage) - if b.kind == Legacy { - go b.handleMatterHook(mchan) - } else { - go b.handleMatterClient(mchan) - } - flog.mm.Info("Start listening for Mattermost messages") - for message := range mchan { - var username string - if b.ignoreMessage(message.Username, message.Text, "mattermost") { - continue - } - username = message.Username + ": " - if b.Config.IRC.RemoteNickFormat != "" { - username = strings.Replace(b.Config.IRC.RemoteNickFormat, "{NICK}", message.Username, -1) - } else if b.Config.IRC.UseSlackCircumfix { - username = "<" + message.Username + "> " - } - cmds := strings.Fields(message.Text) - // empty message - if len(cmds) == 0 { - continue - } - cmd := cmds[0] - switch cmd { - case "!users": - flog.mm.Info("Received !users from ", message.Username) - b.i.SendRaw("NAMES " + b.getIRCChannel(message.Channel)) - continue - case "!gif": - message.Text = b.giphyRandom(strings.Fields(strings.Replace(message.Text, "!gif ", "", 1))) - b.Send(b.ircNick, message.Text, b.getIRCChannel(message.Channel)) - continue - } - texts := strings.Split(message.Text, "\n") - for _, text := range texts { - flog.mm.Debug("Sending message from " + message.Username + " to " + message.Channel) - b.i.Privmsg(b.getIRCChannel(message.Channel), username+text) - } - } -} - -func (b *Bridge) giphyRandom(query []string) string { - g := giphy.DefaultClient - if b.Config.General.GiphyAPIKey != "" { - g.APIKey = b.Config.General.GiphyAPIKey - } - res, err := g.Random(query) - if err != nil { - return "error" - } - return res.Data.FixedHeightDownsampledURL -} - -func (b *Bridge) getMMChannel(ircChannel string) string { - mmchannel, ok := b.ircMap[ircChannel] - if !ok { - mmchannel = b.Config.Mattermost.Channel - } - return mmchannel -} - -func (b *Bridge) getIRCChannel(channel string) string { - if b.kind == Legacy { - ircchannel := b.Config.IRC.Channel - _, ok := b.Config.Token[channel] - if ok { - ircchannel = b.Config.Token[channel].IRCChannel - } - return ircchannel - } - ircchannel, ok := b.mmMap[channel] - if !ok { - ircchannel = b.Config.IRC.Channel - } - return ircchannel -} - -func (b *Bridge) ignoreMessage(nick string, message string, protocol string) bool { - var ignoreNicks = b.mmIgnoreNicks - if protocol == "irc" { - ignoreNicks = b.ircIgnoreNicks - } - // should we discard messages ? - for _, entry := range ignoreNicks { - if nick == entry { - return true - } - } - return false -} diff --git a/vendor/github.com/42wim/matterbridge-plus/bridge/config.go b/vendor/github.com/42wim/matterbridge-plus/bridge/config.go deleted file mode 100644 index f31db98d..00000000 --- a/vendor/github.com/42wim/matterbridge-plus/bridge/config.go +++ /dev/null @@ -1,68 +0,0 @@ -package bridge - -import ( - "gopkg.in/gcfg.v1" - "io/ioutil" - "log" -) - -type Config struct { - IRC struct { - UseTLS bool - SkipTLSVerify bool - Server string - Port int - Nick string - Password string - Channel string - UseSlackCircumfix bool - NickServNick string - NickServPassword string - RemoteNickFormat string - IgnoreNicks string - } - Mattermost struct { - URL string - Port int - ShowJoinPart bool - Token string - IconURL string - SkipTLSVerify bool - BindAddress string - Channel string - PrefixMessagesWithNick bool - NicksPerRow int - NickFormatter string - Server string - Team string - Login string - Password string - RemoteNickFormat *string - IgnoreNicks string - NoTLS bool - } - Token map[string]*struct { - IRCChannel string - MMChannel string - } - Channel map[string]*struct { - IRC string - Mattermost string - } - General struct { - GiphyAPIKey string - } -} - -func NewConfig(cfgfile string) *Config { - var cfg Config - content, err := ioutil.ReadFile(cfgfile) - if err != nil { - log.Fatal(err) - } - err = gcfg.ReadStringInto(&cfg, string(content)) - if err != nil { - log.Fatal("Failed to parse "+cfgfile+":", err) - } - return &cfg -} diff --git a/vendor/github.com/42wim/matterbridge-plus/bridge/helper.go b/vendor/github.com/42wim/matterbridge-plus/bridge/helper.go deleted file mode 100644 index 7669ad57..00000000 --- a/vendor/github.com/42wim/matterbridge-plus/bridge/helper.go +++ /dev/null @@ -1,59 +0,0 @@ -package bridge - -import ( - "strings" -) - -func tableformatter(nicks []string, nicksPerRow int, continued bool) string { - result := "|IRC users" - if continued { - result = "|(continued)" - } - for i := 0; i < 2; i++ { - for j := 1; j <= nicksPerRow && j <= len(nicks); j++ { - if i == 0 { - result += "|" - } else { - result += ":-|" - } - } - result += "\r\n|" - } - result += nicks[0] + "|" - for i := 1; i < len(nicks); i++ { - if i%nicksPerRow == 0 { - result += "\r\n|" + nicks[i] + "|" - } else { - result += nicks[i] + "|" - } - } - return result -} - -func plainformatter(nicks []string, nicksPerRow int) string { - return strings.Join(nicks, ", ") + " currently on IRC" -} - -func IsMarkup(message string) bool { - switch message[0] { - case '|': - fallthrough - case '#': - fallthrough - case '_': - fallthrough - case '*': - fallthrough - case '~': - fallthrough - case '-': - fallthrough - case ':': - fallthrough - case '>': - fallthrough - case '=': - return true - } - return false -} diff --git a/vendor/github.com/42wim/matterbridge-plus/matterclient/LICENSE b/vendor/github.com/42wim/matterbridge-plus/matterclient/LICENSE deleted file mode 100644 index 8f71f43f..00000000 --- a/vendor/github.com/42wim/matterbridge-plus/matterclient/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - diff --git a/vendor/github.com/42wim/matterbridge-plus/matterclient/matterclient.go b/vendor/github.com/42wim/matterbridge-plus/matterclient/matterclient.go deleted file mode 100644 index 93128220..00000000 --- a/vendor/github.com/42wim/matterbridge-plus/matterclient/matterclient.go +++ /dev/null @@ -1,441 +0,0 @@ -package matterclient - -import ( - "crypto/tls" - "errors" - log "github.com/Sirupsen/logrus" - "net/http" - "net/http/cookiejar" - "net/url" - "strings" - "time" - - "github.com/gorilla/websocket" - "github.com/jpillora/backoff" - "github.com/mattermost/platform/model" -) - -type Credentials struct { - Login string - Team string - Pass string - Server string - NoTLS bool - SkipTLSVerify bool -} - -type Message struct { - Raw *model.Message - Post *model.Post - Team string - Channel string - Username string - Text string -} - -type MMClient struct { - *Credentials - Client *model.Client - WsClient *websocket.Conn - WsQuit bool - WsAway bool - Channels *model.ChannelList - MoreChannels *model.ChannelList - User *model.User - Users map[string]*model.User - MessageChan chan *Message - Team *model.Team - log *log.Entry -} - -func New(login, pass, team, server string) *MMClient { - cred := &Credentials{Login: login, Pass: pass, Team: team, Server: server} - mmclient := &MMClient{Credentials: cred, MessageChan: make(chan *Message, 100)} - mmclient.log = log.WithFields(log.Fields{"module": "matterclient"}) - log.SetFormatter(&log.TextFormatter{FullTimestamp: true}) - return mmclient -} - -func (m *MMClient) SetLogLevel(level string) { - l, err := log.ParseLevel(level) - if err != nil { - log.SetLevel(log.InfoLevel) - return - } - log.SetLevel(l) -} - -func (m *MMClient) Login() error { - if m.WsQuit { - return nil - } - b := &backoff.Backoff{ - Min: time.Second, - Max: 5 * time.Minute, - Jitter: true, - } - uriScheme := "https://" - wsScheme := "wss://" - if m.NoTLS { - uriScheme = "http://" - wsScheme = "ws://" - } - // login to mattermost - m.Client = model.NewClient(uriScheme + m.Credentials.Server) - m.Client.HttpClient.Transport = &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: m.SkipTLSVerify}} - var myinfo *model.Result - var appErr *model.AppError - 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 ", model.SESSION_COOKIE_TOKEN) - token := strings.Split(m.Credentials.Pass, model.SESSION_COOKIE_TOKEN+"=") - m.Client.HttpClient.Jar = m.createCookieJar(token[1]) - m.Client.MockSession(token[1]) - myinfo, appErr = m.Client.GetMe("") - if myinfo.Data.(*model.User) == nil { - m.log.Errorf("LOGIN TOKEN: %s is invalid", m.Credentials.Pass) - return errors.New("invalid " + model.SESSION_COOKIE_TOKEN) - } - } else { - myinfo, appErr = m.Client.Login(m.Credentials.Login, m.Credentials.Pass) - } - if appErr != nil { - d := b.Duration() - m.log.Debug(appErr.DetailedError) - if !strings.Contains(appErr.DetailedError, "connection refused") && - !strings.Contains(appErr.DetailedError, "invalid character") { - if appErr.Message == "" { - return errors.New(appErr.DetailedError) - } - return errors.New(appErr.Message) - } - m.log.Debugf("LOGIN: %s, reconnecting in %s", appErr, d) - time.Sleep(d) - logmsg = "retrying login" - continue - } - break - } - // reset timer - b.Reset() - - initLoad, _ := m.Client.GetInitialLoad() - initData := initLoad.Data.(*model.InitialLoad) - m.User = initData.User - for _, v := range initData.Teams { - m.log.Debugf("trying %s (id: %s)", v.Name, v.Id) - if v.Name == m.Credentials.Team { - m.Client.SetTeamId(v.Id) - m.Team = v - m.log.Debugf("GetallTeamListings: found id %s for team %s", v.Id, v.Name) - break - } - } - if m.Team == nil { - return errors.New("team not found") - } - - // setup websocket connection - wsurl := wsScheme + m.Credentials.Server + "/api/v3/users/websocket" - header := http.Header{} - header.Set(model.HEADER_AUTH, "BEARER "+m.Client.AuthToken) - - m.log.Debug("WsClient: making connection") - var err error - for { - wsDialer := &websocket.Dialer{Proxy: http.ProxyFromEnvironment, TLSClientConfig: &tls.Config{InsecureSkipVerify: m.SkipTLSVerify}} - m.WsClient, _, err = wsDialer.Dial(wsurl, header) - if err != nil { - d := b.Duration() - m.log.Debugf("WSS: %s, reconnecting in %s", err, d) - time.Sleep(d) - continue - } - break - } - b.Reset() - - // populating users - m.UpdateUsers() - - // populating channels - m.UpdateChannels() - - return nil -} - -func (m *MMClient) WsReceiver() { - var rmsg model.Message - for { - if m.WsQuit { - m.log.Debug("exiting WsReceiver") - return - } - if err := m.WsClient.ReadJSON(&rmsg); err != nil { - m.log.Error("error:", err) - // reconnect - m.Login() - } - if rmsg.Action == "ping" { - m.handleWsPing() - continue - } - msg := &Message{Raw: &rmsg, Team: m.Credentials.Team} - m.parseMessage(msg) - m.MessageChan <- msg - } - -} - -func (m *MMClient) handleWsPing() { - m.log.Debug("Ws PING") - if !m.WsQuit && !m.WsAway { - m.log.Debug("Ws PONG") - m.WsClient.WriteMessage(websocket.PongMessage, []byte{}) - } -} - -func (m *MMClient) parseMessage(rmsg *Message) { - switch rmsg.Raw.Action { - case model.ACTION_POSTED: - m.parseActionPost(rmsg) - /* - case model.ACTION_USER_REMOVED: - m.handleWsActionUserRemoved(&rmsg) - case model.ACTION_USER_ADDED: - m.handleWsActionUserAdded(&rmsg) - */ - } -} - -func (m *MMClient) parseActionPost(rmsg *Message) { - data := model.PostFromJson(strings.NewReader(rmsg.Raw.Props["post"])) - // log.Println("receiving userid", data.UserId) - // we don't have the user, refresh the userlist - if m.Users[data.UserId] == nil { - m.UpdateUsers() - } - rmsg.Username = m.Users[data.UserId].Username - rmsg.Channel = m.GetChannelName(data.ChannelId) - // direct message - if strings.Contains(rmsg.Channel, "__") { - //log.Println("direct message") - rcvusers := strings.Split(rmsg.Channel, "__") - if rcvusers[0] != m.User.Id { - rmsg.Channel = m.Users[rcvusers[0]].Username - } else { - rmsg.Channel = m.Users[rcvusers[1]].Username - } - } - rmsg.Text = data.Message - rmsg.Post = data - return -} - -func (m *MMClient) UpdateUsers() error { - mmusers, _ := m.Client.GetProfilesForDirectMessageList(m.Team.Id) - m.Users = mmusers.Data.(map[string]*model.User) - return nil -} - -func (m *MMClient) UpdateChannels() error { - mmchannels, _ := m.Client.GetChannels("") - m.Channels = mmchannels.Data.(*model.ChannelList) - mmchannels, _ = m.Client.GetMoreChannels("") - m.MoreChannels = mmchannels.Data.(*model.ChannelList) - return nil -} - -func (m *MMClient) GetChannelName(id string) string { - for _, channel := range append(m.Channels.Channels, m.MoreChannels.Channels...) { - if channel.Id == id { - return channel.Name - } - } - // not found? could be a new direct message from mattermost. Try to update and check again - m.UpdateChannels() - for _, channel := range append(m.Channels.Channels, m.MoreChannels.Channels...) { - if channel.Id == id { - return channel.Name - } - } - return "" -} - -func (m *MMClient) GetChannelId(name string) string { - for _, channel := range append(m.Channels.Channels, m.MoreChannels.Channels...) { - if channel.Name == name { - return channel.Id - } - } - return "" -} - -func (m *MMClient) GetChannelHeader(id string) string { - for _, channel := range append(m.Channels.Channels, m.MoreChannels.Channels...) { - if channel.Id == id { - return channel.Header - } - } - return "" -} - -func (m *MMClient) PostMessage(channel string, text string) { - post := &model.Post{ChannelId: m.GetChannelId(channel), Message: text} - m.Client.CreatePost(post) -} - -func (m *MMClient) JoinChannel(channel string) error { - cleanChan := strings.Replace(channel, "#", "", 1) - if m.GetChannelId(cleanChan) == "" { - return errors.New("failed to join") - } - for _, c := range m.Channels.Channels { - if c.Name == cleanChan { - m.log.Debug("Not joining ", cleanChan, " already joined.") - return nil - } - } - m.log.Debug("Joining ", cleanChan) - _, err := m.Client.JoinChannel(m.GetChannelId(cleanChan)) - if err != nil { - return errors.New("failed to join") - } - // m.SyncChannel(m.getMMChannelId(strings.Replace(channel, "#", "", 1)), strings.Replace(channel, "#", "", 1)) - return nil -} - -func (m *MMClient) GetPostsSince(channelId string, time int64) *model.PostList { - res, err := m.Client.GetPostsSince(channelId, time) - if err != nil { - return nil - } - return res.Data.(*model.PostList) -} - -func (m *MMClient) SearchPosts(query string) *model.PostList { - res, err := m.Client.SearchPosts(query, false) - if err != nil { - return nil - } - return res.Data.(*model.PostList) -} - -func (m *MMClient) GetPosts(channelId string, limit int) *model.PostList { - res, err := m.Client.GetPosts(channelId, 0, limit, "") - if err != nil { - return nil - } - return res.Data.(*model.PostList) -} - -func (m *MMClient) GetPublicLink(filename string) string { - res, err := m.Client.GetPublicLink(filename) - if err != nil { - return "" - } - return res.Data.(string) -} - -func (m *MMClient) GetPublicLinks(filenames []string) []string { - var output []string - for _, f := range filenames { - res, err := m.Client.GetPublicLink(f) - if err != nil { - continue - } - output = append(output, res.Data.(string)) - } - return output -} - -func (m *MMClient) UpdateChannelHeader(channelId string, header string) { - data := make(map[string]string) - data["channel_id"] = channelId - data["channel_header"] = header - m.log.Debugf("updating channelheader %#v, %#v", channelId, header) - _, err := m.Client.UpdateChannelHeader(data) - if err != nil { - log.Error(err) - } -} - -func (m *MMClient) UpdateLastViewed(channelId string) { - m.log.Debugf("posting lastview %#v", channelId) - _, err := m.Client.UpdateLastViewedAt(channelId) - if err != nil { - m.log.Error(err) - } -} - -func (m *MMClient) UsernamesInChannel(channelName string) []string { - ceiRes, err := m.Client.GetChannelExtraInfo(m.GetChannelId(channelName), 5000, "") - if err != nil { - m.log.Errorf("UsernamesInChannel(%s) failed: %s", channelName, err) - return []string{} - } - extra := ceiRes.Data.(*model.ChannelExtra) - result := []string{} - for _, member := range extra.Members { - result = append(result, member.Username) - } - return result -} - -func (m *MMClient) createCookieJar(token string) *cookiejar.Jar { - var cookies []*http.Cookie - jar, _ := cookiejar.New(nil) - firstCookie := &http.Cookie{ - Name: "MMAUTHTOKEN", - Value: token, - Path: "/", - Domain: m.Credentials.Server, - } - cookies = append(cookies, firstCookie) - cookieURL, _ := url.Parse("https://" + m.Credentials.Server) - jar.SetCookies(cookieURL, cookies) - return jar -} - -func (m *MMClient) GetOtherUserDM(channel string) *model.User { - m.UpdateUsers() - var rcvuser *model.User - if strings.Contains(channel, "__") { - rcvusers := strings.Split(channel, "__") - if rcvusers[0] != m.User.Id { - rcvuser = m.Users[rcvusers[0]] - } else { - rcvuser = m.Users[rcvusers[1]] - } - } - return rcvuser -} - -func (m *MMClient) SendDirectMessage(toUserId string, msg string) { - m.log.Debugf("SendDirectMessage to %s, msg %s", toUserId, msg) - var channel string - // We don't have a DM with this user yet. - if m.GetChannelId(toUserId+"__"+m.User.Id) == "" && m.GetChannelId(m.User.Id+"__"+toUserId) == "" { - // create DM channel - _, err := m.Client.CreateDirectChannel(toUserId) - if err != nil { - m.log.Debugf("SendDirectMessage to %#v failed: %s", toUserId, err) - } - // update our channels - mmchannels, _ := m.Client.GetChannels("") - m.Channels = mmchannels.Data.(*model.ChannelList) - } - - // build the channel name - if toUserId > m.User.Id { - channel = m.User.Id + "__" + toUserId - } else { - channel = toUserId + "__" + m.User.Id - } - // build & send the message - msg = strings.Replace(msg, "\r", "", -1) - post := &model.Post{ChannelId: m.GetChannelId(channel), Message: msg} - m.Client.CreatePost(post) -} -- cgit v1.2.3