Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIXBUG #4461 UriProtocol function is case sensitive #144

Merged
merged 2 commits into from May 23, 2015
Merged

WIXBUG #4461 UriProtocol function is case sensitive #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77c4e3b
Created tests for and corrected two issues with the UriProtocol funct…
amoravec Sep 2, 2014
be629cb
pull request feedback, moved additional dependencies to project wide …
amoravec Sep 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 32 additions & 9 deletions src/libs/dutil/uriutil.cpp
View file
Open in desktop
Expand Up @@ -303,28 +303,51 @@ extern "C" HRESULT DAPI UriProtocol(

HRESULT hr = S_OK;

if (L'f' == wzUri[0] && L'i' == wzUri[1] && L'l' == wzUri[2] && L'e' == wzUri[3] && L':' == wzUri[4] && L'/' == wzUri[5] && L'/' == wzUri[6])
if ((L'h' == wzUri[0] || L'H' == wzUri[0]) &&
(L't' == wzUri[1] || L'T' == wzUri[1]) &&
(L't' == wzUri[2] || L'T' == wzUri[2]) &&
(L'p' == wzUri[3] || L'P' == wzUri[3]) &&
(L's' == wzUri[4] || L'S' == wzUri[4]) &&
L':' == wzUri[5] &&
L'/' == wzUri[6] &&
L'/' == wzUri[7])
{
*pProtocol = URI_PROTOCOL_FILE;
*pProtocol = URI_PROTOCOL_HTTPS;
}
else if (L'f' == wzUri[0] && L't' == wzUri[1] && L'p' == wzUri[2] && L':' == wzUri[3] && L'/' == wzUri[4] && L'/' == wzUri[5])
else if ((L'h' == wzUri[0] || L'H' == wzUri[0]) &&
(L't' == wzUri[1] || L'T' == wzUri[1]) &&
(L't' == wzUri[2] || L'T' == wzUri[2]) &&
(L'p' == wzUri[3] || L'P' == wzUri[3]) &&
L':' == wzUri[4] &&
L'/' == wzUri[5] &&
L'/' == wzUri[6])
{
*pProtocol = URI_PROTOCOL_FILE;
*pProtocol = URI_PROTOCOL_HTTP;
}
else if (L'h' == wzUri[0] && L't' == wzUri[1] && L't' == wzUri[2] && L'p' == wzUri[3] && L':' == wzUri[4] && L'/' == wzUri[5] && L'/' == wzUri[6])
else if ((L'f' == wzUri[0] || L'F' == wzUri[0]) &&
(L't' == wzUri[1] || L'T' == wzUri[1]) &&
(L'p' == wzUri[2] || L'P' == wzUri[2]) &&
L':' == wzUri[3] &&
L'/' == wzUri[4] &&
L'/' == wzUri[5])
{
*pProtocol = URI_PROTOCOL_HTTP;
*pProtocol = URI_PROTOCOL_FTP;
}
else if (L'h' == wzUri[0] && L't' == wzUri[1] && L't' == wzUri[2] && L'p' == wzUri[3] && L'S' == wzUri[4] && L':' == wzUri[5] && L'/' == wzUri[6] && L'/' == wzUri[7])
else if ((L'f' == wzUri[0] || L'F' == wzUri[0]) &&
(L'i' == wzUri[1] || L'I' == wzUri[1]) &&
(L'l' == wzUri[2] || L'L' == wzUri[2]) &&
(L'e' == wzUri[3] || L'E' == wzUri[3]) &&
L':' == wzUri[4] &&
L'/' == wzUri[5] &&
L'/' == wzUri[6])
{
*pProtocol = URI_PROTOCOL_HTTPS;
*pProtocol = URI_PROTOCOL_FILE;
}
else
{
*pProtocol = URI_PROTOCOL_UNKNOWN;
}

//LExit:
return hr;
}

