Changeset 6227

Timestamp:

06/02/08 00:14:42 (3 months ago)

Author:

emostar

Message:

Use MD5 method for logins.

Location:

trunk/licq

Files:

• include/licq_icq.h (modified) (2 diffs)
• include/licq_icqd.h (modified) (3 diffs)
• include/licq_packets.h (modified) (2 diffs)
• src/icqd-srv.cpp (modified) (6 diffs)
• src/icqd.cpp (modified) (1 diff)
• src/icqpacket.cpp (modified) (7 diffs)

trunk/licq/include/licq_icq.h

@@ -38 +38 @@
 const unsigned short ICQ_SNACxFAM_LIST             = 0x0013;
 const unsigned short ICQ_SNACxFAM_VARIOUS          = 0x0015;
-const unsigned short ICQ_SNACxFAM_NEWUIN       = 0x0017;
+const unsigned short ICQ_SNACxFAM_AUTH             = 0x0017;
 
 // Subtypes for service family
@@ -101 +101 @@
 // Subtypes for new uin family
 const unsigned short ICQ_SNACxNEW_UIN_ERROR        = 0x0001; // server
+const unsigned short ICQ_SNACxAUTHxLOGON           = 0x0002; // client
+const unsigned short ICQ_SNACxAUTHxLOGON_REPLY     = 0x0003; // server
 const unsigned short ICQ_SNACxREGISTER_USER        = 0x0004; // client
 const unsigned short ICQ_SNACxNEW_UIN              = 0x0005; // server
+const unsigned short ICQ_SNACxAUTHxREQUEST_SALT    = 0x0006; // client
+const unsigned short ICQ_SNACxAUTHxSALT_REPLY      = 0x0007; // server
 const unsigned short ICQ_SNACxREQUEST_IMAGE        = 0x000C; // client
 const unsigned short ICQ_SNACxSEND_IMAGE           = 0x000D; // server

trunk/licq/include/licq_icqd.h

@@ -388 +388 @@
   unsigned long icqFetchAutoResponseServer(unsigned long);
   unsigned long icqLogon(unsigned short logonStatus);
+  unsigned long icqRequestLogonSalt();
   unsigned long icqUserBasicInfo(const char *);
   unsigned long icqUserBasicInfo(unsigned long);
@@ -691 +692 @@
        m_bTCPEnabled,
        m_bFirewall,
-       m_bVerify;
+       m_bVerify,
+       // NeedSalt is to let the daemon know when to make a salt request, which
+       // should only happen when we first log on. After we get the credentials, we
+       // do another logon, but it doesn't need to get a salt.
+       m_bNeedSalt;
   time_t m_tLogonTime;
   char *m_szRegisterPasswd;
@@ -807 +812 @@
   void ProcessBOSFam(CBuffer&, unsigned short);
   void ProcessListFam(CBuffer &, unsigned short);
-  void ProcessNewUINFam(CBuffer &, unsigned short);
+  void ProcessAuthFam(CBuffer &, unsigned short);
 
   void ProcessSystemMessage(CBuffer &packet, unsigned long checkUin, unsigned short newCommand, time_t timeSent);

trunk/licq/include/licq_packets.h

@@ -198 +198 @@
 };
 
+class CPU_ConnectStart : public CSrvPacketTcp
+{
+public:
+  CPU_ConnectStart();
+};
+
 //-----Logon--------------------------------------------------------------------
 class CPU_Logon : public CSrvPacketTcp
@@ -242 +248 @@
                     unsigned short nService = 0);
   virtual ~CPU_GenericFamily();
+};
+
+class CPU_RequestLogonSalt : public CPU_CommonFamily
+{
+public:
+  CPU_RequestLogonSalt(const std::string &);
+};
+
+class CPU_NewLogon : public CPU_CommonFamily
+{
+public:
+  CPU_NewLogon(const char *_szPassword, const char *_szUin, const char *_szMD5Salt);
 };
 

trunk/licq/src/icqd-srv.cpp

@@ -1776 +1776 @@
       case MAKESNAC(ICQ_SNACxFAM_BUDDY, ICQ_SNACxBDY_ADDxTOxLIST):
       case MAKESNAC(ICQ_SNACxFAM_BUDDY, ICQ_SNACxBDY_REMOVExFROMxLIST):
-      case MAKESNAC(ICQ_SNACxFAM_NEWUIN, ICQ_SNACxREGISTER_USER):
+      case MAKESNAC(ICQ_SNACxFAM_AUTH, ICQ_SNACxREGISTER_USER):
       case MAKESNAC(ICQ_SNACxFAM_LOCATION, ICQ_SNACxREQUESTxUSERxINFO):
       case MAKESNAC(ICQ_SNACxFAM_LOCATION, ICQ_SNACxLOC_INFOxREQ):
@@ -1858 +1858 @@
   }
 
