tsai
/
squidex
mirror of https://github.com/Squidex/squidex.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Calculate and verify shared secrets in tests.

pull/926/head
Sebastian 3 years ago
parent
82a81f2fc7
commit
015091394e
6 changed files with 52 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      backend/tools/TestSuite/TestSuite.ApiTests/ContentQueryTests.cs
  2. 26
      backend/tools/TestSuite/TestSuite.ApiTests/RuleRunnerTests.cs
  3. 2
      backend/tools/TestSuite/TestSuite.ApiTests/TestSuite.ApiTests.csproj
  4. 6
      backend/tools/TestSuite/TestSuite.Shared/ClientExtensions.cs
  5. 23
      backend/tools/TestSuite/TestSuite.Shared/Fixtures/WebhookCatcherClient.cs
  6. 2
      backend/tools/TestSuite/TestSuite.Shared/TestSuite.Shared.csproj

1
backend/tools/TestSuite/TestSuite.ApiTests/ContentQueryTests.cs
View File

@ -12,6 +12,7 @@ using Squidex.ClientLibrary.Utils;
using TestSuite.Model;
#pragma warning disable SA1300 // Element should begin with upper-case letter
#pragma warning disable SA1507 // Code should not contain multiple blank lines in a row
namespace TestSuite.ApiTests
{

26
backend/tools/TestSuite/TestSuite.ApiTests/RuleRunnerTests.cs
View File

@ -5,6 +5,7 @@
// All rights reserved. Licensed under the MIT license.
// ==========================================================================
using Squidex.ClientLibrary;
using Squidex.ClientLibrary.Management;
using TestSuite.Fixtures;
using TestSuite.Model;
@ -16,6 +17,7 @@ namespace TestSuite.ApiTests
{
public class RuleRunnerTests : IClassFixture<ClientFixture>, IClassFixture<WebhookCatcherFixture>
{
private readonly string secret = Guid.NewGuid().ToString();
private readonly string appName = Guid.NewGuid().ToString();
private readonly string schemaName = $"schema-{Guid.NewGuid()}";
private readonly string contentString = Guid.NewGuid().ToString();
@ -46,6 +48,7 @@ namespace TestSuite.ApiTests
{
Action = new WebhookRuleActionDto
{
SharedSecret = secret,
Method = WebhookMethod.POST,
Payload = null,
PayloadType = null,
@ -65,8 +68,11 @@ namespace TestSuite.ApiTests
// Get requests.
var requests = await webhookCatcher.WaitForRequestsAsync(sessionId, TimeSpan.FromMinutes(2));
var request = requests.FirstOrDefault(x => x.Method == "POST" && x.Content.Contains(schemaName, StringComparison.OrdinalIgnoreCase));
Assert.Contains(requests, x => x.Method == "POST" && x.Content.Contains(schemaName, StringComparison.OrdinalIgnoreCase));
Assert.NotNull(request);
Assert.NotNull(request.Headers["X-Signature"]);
Assert.Equal(request.Headers["X-Signature"], WebhookUtils.CalculateSignature(request.Content, secret));
// STEP 4: Get events
@ -93,6 +99,7 @@ namespace TestSuite.ApiTests
{
Action = new WebhookRuleActionDto
{
SharedSecret = secret,
Method = WebhookMethod.POST,
Payload = null,
PayloadType = null,
@ -109,8 +116,11 @@ namespace TestSuite.ApiTests
// Get requests.
var requests = await webhookCatcher.WaitForRequestsAsync(sessionId, TimeSpan.FromMinutes(2));
var request = requests.FirstOrDefault(x => x.Method == "POST" && x.Content.Contains("logo-squared", StringComparison.OrdinalIgnoreCase));
Assert.Contains(requests, x => x.Method == "POST" && x.Content.Contains("logo-squared", StringComparison.OrdinalIgnoreCase));
Assert.NotNull(request);
Assert.NotNull(request.Headers["X-Signature"]);
Assert.Equal(request.Headers["X-Signature"], WebhookUtils.CalculateSignature(request.Content, secret));
// STEP 4: Get events
@ -137,6 +147,7 @@ namespace TestSuite.ApiTests
{
Action = new WebhookRuleActionDto
{
SharedSecret = secret,
Method = WebhookMethod.POST,
Payload = null,
PayloadType = null,
@ -153,8 +164,11 @@ namespace TestSuite.ApiTests
// Get requests.
var requests = await webhookCatcher.WaitForRequestsAsync(sessionId, TimeSpan.FromMinutes(2));
var request = requests.FirstOrDefault(x => x.Method == "POST" && x.Content.Contains(schemaName, StringComparison.OrdinalIgnoreCase));
Assert.Contains(requests, x => x.Method == "POST" && x.Content.Contains(schemaName, StringComparison.OrdinalIgnoreCase));
Assert.NotNull(request);
Assert.NotNull(request.Headers["X-Signature"]);
Assert.Equal(request.Headers["X-Signature"], WebhookUtils.CalculateSignature(request.Content, secret));
// STEP 4: Get events
@ -181,6 +195,7 @@ namespace TestSuite.ApiTests
{
Action = new WebhookRuleActionDto
{
SharedSecret = secret,
Method = WebhookMethod.POST,
Payload = null,
PayloadType = null,
@ -197,8 +212,11 @@ namespace TestSuite.ApiTests
// Get requests.
var requests = await webhookCatcher.WaitForRequestsAsync(sessionId, TimeSpan.FromSeconds(30));
var request = requests.FirstOrDefault(x => x.Method == "POST");
Assert.Contains(requests, x => x.Method == "POST");
Assert.NotNull(request);
Assert.NotNull(request.Headers["X-Signature"]);
Assert.Equal(request.Headers["X-Signature"], WebhookUtils.CalculateSignature(request.Content, secret));
// STEP 4: Get events

2
backend/tools/TestSuite/TestSuite.ApiTests/TestSuite.ApiTests.csproj
View File

@ -22,7 +22,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="NSwag.Core" Version="13.16.1" />
<PackageReference Include="PuppeteerSharp" Version="7.1.0" />
<PackageReference Include="Squidex.Assets" Version="3.6.0" />
<PackageReference Include="Squidex.Assets" Version="4.11.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="Verify.Xunit" Version="17.5.0" />
<PackageReference Include="xunit" Version="2.4.1" />

6
backend/tools/TestSuite/TestSuite.Shared/ClientExtensions.cs
View File

@ -5,6 +5,8 @@
// All rights reserved. Licensed under the MIT license.
// ==========================================================================
using System.Security.Cryptography;
using System.Text;
using Squidex.ClientLibrary;
using Squidex.ClientLibrary.Management;
using TestSuite.Fixtures;
@ -92,7 +94,7 @@ namespace TestSuite
return new List<SearchResultDto>();
}
public static async Task<IList<HistoryEventDto>> WaitForHistoryAsync(this IHistoryClient assetsClient, string app, string channel,
public static async Task<IList<HistoryEventDto>> WaitForHistoryAsync(this IHistoryClient historyClient, string app, string channel,
Func<HistoryEventDto, bool> predicate, TimeSpan timeout)
{
try
@ -101,7 +103,7 @@ namespace TestSuite
while (!cts.IsCancellationRequested)
{
var result = await assetsClient.GetHistoryAsync(app, channel, cts.Token);
var result = await historyClient.GetAppHistoryAsync(app, channel, cts.Token);
if (result.Any(predicate))
{

23
backend/tools/TestSuite/TestSuite.Shared/Fixtures/WebhookCatcherClient.cs
View File

@ -28,6 +28,21 @@ namespace TestSuite.Fixtures
[JsonPropertyName("content_base64")]
public string Content { get; set; }
[JsonIgnore]
public Dictionary<string, string> Headers { get; set; } = new Dictionary<string, string>();
[JsonPropertyName("headers")]
public WebhookHeader[] HeaderValues { get; set; }
}
public sealed class WebhookHeader
{
[JsonPropertyName("name")]
public string Name { get; set; }
[JsonPropertyName("value")]
public string Value { get; set; }
}
public sealed class WebhookCatcherClient
@ -82,6 +97,14 @@ namespace TestSuite.Fixtures
{
request.Content = Encoding.Default.GetString(Convert.FromBase64String(request.Content));
}
if (request.HeaderValues != null)
{
foreach (var header in request.HeaderValues)
{
request.Headers[header.Name] = header.Value;
}
}
}
return result;

2
backend/tools/TestSuite/TestSuite.Shared/TestSuite.Shared.csproj
View File

@ -16,7 +16,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="Squidex.ClientLibrary" Version="8.27.0" />
<PackageReference Include="Squidex.ClientLibrary" Version="9.2.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="Verify" Version="17.5.0" />
<PackageReference Include="xunit" Version="2.4.1" />

Write Preview
Loading…
Cancel
Save