Skip to content
Open
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
2 changes: 1 addition & 1 deletion build/scripts/linux/build-avalonia-packages.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -euo pipefail

REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
PROJECT_PATH="$REPO_ROOT/src/GregModmanager.Avalonia/GregModmanager.Avalonia.csproj"
OUTPUT_ROOT="${1:-$REPO_ROOT/artifacts/avalonia-linux}"
VERSION="${2:-1.1.0}"
Expand Down
1 change: 1 addition & 0 deletions src/GregModmanager.Avalonia/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ public static IServiceProvider BuildServices()
services.AddSingleton<GregModmanager.Services.Auth.IAuthApiClient, GregModmanager.Services.Auth.AuthApiClient>();
services.AddSingleton<GregModmanager.Services.Auth.ISessionManager, GregModmanager.Services.Auth.SessionManager>();
services.AddSingleton<GregModmanager.Services.Install.IInstallIntentClient, GregModmanager.Services.Install.InstallIntentClient>();
services.AddSingleton<GregModmanager.Services.Install.IIntentSignatureVerifier, GregModmanager.Services.Install.DummyIntentSignatureVerifier>();

services.AddSingleton<IDialogService, DialogService>();

Expand Down
1 change: 1 addition & 0 deletions src/GregModmanager.Core/Models/AppJsonContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ namespace GregModmanager.Models;
[JsonSerializable(typeof(int))]
[JsonSerializable(typeof(RalphTaskStatus))]
[JsonSerializable(typeof(AssetModMetadata))]
[JsonSerializable(typeof(object))]
public partial class AppJsonContext : JsonSerializerContext
{
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using GregModmanager.Models.Install;

namespace GregModmanager.Services.Install;

public class DummyIntentSignatureVerifier : IIntentSignatureVerifier
{
public bool VerifySignature(InstallIntentContext intent)
{
// For the Vertical Slice (Phase 3), we require the signature to at least match a mock known structure.
return intent.Signature == "valid_dummy_sig" || intent.Signature.Length >= 32;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using GregModmanager.Models.Install;

namespace GregModmanager.Services.Install;

public interface IIntentSignatureVerifier
{
bool VerifySignature(InstallIntentContext intent);
}
19 changes: 10 additions & 9 deletions src/GregModmanager.Core/Services/Install/InstallIntentClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@ public class InstallIntentClient : IInstallIntentClient
private readonly ISessionManager _sessionManager;
private readonly HashSet<string> _consumedIntents = new();

public InstallIntentClient(ISessionManager sessionManager)
private readonly IIntentSignatureVerifier _signatureVerifier;

public InstallIntentClient(ISessionManager sessionManager, IIntentSignatureVerifier signatureVerifier)
{
_sessionManager = sessionManager;
_sessionManager = sessionManager;
_signatureVerifier = signatureVerifier;
}

public async Task HandleIntentAsync(string rawUri)
Expand Down Expand Up @@ -109,13 +112,11 @@ public async Task HandleIntentAsync(string rawUri)
return Task.FromResult<string?>("Missing cryptographic signature.");
}

// TODO: Implement actual cryptographic ECDSA/HMAC signature verification against server public key
// For the Vertical Slice (Phase 3), we require the signature to at least match a mock known structure.
if (intent.Signature != "valid_dummy_sig" && intent.Signature.Length < 32)
{
return Task.FromResult<string?>("Signature format invalid or unrecognized.");
}

if (!_signatureVerifier.VerifySignature(intent))
{
return Task.FromResult<string?>("Signature format invalid or unrecognized.");
}

return Task.FromResult<string?>(null); // Null means valid!
}

Expand Down
3 changes: 2 additions & 1 deletion src/GregModmanager.Core/Services/TelemetryService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ public async Task TrackEventAsync(string eventName, object payload, Dictionary<s
var message = payload switch
{
SyncCollectionEvent sync => JsonSerializer.Serialize(sync, AppJsonContext.Default.SyncCollectionEvent),
_ => JsonSerializer.Serialize(payload, payload.GetType(), AppJsonContext.Default.Options)
string str => str,
_ => JsonSerializer.Serialize((object)payload, AppJsonContext.Default.Object)
};

await PushToLokiAsync(eventName, message, labels);
Expand Down
Loading