1 files changed, 292 insertions, 3 deletions

diff --git a/src/Bindings/ManualBindings.cpp b/src/Bindings/ManualBindings.cpp
index 56f2e73bc..cac81f325 100644
--- a/src/Bindings/ManualBindings.cpp
+++ b/src/Bindings/ManualBindings.cpp
@@ -3,8 +3,11 @@
 
 #include "ManualBindings.h"
 #undef TOLUA_TEMPLATE_BIND
+#include <sstream>
+#include <iomanip>
 #include "tolua++/include/tolua++.h"
 #include "polarssl/md5.h"
+#include "polarssl/sha1.h"
 #include "PluginLua.h"
 #include "PluginManager.h"
 #include "LuaWindow.h"
@@ -28,6 +31,7 @@
 #include "../LineBlockTracer.h"
 #include "../WorldStorage/SchematicFileSerializer.h"
 #include "../CompositeChat.h"
+#include "../StringCompression.h"
 
 
 
@@ -107,6 +111,146 @@ static int tolua_Clamp(lua_State * tolua_S)
 
 
 
+static int tolua_CompressStringZLIB(lua_State * tolua_S)
+{
+	cLuaState S(tolua_S);
+	if (
+		!S.CheckParamString(1) ||
+		(
+			!S.CheckParamNumber(2) &&
+			!S.CheckParamEnd(2)
+		)
+	)
+	{
+		cLuaState::LogStackTrace(tolua_S);
+		return 0;
+	}
+
+	// Get the params:
+	AString ToCompress;
+	int CompressionLevel = 5;
+	S.GetStackValues(1, ToCompress, CompressionLevel);
+
+	// Compress the string:
+	AString res;
+	CompressString(ToCompress.data(), ToCompress.size(), res, CompressionLevel);
+	S.Push(res);
+	return 1;
+}
+
+
+
+
+
+static int tolua_UncompressStringZLIB(lua_State * tolua_S)
+{
+	cLuaState S(tolua_S);
+	if (
+		!S.CheckParamString(1) ||
+		!S.CheckParamNumber(2)
+	)
+	{
+		cLuaState::LogStackTrace(tolua_S);
+		return 0;
+	}
+
+	// Get the params:
+	AString ToUncompress;
+	int UncompressedSize;
+	S.GetStackValues(1, ToUncompress, UncompressedSize);
+
+	// Compress the string:
+	AString res;
+	UncompressString(ToUncompress.data(), ToUncompress.size(), res, UncompressedSize);
+	S.Push(res);
+	return 1;
+}
+
+
+
+
+
+static int tolua_CompressStringGZIP(lua_State * tolua_S)
+{
+	cLuaState S(tolua_S);
+	if (
+		!S.CheckParamString(1) ||
+		!S.CheckParamEnd(2)
+	)
+	{
+		cLuaState::LogStackTrace(tolua_S);
+		return 0;
+	}
+
+	// Get the params:
+	AString ToCompress;
+	S.GetStackValues(1, ToCompress);
+
+	// Compress the string:
+	AString res;
+	CompressStringGZIP(ToCompress.data(), ToCompress.size(), res);
+	S.Push(res);
+	return 1;
+}
+
+
+
+
+
+static int tolua_UncompressStringGZIP(lua_State * tolua_S)
+{
+	cLuaState S(tolua_S);
+	if (
+		!S.CheckParamString(1) ||
+		!S.CheckParamEnd(2)
+	)
+	{
+		cLuaState::LogStackTrace(tolua_S);
+		return 0;
+	}
+
+	// Get the params:
+	AString ToUncompress;
+	S.GetStackValues(1, ToUncompress);
+
+	// Compress the string:
+	AString res;
+	UncompressStringGZIP(ToUncompress.data(), ToUncompress.size(), res);
+	S.Push(res);
+	return 1;
+}
+
+
+
+
+
+static int tolua_InflateString(lua_State * tolua_S)
+{
+	cLuaState S(tolua_S);
+	if (
+		!S.CheckParamString(1) ||
+		!S.CheckParamEnd(2)
+	)
+	{
+		cLuaState::LogStackTrace(tolua_S);
+		return 0;
+	}
+
+	// Get the params:
+	AString ToUncompress;
+	S.GetStackValues(1, ToUncompress);
+
+	// Compress the string:
+	AString res;
+	InflateString(ToUncompress.data(), ToUncompress.size(), res);
+	S.Push(res);
+	return 1;
+}
+
+
+
+
+
 static int tolua_StringSplit(lua_State * tolua_S)
 {
 	cLuaState LuaState(tolua_S);
@@ -165,6 +309,14 @@ static AString GetLogMessage(lua_State * tolua_S)
 
 static int tolua_LOG(lua_State * tolua_S)
 {
+	// If there's no param, spit out an error message instead of crashing:
+	if (lua_isnil(tolua_S, 1))
+	{
+		LOGWARNING("Attempting to LOG a nil value!");
+		cLuaState::LogStackTrace(tolua_S);
+		return 0;
+	}
+
 	// If the param is a cCompositeChat, read the log level from it:
 	cLogger::eLogLevel LogLevel = cLogger::llRegular;
 	tolua_Error err;
@@ -184,6 +336,14 @@ static int tolua_LOG(lua_State * tolua_S)
 
 static int tolua_LOGINFO(lua_State * tolua_S)
 {
+	// If there's no param, spit out an error message instead of crashing:
+	if (lua_isnil(tolua_S, 1))
+	{
+		LOGWARNING("Attempting to LOGINFO a nil value!");
+		cLuaState::LogStackTrace(tolua_S);
+		return 0;
+	}
+
 	cLogger::GetInstance().LogSimple(GetLogMessage(tolua_S).c_str(), cLogger::llInfo);
 	return 0;
 }
@@ -194,6 +354,14 @@ static int tolua_LOGINFO(lua_State * tolua_S)
 
 static int tolua_LOGWARN(lua_State * tolua_S)
 {
+	// If there's no param, spit out an error message instead of crashing:
+	if (lua_isnil(tolua_S, 1))
+	{
+		LOGWARNING("Attempting to LOGWARN a nil value!");
+		cLuaState::LogStackTrace(tolua_S);
+		return 0;
+	}
+
 	cLogger::GetInstance().LogSimple(GetLogMessage(tolua_S).c_str(), cLogger::llWarning);
 	return 0;
 }
@@ -204,6 +372,14 @@ static int tolua_LOGWARN(lua_State * tolua_S)
 
 static int tolua_LOGERROR(lua_State * tolua_S)
 {
+	// If there's no param, spit out an error message instead of crashing:
+	if (lua_isnil(tolua_S, 1))
+	{
+		LOGWARNING("Attempting to LOGERROR a nil value!");
+		cLuaState::LogStackTrace(tolua_S);
+		return 0;
+	}
+
 	cLogger::GetInstance().LogSimple(GetLogMessage(tolua_S).c_str(), cLogger::llError);
 	return 0;
 }
@@ -256,7 +432,7 @@ static int tolua_Base64Decode(lua_State * tolua_S)
 
 
 
-static cPluginLua * GetLuaPlugin(lua_State * L)
+cPluginLua * GetLuaPlugin(lua_State * L)
 {
 	// Get the plugin identification out of LuaState:
 	lua_getglobal(L, LUA_PLUGIN_INSTANCE_VAR_NAME);
@@ -2171,11 +2347,16 @@ static int tolua_cPlugin_Call(lua_State * tolua_S)
 
 
 
-static int tolua_md5(lua_State* tolua_S)
+static int tolua_md5(lua_State * tolua_S)
 {
+	// Calculate the raw md5 checksum byte array:
 	unsigned char Output[16];
 	size_t len = 0;
 	const unsigned char * SourceString = (const unsigned char *)lua_tolstring(tolua_S, 1, &len);
+	if (SourceString == nullptr)
+	{
+		return 0;
+	}
 	md5(SourceString, len, Output);
 	lua_pushlstring(tolua_S, (const char *)Output, ARRAYCOUNT(Output));
 	return 1;
@@ -2185,6 +2366,91 @@ static int tolua_md5(lua_State* tolua_S)
 
 
 
+/** Does the same as tolua_md5, but reports that the usage is obsolete and the plugin should use cCrypto.md5(). */
+static int tolua_md5_obsolete(lua_State * tolua_S)
+{
+	LOGWARNING("Using md5() is obsolete, please change your plugin to use cCryptoHash.md5()");
+	cLuaState::LogStackTrace(tolua_S);
+	return tolua_md5(tolua_S);
+}
+
+
+
+
+
+static int tolua_md5HexString(lua_State * tolua_S)
+{
+	// Calculate the raw md5 checksum byte array:
+	unsigned char md5Output[16];
+	size_t len = 0;
+	const unsigned char * SourceString = (const unsigned char *)lua_tolstring(tolua_S, 1, &len);
+	if (SourceString == nullptr)
+	{
+		return 0;
+	}
+	md5(SourceString, len, md5Output);
+
+	// Convert the md5 checksum to hex string:
+	std::stringstream Output;
+	Output << std::hex << std::setfill('0');
+	for (size_t i = 0; i < ARRAYCOUNT(md5Output); i++)
+	{
+		Output << std::setw(2) << static_cast<unsigned short>(md5Output[i]);  // Need to cast to a number, otherwise a char is output
+	}
+	lua_pushlstring(tolua_S, Output.str().c_str(), Output.str().size());
+	return 1;
+}
+
+
+
+
+
+static int tolua_sha1(lua_State * tolua_S)
+{
+	// Calculate the raw SHA1 checksum byte array from the input string:
+	unsigned char Output[20];
+	size_t len = 0;
+	const unsigned char * SourceString = (const unsigned char *)lua_tolstring(tolua_S, 1, &len);
+	if (SourceString == nullptr)
+	{
+		return 0;
+	}
+	sha1(SourceString, len, Output);
+	lua_pushlstring(tolua_S, (const char *)Output, ARRAYCOUNT(Output));
+	return 1;
+}
+
+
+
+
+
+static int tolua_sha1HexString(lua_State * tolua_S)
+{
+	// Calculate the raw SHA1 checksum byte array from the input string:
+	unsigned char sha1Output[20];
+	size_t len = 0;
+	const unsigned char * SourceString = (const unsigned char *)lua_tolstring(tolua_S, 1, &len);
+	if (SourceString == nullptr)
+	{
+		return 0;
+	}
+	sha1(SourceString, len, sha1Output);
+
+	// Convert the sha1 checksum to hex string:
+	std::stringstream Output;
+	Output << std::hex << std::setfill('0');
+	for (size_t i = 0; i < ARRAYCOUNT(sha1Output); i++)
+	{
+		Output << std::setw(2) << static_cast<unsigned short>(sha1Output[i]);  // Need to cast to a number, otherwise a char is output
+	}
+	lua_pushlstring(tolua_S, Output.str().c_str(), Output.str().size());
+	return 1;
+}
+
+
+
+
+
 static int tolua_push_StringStringMap(lua_State* tolua_S, std::map< std::string, std::string >& a_StringStringMap)
 {
 	lua_newtable(tolua_S);
@@ -3387,6 +3653,14 @@ static int tolua_cCompositeChat_UnderlineUrls(lua_State * tolua_S)
 void ManualBindings::Bind(lua_State * tolua_S)
 {
 	tolua_beginmodule(tolua_S, nullptr);
+
+		// Create the new classes:
+		tolua_usertype(tolua_S, "cCryptoHash");
+		tolua_cclass(tolua_S, "cCryptoHash", "cCryptoHash", "", nullptr);
+		tolua_usertype(tolua_S, "cStringCompression");
+		tolua_cclass(tolua_S, "cStringCompression", "cStringCompression", "", nullptr);
+
+		// Globals:
 		tolua_function(tolua_S, "Clamp",              tolua_Clamp);
 		tolua_function(tolua_S, "StringSplit",        tolua_StringSplit);
 		tolua_function(tolua_S, "StringSplitAndTrim", tolua_StringSplitAndTrim);
@@ -3397,6 +3671,7 @@ void ManualBindings::Bind(lua_State * tolua_S)
 		tolua_function(tolua_S, "LOGERROR",           tolua_LOGERROR);
 		tolua_function(tolua_S, "Base64Encode",       tolua_Base64Encode);
 		tolua_function(tolua_S, "Base64Decode",       tolua_Base64Decode);
+		tolua_function(tolua_S, "md5",                tolua_md5_obsolete);  // OBSOLETE, use cCryptoHash.md5() instead
 		
 		tolua_beginmodule(tolua_S, "cFile");
 			tolua_function(tolua_S, "GetFolderContents", tolua_cFile_GetFolderContents);
@@ -3553,9 +3828,23 @@ void ManualBindings::Bind(lua_State * tolua_S)
 			tolua_function(tolua_S, "GetSlotCoords", Lua_ItemGrid_GetSlotCoords);
 		tolua_endmodule(tolua_S);
 
-		tolua_function(tolua_S, "md5", tolua_md5);
+		tolua_beginmodule(tolua_S, "cCryptoHash");
+			tolua_function(tolua_S, "md5", tolua_md5);
+			tolua_function(tolua_S, "md5HexString", tolua_md5HexString);
+			tolua_function(tolua_S, "sha1", tolua_sha1);
+			tolua_function(tolua_S, "sha1HexString", tolua_sha1HexString);
+		tolua_endmodule(tolua_S);
+		
+		tolua_beginmodule(tolua_S, "cStringCompression");
+			tolua_function(tolua_S, "CompressStringZLIB",     tolua_CompressStringZLIB);
+			tolua_function(tolua_S, "UncompressStringZLIB",   tolua_UncompressStringZLIB);
+			tolua_function(tolua_S, "CompressStringGZIP",     tolua_CompressStringGZIP);
+			tolua_function(tolua_S, "UncompressStringGZIP",   tolua_UncompressStringGZIP);
+			tolua_function(tolua_S, "InflateString",          tolua_InflateString);
+		tolua_endmodule(tolua_S);
 		
 		BindRankManager(tolua_S);
+		BindNetwork(tolua_S);
 
 	tolua_endmodule(tolua_S);
 }