proper escaping in json pointers

Author: erosb

src/main/kotlin/com/github/erosb/jsonsKema/DynamicPath.kt

@@ -11,6 +11,15 @@ class DynamicPath {
         return rval
     }
 
+    fun <P> inSegmentPath(seg: List<String>, cb: () -> P?): P? {
+        path.addAll(seg)
+        val rval = cb()
+        val count = seg.size
+        for (i in 1..count) path.removeLast()
+        return rval
+    }
+
+
     fun asPointer(): JsonPointer = JsonPointer(path.toList())
 
 

src/main/kotlin/com/github/erosb/jsonsKema/JsonValue.kt

@@ -25,7 +25,9 @@ data class JsonPointer(val segments: List<String>) {
 
     constructor(vararg segments: String): this(listOf(*segments))
 
-    override fun toString() = "#" + (if (segments.isEmpty()) "" else "/") + segments.stream().collect(joining("/"))
+    override fun toString() = "#" + (if (segments.isEmpty()) "" else "/") + segments.joinToString("/") {
+        it.replace("~", "~0").replace("/", "~1")
+    }
 
     operator fun plus(additionalSegment: String): JsonPointer = JsonPointer(segments + additionalSegment)
 

src/main/kotlin/com/github/erosb/jsonsKema/SchemaVisitor.kt

@@ -88,6 +88,10 @@ abstract class SchemaVisitor<P> {
         return dynamicPath.inSegmentPath(seg, cb)
     }
 
+    protected fun inPathSegment(seg: List<String>, cb: () -> P?): P? {
+        return dynamicPath.inSegmentPath(seg, cb)
+    }
+
     protected fun dynamicPath(): JsonPointer = dynamicPath.asPointer()
 
     protected fun inPathSegment(seg: Keyword, cb: () -> P?): P? = inPathSegment(seg.value, cb)
@@ -105,7 +109,7 @@ abstract class SchemaVisitor<P> {
     open fun visitEnumSchema(schema: EnumSchema): P? = visitChildren(schema)
     open fun visitTypeSchema(schema: TypeSchema): P? = visitChildren(schema)
     open fun visitMultiTypeSchema(schema: MultiTypeSchema): P? = visitChildren(schema)
-    open fun visitPropertySchema(property: String, schema: Schema): P? = inPathSegment("properties/" + property) { visitChildren(schema) }
+    open fun visitPropertySchema(property: String, schema: Schema): P? = inPathSegment(listOf("properties", property)) { visitChildren(schema) }
     open fun visitPatternPropertySchema(pattern: Regexp, schema: Schema): P? = visitChildren(schema)
     open fun visitPatternSchema(schema: PatternSchema): P? = visitChildren(schema)
     open fun visitNotSchema(schema: NotSchema): P? = visitChildren(schema)

src/main/kotlin/com/github/erosb/jsonsKema/Validator.kt

@@ -306,7 +306,7 @@ private class DefaultValidator(
     }
 
     override fun visitPropertySchema(property: String, schema: Schema): ValidationFailure? =
-        inPathSegment("properties/" + property) {
+        inPathSegment(listOf("properties", property)) {
             if (instance !is IJsonObject<*, *>) {
                 return@inPathSegment null
             }

src/test/kotlin/com/github/erosb/jsonsKema/JsonValueTest.kt

@@ -28,4 +28,9 @@ class JsonValueTest {
         }
         assertEquals("can not remove 3 segment from pointer #/seg1/seg2", thrown.message)
     }
+
+    @Test
+    fun `segments are escaped`() {
+        assertEquals("#/~1seg1/seg2~0", JsonPointer("/seg1", "seg2~").toString())
+    }
 }