-  char *passwd = strdup(o->Password());
-  char *user = strdup(o->IdString());
-  unsigned long status = o->AddStatusFlags(logonStatus);
+  m_nDesiredStatus = o->AddStatusFlags(logonStatus);
   gUserManager.DropOwner();
-  CPU_Logon *p = new CPU_Logon(passwd, user, status);
-  free(passwd);
-  free(user);
+
+  CPU_ConnectStart *startPacket = new CPU_ConnectStart();
+  SendEvent_Server(startPacket);
+
   m_bOnlineNotifies = false;
-  gLog.Info(tr("%sRequesting logon (#%hu)...\n"), L_SRVxSTR, p->Sequence());
   m_nServerSequence = 0;
-  m_nDesiredStatus = status;
   m_bLoggingOn = true;
   m_tLogonTime = time(NULL);
-
-  SendEvent_Server(p);
+  m_bNeedSalt = true;
+
+  return 0;
+}
+
+unsigned long CICQDaemon::icqRequestLogonSalt()
+{
+  if (m_bNeedSalt)
+  {
+    ICQOwner *o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
+    CPU_RequestLogonSalt *p =  new CPU_RequestLogonSalt(o->IdString());
+    gUserManager.DropOwner();
+    gLog.Info(tr("%sRequesting logon salt (#%hu)...\n"), L_SRVxSTR, p->Sequence());
+    SendEvent_Server(p);
+  }
 
   return 0;
@@ -2212 +2222 @@
         m_bRegistering = false;
       }
+    }
+    else if (m_bLoggingOn)
+    {
+      icqRequestLogonSalt();
     }
     break;
@@ -6195 +6209 @@
 }
 
-//--------ProcessNewUINFam-----------------------------------------------------
-void CICQDaemon::ProcessNewUINFam(CBuffer &packet, unsigned short nSubtype)
+//--------ProcessAuthFam----------------------------------------------------
+void CICQDaemon::ProcessAuthFam(CBuffer &packet, unsigned short nSubtype)
 {
   /*unsigned long Flags =*/ packet.UnpackUnsignedLongBE();
@@ -6289 +6303 @@
     }
 
