From dc1d33cf316837cbaf76ee54c45fad2b9c7a6c18 Mon Sep 17 00:00:00 2001
From: Thomas Maier <contact@thomas-maier.net>
Date: Sun, 28 Feb 2021 10:21:50 +0100
Subject: [PATCH] updates dev/test client

---
 dev/xmpp-dev-stack/recipient/.gitignore |  1 -
 dev/xmpp-dev-stack/recipient/Dockerfile |  4 ++--
 dev/xmpp-dev-stack/recipient/go.mod     |  6 +++---
 dev/xmpp-dev-stack/recipient/go.sum     | 24 ++++++++++++++++++++++++
 dev/xmpp-dev-stack/recipient/main.go    | 19 ++++++++++++-------
 5 files changed, 41 insertions(+), 13 deletions(-)
 create mode 100644 dev/xmpp-dev-stack/recipient/go.sum

diff --git a/dev/xmpp-dev-stack/recipient/.gitignore b/dev/xmpp-dev-stack/recipient/.gitignore
index e37d41b..a829320 100644
--- a/dev/xmpp-dev-stack/recipient/.gitignore
+++ b/dev/xmpp-dev-stack/recipient/.gitignore
@@ -1,2 +1 @@
-go.sum
 recipient
diff --git a/dev/xmpp-dev-stack/recipient/Dockerfile b/dev/xmpp-dev-stack/recipient/Dockerfile
index 70b113e..8b0d29f 100644
--- a/dev/xmpp-dev-stack/recipient/Dockerfile
+++ b/dev/xmpp-dev-stack/recipient/Dockerfile
@@ -1,9 +1,9 @@
-FROM golang:1.13-alpine3.10 as builder
+FROM golang:1.15-alpine3.13 as builder
 RUN apk add --no-cache git
 COPY . /build
 WORKDIR /build
 RUN go build
 
-FROM alpine:3.10
+FROM alpine:3.13
 COPY --from=builder /build/recipient /recipient
 CMD /recipient
diff --git a/dev/xmpp-dev-stack/recipient/go.mod b/dev/xmpp-dev-stack/recipient/go.mod
index 0415a48..e148405 100644
--- a/dev/xmpp-dev-stack/recipient/go.mod
+++ b/dev/xmpp-dev-stack/recipient/go.mod
@@ -1,9 +1,9 @@
 module github.com/tmsmr/xmpp-webhook/dev/xmpp-dev-stack/recipient
 
-go 1.13
+go 1.15
 
 require (
 	mellium.im/sasl v0.2.1
-	mellium.im/xmlstream v0.14.0
-	mellium.im/xmpp v0.14.0
+	mellium.im/xmlstream v0.15.2
+	mellium.im/xmpp v0.18.0
 )
diff --git a/dev/xmpp-dev-stack/recipient/go.sum b/dev/xmpp-dev-stack/recipient/go.sum
new file mode 100644
index 0000000..0863449
--- /dev/null
+++ b/dev/xmpp-dev-stack/recipient/go.sum
@@ -0,0 +1,24 @@
+golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/image v0.0.0-20181116024801-cd38e8056d9b/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA=
+golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+mellium.im/reader v0.1.0 h1:UUEMev16gdvaxxZC7fC08j7IzuDKh310nB6BlwnxTww=
+mellium.im/reader v0.1.0/go.mod h1:F+X5HXpkIfJ9EE1zHQG9lM/hO946iYAmU7xjg5dsQHI=
+mellium.im/sasl v0.2.1 h1:nspKSRg7/SyO0cRGY71OkfHab8tf9kCts6a6oTDut0w=
+mellium.im/sasl v0.2.1/go.mod h1:ROaEDLQNuf9vjKqE1SrAfnsobm2YKXT1gnN1uDp1PjQ=
+mellium.im/xmlstream v0.15.2-0.20201219131358-a51cc5cf8151/go.mod h1:7SUlP7f2qnMczK+Cu/OFgqaIhldMolVjo8np7xG41D0=
+mellium.im/xmlstream v0.15.2 h1:RleOK10lEsVtzpEZsJeRl4Iu0iC5SQnTQIGJZ7ZHGEc=
+mellium.im/xmlstream v0.15.2/go.mod h1:7SUlP7f2qnMczK+Cu/OFgqaIhldMolVjo8np7xG41D0=
+mellium.im/xmpp v0.18.0 h1:mm4zgK+7XkVpOKrM6d7d9ssmvH9Z67+16ODU9Rx4fqU=
+mellium.im/xmpp v0.18.0/go.mod h1:T1xCJIP9JyIIO4SSLlfj6zUi/58g22rFL6eojGwlJig=
diff --git a/dev/xmpp-dev-stack/recipient/main.go b/dev/xmpp-dev-stack/recipient/main.go
index 2a5f1f9..b56ddd8 100644
--- a/dev/xmpp-dev-stack/recipient/main.go
+++ b/dev/xmpp-dev-stack/recipient/main.go
@@ -44,23 +44,28 @@ func main() {
 
 	tlsConfig := tls.Config{InsecureSkipVerify: true}
 
-	session, err := xmpp.NegotiateSession(
+	session, err := xmpp.NewSession(
 		context.TODO(),
 		address.Domain(),
 		address,
 		conn,
-		false,
-		xmpp.NewNegotiator(xmpp.StreamConfig{Features: []xmpp.StreamFeature{
-			xmpp.BindResource(),
-			xmpp.StartTLS(true, &tlsConfig),
-			xmpp.SASL("", xp, sasl.ScramSha1Plus, sasl.ScramSha1, sasl.Plain),
+		0,
+		xmpp.NewNegotiator(xmpp.StreamConfig{Features: func(_ *xmpp.Session, f ...xmpp.StreamFeature) []xmpp.StreamFeature {
+			if f != nil {
+				return f
+			}
+			return []xmpp.StreamFeature{
+				xmpp.BindResource(),
+				xmpp.StartTLS(&tlsConfig),
+				xmpp.SASL("", xp, sasl.ScramSha256Plus, sasl.ScramSha256, sasl.ScramSha1Plus, sasl.ScramSha1, sasl.Plain),
+			}
 		}}),
 	)
 	panicOnErr(err)
 
 	fmt.Println("connected")
 
-	err = session.Send(context.TODO(), stanza.WrapPresence(address, stanza.AvailablePresence, nil))
+	err = session.Send(context.TODO(), stanza.Presence{Type: stanza.AvailablePresence}.Wrap(nil))
 	panicOnErr(err)
 
 	err = session.Serve(xmpp.HandlerFunc(func(t xmlstream.TokenReadEncoder, start *xml.StartElement) error {