Add possibility to disable FAST.

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 ### Added
 - Add new parameter `--subject`.
+- Added flag `--fast-off` to disable XEP-0484: Fast Authentication Streamlining Tokens (requires go-xmpp > 0.2.0).
 
 ## [v0.10.0] 2024-04-13
 ### Changed

README.md

@@ -75,10 +75,11 @@ If no configuration file is present or if the values should be overridden it is
 the account details via command line options:
 
 ```plain
-Usage: go-sendxmpp [-cdilnt] [-a value] [-f value] [--headline] [--help] [-h value] [-j value] [-m value] [--muc-password value] [--oob-file value] [--ox] [--ox-delete-nodes] [--ox-genprivkey-rsa] [--ox-genprivkey-x25519] [--ox-import-privkey value] [--ox-passphrase value] [-p value] [--raw] [--scram-mech-pinning value] [--ssdp-off] [-s value] [--timeout value] [--tls-version value] [-u value] [--version] [recipients…]
+Usage: go-sendxmpp [-cdilnt] [-a value] [--fast-off] [-f value] [--headline] [--help] [-h value] [-j value] [-m value] [--muc-password value] [--oob-file value] [--ox] [--ox-delete-nodes] [--ox-genprivkey-rsa] [--ox-genprivkey-x25519] [--ox-import-privkey value] [--ox-passphrase value] [-p value] [--raw] [--scram-mech-pinning value] [--ssdp-off] [-s value] [--timeout value] [--tls-version value] [-u value] [--version] [recipients…]
  -a, --alias=value  Set alias/nicknamefor chatrooms.
  -c, --chatroom     Send message to a chatroom.
  -d, --debug        Show debugging info.
+     --fast-off     Disable XEP-0484: Fast Authentication Streamlining Tokens.
  -f, --file=value   Set configuration file. (Default:
                     ~/.config/go-sendxmpp/sendxmpprc)
      --headline     Send message as type headline.

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/gabriel-vasile/mimetype v1.4.3
 	github.com/google/uuid v1.6.0
 	github.com/pborman/getopt/v2 v2.1.0
-	github.com/xmppo/go-xmpp v0.2.0
+	github.com/xmppo/go-xmpp v0.2.1-0.20240511130541-e9123cc4b3f1
 	golang.org/x/crypto v0.23.0
 	salsa.debian.org/mdosch/xmppsrv v0.2.6
 )

go.sum

@@ -27,8 +27,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/xmppo/go-xmpp v0.2.0 h1:K23zGjq0h6z9LMY2GHv3PpEaqqUDRIRPd0VeNqK0hnc=
-github.com/xmppo/go-xmpp v0.2.0/go.mod h1:wR5vg1WrtcaP0DiW8XRUH9YLdFDjwlwJWl6zQEUqNuo=
+github.com/xmppo/go-xmpp v0.2.1-0.20240511130541-e9123cc4b3f1 h1:yTpklv3Dnk6fwf2mE0SPjxYC2kfKOY49QL7FpFHwsFc=
+github.com/xmppo/go-xmpp v0.2.1-0.20240511130541-e9123cc4b3f1/go.mod h1:H46WSy/5uHW1SWsyJYI6fRZqFrK326qWmFRpVJ2Wwhs=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=

main.go

@@ -137,6 +137,7 @@ func main() {
 	flagSCRAMPinning := getopt.StringLong("scram-mech-pinning", 0, "", "Enforce the use of a certain SCRAM authentication mechanism.")
 	flagSSDPOff := getopt.BoolLong("ssdp-off", 0, "Disable XEP-0474: SASL SCRAM Downgrade Protection.")
 	flagSubject := getopt.StringLong("subject", 's', "", "Set message subject.")
+	flagFastOff := getopt.BoolLong("fast-off", 0, "Disable XEP-0484: Fast Authentication Streamlining Tokens.")
 
 	// Parse command line flags.
 	getopt.Parse()
@@ -271,11 +272,13 @@ func main() {
 		fmt.Println(err)
 	}
 
-	fast, _ = getFastData(user, password)
-	// Reset FAST token and mechanism if expired.
-	if time.Now().After(fast.Expiry) {
-		fast.Token = ""
-		fast.Mechanism = ""
+	if !*flagFastOff {
+		fast, _ = getFastData(user, password)
+		// Reset FAST token and mechanism if expired.
+		if time.Now().After(fast.Expiry) {
+			fast.Token = ""
+			fast.Mechanism = ""
+		}
 	}
 
 	// Use ALPN
@@ -321,6 +324,7 @@ func main() {
 		SSDP:          !*flagSSDPOff,
 		UserAgentSW:   resource,
 		UserAgentID:   clientID,
+		Fast:          !*flagFastOff,
 		FastToken:     fast.Token,
 		FastMechanism: fast.Mechanism,
 	}

man/go-sendxmpp.1

@@ -4,7 +4,7 @@
 .SH "NAME"
 \fBgo\-sendxmpp\fR \- A tool to send messages to an XMPP contact or MUC\.
 .SH "SYNOPSIS"
-\fBgo\-sendxmpp [\-cdilnt] [\-a value] [\-f value] [\-\-headline] [\-\-help] [\-h value] [\-j value] [\-m value] [\-\-muc\-password value] [\-\-oob\-file value] [\-\-ox] [\-\-ox\-delete\-nodes] [\-\-ox\-genprivkey\-rsa] [\-\-ox\-genprivkey\-x25519] [\-\-ox\-import\-privkey value] [\-\-ox\-passphrase value] [\-p value] [\-\-raw] [\-\-scram\-mech\-pinning value] [\-\-ssdp\-off] [\-s value] [\-\-timeout value] [\-\-tls\-version value] [\-u value] [\-\-version] [recipients…]\fR
+\fBgo\-sendxmpp [\-cdilnt] [\-a value] [\-\-fast\-off] [\-f value] [\-\-headline] [\-\-help] [\-h value] [\-j value] [\-m value] [\-\-muc\-password value] [\-\-oob\-file value] [\-\-ox] [\-\-ox\-delete\-nodes] [\-\-ox\-genprivkey\-rsa] [\-\-ox\-genprivkey\-x25519] [\-\-ox\-import\-privkey value] [\-\-ox\-passphrase value] [\-p value] [\-\-raw] [\-\-scram\-mech\-pinning value] [\-\-ssdp\-off] [\-s value] [\-\-timeout value] [\-\-tls\-version value] [\-u value] [\-\-version] [recipients…]\fR
 .SH "DESCRIPTION"
 A tool to send messages to an XMPP contact or MUC inspired by \fBsendxmpp\fR\.
 .br
@@ -20,6 +20,9 @@ Send message to a chatroom\.
 \fB\-d\fR, \fB\-\-debug\fR
 Show debugging info\.
 .TP
+\fB\-\-fast\-off\fR
+Disable XEP\-0484: Fast Authentication Streamlining Tokens\.
+.TP
 \fB\-f\fR, \fB\-\-file\fR=[\fIvalue\fR]
 Set configuration file\. (Default: ~/\.config/go\-sendxmpp/config)
 .TP

man/go-sendxmpp.1.html

@@ -81,7 +81,7 @@
 </p>
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p><code>go-sendxmpp [-cdilnt] [-a value] [-f value] [--headline] [--help] [-h value] [-j value] [-m value] [--muc-password value]
+<p><code>go-sendxmpp [-cdilnt] [-a value] [--fast-off] [-f value] [--headline] [--help] [-h value] [-j value] [-m value] [--muc-password value]
 [--oob-file value] [--ox] [--ox-delete-nodes] [--ox-genprivkey-rsa] [--ox-genprivkey-x25519] [--ox-import-privkey value]
 [--ox-passphrase value] [-p value] [--raw] [--scram-mech-pinning value] [--ssdp-off] [-s value] [--timeout value]
 [--tls-version value] [-u value] [--version] [recipients…]</code></p>
@@ -108,6 +108,8 @@ file location is specified with <code>-f</code> or <code>--file</code>.</p>
 <code>-d</code>, <code>--debug</code>
 </dt>
 <dd>Show debugging info.</dd>
+<dt><code>--fast-off</code></dt>
+<dd>Disable XEP-0484: Fast Authentication Streamlining Tokens.</dd>
 <dt>
 <code>-f</code>, <code>--file</code>=[<var>value</var>]</dt>
 <dd>Set configuration file. (Default: ~/.config/go-sendxmpp/config)</dd>

man/go-sendxmpp.1.ronn

@@ -3,7 +3,7 @@ go-sendxmpp(1) -- A tool to send messages to an XMPP contact or MUC.
 
 ## SYNOPSIS
 
-`go-sendxmpp [-cdilnt] [-a value] [-f value] [--headline] [--help] [-h value] [-j value] [-m value] [--muc-password value]
+`go-sendxmpp [-cdilnt] [-a value] [--fast-off] [-f value] [--headline] [--help] [-h value] [-j value] [-m value] [--muc-password value]
 [--oob-file value] [--ox] [--ox-delete-nodes] [--ox-genprivkey-rsa] [--ox-genprivkey-x25519] [--ox-import-privkey value]
 [--ox-passphrase value] [-p value] [--raw] [--scram-mech-pinning value] [--ssdp-off] [-s value] [--timeout value]
 [--tls-version value] [-u value] [--version] [recipients…]`
@@ -28,6 +28,9 @@ Send message to a chatroom.
 * `-d`, `--debug`:
 Show debugging info.
 
+* `--fast-off`:
+Disable XEP-0484: Fast Authentication Streamlining Tokens.
+
 * `-f`, `--file`=[<value>]:
 Set configuration file. (Default: ~/.config/go-sendxmpp/config)