f641aacddb
* added or updated secure the BACnet primitive value decoders - the core codecs - named bacnet_x_decode(), bacnet_x_application_decode() and bacnet_x_context_decode where x is one of the 13 BACnet primitive value names. The updated API includes an APDU size to prevent over-reading of an APDU buffer while decoding. Improved or added unit test code coverage for the BACnet primitive value decoders. * marked the insecure decoding API as 'deprecated' which is defined in src/bacnet/basic/sys/platform.h and can be disabled during a build. * added secure decoders for BACnetTimeValue, BACnetHostNPort, BACnetTimeStamp, BACnetAddress, and Weekly_Schedule and improved unit test code coverage. * improved test code coverage for BACnet objects and properties. * secured AtomicReadFile and AtomicWriteFile service decoders and improved unit test code coverage. * secured BACnet Error service decoder and improved unit test code coverage. --------- Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
405 lines
12 KiB
C
405 lines
12 KiB
C
/*####COPYRIGHTBEGIN####
|
|
-------------------------------------------
|
|
Copyright (C) 2015 Nikola Jelic
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public License
|
|
as published by the Free Software Foundation; either version 2
|
|
of the License, or (at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to:
|
|
The Free Software Foundation, Inc.
|
|
59 Temple Place - Suite 330
|
|
Boston, MA 02111-1307, USA.
|
|
|
|
As a special exception, if other files instantiate templates or
|
|
use macros or inline functions from this file, or you compile
|
|
this file and link it with other works to produce a work based
|
|
on this file, this file does not by itself cause the resulting
|
|
work to be covered by the GNU General Public License. However
|
|
the source code for this file must still be made available in
|
|
accordance with section (3) of the GNU General Public License.
|
|
|
|
This exception does not invalidate any other reasons why a work
|
|
based on this file might be covered by the GNU General Public
|
|
License.
|
|
-------------------------------------------
|
|
####COPYRIGHTEND####*/
|
|
|
|
#include <stdbool.h>
|
|
#include <stdint.h>
|
|
#include <string.h> /* memcpy */
|
|
#include "bacnet/bacdcode.h"
|
|
#include "bacnet/bactimevalue.h"
|
|
#include "bacnet/bacapp.h"
|
|
|
|
static bool is_data_value_schedule_compatible(uint8_t tag)
|
|
{
|
|
switch (tag) {
|
|
/* Every member of the union must be listed here to allow decoding */
|
|
case BACNET_APPLICATION_TAG_NULL:
|
|
return true;
|
|
#if defined(BACAPP_BOOLEAN)
|
|
case BACNET_APPLICATION_TAG_BOOLEAN:
|
|
return true;
|
|
#endif
|
|
#if defined(BACAPP_UNSIGNED)
|
|
case BACNET_APPLICATION_TAG_UNSIGNED_INT:
|
|
return true;
|
|
#endif
|
|
#if defined(BACAPP_SIGNED)
|
|
case BACNET_APPLICATION_TAG_SIGNED_INT:
|
|
return true;
|
|
#endif
|
|
#if defined(BACAPP_REAL)
|
|
case BACNET_APPLICATION_TAG_REAL:
|
|
return true;
|
|
#endif
|
|
#if defined(BACAPP_DOUBLE)
|
|
case BACNET_APPLICATION_TAG_DOUBLE:
|
|
return true;
|
|
#endif
|
|
#if defined(BACAPP_ENUMERATED)
|
|
case BACNET_APPLICATION_TAG_ENUMERATED:
|
|
return true;
|
|
#endif
|
|
default:
|
|
return false;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @brief Encode the BACnetTimeValue
|
|
*
|
|
* From clause 21. FORMAL DESCRIPTION OF APPLICATION PROTOCOL DATA UNITS
|
|
*
|
|
* BACnetTimeValue ::= SEQUENCE {
|
|
* time Time,
|
|
* value ABSTRACT-SYNTAX.&Type
|
|
* -- any primitive datatype;
|
|
* -- complex types cannot be decoded
|
|
* }
|
|
*
|
|
* @param apdu - buffer of data to be encoded, or NULL for length
|
|
* @param tag_number - context tag number to be encoded
|
|
* @param value - value to be encoded
|
|
* @return the number of apdu bytes encoded
|
|
*/
|
|
int bacnet_time_value_encode(uint8_t *apdu, BACNET_TIME_VALUE *value)
|
|
{
|
|
int len;
|
|
int apdu_len = 0;
|
|
uint8_t *apdu_offset = NULL;
|
|
BACNET_APPLICATION_DATA_VALUE adv;
|
|
|
|
if (!value || !is_data_value_schedule_compatible(value->Value.tag)) {
|
|
return BACNET_STATUS_ERROR;
|
|
}
|
|
|
|
if (apdu) {
|
|
apdu_offset = &apdu[apdu_len];
|
|
}
|
|
len = encode_application_time(apdu_offset, &value->Time);
|
|
apdu_len += len;
|
|
|
|
if (apdu) {
|
|
apdu_offset = &apdu[apdu_len];
|
|
}
|
|
bacnet_primitive_to_application_data_value(&adv, &value->Value);
|
|
len = bacapp_encode_application_data(apdu_offset, &adv);
|
|
apdu_len += len;
|
|
|
|
return apdu_len;
|
|
}
|
|
|
|
int bacapp_encode_time_value(uint8_t *apdu, BACNET_TIME_VALUE *value)
|
|
{
|
|
return bacnet_time_value_encode(apdu, value);
|
|
}
|
|
|
|
/**
|
|
* @brief Encode the BACnetTimeValue as Context Tagged
|
|
* as defined in clause 20.2.1 General Rules for Encoding BACnet Tags
|
|
* @param apdu - buffer of data to be encoded, or NULL for length
|
|
* @param tag_number - context tag number to be encoded
|
|
* @param value - value to be encoded
|
|
* @return the number of apdu bytes encoded
|
|
*/
|
|
int bacnet_time_value_context_encode(
|
|
uint8_t *apdu, uint8_t tag_number, BACNET_TIME_VALUE *value)
|
|
{
|
|
int len;
|
|
int apdu_len = 0;
|
|
uint8_t *apdu_offset = NULL;
|
|
|
|
if (apdu) {
|
|
apdu_offset = &apdu[apdu_len];
|
|
}
|
|
len = encode_opening_tag(apdu_offset, tag_number);
|
|
apdu_len += len;
|
|
|
|
if (apdu) {
|
|
apdu_offset = &apdu[apdu_len];
|
|
}
|
|
len = bacnet_time_value_encode(apdu_offset, value);
|
|
apdu_len += len;
|
|
|
|
if (apdu) {
|
|
apdu_offset = &apdu[apdu_len];
|
|
}
|
|
len = encode_closing_tag(apdu_offset, tag_number);
|
|
apdu_len += len;
|
|
|
|
return apdu_len;
|
|
}
|
|
|
|
int bacapp_encode_context_time_value(
|
|
uint8_t *apdu, uint8_t tag_number, BACNET_TIME_VALUE *value)
|
|
{
|
|
return bacnet_time_value_context_encode(apdu, tag_number, value);
|
|
}
|
|
|
|
/**
|
|
* @brief Convert primitive value from application data value
|
|
* @param dest Primitive Data Value
|
|
* @param src Application Data Value
|
|
* @return BACNET_STATUS_OK, or BACNET_STATUS_ERROR if an error occurs
|
|
*/
|
|
int bacnet_application_to_primitive_data_value(
|
|
struct BACnet_Primitive_Data_Value *dest,
|
|
const struct BACnet_Application_Data_Value *src)
|
|
{
|
|
/* make sure the value passed is valid */
|
|
if (!src || !dest || !is_data_value_schedule_compatible(src->tag)) {
|
|
return BACNET_STATUS_ERROR;
|
|
}
|
|
memset(dest, 0, sizeof(struct BACnet_Primitive_Data_Value));
|
|
dest->tag = src->tag;
|
|
memcpy(&dest->type, &src->type, sizeof(dest->type));
|
|
return BACNET_STATUS_OK;
|
|
}
|
|
|
|
/**
|
|
* @brief Convert primitive value to application data value
|
|
* @param dest Application Data Value
|
|
* @param src Primitive Data Value
|
|
* @return BACNET_STATUS_OK, or BACNET_STATUS_ERROR if an error occurs
|
|
*/
|
|
int bacnet_primitive_to_application_data_value(
|
|
struct BACnet_Application_Data_Value *dest,
|
|
const struct BACnet_Primitive_Data_Value *src)
|
|
{
|
|
/* make sure the value passed is valid */
|
|
if (!dest || !src) {
|
|
return BACNET_STATUS_ERROR;
|
|
}
|
|
memset(dest, 0, sizeof(struct BACnet_Application_Data_Value));
|
|
dest->tag = src->tag;
|
|
memcpy(&dest->type, &src->type, sizeof(src->type));
|
|
return BACNET_STATUS_OK;
|
|
}
|
|
|
|
/**
|
|
* @brief decode a BACnetTimeValue
|
|
*
|
|
* @param apdu - buffer of data to be decoded
|
|
* @param max_apdu_len - number of bytes in the buffer
|
|
* @param value - stores the decoded property value
|
|
* @return number of bytes decoded, or BACNET_STATUS_ERROR if errors occur
|
|
*/
|
|
int bacnet_time_value_decode(
|
|
uint8_t *apdu, int max_apdu_len, BACNET_TIME_VALUE *value)
|
|
{
|
|
int len;
|
|
int apdu_len = 0;
|
|
BACNET_APPLICATION_DATA_VALUE full_data_value = { 0 };
|
|
|
|
len = bacnet_time_application_decode(
|
|
&apdu[apdu_len], max_apdu_len, &value->Time);
|
|
if (len <= 0) {
|
|
return BACNET_STATUS_ERROR;
|
|
}
|
|
apdu_len += len;
|
|
|
|
len = bacapp_decode_application_data(
|
|
&apdu[apdu_len], max_apdu_len - apdu_len, &full_data_value);
|
|
if (len <= 0) {
|
|
return -1;
|
|
}
|
|
if (BACNET_STATUS_OK !=
|
|
bacnet_application_to_primitive_data_value(
|
|
&value->Value, &full_data_value)) {
|
|
return BACNET_STATUS_ERROR;
|
|
}
|
|
apdu_len += len;
|
|
|
|
return apdu_len;
|
|
}
|
|
|
|
int bacapp_decode_time_value(uint8_t *apdu, BACNET_TIME_VALUE *value)
|
|
{
|
|
return bacnet_time_value_decode(apdu, MAX_APDU, value);
|
|
}
|
|
|
|
/**
|
|
* @brief decode a context encoded BACnetTimeValue
|
|
* @param apdu - buffer of data to be decoded
|
|
* @param max_apdu_len - number of bytes in the buffer
|
|
* @param tag_number - context tag number to match
|
|
* @param value - stores the decoded property value
|
|
* @return number of bytes decoded, or BACNET_STATUS_ERROR if an error occurs
|
|
*/
|
|
int bacnet_time_value_context_decode(uint8_t *apdu,
|
|
int max_apdu_len,
|
|
uint8_t tag_number,
|
|
BACNET_TIME_VALUE *value)
|
|
{
|
|
int len;
|
|
int apdu_len = 0;
|
|
|
|
if (bacnet_is_opening_tag_number(
|
|
&apdu[apdu_len], max_apdu_len - apdu_len, tag_number, &len)) {
|
|
apdu_len += len;
|
|
} else {
|
|
return BACNET_STATUS_ERROR;
|
|
}
|
|
len = bacnet_time_value_decode(
|
|
&apdu[apdu_len], max_apdu_len - apdu_len, value);
|
|
if (len > 0) {
|
|
apdu_len += len;
|
|
} else {
|
|
return BACNET_STATUS_ERROR;
|
|
}
|
|
if (bacnet_is_closing_tag_number(
|
|
&apdu[apdu_len], max_apdu_len - apdu_len, tag_number, &len)) {
|
|
apdu_len += len;
|
|
} else {
|
|
return BACNET_STATUS_ERROR;
|
|
}
|
|
|
|
return apdu_len;
|
|
}
|
|
|
|
int bacapp_decode_context_time_value(
|
|
uint8_t *apdu, uint8_t tag_number, BACNET_TIME_VALUE *value)
|
|
{
|
|
return bacnet_time_value_context_decode(apdu, MAX_APDU, tag_number, value);
|
|
}
|
|
|
|
/**
|
|
* @brief decode a context encoded list of BACnetTimeValue
|
|
* @param apdu - buffer of data to be decoded
|
|
* @param max_apdu_len - number of bytes in the buffer
|
|
* @param tag_number - context tag number to match
|
|
* @param time_values - stores the decoded property values
|
|
* @param max_time_values - number of values to be able to store
|
|
* @return number of bytes decoded, or BACNET_STATUS_ERROR if an error occurs
|
|
*/
|
|
int bacnet_time_values_context_decode(uint8_t *apdu,
|
|
const int max_apdu_len,
|
|
const uint8_t tag_number,
|
|
BACNET_TIME_VALUE *time_values,
|
|
const unsigned int max_time_values,
|
|
unsigned int *out_count)
|
|
{
|
|
unsigned int j;
|
|
int len;
|
|
int apdu_len = 0;
|
|
unsigned int count_values = 0;
|
|
BACNET_TIME_VALUE dummy;
|
|
|
|
/* day-schedule [0] SEQUENCE OF BACnetTimeValue */
|
|
if (bacnet_is_opening_tag_number(
|
|
&apdu[apdu_len], max_apdu_len - apdu_len, tag_number, &len)) {
|
|
apdu_len += len;
|
|
while (!bacnet_is_closing_tag_number(
|
|
&apdu[apdu_len], max_apdu_len - apdu_len, tag_number, &len)) {
|
|
if (count_values < max_time_values) {
|
|
len = bacnet_time_value_decode(&apdu[apdu_len],
|
|
max_apdu_len - apdu_len, &time_values[count_values++]);
|
|
} else {
|
|
len = bacnet_time_value_decode(
|
|
&apdu[apdu_len], max_apdu_len - apdu_len, &dummy);
|
|
}
|
|
if (len < 0) {
|
|
return BACNET_STATUS_ERROR;
|
|
}
|
|
apdu_len += len;
|
|
len = 0;
|
|
}
|
|
/* Zeroing other values */
|
|
for (j = count_values; j < max_time_values; j++) {
|
|
time_values[j].Value.tag = BACNET_APPLICATION_TAG_NULL;
|
|
time_values[j].Value.type.Unsigned_Int = 0;
|
|
time_values[j].Time.hour = 0;
|
|
time_values[j].Time.min = 0;
|
|
time_values[j].Time.sec = 0;
|
|
time_values[j].Time.hundredths = 0;
|
|
}
|
|
/* closing tag */
|
|
if (len > 0) {
|
|
apdu_len += len;
|
|
} else {
|
|
return BACNET_STATUS_ERROR;
|
|
}
|
|
if (out_count) {
|
|
*out_count = count_values;
|
|
}
|
|
|
|
return apdu_len;
|
|
}
|
|
|
|
return BACNET_STATUS_ERROR;
|
|
}
|
|
|
|
/**
|
|
* @brief Encodes a : [x] SEQUENCE OF BACnetTimeValue into a fixed-size buffer
|
|
* @param apdu - buffer of data to be encoded, or NULL for buffer length
|
|
* @param tag_number - context tag number to be encoded
|
|
* @param value - value to be encoded
|
|
* @return the number of apdu bytes encoded, or BACNET_STATUS_ERROR
|
|
*/
|
|
int bacnet_time_values_context_encode(uint8_t *apdu,
|
|
uint8_t tag_number,
|
|
BACNET_TIME_VALUE *time_values,
|
|
unsigned int max_time_values)
|
|
{
|
|
unsigned int j;
|
|
int apdu_len = 0;
|
|
int len = 0;
|
|
BACNET_TIME t0 = { 0 };
|
|
uint8_t *apdu_offset = NULL;
|
|
|
|
/* day-schedule [x] SEQUENCE OF BACnetTimeValue */
|
|
if (apdu) {
|
|
apdu_offset = &apdu[apdu_len];
|
|
}
|
|
apdu_len += encode_opening_tag(apdu_offset, tag_number);
|
|
for (j = 0; j < max_time_values; j++)
|
|
/* Encode only non-null values (NULL,00:00:00.00) */
|
|
if (time_values[j].Value.tag != BACNET_APPLICATION_TAG_NULL ||
|
|
datetime_compare_time(&t0, &time_values[j].Time) != 0) {
|
|
if (apdu) {
|
|
apdu_offset = &apdu[apdu_len];
|
|
}
|
|
len = bacnet_time_value_encode(apdu_offset, &time_values[j]);
|
|
if (len < 0) {
|
|
return BACNET_STATUS_ERROR;
|
|
}
|
|
apdu_len += len;
|
|
}
|
|
/* close tag */
|
|
if (apdu) {
|
|
apdu_offset = &apdu[apdu_len];
|
|
}
|
|
apdu_len += encode_closing_tag(apdu_offset, tag_number);
|
|
|
|
return apdu_len;
|
|
}
|