TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-21 18:08:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix percent encoding

Browse Source 
Must use utf8 bytes, of course…
This commit is contained in:
Eike Kettner
2019-12-11 21:56:31 +01:00
parent 2b10652082
commit 07a23b9611
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
modules/common/src/main/scala/docspell/common/LenientUri.scala
View File

@ -8,6 +8,7 @@ import cats.data.NonEmptyList
import cats.effect.{Blocker, ContextShift, Sync} import cats.effect.{Blocker, ContextShift, Sync}
import docspell.common.LenientUri.Path import docspell.common.LenientUri.Path
import io.circe.{Decoder, Encoder} import io.circe.{Decoder, Encoder}
import scodec.bits.ByteVector
/** A URI. /** A URI.
* *
@ -166,19 +167,28 @@ object LenientUri {
} }
} }
private[this] val delims: Set[Char] = ":/?#[]@".toSet private[this] val delims: Set[Char] = ",/?:@&=+$# %".toSet
private def percentEncode(s: String): String = private def percent(s: String): String =
s.flatMap(c => if (delims.contains(c)) s"%${c.toInt.toHexString}" else c.toString) "%" + ByteVector.encodeUtf8(s).
fold(throw _, identity).
toHex
private def percentDecode(s: String): String = def percentEncode(s: String): String =
s.flatMap(c =>
if (delims.contains(c)) percent(c.toString) else c.toString)
def percentDecode(s: String): String =
if (!s.contains("%")) s if (!s.contains("%")) s
else s.foldLeft(("", "")) { case ((acc, res), c) => else
if (acc.length == 2) ("", res :+ Integer.parseInt(acc.drop(1) :+ c, 16).toChar) s.foldLeft(("", ByteVector.empty)) {
case ((acc, res), c) =>
if (acc.length == 2) ("", res ++ ByteVector.fromValidHex(acc.drop(1) + c))
else if (acc.startsWith("%")) (acc :+ c, res) else if (acc.startsWith("%")) (acc :+ c, res)
else if (c == '%') ("%", res) else if (c == '%') ("%", res)
else (acc, res :+ c) else (acc, res :+ c.toByte)
}._2 }
._2.decodeUtf8.fold(throw _, identity)
private def stripLeading(s: String, c: Char): String = private def stripLeading(s: String, c: Char): String =
if (s.length > 0 && s.charAt(0) == c) s.substring(1) if (s.length > 0 && s.charAt(0) == c) s.substring(1)