Merge branch 'Branch_develop_ode-763' of https://github.com/usdot-jpo…

…-ode/jpo-ode into open-ode

# Conflicts:
#	README.md
#	jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/builders/TravelerMessageFromHumanToAsnConverterTest.java
#	jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/OdeProperties.java
#	jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/services/asn1/Asn1EncodedDataRouter.java
#	jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/traveler/TimController.java
#	jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/services/asn1/Asn1EncodedDataRouterTest.java

.gitignore

@@ -104,3 +104,7 @@ jpo-ode-consumer-example/target/
 /SNMP_Error.log
 /Events.log
 /uploads
+
+#########################
+### jpo-security-svcs ###
+/jpo-security-svcs/*.log

.gitmodules

@@ -7,3 +7,9 @@
 [submodule "jpo-s3-deposit"]
  path = jpo-s3-deposit
  url = https://github.com/usdot-jpo-ode/jpo-s3-deposit.git
+[submodule "jpo-security-svcs"]
+ path = jpo-security-svcs
+ url = https://github.com/usdot-jpo-ode/jpo-security-svcs
+[submodule "jpo-security"]
+ path = jpo-security
+ url = https://github.com/usdot-jpo-ode/jpo-security.git

README.md

@@ -159,6 +159,7 @@ ODE software consists of the following modules:
 |[jpo-cvdp](https://github.com/usdot-jpo-ode/jpo-cvdp)|public|Privacy Protection Module|
 |[jpo-s3-deposit](https://github.com/usdot-jpo-ode/jpo-s3-deposit)|public|S3 depositor service. Optional, comment out of `docker-compose.yml` file if not used.|
 |[asn1_codec](https://github.com/usdot-jpo-ode/asn1_codec)|public|ASN.1 Encoder/Decoder module|
+|[jpo-security-svcs](https://github.com/usdot-jpo-ode/jpo-security-svcs)|public|Provides cryptographic services.|
 
 Clone the repositories by running these commands:
 
@@ -168,6 +169,7 @@ git clone --recurse-submodules https://github.com/usdot-jpo-ode/jpo-ode.git
 *Note*: Make sure you specify the --recurse-submodules option on the clone command line. This option will cause the cloning of all dependent submodules:
 - Privacy Protection Module (PPM) - [jpo-cvdp](https://github.com/usdot-jpo-ode/jpo-cvdp)
 - S3 Bucket Depositor - [jpo-s3-deposit](https://github.com/usdot-jpo-ode/jpo-s3-deposit)
+- Security Services Module- [jpo-security](https://github.com/usdot-jpo-ode/jpo-security-svcs)
 - ASN.1 CODEC - [asn1_codec](https://github.com/usdot-jpo-ode/asn1_codec)
 
 Once you have these repositories obtained, you are ready to build and deploy the application.

docker-compose.yml

@@ -48,6 +48,7 @@ services:
  ODE_DDS_CAS_PASSWORD: ${ODE_DDS_CAS_PASSWORD}
  ODE_EXTERNAL_IPV4: ${ODE_EXTERNAL_IPV4}
  ODE_EXTERNAL_IPV6: ${ODE_EXTERNAL_IPV6}
+ ODE_SECURITY_SVCS_SIGNATURE_URI: ${ODE_SECURITY_SVCS_SIGNATURE_URI}
  depends_on:
  - kafka
  links:
@@ -167,3 +168,9 @@ services:
  - kafka
  links:
  - kafka
+ sec:
+ build: ./jpo-security-svcs
+ ports:
+ - "8090:8090"
+ environment:
+ SEC_CRYPTO_SERVICE_BASE_URI: ${SEC_CRYPTO_SERVICE_BASE_URI}

docs/ODESwagger.yaml

@@ -46,11 +46,13 @@ paths:
  $ref: '#/definitions/Status'
  /tim:
  put:
- summary: >-
- Used to update an existing TIM already present on an RSU.
- operationId: tim_post
+ summary: Used to update an existing TIM already present on an RSU.
+ operationId: tim_put
  description: >-
- Update a Traveler Information Message (TIM) that has already been deposited to an RSU. Parameters and response codes are identical to the POST request. Will also deposit the new message to the SDW, if the SDW field is present.
+ Update a Traveler Information Message (TIM) that has already been
+ deposited to an RSU. Parameters and response codes are identical to the
+ POST request. Will also deposit the new message to the SDW, if the SDW
+ field is present.
  parameters:
  - name: TravelerInputData
  in: body
@@ -258,10 +260,6 @@ definitions:
  type: array
  items:
  $ref: '#/definitions/TravelerDataFrame'
- snmp:
- $ref: '#/definitions/SNMP'
- sdw:
- $ref: '#/definitions/SDW'
  TravelerInputData:
  type: object
  properties:
@@ -296,17 +294,10 @@ definitions:
  required:
  - sspindex
  properties:
+ # Part I, Frame header
  sspTimRights:
  type: integer
  description: A short header information
- sspindex:
- type: integer
- description: >-
- The SSP index is used to control the data elements that follow the
- occurrence of the index. The index relates back to the SSP contents in
- the CERT used to declare what content is allowed by that CERT. In the
- absence of a matching index in the message sender’s CERT, the message
- contents are not valid.
  frameType:
  type: string
  description: >-
@@ -323,8 +314,24 @@ definitions:
  means forever.
  priority:
  type: integer
+
+ # Part II, Applicable Regions of Use
  sspLocationRights:
  type: integer
+ sspindex:
+ type: integer
+ description: >-
+ The SSP index is used to control the data elements that follow the
+ occurrence of the index. The index relates back to the SSP contents in
+ the CERT used to declare what content is allowed by that CERT. In the
+ absence of a matching index in the message sender’s CERT, the message
+ contents are not valid.
+ regions:
+ type: array
+ items:
+ $ref: '#/definitions/Region'
+
+ # Part III, Content
  sspMsgTypes:
  type: integer
  sspMsgContent:
@@ -337,9 +344,15 @@ definitions:
  items:
  type: array
  items:
- $ref: '#/definitions/ITISObj'
- region:
- $ref: '#/definitions/Region'
+ type: string
+ description: >-
+ If the value is purely an integer number, it will be interpreted as
+ ITIS code. If it is not an integer, it will be interpreted as a
+ text message. If you intend to send an integral value as a literal
+ integer, prefix the number with a single quote ('), for example,
+ "'98765" will be interpreted as literal 98765. The prefix character
+ will be removed before populating the TIM message One may mix ITIS
+ code and text in the items array.
  MsgID:
  type: object
  properties:
@@ -355,7 +368,7 @@ definitions:
  type: object
  properties:
  position:
- $ref: '#/definitions/J2735Position3D'
+ $ref: '#/definitions/OdePosition3D'
  viewAngle:
  type: string
  mutcdCode:
@@ -377,7 +390,7 @@ definitions:
  properties:
  name:
  type: string
- regulatorID":
+ regulatorID:
  type: integer
  segmentId:
  type: integer
@@ -404,12 +417,6 @@ definitions:
  $ref: '#/definitions/OldRegion'
  geometry:
  $ref: '#/definitions/Geometry'
- content:
- type: string
- itemss:
- type: array
- items:
- type: integer
  ComputedLane:
  type: object
  properties:
@@ -544,7 +551,7 @@ definitions:
  type: object
  properties:
  position:
- $ref: '#/definitions/J2735Position3D'
+ $ref: '#/definitions/OdePosition3D'
  radius:
  type: integer
  units:
@@ -553,7 +560,7 @@ definitions:
  type: object
  properties:
  position:
- $ref: '#/definitions/J2735Position3D'
+ $ref: '#/definitions/OdePosition3D'
  directionality:
  type: integer
  nodeType:
@@ -568,7 +575,7 @@ definitions:
  type: object
  properties:
  position:
- $ref: '#/definitions/J2735Position3D'
+ $ref: '#/definitions/OdePosition3D'
  zoom:
  type: integer
  description: (OPTIONAL) A zoom scale applied in units of 2^N.
@@ -588,7 +595,7 @@ definitions:
  zOffset:
  type: number
  description: '(OPTIONAL) OffsetLL-B16 measured in degrees [-0.0032767..0.0032767]'
- J2735Position3D:
+ OdePosition3D:
  type: object
  properties:
  latitude:
@@ -617,18 +624,11 @@ definitions:
  x:
  type: number
  description: 'Offset-B10 in meters [-5.11..5.11m]'
- 'y':
+ y:
  type: number
  description: 'Offset-B10 in meters [-5.11..5.11m]'
  attributes:
  $ref: '#/definitions/Attribute'
- ITISObj:
- type: object
- properties:
- ITISCodes:
- type: integer
- ITIStext:
- type: string
  SNMP:
  type: object
  description: 'Optional field, needed for SNMP deposit to RSU.'