From b12c5e579e53bf5ba52938b1f5c2af56f4d63df1 Mon Sep 17 00:00:00 2001 From: "nedim.uka" Date: Tue, 14 Sep 2021 19:25:37 +0200 Subject: [PATCH 01/16] Initial commit --- README.md | 19 +++++++++ config/config.go | 23 +++++++++++ config/helpers.go | 56 +++++++++++++++++++++++++ config/models.go | 25 +++++++++++ go.mod | 10 +++++ go.sum | 103 ++++++++++++++++++++++++++++++++++++++++++++++ main.go | 83 +++++++++++++++++++++++++++++++++++++ 7 files changed, 319 insertions(+) create mode 100644 config/config.go create mode 100644 config/helpers.go create mode 100644 config/models.go create mode 100644 go.mod create mode 100644 go.sum create mode 100644 main.go diff --git a/README.md b/README.md index 96131e5..62be1c6 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,21 @@ # xmpploadtesting +A tool for testing xmpp servers load + +## Environment variables + +| Variable | Required | Default Value | Description | +| ------------------------------------------------- | -------- | --------------------------------- | ---------------------------------------------- | +| **Service:** | +| OPENFIRE_PORT | NO | 5222 | Port for openfire server | +| OPENFIRE_ADRESS | YES | | Openfire server address | +| OPENFIRE_DOMAIN | YES | | Domain | +| | +| **Credentials:** | +| | +| CREDENTIALS_FILE_LOCATION | NO | input.json | Database username | +| | +| **GeneralOptions:** | +| | +| MASSAGE_DELAY | NO | 120000000000 - 2 mins | Delay for online presence message loop | +| | diff --git a/config/config.go b/config/config.go new file mode 100644 index 0000000..492f417 --- /dev/null +++ b/config/config.go @@ -0,0 +1,23 @@ +package config + +// AppConfig contains application configuration +var AppConfig Config + +// Load application configuration +func Load() { + + AppConfig = Config{ + + Service: Service{ + Port: getEnv("OPENFIRE_PORT", "5222"), + Address: mustGetEnv("OPENFIRE_ADRESS"), + Domain: mustGetEnv("OPENFIRE_DOMAIN"), + }, + Credentials: Credentials{ + CredentialsFileLocation: getEnv("CREDENTIALS_FILE_LOCATION", "input.json"), + }, + GeneralOptions: GeneralOptions{ + DelayBetweenMassages: int64(getEnvInt("MASSAGE_DELAY", 120000000000)), + }, + } +} diff --git a/config/helpers.go b/config/helpers.go new file mode 100644 index 0000000..50ea031 --- /dev/null +++ b/config/helpers.go @@ -0,0 +1,56 @@ +package config + +import ( + "log" + "os" + "strconv" +) + +// getEnv returns value for give key from environment +// if key is not present in environment it returns defaultValue +func getEnv(key, defaultValue string) string { + v := os.Getenv(key) + if len(v) > 0 { + return v + } + return defaultValue +} + +// getEnvInt returns integer value for give key from environment +// if key is not present in environment it returns defaultValue +// if key cannot be parsed to integer function will panic +func getEnvInt(key string, defaultValue int) int { + v := os.Getenv(key) + if len(v) == 0 { + return defaultValue + } + + valInteger, err := strconv.Atoi(v) + if err != nil { + log.Fatalf("variable `%s` cannot be parsed to INTEGER", key) + } + + return valInteger +} + +// getEnv extracts the bool value from environment variable +func getEnvBool(env string) bool { + envVal := mustGetEnv(env) + value, err := strconv.ParseBool(envVal) + + if err != nil { + value = false + } + + return value +} + +// mustGetEnv returns value for give key from environment +// if key is not present in environment function will panic +func mustGetEnv(key string) string { + v := os.Getenv(key) + if len(v) == 0 { + log.Fatalf(" variable `%s` is not present in ENVIRONMENT", key) + } + return v +} diff --git a/config/models.go b/config/models.go new file mode 100644 index 0000000..0bf756c --- /dev/null +++ b/config/models.go @@ -0,0 +1,25 @@ +package config + +// Config stores application configuration +type Config struct { + Service Service + Credentials Credentials + GeneralOptions GeneralOptions +} + +// Service contains configuration for service +type Service struct { + Port string + Address string + Domain string +} + +// Credentials contains information about client credentials +type Credentials struct { + CredentialsFileLocation string +} + +// GeneralOptions contains information for general configuration options +type GeneralOptions struct { + DelayBetweenMassages int64 +} diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..7712de9 --- /dev/null +++ b/go.mod @@ -0,0 +1,10 @@ +module github.com/xmpploadtesting + +go 1.17 + +require ( + github.com/google/uuid v1.1.1 // indirect + golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 // indirect + gosrc.io/xmpp v0.5.1 // indirect + nhooyr.io/websocket v1.6.5 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..d188290 --- /dev/null +++ b/go.sum @@ -0,0 +1,103 @@ +github.com/agnivade/wasmbrowsertest v0.3.1/go.mod h1:zQt6ZTdl338xxRaMW395qccVE2eQm0SjC/SDz0mPWQI= +github.com/chromedp/cdproto v0.0.0-20190614062957-d6d2f92b486d/go.mod h1:S8mB5wY3vV+vRIzf39xDXsw3XKYewW9X6rW2aEmkrSw= +github.com/chromedp/cdproto v0.0.0-20190621002710-8cbd498dd7a0/go.mod h1:S8mB5wY3vV+vRIzf39xDXsw3XKYewW9X6rW2aEmkrSw= +github.com/chromedp/cdproto v0.0.0-20190812224334-39ef923dcb8d/go.mod h1:0YChpVzuLJC5CPr+x3xkHN6Z8KOSXjNbL7qV8Wc4GW0= +github.com/chromedp/cdproto v0.0.0-20190926234355-1b4886c6fad6/go.mod h1:0YChpVzuLJC5CPr+x3xkHN6Z8KOSXjNbL7qV8Wc4GW0= +github.com/chromedp/chromedp v0.3.1-0.20190619195644-fd957a4d2901/go.mod h1:mJdvfrVn594N9tfiPecUidF6W5jPRKHymqHfzbobPsM= +github.com/chromedp/chromedp v0.4.0/go.mod h1:DC3QUn4mJ24dwjcaGQLoZrhm4X/uPHZ6spDbS2uFhm4= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +github.com/fatih/color v1.6.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/go-interpreter/wagon v0.5.1-0.20190713202023-55a163980b6c/go.mod h1:5+b/MBYkclRZngKF5s6qrgWxSLgE9F5dFdO1hAueZLc= +github.com/go-interpreter/wagon v0.6.0/go.mod h1:5+b/MBYkclRZngKF5s6qrgWxSLgE9F5dFdO1hAueZLc= +github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= +github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190908185732-236ed259b199/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/knq/sysutil v0.0.0-20181215143952-f05b59f0f307/go.mod h1:BjPj+aVjl9FW/cCGiF3nGh5v+9Gd3VCgBQbod/GlMaQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/mailru/easyjson v0.0.0-20190403194419-1ea4449da983/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190620125010-da37f6c1e481/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/sirupsen/logrus v1.0.5/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/twitchyliquid64/golang-asm v0.0.0-20190126203739-365674df15fc/go.mod h1:NoCfSFWosfqMqmmD7hApkirIK9ozpHjxRnRxs1l413A= +go.coder.com/go-tools v0.0.0-20190317003359-0c6a35b74a16/go.mod h1:iKV5yK9t+J5nG9O3uF6KYdPEz3dyfMyB15MN1rbQ8Qw= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +golang.org/x/crypto v0.0.0-20180426230345-b49d69b5da94/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190306220234-b354f8bf4d9e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190618155005-516e3c20635f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190927073244-c990c680b611/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gosrc.io/xmpp v0.5.1 h1:Rgrm5s2rt+npGggJH3HakQxQXR8ZZz3+QRzakRQqaq4= +gosrc.io/xmpp v0.5.1/go.mod h1:L3NFMqYOxyLz3JGmgFyWf7r9htE91zVGiK40oW4RwdY= +gotest.tools v2.1.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +gotest.tools/gotestsum v0.3.5/go.mod h1:Mnf3e5FUzXbkCfynWBGOwLssY7gTQgCHObK9tMpAriY= +mvdan.cc/sh v2.6.4+incompatible/go.mod h1:IeeQbZq+x2SUGBensq/jge5lLQbS3XT2ktyp3wrt4x8= +nhooyr.io/websocket v1.6.5 h1:8TzpkldRfefda5JST+CnOH135bzVPz5uzfn/AF+gVKg= +nhooyr.io/websocket v1.6.5/go.mod h1:F259lAzPRAH0htX2y3ehpJe09ih1aSHN7udWki1defY= diff --git a/main.go b/main.go new file mode 100644 index 0000000..1b40273 --- /dev/null +++ b/main.go @@ -0,0 +1,83 @@ +package main + +import ( + "crypto/tls" + "fmt" + "log" + "os" + "time" + + appConfig "github.com/xmpploadtesting/config" + "gosrc.io/xmpp" + "gosrc.io/xmpp/stanza" +) + +func main() { + + var client *xmpp.Client + var err error + + // LOAD APPLICATION CONFIGURATION + appConfig.Load() + + // Setup xmpp config + config := &xmpp.Config{ + TransportConfiguration: xmpp.TransportConfiguration{ + Address: appConfig.AppConfig.Service.Address + ":" + appConfig.AppConfig.Service.Port, + Domain: appConfig.AppConfig.Service.Domain, + TLSConfig: &tls.Config{InsecureSkipVerify: true}, + }, + Jid: "admin@localhost", + Credential: xmpp.Password("openadmin123"), + StreamLogger: os.Stdout, + Insecure: true, + } + + // Setup xmpp router + router := xmpp.NewRouter() + router.HandleFunc("message", handleMessage) + log.Printf("Adding message") + + // Setup new xmpp client + if client, err = xmpp.NewClient(config, router, errorHandler); err != nil { + log.Panicln(fmt.Sprintf("Could not create a new client ! %s", err)) + } + + // Client connection + if err := client.Connect(); err != nil { + msg := fmt.Sprintf("XMPP connection failed: %v", err) + + fmt.Printf("Failed to connect to server. Exiting... %v", msg) + return + } + + onlinePresencePacket := stanza.NewPresence(stanza.Attrs{From: config.Jid, Type: stanza.StanzaType(stanza.PresenceShowAway)}) + + // Send onlinePresence packet indefiletly delayed by DelayBetweenMeassges from configuration + for { + + err = client.Send(onlinePresencePacket) + log.Printf("Sending online presence stanza: %v", err) + // Delay before sending another message + time.Sleep(time.Duration(appConfig.AppConfig.GeneralOptions.DelayBetweenMassages)) + } +} + +func handleMessage(s xmpp.Sender, p stanza.Packet) { + log.Printf("Handle message") + msg, ok := p.(stanza.Message) + if !ok { + log.Printf(" message not OK") + _, _ = fmt.Fprintf(os.Stdout, "Ignoring packet: %T\n", p) + return + } + + _, _ = fmt.Fprintf(os.Stdout, "Body = %s - from = %s\n", msg.Body, msg.From) + reply := stanza.Message{Attrs: stanza.Attrs{To: msg.From}, Body: msg.Body} + err := s.Send(reply) + log.Printf("Error sending message %v", err) +} + +func errorHandler(err error) { + fmt.Println(err.Error()) +} From 7f3ac161495822303aa8369712ee9df3ee01dee9 Mon Sep 17 00:00:00 2001 From: "nedim.uka" Date: Wed, 15 Sep 2021 12:40:25 +0200 Subject: [PATCH 02/16] Added XMPP service to handle clients and configurations --- .vscode/settings.json | 4 ++ main.go | 88 ++++++++-------------------- services/xmppsService.go | 120 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+), 65 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 services/xmppsService.go diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..0c9a7b3 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "go.gopath": "/home/nedim/go", + "go.useLanguageServer": true +} \ No newline at end of file diff --git a/main.go b/main.go index 1b40273..1792c16 100644 --- a/main.go +++ b/main.go @@ -1,83 +1,41 @@ package main import ( - "crypto/tls" - "fmt" - "log" - "os" - "time" - appConfig "github.com/xmpploadtesting/config" - "gosrc.io/xmpp" - "gosrc.io/xmpp/stanza" + xmppService "github.com/xmpploadtesting/services" ) func main() { - var client *xmpp.Client - var err error - // LOAD APPLICATION CONFIGURATION appConfig.Load() - // Setup xmpp config - config := &xmpp.Config{ - TransportConfiguration: xmpp.TransportConfiguration{ - Address: appConfig.AppConfig.Service.Address + ":" + appConfig.AppConfig.Service.Port, - Domain: appConfig.AppConfig.Service.Domain, - TLSConfig: &tls.Config{InsecureSkipVerify: true}, - }, - Jid: "admin@localhost", - Credential: xmpp.Password("openadmin123"), - StreamLogger: os.Stdout, - Insecure: true, - } + xmppService.Init() + xmppServiceInstance := xmppService.Instance() + xmppService.SendOnlinePresenceStanza(xmppServiceInstance.XMPPClients[0].Client, xmppServiceInstance.XMPPClients[0].Config.Jid) - // Setup xmpp router - router := xmpp.NewRouter() - router.HandleFunc("message", handleMessage) - log.Printf("Adding message") + // // Setup new xmpp client + // if client, err = xmpp.NewClient(config, router, errorHandler); err != nil { + // log.Panicln(fmt.Sprintf("Could not create a new client ! %s", err)) + // } - // Setup new xmpp client - if client, err = xmpp.NewClient(config, router, errorHandler); err != nil { - log.Panicln(fmt.Sprintf("Could not create a new client ! %s", err)) - } + // // Client connection + // if err := client.Connect(); err != nil { + // msg := fmt.Sprintf("XMPP connection failed: %v", err) - // Client connection - if err := client.Connect(); err != nil { - msg := fmt.Sprintf("XMPP connection failed: %v", err) + // fmt.Printf("Failed to connect to server. Exiting... %v", msg) + // return + // } - fmt.Printf("Failed to connect to server. Exiting... %v", msg) - return - } + // onlinePresencePacket := stanza.NewPresence(stanza.Attrs{From: config.Jid, Type: stanza.StanzaType(stanza.PresenceShowChat)}) - onlinePresencePacket := stanza.NewPresence(stanza.Attrs{From: config.Jid, Type: stanza.StanzaType(stanza.PresenceShowAway)}) + // // Send onlinePresence packet indefiletly delayed by DelayBetweenMeassges from configuration + // for { - // Send onlinePresence packet indefiletly delayed by DelayBetweenMeassges from configuration - for { - - err = client.Send(onlinePresencePacket) - log.Printf("Sending online presence stanza: %v", err) - // Delay before sending another message - time.Sleep(time.Duration(appConfig.AppConfig.GeneralOptions.DelayBetweenMassages)) - } -} - -func handleMessage(s xmpp.Sender, p stanza.Packet) { - log.Printf("Handle message") - msg, ok := p.(stanza.Message) - if !ok { - log.Printf(" message not OK") - _, _ = fmt.Fprintf(os.Stdout, "Ignoring packet: %T\n", p) - return - } - - _, _ = fmt.Fprintf(os.Stdout, "Body = %s - from = %s\n", msg.Body, msg.From) - reply := stanza.Message{Attrs: stanza.Attrs{To: msg.From}, Body: msg.Body} - err := s.Send(reply) - log.Printf("Error sending message %v", err) -} - -func errorHandler(err error) { - fmt.Println(err.Error()) + // err = client.Send(onlinePresencePacket) + // log.Printf("Sending online presence stanza: %v", err) + // // Delay before sending another message + // time.Sleep(time.Duration(appConfig.AppConfig.GeneralOptions.DelayBetweenMassages)) + // } + // } diff --git a/services/xmppsService.go b/services/xmppsService.go new file mode 100644 index 0000000..0db6a7b --- /dev/null +++ b/services/xmppsService.go @@ -0,0 +1,120 @@ +package services + +import ( + "crypto/tls" + "fmt" + "log" + "os" + "time" + + appConfig "github.com/xmpploadtesting/config" + "gosrc.io/xmpp" + "gosrc.io/xmpp/stanza" +) + +// XMPPService - struct containing +type XMPPService struct { + Router *xmpp.Router + XMPPClients []XMPPClient +} + +// XMPPClient - struct containing client and client configuration +type XMPPClient struct { + Config xmpp.Config + Client *xmpp.Client +} + +// Instance - get instance of xmpp service +func Instance() *XMPPService { + return &xmppService +} + +var xmppService XMPPService + +// Init Initialise XMPP servie, and router +func Init() { + // TODO load configs and init clients from the config file + xmppService = XMPPService{ + Router: xmpp.NewRouter(), + // Configs: []xmpp.Config{ + // { + // TransportConfiguration: xmpp.TransportConfiguration{ + // Address: appConfig.AppConfig.Service.Address + ":" + appConfig.AppConfig.Service.Port, + // Domain: appConfig.AppConfig.Service.Domain, + // TLSConfig: &tls.Config{InsecureSkipVerify: true}, + // }, + // Jid: "admin@localhost", + // Credential: xmpp.Password("openadmin123"), + // StreamLogger: os.Stdout, + // Insecure: true, + // }, + // }, + } + xmppService.Router.HandleFunc("message", handleMessage) + + xmppService.XMPPClients = make([]XMPPClient, 0) + xmppClient := XMPPClient{ + Config: xmpp.Config{ + + TransportConfiguration: xmpp.TransportConfiguration{ + Address: appConfig.AppConfig.Service.Address + ":" + appConfig.AppConfig.Service.Port, + Domain: appConfig.AppConfig.Service.Domain, + TLSConfig: &tls.Config{InsecureSkipVerify: true}, + }, + Jid: "admin@localhost", + Credential: xmpp.Password("openadmin123"), + StreamLogger: os.Stdout, + Insecure: true, + }, + } + + client, err := xmpp.NewClient(&xmppClient.Config, xmppService.Router, errorHandler) + + // Client connection + if err := client.Connect(); err != nil { + msg := fmt.Sprintf("XMPP connection failed: %v", err) + + fmt.Printf("Failed to connect to server. Exiting... %v", msg) + return + } + + if err != nil { + log.Printf("Unable to initialise client for %v", xmppClient.Config.Jid) + } + xmppClient.Client = client + xmppService.XMPPClients = append(xmppService.XMPPClients, xmppClient) + +} + +// SendOnlinePresenceStanza - send online presence stnza with data, to server +func SendOnlinePresenceStanza(client *xmpp.Client, jid string) error { + onlinePresencePacket := stanza.NewPresence(stanza.Attrs{From: jid, Type: stanza.StanzaType(stanza.PresenceShowChat)}) + + //TODO All clients should send messages at once + for { + + err := client.Send(onlinePresencePacket) + log.Printf("Sending online presence stanza: %v", err) + // Delay before sending another message + time.Sleep(time.Duration(appConfig.AppConfig.GeneralOptions.DelayBetweenMassages)) + } +} + +func handleMessage(s xmpp.Sender, p stanza.Packet) { + log.Printf("Handle message") + msg, ok := p.(stanza.Message) + if !ok { + log.Printf(" message not OK") + _, _ = fmt.Fprintf(os.Stdout, "Ignoring packet: %T\n", p) + return + } + + _, _ = fmt.Fprintf(os.Stdout, "Body = %s - from = %s\n", msg.Body, msg.From) + reply := stanza.Message{Attrs: stanza.Attrs{To: msg.From}, Body: msg.Body} + err := s.Send(reply) + log.Printf("Error sending message %v", err) +} + +func errorHandler(err error) { + fmt.Println(err.Error()) +} From 4d532ad7651f3333aa6fd190adf0e8fcfb1b09ad Mon Sep 17 00:00:00 2001 From: "nedim.uka" Date: Wed, 15 Sep 2021 12:41:28 +0200 Subject: [PATCH 03/16] Added gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..600d2d3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.vscode \ No newline at end of file From 1fda2c4506b09ed71f30c30c22e325fe97f9f458 Mon Sep 17 00:00:00 2001 From: "nedim.uka" Date: Wed, 15 Sep 2021 12:43:16 +0200 Subject: [PATCH 04/16] Code cleanup --- services/xmppsService.go | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/services/xmppsService.go b/services/xmppsService.go index 0db6a7b..49732e6 100644 --- a/services/xmppsService.go +++ b/services/xmppsService.go @@ -36,19 +36,6 @@ func Init() { // TODO load configs and init clients from the config file xmppService = XMPPService{ Router: xmpp.NewRouter(), - // Configs: []xmpp.Config{ - // { - // TransportConfiguration: xmpp.TransportConfiguration{ - // Address: appConfig.AppConfig.Service.Address + ":" + appConfig.AppConfig.Service.Port, - // Domain: appConfig.AppConfig.Service.Domain, - // TLSConfig: &tls.Config{InsecureSkipVerify: true}, - // }, - // Jid: "admin@localhost", - // Credential: xmpp.Password("openadmin123"), - // StreamLogger: os.Stdout, - // Insecure: true, - // }, - // }, } xmppService.Router.HandleFunc("message", handleMessage) From 251859773e7f5ee6cbc4149c830e864c4513a97e Mon Sep 17 00:00:00 2001 From: "nedim.uka" Date: Wed, 15 Sep 2021 12:44:00 +0200 Subject: [PATCH 05/16] Code cleanup --- main.go | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/main.go b/main.go index 1792c16..2ae7a6c 100644 --- a/main.go +++ b/main.go @@ -13,29 +13,4 @@ func main() { xmppService.Init() xmppServiceInstance := xmppService.Instance() xmppService.SendOnlinePresenceStanza(xmppServiceInstance.XMPPClients[0].Client, xmppServiceInstance.XMPPClients[0].Config.Jid) - - // // Setup new xmpp client - // if client, err = xmpp.NewClient(config, router, errorHandler); err != nil { - // log.Panicln(fmt.Sprintf("Could not create a new client ! %s", err)) - // } - - // // Client connection - // if err := client.Connect(); err != nil { - // msg := fmt.Sprintf("XMPP connection failed: %v", err) - - // fmt.Printf("Failed to connect to server. Exiting... %v", msg) - // return - // } - - // onlinePresencePacket := stanza.NewPresence(stanza.Attrs{From: config.Jid, Type: stanza.StanzaType(stanza.PresenceShowChat)}) - - // // Send onlinePresence packet indefiletly delayed by DelayBetweenMeassges from configuration - // for { - - // err = client.Send(onlinePresencePacket) - // log.Printf("Sending online presence stanza: %v", err) - // // Delay before sending another message - // time.Sleep(time.Duration(appConfig.AppConfig.GeneralOptions.DelayBetweenMassages)) - // } - // } From bfebfab3afc26b53177dd9d5b3ebf6b8ac24eb7c Mon Sep 17 00:00:00 2001 From: "nedim.uka" Date: Wed, 15 Sep 2021 12:54:38 +0200 Subject: [PATCH 06/16] Added roling stock presence message to online presence stanza --- services/xmppsService.go | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/services/xmppsService.go b/services/xmppsService.go index 49732e6..1d992b0 100644 --- a/services/xmppsService.go +++ b/services/xmppsService.go @@ -12,6 +12,33 @@ import ( "gosrc.io/xmpp/stanza" ) +const rolingStockPresenceMessage = `ROLLING STOCK PRESENCE MESSAGE\n +{ + "serial": "79101X02Y0029450001CJ2000", + "model": "VEN032FSNWM00", + "displayOrientation": "left", + "macAddress": "1c:c0:e1:42:5a:c4", + "node": "v8.16.2", + "nodeJS": "v8.16.2", + "fbi": "2.10-2ubuntu1", + "libgif7": "5.1.4-2ubuntu0.1", + "bsEdgeServer": "13.3.9-1", + "initopciVersion": "0.4~24", + "bspInstallVersion": "1.0~36", + "awsConfigsVersion": "2021.21.26-e7c5738", + "outGuard": "2021.36.23-dev-028972a", + "val": "1.1.11~129", + "broadSignPlayer": "13.3.9-1", + "displayUnitExternalID": "L-0141-M7-7281-Right-3SM-G02-02-79101X02Y0020040003EJ2001", + "privateIPaddress": "10.1.1.94", + "linux": { + "os": "Ubuntu 18.04.2 LTS", + "kernel": "4.18.20+10+opci", + "architecture": "x86-64" + }, + "digiID": "digi-00000000-00000000-0040FFFF-FF801D30" + } + ` + // XMPPService - struct containing type XMPPService struct { Router *xmpp.Router @@ -76,6 +103,7 @@ func Init() { // SendOnlinePresenceStanza - send online presence stnza with data, to server func SendOnlinePresenceStanza(client *xmpp.Client, jid string) error { onlinePresencePacket := stanza.NewPresence(stanza.Attrs{From: jid, Type: stanza.StanzaType(stanza.PresenceShowChat)}) + onlinePresencePacket.Status = rolingStockPresenceMessage //TODO All clients should send messages at once for { From 4d7a97329389a416bb3bd261af1b432c1734480f Mon Sep 17 00:00:00 2001 From: "nedim.uka" Date: Wed, 15 Sep 2021 17:20:11 +0200 Subject: [PATCH 07/16] Respond with status OK on every command message --- main.go | 3 +++ services/xmppsService.go | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/main.go b/main.go index 2ae7a6c..d33b36b 100644 --- a/main.go +++ b/main.go @@ -10,7 +10,10 @@ func main() { // LOAD APPLICATION CONFIGURATION appConfig.Load() + // Initialise XMPP service xmppService.Init() + + // Send online presence stanza xmppServiceInstance := xmppService.Instance() xmppService.SendOnlinePresenceStanza(xmppServiceInstance.XMPPClients[0].Client, xmppServiceInstance.XMPPClients[0].Config.Jid) } diff --git a/services/xmppsService.go b/services/xmppsService.go index 1d992b0..5448082 100644 --- a/services/xmppsService.go +++ b/services/xmppsService.go @@ -124,8 +124,9 @@ func handleMessage(s xmpp.Sender, p stanza.Packet) { return } + log.Printf("Received The message %v", msg) _, _ = fmt.Fprintf(os.Stdout, "Body = %s - from = %s\n", msg.Body, msg.From) - reply := stanza.Message{Attrs: stanza.Attrs{To: msg.From}, Body: msg.Body} + reply := stanza.Message{Attrs: stanza.Attrs{To: msg.From}, Body: `{"status": "OK"}`} err := s.Send(reply) log.Printf("Error sending message %v", err) } From 48754c96bb464c7bb55fd778edfe8da5d9512639 Mon Sep 17 00:00:00 2001 From: "nedim.uka" Date: Wed, 15 Sep 2021 17:35:35 +0200 Subject: [PATCH 08/16] Fixed online presence stanza message --- services/xmppsService.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/services/xmppsService.go b/services/xmppsService.go index 5448082..572a8dc 100644 --- a/services/xmppsService.go +++ b/services/xmppsService.go @@ -12,7 +12,8 @@ import ( "gosrc.io/xmpp/stanza" ) -const rolingStockPresenceMessage = `ROLLING STOCK PRESENCE MESSAGE\n +{ +const rolingStockPresenceMessage = `ROLLING STOCK PRESENCE MESSAGE\n +{ "serial": "79101X02Y0029450001CJ2000", "model": "VEN032FSNWM00", "displayOrientation": "left", @@ -36,8 +37,7 @@ const rolingStockPresenceMessage = `ROLLING STOCK PRESENCE MESSAGE\n +{ "architecture": "x86-64" }, "digiID": "digi-00000000-00000000-0040FFFF-FF801D30" - } - ` +}` // XMPPService - struct containing type XMPPService struct { @@ -128,7 +128,10 @@ func handleMessage(s xmpp.Sender, p stanza.Packet) { _, _ = fmt.Fprintf(os.Stdout, "Body = %s - from = %s\n", msg.Body, msg.From) reply := stanza.Message{Attrs: stanza.Attrs{To: msg.From}, Body: `{"status": "OK"}`} err := s.Send(reply) - log.Printf("Error sending message %v", err) + + if err != nil { + log.Printf("Error sending to %v message %v", msg.From, err) + } } func errorHandler(err error) { From 9095638867f7d37f7aefab5745f574451106932f Mon Sep 17 00:00:00 2001 From: "nedim.uka" Date: Wed, 15 Sep 2021 20:11:55 +0200 Subject: [PATCH 09/16] Loaded credentials from input json file --- .gitignore | 3 ++- services/xmppsService.go | 46 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 600d2d3..fe4152d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.vscode \ No newline at end of file +.vscode +input.json \ No newline at end of file diff --git a/services/xmppsService.go b/services/xmppsService.go index 572a8dc..9086a52 100644 --- a/services/xmppsService.go +++ b/services/xmppsService.go @@ -2,7 +2,9 @@ package services import ( "crypto/tls" + "encoding/json" "fmt" + "io/ioutil" "log" "os" "time" @@ -51,6 +53,15 @@ type XMPPClient struct { Client *xmpp.Client } +// ClientCredentials - credentials info for client configuration +type ClientCredentials struct { + Jid string `json:"username"` + Credential string `json:"password"` + Host string `json:"host"` + Port int `json:"port"` + Ping int `json:"ping"` +} + // Instance - get instance of xmpp service func Instance() *XMPPService { return &xmppService @@ -66,6 +77,15 @@ func Init() { } xmppService.Router.HandleFunc("message", handleMessage) + //Get Client credentials from file + clientCredentials, err := getClientConfigsFromFile(appConfig.AppConfig.Credentials.CredentialsFileLocation) + + if err != nil { + log.Fatalf("Unable to load credentials from file path %v, ERROR : %v TERMINATING", appConfig.AppConfig.Credentials.CredentialsFileLocation, err) + } + + log.Printf("Client credentials length %v", len(clientCredentials)) + xmppService.XMPPClients = make([]XMPPClient, 0) xmppClient := XMPPClient{ Config: xmpp.Config{ @@ -115,6 +135,32 @@ func SendOnlinePresenceStanza(client *xmpp.Client, jid string) error { } } +func getClientConfigsFromFile(filePath string) ([]ClientCredentials, error) { + + var clientCredentials []ClientCredentials + + f, err := os.Open(filePath) + if err != nil { + return clientCredentials, err + } + defer f.Close() + + byteValue, err := ioutil.ReadAll(f) + + if err != nil { + return clientCredentials, err + } + + err = json.Unmarshal(byteValue, &clientCredentials) + + if err != nil { + return clientCredentials, err + } + + return clientCredentials, nil + +} + func handleMessage(s xmpp.Sender, p stanza.Packet) { log.Printf("Handle message") msg, ok := p.(stanza.Message) From 1d2a8068dd1a14d83f9cc3f6c8d5d0cb83f693ca Mon Sep 17 00:00:00 2001 From: "nedim.uka" Date: Thu, 16 Sep 2021 10:18:44 +0200 Subject: [PATCH 10/16] Added multiple client connections in go rutines --- main.go | 26 ++++++++++++- services/xmppsService.go | 81 ++++++++++++++++++++++------------------ 2 files changed, 69 insertions(+), 38 deletions(-) diff --git a/main.go b/main.go index d33b36b..2e33a00 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,9 @@ package main import ( + "log" + "time" + appConfig "github.com/xmpploadtesting/config" xmppService "github.com/xmpploadtesting/services" ) @@ -15,5 +18,26 @@ func main() { // Send online presence stanza xmppServiceInstance := xmppService.Instance() - xmppService.SendOnlinePresenceStanza(xmppServiceInstance.XMPPClients[0].Client, xmppServiceInstance.XMPPClients[0].Config.Jid) + + for { + + for _, xmppClient := range xmppServiceInstance.XMPPClients { + + // Send online presence stanza in go rutines + go func(xmppClient xmppService.XMPPClient) { + log.Printf("online presence stanza FOR %v", xmppClient.Config.Jid) + err := xmppService.SendOnlinePresenceStanza(xmppClient.Client, xmppClient.Config.Jid) + + if err != nil { + log.Printf("There was an error while sending online presence stanza %v", err) + } + + }(xmppClient) + + } + // Delay before sending another message + time.Sleep(time.Duration(appConfig.AppConfig.GeneralOptions.DelayBetweenMassages)) + + } + } diff --git a/services/xmppsService.go b/services/xmppsService.go index 9086a52..228d9a1 100644 --- a/services/xmppsService.go +++ b/services/xmppsService.go @@ -7,7 +7,7 @@ import ( "io/ioutil" "log" "os" - "time" + "strconv" appConfig "github.com/xmpploadtesting/config" "gosrc.io/xmpp" @@ -71,7 +71,7 @@ var xmppService XMPPService // Init Initialise XMPP servie, and router func Init() { - // TODO load configs and init clients from the config file + xmppService = XMPPService{ Router: xmpp.NewRouter(), } @@ -87,37 +87,49 @@ func Init() { log.Printf("Client credentials length %v", len(clientCredentials)) xmppService.XMPPClients = make([]XMPPClient, 0) - xmppClient := XMPPClient{ - Config: xmpp.Config{ - TransportConfiguration: xmpp.TransportConfiguration{ - Address: appConfig.AppConfig.Service.Address + ":" + appConfig.AppConfig.Service.Port, - Domain: appConfig.AppConfig.Service.Domain, - TLSConfig: &tls.Config{InsecureSkipVerify: true}, + for _, credential := range clientCredentials { + log.Printf("Host %v", credential.Host+":"+strconv.Itoa(credential.Port)) + log.Printf("Jid %v", credential.Jid+"@"+credential.Host) + log.Printf("Port %v", credential.Port) + log.Printf("Credential %v", credential.Credential) + + xmppClient := XMPPClient{ + Config: xmpp.Config{ + + TransportConfiguration: xmpp.TransportConfiguration{ + Address: credential.Host + ":" + strconv.Itoa(credential.Port), + Domain: credential.Host, + TLSConfig: &tls.Config{InsecureSkipVerify: true}, + }, + Jid: credential.Jid + "@" + credential.Host, + Credential: xmpp.Password(credential.Credential), + StreamLogger: os.Stdout, + Insecure: true, }, - Jid: "admin@localhost", - Credential: xmpp.Password("openadmin123"), - StreamLogger: os.Stdout, - Insecure: true, - }, + } + + go func() { + + client, err := xmpp.NewClient(&xmppClient.Config, xmppService.Router, errorHandler) + + // Client connection + if err := client.Connect(); err != nil { + msg := fmt.Sprintf("XMPP connection failed: %v", err) + + fmt.Printf("Failed to connect to server. Exiting... %v", msg) + return + } + + if err != nil { + log.Printf("Unable to initialise client for %v", xmppClient.Config.Jid) + } + xmppClient.Client = client + xmppService.XMPPClients = append(xmppService.XMPPClients, xmppClient) + }() + } - client, err := xmpp.NewClient(&xmppClient.Config, xmppService.Router, errorHandler) - - // Client connection - if err := client.Connect(); err != nil { - msg := fmt.Sprintf("XMPP connection failed: %v", err) - - fmt.Printf("Failed to connect to server. Exiting... %v", msg) - return - } - - if err != nil { - log.Printf("Unable to initialise client for %v", xmppClient.Config.Jid) - } - xmppClient.Client = client - xmppService.XMPPClients = append(xmppService.XMPPClients, xmppClient) - } // SendOnlinePresenceStanza - send online presence stnza with data, to server @@ -125,14 +137,9 @@ func SendOnlinePresenceStanza(client *xmpp.Client, jid string) error { onlinePresencePacket := stanza.NewPresence(stanza.Attrs{From: jid, Type: stanza.StanzaType(stanza.PresenceShowChat)}) onlinePresencePacket.Status = rolingStockPresenceMessage - //TODO All clients should send messages at once - for { - - err := client.Send(onlinePresencePacket) - log.Printf("Sending online presence stanza: %v", err) - // Delay before sending another message - time.Sleep(time.Duration(appConfig.AppConfig.GeneralOptions.DelayBetweenMassages)) - } + err := client.Send(onlinePresencePacket) + log.Printf("Sending online presence stanza: %v", err) + return err } func getClientConfigsFromFile(filePath string) ([]ClientCredentials, error) { From 83bb549c419af1aadd3d7412b8e900eaa842f556 Mon Sep 17 00:00:00 2001 From: "nedim.uka" Date: Thu, 16 Sep 2021 10:41:55 +0200 Subject: [PATCH 11/16] Add delay so that clients can setup properly --- services/xmppsService.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/xmppsService.go b/services/xmppsService.go index 228d9a1..9718ed1 100644 --- a/services/xmppsService.go +++ b/services/xmppsService.go @@ -8,13 +8,14 @@ import ( "log" "os" "strconv" + "time" appConfig "github.com/xmpploadtesting/config" "gosrc.io/xmpp" "gosrc.io/xmpp/stanza" ) -const rolingStockPresenceMessage = `ROLLING STOCK PRESENCE MESSAGE\n +const rolingStockPresenceMessage = `ROLLING STOCK PRESENCE MESSAGE { "serial": "79101X02Y0029450001CJ2000", "model": "VEN032FSNWM00", @@ -129,6 +130,8 @@ func Init() { }() } + // Delay For one seccond to allow all clients to connect + time.Sleep(time.Duration(1000000000)) } From 9ccd41339964be489fa7a97bda11b6125d1bca75 Mon Sep 17 00:00:00 2001 From: "nedim.uka" Date: Thu, 16 Sep 2021 15:45:36 +0200 Subject: [PATCH 12/16] Added message Logging --- main.go | 13 ++++++++++++- services/xmppsService.go | 18 +++++++++++++----- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/main.go b/main.go index 2e33a00..39be5be 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,7 @@ package main import ( + "fmt" "log" "time" @@ -8,6 +9,8 @@ import ( xmppService "github.com/xmpploadtesting/services" ) +var layout = "2006-01-02T15:04:05.000Z" + func main() { // LOAD APPLICATION CONFIGURATION @@ -25,13 +28,21 @@ func main() { // Send online presence stanza in go rutines go func(xmppClient xmppService.XMPPClient) { - log.Printf("online presence stanza FOR %v", xmppClient.Config.Jid) + log.Printf("Online presence stanza FOR %v", xmppClient.Config.Jid) err := xmppService.SendOnlinePresenceStanza(xmppClient.Client, xmppClient.Config.Jid) if err != nil { log.Printf("There was an error while sending online presence stanza %v", err) + return } + str := "2014-11-12T11:45:26.371Z" + t, err := time.Parse(layout, str) + if err != nil { + fmt.Println(err) + } + fmt.Println(t) + }(xmppClient) } diff --git a/services/xmppsService.go b/services/xmppsService.go index 9718ed1..23b176c 100644 --- a/services/xmppsService.go +++ b/services/xmppsService.go @@ -63,6 +63,8 @@ type ClientCredentials struct { Ping int `json:"ping"` } +const format = "2006/01/02 15:04:05" + // Instance - get instance of xmpp service func Instance() *XMPPService { return &xmppService @@ -141,8 +143,13 @@ func SendOnlinePresenceStanza(client *xmpp.Client, jid string) error { onlinePresencePacket.Status = rolingStockPresenceMessage err := client.Send(onlinePresencePacket) - log.Printf("Sending online presence stanza: %v", err) - return err + + if err != nil { + return err + } + + log.Printf("<%v> sent online status", jid) + return nil } func getClientConfigsFromFile(filePath string) ([]ClientCredentials, error) { @@ -172,7 +179,7 @@ func getClientConfigsFromFile(filePath string) ([]ClientCredentials, error) { } func handleMessage(s xmpp.Sender, p stanza.Packet) { - log.Printf("Handle message") + msg, ok := p.(stanza.Message) if !ok { log.Printf(" message not OK") @@ -180,8 +187,9 @@ func handleMessage(s xmpp.Sender, p stanza.Packet) { return } - log.Printf("Received The message %v", msg) - _, _ = fmt.Fprintf(os.Stdout, "Body = %s - from = %s\n", msg.Body, msg.From) + log.Printf("<%v> received following message: %v", msg.To, msg.Body) + + // _, _ = fmt.Fprintf(os.Stdout, "Body = %s - from = %s\n", msg.Body, msg.From) reply := stanza.Message{Attrs: stanza.Attrs{To: msg.From}, Body: `{"status": "OK"}`} err := s.Send(reply) From 9964093b033156481a6a23e048dd6986825f6121 Mon Sep 17 00:00:00 2001 From: "nedim.uka" Date: Thu, 16 Sep 2021 18:33:33 +0200 Subject: [PATCH 13/16] code cleanup --- main.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/main.go b/main.go index 39be5be..b9cea87 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,6 @@ package main import ( - "fmt" "log" "time" @@ -9,8 +8,6 @@ import ( xmppService "github.com/xmpploadtesting/services" ) -var layout = "2006-01-02T15:04:05.000Z" - func main() { // LOAD APPLICATION CONFIGURATION @@ -36,13 +33,6 @@ func main() { return } - str := "2014-11-12T11:45:26.371Z" - t, err := time.Parse(layout, str) - if err != nil { - fmt.Println(err) - } - fmt.Println(t) - }(xmppClient) } From 73f8698ad7617c0f4e7028a55088b92de70e534d Mon Sep 17 00:00:00 2001 From: "nedim.uka" Date: Fri, 17 Sep 2021 17:35:08 +0200 Subject: [PATCH 14/16] Added delay for client status ok message --- config/config.go | 1 + config/models.go | 1 + main.go | 1 - services/xmppsService.go | 10 +++++++--- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/config/config.go b/config/config.go index 492f417..4af88c3 100644 --- a/config/config.go +++ b/config/config.go @@ -18,6 +18,7 @@ func Load() { }, GeneralOptions: GeneralOptions{ DelayBetweenMassages: int64(getEnvInt("MASSAGE_DELAY", 120000000000)), + StatusMessageDelay: getEnvInt("STATUS_MASSAGE_DELAY", 10), }, } } diff --git a/config/models.go b/config/models.go index 0bf756c..74c6d9e 100644 --- a/config/models.go +++ b/config/models.go @@ -22,4 +22,5 @@ type Credentials struct { // GeneralOptions contains information for general configuration options type GeneralOptions struct { DelayBetweenMassages int64 + StatusMessageDelay int } diff --git a/main.go b/main.go index b9cea87..b6b89d0 100644 --- a/main.go +++ b/main.go @@ -25,7 +25,6 @@ func main() { // Send online presence stanza in go rutines go func(xmppClient xmppService.XMPPClient) { - log.Printf("Online presence stanza FOR %v", xmppClient.Config.Jid) err := xmppService.SendOnlinePresenceStanza(xmppClient.Client, xmppClient.Config.Jid) if err != nil { diff --git a/services/xmppsService.go b/services/xmppsService.go index 23b176c..bf3358f 100644 --- a/services/xmppsService.go +++ b/services/xmppsService.go @@ -6,6 +6,7 @@ import ( "fmt" "io/ioutil" "log" + "math/rand" "os" "strconv" "time" @@ -132,8 +133,8 @@ func Init() { }() } - // Delay For one seccond to allow all clients to connect - time.Sleep(time.Duration(1000000000)) + // Delay For two seccond to allow all clients to connect + time.Sleep(time.Duration(2000000000)) } @@ -188,8 +189,11 @@ func handleMessage(s xmpp.Sender, p stanza.Packet) { } log.Printf("<%v> received following message: %v", msg.To, msg.Body) + statusMesageDelay := int64(rand.Intn(appConfig.AppConfig.GeneralOptions.StatusMessageDelay)) + log.Printf("DELAYING FOR: %v", statusMesageDelay*1000000000) + // Delay For two seccond to allow all clients to connect + time.Sleep(time.Duration(statusMesageDelay * 1000000000)) - // _, _ = fmt.Fprintf(os.Stdout, "Body = %s - from = %s\n", msg.Body, msg.From) reply := stanza.Message{Attrs: stanza.Attrs{To: msg.From}, Body: `{"status": "OK"}`} err := s.Send(reply) From ac8e0473e329f5782ca505520f9b2bc7c15ec166 Mon Sep 17 00:00:00 2001 From: "nedim.uka" Date: Fri, 17 Sep 2021 17:40:15 +0200 Subject: [PATCH 15/16] Added status measage env variable to readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 62be1c6..9938f6b 100644 --- a/README.md +++ b/README.md @@ -17,5 +17,6 @@ A tool for testing xmpp servers load | **GeneralOptions:** | | | | MASSAGE_DELAY | NO | 120000000000 - 2 mins | Delay for online presence message loop | +| STATUS_MASSAGE_DELAY | NO | 10 sec | Delay for online presence message loop | | | From 69b8282880dff5acdd31264ea2edf13bff72cbca Mon Sep 17 00:00:00 2001 From: "nedim.uka" Date: Fri, 17 Sep 2021 18:18:51 +0200 Subject: [PATCH 16/16] Respond with status only if there is some content inside message --- services/xmppsService.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/services/xmppsService.go b/services/xmppsService.go index bf3358f..44b40b6 100644 --- a/services/xmppsService.go +++ b/services/xmppsService.go @@ -188,6 +188,11 @@ func handleMessage(s xmpp.Sender, p stanza.Packet) { return } + if len(msg.Body) == 0 { + log.Printf("<%v> received empty message, and will not respond", msg.To) + return + } + log.Printf("<%v> received following message: %v", msg.To, msg.Body) statusMesageDelay := int64(rand.Intn(appConfig.AppConfig.GeneralOptions.StatusMessageDelay)) log.Printf("DELAYING FOR: %v", statusMesageDelay*1000000000)