serverless-ircd 0.2.0 → 0.3.0

package/webircgateway/main.go

@@ -1,118 +0,0 @@
-package main
-
-import (
-	"flag"
-	"fmt"
-	"log"
-	"os"
-	"os/signal"
-	"plugin"
-	"sync"
-	"syscall"
-
-	"github.com/kiwiirc/webircgateway/pkg/webircgateway"
-)
-
-var VERSION = "1.1.0"
-var GITCOMMIT = "-"
-var BUILTWITHGO = "-"
-
-func init() {
-	webircgateway.Version = VERSION
-}
-
-func main() {
-	printVersion := flag.Bool("version", false, "Print the version")
-	configFile := flag.String("config", "config.conf", "Config file location")
-	startSection := flag.String("run", "gateway", "What type of server to run")
-	flag.Parse()
-
-	if *printVersion {
-		fmt.Printf("Version: %s\n", webircgateway.Version)
-		fmt.Printf("Git commit: %s\n", GITCOMMIT)
-		fmt.Printf("Built with Go version: %s\n", BUILTWITHGO)
-		os.Exit(0)
-	}
-
-	if *startSection != "gateway" && *startSection != "proxy" {
-		fmt.Println("-run can either be 'gateway' or 'proxy'")
-		os.Exit(1)
-	}
-
-	runGateway(*configFile, *startSection)
-}
-
-func runGateway(configFile string, function string) {
-	gateway := webircgateway.NewGateway(function)
-
-	log.SetFlags(log.Flags() | log.Lmicroseconds)
-
-	// Print any webircgateway logout to STDOUT
-	go printLogOutput(gateway)
-
-	// Listen for process signals
-	go watchForSignals(gateway)
-
-	gateway.Config.SetConfigFile(configFile)
-	log.Printf("Using config %s", gateway.Config.CurrentConfigFile())
-
-	configErr := gateway.Config.Load()
-	if configErr != nil {
-		log.Printf("Config file error: %s", configErr.Error())
-		os.Exit(1)
-	}
-
-	pluginsQuit := &sync.WaitGroup{}
-	loadPlugins(gateway, pluginsQuit)
-
-	gateway.Start()
-
-	pluginsQuit.Wait()
-	gateway.WaitClose()
-}
-
-func watchForSignals(gateway *webircgateway.Gateway) {
-	c := make(chan os.Signal, 1)
-	signal.Notify(c, syscall.SIGHUP, syscall.SIGINT)
-
-	for {
-		switch sig := <-c; sig {
-		case syscall.SIGINT:
-			fmt.Println("Received SIGINT, shutting down webircgateway")
-			gateway.Close()
-		case syscall.SIGHUP:
-			fmt.Println("Recieved SIGHUP, reloading config file")
-			gateway.Config.Load()
-		}
-	}
-}
-
-func printLogOutput(gateway *webircgateway.Gateway) {
-	for {
-		line, _ := <-gateway.LogOutput
-		log.Println(line)
-	}
-}
-
-func loadPlugins(gateway *webircgateway.Gateway, pluginsQuit *sync.WaitGroup) {
-	for _, pluginPath := range gateway.Config.Plugins {
-		pluginFullPath := gateway.Config.ResolvePath(pluginPath)
-
-		gateway.Log(2, "Loading plugin "+pluginFullPath)
-		p, err := plugin.Open(pluginFullPath)
-		if err != nil {
-			gateway.Log(3, "Error loading plugin: "+err.Error())
-			continue
-		}
-
-		startSymbol, err := p.Lookup("Start")
-		if err != nil {
-			gateway.Log(3, "Plugin does not export a Start function! (%s)", pluginFullPath)
-			continue
-		}
-
-		startFunc := startSymbol.(func(*webircgateway.Gateway, *sync.WaitGroup))
-		pluginsQuit.Add(1)
-		startFunc(gateway, pluginsQuit)
-	}
-}

package/webircgateway/pkg/dnsbl/dnsbl.go

