Merge pull request #667 from AElfProject/simple-version-check

Add simple version check at connection.
AElfProject · Dec 6, 2018 · 805735a · 805735a
2 parents a727ae1 + 328345a
commit 805735a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/AElf.Common/GlobalConfig.cs b/AElf.Common/GlobalConfig.cs
@@ -1,8 +1,13 @@
+using System.Reflection;
+
 namespace AElf.Common
 {
     // ReSharper disable InconsistentNaming
     public static class GlobalConfig
     {
+        // current release version
+        public static int ProtocolVersion = 1;
+
         public static int AddressLength = 18;
         public const ulong GenesisBlockHeight = 1;
         public static readonly string GenesisSmartContractZeroAssemblyName = "AElf.Contracts.Genesis";

diff --git a/AElf.Network.Tests/NetworkTestHelpers.cs b/AElf.Network.Tests/NetworkTestHelpers.cs
@@ -1,4 +1,5 @@
 using System;
+using AElf.Common;
 using AElf.Cryptography.ECDSA;
 using AElf.Network.Data;
 using Google.Protobuf;
@@ -20,6 +21,7 @@ public static (ECKeyPair, Handshake) CreateKeyPairAndHandshake(int port)
             {
                 NodeInfo = nodeInfo,
                 PublicKey = ByteString.CopyFrom(key.GetEncodedPublicKey()),
+                Version = GlobalConfig.ProtocolVersion,
                 R = ByteString.CopyFrom(sig.R),
                 S = ByteString.CopyFrom(sig.S),
             };

diff --git a/AElf.Network/Data/Protobuf/Definitions/messages.proto b/AElf.Network/Data/Protobuf/Definitions/messages.proto
@@ -9,6 +9,7 @@ message Handshake {
     NodeData NodeInfo = 1;
     bytes PublicKey = 2;
     int32 Height = 3;
+    int32 Version = 4;
     // sig NodeData
     bytes R = 9;
     bytes S = 10;

diff --git a/AElf.Network/Peers/Peer.cs b/AElf.Network/Peers/Peer.cs
@@ -40,6 +40,7 @@ public AuthFinishedArgs()
     public enum RejectReason
     {
         AuthTimeout,
+        AuthWrongVersion,
         AuthInvalidHandshakeMsg,
         AuthInvalidKey,
         AuthInvalidSig
@@ -276,8 +277,9 @@ private void StartAuthentification()
                 NodeInfo = nodeInfo,
                 PublicKey = ByteString.CopyFrom(_nodeKey.GetEncodedPublicKey()),
                 Height = CurrentHeight,
+                Version = GlobalConfig.ProtocolVersion,
                 R = ByteString.CopyFrom(sig.R),
-                S = ByteString.CopyFrom(sig.S),
+                S = ByteString.CopyFrom(sig.S)
             };
 
             byte[] packet = nd.ToByteArray();
@@ -359,6 +361,12 @@ internal void AuthentifyWith(Handshake handshakeMsg)
 
             try
             {
+                if (handshakeMsg.Version != GlobalConfig.ProtocolVersion)
+                {
+                    FireInvalidAuth(RejectReason.AuthWrongVersion);
+                    return;
+                }
+
                 DistantNodeKeyPair = ECKeyPair.FromPublicKey(handshakeMsg.PublicKey.ToByteArray());
 
                 if (DistantNodeKeyPair == null)

diff --git a/deploy.sh b/deploy.sh
@@ -6,7 +6,7 @@ DOCKER_USERNAME=$2
 DOCKER_PASSWORD=$3
 
 # AElf node
-dotnet publish -c Release -o ~/aelf/
+dotnet publish /p:Version=$TAG -c Release -o ~/aelf/
 
 docker build -t aelf/node:$TAG ~/aelf/.
 docker tag aelf/node:$TAG aelf/node:latest