Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit f6cffd3

Browse files
author
Todd Lair
committed
Merge branch 'develop'
2 parents 2c8c089 + 461bbc5 commit f6cffd3

File tree

3 files changed

+43
-16
lines changed

3 files changed

+43
-16
lines changed

‎Src/StackifyLib/StackifyLib.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<AssemblyTitle>Stackify API</AssemblyTitle>
5-
<VersionPrefix>2.2.9</VersionPrefix>
5+
<VersionPrefix>2.2.10</VersionPrefix>
66
<TargetFrameworks>netstandard2.0;net40;net45;net451;net452;net46;net461;net462</TargetFrameworks>
77
<AssemblyName>StackifyLib</AssemblyName>
88
<PackageId>StackifyLib</PackageId>
@@ -13,15 +13,15 @@
1313
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1414
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1515
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
16-
<Version>2.2.9</Version>
16+
<Version>2.2.10</Version>
1717
<Authors>StackifyLib</Authors>
1818
<PackageProjectUrl>https://github.com/stackify/stackify-api-dotnet</PackageProjectUrl>
1919
<PackageLicenseUrl>https://github.com/stackify/stackify-api-dotnet/blob/master/LICENSE</PackageLicenseUrl>
2020
<RepositoryUrl>https://github.com/stackify/stackify-api-dotnet</RepositoryUrl>
2121
<RepositoryType>git</RepositoryType>
2222
<PackageIconUrl>https://stackify.com/wp-content/uploads/2017/02/stk.png</PackageIconUrl>
23-
<AssemblyVersion>2.2.9.0</AssemblyVersion>
24-
<FileVersion>2.2.9.0</FileVersion>
23+
<AssemblyVersion>2.2.10.0</AssemblyVersion>
24+
<FileVersion>2.2.10.0</FileVersion>
2525
<PackageReleaseNotes>Remove default internal file logger</PackageReleaseNotes>
2626
<SignAssembly>false</SignAssembly>
2727
</PropertyGroup>

‎Src/StackifyLib/Web/RealUserMonitoring.cs

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Security.Cryptography;
33
using Newtonsoft.Json;
44
using Newtonsoft.Json.Linq;
@@ -9,8 +9,12 @@ namespace StackifyLib.Web
99
public static class RealUserMonitoring
1010
{
1111
private static readonly RandomNumberGenerator Rng = new RNGCryptoServiceProvider();
12-
13-
public static string GetHeaderScript()
12+
13+
/// <summary>
14+
/// Generate the header script for including RUM
15+
/// </summary>
16+
/// <param name="nonce">nonce value, defaults to a cryptographic unique string if left null</param>
17+
public static string GetHeaderScript(string nonce = null)
1418
{
1519
var rumScriptUrl = Config.RumScriptUrl;
1620
var rumKey = Config.RumKey;
@@ -52,13 +56,16 @@ public static string GetHeaderScript()
5256
settings["Trans"] = Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(reportingUrl));
5357
}
5458

55-
// generate nonce for strict CSP rules
59+
return string.Format("<script type=\"text/javascript\" nonce=\"{3}\">(window.StackifySettings || (window.StackifySettings = {0}))</script><script src=\"{1}\" data-key=\"{2}\" async></script>",
60+
settings.ToString(Formatting.None), rumScriptUrl, rumKey, nonce ?? GetNonce());
61+
}
62+
63+
// generate nonce for strict CSP rules
64+
private static string GetNonce()
65+
{
5666
var nonceBytes = new byte[20];
5767
Rng.GetNonZeroBytes(nonceBytes);
58-
var nonce = Convert.ToBase64String(nonceBytes);
59-
60-
return string.Format("<script type=\"text/javascript\" nonce=\"{3}\">(window.StackifySettings || (window.StackifySettings = {0}))</script><script src=\"{1}\" data-key=\"{2}\" async></script>",
61-
settings.ToString(Formatting.None), rumScriptUrl, rumKey, nonce);
68+
return Convert.ToBase64String(nonceBytes);
6269
}
6370
}
6471
}

‎azure-pipelines.yml

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,28 @@ trigger:
33
include:
44
- develop
55

6+
schedules:
7+
- cron: "0 21-22 31 * *"
8+
displayName: Monthly build
9+
branches:
10+
include:
11+
- develop
12+
always: true
13+
614
pool:
715
name: win2016-vs2017
816
# name: Azure Pipelines
917

18+
parameters:
19+
- name: RUN_VERACODE_SCAN
20+
displayName: 'Upload to Veracode'
21+
type: boolean
22+
default: true
23+
- name: RUN_VERACODE_SCA
24+
displayName: 'Execute Veracode SCA'
25+
type: boolean
26+
default: false
27+
1028
steps:
1129
- checkout: self
1230
clean: true
@@ -19,7 +37,7 @@ steps:
1937
RunAsPreJob: true
2038
- task: PowerShell@2
2139
displayName: PowerShell Script
22-
condition: and(succeeded(), eq('${{ variables.veracodeSCA }}', 'true'))
40+
condition: and(succeeded(), eq('${{ parameters.RUN_VERACODE_SCA }}', 'true'))
2341
inputs:
2442
targetType: inline
2543
script: >
@@ -172,14 +190,16 @@ steps:
172190
$xml = [Xml] (Get-Content .\Src\StackifyLib\StackifyLib.csproj)
173191
$version = $xml.Project.PropertyGroup.Version
174192
echo $version
193+
$version = "$version".Trim()
175194
echo "##vso[task.setvariable variable=version]$version"
176195
echo "StackifyLib."$version".nupkg"
177196
workingDirectory: $(Build.SourcesDirectory)
178197
- task: Veracode@3
179-
displayName: 'Upload and scan: $(Build.ArtifactStagingDirectory)/StackifyLib.$(BuildVersion).nupkg'
180-
enabled: False
198+
displayName: 'Upload and scan: $(Build.ArtifactStagingDirectory)/StackifyLib.$(version).nupkg'
199+
condition: and(succeeded(), eq('${{ parameters.RUN_VERACODE_SCAN }}', 'true'))
200+
enabled: True
181201
inputs:
182202
AnalysisService: 51003f89-58ab-463c-8e20-41484888d9c7
183203
veracodeAppProfile: Retrace .Net StackifyLib
184204
version: AZ-Devops-Build-$(build.buildNumber)
185-
filepath: $(Build.ArtifactStagingDirectory)/StackifyLib.$(BuildVersion).nupkg
205+
filepath: $(Build.ArtifactStagingDirectory)/StackifyLib.$(version).nupkg

0 commit comments

Comments
 (0)