Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Decode bignums properly #454

Merged
merged 6 commits into from
Mar 22, 2023
Merged

Decode bignums properly #454

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
028d9fb
Decode bignums properly
ybasket Feb 26, 2023
6bfa4e5
Add header to new test file
ybasket Feb 26, 2023
efa8c41
Fix handling of other tags on bignums
ybasket Mar 8, 2023
a39bdd7
Merge branch 'main' into fix/bignum-decoding
ybasket Mar 15, 2023
3dfcd66
Merge branch 'main' into fix/bignum-decoding
ybasket Mar 21, 2023
d536f51
Attempt to make Scala.js happy
ybasket Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cbor/shared/src/main/scala/fs2/data/cbor/CborException.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@ sealed abstract class CborException(msg: String, inner: Throwable) extends Excep

class CborParsingException(msg: String, inner: Throwable = null) extends CborException(msg, inner)

class CborTagDecodingException(msg: String, inner: Throwable = null) extends CborException(msg, inner)

class CborValidationException(msg: String, inner: Throwable = null) extends CborException(msg, inner)
98 changes: 52 additions & 46 deletions cbor/shared/src/main/scala/fs2/data/cbor/high/internal/ValueParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ package internal
import low.CborItem

import scala.collection.mutable

import java.lang.{Float => JFloat, Double => JDouble, Long => JLong}
import java.lang.{Double => JDouble, Float => JFloat, Long => JLong}
import scodec.bits.ByteVector