@@ -1,121 +0,0 @@
-package dnsbl
-
-import (
-	"encoding/hex"
-	"fmt"
-	"net"
-	"strings"
-)
-
-type ResultList struct {
-	Listed  bool
-	Results []Result
-}
-
-/*
-Result holds the individual IP lookup results for each RBL search
-*/
-type Result struct {
-	// Blacklist is the DNSBL server that gave this result
-	Blacklist string
-	// Address is the IP address that was searched
-	Address string
-	// Listed indicates whether or not the IP was on the RBL
-	Listed bool
-	// RBL lists sometimes add extra information as a TXT record
-	// if any info is present, it will be stored here.
-	Text string
-	// Error represents any error that was encountered (DNS timeout, host not
-	// found, etc.) if any
-	Error bool
-	// ErrorType is the type of error encountered if any
-	ErrorType error
-}
-
-/*
-Convert an IP to a hostname ready for a dnsbl lookup
-127.0.0.1 becomes 1.0.0.127
-1234:1234:1234:1234:1234:1234:1234:1234 becomes 4.3.2.1.4.3.2.1.4.3.2.1.4.3.2.1.4.3.2.1.4.3.2.1.4.3.2.1.4.3.2.1
-*/
-func toDnsBlHostname(ip net.IP) string {
-	if ip.To4() != nil {
-		// IPv4
-		// Reverse the complete octects
-		splitAddress := strings.Split(ip.String(), ".")
-		for i, j := 0, len(splitAddress)-1; i < len(splitAddress)/2; i, j = i+1, j-1 {
-			splitAddress[i], splitAddress[j] = splitAddress[j], splitAddress[i]
-		}
-
-		return strings.Join(splitAddress, ".")
-	}
-
-	// IPv6
-	// Remove all : from a full expanded address, then reverse all the hex characters
-	ipv6Str := expandIPv6(ip)
-	addrHexStr := strings.ReplaceAll(ipv6Str, ":", "")
-	chars := []rune(addrHexStr)
-	for i, j := 0, len(chars)-1; i < j; i, j = i+1, j-1 {
-		chars[i], chars[j] = chars[j], chars[i]
-	}
-
-	return strings.Join(strings.Split(string(chars), ""), ".")
-}
-
-func expandIPv6(ip net.IP) string {
-	dst := make([]byte, hex.EncodedLen(len(ip)))
-	_ = hex.Encode(dst, ip)
-	return string(dst[0:4]) + ":" +
-		string(dst[4:8]) + ":" +
-		string(dst[8:12]) + ":" +
-		string(dst[12:16]) + ":" +
-		string(dst[16:20]) + ":" +
-		string(dst[20:24]) + ":" +
-		string(dst[24:28]) + ":" +
-		string(dst[28:])
-}
-
-func query(rbl string, host string, r *Result) {
-	r.Listed = false
-
-	lookup := fmt.Sprintf("%s.%s", host, rbl)
-	res, err := net.LookupHost(lookup)
-
-	if len(res) > 0 {
-		r.Listed = true
-		txt, _ := net.LookupTXT(lookup)
-		if len(txt) > 0 {
-			r.Text = txt[0]
-		}
-	}
-	if err != nil {
-		r.Error = true
-		r.ErrorType = err
-	}
-
-	return
-}
-
-func Lookup(dnsblList []string, targetHost string) (r ResultList) {
-	ip, err := net.LookupIP(targetHost)
-	if err != nil {
-		return
-	}
-
-	for _, dnsbl := range dnsblList {
-		for _, addr := range ip {
-			res := Result{}
-			res.Blacklist = dnsbl
-			res.Address = addr.String()
-
-			addr := toDnsBlHostname(addr)
-			query(dnsbl, addr, &res)
-			r.Results = append(r.Results, res)
-
-			if res.Listed {
-				r.Listed = true
-			}
-		}
-	}
-
-	return
-}

package/webircgateway/pkg/identd/identd.go