+    case ICQ_SNACxAUTHxSALT_REPLY:
+    {
+      char *md5Salt = packet.UnpackStringBE();
+      ICQOwner *o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
+      CPU_NewLogon *p = new CPU_NewLogon(o->Password(), o->IdString(), md5Salt);
+      gUserManager.DropOwner(LICQ_PPID);
+      gLog.Info(tr("%sSending md5 hashed password.\n"), L_SRVxSTR);
+      SendEvent_Server(p);
+      delete [] md5Salt;
+      m_bNeedSalt = false;
+      break;
+    }
+
+    case ICQ_SNACxAUTHxLOGON_REPLY:
+    {
+      ProcessCloseChannel(packet);
+      break;
+    }
+
     case ICQ_SNACxSEND_IMAGE:
     {
@@ -6377 +6410 @@
     break;
 
-  case ICQ_SNACxFAM_NEWUIN:
-    ProcessNewUINFam(packet, nSubtype);
+  case ICQ_SNACxFAM_AUTH:
+    ProcessAuthFam(packet, nSubtype);
     break;
     

trunk/licq/src/icqd.cpp

@@ -161 +161 @@
   m_bOnlineNotifies = true;
   m_bVerify = false;
+  m_bNeedSalt = true;
   m_szRegisterPasswd = 0;
   m_nRegisterThreadId = 0;

trunk/licq/src/icqpacket.cpp

@@ -23 +23 @@
 extern int errno;
 #endif
+
+#include <openssl/md5.h>
 
 #include <boost/scoped_array.hpp>
@@ -713 +715 @@
 
 CPU_Register::CPU_Register(const char *szPasswd)
-    : CPU_CommonFamily(ICQ_SNACxFAM_NEWUIN, ICQ_SNACxREGISTER_USER)
+    : CPU_CommonFamily(ICQ_SNACxFAM_AUTH, ICQ_SNACxREGISTER_USER)
 {
   int nPassLen = strlen(szPasswd);
@@ -742 +744 @@
 
 CPU_VerifyRegistration::CPU_VerifyRegistration()
-  : CPU_CommonFamily(ICQ_SNACxFAM_NEWUIN, ICQ_SNACxREQUEST_IMAGE)
+  : CPU_CommonFamily(ICQ_SNACxFAM_AUTH, ICQ_SNACxREQUEST_IMAGE)
 {
   // Yes, it's empty
@@ -755 +757 @@
 
 CPU_SendVerification::CPU_SendVerification(const char *szPasswd, const char *szVerify)
-  : CPU_CommonFamily(ICQ_SNACxFAM_NEWUIN, ICQ_SNACxREGISTER_USER)
+  : CPU_CommonFamily(ICQ_SNACxFAM_AUTH, ICQ_SNACxREGISTER_USER)
 {
   int nPassLen = strlen(szPasswd);
@@ -786 +788 @@
 }
 
+CPU_ConnectStart::CPU_ConnectStart()
+  : CSrvPacketTcp(ICQ_CHNxNEW)
+{
+  pthread_mutex_lock(&s_xMutex);
+  if (!s_bRegistered) {
+    s_nSequence[m_nService] = 0xffff;
+    s_bRegistered = true;
+  }
+  pthread_mutex_unlock(&s_xMutex);
+
+  m_nSize = 12;
+  InitBuffer();
+
+  buffer->PackUnsignedLongBE(0x00000001);
+  buffer->PackUnsignedLongBE(0x80030004);
+  buffer->PackUnsignedLongBE(0x00100000);
+}
+
+CPU_RequestLogonSalt::CPU_RequestLogonSalt(const std::string &id)
+  : CPU_CommonFamily(ICQ_SNACxFAM_AUTH, ICQ_SNACxAUTHxREQUEST_SALT)
+{
+  m_nSize += id.size() + 4;
+  InitBuffer();
+
+  buffer->PackTLV(0x0001, id.size(), id.c_str());
+}
+
+//-----NewLogon-----------------------------------------------------------------
+CPU_NewLogon::CPU_NewLogon(const char *szPassword, const char *szUin, const char *szMD5Salt)
+  : CPU_CommonFamily(ICQ_SNACxFAM_AUTH, ICQ_SNACxAUTHxLOGON)
+{
+  // truncate password to MAX 8 characters
+  char szPass[MAX_LINE_LEN];
+  if (strlen(szPassword) > 8)
+  {
+    gLog.Warn(tr("%sPassword too long, truncated to 8 Characters!\n"), L_WARNxSTR);
+    strncpy(szPass, szPassword, 8);
+    szPass[8] = '\0';
+  }
+  else
+  {
+    strcpy(szPass, szPassword);
+  }
+
+  std::string toHash = szMD5Salt;
+  toHash += szPass;
+  toHash += "AOL Instant Messenger (SM)";
+  unsigned char szDigest[16];
+  MD5((const unsigned char *)toHash.c_str(), toHash.size(), szDigest);
+
+  unsigned int uinlen = strlen(szUin);
+  unsigned int digestlen = strlen(reinterpret_cast<char *>(szDigest));
+
+  m_nSize += uinlen + digestlen + 70;
+  InitBuffer();
+
+  buffer->PackTLV(0x0001, uinlen, szUin);
+  buffer->PackTLV(0x0025, digestlen, reinterpret_cast<char *>(szDigest));
+
+  buffer->PackTLV(0x0003,  0x0008, "ICQBasic");
+
+  // Static versioning
+  buffer->PackUnsignedLongBE(0x00160002);
+  buffer->PackUnsignedShortBE(0x010A);
+  // Client version major (4 == ICQ2000, 5 == ICQ2001)
+  buffer->PackUnsignedLongBE(0x00170002);
+  buffer->PackUnsignedShortBE(0x0014);
+  // Client version minor
+  buffer->PackUnsignedLongBE(0x00180002);
+  buffer->PackUnsignedShortBE(0x0022);
+  buffer->PackUnsignedLongBE(0x00190002);
+  buffer->PackUnsignedShortBE(0x0000);
+  // Client version build
+  buffer->PackUnsignedLongBE(0x001a0002);
+  buffer->PackUnsignedShortBE(0x0BB8);
+  buffer->PackUnsignedLongBE(0x00140004);
+  buffer->PackUnsignedLongBE(0x0000043D);
+
+  // locale info, just use english, usa for now, i don't know what else they use
+  buffer->PackTLV(0x000f, 0x0002, "en");
+  buffer->PackTLV(0x000e, 0x0002, "us");
+}
+
 //-----Logon--------------------------------------------------------------------
 CPU_Logon::CPU_Logon(const char *szPassword, const char *szUin, unsigned short _nLogonStatus)
@@ -792 +877 @@
   // truncate password to MAX 8 characters
   char szPass[MAX_LINE_LEN];
-  strcpy(szPass, szPassword);
-  if (strlen(szPass) > 8)
+  if (strlen(szPassword) > 8)
   {
     gLog.Warn(tr("%sPassword too long, truncated to 8 Characters!\n"), L_WARNxSTR);
-              szPass[8] = 0;
-  }
+    strncpy(szPass, szPassword, 8);
+  }
+  else
+  {
+    strcpy(szPass, szPassword);
+  }
+
   char szEncPass[16];
   unsigned int j;
@@ -819 +908 @@
   // Encrypt our password here
   unsigned char xor_table[] = { 0xf3, 0x26, 0x81, 0xc4, 0x39, 0x86, 0xdb, 0x92,
-                0x71, 0xa3, 0xb9, 0xe6, 0x53, 0x7a, 0x95, 0x7c};
+                           0x71, 0xa3, 0xb9, 0xe6, 0x53, 0x7a, 0x95, 0x7c};
   for (j = 0; j < pwlen; j++)
     szEncPass[j] = (szPass[j] ^ xor_table[j]);