possible scram auth more coberage

Jouby · Apr 30, 2021 · acb5d23 · acb5d23
1 parent 67a38b6
commit acb5d23
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 15 deletions.
diff --git a/lib/src/authentication/cryptosign_authentication.dart b/lib/src/authentication/cryptosign_authentication.dart
@@ -88,8 +88,7 @@ class CryptosignAuthentication extends AbstractAuthentication {
     }
     var authenticate = Authenticate();
 
-    authenticate.extra = HashMap<String, dynamic>();
-    authenticate.extra!['channel_binding'] = channelBinding;
+    authenticate.extra['channel_binding'] = channelBinding;
     var binaryChallenge = hexToBin(extra.challenge);
     authenticate.signature =
         privateKey.sign(binaryChallenge).encode(HexCoder.instance);

diff --git a/lib/src/authentication/scram_authentication.dart b/lib/src/authentication/scram_authentication.dart
@@ -69,12 +69,12 @@ class ScramAuthentication extends AbstractAuthentication {
     var authenticate = Authenticate();
 
     authenticate.extra = HashMap<String, Object>();
-    authenticate.extra!['nonce'] = extra.nonce;
-    authenticate.extra!['channel_binding'] = null;
-    authenticate.extra!['cbind_data'] = null;
+    authenticate.extra['nonce'] = extra.nonce;
+    authenticate.extra['channel_binding'] = null;
+    authenticate.extra['cbind_data'] = null;
     if (extra.kdf == KDF_PBKDF2) {
       authenticate.signature =
-          challengePBKDF2(_authid!, _helloNonce!, extra, HashMap<String, dynamic>.from(authenticate.extra!));
+          challengePBKDF2(_authid!, _helloNonce!, extra, HashMap<String, dynamic>.from(authenticate.extra));
     }
     if (authenticate.signature == null) {
       return Future.error(

diff --git a/lib/src/message/authenticate.dart b/lib/src/message/authenticate.dart
@@ -4,7 +4,7 @@ import 'message_types.dart';
 /// The WAMP Authenticate massage
 class Authenticate extends AbstractMessage {
   String? signature;
-  Map<String, dynamic>? extra;
+  Map<String, dynamic> extra = {};
 
   /// Creates a WAMP Authentication message with a [signature] that was
   /// cryptographically created by an authentication method of this package

diff --git a/lib/src/serializer/msgpack/serializer.dart b/lib/src/serializer/msgpack/serializer.dart
@@ -247,7 +247,7 @@ class Serializer extends AbstractSerializer {
       return Uint8List.fromList([147] +
           msgpack_dart.serialize(MessageTypes.CODE_AUTHENTICATE) +
           msgpack_dart.serialize(message.signature ?? '') +
-          msgpack_dart.serialize(message.extra ?? '{}'));
+          msgpack_dart.serialize(message.extra));
     }
     if (message is Register) {
       return Uint8List.fromList([148] +

diff --git a/test/authentication/scram_authentication_test.dart b/test/authentication/scram_authentication_test.dart
@@ -44,10 +44,10 @@ void main() {
       challengeExtra2.nonce = authMethod.helloNonce! + 'nonce';
       var authenticate = await authMethod.challenge(challengeExtra2);
       expect(authenticate.signature, isNotNull);
-      expect(authenticate.extra!['nonce'],
+      expect(authenticate.extra['nonce'],
           equals(challengeExtra2.nonce = authMethod.helloNonce! + 'nonce'));
-      expect(authenticate.extra!['channel_binding'], isNull);
-      expect(authenticate.extra!['cbind_data'], isNull);
+      expect(authenticate.extra['channel_binding'], isNull);
+      expect(authenticate.extra['cbind_data'], isNull);
     });
     test('timedout challenge', () async {
       final authMethod = ScramAuthentication(secret,

diff --git a/test/serializer/json/serializer_test.dart b/test/serializer/json/serializer_test.dart
@@ -64,8 +64,7 @@ void main() {
           equals(
               '[${MessageTypes.CODE_AUTHENTICATE},"${"someSignature"}",{}]'));
       var authenticate = Authenticate.signature('someSignature');
-      authenticate.extra = HashMap<String, Object>();
-      authenticate.extra!['nonce'] = 'abc';
+      authenticate.extra['nonce'] = 'abc';
       expect(
           serializer.serializeToString(authenticate),
           equals(

diff --git a/test/serializer/msgpack/serializer_test.dart b/test/serializer/msgpack/serializer_test.dart
@@ -207,8 +207,7 @@ void main() {
             110, 97, 116, 117, 114, 101, 162, 123, 125
           ])));
       var authenticate = Authenticate.signature('someSignature');
-      authenticate.extra = HashMap<String, Object>();
-      authenticate.extra!['nonce'] = 'abc';
+      authenticate.extra['nonce'] = 'abc';
       expect(
           serializer.serialize(authenticate),
           equals(Uint8List.fromList([