From 4009f7571bae33eab108c525568034cd9c9fd220 Mon Sep 17 00:00:00 2001 From: Ola Bini Date: Thu, 26 Jul 2018 19:59:36 +0200 Subject: [PATCH] Remove valid domains as a possibility here --- cmd.go | 1 - message_handler.go | 22 ---------------------- 2 files changed, 23 deletions(-) diff --git a/cmd.go b/cmd.go index 33fbffd..336e290 100644 --- a/cmd.go +++ b/cmd.go @@ -14,7 +14,6 @@ var ( xmppSharedSecret = flag.String("shared-secret", "changeme", "Shared secret for authenticating to the XMPP server") xmppName = flag.String("name", "changeme", "Name for the XMPP component. Usually something like prekeys.example.org") prekeyServerFingerprint = flag.String("fingerprint", "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "Fingerprint for the prekey server. This is expected to be 56 bytes expressed in hexadecimal - thus 112 digits") - validDomains = flag.String("valid-domains", "", "A list of all domains that are valid for users, separated by commas. An empty list is equal to no restriction.") ) func isFingerprint(name string) bool { diff --git a/message_handler.go b/message_handler.go index e377087..4588bf1 100644 --- a/message_handler.go +++ b/message_handler.go @@ -2,33 +2,11 @@ package main import ( "fmt" - "strings" xco "github.com/sheenobu/go-xco" ) -func contains(a []string, x string) bool { - for _, n := range a { - if x == n { - return true - } - } - return false -} -func validDomain(d string) bool { - if *validDomains == "" { - return true - } - ds := strings.Split(*validDomains, ",") - return contains(ds, d) -} - func messageHandler(c *xco.Component, m *xco.Message) error { - if !validDomain(m.Header.From.DomainPart) { - fmt.Printf("Attempt to add data from unauthorized domain: %v@%v\n", m.Header.From.LocalPart, m.Header.From.DomainPart) - return nil - } - res, e := getPrekeyResponseFromRealServer(fmt.Sprintf("%s@%s", m.Header.From.LocalPart, m.Header.From.DomainPart), []byte(m.Body)) if e != nil { fmt.Printf("encountered error when communicating with the raw server: %v\n", e) -- GitLab