@@ -1,86 +0,0 @@
-package identd
-
-import (
-	"fmt"
-	"net"
-	"net/textproto"
-	"strings"
-	"sync"
-)
-
-// Server - An IdentD server
-type Server struct {
-	Entries     map[string]string
-	EntriesLock sync.Mutex
-}
-
-// NewIdentdServer - Create a new IdentdServer instance
-func NewIdentdServer() Server {
-	return Server{
-		Entries: make(map[string]string),
-	}
-}
-
-// AddIdent - Add an ident to be looked up
-func (i *Server) AddIdent(localPort, remotePort int, ident string, iface string) {
-	i.EntriesLock.Lock()
-	i.Entries[fmt.Sprintf("%d-%d", localPort, remotePort)] = ident
-	i.EntriesLock.Unlock()
-}
-
-// RemoveIdent - Remove an ident from being looked up
-func (i *Server) RemoveIdent(localPort, remotePort int, iface string) {
-	i.EntriesLock.Lock()
-	delete(i.Entries, fmt.Sprintf("%d-%d", localPort, remotePort))
-	i.EntriesLock.Unlock()
-}
-
-// Run - Start listening for ident lookups
-func (i *Server) Run() error {
-	serv, err := net.Listen("tcp", ":113")
-	if err != nil {
-		return err
-	}
-
-	go i.ListenForRequests(&serv)
-	return nil
-}
-
-// ListenForRequests - Listen on a net.Listener for ident lookups
-func (i *Server) ListenForRequests(serverSocket *net.Listener) {
-	for {
-		serv := *serverSocket
-		client, err := serv.Accept()
-		if err != nil {
-			break
-		}
-
-		go func(conn net.Conn) {
-			tc := textproto.NewConn(conn)
-
-			line, err := tc.ReadLine()
-			if err != nil {
-				conn.Close()
-				return
-			}
-
-			// Remove all spaces, some servers like to send "%d , %d" but the spec examples use "%d, %d"
-			line = strings.ReplaceAll(line, " ", "")
-
-			var localPort, remotePort int
-			fmt.Sscanf(line, "%d,%d", &localPort, &remotePort)
-			if localPort > 0 && remotePort > 0 {
-				i.EntriesLock.Lock()
-				ident, ok := i.Entries[fmt.Sprintf("%d-%d", localPort, remotePort)]
-				i.EntriesLock.Unlock()
-				if !ok {
-					fmt.Fprintf(conn, "%d, %d : ERROR : NO-USER\r\n", localPort, remotePort)
-				} else {
-					fmt.Fprintf(conn, "%d, %d : USERID : UNIX : %s\r\n", localPort, remotePort, ident)
-				}
-			}
-
-			conn.Close()
-		}(client)
-	}
-}

package/webircgateway/pkg/identd/rpcclient.go

@@ -1,59 +0,0 @@
-package identd
-
-import "net"
-import "fmt"
-import "time"
-
-func MakeRpcClient(appName string) *RpcClient {
-	return &RpcClient{AppName: appName}
-}
-
-type RpcClient struct {
-	AppName string
-	Conn    *net.Conn
-}
-
-func (rpc *RpcClient) ConnectAndReconnect(serverAddress string) {
-	for {
-		if rpc.Conn == nil {
-			println("Connecting to identd RPC...")
-			rpc.Connect(serverAddress)
-		}
-
-		time.Sleep(time.Second * 3)
-	}
-}
-
-func (rpc *RpcClient) Connect(serverAddress string) error {
-	conn, err := net.Dial("tcp", serverAddress)
-	if err != nil {
-		return err
-	}
-
-	rpc.Conn = &conn
-	rpc.Write("id " + rpc.AppName)
-
-	return nil
-}
-
-func (rpc *RpcClient) Write(line string) error {
-	if rpc.Conn == nil {
-		return fmt.Errorf("not connected")
-	}
-
-	conn := *rpc.Conn
-	_, err := conn.Write([]byte(line + "\n"))
-	if err != nil {
-		rpc.Conn = nil
-		conn.Close()
-	}
-	return err
-}
-
-func (rpc *RpcClient) AddIdent(lport int, rport int, username string, iface string) {
-	rpc.Write(fmt.Sprintf("add %s %d %d %s", username, lport, rport, iface))
-}
-
-func (rpc *RpcClient) RemoveIdent(lport int, rport int, username string, iface string) {
-	rpc.Write(fmt.Sprintf("del %d %d %s", lport, rport, iface))
-}

