v1.9.3 (#1160 )

Update CHANGELOG for Nebula v1.9.3
initialize messageCounter to 2 instead of verifying later (#1156 )
2025-11-22 08:24:25 +01:00 · 2024-06-06 13:17:07 -04:00 · 2024-06-06 13:03:07 -04:00 · 2024-06-03 15:50:02 -04:00 · 2024-06-03 15:40:51 -04:00
3 changed files with 18 additions and 5 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [Unreleased]

+## [1.9.3] - 2024-06-06
+
+### Fixed
+
+- Initialize messageCounter to 2 instead of verifying later. (#1156)
+
+## [1.9.2] - 2024-06-03
+
+### Fixed
+
+- Ensure messageCounter is set before handshake is complete. (#1154)
+
 ## [1.9.1] - 2024-05-29

 ### Fixed
@@ -632,7 +644,9 @@ created.)

 - Initial public release.

-[Unreleased]: https://github.com/slackhq/nebula/compare/v1.9.1...HEAD
+[Unreleased]: https://github.com/slackhq/nebula/compare/v1.9.3...HEAD
+[1.9.3]: https://github.com/slackhq/nebula/releases/tag/v1.9.3
+[1.9.2]: https://github.com/slackhq/nebula/releases/tag/v1.9.2
 [1.9.1]: https://github.com/slackhq/nebula/releases/tag/v1.9.1
 [1.9.0]: https://github.com/slackhq/nebula/releases/tag/v1.9.0
 [1.8.2]: https://github.com/slackhq/nebula/releases/tag/v1.8.2
--- a/connection_state.go
+++ b/connection_state.go
@@ -72,6 +72,8 @@ func NewConnectionState(l *logrus.Logger, cipher string, certState *CertState, i
 		window:    b,
 		myCert:    certState.Certificate,
 	}
+	// always start the counter from 2, as packet 1 and packet 2 are handshake packets.
+	ci.messageCounter.Add(2)

 	return ci
 }
--- a/handshake_ix.go
+++ b/handshake_ix.go
@@ -46,7 +46,6 @@ func ixHandshakeStage0(f *Interface, hh *HandshakeHostInfo) bool {
 	}

 	h := header.Encode(make([]byte, header.Len), header.Version, header.Handshake, header.HandshakeIXPSK0, 0, 1)
-	ci.messageCounter.Add(1)

 	msg, _, _, err := ci.H.WriteMessage(h, hsBytes)
 	if err != nil {
@@ -321,7 +320,7 @@ func ixHandshakeStage1(f *Interface, addr *udp.Addr, via *ViaSender, packet []by
 	}

 	f.connectionManager.AddTrafficWatch(hostinfo.localIndexId)
-	hostinfo.ConnectionState.messageCounter.Store(2)
+
 	hostinfo.remotes.ResetBlockedRemotes()

 	return
@@ -467,8 +466,6 @@ func ixHandshakeStage2(f *Interface, addr *udp.Addr, via *ViaSender, hh *Handsha
 	f.handshakeManager.Complete(hostinfo, f)
 	f.connectionManager.AddTrafficWatch(hostinfo.localIndexId)

-	hostinfo.ConnectionState.messageCounter.Store(2)
-
 	if f.l.Level >= logrus.DebugLevel {
 		hostinfo.logger(f.l).Debugf("Sending %d stored packets", len(hh.packetStore))
 	}
Author	SHA1	Message	Date
Wade Simmons	b14bad586a	v1.9.3 (#1160 ) Update CHANGELOG for Nebula v1.9.3	2024-06-06 13:17:07 -04:00
Wade Simmons	4c066d8c32	initialize messageCounter to 2 instead of verifying later (#1156 ) Clean up the messageCounter checks added in #1154. Instead of checking that messageCounter is still at 2, just initialize it to 2 and only increment for non-handshake messages. Handshake packets will always be packets 1 and 2.	2024-06-06 13:03:07 -04:00
Wade Simmons	249ae41fec	v1.9.2 (#1155 ) Update CHANGELOG for Nebula v1.9.2	2024-06-03 15:50:02 -04:00
Wade Simmons	d9cae9e062	ensure messageCounter is set before handshake is complete (#1154 ) Ensure we set messageCounter to 2 before the handshake is marked as complete.	2024-06-03 15:40:51 -04:00