Directory: fix broken directory-signature parsing

nblockchain · Apr 23, 2023 · 7b574cd · 7b574cd
1 parent 41cfb4a
commit 7b574cd
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/NOnion.Tests/Directory-Samples/NetworkStatus.json b/NOnion.Tests/Directory-Samples/NetworkStatus.json
diff --git a/NOnion/Directory/NetworkStatusDocument.fs b/NOnion/Directory/NetworkStatusDocument.fs
@@ -1,7 +1,6 @@
 namespace NOnion.Directory
 
 open System
-open System.Text
 
 open NOnion
 open NOnion.Utility
@@ -216,14 +215,16 @@ type RouterStatusEntry =
 
 type DirectorySignature =
     {
+        Algorithm: Option<string>
         Identity: Option<string>
         Digest: Option<string>
         Signature: Option<string>
     }
 
     static member Empty =
         {
-            DirectorySignature.Identity = None
+            DirectorySignature.Algorithm = None
+            Identity = None
             Digest = None
             Signature = None
         }
@@ -252,12 +253,25 @@ type DirectorySignature =
                 | "directory-signature" when state.Identity = None ->
                     lines.Dequeue() |> ignore<string>
 
-                    innerParse
-                        { state with
-                            DirectorySignature.Identity = readWord() |> Some
-                            Digest = readWord() |> Some
-                            Signature = readBlock String.Empty |> Some
-                        }
+                    let algs = [ "sha1"; "sha256" ]
+                    let maybeAlg = readWord()
+
+                    if Seq.contains maybeAlg algs then
+                        innerParse
+                            { state with
+                                DirectorySignature.Algorithm = maybeAlg |> Some
+                                Identity = readWord() |> Some
+                                Digest = readWord() |> Some
+                                Signature = readBlock String.Empty |> Some
+                            }
+                    else
+                        innerParse
+                            { state with
+                                DirectorySignature.Algorithm = "sha1" |> Some
+                                Identity = maybeAlg |> Some
+                                Digest = readWord() |> Some
+                                Signature = readBlock String.Empty |> Some
+                            }
                 | "directory-signature" when state.Identity <> None -> state
                 | _ -> state