Skip to content

Commit

Permalink
Add some netsh tests (microsoft#295)
Browse files Browse the repository at this point in the history
Adds tests for "show sections" and "show disassembly"

Addresses part of issue microsoft#240

Signed-off-by: Dave Thaler <dthaler@ntdev.microsoft.com>
  • Loading branch information
dthaler authored Jun 23, 2021
1 parent c31547c commit 360aa22
Show file tree
Hide file tree
Showing 15 changed files with 565 additions and 12 deletions.
30 changes: 30 additions & 0 deletions ebpf-for-windows.sln
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_util", "tests\libs\util\test_util.vcxproj", "{D6725F19-B9BF-435F-80F2-C5F3EF0F4B8F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit_tests", "tests\unit\test.vcxproj", "{A4037E5D-B00C-4AF1-9398-76B3ECE95F62}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ebpfnetsh", "libs\ebpfnetsh\ebpfnetsh.vcxproj", "{370E7D53-C97F-4077-A3D5-620C4FD87EED}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -956,6 +957,34 @@ Global
{A4037E5D-B00C-4AF1-9398-76B3ECE95F62}.RelWithDebInfo|x64.Build.0 = Release|x64
{A4037E5D-B00C-4AF1-9398-76B3ECE95F62}.RelWithDebInfo|x86.ActiveCfg = Release|Win32
{A4037E5D-B00C-4AF1-9398-76B3ECE95F62}.RelWithDebInfo|x86.Build.0 = Release|Win32
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.Debug|ARM.ActiveCfg = Debug|Win32
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.Debug|ARM64.ActiveCfg = Debug|Win32
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.Debug|x64.ActiveCfg = Debug|x64
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.Debug|x64.Build.0 = Debug|x64
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.Debug|x86.ActiveCfg = Debug|Win32
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.Debug|x86.Build.0 = Debug|Win32
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.MinSizeRel|ARM.ActiveCfg = Debug|Win32
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.MinSizeRel|ARM.Build.0 = Debug|Win32
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.MinSizeRel|ARM64.ActiveCfg = Debug|Win32
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.MinSizeRel|ARM64.Build.0 = Debug|Win32
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.MinSizeRel|x64.ActiveCfg = Debug|x64
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.MinSizeRel|x64.Build.0 = Debug|x64
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.MinSizeRel|x86.ActiveCfg = Debug|Win32
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.MinSizeRel|x86.Build.0 = Debug|Win32
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.Release|ARM.ActiveCfg = Release|Win32
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.Release|ARM64.ActiveCfg = Release|Win32
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.Release|x64.ActiveCfg = Release|x64
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.Release|x64.Build.0 = Release|x64
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.Release|x86.ActiveCfg = Release|Win32
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.Release|x86.Build.0 = Release|Win32
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.RelWithDebInfo|ARM.ActiveCfg = Debug|Win32
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.RelWithDebInfo|ARM.Build.0 = Debug|Win32
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.RelWithDebInfo|ARM64.ActiveCfg = Debug|Win32
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.RelWithDebInfo|ARM64.Build.0 = Debug|Win32
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.RelWithDebInfo|x64.ActiveCfg = Release|x64
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.RelWithDebInfo|x64.Build.0 = Release|x64
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.RelWithDebInfo|x86.ActiveCfg = Release|Win32
{370E7D53-C97F-4077-A3D5-620C4FD87EED}.RelWithDebInfo|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -990,6 +1019,7 @@ Global
{3617528A-CB85-418B-82C1-E9CFC16755F6} = {492C9B22-9237-4996-9E33-CA14D3533616}
{D6725F19-B9BF-435F-80F2-C5F3EF0F4B8F} = {492C9B22-9237-4996-9E33-CA14D3533616}
{A4037E5D-B00C-4AF1-9398-76B3ECE95F62} = {492C9B22-9237-4996-9E33-CA14D3533616}
{370E7D53-C97F-4077-A3D5-620C4FD87EED} = {69CDB6A1-434D-4BC9-9BFF-D12DF7EDBB6B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3D5F862D-74C6-4357-9F95-0B152E33B7B8}
Expand Down
176 changes: 176 additions & 0 deletions libs/ebpfnetsh/ebpfnetsh.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) Microsoft Corporation
SPDX-License-Identifier: MIT
-->
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{370e7d53-c97f-4077-a3d5-620c4fd87eed}</ProjectGuid>
<RootNamespace>ebpfnetsh</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<ProjectName>netsh_static</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir)include</AdditionalIncludeDirectories>
<LanguageStandard>stdcpplatest</LanguageStandard>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>
</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir)include</AdditionalIncludeDirectories>
<LanguageStandard>stdcpplatest</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>
</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir)include</AdditionalIncludeDirectories>
<LanguageStandard>stdcpplatest</LanguageStandard>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>
</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir)include</AdditionalIncludeDirectories>
<LanguageStandard>stdcpplatest</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>
</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="elf.cpp" />
<ClCompile Include="programs.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="elf.h" />
<ClInclude Include="programs.h" />
<ClInclude Include="tokens.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
40 changes: 40 additions & 0 deletions libs/ebpfnetsh/ebpfnetsh.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) Microsoft Corporation
SPDX-License-Identifier: MIT
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="elf.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="programs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="elf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="programs.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="tokens.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
105 changes: 105 additions & 0 deletions tests/end_to_end/capture_helper.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
// Copyright (c) Microsoft Corporation
// SPDX-License-Identifier: MIT

