Skip to content

Commit

Permalink
Merge pull request #545 from CDOT-CV/hotfix/security_headers
Browse files Browse the repository at this point in the history
JPO-ODE Hotfix for Security Headers
  • Loading branch information
SaikrishnaBairamoni committed May 23, 2024
2 parents 6f6f094 + fa4e402 commit 331a90f
Show file tree
Hide file tree
Showing 44 changed files with 2,057 additions and 1,411 deletions.
181 changes: 0 additions & 181 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,184 +91,3 @@ services:
options:
max-size: "10m"
max-file: "5"

aem:
build: ./asn1_codec
image: jpoode_acm:latest
environment:
DOCKER_HOST_IP: ${DOCKER_HOST_IP}
ACM_CONFIG_FILE: aem.properties
ACM_LOG_TO_CONSOLE: ${AEM_LOG_TO_CONSOLE}
ACM_LOG_TO_FILE: ${AEM_LOG_TO_FILE}
ACM_LOG_LEVEL: ${AEM_LOG_LEVEL}
depends_on:
- kafka
volumes:
- ${DOCKER_SHARED_VOLUME}:/asn1_codec_share
logging:
options:
max-size: "10m"
max-file: "5"

ppm_bsm:
build:
context: ./jpo-cvdp
dockerfile: Dockerfile
image: jpoode_ppm:latest
environment:
DOCKER_HOST_IP: ${DOCKER_HOST_IP}
PPM_CONFIG_FILE: ppmBsm.properties
PPM_LOG_TO_CONSOLE: ${PPM_BSM_LOG_TO_CONSOLE}
PPM_LOG_TO_FILE: ${PPM_BSM_LOG_TO_FILE}
PPM_LOG_LEVEL: ${PPM_BSM_LOG_LEVEL}
volumes:
- ${DOCKER_SHARED_VOLUME}:/ppm_data
depends_on:
- kafka
logging:
options:
max-size: "10m"
max-file: "5"

ppm_tim:
build:
context: ./jpo-cvdp
dockerfile: Dockerfile
image: jpoode_ppm:latest
environment:
DOCKER_HOST_IP: ${DOCKER_HOST_IP}
PPM_CONFIG_FILE: ppmTim.properties
PPM_LOG_TO_CONSOLE: ${PPM_TIM_LOG_TO_CONSOLE}
PPM_LOG_TO_FILE: ${PPM_TIM_LOG_TO_FILE}
PPM_LOG_LEVEL: ${PPM_TIM_LOG_LEVEL}
volumes:
- ${DOCKER_SHARED_VOLUME}:/ppm_data
depends_on:
- kafka
logging:
options:
max-size: "10m"
max-file: "5"

cvpep_bsm_depositor:
build: ./jpo-s3-deposit
image: jpoode_s3dep:latest
environment:
DOCKER_HOST_IP: ${DOCKER_HOST_IP}
DEPOSIT_BUCKET_NAME: ${CVPEP_BSM_BUCKET_NAME}
DEPOSIT_KEY_NAME: ${CVPEP_BSM_DEPOSIT_KEY}
DEPOSIT_TOPIC: ${CVPEP_BSM_TOPIC}
K_AWS_ACCESS_KEY_ID: ${CVPEP_BSM_K_AWS_ACCESS_KEY_ID}
K_AWS_SECRET_ACCESS_SECRET: ${CVPEP_BSM_K_AWS_SECRET_ACCESS_SECRET}
K_AWS_SESSION_TOKEN: ${CVPEP_BSM_K_AWS_SESSION_TOKEN}
K_AWS_EXPIRATION: ${CVPEP_BSM_K_AWS_EXPIRATION}
API_ENDPOINT: ${CVPEP_BSM_API_ENDPOINT}
HEADER_ACCEPT: ${CVPEP_BSM_HEADER_ACCEPT}
HEADER_X_API_KEY: ${CVPEP_BSM_HEADER_X_API_KEY}
DEPOSIT_GROUP: ${CVPEP_BSM_GROUP}
depends_on:
- kafka
logging:
options:
max-size: "10m"
max-file: "5"

rde_bsm_depositor:
build: ./jpo-s3-deposit
image: jpoode_s3dep:latest
environment:
DOCKER_HOST_IP: ${DOCKER_HOST_IP}
DEPOSIT_BUCKET_NAME: ${RDE_BSM_BUCKET_NAME}
DEPOSIT_KEY_NAME: ${RDE_BSM_DEPOSIT_KEY}
DEPOSIT_TOPIC: ${RDE_BSM_TOPIC}
K_AWS_ACCESS_KEY_ID: ${RDE_BSM_K_AWS_ACCESS_KEY_ID}
K_AWS_SECRET_ACCESS_SECRET: ${RDE_BSM_K_AWS_SECRET_ACCESS_SECRET}
K_AWS_SESSION_TOKEN: ${RDE_BSM_K_AWS_SESSION_TOKEN}
K_AWS_EXPIRATION: ${RDE_BSM_K_AWS_EXPIRATION}
API_ENDPOINT: ${RDE_BSM_API_ENDPOINT}
HEADER_ACCEPT: ${RDE_BSM_HEADER_ACCEPT}
HEADER_X_API_KEY: ${RDE_BSM_HEADER_X_API_KEY}
DEPOSIT_GROUP: ${RDE_BSM_GROUP}
depends_on:
- kafka
logging:
options:
max-size: "10m"
max-file: "5"