object ValueParser {
Expand Down Expand Up @@ -209,16 +208,31 @@ object ValueParser {
private def parseTags[F[_]](chunk: Chunk[CborItem],
idx: Int,
rest: Stream[F, CborItem],
tags: CborValue => CborValue,
tags: CborValue => Pull[F, Nothing, CborValue],
chunkAcc: List[CborValue])(implicit
F: RaiseThrowable[F]): Pull[F, CborValue, Result[F, CborValue => CborValue]] =
F: RaiseThrowable[F]): Pull[F, CborValue, Result[F, CborValue => Pull[F, Nothing, CborValue]]] =
if (idx >= chunk.size) {
Pull.output(Chunk.seq(chunkAcc.reverse)) >> rest.pull.uncons.flatMap {
case Some((hd, tl)) => parseTags(hd, 0, tl, tags, Nil)
case None => Pull.raiseError(new CborParsingException("unexpected end of input"))
}
} else {
chunk(idx) match {
case CborItem.Tag(Tags.PositiveBigNum) =>
def f: CborValue => Pull[F, Nothing, CborValue] = {
case CborValue.ByteString(bytes) => tags(CborValue.Integer(BigInt(bytes.toArrayUnsafe)))
case CborValue.Tagged(tag2, v) => f(v).map(CborValue.Tagged(tag2, _))
satabin marked this conversation as resolved.
Show resolved Hide resolved
case _ => Pull.raiseError(new CborTagDecodingException("A bignum must have a byte string as value"))
satabin marked this conversation as resolved.
Show resolved Hide resolved
}
parseTags(chunk, idx + 1, rest, f, chunkAcc)
case CborItem.Tag(Tags.NegativeBigNum) =>
def f: CborValue => Pull[F, Nothing, CborValue] = {
case CborValue.ByteString(bytes) =>
tags(CborValue.Integer(minusOne + minusOne * BigInt(bytes.toArrayUnsafe)))
case CborValue.Tagged(tag2, v) => f(v).map(CborValue.Tagged(tag2, _))
case _ => Pull.raiseError(new CborTagDecodingException("A bignum must have a byte string as value"))
}
parseTags(chunk, idx + 1, rest, f, chunkAcc)
case CborItem.Tag(tag) => parseTags(chunk, idx + 1, rest, v => tags(CborValue.Tagged(tag, v)), chunkAcc)
case _ => Pull.pure((chunk, idx, rest, chunkAcc, tags))
}
Expand All @@ -228,76 +242,68 @@ object ValueParser {

private def parseValue[F[_]](chunk: Chunk[CborItem], idx: Int, rest: Stream[F, CborItem], chunkAcc: List[CborValue])(
implicit F: RaiseThrowable[F]): Pull[F, CborValue, Result[F, CborValue]] =
parseTags(chunk, idx, rest, identity, chunkAcc).flatMap { case (chunk, idx, rest, chunkAcc, tags) =>
parseTags(chunk, idx, rest, Pull.pure, chunkAcc).flatMap { case (chunk, idx, rest, chunkAcc, tags) =>
if (idx >= chunk.size) {
Pull.output(Chunk.seq(chunkAcc.reverse)) >> rest.pull.uncons.flatMap {
case Some((hd, tl)) => parseValue(hd, 0, tl, Nil)
case None => Pull.raiseError(new CborParsingException("unexpected end of input"))
}
} else {
chunk(idx) match {
case CborItem.False => Pull.pure((chunk, idx + 1, rest, chunkAcc, tags(CborValue.False)))
case CborItem.True => Pull.pure((chunk, idx + 1, rest, chunkAcc, tags(CborValue.True)))
case CborItem.Null => Pull.pure((chunk, idx + 1, rest, chunkAcc, tags(CborValue.Null)))
case CborItem.Undefined => Pull.pure((chunk, idx + 1, rest, chunkAcc, tags(CborValue.Undefined)))
case CborItem.False =>
tags(CborValue.False).map(v => (chunk, idx + 1, rest, chunkAcc, v))
case CborItem.True =>
tags(CborValue.True).map(v => (chunk, idx + 1, rest, chunkAcc, v))
case CborItem.Null =>
tags(CborValue.Null).map(v => (chunk, idx + 1, rest, chunkAcc, v))
case CborItem.Undefined =>
tags(CborValue.Undefined).map(v => (chunk, idx + 1, rest, chunkAcc, v))
case CborItem.SimpleValue(value) =>
Pull.pure((chunk, idx + 1, rest, chunkAcc, tags(CborValue.SimpleValue(value))))
tags(CborValue.SimpleValue(value)).map(v => (chunk, idx + 1, rest, chunkAcc, v))
case CborItem.PositiveInt(bytes) =>
val value = BigInt(bytes.toHex, 16)
Pull.pure((chunk, idx + 1, rest, chunkAcc, tags(CborValue.Integer(value))))
val value = BigInt(bytes.toArrayUnsafe)
tags(CborValue.Integer(value)).map(v => (chunk, idx + 1, rest, chunkAcc, v))
case CborItem.NegativeInt(bytes) =>
val value = minusOne - BigInt(bytes.toHex, 16)
Pull.pure((chunk, idx + 1, rest, chunkAcc, tags(CborValue.Integer(value))))
val value = minusOne - BigInt(bytes.toArrayUnsafe)
tags(CborValue.Integer(value)).map(v => (chunk, idx + 1, rest, chunkAcc, v))
case CborItem.Float16(raw) =>
Pull.pure(
(chunk,
idx + 1,
rest,
chunkAcc,
tags(CborValue.Float32(fs2.data.cbor.HalfFloat.toFloat(raw.toShort(signed = false))))))
tags(CborValue.Float32(fs2.data.cbor.HalfFloat.toFloat(raw.toShort(signed = false)))).map(v =>
(chunk, idx + 1, rest, chunkAcc, v))
case CborItem.Float32(raw) =>
Pull.pure(
(chunk,
idx + 1,
rest,
chunkAcc,
tags(CborValue.Float32(JFloat.intBitsToFloat(raw.toInt(signed = false))))))
tags(CborValue.Float32(JFloat.intBitsToFloat(raw.toInt(signed = false)))).map(v =>
(chunk, idx + 1, rest, chunkAcc, v))
case CborItem.Float64(raw) =>
Pull.pure(
(chunk,
idx + 1,
rest,
chunkAcc,
tags(CborValue.Float64(JDouble.longBitsToDouble(raw.toLong(signed = false))))))
tags(CborValue.Float64(JDouble.longBitsToDouble(raw.toLong(signed = false)))).map(v =>
(chunk, idx + 1, rest, chunkAcc, v))
case CborItem.ByteString(bytes) =>
Pull.pure((chunk, idx + 1, rest, chunkAcc, tags(CborValue.ByteString(bytes))))
tags(CborValue.ByteString(bytes)).map(v => (chunk, idx + 1, rest, chunkAcc, v))
case CborItem.StartIndefiniteByteString =>
parseByteStrings(chunk, idx + 1, rest, ByteVector.empty, chunkAcc).map {
parseByteStrings(chunk, idx + 1, rest, ByteVector.empty, chunkAcc).flatMap {
case (chunk, idx, rest, chunkAcc, bs) =>
(chunk, idx, rest, chunkAcc, tags(bs))
tags(bs).map(v => (chunk, idx, rest, chunkAcc, v))
}
case CborItem.TextString(string) =>
Pull.pure((chunk, idx + 1, rest, chunkAcc, tags(CborValue.TextString(string))))
tags(CborValue.TextString(string)).map(v => (chunk, idx + 1, rest, chunkAcc, v))
case CborItem.StartIndefiniteTextString =>
parseTextStrings(chunk, idx + 1, rest, new StringBuilder, chunkAcc).map {
parseTextStrings(chunk, idx + 1, rest, new StringBuilder, chunkAcc).flatMap {
case (chunk, idx, rest, chunkAcc, ts) =>
(chunk, idx, rest, chunkAcc, tags(ts))
tags(ts).map(v => (chunk, idx, rest, chunkAcc, v))
}
case CborItem.StartArray(size) =>
parseArray(chunk, idx + 1, rest, size, new mutable.ListBuffer, chunkAcc).map {
case (chunk, idx, rest, chunkAcc, array) => (chunk, idx, rest, chunkAcc, tags(array))
parseArray(chunk, idx + 1, rest, size, new mutable.ListBuffer, chunkAcc).flatMap {
case (chunk, idx, rest, chunkAcc, array) => tags(array).map(v => (chunk, idx, rest, chunkAcc, v))
}
case CborItem.StartIndefiniteArray =>
parseIndefiniteArray(chunk, idx + 1, rest, new mutable.ListBuffer, chunkAcc).map {
case (chunk, idx, rest, chunkAcc, array) => (chunk, idx, rest, chunkAcc, tags(array))
parseIndefiniteArray(chunk, idx + 1, rest, new mutable.ListBuffer, chunkAcc).flatMap {
case (chunk, idx, rest, chunkAcc, array) => tags(array).map(v => (chunk, idx, rest, chunkAcc, v))
}
case CborItem.StartMap(size) =>
parseMap(chunk, idx + 1, rest, size, mutable.Map.empty, chunkAcc).map {
case (chunk, idx, rest, chunkAcc, array) => (chunk, idx, rest, chunkAcc, tags(array))
parseMap(chunk, idx + 1, rest, size, mutable.Map.empty, chunkAcc).flatMap {
case (chunk, idx, rest, chunkAcc, array) => tags(array).map(v => (chunk, idx, rest, chunkAcc, v))
}
case CborItem.StartIndefiniteMap =>
parseIndefiniteMap(chunk, idx + 1, rest, mutable.Map.empty, chunkAcc).map {
case (chunk, idx, rest, chunkAcc, array) => (chunk, idx, rest, chunkAcc, tags(array))
parseIndefiniteMap(chunk, idx + 1, rest, mutable.Map.empty, chunkAcc).flatMap {
case (chunk, idx, rest, chunkAcc, array) => tags(array).map(v => (chunk, idx, rest, chunkAcc, v))
}
case item =>
raise(new CborParsingException(s"unknown item $item"), chunkAcc)
Expand Down
32 changes: 32 additions & 0 deletions cbor/shared/src/test/scala/fs2/data/cbor/high/ValueParserTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
* Copyright 2022 Lucas Satabin
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package fs2.data.cbor.high

import cats.effect.IO
import fs2._
import weaver.SimpleIOSuite

object ValueParserTest extends SimpleIOSuite {
ybasket marked this conversation as resolved.
Show resolved Hide resolved

test("roundtrips bignums") {
val in = CborValue.Integer(BigInt("-739421513997118914047232662242593364"))
Stream(in).covary[IO].through(toBinary).through(values).compile.onlyOrError.map { out =>
expect.same(in, out)
}
}

}