Baustein 1: Server-Auth-Fix (Kapitel 10)
/api/auth/login und /api/auth/register akzeptierten zuvor jeden beliebigen Nutzernamen/Passwort und stellten ein gueltiges 30-Tage-JWT aus - konkrete, ausnutzbare Luecke bei echtem Deployment. - PasswordHasher (PBKDF2, Salt pro Nutzer) + UserStore (LiteDB) statt des ungeprueften Stubs - /api/auth/register ersatzlos entfernt (kein offener Registrierungs-Endpunkt fuer ein Einzel-/Familien-Deployment) - Neue Nutzer per CLI (dotnet LehrerApp.Api.dll create-user <name>), dokumentiert in docker/README.md - Neues Testprojekt LehrerApp.Api.Tests (bisher als einziges Projekt ohne Tests) Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,18 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
|
<IsPackable>false</IsPackable>
|
||||||
|
<IsTestProject>true</IsTestProject>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\LehrerApp.Api\LehrerApp.Api.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Test.Sdk" />
|
||||||
|
<PackageReference Include="xunit" />
|
||||||
|
<PackageReference Include="xunit.runner.visualstudio">
|
||||||
|
<PrivateAssets>all</PrivateAssets>
|
||||||
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
using Xunit;
|
||||||
|
|
||||||
|
namespace LehrerApp.Api.Tests;
|
||||||
|
|
||||||
|
public sealed class PasswordHasherTests
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public void Verify_RichtigesPasswort_GibtTrueZurueck()
|
||||||
|
{
|
||||||
|
var hash = PasswordHasher.Hash("korrektes-passwort-123");
|
||||||
|
|
||||||
|
Assert.True(PasswordHasher.Verify("korrektes-passwort-123", hash));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Verify_FalschesPasswort_GibtFalseZurueck()
|
||||||
|
{
|
||||||
|
var hash = PasswordHasher.Hash("korrektes-passwort-123");
|
||||||
|
|
||||||
|
Assert.False(PasswordHasher.Verify("falsches-passwort-456", hash));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Hash_ZweiAufrufeMitGleichemPasswort_ErzeugenUnterschiedlicheHashes()
|
||||||
|
{
|
||||||
|
// Zufälliger Salt pro Nutzer -> selbst identische Passwörter dürfen nicht denselben
|
||||||
|
// gespeicherten Wert ergeben.
|
||||||
|
var hash1 = PasswordHasher.Hash("dasselbe-passwort");
|
||||||
|
var hash2 = PasswordHasher.Hash("dasselbe-passwort");
|
||||||
|
|
||||||
|
Assert.NotEqual(hash1, hash2);
|
||||||
|
Assert.True(PasswordHasher.Verify("dasselbe-passwort", hash1));
|
||||||
|
Assert.True(PasswordHasher.Verify("dasselbe-passwort", hash2));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Verify_UngueltigesGespeichertesFormat_GibtFalseZurueckStattZuWerfen()
|
||||||
|
{
|
||||||
|
Assert.False(PasswordHasher.Verify("irgendwas", "kein-gueltiges-format"));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
using Xunit;
|
||||||
|
|
||||||
|
namespace LehrerApp.Api.Tests;
|
||||||
|
|
||||||
|
public sealed class UserStoreTests
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public void CreateUser_NeuerNutzername_GibtTrueZurueckUndKannSichAnmelden()
|
||||||
|
{
|
||||||
|
using var temp = new TempUserStore();
|
||||||
|
|
||||||
|
var created = temp.Store.CreateUser("sebastian", "einSicheresPasswort");
|
||||||
|
|
||||||
|
Assert.True(created);
|
||||||
|
Assert.True(temp.Store.VerifyPassword("sebastian", "einSicheresPasswort"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void CreateUser_BereitsVorhandenerNutzername_GibtFalseZurueck()
|
||||||
|
{
|
||||||
|
using var temp = new TempUserStore();
|
||||||
|
temp.Store.CreateUser("sebastian", "einSicheresPasswort");
|
||||||
|
|
||||||
|
var created = temp.Store.CreateUser("sebastian", "einAnderesPasswort");
|
||||||
|
|
||||||
|
Assert.False(created);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void VerifyPassword_FalschesPasswort_GibtFalseZurueck()
|
||||||
|
{
|
||||||
|
using var temp = new TempUserStore();
|
||||||
|
temp.Store.CreateUser("sebastian", "einSicheresPasswort");
|
||||||
|
|
||||||
|
Assert.False(temp.Store.VerifyPassword("sebastian", "falschesPasswort"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void VerifyPassword_UnbekannterNutzer_GibtFalseZurueck()
|
||||||
|
{
|
||||||
|
using var temp = new TempUserStore();
|
||||||
|
|
||||||
|
Assert.False(temp.Store.VerifyPassword("unbekannt", "irgendwas"));
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class TempUserStore : IDisposable
|
||||||
|
{
|
||||||
|
private readonly string _directory = Path.Combine(
|
||||||
|
Path.GetTempPath(), $"lehrerapp-api-tests-{Guid.NewGuid():N}");
|
||||||
|
public UserStore Store { get; }
|
||||||
|
|
||||||
|
public TempUserStore()
|
||||||
|
{
|
||||||
|
Directory.CreateDirectory(_directory);
|
||||||
|
Store = new UserStore(_directory);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
Store.Dispose();
|
||||||
|
if (Directory.Exists(_directory)) Directory.Delete(_directory, recursive: true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace LehrerApp.Api;
|
||||||
|
|
||||||
|
internal static class Cli
|
||||||
|
{
|
||||||
|
public static Task<int> RunCreateUserAsync(string dataPath, string[] args)
|
||||||
|
{
|
||||||
|
if (args.Length < 2)
|
||||||
|
{
|
||||||
|
Console.Error.WriteLine("Verwendung: create-user <benutzername> [--password <passwort>]");
|
||||||
|
return Task.FromResult(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
var username = args[1];
|
||||||
|
string? password = null;
|
||||||
|
for (var i = 2; i < args.Length - 1; i++)
|
||||||
|
if (args[i] == "--password") password = args[i + 1];
|
||||||
|
|
||||||
|
password ??= ReadPassword("Passwort (mind. 12 Zeichen): ");
|
||||||
|
|
||||||
|
if (string.IsNullOrWhiteSpace(password) || password.Length < 12)
|
||||||
|
{
|
||||||
|
Console.Error.WriteLine("Passwort muss mindestens 12 Zeichen lang sein.");
|
||||||
|
return Task.FromResult(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
Directory.CreateDirectory(dataPath);
|
||||||
|
using var store = new UserStore(dataPath);
|
||||||
|
if (!store.CreateUser(username, password))
|
||||||
|
{
|
||||||
|
Console.Error.WriteLine($"Nutzer '{username}' existiert bereits.");
|
||||||
|
return Task.FromResult(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
Console.WriteLine($"Nutzer '{username}' angelegt.");
|
||||||
|
return Task.FromResult(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
// docker exec ohne -it liefert kein TTY -> ReadKey wäre nicht möglich, dann normal lesen.
|
||||||
|
private static string ReadPassword(string prompt)
|
||||||
|
{
|
||||||
|
Console.Write(prompt);
|
||||||
|
if (Console.IsInputRedirected) return Console.ReadLine() ?? "";
|
||||||
|
|
||||||
|
var sb = new StringBuilder();
|
||||||
|
ConsoleKeyInfo key;
|
||||||
|
while ((key = Console.ReadKey(intercept: true)).Key != ConsoleKey.Enter)
|
||||||
|
{
|
||||||
|
if (key.Key == ConsoleKey.Backspace && sb.Length > 0) { sb.Length--; Console.Write("\b \b"); }
|
||||||
|
else if (!char.IsControl(key.KeyChar)) { sb.Append(key.KeyChar); Console.Write('*'); }
|
||||||
|
}
|
||||||
|
Console.WriteLine();
|
||||||
|
return sb.ToString();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -14,19 +14,12 @@ public static class Endpoints
|
|||||||
|
|
||||||
public static void MapAuthEndpoints(this WebApplication app, string secret)
|
public static void MapAuthEndpoints(this WebApplication app, string secret)
|
||||||
{
|
{
|
||||||
app.MapPost("/api/auth/login", (LoginRequest req) =>
|
app.MapPost("/api/auth/login", (LoginRequest req, UserStore store) =>
|
||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(req.Username) || string.IsNullOrWhiteSpace(req.Password))
|
if (string.IsNullOrWhiteSpace(req.Username) || string.IsNullOrWhiteSpace(req.Password))
|
||||||
return Results.Unauthorized();
|
return Results.Unauthorized();
|
||||||
// TODO: Passwort gegen DB prüfen
|
if (!store.VerifyPassword(req.Username, req.Password))
|
||||||
return Results.Ok(new { token = Jwt(req.Username, secret), userId = req.Username });
|
return Results.Unauthorized();
|
||||||
});
|
|
||||||
|
|
||||||
app.MapPost("/api/auth/register", (RegisterRequest req) =>
|
|
||||||
{
|
|
||||||
if (req.Password.Length < 12)
|
|
||||||
return Results.BadRequest("Passwort mind. 12 Zeichen.");
|
|
||||||
// TODO: User anlegen, Passwort hashen (BCrypt)
|
|
||||||
return Results.Ok(new { token = Jwt(req.Username, secret), userId = req.Username });
|
return Results.Ok(new { token = Jwt(req.Username, secret), userId = req.Username });
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -130,4 +123,3 @@ public static class Endpoints
|
|||||||
}
|
}
|
||||||
|
|
||||||
public record LoginRequest(string Username, string Password);
|
public record LoginRequest(string Username, string Password);
|
||||||
public record RegisterRequest(string Username, string Password, string DisplayName);
|
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
using System.Security.Cryptography;
|
||||||
|
|
||||||
|
namespace LehrerApp.Api;
|
||||||
|
|
||||||
|
public static class PasswordHasher
|
||||||
|
{
|
||||||
|
private const int Iterations = 100_000;
|
||||||
|
private const int SaltSize = 16;
|
||||||
|
private const int HashSize = 32;
|
||||||
|
|
||||||
|
public static string Hash(string password)
|
||||||
|
{
|
||||||
|
var salt = RandomNumberGenerator.GetBytes(SaltSize);
|
||||||
|
var hash = Rfc2898DeriveBytes.Pbkdf2(password, salt, Iterations, HashAlgorithmName.SHA256, HashSize);
|
||||||
|
return $"{Convert.ToBase64String(salt)}:{Convert.ToBase64String(hash)}";
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool Verify(string password, string stored)
|
||||||
|
{
|
||||||
|
var parts = stored.Split(':');
|
||||||
|
if (parts.Length != 2) return false;
|
||||||
|
var salt = Convert.FromBase64String(parts[0]);
|
||||||
|
var expected = Convert.FromBase64String(parts[1]);
|
||||||
|
var actual = Rfc2898DeriveBytes.Pbkdf2(password, salt, Iterations, HashAlgorithmName.SHA256, HashSize);
|
||||||
|
return CryptographicOperations.FixedTimeEquals(actual, expected);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -11,6 +11,11 @@ builder.WebHost.UseKestrel(o =>
|
|||||||
o.ListenAnyIP(port);
|
o.ListenAnyIP(port);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
var data = builder.Configuration["Api:DataPath"] ?? "./data";
|
||||||
|
|
||||||
|
if (args.Length > 0 && args[0] == "create-user")
|
||||||
|
return await Cli.RunCreateUserAsync(data, args);
|
||||||
|
|
||||||
var secret = builder.Configuration["JWT_SECRET"]
|
var secret = builder.Configuration["JWT_SECRET"]
|
||||||
?? throw new InvalidOperationException("JWT_SECRET nicht konfiguriert.");
|
?? throw new InvalidOperationException("JWT_SECRET nicht konfiguriert.");
|
||||||
|
|
||||||
@@ -24,7 +29,7 @@ builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
|
|||||||
});
|
});
|
||||||
builder.Services.AddAuthorization();
|
builder.Services.AddAuthorization();
|
||||||
|
|
||||||
var data = builder.Configuration["Api:DataPath"] ?? "./data";
|
builder.Services.AddSingleton<UserStore>(_ => new UserStore(data));
|
||||||
builder.Services.AddSingleton<EventStore>(_ => new EventStore(data));
|
builder.Services.AddSingleton<EventStore>(_ => new EventStore(data));
|
||||||
builder.Services.AddSingleton<SnapshotStore>(_ => new SnapshotStore(data));
|
builder.Services.AddSingleton<SnapshotStore>(_ => new SnapshotStore(data));
|
||||||
builder.Services.AddSingleton<ReadableSnapshotStore>(_ => new ReadableSnapshotStore(data));
|
builder.Services.AddSingleton<ReadableSnapshotStore>(_ => new ReadableSnapshotStore(data));
|
||||||
@@ -40,3 +45,4 @@ app.MapSnapshotEndpoints();
|
|||||||
app.MapReadableSnapshotEndpoints();
|
app.MapReadableSnapshotEndpoints();
|
||||||
app.MapPlainSyncEndpoints();
|
app.MapPlainSyncEndpoints();
|
||||||
app.Run();
|
app.Run();
|
||||||
|
return 0;
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
using LiteDB;
|
||||||
|
|
||||||
|
namespace LehrerApp.Api;
|
||||||
|
|
||||||
|
public class UserStore(string dataPath) : IDisposable
|
||||||
|
{
|
||||||
|
private readonly LiteDatabase _db = new(Path.Combine(dataPath, "users.db"));
|
||||||
|
|
||||||
|
private ILiteCollection<UserEntry> Col
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
var col = _db.GetCollection<UserEntry>("users");
|
||||||
|
col.EnsureIndex(x => x.Username, unique: true);
|
||||||
|
return col;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool CreateUser(string username, string password)
|
||||||
|
{
|
||||||
|
if (Col.Exists(x => x.Username == username)) return false;
|
||||||
|
Col.Insert(new UserEntry { Username = username, PasswordHash = PasswordHasher.Hash(password) });
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool VerifyPassword(string username, string password)
|
||||||
|
{
|
||||||
|
var user = Col.FindOne(x => x.Username == username);
|
||||||
|
return user is not null && PasswordHasher.Verify(password, user.PasswordHash);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose() => _db.Dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
internal class UserEntry
|
||||||
|
{
|
||||||
|
public ObjectId Id { get; set; } = ObjectId.NewObjectId();
|
||||||
|
public string Username { get; set; } = "";
|
||||||
|
public string PasswordHash { get; set; } = "";
|
||||||
|
}
|
||||||
@@ -18,6 +18,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LehrerApp.Desktop.Tests", "
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LehrerApp.Sync.Tests", "LehrerApp.Sync.Tests\LehrerApp.Sync.Tests.csproj", "{2E2B2FA3-B0C4-415D-913F-0A0432394EEC}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LehrerApp.Sync.Tests", "LehrerApp.Sync.Tests\LehrerApp.Sync.Tests.csproj", "{2E2B2FA3-B0C4-415D-913F-0A0432394EEC}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LehrerApp.Api.Tests", "LehrerApp.Api.Tests\LehrerApp.Api.Tests.csproj", "{E8152216-11F1-427E-B189-D8CEC9A71C33}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@@ -124,6 +126,18 @@ Global
|
|||||||
{2E2B2FA3-B0C4-415D-913F-0A0432394EEC}.Release|x64.Build.0 = Release|Any CPU
|
{2E2B2FA3-B0C4-415D-913F-0A0432394EEC}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{2E2B2FA3-B0C4-415D-913F-0A0432394EEC}.Release|x86.ActiveCfg = Release|Any CPU
|
{2E2B2FA3-B0C4-415D-913F-0A0432394EEC}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{2E2B2FA3-B0C4-415D-913F-0A0432394EEC}.Release|x86.Build.0 = Release|Any CPU
|
{2E2B2FA3-B0C4-415D-913F-0A0432394EEC}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{E8152216-11F1-427E-B189-D8CEC9A71C33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{E8152216-11F1-427E-B189-D8CEC9A71C33}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{E8152216-11F1-427E-B189-D8CEC9A71C33}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{E8152216-11F1-427E-B189-D8CEC9A71C33}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{E8152216-11F1-427E-B189-D8CEC9A71C33}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{E8152216-11F1-427E-B189-D8CEC9A71C33}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{E8152216-11F1-427E-B189-D8CEC9A71C33}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{E8152216-11F1-427E-B189-D8CEC9A71C33}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{E8152216-11F1-427E-B189-D8CEC9A71C33}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{E8152216-11F1-427E-B189-D8CEC9A71C33}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{E8152216-11F1-427E-B189-D8CEC9A71C33}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{E8152216-11F1-427E-B189-D8CEC9A71C33}.Release|x86.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
# LehrerApp.Api – Deployment per Docker
|
||||||
|
|
||||||
|
## Starten
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd docker
|
||||||
|
JWT_SECRET=<zufälliger-langer-string> docker compose up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
`./data` (relativ zu `docker/`) wird als Volume gemountet und enthält alle Server-Daten
|
||||||
|
(Ereignis-Logs, Snapshots, Nutzer) – bei Neustarts/Updates bleibt es erhalten.
|
||||||
|
|
||||||
|
## Nutzer anlegen
|
||||||
|
|
||||||
|
Es gibt keine offene Registrierung (`/api/auth/register`). Neue Nutzer werden per CLI im
|
||||||
|
laufenden Container angelegt:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose exec api dotnet LehrerApp.Api.dll create-user <benutzername>
|
||||||
|
```
|
||||||
|
|
||||||
|
Fragt interaktiv nach einem Passwort (mind. 12 Zeichen). Alternativ nicht-interaktiv, z. B. aus
|
||||||
|
einem Skript:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose exec api dotnet LehrerApp.Api.dll create-user <benutzername> --password "<passwort>"
|
||||||
|
```
|
||||||
|
|
||||||
|
Der Befehl beendet sich danach sofort wieder, ohne den API-Dienst zu starten – für den
|
||||||
|
eigentlichen Serverbetrieb läuft `docker compose up` unverändert weiter.
|
||||||
Reference in New Issue
Block a user