diff --git a/CHANGELOG.md b/CHANGELOG.md index e5431eb97..dcfa3925b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,8 @@ Planned future work is listed at the bottom. - Client API will reconnect and restore subscriptions after a disconnect from a server. Reconnection is controlled by a session retry policy. - TranslateBrowsePathsToNodeIds service has been fixed - - SetTriggering and SetMonitoringMode services have been added to the Monitored Item Service Set + - (in progress) AddNodes, AddReferences, DeleteNodes and DeleteReferences have been added from the Node Management service set. + - SetTriggering and SetMonitoringMode services have been added to the Monitored Item service set - TransferSubscriptions service is implemented as a stub. Most clients will see the error response and failover to manually reconstructing their subscription state. - New `web-client` code which demonstrates an OPCUA client that serves streaming data over a websocket. Reconnection diff --git a/appveyor.yml b/appveyor.yml index c297d874c..dcdac4ef7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -51,4 +51,4 @@ notifications: on_build_success: false # disable automatic builds -build: false \ No newline at end of file +build: off \ No newline at end of file diff --git a/docs/compatibility.md b/docs/compatibility.md index 056ee31cf..47c3a2c4d 100644 --- a/docs/compatibility.md +++ b/docs/compatibility.md @@ -29,6 +29,12 @@ The following services are supported: * ActivateSession * CloseSession * Cancel - stub implementation + +* Node Management service set + * AddNodes + * AddReferences + * DeleteNodes + * DeleteReferences * View service set * Browse diff --git a/integration/src/tests.rs b/integration/src/tests.rs index 643b657a6..6ba78cfe0 100644 --- a/integration/src/tests.rs +++ b/integration/src/tests.rs @@ -220,7 +220,7 @@ fn new_server(port_offset: u16) -> Server { // Register a getter for the variable if let Some(ref mut v) = address_space.find_variable_mut(v1_node.clone()) { - let getter = AttrFnGetter::new(move |_, _| -> Result, StatusCode> { + let getter = AttrFnGetter::new(move |_, _, _| -> Result, StatusCode> { Ok(Some(DataValue::new(100))) }); v.set_value_getter(Arc::new(Mutex::new(getter))); diff --git a/server/src/services/message_handler.rs b/server/src/services/message_handler.rs index c255eb10c..238c3f336 100644 --- a/server/src/services/message_handler.rs +++ b/server/src/services/message_handler.rs @@ -19,8 +19,9 @@ use crate::{ }, session::Session, }; +use crate::services::node_management::NodeManagementService; -macro_rules! validated_request{ +macro_rules! validated_request { ($validator: expr, $request: expr, $session: expr, $action: block) => { if let Err(response) = $validator.validate_request($session, &$request.request_header) { Some(response) @@ -44,6 +45,8 @@ pub struct MessageHandler { attribute_service: AttributeService, /// Discovery service discovery_service: DiscoveryService, + /// Node Management service + node_management_service: NodeManagementService, /// Method service method_service: MethodService, /// MonitoredItem service @@ -67,6 +70,7 @@ impl MessageHandler { discovery_service: DiscoveryService::new(), method_service: MethodService::new(), monitored_item_service: MonitoredItemService::new(), + node_management_service: NodeManagementService::new(), session_service: SessionService::new(), view_service: ViewService::new(), subscription_service: SubscriptionService::new(), @@ -131,6 +135,30 @@ impl MessageHandler { // NodeManagement Service Set, OPC UA Part 4, Section 5.7 + SupportedMessage::AddNodesRequest(request) => { + validated_request!(self, &request, &mut session, { + self.node_management_service.add_nodes(&mut address_space, &request) + }) + } + + SupportedMessage::AddReferencesRequest(request) => { + validated_request!(self, &request, &mut session, { + self.node_management_service.add_references(&mut address_space, &request) + }) + } + + SupportedMessage::DeleteNodesRequest(request) => { + validated_request!(self, &request, &mut session, { + self.node_management_service.delete_nodes(&mut address_space, &request) + }) + } + + SupportedMessage::DeleteReferencesRequest(request) => { + validated_request!(self, &request, &mut session, { + self.node_management_service.delete_references(&mut address_space, &request) + }) + } + // View Service Set, OPC UA Part 4, Section 5.8 SupportedMessage::BrowseRequest(request) => { diff --git a/server/src/services/mod.rs b/server/src/services/mod.rs index d19948248..2d0577248 100644 --- a/server/src/services/mod.rs +++ b/server/src/services/mod.rs @@ -15,6 +15,7 @@ pub mod attribute; pub mod discovery; pub mod method; pub mod monitored_item; +pub mod node_management; pub mod session; pub mod subscription; pub mod view; diff --git a/server/src/services/node_management.rs b/server/src/services/node_management.rs new file mode 100644 index 000000000..d01b76dba --- /dev/null +++ b/server/src/services/node_management.rs @@ -0,0 +1,82 @@ +use std::result::Result; + +use opcua_types::*; +use opcua_types::status_code::StatusCode; +use opcua_types::service_types::*; + +use crate::{ + address_space::AddressSpace, + services::Service, + session::Session, + state::ServerState, + constants, +}; + +pub(crate) struct NodeManagementService; + +impl Service for NodeManagementService {} + +impl NodeManagementService { + pub fn new() -> NodeManagementService { + NodeManagementService {} + } + + pub fn add_nodes(&self, _address_space: &mut AddressSpace, request: &AddNodesRequest) -> Result { + if let Some(ref nodes_to_add) = request.nodes_to_add { + if !nodes_to_add.is_empty() { + let results = nodes_to_add.iter().map(|node_to_add| { + AddNodesResult { + status_code: StatusCode::BadUserAccessDenied, + added_node_id: NodeId::null(), + } + }).collect(); + let response = AddNodesResponse { + response_header: ResponseHeader::new_good(&request.request_header), + results: Some(results), + diagnostic_infos: None, + }; + Ok(response.into()) + } else { + Ok(self.service_fault(&request.request_header, StatusCode::BadNothingToDo)) + } + } else { + Ok(self.service_fault(&request.request_header, StatusCode::BadNothingToDo)) + } + } + + pub fn add_references(&self, _address_space: &mut AddressSpace, request: &AddReferencesRequest) -> Result { + if let Some(ref references_to_add) = request.references_to_add { + if !references_to_add.is_empty() { + Ok(self.service_fault(&request.request_header, StatusCode::BadNotImplemented)) + } else { + Ok(self.service_fault(&request.request_header, StatusCode::BadNothingToDo)) + } + } else { + Ok(self.service_fault(&request.request_header, StatusCode::BadNothingToDo)) + } + } + + pub fn delete_nodes(&self, _address_space: &mut AddressSpace, request: &DeleteNodesRequest) -> Result { + if let Some(ref nodes_to_delete) = request.nodes_to_delete { + if !nodes_to_delete.is_empty() { + Ok(self.service_fault(&request.request_header, StatusCode::BadNotImplemented)) + } else { + Ok(self.service_fault(&request.request_header, StatusCode::BadNothingToDo)) + } + } else { + Ok(self.service_fault(&request.request_header, StatusCode::BadNothingToDo)) + } + } + + pub fn delete_references(&self, _address_space: &mut AddressSpace, request: &DeleteReferencesRequest) -> Result { + if let Some(ref references_to_delete) = request.references_to_delete { + if !references_to_delete.is_empty() { + Ok(self.service_fault(&request.request_header, StatusCode::BadNotImplemented)) + } else { + Ok(self.service_fault(&request.request_header, StatusCode::BadNothingToDo)) + } + } else { + Ok(self.service_fault(&request.request_header, StatusCode::BadNothingToDo)) + } + } +} diff --git a/server/src/tests/services/mod.rs b/server/src/tests/services/mod.rs index 7300bd027..9ffa8c152 100644 --- a/server/src/tests/services/mod.rs +++ b/server/src/tests/services/mod.rs @@ -134,8 +134,9 @@ fn create_monitored_items_request(subscription_id: u32, mut node_id: Vec) pub mod attribute; pub mod discovery; -pub mod session; +pub mod method; pub mod monitored_item; +pub mod node_management; +pub mod session; pub mod subscription; pub mod view; -pub mod method; \ No newline at end of file diff --git a/server/src/tests/services/node_management.rs b/server/src/tests/services/node_management.rs new file mode 100644 index 000000000..5533b1397 --- /dev/null +++ b/server/src/tests/services/node_management.rs @@ -0,0 +1 @@ +// TODO tests to test the node management API \ No newline at end of file diff --git a/types/src/supported_message.rs b/types/src/supported_message.rs index 95f56063a..fa92b7777 100644 --- a/types/src/supported_message.rs +++ b/types/src/supported_message.rs @@ -103,6 +103,14 @@ impl SupportedMessage { SupportedMessage::CancelResponse(ref r) => r.response_header.request_handle, SupportedMessage::ActivateSessionRequest(ref r) => r.request_header.request_handle, SupportedMessage::ActivateSessionResponse(ref r) => r.response_header.request_handle, + SupportedMessage::AddNodesRequest(ref r) => r.request_header.request_handle, + SupportedMessage::AddNodesResponse(ref r) => r.response_header.request_handle, + SupportedMessage::AddReferencesRequest(ref r) => r.request_header.request_handle, + SupportedMessage::AddReferencesResponse(ref r) => r.response_header.request_handle, + SupportedMessage::DeleteNodesRequest(ref r) => r.request_header.request_handle, + SupportedMessage::DeleteNodesResponse(ref r) => r.response_header.request_handle, + SupportedMessage::DeleteReferencesRequest(ref r) => r.request_header.request_handle, + SupportedMessage::DeleteReferencesResponse(ref r) => r.response_header.request_handle, SupportedMessage::CreateMonitoredItemsRequest(ref r) => r.request_header.request_handle, SupportedMessage::CreateMonitoredItemsResponse(ref r) => r.response_header.request_handle, SupportedMessage::ModifyMonitoredItemsRequest(ref r) => r.request_header.request_handle, @@ -202,6 +210,30 @@ impl SupportedMessage { ObjectId::ActivateSessionResponse_Encoding_DefaultBinary => { ActivateSessionResponse::decode(stream, decoding_limits)?.into() } + ObjectId::AddNodesRequest_Encoding_DefaultBinary => { + AddNodesRequest::decode(stream, decoding_limits)?.into() + } + ObjectId::AddNodesResponse_Encoding_DefaultBinary => { + AddNodesResponse::decode(stream, decoding_limits)?.into() + } + ObjectId::AddReferencesRequest_Encoding_DefaultBinary => { + AddReferencesRequest::decode(stream, decoding_limits)?.into() + } + ObjectId::AddReferencesResponse_Encoding_DefaultBinary => { + AddReferencesResponse::decode(stream, decoding_limits)?.into() + } + ObjectId::DeleteNodesRequest_Encoding_DefaultBinary => { + DeleteNodesRequest::decode(stream, decoding_limits)?.into() + } + ObjectId::DeleteNodesResponse_Encoding_DefaultBinary => { + DeleteNodesResponse::decode(stream, decoding_limits)?.into() + } + ObjectId::DeleteReferencesRequest_Encoding_DefaultBinary => { + DeleteReferencesRequest::decode(stream, decoding_limits)?.into() + } + ObjectId::DeleteReferencesResponse_Encoding_DefaultBinary => { + DeleteReferencesResponse::decode(stream, decoding_limits)?.into() + } ObjectId::CreateMonitoredItemsRequest_Encoding_DefaultBinary => { CreateMonitoredItemsRequest::decode(stream, decoding_limits)?.into() } @@ -310,7 +342,6 @@ impl SupportedMessage { ObjectId::CallResponse_Encoding_DefaultBinary => { CallResponse::decode(stream, decoding_limits)?.into() } - _ => { debug!("decoding unsupported for object id {:?}", object_id); SupportedMessage::Invalid(object_id) @@ -341,6 +372,14 @@ supported_messages_enum![ CancelResponse, ActivateSessionRequest, ActivateSessionResponse, + AddNodesRequest, + AddNodesResponse, + AddReferencesRequest, + AddReferencesResponse, + DeleteNodesRequest, + DeleteNodesResponse, + DeleteReferencesRequest, + DeleteReferencesResponse, CreateMonitoredItemsRequest, CreateMonitoredItemsResponse, ModifyMonitoredItemsRequest,