Changeset 33 in chevmsgr

Timestamp:

12/09/15 06:47:21 (8 years ago)

Author:

cheese

Message:

1. 클라이언트 UI ID/PW 입력 안하면 죽는 문제 수정
2. UI 종료 함수 exit로 수정
3. 그룹챗 인덱스 변수 형 때문에 나오는 warning 수정
4. toOpenSession 함수 가끔 죽는 문제 수정
5. generateRandom()에서 time()하던거 rand()로 수정
6. sms 전송 url 및 sms 코드 생성 로직 대폭 수정 (주석 참고)

Location:

trunk

Files:

• msg.hpp (modified) (1 diff)
• msgclnt.cpp (modified) (1 diff)
• msgsrv.cpp (modified) (2 diffs)
• msvc14/ChevMsgrClient_MFC/AddGroupChat.cpp (modified) (1 diff)
• msvc14/ChevMsgrClient_MFC/ChevMsgrClient_MFCDlg.cpp (modified) (5 diffs)
• msvc14/ChevMsgrClient_MFC/LoginDlg.cpp (modified) (2 diffs)

trunk/msg.hpp

@@ -175 +175 @@
 static cf::bin generateRandom()
 {
-    int t = (int)time(NULL);
+    srand((unsigned int)time(NULL));
+    int t = rand();
 
     cf::bin b;

trunk/msgclnt.cpp

@@ -89 +89 @@
     SOpenSession o;
 
-    o.sessid = message.get<std::string>(ProtocolType::SESSION_ID);
-    o.idList = message.getList<std::string>(ProtocolType::ID_LIST);
-
     if (message.mObject.HasKey(ProtocolType::SESSION_KEY))
     {
+        o.sessid = message.get<std::string>(ProtocolType::SESSION_ID);
+        o.idList = message.getList<std::string>(ProtocolType::ID_LIST);
+
         std::string encodedKey = message.get<std::string>(ProtocolType::SESSION_KEY);
         cf::bin key = cf::codec::hex::getInstance()->decode(encodedKey);

trunk/msgsrv.cpp

@@ -294 +294 @@
 }
 
-static unsigned int generateSeed()
-{
-    unsigned int ret = 0;
-    int t = (int)time(NULL);
-
-    cf::bin b;
-    b.resize(sizeof(int));
-
-    b.set((cf::uint8_t*)&t, sizeof(int));
-    cf::bin s = crypto().sha256(b);
-
-    memcpy(&ret, s.buffer(), sizeof(unsigned int));
-
-    return ret;
-}
-
 static std::string generateSMSCode()
 {
-    return "545454";
-    char random[8] = {0x00,};
-    sprintf(random, "%06d", generateSeed() % 1000000);
-
-    return random;
+    cf::bin random  = generateRandom(); // ·£´ý °ª °¡Á®¿È
+    cf::bin hash    = crypto().sha256(random); // ·£´ý °ª Çؽ¬
+    std::string enc = cf::codec::hex::getInstance()->encode(hash); // Çؽ¬ÇÑ °á°ú hex encode
+
+    std::string sms; // ÃÖÁ¾ sms¹ÞÀ» º¯¼ö
+
+    // xxxx-xxxx-xxxx-xxxx-xxxx-xxxx-xxxx-xxxx
+    for (int i = 0; i < 8 ; i++)
+    {
+        char buf[128] = {0,};
+
+        // [0] ºÎÅÍ 4±ÛÀÚ, [4] ºÎÅÍ 4±ÛÀÚ, ...
+        size_t start = i * 4;
+
+        // 1. enc º¯¼ö¿¡¼­ 4ÀÚ¸®¾¿ ¼ø¼­´ë·Î ¶¼¾î³»¼­ xxxx- ·Î ¸¸µë
+        //    std::string::substr(½ÃÀÛ À妽º, °³¼ö)
+        // 2. std::string::substr() ´Â std::stringÀ» return ÇϹǷÎ,
+        //    std::string::c_str() ÇÏ¿© const char * ÇüÀ¸·Î ¹Þ¾Æ¿È
+        snprintf(buf, sizeof(buf), "%s-", enc.substr(start, 4).c_str());
+
+        // xxxx- ·Î ¸¸µç°Å sms °á°ú¿¡ Ãß°¡
+        sms += buf;
+    }
+
+    // ·çÇÁ¿¡¼­ xxxx- ¸¦ °è¼Ó ºÙ¿©¼­ ´Ù ¸¸µé°í ³ª¸é ¸¶Áö¸·ÀÌ '-' ·Î ³¡³ª°Ô µÇ¹Ç·Î ¸¶Áö¸· ±ÛÀÚ ¶¼¾î³¿
+    sms[sms.length() - 1] = 0;
+
+    return sms;
 }
 
@@ -325 +332 @@
 #define CRLF    "\r\n"
     std::string code = generateSMSCode();
-    std::string url = "unsigned.kr";
-    std::string uri = "/~cheese/sms/req.php?to=" + phone + "&code=" + code;
+    std::string url = "chev.unsigned.kr";
+    std::string uri = "/sms/req.php?to=" + phone + "&code=" + code;
     std::string http =
         "GET " + uri + " HTTP/1.1" CRLF

trunk/msvc14/ChevMsgrClient_MFC/AddGroupChat.cpp

@@ -41 +41 @@
 
     for (size_t iter = 0; iter < mMsgrClntDlg->idList.size(); iter++)
-        mFriendListToChat.InsertString(iter, str2cstr(mMsgrClntDlg->idList[iter].id));
+        mFriendListToChat.InsertString((int)iter, str2cstr(mMsgrClntDlg->idList[iter].id));
 
     return TRUE;

trunk/msvc14/ChevMsgrClient_MFC/ChevMsgrClient_MFCDlg.cpp

@@ -136 +136 @@
     {
         AfxMessageBox(_T("¼­¹ö Á¤º¸ ÆÄÀÏÀ» ãÀ» ¼ö ¾øÀ½"));
-        ::SendMessage(GetSafeHwnd(), WM_QUIT, NULL, NULL);
+        exit(1);
     }
     std::string ip;
@@ -147 +147 @@
     {
         AfxMessageBox(str2cstr(chev.getLastError()));
-        ::SendMessage(GetSafeHwnd(), WM_QUIT, NULL, NULL);
+        exit(1);
     }
 
@@ -155 +155 @@
     {
         AfxMessageBox(_T("login failed"));
-        ::SendMessage(GetSafeHwnd(), WM_QUIT, NULL, NULL);
+        exit(1);
     }
 
@@ -243 +243 @@
                 SensitiveCtrl sc;
 
-                sc.sensitiveIdx = gDlg->scl[idx].chatList.size();
+                sc.sensitiveIdx = (int)gDlg->scl[idx].chatList.size();
                 sc.timestamp = (int)time(NULL);
                 gDlg->scl[idx].sensitiveCtrl.push_back(sc);
@@ -341 +341 @@
             SensitiveCtrl sc;
 
-            sc.sensitiveIdx = gDlg->scl[idx].chatList.size();
+            sc.sensitiveIdx = (int)gDlg->scl[idx].chatList.size();
             sc.timestamp = (int)time(NULL);
             gDlg->scl[idx].sensitiveCtrl.push_back(sc);

trunk/msvc14/ChevMsgrClient_MFC/LoginDlg.cpp

@@ -59 +59 @@
 
     GetDlgItemText(IDC_EDIT_LOGIN_ID, id);
+    if (id == _T(""))
+    {
+        AfxMessageBox(_T("No ID"));
+        return;
+    }
+
     std::string name = cf::codec::hex::getInstance()->encode(c.sha256(cf::bin(cstr2str(id))));
     std::ifstream f(name);
@@ -70 +76 @@
 
     GetDlgItemText(IDC_EDIT_LOGIN_PW, pw);
+    if (pw == _T(""))
+    {
+        AfxMessageBox(_T("No Password"));
+        return;
+    }
+
     f >> str;