Add whitelist system

Author: CodeDoctorDE

api/lib/src/event/process/client.dart

@@ -140,15 +140,15 @@ Future<ServerResponse?> processClientEvent(
 
   if (event == null) {
     if (challengeManager != null) {
-      final challenge = challengeManager.getChallenge(channel);
+      final challenge = challengeManager.generateNewChallenge(channel);
       return ServerResponse.builder(
           AuthenticatedRequested(
             challenge,
             isRequired: true,
           ),
           channel);
     }
-    userManager?.addUser(channel);
+    await userManager?.addUser(channel);
     return ServerResponse.builder(buildInitialize(), channel);
   }
   if (!isValidClientEvent(event, channel, state, assetManager: assetManager)) {
@@ -299,12 +299,20 @@ Future<ServerResponse?> processClientEvent(
     case AuthenticateRequest():
       final challenge = challengeManager?.getChallenge(channel);
       if (challenge == null) return null;
+      if (challengeManager == null) return null;
       final verified = await event.verify(challenge);
       if (!verified) {
+        final newChallenge = challengeManager.generateNewChallenge(channel);
         return ServerResponse.builder(
-            AuthenticatedRequested(challenge, isRequired: true), channel);
+            AuthenticatedRequested(newChallenge, isRequired: true), channel);
+      }
+      final result = await userManager?.addUser(
+          channel, generateFingerprint(event.publicKey));
+      if (result == false) {
+        final newChallenge = challengeManager.generateNewChallenge(channel);
+        return ServerResponse.builder(
+            AuthenticatedRequested(newChallenge, isRequired: true), channel);
       }
-      userManager?.addUser(channel, generateFingerprint(event.publicKey));
       return ServerResponse.builder(buildInitialize(), channel);
   }
 }

api/lib/src/models/config.dart

@@ -29,9 +29,12 @@ final class SetonixConfig with SetonixConfigMappable {
   final String? guestPrefix;
   static const String defaultGuestPrefix = 'Guest ';
   static const String envGuestPrefix = 'SETONIX_GUEST_PREFIX';
-  final String? authEndpoint;
-  static const String defaultAuthEndpoint = '';
-  static const String envAuthEndpoint = 'SETONIX_AUTH_ENDPOINT';
+  final bool? whitelistEnabled;
+  static const bool defaultWhitelistEnabled = false;
+  static const String envWhitelistEnabled = 'SETONIX_WHITELIST_ENABLED';
+  final bool? accountRequired;
+  static const bool defaultAccountRequired = true;
+  static const String envAccountRequired = 'SETONIX_ACCOUNT_REQUIRED';
   final String? endpointSecret;
   static const String defaultEndpointSecret = '';
   static const String envEndpointSecret = 'SETONIX_ENDPOINT_SECRET';
@@ -45,7 +48,8 @@ final class SetonixConfig with SetonixConfigMappable {
     this.maxPlayers,
     this.description,
     this.guestPrefix,
-    this.authEndpoint,
+    this.whitelistEnabled,
+    this.accountRequired,
     this.endpointSecret,
   });
 
@@ -58,7 +62,8 @@ final class SetonixConfig with SetonixConfigMappable {
     maxPlayers: defaultMaxPlayers,
     description: defaultDescription,
     guestPrefix: defaultGuestPrefix,
-    authEndpoint: defaultAuthEndpoint,
+    whitelistEnabled: defaultWhitelistEnabled,
+    accountRequired: defaultAccountRequired,
     endpointSecret: defaultEndpointSecret,
   );
 
