-
Notifications
You must be signed in to change notification settings - Fork 1
feat: Add TLS encryption to MQTT bridge for secure connection to base station #537
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
char1ss4
wants to merge
5
commits into
Northeastern-Electric-Racing:develop
Choose a base branch
from
char1ss4:Charissa/feature/mqtt-encryption
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
5e341af
feat: Add TLS encryption to MQTT bridge for secure connection to car
char1ss4 25dc2eb
fix: restore dropped settings and fix inline comment in moquitto.conf
char1ss4 3ef1f10
fix: add cert volume mounts to compose.siren.yml for TLS bridge
char1ss4 6a74c5c
fix: add *.pem and *.p12 to mosquitto gitignore
char1ss4 de6d58b
fix: resolve merge conflicts with develop
char1ss4 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| diff --git a/compose/compose.brick.yml b/compose/compose.brick.yml | ||
| index 007ef16..f7c2537 100644 | ||
| --- a/compose/compose.brick.yml | ||
| +++ b/compose/compose.brick.yml | ||
| @@ -1,6 +1,6 @@ | ||
| services: | ||
| scylla-server: | ||
| environment: | ||
| - - SCYLLA_SIREN_HOST_URL=192.168.100.11:1883 | ||
| + - SCYLLA_SIREN_HOST_URL=192.168.100.11:8883 | ||
| - SCYLLA_RATE_LIMIT_MODE=none | ||
|
|
||
| diff --git a/compose/compose.calypso.yml b/compose/compose.calypso.yml | ||
| index c27b441..75df348 100644 | ||
| --- a/compose/compose.calypso.yml | ||
| +++ b/compose/compose.calypso.yml | ||
| @@ -8,4 +8,4 @@ services: | ||
| #- CALYPSO_CAN_ENCODE=false | ||
| #- CALYPSO_SOCKETCAN_IFACE=vcan0 | ||
| # in sim or prod mode | ||
| - - CALYPSO_SIREN_HOST_URL=siren:1883 | ||
| + - CALYPSO_SIREN_HOST_URL=siren:8883 | ||
| diff --git a/compose/compose.client-dev.yml b/compose/compose.client-dev.yml | ||
| index 9b4c46c..875434d 100644 | ||
| --- a/compose/compose.client-dev.yml | ||
| +++ b/compose/compose.client-dev.yml | ||
| @@ -1,7 +1,7 @@ | ||
| services: | ||
| scylla-server: | ||
| environment: | ||
| - - SCYLLA_SIREN_HOST_URL=siren:1883 | ||
| + - SCYLLA_SIREN_HOST_URL=siren:8883 | ||
|
|
||
| siren: | ||
| extends: | ||
| diff --git a/compose/compose.router.yml b/compose/compose.router.yml | ||
| index 9a660e0..06be21f 100644 | ||
| --- a/compose/compose.router.yml | ||
| +++ b/compose/compose.router.yml | ||
| @@ -3,7 +3,7 @@ services: | ||
| depends_on: | ||
| - siren | ||
| environment: | ||
| - - SCYLLA_SIREN_HOST_URL=siren:1883 | ||
| + - SCYLLA_SIREN_HOST_URL=siren:8883 | ||
| - SCYLLA_BATCH_UPSERT_TIME=20 | ||
| init: false | ||
|
|
||
| diff --git a/compose/compose.tpu.yml b/compose/compose.tpu.yml | ||
| index 88ea321..6dda3c2 100644 | ||
| --- a/compose/compose.tpu.yml | ||
| +++ b/compose/compose.tpu.yml | ||
| @@ -1,7 +1,7 @@ | ||
| services: | ||
| scylla-server: | ||
| environment: | ||
| - - SCYLLA_SIREN_HOST_URL=host.docker.internal:1883 | ||
| + - SCYLLA_SIREN_HOST_URL=host.docker.internal:8883 | ||
| - SCYLLA_RATE_LIMIT_MODE=static | ||
| - SCYLLA_STATIC_RATE_LIMIT_VALUE=100 | ||
| extra_hosts: | ||
| diff --git a/scylla-server/src/main.rs b/scylla-server/src/main.rs | ||
| index d51d3fc..033dd06 100755 | ||
| --- a/scylla-server/src/main.rs | ||
| +++ b/scylla-server/src/main.rs | ||
| @@ -77,7 +77,7 @@ struct ScyllaArgs { | ||
| short = 'u', | ||
| long, | ||
| env = "SCYLLA_SIREN_HOST_URL", | ||
| - default_value = "localhost:1883" | ||
| + default_value = "localhost:8883" | ||
| )] | ||
| siren_host_url: String, | ||
|
|
||
| diff --git a/siren-base/compose.siren.yml b/siren-base/compose.siren.yml | ||
| index 3e4e4c6..4d97b46 100644 | ||
| --- a/siren-base/compose.siren.yml | ||
| +++ b/siren-base/compose.siren.yml | ||
| @@ -4,10 +4,10 @@ services: | ||
| restart: unless-stopped | ||
| image: eclipse-mosquitto:latest | ||
| ports: | ||
| - - 1883:1883 | ||
| + - 8883:8883 | ||
| - 9002:9001 # win conflict on 9001 | ||
| expose: | ||
| - - 1883 | ||
| + - 8883 | ||
| volumes: | ||
| - ./mosquitto/mosquitto.conf:/mosquitto/config/mosquitto.conf | ||
| cpu_shares: 2048 | ||
| diff --git a/siren-base/mosquitto/mosquitto.conf b/siren-base/mosquitto/mosquitto.conf | ||
| index 19deeea..f691d2e 100755 | ||
| --- a/siren-base/mosquitto/mosquitto.conf | ||
| +++ b/siren-base/mosquitto/mosquitto.conf | ||
| @@ -49,7 +49,7 @@ queue_qos0_messages false | ||
| # Listeners | ||
| # ================================================================= | ||
|
|
||
| -listener 1883 | ||
| +listener 8883 | ||
|
|
||
| socket_domain ipv4 | ||
|
|
||
| @@ -176,7 +176,7 @@ allow_anonymous true | ||
| connection tpu | ||
| # *** tpu ip | ||
| # *** diff from tpu | ||
| -address 192.168.100.12 | ||
| +address 192.168.100.12:8883 | ||
| # *** diff from tpu (needed as topic key required) | ||
| topic reserved out 2 dummy dummyremote | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| *.key | ||
| *.crt | ||
| *.pem | ||
| *.p12 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This patch file references paths that don't exist in the current repo (e.g.,
compose/compose.*.ymlandsiren-base/compose.siren.yml), so it won’t apply cleanly and is likely to become stale. Consider removing it from version control (or moving it to external documentation/issue notes) unless it’s kept in sync with the current file layout and validated withgit apply.