#include <fcntl.h>
#include <fstream>
#include <io.h>
#include <iostream>
#include <sal.h>
#include <sstream>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <windows.h>
#include "capture_helper.hpp"

// This class can be used by tests to catch stdout and stderr output.

#define TEMPORARY_STDOUT_FILENAME ".\\stdout.txt"
#define TEMPORARY_STDERR_FILENAME ".\\stderr.txt"

std::string
capture_helper_t::get_stdout_contents(void)
{
end_capture();
return _stdout_contents;
}

std::string
capture_helper_t::get_stderr_contents(void)
{
end_capture();
return _stderr_contents;
}

errno_t
capture_helper_t::begin_fd_capture(_In_ FILE* fp, _Out_ int* original_fd, _In_z_ const char* temporary_filename)
{
// Create a temporary file.
int destination_fd;
errno_t err =
_sopen_s(&destination_fd, temporary_filename, _O_WRONLY | O_CREAT | O_TRUNC, _SH_DENYNO, _S_IREAD | _S_IWRITE);
if (err != 0) {
return err;
}

int standard_fileno = _fileno(fp);
fflush(fp);
*original_fd = _dup(standard_fileno);

// Redirect fp to the temporary file.
_dup2(destination_fd, standard_fileno);
_close(destination_fd);
return 0;
}

std::string
capture_helper_t::end_fd_capture(_In_ FILE* fp, _Inout_ int* original_fd, _In_z_ const char* temporary_filename)
{
if (*original_fd == -1) {
// Nothing to do.
return {};
}

// Restore standard fd to original.
int standard_fileno = _fileno(fp);
fflush(fp);
_dup2(*original_fd, standard_fileno);
_close(*original_fd);
*original_fd = -1;

// Read the contents of the temporary file.
std::ifstream stdout_fs(temporary_filename);
std::string contents((std::istreambuf_iterator<char>(stdout_fs)), std::istreambuf_iterator<char>());

// Clean up the temporary file.
_unlink(temporary_filename);

return contents;
}

errno_t
capture_helper_t::begin_capture(void)
{
errno_t error = begin_fd_capture(stdout, &_original_stdout_fd, TEMPORARY_STDOUT_FILENAME);
if (error != 0) {
return error;
}

error = begin_fd_capture(stderr, &_original_stderr_fd, TEMPORARY_STDERR_FILENAME);
if (error != 0) {
end_fd_capture(stdout, &_original_stdout_fd, TEMPORARY_STDOUT_FILENAME);
return error;
}

return 0;
}

void
capture_helper_t::end_capture(void)
{
_stdout_contents = end_fd_capture(stdout, &_original_stdout_fd, TEMPORARY_STDOUT_FILENAME);
_stderr_contents = end_fd_capture(stderr, &_original_stderr_fd, TEMPORARY_STDERR_FILENAME);
}

capture_helper_t::~capture_helper_t(void) { end_capture(); }
Loading

0 comments on commit 360aa22

Please sign in to comment.