Merge pull request #1693 from ethereum-mining/FixIssue1687

Allow passing "." as username or workername using %2e.

Author: StefanOberhumer

libpoolprotocols/PoolURI.cpp

@@ -156,7 +156,24 @@ URI::URI(const std::string uri)
             tmpstr++;
         len = tmpstr - curstr;
         m_username.append(curstr, len);
+
+        // Expect we got a uri "username%2e246891.rigname%2e01:x@eu-01.miningrigrentals.com:3344"
+        // which should mean: username = "username.246891"
+        //                    workername = "rigname.01"
+        // we must split username and workername before urlDecode() is called !
+        auto p = m_username.find_first_of(".");
+        if (p != std::string::npos)
+        {
+            // There should be at least one char after dot
+            // returned p is zero based
+            if (p < (m_username.length() - 1))
+                m_workername = m_username.substr(p+1);
+
+            m_username = m_username.substr(0, p);
+        }
         m_username = urlDecode(m_username);
+        m_workername = urlDecode(m_workername);
+
         // Look for password
         curstr = tmpstr;
         if (':' == *curstr)

libpoolprotocols/PoolURI.h

@@ -58,6 +58,7 @@ class URI
     unsigned short Port() const { return m_port; }
     std::string User() const { return m_username; }
     std::string Pass() const { return m_password; }
+    std::string Workername() const { return m_workername; }
     SecureLevel SecLevel() const;
     ProtocolFamily Family() const;
     UriHostNameType HostNameType() const;
@@ -88,6 +89,7 @@ class URI
     std::string m_fragment;
     std::string m_username;
     std::string m_password;
+    std::string m_workername;
     std::string m_uri;
     unsigned short m_stratumMode = 999;  // Initial value 999 means not tested yet
     unsigned short m_port = 0;

libpoolprotocols/stratum/EthStratumClient.cpp

@@ -611,23 +611,9 @@ void EthStratumClient::connect_handler(const boost::system::error_code& ec)
     m_sendBuffer.consume(4096);
     clear_response_pleas();
 
-    // Extract user and worker
-    size_t p;
-    m_worker.clear();
-    p = m_conn->User().find_first_of(".");
-    if (p != string::npos)
-    {
-        m_user = m_conn->User().substr(0, p);
-
-        // There should be at least one char after dot
-        // returned p is zero based
-        if (p < (m_conn->User().length() - 1))
-            m_worker = m_conn->User().substr(++p);
-    }
-    else
-    {
-        m_user = m_conn->User();
-    }
+    // user and worker
+    m_user = m_conn->User();
+    m_worker = m_conn->Workername();
 
     /*
 
@@ -1430,7 +1416,7 @@ void EthStratumClient::onRecvSocketDataCompleted(
 
     if (!ec && bytes_transferred > 0)
     {
-        
+
         // DO NOT DO THIS !!!!!
         // std::istream is(&m_recvBuffer);
         // std::string message;
@@ -1511,7 +1497,7 @@ void EthStratumClient::onRecvSocketDataCompleted(
     }
 }
 
-void EthStratumClient::send(Json::Value const& jReq) 
+void EthStratumClient::send(Json::Value const& jReq)
 {
     std::string* line = new std::string(Json::writeString(m_jSwBuilder, jReq));
     m_txQueue.push(line);