Core/Battle.net: Additional checks

* Force grunt login for versions < 15595
* Force bn login if supported and game account is linked to bn account

4 files changed, 15 insertions, 3 deletions

diff --git a/src/server/authserver/Authentication/AuthCodes.cpp b/src/server/authserver/Authentication/AuthCodes.cpp
index bb278dd6653..7a4998f7028 100644
--- a/src/server/authserver/Authentication/AuthCodes.cpp
+++ b/src/server/authserver/Authentication/AuthCodes.cpp
@@ -79,4 +79,9 @@ namespace AuthHelper
 
         return NULL;
     }
+
+    bool IsBuildSupportingBattlenet(int build)
+    {
+        return build >= 15595;
+    }
 };
diff --git a/src/server/authserver/Authentication/AuthCodes.h b/src/server/authserver/Authentication/AuthCodes.h
index 57db55c98a8..a6113b0d26d 100644
--- a/src/server/authserver/Authentication/AuthCodes.h
+++ b/src/server/authserver/Authentication/AuthCodes.h
@@ -182,6 +182,7 @@ namespace AuthHelper
     bool IsAcceptedClientBuild(int build);
     bool IsPostBCAcceptedClientBuild(int build);
     bool IsPreBCAcceptedClientBuild(int build);
+    bool IsBuildSupportingBattlenet(int build);
 };
 
 #endif
diff --git a/src/server/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp
index 32140f76ba4..7ca49b03b56 100644
--- a/src/server/authserver/Server/AuthSocket.cpp
+++ b/src/server/authserver/Server/AuthSocket.cpp
@@ -480,7 +480,9 @@ bool AuthSocket::_HandleLogonChallenge()
                     unk3.SetRand(16 * 8);
 
                     // Fill the response packet with the result
-                    if (AuthHelper::IsAcceptedClientBuild(_build))
+                    if (fields[9].GetUInt32() && AuthHelper::IsBuildSupportingBattlenet(_build))
+                        pkt << uint8(WOW_FAIL_USE_BATTLENET);
+                    else if (AuthHelper::IsAcceptedClientBuild(_build))
                         pkt << uint8(WOW_SUCCESS);
                     else
                         pkt << uint8(WOW_FAIL_VERSION_INVALID);
diff --git a/src/server/authserver/Server/BattlenetSocket.cpp b/src/server/authserver/Server/BattlenetSocket.cpp
index eb8dc1158f0..4ee3c8e9b3d 100644
--- a/src/server/authserver/Server/BattlenetSocket.cpp
+++ b/src/server/authserver/Server/BattlenetSocket.cpp
@@ -107,7 +107,6 @@ void Battlenet::Socket::_SetVSFields(std::string const& pstr)
 
 bool Battlenet::Socket::HandleAuthChallenge(PacketHeader& header, BitStream& packet)
 {
-
     // Verify that this IP is not in the ip_banned table
     LoginDatabase.Execute(LoginDatabase.GetPreparedStatement(LOGIN_DEL_EXPIRED_IP_BANS));
 
@@ -160,7 +159,12 @@ bool Battlenet::Socket::HandleAuthChallenge(PacketHeader& header, BitStream& pac
             else if (!sBattlenetMgr->HasPlatform(component.Platform))
                 complete.SetAuthResult(AUTH_INVALID_OS);
             else
-                complete.SetAuthResult(AUTH_REGION_BAD_VERSION);
+            {
+                if (component.Program != "WoW" || AuthHelper::IsBuildSupportingBattlenet(component.Build))
+                    complete.SetAuthResult(AUTH_REGION_BAD_VERSION);
+                else
+                    complete.SetAuthResult(AUTH_USE_GRUNT_LOGON);
+            }
 
             Send(complete);
             return true;