Skip to content
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.

Sign up for GitHub

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

Mark nat-lab core api certificate as test-only #1076

Merged
merged 1 commit into from
Jan 27, 2025
Merged

Mark nat-lab core api certificate as test-only #1076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added .unreleased/mark_core_api_cert_as_test_only
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion nat-lab/bin/core-api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"weight": 1,
}

CERTIFICATE_PATH = "/etc/ssl/server_certificate/server.pem"
CERTIFICATE_PATH = "/etc/ssl/server_certificate/test.pem"

MQTT_BROKER_HOST = "mqtt.nordvpn.com"
MQTT_BROKER_PORT = 8883
Expand Down
2 changes: 1 addition & 1 deletion nat-lab/bin/mqtt-listener.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import ssl
import sys

CERTIFICATE_PATH = "/etc/ssl/server_certificate/server.pem"
CERTIFICATE_PATH = "/etc/ssl/server_certificate/test.pem"


def on_message(_client, _userdata, message):
Expand Down
4 changes: 2 additions & 2 deletions nat-lab/data/core_api/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ To generate self-signed certificate execute following:
```
export CERTIFICATE_FOLDER_PATH=/etc/ssl/server_certificate

openssl req -newkey rsa:4096 -x509 -sha256 -days 3650 -nodes -out $CERTIFICATE_FOLDER_PATH/server.crt -keyout $CERTIFICATE_FOLDER_PATH/server.key -subj "/CN=*.nordvpn.com"
openssl req -newkey rsa:4096 -x509 -sha256 -days 3650 -nodes -out $CERTIFICATE_FOLDER_PATH/test.crt -keyout $CERTIFICATE_FOLDER_PATH/test.key -subj "/CN=*.nordvpn.com"

cat $CERTIFICATE_FOLDER_PATH/server.crt $CERTIFICATE_FOLDER_PATH/server.key > $CERTIFICATE_FOLDER_PATH/server.pem
cat $CERTIFICATE_FOLDER_PATH/test.crt $CERTIFICATE_FOLDER_PATH/test.key > $CERTIFICATE_FOLDER_PATH/test.pem
```
4 changes: 2 additions & 2 deletions nat-lab/data/core_api/rumqttd.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ name = "v4-2"
listen = "0.0.0.0:8883"
next_connection_delay_ms = 10
[v4.2.tls]
certpath = "/etc/ssl/server_certificate/server.pem"
keypath = "/etc/ssl/server_certificate/server.pem"
certpath = "/etc/ssl/server_certificate/test.pem"
keypath = "/etc/ssl/server_certificate/test.pem"
[v4.2.connections]
connection_timeout_ms = 60000
throttle_delay_ms = 0
Expand Down
0 nat-lab/data/core_api/server.pem → nat-lab/data/core_api/test.pem
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions nat-lab/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ services:
volumes:
- ../:/libtelio
- ./data/teliod:/etc/teliod
- ./data/core_api/server.pem:/etc/ssl/server_certificate/server.pem
- ./data/core_api/test.pem:/etc/ssl/server_certificate/test.pem
healthcheck:
test: "ls /ready"
cone-client-02:
Expand Down Expand Up @@ -619,7 +619,7 @@ services:
start_period: 5s
volumes:
- ./data/core_api/rumqttd.toml:/etc/mqtt/rumqttd.toml
- ./data/core_api/server.pem:/etc/ssl/server_certificate/server.pem
- ./data/core_api/test.pem:/etc/ssl/server_certificate/test.pem

core-api:
hostname: core-api
Expand All @@ -628,7 +628,7 @@ services:
environment:
PYTHONUNBUFFERED: 1
healthcheck:
test: "curl --cacert /etc/ssl/server_certificate/server.pem https://api.nordvpn.com/v1/health"
test: "curl --cacert /etc/ssl/server_certificate/test.pem https://api.nordvpn.com/v1/health"
networks:
internet:
ipv4_address: 10.0.80.86
Expand All @@ -637,7 +637,7 @@ services:
mqtt-broker:
condition: service_healthy
volumes:
- ./data/core_api/server.pem:/etc/ssl/server_certificate/server.pem
- ./data/core_api/test.pem:/etc/ssl/server_certificate/test.pem
dns:
- 10.0.80.82
- 10.0.80.83
Expand Down
2 changes: 1 addition & 1 deletion nat-lab/tests/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,4 +210,4 @@ def get_root_path(path: str) -> str:
CORE_API_URL = "https://api.nordvpn.com"
MQTT_BROKER_HOST = "mqtt.nordvpn.com"
MQTT_BROKER_IP = "10.0.80.85"
CORE_API_CA_CERTIFICATE_PATH = "/etc/ssl/server_certificate/server.pem"
CORE_API_CA_CERTIFICATE_PATH = "/etc/ssl/server_certificate/test.pem"
Loading