Skip to content

Commit ff08972

Browse files
committed
fix(model-server): RestWebModelClient couldn't request a clientId
1 parent 693f3bd commit ff08972

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,9 @@ class KeyValueLikeModelServer(
280280
serverId = {
281281
throw NoPermissionException("'$key' is read-only.")
282282
},
283+
legacyClientId = {
284+
throw NoPermissionException("Directly writing to 'clientId' is not allowed")
285+
},
283286
unknown = {
284287
userDefinedEntries[key] = value
285288
},
@@ -335,6 +338,7 @@ class KeyValueLikeModelServer(
335338
serverId = {
336339
if (isWrite) throw NoPermissionException("'$key' is read-only.")
337340
},
341+
legacyClientId = {},
338342
unknown = {
339343
call.checkPermission(ModelServerPermissionSchema.legacyUserDefinedObjects.run { if (isWrite) write else read })
340344
},
@@ -346,6 +350,7 @@ class KeyValueLikeModelServer(
346350
immutableObject: () -> R,
347351
branch: (branch: BranchReference) -> R,
348352
serverId: () -> R,
353+
legacyClientId: () -> R,
349354
unknown: () -> R,
350355
): R {
351356
return when {
@@ -354,6 +359,7 @@ class KeyValueLikeModelServer(
354359
key.startsWith(PROTECTED_PREFIX) -> throw NoPermissionException("Access to keys starting with '$PROTECTED_PREFIX' is only permitted to the model server itself.")
355360
key.startsWith(RepositoriesManager.KEY_PREFIX) -> throw NoPermissionException("Access to keys starting with '${RepositoriesManager.KEY_PREFIX}' is only permitted to the model server itself.")
356361
key == RepositoriesManager.LEGACY_SERVER_ID_KEY || key == RepositoriesManager.LEGACY_SERVER_ID_KEY2 -> serverId()
362+
key == "clientId" -> legacyClientId()
357363
else -> unknown()
358364
}
359365
}

0 commit comments

Comments
 (0)