Merge pull request PurpleI2P#1304 from lifecoder-phoenix/openssl

Fix PurpleI2P#1257
GuardianOfKnowledge · Feb 25, 2019 · ec30ec0 · ec30ec0
2 parents 846eac2 + cdecb7a
commit ec30ec0
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/libi2pd_client/SAM.cpp b/libi2pd_client/SAM.cpp
@@ -359,6 +359,21 @@ namespace client
 			}
 			forward = std::make_shared<boost::asio::ip::udp::endpoint>(addr, port);
 		}
+
+		//ensure we actually received a destination
+		if (destination.empty())
+		{
+			SendMessageReply (SAM_SESSION_STATUS_INVALID_KEY, strlen(SAM_SESSION_STATUS_INVALID_KEY), true);
+			return;
+		}
+
+		//ensure it's a base64 string
+		i2p::data::PrivateKeys keys;
+		if (!keys.FromBase64(destination))
+		{
+			SendMessageReply(SAM_SESSION_STATUS_INVALID_KEY, strlen(SAM_SESSION_STATUS_INVALID_KEY), true);
+			return;
+		}
 
 		// create destination
 		auto session = m_Owner.CreateSession (id, destination == SAM_VALUE_TRANSIENT ? "" : destination, &params);