package/webircgateway/pkg/irc/isupport.go

@@ -1,56 +0,0 @@
-package irc
-
-import (
-	"strings"
-	"sync"
-)
-
-type ISupport struct {
-	Received    bool
-	Injected    bool
-	Tags        map[string]string
-	tokens      map[string]string
-	tokensMutex sync.RWMutex
-}
-
-func (m *ISupport) ClearTokens() {
-	m.tokensMutex.Lock()
-	m.tokens = make(map[string]string)
-	m.tokensMutex.Unlock()
-}
-
-func (m *ISupport) AddToken(tokenPair string) {
-	m.tokensMutex.Lock()
-	m.addToken(tokenPair)
-	m.tokensMutex.Unlock()
-}
-
-func (m *ISupport) AddTokens(tokenPairs []string) {
-	m.tokensMutex.Lock()
-	for _, tp := range tokenPairs {
-		m.addToken(tp)
-	}
-	m.tokensMutex.Unlock()
-}
-
-func (m *ISupport) HasToken(key string) (ok bool) {
-	m.tokensMutex.RLock()
-	_, ok = m.tokens[strings.ToUpper(key)]
-	m.tokensMutex.RUnlock()
-	return
-}
-
-func (m *ISupport) GetToken(key string) (val string) {
-	m.tokensMutex.RLock()
-	val = m.tokens[strings.ToUpper(key)]
-	m.tokensMutex.RUnlock()
-	return
-}
-
-func (m *ISupport) addToken(tokenPair string) {
-	kv := strings.Split(tokenPair, "=")
-	if len(kv) == 1 {
-		kv = append(kv, "")
-	}
-	m.tokens[strings.ToUpper(kv[0])] = kv[1]
-}

package/webircgateway/pkg/irc/message.go