@@ -90,9 +95,13 @@ final class SetonixConfig with SetonixConfigMappable {
           ? String.fromEnvironment(envGuestPrefix,
               defaultValue: defaultGuestPrefix)
           : null,
-      authEndpoint: bool.hasEnvironment(envAuthEndpoint)
-          ? String.fromEnvironment(envAuthEndpoint,
-              defaultValue: defaultAuthEndpoint)
+      whitelistEnabled: bool.hasEnvironment(envWhitelistEnabled)
+          ? bool.fromEnvironment(envWhitelistEnabled,
+              defaultValue: defaultWhitelistEnabled)
+          : null,
+      accountRequired: bool.hasEnvironment(envAccountRequired)
+          ? bool.fromEnvironment(envAccountRequired,
+              defaultValue: defaultAccountRequired)
           : null,
       endpointSecret: bool.hasEnvironment(envEndpointSecret)
           ? String.fromEnvironment(envEndpointSecret,
@@ -110,5 +119,8 @@ final class SetonixConfig with SetonixConfigMappable {
         maxPlayers: other.maxPlayers ?? maxPlayers,
         description: other.description ?? description,
         guestPrefix: other.guestPrefix ?? guestPrefix,
+        endpointSecret: other.endpointSecret ?? endpointSecret,
+        accountRequired: other.accountRequired ?? accountRequired,
+        whitelistEnabled: other.whitelistEnabled ?? whitelistEnabled,
       );
 }

api/lib/src/models/config.mapper.dart

@@ -6,8 +6,14 @@ import 'package:networker/networker.dart';
 class ChallengeManager {
   final Map<Channel, Uint8List> _challenges = {};
 
-  Uint8List getChallenge(Channel channel) {
-    return _challenges[channel] ??= generateChallenge();
+  Uint8List? getChallenge(Channel channel) {
+    return _challenges[channel];
+  }
+
+  Uint8List generateNewChallenge(Channel channel) {
+    final challenge = generateChallenge();
+    _challenges[channel] = challenge;
+    return challenge;
   }
 
   void removeChallenge(Channel channel) {

api/lib/src/services/challenge.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:typed_data';
 
 import 'package:dart_mappable/dart_mappable.dart';
 import 'package:networker/networker.dart';
@@ -39,10 +38,12 @@ final class UserManager {
   final Map<Channel, SetonixUser> _users = {};
   final String guestPrefix;
   final UserService? service;
+  final bool whitelistEnabled;
   int _nextGuestId = 1;
 
   UserManager({
     this.service,
+    this.whitelistEnabled = SetonixConfig.defaultWhitelistEnabled,
     this.guestPrefix = SetonixConfig.defaultGuestPrefix,
   });
 
@@ -78,7 +79,13 @@ final class UserManager {
   Future<bool> addUser(Channel channel,
       [String? fingerprint, String? name]) async {
     SetonixUser? user;
-    if (fingerprint != null) user = await service?.getUser(fingerprint);
+    if (fingerprint != null) {
+      user = await service?.getUser(fingerprint);
+      if (user != null) name = user.name;
+      if (whitelistEnabled && user?.onWhitelist != true) {
+        return false; // User is not on the whitelist
+      }
+    }
     name ??= _generateGuestName();
     if (containsUserName(name)) {
       return false;

api/lib/src/services/user.dart

@@ -61,10 +61,10 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: "8295b0b6dfe00499b786718f2936a56b5e0d56d169c528472c8c1908f2b1e3ee"
+      sha256: "74273591bd8b7f82eeb1f191c1b65a6576535bbfd5ca3722778b07d5702d33cc"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.5.3"
   build_config:
     dependency: transitive
     description:
@@ -85,26 +85,26 @@ packages:
     dependency: transitive
     description:
       name: build_resolvers
-      sha256: "57fe2f9149b01d52fcd0ea7de17083739b5cf9e040dedb4e24a17c628c1e9caf"
+      sha256: badce70566085f2e87434531c4a6bc8e833672f755fc51146d612245947e91c9
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.5.3"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "9b196d7b629c5317dff3ec83c7e98840b773cee3b9339b646fe487048d2ebc74"
+      sha256: b9070a4127033777c0e63195f6f117ed16a351ed676f6313b095cf4f328c0b82
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.5.3"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: dae6a8a5cbef6866cdfa0d96df4b0d85b9086897096270a405a44d946dafffba
+      sha256: "1cdfece3eeb3f1263f7dbf5bcc0cba697bd0c22d2c866cb4b578c954dbb09bcf"
       url: "https://pub.dev"
     source: hosted
-    version: "9.0.0"
+    version: "9.1.1"
   built_collection:
     dependency: transitive
     description: