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.

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

Fix RCE Vulnerability #32

Merged
merged 4 commits into from
Jan 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Prometheus.Client.AspNetCore.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ VisualStudioVersion = 15.0.26228.4
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D994EEE1-3786-4FDF-8A49-76D8B9819A29}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prometheus.Client.AspNetCore", "src\Prometheus.Client.AspNetCore\Prometheus.Client.AspNetCore.csproj", "{B70120FA-53E2-4290-8DF2-BD3AF7139DCB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{FA0CD8D2-E9AE-4518-B989-17901C5928B0}"
ProjectSection(SolutionItems) = preProject
.gitattributes = .gitattributes
Expand All @@ -28,27 +26,29 @@ EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{D3EB5CE6-053E-4CB3-A828-A987DA33BC3C}"
ProjectSection(SolutionItems) = preProject
.github\workflows\branch.yml = .github\workflows\branch.yml
.github\workflows\pr.yml = .github\workflows\pr.yml
.github\workflows\master.yml = .github\workflows\master.yml
.github\workflows\production.yml = .github\workflows\production.yml
.github\workflows\prod.yml = .github\workflows\prod.yml
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prometheus.Client.AspNetCore", "src\Prometheus.Client.AspNetCore.csproj", "{9CEA986B-142E-4A8A-87B4-A6C2A5B7106B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B70120FA-53E2-4290-8DF2-BD3AF7139DCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B70120FA-53E2-4290-8DF2-BD3AF7139DCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B70120FA-53E2-4290-8DF2-BD3AF7139DCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B70120FA-53E2-4290-8DF2-BD3AF7139DCB}.Release|Any CPU.Build.0 = Release|Any CPU
{9CEA986B-142E-4A8A-87B4-A6C2A5B7106B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9CEA986B-142E-4A8A-87B4-A6C2A5B7106B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9CEA986B-142E-4A8A-87B4-A6C2A5B7106B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9CEA986B-142E-4A8A-87B4-A6C2A5B7106B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{B70120FA-53E2-4290-8DF2-BD3AF7139DCB} = {D994EEE1-3786-4FDF-8A49-76D8B9819A29}
{D3EB5CE6-053E-4CB3-A828-A987DA33BC3C} = {255858DA-9CD1-49FD-BA65-010985E26F2A}
{9CEA986B-142E-4A8A-87B4-A6C2A5B7106B} = {D994EEE1-3786-4FDF-8A49-76D8B9819A29}
EndGlobalSection
EndGlobal
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@

Extension for [Prometheus.Client](https://github.com/prom-client-net/prom-client)

## Installation

#### Installation:
```sh
dotnet add package Prometheus.Client.AspNetCore
```
#### Quik start:

## Use

There are [Examples](https://github.com/prom-client-net/prom-examples/tree/master/Middleware/WebAspNetCore_2.0)

Expand All @@ -40,6 +41,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
}

```

## Contribute

Contributions to the package are always welcome!
Expand All @@ -60,4 +62,3 @@ If you like what I'm accomplishing, feel free to buy me a coffee
## License

All contents of this package are licensed under the [MIT license](https://opensource.org/licenses/MIT).

Original file line number Diff line number Diff line change
@@ -1,37 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>ASP.NET Core middleware for the Prometheus.Client</Description>
<VersionPrefix>4.5.0</VersionPrefix>
<VersionPrefix>4.5.1</VersionPrefix>
<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<AssemblyName>Prometheus.Client.AspNetCore</AssemblyName>
<PackageId>Prometheus.Client.AspNetCore</PackageId>
<PackageTags>prometheus;metrics</PackageTags>
<PackageIcon>icon.png</PackageIcon>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/prom-client-net/prom-client-aspnetcore</RepositoryUrl>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../Prometheus.Client.AspNetCore.snk</AssemblyOriginatorKeyFile>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<AssemblyOriginatorKeyFile>../Prometheus.Client.AspNetCore.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<None Include="../../icon.png">
<Pack>true</Pack>
<Visible>false</Visible>
<PackagePath></PackagePath>
</None>
<None Include="../icon.png" Visible="false" Pack="true" PackagePath="" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Prometheus.Client" Version="[4.5.1,5.0.0)" />
<PackageReference Include="Prometheus.Client" Version="[4.5.3,5.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net5.0'">
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.1' AND '$(TargetFramework)' != 'net5.0'">
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.5.1" />
</ItemGroup>
</Project>
File renamed without changes.