Expand Down
3 changes: 2 additions & 1 deletion test/src/UnitTests/dutil/DUtilUnitTest.vcxproj
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.props" />
<PropertyGroup>
<ProjectAdditionalIncludeDirectories>$(WixRoot)src\libs\dutil\inc</ProjectAdditionalIncludeDirectories>
<ProjectAdditionalLinkLibraries>rpcrt4.lib;dutil.lib</ProjectAdditionalLinkLibraries>
<ProjectAdditionalLinkLibraries>rpcrt4.lib;dutil.lib;urlmon.lib;wininet.lib</ProjectAdditionalLinkLibraries>
</PropertyGroup>
<ItemGroup>
<ClCompile Include="AssemblyInfo.cpp" />
Expand All @@ -40,6 +40,7 @@
<ClCompile Include="IniUtilTest.cpp" />
<ClCompile Include="MemUtilTest.cpp" />
<ClCompile Include="StrUtilTest.cpp" />
<ClCompile Include="UriUtilTest.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="precomp.h" />
Expand Down
3 changes: 3 additions & 0 deletions test/src/UnitTests/dutil/DUtilUnitTest.vcxproj.filters
View file
Open in desktop
Expand Up @@ -39,6 +39,9 @@
<ClCompile Include="$(WixRoot)src\common\precomp.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="UriUtilTest.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="UnitTest.rc">
Expand Down
103 changes: 103 additions & 0 deletions test/src/UnitTests/dutil/UriUtilTest.cpp
View file
Open in desktop
@@ -0,0 +1,103 @@
//-------------------------------------------------------------------------------------------------
// <copyright file="StrUtilTest.cpp" company="Outercurve Foundation">
// Copyright (c) 2004, Outercurve Foundation.
// This software is released under Microsoft Reciprocal License (MS-RL).
// The license and further copyright text can be found in the file
// LICENSE.TXT at the root directory of the distribution.
// </copyright>
//-------------------------------------------------------------------------------------------------

#include "precomp.h"

using namespace System;
using namespace System::Text;
using namespace System::Collections::Generic;
using namespace Xunit;

namespace CfgTests
{
public ref class UriUtil
{
public:
[Fact]
void UriProtocolTest()
{
HRESULT hr = S_OK;

LPCWSTR uri = L"https://localhost/";
URI_PROTOCOL uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
hr = UriProtocol(uri, &uriProtocol);
ExitOnFailure(hr, "Failed to determine UriProtocol");
Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_HTTPS, (int)uriProtocol);

uri = L"HTTPS://localhost/";
uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
hr = UriProtocol(uri, &uriProtocol);
ExitOnFailure(hr, "Failed to determine UriProtocol");
Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_HTTPS, (int)uriProtocol);

uri = L"HtTpS://localhost/";
uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
hr = UriProtocol(uri, &uriProtocol);
ExitOnFailure(hr, "Failed to determine UriProtocol");
Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_HTTPS, (int)uriProtocol);

uri = L"HTTP://localhost/";
uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
hr = UriProtocol(uri, &uriProtocol);
ExitOnFailure(hr, "Failed to determine UriProtocol");
Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_HTTP, (int)uriProtocol);

uri = L"http://localhost/";
uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
hr = UriProtocol(uri, &uriProtocol);
ExitOnFailure(hr, "Failed to determine UriProtocol");
Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_HTTP, (int)uriProtocol);

uri = L"HtTp://localhost/";
uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
hr = UriProtocol(uri, &uriProtocol);
ExitOnFailure(hr, "Failed to determine UriProtocol");
Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_HTTP, (int)uriProtocol);

uri = L"file://localhost/";
uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
hr = UriProtocol(uri, &uriProtocol);
ExitOnFailure(hr, "Failed to determine UriProtocol");
Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_FILE, (int)uriProtocol);

uri = L"FILE://localhost/";
uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
hr = UriProtocol(uri, &uriProtocol);
ExitOnFailure(hr, "Failed to determine UriProtocol");
Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_FILE, (int)uriProtocol);

uri = L"FiLe://localhost/";
uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
hr = UriProtocol(uri, &uriProtocol);
ExitOnFailure(hr, "Failed to determine UriProtocol");
Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_FILE, (int)uriProtocol);

uri = L"FTP://localhost/";
uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
hr = UriProtocol(uri, &uriProtocol);
ExitOnFailure(hr, "Failed to determine UriProtocol");
Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_FTP, (int)uriProtocol);

uri = L"ftp://localhost/";
uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
hr = UriProtocol(uri, &uriProtocol);
ExitOnFailure(hr, "Failed to determine UriProtocol");
Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_FTP, (int)uriProtocol);

uri = L"FtP://localhost/";
uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
hr = UriProtocol(uri, &uriProtocol);
ExitOnFailure(hr, "Failed to determine UriProtocol");
Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_FTP, (int)uriProtocol);

LExit:
;
}
};
}
1 change: 1 addition & 0 deletions test/src/UnitTests/dutil/precomp.h
View file
Open in desktop
Expand Up @@ -28,6 +28,7 @@
#include <memutil.h>
#include <pathutil.h>
#include <strutil.h>
#include <uriutil.h>

#pragma managed
#include <vcclr.h>