Commit cba2c8d4 authored by Michele Carignani's avatar Michele Carignani
Browse files

Merge branch 'latest-open-draft'

parents 9ecb6cb6 4688594a

.jenkins.sh

+8 −2
Original line number Diff line number Diff line
@@ -7,7 +7,13 @@ 


cd "$(dirname "$0")"



cd ./docker

run_dir="$(pwd)"



./docker/build-container.sh

./docker/run-container.sh "${run_dir}"
 
./build.sh

#./run.sh



cd -



exit 0

README.md

+10 −4
Original line number Diff line number Diff line 
# MEC Testing Framework in TTCN-3

# MEC Testing Framework in TTCN-3 - - GS 032-3



## Introduction

This repositories contains the test specifications and test adapter code for MEC Testing project in TTCN-3.

This repositories contains the test specifications and test adapter code for MEC API Conformance Testing in TTCN-3, GS 032-3.



Latest publicly available drafts are available at https://docbox.etsi.org/isg/mec/open.



**{- Disclaimer: The content of this repository is related to a DRAFT, i.e. a working document, of ETSI ISG MEC. -}**

{-The content of the repository is provided for information only and is still under development. It may be updated, replaced, or removed at any time. Do not use as reference material. -} 



For more information on ETSI ISG Multi-access Edge Computing (MEC), visit https://www.etsi.org/technologies/multi-access-edge-computing.



## Contact information

Email at cti_support at etsi dot org

Email at `cti_support` at `etsi` dot `org`.



## License

Unless specified otherwise, the content of this repository and the files contained are released under the BSD-3-Clause license.

See the attached LICENSE file or visit https://forge.etsi.org/legal-matters.





## Standard links

