Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions vuu/src/main/scala/org/finos/vuu/client/ClientHelperFns.scala
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,6 @@ object ClientHelperFns {
vsClient.send(JsonViewServerMessage(RequestId.oneNew(), sessionId, GetTableList()))
}

def rpcTableUpdate(sessionId: String, token: String, user: String, table: ViewPortTable, key: String, data: Map[String, Any])(implicit vsClient: ViewServerClient): Unit = {
vsClient.send(JsonViewServerMessage(RequestId.oneNew(), sessionId, RpcUpdate(table, key, data)))
}

def getViewPortMenusAsync(sessionId: String, token: String, user: String, vpId: String)(implicit vsClient: ViewServerClient): Unit = {
vsClient.send(JsonViewServerMessage(RequestId.oneNew(), sessionId, GetViewPortMenusRequest(vpId)))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,6 @@ class CoreServerApiHandler(val viewPortContainer: ViewPortContainer,
}
}

override def process(msg: RpcUpdate)(ctx: RequestContext): Option[ViewServerMessage] = {
//TODO This is way too dangerous to leave enabled for now.
vsMsg(RpcReject(msg.table, msg.key, "Feature disabled"))(ctx)
}

override def process(msg: HeartBeatResponse)(ctx: RequestContext): Option[ViewServerMessage] = {
logger.trace("[API] HB [" + (timeProvider.now() - msg.ts) + "]")
None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ class DefaultMessageHandler(val channel: Channel,
case req: GetTableList => serverApi.process(req)(ctx)
case req: GetTableMetaRequest => serverApi.process(req)(ctx)
case req: HeartBeatResponse => serverApi.process(req)(ctx)
case req: RpcUpdate => serverApi.process(req)(ctx)
case req: GetViewPortVisualLinksRequest => serverApi.process(req)(ctx)
case req: CreateVisualLinkRequest => serverApi.process(req)(ctx)
case req: RemoveViewPortRequest => serverApi.process(req)(ctx)
Expand Down
2 changes: 0 additions & 2 deletions vuu/src/main/scala/org/finos/vuu/net/Messages.scala
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,6 @@ case class MenuRpcCall(module: String, method: String, params: Array[Any], named

case class MenuRpcResponse(module: String, method: String, result: ViewPortAction) extends MessageBody

case class RpcUpdate(table: ViewPortTable, key: String, data: Map[String, Any]) extends MessageBody

case class RpcSuccess(table: ViewPortTable, key: String) extends MessageBody

case class RpcReject(table: ViewPortTable, key: String, reason: String) extends MessageBody
Expand Down
2 changes: 0 additions & 2 deletions vuu/src/main/scala/org/finos/vuu/net/ServerApi.scala
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ trait ServerApi {

def process(msg: HeartBeatResponse)(ctx: RequestContext): Option[ViewServerMessage]

def process(msg: RpcUpdate)(ctx: RequestContext): Option[ViewServerMessage]

def process(msg: SelectRowRequest)(ctx: RequestContext): Option[ViewServerMessage]

def process(msg: DeselectRowRequest)(ctx: RequestContext): Option[ViewServerMessage]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ import org.finos.vuu.net.*
new Type(value = classOf[GetTableList], name = "GET_TABLE_LIST"),
new Type(value = classOf[GetTableListResponse], name = "TABLE_LIST_RESP"),
new Type(value = classOf[HeartBeat], name = "HB"),
new Type(value = classOf[RpcUpdate], name = "RPC_UP"),
new Type(value = classOf[RpcSuccess], name = "RPC_SUCCESS"),
new Type(value = classOf[RpcReject], name = "RPC_REJECT"),
new Type(value = classOf[HeartBeatResponse], name = "HB_RESP"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ class JsonVsSerializerTest extends AnyFeatureSpec with Matchers{
roundTrip(LoginSuccess("vuuServerId"))
roundTrip(HeartBeat(123L))
roundTrip(HeartBeatResponse(123L))
roundTrip(RpcUpdate(ViewPortTable("orderEntry", "CORE"), "Foo", Map("Foo" -> 123, "Bar" -> true, "Whizzle" -> "TANG", "HooHa" -> 344567L)))
roundTrip(RpcSuccess(ViewPortTable("orderEntry", "CORE"), "Foo"))
roundTrip(RpcReject(ViewPortTable("orderEntry", "CORE"), "Foo", "cause you aint pretty"))
roundTrip(OpenTreeNodeSuccess("orderEntry", "..."))
Expand Down
10 changes: 1 addition & 9 deletions vuu/src/test/scala/org/finos/vuu/wsapi/SecurityWSApiTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import org.finos.vuu.core.table.{DataTable, TableContainer}
import org.finos.vuu.net.json.JsonVsSerializer
import org.finos.vuu.net.rpc.{DefaultRpcHandler, RpcNames}
import org.finos.vuu.net.ws.WebSocketClient
import org.finos.vuu.net.{ChangeViewPortRange, ChangeViewPortReject, ChangeViewPortRequest, ChangeViewPortSuccess, CloseTreeNodeReject, CloseTreeNodeRequest, CreateViewPortRequest, CreateViewPortSuccess, CreateVisualLinkRequest, CreateVisualLinkSuccess, DeselectAllReject, DeselectAllRequest, DeselectRowReject, DeselectRowRequest, DisableViewPortReject, DisableViewPortRequest, DisableViewPortSuccess, EnableViewPortReject, EnableViewPortRequest, ErrorResponse, FilterSpec, FreezeViewPortReject, FreezeViewPortRequest, FreezeViewPortSuccess, GetViewPortMenusRequest, GetViewPortVisualLinksRequest, OpenTreeNodeReject, OpenTreeNodeRequest, OpenTreeNodeSuccess, RemoveViewPortReject, RemoveViewPortRequest, RemoveViewPortSuccess, RemoveVisualLinkRequest, RemoveVisualLinkSuccess, RpcErrorResult, RpcReject, RpcRequest, RpcResponseNew, RpcUpdate, SelectAllReject, SelectAllRequest, SelectAllSuccess, SelectRowRangeReject, SelectRowRangeRequest, SelectRowReject, SelectRowRequest, SelectRowSuccess, UnfreezeViewPortReject, UnfreezeViewPortRequest, ViewPortContext, WebSocketViewServerClient}
import org.finos.vuu.net.{ChangeViewPortRange, ChangeViewPortReject, ChangeViewPortRequest, ChangeViewPortSuccess, CloseTreeNodeReject, CloseTreeNodeRequest, CreateViewPortRequest, CreateViewPortSuccess, CreateVisualLinkRequest, CreateVisualLinkSuccess, DeselectAllReject, DeselectAllRequest, DeselectRowReject, DeselectRowRequest, DisableViewPortReject, DisableViewPortRequest, DisableViewPortSuccess, EnableViewPortReject, EnableViewPortRequest, ErrorResponse, FilterSpec, FreezeViewPortReject, FreezeViewPortRequest, FreezeViewPortSuccess, GetViewPortMenusRequest, GetViewPortVisualLinksRequest, OpenTreeNodeReject, OpenTreeNodeRequest, OpenTreeNodeSuccess, RemoveViewPortReject, RemoveViewPortRequest, RemoveViewPortSuccess, RemoveVisualLinkRequest, RemoveVisualLinkSuccess, RpcErrorResult, RpcReject, RpcRequest, RpcResponseNew, SelectAllReject, SelectAllRequest, SelectAllSuccess, SelectRowRangeReject, SelectRowRangeRequest, SelectRowReject, SelectRowRequest, SelectRowSuccess, UnfreezeViewPortReject, UnfreezeViewPortRequest, ViewPortContext, WebSocketViewServerClient}
import org.finos.vuu.provider.{Provider, ProviderContainer}
import org.finos.vuu.viewport.{ViewPortRange, ViewPortTable}
import org.finos.vuu.wsapi.helpers.TestExtension.ModuleFactoryExtension
Expand Down Expand Up @@ -112,14 +112,6 @@ class SecurityWSApiTest extends WebSocketApiTestBase {
response.get.errorMessage shouldEqual s"Failed to process request $requestId"
}

Scenario("RPC Update is disabled") {
vuuClient.send(sessionId, RpcUpdate(ViewPortTable(tableName, moduleName), "row1", Map("Name" -> "Snoopy")))

val response = vuuClient.awaitForMsgWithBody[RpcReject]
response.isEmpty shouldBe false
response.get.reason shouldEqual "Feature disabled"
}

Scenario("Getting VP menus on another sessions viewport should be rejected") {
val invalidRequest = GetViewPortMenusRequest(targetViewPortId)
val requestId = attackingClient.send(attackingSessionId, invalidRequest)
Expand Down