Skip to content

Commit 932e4fc

Browse files
author
Oleksandr Dzhychko
committed
fix(model-server): escape slashes in URL for branches and repositories
1 parent ed5a200 commit 932e4fc

File tree

2 files changed

+42
-3
lines changed

2 files changed

+42
-3
lines changed

model-server/src/main/kotlin/org/modelix/model/server/handlers/RepositoryOverview.kt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package org.modelix.model.server.handlers
22

3+
import io.ktor.http.encodeURLPathPart
34
import io.ktor.server.application.Application
45
import io.ktor.server.application.call
56
import io.ktor.server.html.respondHtmlTemplate
67
import io.ktor.server.routing.get
78
import io.ktor.server.routing.routing
89
import kotlinx.html.FlowContent
10+
import kotlinx.html.FlowOrInteractiveOrPhrasingContent
911
import kotlinx.html.a
1012
import kotlinx.html.h1
1113
import kotlinx.html.i
@@ -74,9 +76,7 @@ class RepositoryOverview(private val repoManager: RepositoriesManager) {
7476
}
7577
}
7678
td {
77-
a("../history/${branch.repositoryId.id}/${branch.branchName}/") {
78-
+"Show History"
79-
}
79+
buildHistoryLink(branch.repositoryId.id, branch.branchName)
8080
}
8181
td {
8282
val latestVersion = repoManager.getVersion(branch)
@@ -94,3 +94,9 @@ class RepositoryOverview(private val repoManager: RepositoriesManager) {
9494
}
9595
}
9696
}
97+
98+
fun FlowOrInteractiveOrPhrasingContent.buildHistoryLink(repositoryId: String, branchName: String) {
99+
a("../history/${repositoryId.encodeURLPathPart()}/${branchName.encodeURLPathPart()}/") {
100+
+"Show History"
101+
}
102+
}
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*
2+
* Copyright (c) 2023.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.modelix.model.server.handlers
18+
19+
import kotlinx.html.span
20+
import kotlinx.html.stream.createHTML
21+
import kotlin.test.Test
22+
import kotlin.test.assertEquals
23+
24+
class RepositoryOverviewTest {
25+
26+
@Test
27+
fun testSlashesInPathSegmentsFromRepositoryIdAndBranchId() {
28+
val html = createHTML().span {
29+
buildHistoryLink("repository/v1", "branch/v2")
30+
}
31+
assertEquals("<span><a href=\"../history/repository%2Fv1/branch%2Fv2/\">Show History</a></span>", html)
32+
}
33+
}

0 commit comments

Comments
 (0)