Changeset 20 in chevmsgr

Timestamp:

11/24/15 00:21:07 (8 years ago)

Author:

cheese

Message:

cf::bin 버그 픽스
msg / client / server 버그 픽스

Location:

trunk

Files:

• cf/bin.cpp (modified) (1 diff)
• msg.cpp (modified) (1 diff)
• msg.hpp (modified) (1 diff)
• msgclnt.cpp (modified) (7 diffs)
• msgsrv.cpp (modified) (9 diffs)

trunk/cf/bin.cpp

@@ -102 +102 @@
 cf::bin cf::bin::operator +(const cf::bin & in) const
 {
-    bin out(in);
+    bin out(*this);
 
     out.append(in);

trunk/msg.cpp

@@ -93 +93 @@
     }
 
-    std::string Request::secretWithRandom(const std::string & id, std::string & secret, const std::string & random) const
+    std::string Request::secretWithRandom(const std::string & type, const std::string & id, std::string & secret, const std::string & random) const
     {
-        DECLARE_TEMPLATE_OBJECT(obj, ProtocolType::SECRET);
+        DECLARE_TEMPLATE_OBJECT(obj, type);
 
         obj[ProtocolType::ID] = id;

trunk/msg.hpp

@@ -113 +113 @@
         std::string login(const std::string & pw) const;
 
-        std::string secretWithRandom(const std::string & id, std::string & secret, const std::string & random) const;
+        std::string secretWithRandom(const std::string & type, const std::string & id, std::string & secret, const std::string & random) const;
 
         std::string logout() const;

trunk/msgclnt.cpp

@@ -117 +117 @@
 static std::string generateRandom()
 {
-    unsigned int ret = 0;
     int t = (int)time(NULL);
 
@@ -139 +138 @@
     crypt.setKey(cf::bin(sms + DELIMITER + random));
 
-    return crypt.encrypt(cf::bin(msg)).toString();
+    return cf::codec::hex::getInstance()->encode(crypt.encrypt(cf::bin(msg)));
 }
 
@@ -176 +175 @@
 }
 
+static bool handshake(cf::network::tcp & socket, std::string & msg, const std::string & type)
+{
+    Protocol::Message parser;
+
+    socket.send(msg);
+
+    parser.parse(socket.receive().toString());
+    if (parser.type() != type)
+        THROW_EXCEPTION("invalid message type");
+
+    return parser.get<bool>(ProtocolType::RESULT);
+}
+
 // --------------------------------------------------------------
 
@@ -201 +213 @@
     {
         socket.connect(host, port);
-
-        SMessageQWorkerArg * arg = (SMessageQWorkerArg *)malloc(sizeof(SMessageQWorkerArg));
-        if (!arg)
-            return false;
-
-        arg->secureSocket = &secureSocket;
-        arg->messageQ = &messageQ;
-
-        listener.start(arg);
-
+        secureSocket.setSocket(&socket);
         return true;
     }
@@ -226 +229 @@
     {
         std::string random = generateRandom();
-        std::string msg = request.join(id, hashPassword(pw), sms);
-        std::string secret = getSecret(msg, sms, random);
-        socket.send(request.secretWithRandom(id, secret, random));
-
-        return messageQ.pop(ProtocolType::JOIN).get<bool>(ProtocolType::RESULT);
+        std::string sub = request.join(id, hashPassword(pw), sms);
+        std::string secret = getSecret(sub, sms, random);
+        std::string msg = request.secretWithRandom(ProtocolType::JOIN, id, secret, random);
+
+        return handshake(socket, msg, ProtocolType::JOIN);
     }
     catch (cf::exception & e)
@@ -247 +250 @@
 
         std::string random = generateRandom();