- Multi-access Edge Computating standards, accessible [here](https://www.etsi.org/standards#page=1&search=MEC&title=1&etsiNumber=1&content=1&version=0&onApproval=1&published=1&historical=1&startDate=1988-01-15&endDate=2019-05-06&harmonized=0&keyword=&TB=&stdType=&frequency=&mandate=&collection=&sort=1).

ccsrc/Protocols/Http/http_codec.cc

+36 −31
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 


#include "loggers.hh"



#include "converter.hh"



#include "LibItsHttp_TypesAndValues.hh"

#include "LibItsHttp_MessageBodyTypes.hh"

#include "LibItsHttp_XmlMessageBodyTypes.hh"
@@ -80,7 +78,7 @@ int http_codec::decode (const OCTETSTRING& data, LibItsHttp__TypesAndValues::Htt 
      response.version__minor() = std::stoi(m[2].str().c_str());

      response.statuscode() = std::stoi(m[3].str().c_str());

      response.statustext() = CHARSTRING(m[4].str().c_str());

      LibItsHttp__TypesAndValues::HeaderLines headers;

      LibItsHttp__TypesAndValues::Headers headers;

      std::string content_type;

      decode_headers(decoding_buffer, headers, content_type);

      response.header() = headers;
@@ -105,7 +103,7 @@ int http_codec::decode (const OCTETSTRING& data, LibItsHttp__TypesAndValues::Htt 
      request.uri() = CHARSTRING(m[2].str().c_str());

      request.version__major() = std::stoi(m[3].str().c_str());

      request.version__minor() = std::stoi(m[4].str().c_str());

      LibItsHttp__TypesAndValues::HeaderLines headers;

      LibItsHttp__TypesAndValues::Headers headers;

      std::string content_type;

      decode_headers(decoding_buffer, headers, content_type);

      request.header() = headers;
@@ -142,10 +140,10 @@ int http_codec::encode_request(const LibItsHttp__TypesAndValues::Request& p_requ 
  p_encoding_buffer.put_cs("\r\n");

  

  // Encode headers excepeted the Content-Length

  const LibItsHttp__TypesAndValues::HeaderLines& headers = p_request.header();

  const LibItsHttp__TypesAndValues::Headers& headers = p_request.header();

  std::string content_type;

  for (int i = 0; i < headers.size_of(); i++) {

    const LibItsHttp__TypesAndValues::HeaderLine& header = headers[i];

    const LibItsHttp__TypesAndValues::Header& header = headers[i];

    loggers::get_instance().log_msg("http_codec::encode_request: Processing header ", header.header__name());

    if (std::string(static_cast<const char*>(header.header__name())).compare("Content-Length") == 0) { // Skip it, processed later

      loggers::get_instance().log("http_codec::encode_request: Skip it");
@@ -203,12 +201,13 @@ int http_codec::encode_request(const LibItsHttp__TypesAndValues::Request& p_requ 
  p_encoding_buffer.put_cs("Content-Length: ");

  if (_ec.length != 0) {

    loggers::get_instance().log("http_codec::encode_request: Content-Length: %s", static_cast<const char*>(int2str(_ec.length + 2/*Stand for the last CRLF*/)));

    p_encoding_buffer.put_cs(static_cast<const char*>(int2str(_ec.length + 2/*Stand for the last CRLF*/)));

    p_encoding_buffer.put_cs(static_cast<const char*>(int2str(_ec.length)));

    _ec.is_content_length_present = 0x01;

  } else {

    p_encoding_buffer.put_cs("0");

    _ec.is_content_length_present = 0x00;

  }

  loggers::get_instance().log("http_codec::encode_request: Content-Length: %d - %x", _ec.length, _ec.is_content_length_present);

  p_encoding_buffer.put_cs("\r\n");



  // Add message body
@@ -216,7 +215,7 @@ int http_codec::encode_request(const LibItsHttp__TypesAndValues::Request& p_requ 
  if (_ec.is_content_length_present == 0x01) {

    loggers::get_instance().log_msg("http_codec::encode_request: Add body ", os);

    p_encoding_buffer.put_os(os);

    p_encoding_buffer.put_cs("\r\n");

    //p_encoding_buffer.put_cs("\r\n");

  }



  loggers::get_instance().log_to_hexa("<<< http_codec::encode_request: ", p_encoding_buffer);
@@ -239,11 +238,11 @@ int http_codec::encode_response (const LibItsHttp__TypesAndValues::Response& p_r 
  }

  p_encoding_buffer.put_cs("\r\n");

  

  // Encode headers excepted the Content-Length

  const LibItsHttp__TypesAndValues::HeaderLines& headers = p_response.header();

  // Encode headers excepeted the Content-Length

  const LibItsHttp__TypesAndValues::Headers& headers = p_response.header();

  std::string content_type;

  for (int i = 0; i < headers.size_of(); i++) {

    const LibItsHttp__TypesAndValues::HeaderLine& header = headers[i];

    const LibItsHttp__TypesAndValues::Header& header = headers[i];

    loggers::get_instance().log_msg("http_codec::encode_response: Processing header ", header.header__name());

    p_encoding_buffer.put_cs(header.header__name());

    p_encoding_buffer.put_cs(": ");
@@ -256,7 +255,8 @@ int http_codec::encode_response (const LibItsHttp__TypesAndValues::Response& p_r 
        if (v.size_of() > 0) {

          loggers::get_instance().log_msg("http_codec::encode_response: Processing value ", v[0]);

          if (std::string(static_cast<const char*>(header.header__name())).compare("Content-Type") == 0) { // Store it for HTTP body payload encoding

            int j = 1;

            loggers::get_instance().log("http_codec::encode_response: Storing Content-Type");

            int j = 0;

            while (j < v.size_of()) {

              content_type += v[j++];

            } // End of 'while' statement
@@ -266,7 +266,7 @@ int http_codec::encode_response (const LibItsHttp__TypesAndValues::Response& p_r 
          while (j < v.size_of()) {

                p_encoding_buffer.put_cs(", ");

                loggers::get_instance().log_msg("http_codec::encode_response: Processing value ", v[j]);

                p_encoding_buffer.put_cs(v[j]);

                p_encoding_buffer.put_cs(v[j++]);

                j += 1;

          } // End of 'while' statement

        }
@@ -288,34 +288,39 @@ int http_codec::encode_response (const LibItsHttp__TypesAndValues::Response& p_r 
      _ec.length = os.lengthof();

      _ec.is_content_length_present = 0x01;

    }

    loggers::get_instance().log("http_codec::encode_request: length=%d", _ec.length);

    loggers::get_instance().log("http_codec::encode_response: length=%d", _ec.length);

  } else {

    loggers::get_instance().log("http_codec::encode_request: HTTP body field not present");

    loggers::get_instance().log("http_codec::encode_response: HTTP body field not present");

    _ec.length = 0;

    _ec.is_content_length_present = 0x00;

  }



  // Encode Content-Length header

  p_encoding_buffer.put_cs("Content-Length: ");

  if (_ec.length != 0) {

    p_encoding_buffer.put_cs(int2str(_ec.length + 2/*Stand for the last CRLF*/));

    loggers::get_instance().log("http_codec::encode_request: Content-Length: %s", static_cast<const char*>(int2str(_ec.length + 2/*Stand for the last CRLF*/)));

    p_encoding_buffer.put_cs(static_cast<const char*>(int2str(_ec.length)));

    _ec.is_content_length_present = 0x01;

  } else {

    p_encoding_buffer.put_cs("0");

    _ec.is_content_length_present = 0x00;

  }

  loggers::get_instance().log("http_codec::encode_response: Content-Length: %d - %x", _ec.length, _ec.is_content_length_present);

  loggers::get_instance().log("http_codec::encode_request: Content-Length: %d - %x", _ec.length, _ec.is_content_length_present);

  p_encoding_buffer.put_cs("\r\n");



  // Add message body

  p_encoding_buffer.put_cs("\r\n");

  if (_ec.length != 0) {

  if (_ec.is_content_length_present == 0x01) {

    loggers::get_instance().log_msg("http_codec::encode_request: Add body ", os);

    p_encoding_buffer.put_os(os);

    p_encoding_buffer.put_cs("\r\n");

    //    p_encoding_buffer.put_cs("\r\n");

  }

  

  loggers::get_instance().log_to_hexa("<<< http_codec::encode_response: ", p_encoding_buffer);

  return 0;

}



int http_codec::decode_headers(TTCN_Buffer& decoding_buffer, LibItsHttp__TypesAndValues::HeaderLines& headers, std::string& p_content_type) {

int http_codec::decode_headers(TTCN_Buffer& decoding_buffer, LibItsHttp__TypesAndValues::Headers& headers, std::string& p_content_type) {

  loggers::get_instance().log(">>> http_codec::decode_headers");

  loggers::get_instance().log_to_hexa("http_codec::decode_headers", decoding_buffer);
@@ -325,7 +330,7 @@ int http_codec::decode_headers(TTCN_Buffer& decoding_buffer, LibItsHttp__TypesAn 
    switch(get_line(decoding_buffer, cstr, true)) {

      case 0: {

          loggers::get_instance().log_msg("http_codec::decode_headers: ", cstr);

          LibItsHttp__TypesAndValues::HeaderLine header;

          LibItsHttp__TypesAndValues::Header header;

          if (decode_header(cstr, header) == -1) {

            loggers::get_instance().warning("http_codec::decode_headers: Failed to decode header %s", static_cast<const char*>(cstr));

            return -1;
@@ -351,7 +356,7 @@ int http_codec::decode_headers(TTCN_Buffer& decoding_buffer, LibItsHttp__TypesAn 
  } // End of 'while' statement

}



int http_codec::decode_header(CHARSTRING& header_line, LibItsHttp__TypesAndValues::HeaderLine& header) {

int http_codec::decode_header(CHARSTRING& header_line, LibItsHttp__TypesAndValues::Header& header) {

  loggers::get_instance().log_msg(">>> http_codec::decode_header", header_line);



  try {
@@ -504,7 +509,7 @@ int http_codec::decode_body(TTCN_Buffer& decoding_buffer, LibItsHttp__MessageBod 
  OCTETSTRING s(decoding_buffer.get_len() - decoding_buffer.get_pos(), decoding_buffer.get_data() + decoding_buffer.get_pos());

  loggers::get_instance().log_msg("http_codec::decode_body: raw body=", s);



  // Align the payload length with the specified Content-Length value

  // Align the payload length with the specified Content-Lenght value

  loggers::get_instance().log("http_codec::decode_body: _dc.length=%d - body length=%d", _dc.length, s.lengthof());

  OCTETSTRING body;

  if (_dc.length != 0) {
@@ -515,10 +520,11 @@ int http_codec::decode_body(TTCN_Buffer& decoding_buffer, LibItsHttp__MessageBod 
      body = OCTETSTRING(_dc.length, p);

    }

  } else {

    loggers::get_instance().warning("http_codec::decode_body: No Content-Length header, process all remaining bytes");

    loggers::get_instance().warning("http_codec::decode_body: No Conten-Length header, process all remaining bytes");

    body = s;

  }

  loggers::get_instance().log_msg("http_codec::decode_body: Aligned body=", body);

  loggers::get_instance().log("http_codec::decode_body: body length=%d", body.lengthof());

  // Remove CRLF if any

  int counter = 0;

  if ((body[body.lengthof() - 1].get_octet() == 0x0d) || (body[body.lengthof() - 1].get_octet() == 0x0a)) {
@@ -528,10 +534,9 @@ int http_codec::decode_body(TTCN_Buffer& decoding_buffer, LibItsHttp__MessageBod 
    }

  }

  loggers::get_instance().log("http_codec::decode_body: counter=%d", counter);

  loggers::get_instance().log("http_codec::decode_body: body length=%d", body.lengthof());

  body = OCTETSTRING(body.lengthof() - counter, static_cast<const unsigned char*>(body));

  if (_dc.chunked){

    counter = 0;

    int counter = 0;

    int prev = 0;

    OCTETSTRING os(0, nullptr);

    do {
@@ -569,8 +574,8 @@ int http_codec::decode_body(TTCN_Buffer& decoding_buffer, LibItsHttp__MessageBod 
      }

    } while (counter < body.lengthof()); // Process next chunk if any

    body = os;

  }

    loggers::get_instance().log_msg("http_codec::decode_body: Finalised body=", body);

  }

  // Check if HTTP message body contains binary characters

  for (int i = 0; i < body.lengthof(); i++) {

    unsigned char c = body[i].get_octet();
@@ -688,7 +693,7 @@ int http_codec::decode_body(TTCN_Buffer& decoding_buffer, LibItsHttp__MessageBod 
      LibItsHttp__MessageBodyTypes::HtmlBody html_body;

      message_body.html__body() = CHARSTRING(body.lengthof(), (char*)static_cast<const unsigned char*>(body));

    } else {

      loggers::get_instance().log("http_codec::decode_body: Use textBody as default");

      loggers::get_instance().log("http_codec::decode_body: Use textBdy as default");

      LibItsHttp__MessageBodyTypes::TextBody text_body;

      message_body.text__body() = CHARSTRING(body.lengthof(), (char*)static_cast<const unsigned char*>(body));

    }

ccsrc/Protocols/Http/http_codec.hh

+67 −67
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ namespace LibItsHttp__TypesAndValues { 
  class HttpMessage;

  class Request;

  class Response;

  class HeaderLines;

  class HeaderLine;

  class Headers;

  class Header;

}

namespace LibItsHttp__MessageBodyTypes {

  class HttpMessageBody;
@@ -59,8 +59,8 @@ private: 
  int encode_response (const LibItsHttp__TypesAndValues::Response& p_response, TTCN_Buffer& p_encoding_buffer);

  int encode_body(const LibItsHttp__MessageBodyTypes::HttpMessageBody& p_message_body, OCTETSTRING& p_encoding_buffer, const std::string& p_content_type);



  int decode_headers(TTCN_Buffer& decoding_buffer, LibItsHttp__TypesAndValues::HeaderLines& headers, std::string& p_content_type);

  int decode_header(CHARSTRING& header_line, LibItsHttp__TypesAndValues::HeaderLine& header);

  int decode_headers(TTCN_Buffer& decoding_buffer, LibItsHttp__TypesAndValues::Headers& headers, std::string& p_content_type);

  int decode_header(CHARSTRING& header_line, LibItsHttp__TypesAndValues::Header& header);

  int decode_body(TTCN_Buffer& decoding_buffer, LibItsHttp__MessageBodyTypes::HttpMessageBody& message_body, const std::string& p_content_type);

  int get_line(TTCN_Buffer& buffer, CHARSTRING& to, const bool concatenate_header_lines = false);

ccsrc/Protocols/Json/json_codec.cc

+154 −46

File changed.

Preview size limit exceeded, changes collapsed.