Skip to content

Commit 3e6294d

Browse files
authored
[Fix] GithubVulnerability2V3 use only HTTPS (#10292)
1 parent 27bc6a6 commit 3e6294d

4 files changed

Lines changed: 3 additions & 17 deletions

File tree

src/GitHubVulnerabilities2v3/Extensions/BlobStorageVulnerabilityWriter.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ public async Task FlushAsync(string outputFileName = null)
8383

8484
var currentTime = DateTime.UtcNow.ToString(TimeFormat);
8585
var indexStorageUri = _storage.ResolveUri(_configuration.IndexFileName);
86-
StringBuilder updateUriPathBuilder = new StringBuilder();
87-
updateUriPathBuilder.Append(_configuration.V3VulnerabilityContainerName + "/");
8886

8987
if (runMode == RunMode.Update && !await _storage.ExistsAsync(indexStorageUri.ToString(), CancellationToken.None))
9088
{

src/GitHubVulnerabilities2v3/Job.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ protected void ConfigureCollectorServices(ContainerBuilder containerBuilder, ICo
131131
ctx.Resolve<BlobServiceClientFactory>(),
132132
ctx.Resolve<GitHubVulnerabilities2v3Configuration>().V3VulnerabilityContainerName,
133133
enablePublicAccess: true,
134-
ctx.Resolve<ILogger<AzureStorage>>());
134+
azureStorageLogger: ctx.Resolve<ILogger<AzureStorage>>());
135135
})
136136
.As<StorageFactory>()
137137
.As<IStorageFactory>();

src/NuGet.Services.Storage/AzureStorage.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,7 @@ public bool CompressContent
117117

118118
static Uri GetDirectoryUri(BlobContainerClient directory)
119119
{
120-
Uri uri = new UriBuilder(directory.Uri)
121-
{
122-
Scheme = "http",
123-
Port = 80
124-
}.Uri;
125-
126-
return uri;
120+
return directory.Uri;
127121
}
128122

129123
//Blob exists

src/NuGet.Services.Storage/AzureStorageFactory.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,7 @@ public AzureStorageFactory(
5050

5151
if (baseAddress == null)
5252
{
53-
Uri blobEndpoint = new UriBuilder(account.Uri)
54-
{
55-
Scheme = "http", // Convert base address to http. 'https' can be used for communication but is not part of the names.
56-
Port = 80
57-
}.Uri;
58-
59-
BaseAddress = new Uri(blobEndpoint, containerName + "/" + _path ?? string.Empty);
53+
BaseAddress = new Uri(account.Uri, containerName + "/" + _path ?? string.Empty);
6054
}
6155
else
6256
{

0 commit comments

Comments
 (0)