-        std::string msg = request.login(hashPassword(pw));
-        std::string secret = getSecret(msg, sms, random);
-        socket.send(request.secretWithRandom(id, secret, random));
-
-        return messageQ.pop(ProtocolType::LOGIN).get<bool>(ProtocolType::RESULT);
+        std::string sub = request.login(hashPassword(pw));
+        std::string secret = getSecret(sub, sms, random);
+        std::string msg = request.secretWithRandom(ProtocolType::LOGIN, id, secret, random);
+
+        bool succeed = handshake(socket, msg, ProtocolType::LOGIN);
+        if (succeed)
+        {
+            secureSocket.setKey(socket.local().address(), sms);
+
+            SMessageQWorkerArg * arg = (SMessageQWorkerArg *)malloc(sizeof(SMessageQWorkerArg));
+            if (!arg)
+                return false;
+
+            arg->secureSocket = &secureSocket;
+            arg->messageQ = &messageQ;
+
+            listener.start(arg);
+        }
+        return succeed;
     }
     catch (cf::exception & e)
@@ -265 +282 @@
     try
     {
-        socket.send(request.sms(phone));
-
-        return messageQ.pop(ProtocolType::SMS).get<bool>(ProtocolType::RESULT);
+        return handshake(socket, request.sms(phone), ProtocolType::SMS);
     }
     catch (cf::exception & e)

trunk/msgsrv.cpp

@@ -308 +308 @@
 }
 
-static std::string getRandomCode()
+static std::string generateSMSCode()
 {
     char random[8] = {0x00,};
@@ -321 +321 @@
 
 #define CRLF    "\r\n"
-    std::string code = getRandomCode();
+    std::string code = generateSMSCode();
     std::string url = "unsigned.kr";
     std::string uri = "/~cheese/sms/req.php?to=" + phone + "&code=" + code;
@@ -350 +350 @@
 
     std::string auth = crypt.decrypt(cf::bin(secret)).toString();
+
+    if (auth[0] != '{')
+        THROW_EXCEPTION("invalid secret data (check cipher and its key)");
+
+    for (size_t iter = 0; iter < auth.length(); iter++)
+    {
+        if (auth[iter] < ' ' || '~' < auth[iter])
+            THROW_EXCEPTION("invalid secret data (check cipher and its key)");
+    }
+
     Protocol::Message authParser;
 
@@ -360 +370 @@
     throw (cf::exception)
 {
-    if (sms != parser.get<std::string>(ProtocolType::SMS))
+    Protocol::Message & authParser = getSecret(parser, sms);
+
+    if (sms != authParser.get<std::string>(ProtocolType::SMS))
         THROW_EXCEPTION("SMS is not same");
-
-    Protocol::Message & authParser = getSecret(parser, sms);
 
     std::string id = authParser.get<std::string>(ProtocolType::ID);
@@ -468 +478 @@
         std::string id;
         bool loggedIn = false;
+        bool result = false;
 
         while (true)
         {
+            result = false;
             parser.parse(sock.receive().toString());
 
@@ -476 +488 @@
             {
                 sms = httpSMS(parser);
+                result = true;
             }
             else if (parser.type() == ProtocolType::JOIN)
@@ -481 +494 @@
                 if (!join(parser, sms, sock.peer().address()))
                     THROW_EXCEPTION("user(" << parser.get<std::string>(ProtocolType::ID) << ") cannot join");
+                result = true;
             }
             else if (parser.type() == ProtocolType::LOGIN)
@@ -491 +505 @@
                 // ¿©±ä ¼º°øÇÒ ¶§¿¡¸¸ ¿È
                 if (login(parser, sock, ip, sms))
+                {
                     loggedIn = true;
+                    result = true;
+                }
             }
 
             // success
-            sock.send(Protocol::Response().result(parser.type(), true));
+            sock.send(Protocol::Response().result(parser.type(), result));
             if (loggedIn)
                 return id;
@@ -590 +607 @@
 int main(int argc, char ** argv)
 {
-    if (argc != 3)
+    if (argc != 2)
     {
         std::cerr << "-_-^" << std::endl;