@@ -1,217 +0,0 @@
-package irc
-
-import (
-	"errors"
-	"strings"
-)
-
-type Mask struct {
-	Nick     string
-	Username string
-	Hostname string
-	Mask     string
-}
-type Message struct {
-	Raw     string
-	Tags    map[string]string
-	Prefix  *Mask
-	Command string
-	Params  []string
-}
-
-func NewMessage() *Message {
-	return &Message{
-		Tags:   make(map[string]string),
-		Prefix: &Mask{},
-	}
-}
-
-// GetParam - Get a param value, returning a default value if it doesn't exist
-func (m *Message) GetParam(idx int, def string) string {
-	if idx < 0 || idx > len(m.Params)-1 {
-		return def
-	}
-
-	return m.Params[idx]
-}
-
-// GetParamU - Get a param value in uppercase, returning a default value if it doesn't exist
-func (m *Message) GetParamU(idx int, def string) string {
-	return strings.ToUpper(m.GetParam(idx, def))
-}
-
-// ToLine - Convert the Message struct to its raw IRC line
-func (m *Message) ToLine() string {
-	line := ""
-
-	if len(m.Tags) > 0 {
-		line += "@"
-		tagCount := 0
-		for tagName, tagVal := range m.Tags {
-			tagCount++
-			line += tagName
-			if tagVal != "" {
-				line += "=" + tagVal
-			}
-			if tagCount < len(m.Tags) {
-				line += ";"
-			}
-		}
-	}
-
-	if m.Prefix != nil && (m.Prefix.Nick != "" || m.Prefix.Username != "" || m.Prefix.Hostname != "") {
-		prefix := ""
-
-		if m.Prefix.Nick != "" {
-			prefix += m.Prefix.Nick
-		}
-
-		if m.Prefix.Username != "" && m.Prefix.Nick != "" {
-			prefix += "!" + m.Prefix.Username
-		} else if m.Prefix.Username != "" {
-			prefix += m.Prefix.Username
-		}
-
-		if m.Prefix.Hostname != "" && prefix != "" {
-			prefix += "@" + m.Prefix.Username
-		} else if m.Prefix.Hostname != "" {
-			prefix += m.Prefix.Hostname
-		}
-
-		if line != "" {
-			line += " :" + prefix
-		} else {
-			line += ":" + prefix
-		}
-	}
-
-	if line != "" {
-		line += " " + m.Command
-	} else {
-		line += m.Command
-	}
-
-	paramLen := len(m.Params)
-	for idx, param := range m.Params {
-		if idx == paramLen-1 && (strings.Contains(param, " ") || strings.HasPrefix(param, ":")) {
-			line += " :" + param
-		} else {
-			line += " " + param
-		}
-	}
-
-	return line
-}
-
-func createMask(maskStr string) *Mask {
-	mask := &Mask{
-		Mask: maskStr,
-	}
-
-	usernameStart := strings.Index(maskStr, "!")
-	hostStart := strings.Index(maskStr, "@")
-
-	if usernameStart == -1 && hostStart == -1 {
-		mask.Nick = maskStr
-	} else if usernameStart > -1 && hostStart > -1 {
-		mask.Nick = maskStr[0:usernameStart]
-		mask.Username = maskStr[usernameStart+1 : hostStart]
-		mask.Hostname = maskStr[hostStart+1:]
-	} else if usernameStart > -1 && hostStart == -1 {
-		mask.Nick = maskStr[0:usernameStart]
-		mask.Username = maskStr[usernameStart+1:]
-	} else if usernameStart == -1 && hostStart > -1 {
-		mask.Username = maskStr[0:hostStart]
-		mask.Hostname = maskStr[hostStart+1:]
-	}
-
-	return mask
-}
-
-// ParseLine - Turn a raw IRC line into a message
-func ParseLine(input string) (*Message, error) {
-	line := strings.Trim(input, "\r\n")
-
-	message := NewMessage()
-	message.Raw = line
-
-	token := ""
-	rest := ""
-
-	token, rest = nextToken(line, false)
-	if token == "" {
-		return message, errors.New("Empty line")
-	}
-
-	// Tags. Starts with "@"
-	if token[0] == 64 {
-		tagsRaw := token[1:]
-		tags := strings.Split(tagsRaw, ";")
-		for _, tag := range tags {
-			parts := strings.Split(tag, "=")
-			if len(parts) > 0 && parts[0] == "" {
-				continue
-			}
-
-			if len(parts) == 1 {
-				message.Tags[parts[0]] = ""
-			} else {
-				message.Tags[parts[0]] = parts[1]
-			}
-		}
-
-		token, rest = nextToken(rest, false)
-	}
-
-	// Prefix. Starts with ":"
-	if token != "" && token[0] == 58 {
-		message.Prefix = createMask(token[1:])
-		token, rest = nextToken(rest, false)
-	} else {
-		message.Prefix = createMask("")
-	}
-
-	// Command
-	if token == "" {
-		return message, errors.New("Missing command")
-	}
-
-	message.Command = token
-
-	// Params
-	for {
-		token, rest = nextToken(rest, true)
-		if token == "" {
-			break
-		}
-
-		message.Params = append(message.Params, token)
-	}
-
-	return message, nil
-}
-
-func nextToken(s string, allowTrailing bool) (string, string) {
-	s = strings.TrimLeft(s, " ")
-
-	if len(s) == 0 {
-		return "", ""
-	}
-
-	// The last token (trailing) start with :
-	if allowTrailing && s[0] == 58 {
-		return s[1:], ""
-	}
-
-	token := ""
-	spaceIdx := strings.Index(s, " ")
-	if spaceIdx > -1 {
-		token = s[:spaceIdx]
-		s = s[spaceIdx+1:]
-	} else {
-		token = s
-		s = ""
-	}
-
-	return token, s
-}