Add HTTPS using OpenSSL (#32)

* Switch over to toml11 * Remove cpptoml * Switch over to using a separate internal representation for the recipe to maintain order and allow for comments * Round trip comments * Fix value bug * Switch to iniailize command * Match new update/create package api * Add basic auth api * Fix breaking issues in latest msvc * Fix some stuff * Add (disabled) botan client * Add missing exports * Add missing exports * Enable HTTPS requests * Add console manager to read password * Better status results for api * Cleanup messages Co-authored-by: Matthew Asplund <[email protected]>
SoupBuild · Apr 19, 2020 · 6b9b88c · 6b9b88c
1 parent 6ca4ecb
commit 6b9b88c
Show file tree

Hide file tree

Showing 79 changed files with 2,347 additions and 363 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,5 @@
 
 # Build
 out/
+bin/
+obj/
diff --git a/.gitmodules b/.gitmodules
@@ -12,13 +12,16 @@
 	url = https://github.com/mwasplund/Json11.git
 [submodule "Dependencies/toml11"]
 	path = Dependencies/toml11
-	url = https://github.com/mwasplund/toml11.git
-[submodule "Dependencies/cpptoml"]
-	path = Dependencies/cpptoml
-	url = https://github.com/mwasplund/cpptoml.git
+	url = https://github.com/mwasplund/toml11.gits
 [submodule "Dependencies/cpp-httplib"]
 	path = Dependencies/cpp-httplib
 	url = https://github.com/mwasplund/cpp-httplib.git
 [submodule "Dependencies/LzmaSdk"]
 	path = Dependencies/LzmaSdk
 	url = https://github.com/mwasplund/LzmaSdk.git
+[submodule "Dependencies/botan"]
+	path = Dependencies/botan
+	url = https://github.com/mwasplund/botan.git
+[submodule "Dependencies/openssl"]
+	path = Dependencies/openssl
+	url = https://github.com/openssl/openssl.git
diff --git a/Dependencies/LzmaSdk b/Dependencies/LzmaSdk
diff --git a/Dependencies/SoupTest b/Dependencies/SoupTest
diff --git a/Dependencies/cpp-httplib b/Dependencies/cpp-httplib
diff --git a/Dependencies/cpptoml b/Dependencies/cpptoml
diff --git a/Dependencies/openssl b/Dependencies/openssl
diff --git a/Dependencies/toml11 b/Dependencies/toml11
diff --git a/Docs/DeveloperSetup.md b/Docs/DeveloperSetup.md
@@ -8,15 +8,30 @@
   * [Build Tools For Visual Studio 2019](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2019) with "c++ build tools" workload.
 * [Latest Release](https://github.com/mwasplund/Soup/releases)
 
+### OpenSSL Requirements
+* Perl. We recommend ActiveState Perl, available from https://www.activestate.com/ActivePerl
+* Netwide Assembler, a.k.a. NASM, available from https://www.nasm.us
+
 ## Setup
 Clone the repository and all submodules recursively.
 
 ```
 git clone --recursive https://github.com/mwasplund/Soup.git
 ```
 
-## Build the client
+## Build
+
+### Build openssl
+using x64 Native Tools Command Prompt for VS 2019
+```
+cd Dependencies/openssl
+PATH=%PATH%;"C:\Program Files\NASM"
+perl Configure VC-WIN64A
+nmake
+nmake test
+```
 
+### Build the Client
 ```
 cd Source/Client
 soup build

diff --git a/Source/Client/Commands/BuildCommand.h b/Source/Client/Commands/BuildCommand.h
@@ -124,6 +124,8 @@ namespace Soup::Client
 			// arguments.PlatformLibraries.push_back(Path("odbc32.lib"));
 			// arguments.PlatformLibraries.push_back(Path("odbccp32.lib"));
 
+			arguments.PlatformLibraries.push_back("crypt32.lib");
+
 			std::string runtimeCompiler = config.GetRuntimeCompiler();
 			std::string systemCompiler = runtimeCompiler;
 

diff --git a/Source/Client/Commands/InitializeCommand.h b/Source/Client/Commands/InitializeCommand.h
@@ -68,7 +68,7 @@ int main()
 	private:
 		void UpdateDefaultValues(Recipe& recipe)
 		{
-			Log::HighPriority("Name: (" + std::string(recipe.GetName()) + ")");
+			Log::HighPriority("Name: (" + recipe.GetName() + ")");
 			auto newName = std::string();
 			std::getline(std::cin, newName);
 			if (!newName.empty())

diff --git a/Source/Client/Commands/RunCommand.h b/Source/Client/Commands/RunCommand.h
@@ -54,7 +54,7 @@ namespace Soup::Client
 			auto configuration = "release";
 			auto compilerName = config.GetRuntimeCompiler();
 			auto binaryDirectory = RecipeExtensions::GetBinaryDirectory(compilerName, configuration);
-			auto executablePath = workingDirectory + binaryDirectory + Path(std::string(recipe.GetName()) + ".exe");
+			auto executablePath = workingDirectory + binaryDirectory + Path(recipe.GetName() + ".exe");
 			Log::Info(executablePath.ToString());
 			if (!System::IFileSystem::Current().Exists(executablePath))
 			{

diff --git a/Source/Client/Commands/VersionCommand.h b/Source/Client/Commands/VersionCommand.h
@@ -31,7 +31,7 @@ namespace Soup::Client
 
 			// TODO var version = Assembly.GetExecutingAssembly().GetName().Version;
 			// Log::Message($"{version.Major}.{version.Minor}.{version.Build}");
-			Log::HighPriority("0.5.7");
+			Log::HighPriority("0.6.0");
 		}
 
 	private:

diff --git a/Source/Client/Options/ArgumentsParser.h b/Source/Client/Options/ArgumentsParser.h
@@ -68,7 +68,7 @@ namespace Soup::Client
 
 				result = std::move(options);
 			}
-			else if (commandType == "init")
+			else if (commandType == "initialize")
 			{
 				Log::Diag("Parse initialize");
 

diff --git a/Source/Client/Options/InitializeOptions.h b/Source/Client/Options/InitializeOptions.h
@@ -10,7 +10,7 @@ namespace Soup::Client
 	/// <summary>
 	/// Initialize Command Options
 	/// </summary>
-	// TODO: [Verb("init")]
+	// TODO: [Verb("initialize")]
 	class InitializeOptions : public SharedOptions
 	{
 	};

diff --git a/Source/Client/Program.h b/Source/Client/Program.h
@@ -53,6 +53,7 @@ namespace Soup::Client
 				Network::INetworkManager::Register(std::make_shared<Network::HttpLibNetworkManager>());
 				System::IFileSystem::Register(std::make_shared<System::STLFileSystem>());
 				System::IProcessManager::Register(std::make_shared<System::PlatformProcessManager>());
+				IO::IConsoleManager::Register(std::make_shared<IO::SystemConsoleManager>());
 
 				// Attempt to parse the provided arguments
 				Log::Diag("ProgramStart");
@@ -91,7 +92,7 @@ namespace Soup::Client
 				else if (arguments.IsA<ViewOptions>())
 					command = Setup(arguments.ExtractResult<ViewOptions>());
 				else
-					throw std::runtime_error("Unknown arguments.");
+					throw std::runtime_error("Unknown arguments");
 
 				// Run the requested command
 				Log::Diag("Run Command");
@@ -101,7 +102,7 @@ namespace Soup::Client
 			}
 			catch (const std::exception& ex)
 			{
-				Log::Error("Exception Handled: Exiting.");
+				Log::Error("Exception Handled: Exiting");
 				Log::Error(ex.what());
 				return -2;
 			}

diff --git a/Source/Client/Recipe.toml b/Source/Client/Recipe.toml
@@ -1,5 +1,5 @@
 Name = "Soup"
-Version = "0.5.6"
+Version = "0.6.0"
 Type = "Executable"
 
 # Ensure the core build extensions are runtime dependencies

diff --git a/Source/Compiler/MSVC.UnitTests/CompilerArgumentBuilderTests.h b/Source/Compiler/MSVC.UnitTests/CompilerArgumentBuilderTests.h
@@ -65,6 +65,7 @@ namespace Soup::Compiler::MSVC::UnitTests
 
 			auto expectedArguments = std::vector<std::string>({
 				"/nologo",
+				"/Zc:__cplusplus",
 				"/std:c++11",
 				"/Od",
 				"/X",
@@ -107,6 +108,7 @@ namespace Soup::Compiler::MSVC::UnitTests
 
 			auto expectedArguments = std::vector<std::string>({
 				"/nologo",
+				"/Zc:__cplusplus",
 				"/showIncludes",
 				"/std:c++11",
 				"/Od",
@@ -153,6 +155,7 @@ namespace Soup::Compiler::MSVC::UnitTests
 
 			auto expectedArguments = std::vector<std::string>({
 				"/nologo",
+				"/Zc:__cplusplus",
 				expectedFlag,
 				"/Od",
 				"/X",
@@ -195,6 +198,7 @@ namespace Soup::Compiler::MSVC::UnitTests
 
 			auto expectedArguments = std::vector<std::string>({
 				"/nologo",
+				"/Zc:__cplusplus",
 				"/std:c++latest",
 				"/experimental:module",
 				"/Od",
@@ -239,6 +243,7 @@ namespace Soup::Compiler::MSVC::UnitTests
 
 			auto expectedArguments = std::vector<std::string>({
 				"/nologo",
+				"/Zc:__cplusplus",
 				"/std:c++17",
 				"/Od",
 				"/X",
@@ -284,6 +289,7 @@ namespace Soup::Compiler::MSVC::UnitTests
 
 			auto expectedArguments = std::vector<std::string>({
 				"/nologo",
+				"/Zc:__cplusplus",
 				"/std:c++17",
 				expectedFlag,
 				"/X",
@@ -328,6 +334,7 @@ namespace Soup::Compiler::MSVC::UnitTests
 
 			auto expectedArguments = std::vector<std::string>({
 				"/nologo",
+				"/Zc:__cplusplus",
 				"/Z7",
 				"/std:c++17",
 				"/Od",
@@ -374,6 +381,7 @@ namespace Soup::Compiler::MSVC::UnitTests
 
 			auto expectedArguments = std::vector<std::string>({
 				"/nologo",
+				"/Zc:__cplusplus",
 				"/std:c++11",
 				"/Od",
 				"/I\"C:/Files/SDK/\"",
@@ -421,6 +429,7 @@ namespace Soup::Compiler::MSVC::UnitTests
 
 			auto expectedArguments = std::vector<std::string>({
 				"/nologo",
+				"/Zc:__cplusplus",
 				"/std:c++11",
 				"/Od",
 				"/DDEBUG",
@@ -468,6 +477,7 @@ namespace Soup::Compiler::MSVC::UnitTests
 
 			auto expectedArguments = std::vector<std::string>({
 				"/nologo",
+				"/Zc:__cplusplus",
 				"/std:c++11",
 				"/Od",
 				"/X",
@@ -516,13 +526,14 @@ namespace Soup::Compiler::MSVC::UnitTests
 
 			auto expectedArguments = std::vector<std::string>({
 				"/nologo",
+				"/Zc:__cplusplus",
 				"/std:c++11",
 				"/Od",
 				"/X",
 				"/RTC1",
 				"/EHsc",
 				"/MT",
-				"/module:export",
+				"/module:interface",
 				"/module:output",
 				"\"module.ifc\"",
 				"/bigobj",

diff --git a/Source/Compiler/MSVC.UnitTests/CompilerTests.h b/Source/Compiler/MSVC.UnitTests/CompilerTests.h
@@ -46,7 +46,7 @@ namespace Soup::Compiler::MSVC::UnitTests
 				new Build::BuildGraphNode(
 					"File.cpp",
 					"bin/mock.cl.exe",
-					"/nologo /std:c++11 /Od /X /RTC1 /EHsc /MT /bigobj /c File.cpp /Fo\"obj/File.obj\"",
+					"/nologo /Zc:__cplusplus /std:c++11 /Od /X /RTC1 /EHsc /MT /bigobj /c File.cpp /Fo\"obj/File.obj\"",
 					"Source",
 					std::vector<std::string>({
 						"File.cpp",
@@ -90,7 +90,7 @@ namespace Soup::Compiler::MSVC::UnitTests
 				new Build::BuildGraphNode(
 					"File.cpp",
 					"bin/mock.cl.exe",
-					"/nologo /std:c++11 /Od /I\"Includes\" /DDEBUG /X /RTC1 /EHsc /MT /module:reference \"Module.pcm\" /module:export /module:output \"obj/File.ifc\" /bigobj /c File.cpp /Fo\"obj/File.obj\"",
+					"/nologo /Zc:__cplusplus /std:c++11 /Od /I\"Includes\" /DDEBUG /X /RTC1 /EHsc /MT /module:reference \"Module.pcm\" /module:interface /module:output \"obj/File.ifc\" /bigobj /c File.cpp /Fo\"obj/File.obj\"",
 					"Source",
 					std::vector<std::string>({
 						"Module.pcm",

diff --git a/Source/Compiler/MSVC/ArgumentBuilder.h b/Source/Compiler/MSVC/ArgumentBuilder.h
@@ -64,6 +64,9 @@ namespace Soup::Compiler::MSVC
 			// Disable the logo
 			AddFlag(commandArgs, ArgumentFlag_NoLogo);
 
+			// Get better support for _cplusplus macro version
+			AddParameter(commandArgs, "Zc", "__cplusplus");
+
 			// Enable Header includes if needed
 			if (args.GenerateIncludeTree)
 			{
@@ -153,7 +156,7 @@ namespace Soup::Compiler::MSVC
 
 			if (args.ExportModule)
 			{
-				AddParameter(commandArgs, Compiler_ArgumentParameter_Module, "export");
+				AddParameter(commandArgs, Compiler_ArgumentParameter_Module, "interface");
 
 				// Place the ifc in the output directory
 				//var outputFile = "{Path.GetFileNameWithoutExtension(sourceFile)}.{ModuleFileExtension}";