WIP

Signed-off-by: Nguyen Van Nguyen <[email protected]>
web-of-trust · Mar 25, 2024 · d7d6b54 · d7d6b54
1 parent b747e8d
commit d7d6b54
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 25 deletions.
diff --git a/lib/src/openpgp.dart b/lib/src/openpgp.dart
@@ -85,6 +85,11 @@ class OpenPGP {
   ) async =>
       PublicKey.fromArmored(armoredPublicKey);
 
+  /// Read an armored OpenPGP public key list.
+  static List<PublicKey> readPublicKeys(final String armoredPublicKeys) {
+    return PublicKey.readPublicKeys(armoredPublicKeys);
+  }
+
   /// Sign a cleartext message.
   static Future<SignedMessage> sign(
     final String cleartext,

diff --git a/lib/src/packet/packet_list.dart b/lib/src/packet/packet_list.dart
@@ -113,10 +113,7 @@ class PacketList extends ListBase<ContainedPacket> {
   }
 
   Uint8List encode() => Uint8List.fromList(
-        packets
-            .map((packet) => packet.encode())
-            .expand((byte) => byte)
-            .toList(growable: false),
+        packets.map((packet) => packet.encode()).expand((byte) => byte).toList(growable: false),
       );
 
   PacketList filterByTags([final List<PacketTag> tags = const []]) {
@@ -126,6 +123,18 @@ class PacketList extends ListBase<ContainedPacket> {
     return this;
   }
 
+  List<int> indexOfTags([final List<PacketTag> tags = const []]) {
+    final indexes = <int>[];
+    for (var i = 0; i < packets.length; i++) {
+      final packet = packets[i];
+      if (tags.contains(packet.tag)) {
+        indexes.add(i);
+      }
+    }
+
+    return indexes;
+  }
+
   @override
   int get length => packets.length;
 

diff --git a/lib/src/type/key.dart b/lib/src/type/key.dart
@@ -81,8 +81,7 @@ abstract class Key {
       for (final user in users) {
         for (var signature in user.selfCertifications) {
           if (signature.keyFlags != null &&
-              !(signature.keyFlags!.isEncryptStorage ||
-                  signature.keyFlags!.isEncryptCommunication)) {
+              !(signature.keyFlags!.isEncryptStorage || signature.keyFlags!.isEncryptCommunication)) {
             return false;
           }
         }
@@ -107,8 +106,7 @@ abstract class Key {
   bool get aeadSupported {
     for (final user in users) {
       for (var signature in user.selfCertifications) {
-        if (signature.features != null &&
-            signature.features!.supportAeadEncryptedData) {
+        if (signature.features != null && signature.features!.supportAeadEncryptedData) {
           return true;
         }
       }
@@ -184,9 +182,9 @@ abstract class Key {
     final DateTime? date,
   }) async {
     if (revocationSignatures.isNotEmpty) {
-      for (var revocation in revocationSignatures) {
-        if (signature == null ||
-            revocation.issuerKeyID.id == signature.issuerKeyID.id) {
+      final revocationKeyIDs = <String>[];
+      for (final revocation in revocationSignatures) {
+        if (signature == null || revocation.issuerKeyID.id == signature.issuerKeyID.id) {
           if (await revocation.verify(
             keyPacket,
             keyPacket.writeForSign(),
@@ -195,7 +193,9 @@ abstract class Key {
             return true;
           }
         }
+        revocationKeyIDs.add(revocation.issuerKeyID.id);
       }
+      return revocationKeyIDs.isNotEmpty;
     }
     return false;
   }
@@ -242,9 +242,7 @@ abstract class Key {
         ...revocationSignatures,
         ...directSignatures,
         ...users.map((user) => user.toPacketList()).expand((packet) => packet),
-        ...subkeys
-            .map((subkey) => subkey.toPacketList())
-            .expand((packet) => packet),
+        ...subkeys.map((subkey) => subkey.toPacketList()).expand((packet) => packet),
       ]);
 
   static Map<String, dynamic> readPacketList(final PacketList packetList) {

diff --git a/lib/src/type/public_key.dart b/lib/src/type/public_key.dart
@@ -3,6 +3,7 @@
 // file that was distributed with this source code.
 
 import '../armor/armor.dart';
+import '../enum/packet_tag.dart';
 import '../enum/armor_type.dart';
 import '../packet/packet_list.dart';
 import '../packet/key_packet.dart';
@@ -41,6 +42,28 @@ class PublicKey extends Key {
     );
   }
 
+  static List<PublicKey> readPublicKeys(String armored) {
+    final armor = Armor.decode(armored);
+    if (armor.type != ArmorType.publicKey) {
+      throw ArgumentError('Armored text not of public key type');
+    }
+    final publicKeys = <PublicKey>[];
+    final packetList = PacketList.packetDecode(armor.data);
+    final indexes = packetList.indexOfTags([PacketTag.publicKey]);
+    for (var i = 0; i < indexes.length; i++) {
+      if (indexes.asMap().containsKey(i + 1)) {
+        publicKeys.add(
+          PublicKey.fromPacketList(
+            PacketList(
+              packetList.packets.sublist(indexes[i], indexes[i + 1]),
+            ),
+          ),
+        );
+      }
+    }
+    return publicKeys;
+  }
+
   @override
   PublicKeyPacket get keyPacket => super.keyPacket as PublicKeyPacket;
 
@@ -67,8 +90,7 @@ class PublicKey extends Key {
         }
       }
     }
-    if (isSigningKey ||
-        (keyID.isNotEmpty && keyID != keyPacket.keyID.toString())) {
+    if (isSigningKey || (keyID.isNotEmpty && keyID != keyPacket.keyID.toString())) {
       throw StateError('Could not find valid encryption key packet.');
     }
     return keyPacket.publicKey;
@@ -91,8 +113,7 @@ class PublicKey extends Key {
         }
       }
     }
-    if (isEncryptionKey ||
-        (keyID.isNotEmpty && keyID != keyPacket.keyID.toString())) {
+    if (isEncryptionKey || (keyID.isNotEmpty && keyID != keyPacket.keyID.toString())) {
       throw StateError('Could not find valid verification key packet.');
     }
     return keyPacket;

diff --git a/lib/src/type/subkey.dart b/lib/src/type/subkey.dart
@@ -56,8 +56,7 @@ class Subkey {
     if (keyPacket.isEncryptionKey) {
       for (final signature in bindingSignatures) {
         if (signature.keyFlags != null &&
-            !(signature.keyFlags!.isEncryptStorage ||
-                signature.keyFlags!.isEncryptCommunication)) {
+            !(signature.keyFlags!.isEncryptStorage || signature.keyFlags!.isEncryptCommunication)) {
           return false;
         }
       }
@@ -104,9 +103,9 @@ class Subkey {
     final DateTime? date,
   }) async {
     if (mainKey != null && revocationSignatures.isNotEmpty) {
-      for (var revocation in revocationSignatures) {
-        if (signature == null ||
-            revocation.issuerKeyID.id == signature.issuerKeyID.id) {
+      final revocationKeyIDs = <String>[];
+      for (final revocation in revocationSignatures) {
+        if (signature == null || revocation.issuerKeyID.id == signature.issuerKeyID.id) {
           if (await revocation.verify(
             mainKey!.keyPacket,
             Uint8List.fromList([
@@ -118,7 +117,9 @@ class Subkey {
             return true;
           }
         }
+        revocationKeyIDs.add(revocation.issuerKeyID.id);
       }
+      return revocationKeyIDs.isNotEmpty;
     }
     return false;
   }

diff --git a/lib/src/type/user.dart b/lib/src/type/user.dart
@@ -38,9 +38,9 @@ class User {
     final DateTime? date,
   }) async {
     if (mainKey != null && revocationSignatures.isNotEmpty) {
+      final revocationKeyIDs = <String>[];
       for (var revocation in revocationSignatures) {
-        if (signature == null ||
-            revocation.issuerKeyID.id == signature.issuerKeyID.id) {
+        if (signature == null || revocation.issuerKeyID.id == signature.issuerKeyID.id) {
           if (await revocation.verifyUserCertification(
             mainKey!.keyPacket,
             userID: userID,
@@ -50,7 +50,9 @@ class User {
             return true;
           }
         }
+        revocationKeyIDs.add(revocation.issuerKeyID.id);
       }
+      return revocationKeyIDs.isNotEmpty;
     }
     return false;
   }