Changed authserial to enabled by default.

Added mtaserver.conf IP exceptions option for auth serial http protection.
Added mtaserver.conf owner email address option.

Author: ccw808

Server/mods/deathmatch/logic/CAccountManager.cpp

@@ -997,6 +997,7 @@ bool CAccountManager::IsAuthorizedSerialRequired( CAccount* pAccount )
 bool CAccountManager::IsHttpLoginAllowed( CAccount* pAccount, const SString& strIp )
 {
     if ( !g_pGame->GetConfig()->GetAuthSerialHttpEnabled() ||
+         g_pGame->GetConfig()->IsAuthSerialHttpIpException(strIp) ||
          !IsAuthorizedSerialRequired( pAccount ) ||
          pAccount->IsIpAuthorized( strIp ) )
     {

Server/mods/deathmatch/logic/CMainConfig.cpp

@@ -499,8 +499,8 @@ bool CMainConfig::Load ( void )
     SString strGroupList;
     if ( GetString( m_pRootNode, "auth_serial_groups", strGroupList, 1 ) != IS_SUCCESS )
     {
-        // If not defined in conf file, then default to disabled
-        strGroupList = "";
+        // If not defined in conf file, then default to Admin
+        strGroupList = "Admin";
     }
     ReadCommaSeparatedList(strGroupList, m_AuthSerialGroupList);
 
@@ -510,6 +510,16 @@ bool CMainConfig::Load ( void )
         m_bAuthSerialHttpEnabled = true;
     }
 
+    // auth_serial_http_ip_exceptions
+    SString strIpsString;
+    GetString(m_pRootNode, "auth_serial_http_ip_exceptions", strIpsString);
+    ReadCommaSeparatedList(strIpsString, m_AuthSerialHttpIpExceptionList);
+
+    // owner_email_address
+    SString strEmailsString;
+    GetString(m_pRootNode, "owner_email_address", strEmailsString);
+    ReadCommaSeparatedList(strEmailsString, m_OwnerEmailAddressList);
+
     // Check settings in this list here
     const std::vector < SIntSetting >& settingList = GetIntSettingList ();
     for ( uint i = 0 ; i < settingList.size () ; i++ )

Server/mods/deathmatch/logic/CMainConfig.h

@@ -125,9 +125,12 @@ class CMainConfig: public CXMLConfig
     bool                            GetCrashDumpUploadEnabled       ( void ) const              { return m_bCrashDumpUploadEnabled != 0; }
     bool                            GetFilterDuplicateLogLinesEnabled ( void ) const            { return m_bFilterDuplicateLogLinesEnabled != 0; }
     bool                            IsAuthSerialGroup               ( const SString& strGroup ) const   { return ListContains ( m_AuthSerialGroupList, strGroup ); };
+    bool                            IsAuthSerialHttpIpException     ( const SString& strIp ) const      { return ListContains ( m_AuthSerialHttpIpExceptionList, strIp ); }
     bool                            GetAuthSerialEnabled            ( void ) const                      { return !m_AuthSerialGroupList.empty(); };
     bool                            GetAuthSerialHttpEnabled        ( void ) const                      { return m_bAuthSerialHttpEnabled && GetAuthSerialEnabled(); };
     const std::vector< SString >&   GetAuthSerialGroupList          ( void ) const                      { return m_AuthSerialGroupList; }
+    const std::vector< SString >&   GetAuthSerialHttpIpExceptionList( void ) const                      { return m_AuthSerialHttpIpExceptionList; }
+    const std::vector< SString >&   GetOwnerEmailAddressList        ( void ) const                      { return m_OwnerEmailAddressList; }
     bool                            IsDatabaseCredentialsProtectionEnabled ( void ) const               { return m_bDatabaseCredentialsProtectionEnabled != 0; }
     bool                            IsFakeLagCommandEnabled         ( void ) const                      { return m_bFakeLagCommandEnabled != 0; }
 
@@ -193,6 +196,8 @@ class CMainConfig: public CXMLConfig
     std::set < SString >            m_EnableDiagnosticMap;
     std::vector < SString >         m_AuthSerialGroupList;
     bool                            m_bAuthSerialHttpEnabled;
+    std::vector<SString>            m_AuthSerialHttpIpExceptionList;
+    std::vector<SString>            m_OwnerEmailAddressList;
     SString                         m_strMinClientVersion;
     SString                         m_strRecommendedClientVersion;
     SString                         m_strIdFile;

Server/mods/deathmatch/mtaserver.conf

@@ -4,6 +4,11 @@
          and on Game-Monitor. It is a required parameter. -->
     <servername>Default MTA Server</servername>
 
+    <!-- This parameter specifies the contact email addresses for the owner(s) of this server.
+         Note: Missing or incorrect owner_email_address can affect your server list position.
+         Values: Comma separated list of email addresses -->
+    <owner_email_address></owner_email_address>
+
     <!-- ONLY USE THIS PARAMETER IF YOU ARE SURE OF WHAT YOU ARE DOING - it is generally only
          needed for professional servers and should be left at the default value otherwise.
          This parameter specifies the IP to use for servers that have multiple IP addresses. If set
@@ -44,9 +49,9 @@
          e.g. 88.11.22.33,101.2.3.4 -->
     <http_dos_exclude></http_dos_exclude>
 
-    <!-- By default, the server will block the use of locally customized gta3.img player skins and vehicles
+    <!-- By default, the server will block the use of locally customized gta3.img player skins
          This setting can be used to allow such mods. Not recommended for competitive servers.
-         Values: none, peds, vehicles ; default value: none -->
+         Values: none, peds ; default value: none -->
     <allow_gta3_img_mods>none</allow_gta3_img_mods>
 
     <!-- By default, the server will block the use of customized GTA:SA data files. -->
@@ -230,16 +235,22 @@
          Login attempts to a protected account from a second serial are blocked until the serial is manually authorized via
          the authserial command.
          For more info see: https://mtasa.com/authserial
+         Note: Disabling auth_serial_groups can affect your server list position.
          Values: Comma separated list of ACL groups.  Default - Admin -->
     <auth_serial_groups>Admin</auth_serial_groups>
 
     <!-- This parameter specifies if the authorized serial login checks should also apply to the http interface.
          Protected account login attempts to the http interface will only succeed if the IP address matches one
          recently used by the account holder in-game
          For more info see: https://mtasa.com/authserialhttp
+         Note: Disabling auth_serial_http can affect your server list position.
          Values: 0 - Off, 1 - Enabled.  Default - 1 -->
     <auth_serial_http>1</auth_serial_http>
 
+    <!-- This parameter specifies which IP addresses should always pass auth_serial_http checks.
+         Values: Comma separated list of IP addresses -->
+    <auth_serial_http_ip_exceptions>127.0.0.1</auth_serial_http_ip_exceptions>
+
     <!-- This parameter specifies if extra security measures are applied to resources which use dbConnect with mysql.
          The extra measures are:
            - Script files cannot be accessed with fileOpen()

Server/mods/deathmatch/utils/CHqComms.h

@@ -45,7 +45,7 @@ class CHqComms : public CRefCountable
             m_Stage = HQCOMMS_STAGE_QUERY;
 
             CBitStream bitStream;
-            bitStream->Write( (char)3 );    // Data version
+            bitStream->Write( (char)4 );    // Data version
             bitStream->WriteStr( g_pGame->GetConfig()->GetServerIP() );
             bitStream->Write( g_pGame->GetConfig()->GetServerPort() );
             bitStream->WriteStr( CStaticFunctionDefinitions::GetVersionSortable() );
@@ -80,6 +80,12 @@ class CHqComms : public CRefCountable
             bitStream->WriteStr( MTA_OS_STRING );
             bitStream->WriteStr( g_pGame->GetConfig()->GetServerIPList() );
 
+            bitStream->Write( g_pGame->GetConfig()->IsDatabaseCredentialsProtectionEnabled() ? 1 : 0 );
+            bitStream->Write( g_pGame->GetConfig()->IsFakeLagCommandEnabled() ? 1 : 0 );
+            bitStream->Write( g_pGame->GetConfig()->GetAuthSerialHttpEnabled() ? 1 : 0 );
+            bitStream->WriteStr( SString::Join(",", g_pGame->GetConfig()->GetAuthSerialGroupList()) );
+            bitStream->WriteStr( SString::Join(",", g_pGame->GetConfig()->GetOwnerEmailAddressList()) );
+
             // Send request
             this->AddRef();     // Keep object alive
             GetDownloadManager()->QueueFile( m_strURL, NULL, 0, (const char*)bitStream->GetData(), bitStream->GetNumberOfBytesUsed(), true, this, StaticDownloadFinishedCallback, false, 2 );