hubert/SimpleNotes
1
0
Fork 0
Code Projects Releases Activity

Add tasklist markdown extension

Browse Source
This commit is contained in:
Hubert Van De Walle 2020-08-14 02:32:05 +02:00
parent 29e445ff41
commit 24ac5cf4fc
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
domain/pom.xml
View File

@ -42,6 +42,11 @@
<artifactId>flexmark</artifactId> <artifactId>flexmark</artifactId>
<version>0.62.2</version> <version>0.62.2</version>
</dependency> </dependency>
<dependency>
<groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-ext-gfm-tasklist</artifactId>
<version>0.62.2</version>
</dependency>
<dependency> <dependency>
<groupId>org.yaml</groupId> <groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId> <artifactId>snakeyaml</artifactId>

2
domain/src/main/kotlin/security/HtmlSanitizer.kt
View File

@ -11,6 +11,8 @@ object HtmlSanitizer {
.allowAttributes("class").onElements("code") .allowAttributes("class").onElements("code")
.allowUrlProtocols("http", "https") .allowUrlProtocols("http", "https")
.allowAttributes("href").onElements("a") .allowAttributes("href").onElements("a")
.allowElements("input")
.allowAttributes("type", "checked", "disabled", "readonly").onElements("input")
.requireRelNofollowOnLinks() .requireRelNofollowOnLinks()
.toFactory()!! .toFactory()!!

17
domain/src/main/kotlin/usecases/markdown/MarkdownConverter.kt
View File

@ -1,20 +1,21 @@
package be.simplenotes.domain.usecases.markdown package be.simplenotes.domain.usecases.markdown
import arrow.core.Either import arrow.core.Either
import arrow.core.Try
import arrow.core.extensions.fx import arrow.core.extensions.fx
import arrow.core.left import arrow.core.left
import arrow.core.right import arrow.core.right
import be.simplenotes.domain.model.NoteMetadata import be.simplenotes.domain.model.NoteMetadata
import be.simplenotes.domain.validation.NoteValidations import be.simplenotes.domain.validation.NoteValidations
import com.auth0.jwt.JWT import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension
import com.vladsch.flexmark.html.HtmlRenderer import com.vladsch.flexmark.html.HtmlRenderer
import com.vladsch.flexmark.parser.Parser import com.vladsch.flexmark.parser.Parser
import com.vladsch.flexmark.util.data.MutableDataSet
import io.konform.validation.ValidationErrors import io.konform.validation.ValidationErrors
import org.yaml.snakeyaml.Yaml import org.yaml.snakeyaml.Yaml
import org.yaml.snakeyaml.parser.ParserException import org.yaml.snakeyaml.parser.ParserException
import org.yaml.snakeyaml.scanner.ScannerException import org.yaml.snakeyaml.scanner.ScannerException
sealed class MarkdownParsingError sealed class MarkdownParsingError
object MissingMeta : MarkdownParsingError() object MissingMeta : MarkdownParsingError()
object InvalidMeta : MarkdownParsingError() object InvalidMeta : MarkdownParsingError()
@ -60,8 +61,16 @@ internal class MarkdownConverterImpl : MarkdownConverter {
return NoteMetadata(title, tags).right() return NoteMetadata(title, tags).right()
} }
private val parser = Parser.builder().build() private val parser: Parser
private val renderer = HtmlRenderer.builder().build() private val renderer: HtmlRenderer
init {
val options = MutableDataSet()
options.set(Parser.EXTENSIONS, listOf(TaskListExtension.create()))
parser = Parser.builder(options).build()
renderer = HtmlRenderer.builder(options).build()
}
private fun renderMarkdown(markdown: String) = parser.parse(markdown).run(renderer::render) private fun renderMarkdown(markdown: String) = parser.parse(markdown).run(renderer::render)
override fun renderDocument(input: String) = Either.fx<MarkdownParsingError, Document> { override fun renderDocument(input: String) = Either.fx<MarkdownParsingError, Document> {