TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-04 06:05:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't require a prefix when configuring byte arrays

Browse Source
This commit is contained in:
Eike Kettner 2020-01-05 15:28:57 +01:00
parent 993a3d05e2
commit 9020d9aa3b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/common/src/main/scala/docspell/common/pureconfig/Implicits.scala
View File

@ -27,7 +27,7 @@ object Implicits {
ConfigReader[String].emap(reason(str => { ConfigReader[String].emap(reason(str => {
if (str.startsWith("hex:")) ByteVector.fromHex(str.drop(4)).toRight("Invalid hex value.") if (str.startsWith("hex:")) ByteVector.fromHex(str.drop(4)).toRight("Invalid hex value.")
else if (str.startsWith("b64:")) ByteVector.fromBase64(str.drop(4)).toRight("Invalid Base64 string.") else if (str.startsWith("b64:")) ByteVector.fromBase64(str.drop(4)).toRight("Invalid Base64 string.")
else ByteVector.fromHex(str).toRight("Invalid hex value.") else ByteVector.encodeUtf8(str).left.map(ex => s"Invalid utf8 string: ${ex.getMessage}")
})) }))
def reason[A: ClassTag](f: String => Either[String, A]): String => Either[FailureReason, A] = def reason[A: ClassTag](f: String => Either[String, A]): String => Either[FailureReason, A] =

3
modules/microsite/docs/doc/configure.md
View File

@ -187,7 +187,8 @@ The `server-secret` is used to sign the token. If multiple REST
servers are deployed, all must share the same server secret. Otherwise servers are deployed, all must share the same server secret. Otherwise
tokens from one instance are not valid on another instance. The secret tokens from one instance are not valid on another instance. The secret
can be given as Base64 encoded string or in hex form. Use the prefix can be given as Base64 encoded string or in hex form. Use the prefix
`hex:` and `b64:`, respectively. `hex:` and `b64:`, respectively. If no prefix is given, the UTF8 bytes
of the string are used.
The `session-valid` deterimens how long a token is valid. This can be The `session-valid` deterimens how long a token is valid. This can be
just some minutes, the web application obtains new ones just some minutes, the web application obtains new ones