cvpep_tim_depositor:
build: ./jpo-s3-deposit
image: jpoode_s3dep:latest
environment:
DOCKER_HOST_IP: ${DOCKER_HOST_IP}
DEPOSIT_BUCKET_NAME: ${CVPEP_TIM_BUCKET_NAME}
DEPOSIT_KEY_NAME: ${CVPEP_TIM_DEPOSIT_KEY}
DEPOSIT_TOPIC: ${CVPEP_TIM_TOPIC}
K_AWS_ACCESS_KEY_ID: ${CVPEP_BSM_K_AWS_ACCESS_KEY_ID}
K_AWS_SECRET_ACCESS_SECRET: ${CVPEP_BSM_K_AWS_SECRET_ACCESS_SECRET}
K_AWS_SESSION_TOKEN: ${CVPEP_BSM_K_AWS_SESSION_TOKEN}
K_AWS_EXPIRATION: ${CVPEP_BSM_K_AWS_EXPIRATION}
API_ENDPOINT: ${CVPEP_BSM_API_ENDPOINT}
HEADER_ACCEPT: ${CVPEP_BSM_HEADER_ACCEPT}
HEADER_X_API_KEY: ${CVPEP_BSM_HEADER_X_API_KEY}
DEPOSIT_GROUP: ${CVPEP_TIM_GROUP}
depends_on:
- kafka
logging:
options:
max-size: "10m"
max-file: "5"

rde_tim_depositor:
build: ./jpo-s3-deposit
image: jpoode_s3dep:latest
environment:
DOCKER_HOST_IP: ${DOCKER_HOST_IP}
DEPOSIT_BUCKET_NAME: ${RDE_TIM_BUCKET_NAME}
DEPOSIT_KEY_NAME: ${RDE_TIM_DEPOSIT_KEY}
DEPOSIT_TOPIC: ${RDE_TIM_TOPIC}
K_AWS_ACCESS_KEY_ID: ${CVPEP_BSM_K_AWS_ACCESS_KEY_ID}
K_AWS_SECRET_ACCESS_SECRET: ${RDE_TIM_K_AWS_SECRET_ACCESS_SECRET}
K_AWS_SESSION_TOKEN: ${RDE_TIM_K_AWS_SESSION_TOKEN}
K_AWS_EXPIRATION: ${RDE_TIM_K_AWS_EXPIRATION}
API_ENDPOINT: ${RDE_TIM_API_ENDPOINT}
HEADER_ACCEPT: ${RDE_TIM_HEADER_ACCEPT}
HEADER_X_API_KEY: ${RDE_TIM_HEADER_X_API_KEY}
DEPOSIT_GROUP: ${RDE_TIM_GROUP}
depends_on:
- kafka
logging:
options:
max-size: "10m"
max-file: "5"

sdw_depositor:
build: ./jpo-sdw-depositor
image: jpoode_sdwdep:latest
environment:
DOCKER_HOST_IP: ${DOCKER_HOST_IP}
#SDW_GROUP_ID: ${SDW_GROUP_ID}
#SDW_KAFKA_PORT: ${SDW_KAFKA_PORT}
#SDW_SUBSCRIPTION_TOPICS: ${SDW_SUBSCRIPTION_TOPICS}
#SDW_DESTINATION_URL: ${SDW_DESTINATION_URL}
SDW_API_KEY: ${SDW_API_KEY}
depends_on:
- kafka
- zookeeper
- ode
logging:
options:
max-size: "10m"
max-file: "5"

sec:
build: ./jpo-security-svcs
image: jpoode_sec:latest
ports:
- "8090:8090"
environment:
SEC_CRYPTO_SERVICE_BASE_URI: ${SEC_CRYPTO_SERVICE_BASE_URI}
logging:
options:
max-size: "10m"
max-file: "5"
14 changes: 14 additions & 0 deletions docs/Release_notes.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
JPO-ODE Release Notes
----------------------------

Version 2.0.2, released April 2024
----------------------------------------
### **Summary**
The updates for the jpo-ode 2.0.2 release includes an update to the dataflow for the UDP and log ingestion endpoints. This update allows for the UDP and log ingestion endpoints to handle and strip unsigned IEEE 1609.2 and 1609.3 headers. Signed IEEE 1609.2 security headers are maintained in the encoded Kafka topic prior to being decoded.

Enhancements in this release:
- Support IEEE 1609.2 and 1609.3 header ingestion
- Strips unsigned IEEE 1609.2 headers
- Strips IEEE 1609.2 headers
- Maintains signed IEEE 1609.3 headers before eventually stripping them before decoding to the J2735 payload

Known Issues:
- No known issues at this time.

Version 2.0.1, released March 2024
----------------------------------------
### **Summary**
Expand Down
Loading

0 comments on commit 331a90f

Please sign in to comment.