Skip to content

[fix] Make parameter tls_cipher an array #349 #350

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

Open
okraits wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[fix] Make parameter tls_cipher an array #349 #350

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
8 changes: 8 additions & 0 deletions netjsonconfig/backends/openwrt/converters/openvpn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ def __intermediate_vpn(self, vpn):
"enabled": not vpn.pop("disabled", False),
}
)
if (ciphers := vpn.get("tls_cipher")) and isinstance(ciphers, str):
vpn["tls_cipher"] = []
# only add non empty strings
for part in ciphers.split(":"):
if part:
vpn["tls_cipher"].append(part)
return super().__intermediate_vpn(vpn, remove=[""])

def __netjson_vpn(self, vpn):
Expand All @@ -24,4 +30,6 @@ def __netjson_vpn(self, vpn):
vpn["disabled"] = vpn.pop("enabled", "0") == "0"
vpn["name"] = vpn.pop(".name")
del vpn[".type"]
if (ciphers := vpn.get("tls_cipher")) and isinstance(ciphers, list) and ciphers:
vpn["tls_cipher"] = ":".join(ciphers)
return super().__netjson_vpn(vpn)
6 changes: 6 additions & 0 deletions tests/openvpn/test_backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,11 @@ def test_client_mode(self):
"status_version": 1,
"tls_client": True,
"tls_auth": "tls_auth.key 1",
"tls_cipher": (
"TLS-DHE-RSA-WITH-AES-256-CBC-SHA:"
"TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA:"
"@SECLEVEL=0"
),
"topology": "p2p",
"tun_ipv6": True,
"up": "/home/user/up-command.sh",
Expand Down Expand Up @@ -302,6 +307,7 @@ def test_client_mode(self):
status /var/log/openvpn.status 30
status-version 1
tls-auth tls_auth.key 1
tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA:@SECLEVEL=0
tls-client
topology p2p
tun-ipv6
Expand Down
6 changes: 6 additions & 0 deletions tests/openvpn/test_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ def test_parse_server(self):
script-security 0
status /var/log/openvpn.status 10
status-version 1
tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA:@SECLEVEL=0
tls-server
user nobody
verb 3
Expand Down Expand Up @@ -110,6 +111,11 @@ def test_parse_server(self):
"script_security": 0,
"status": "/var/log/openvpn.status 10",
"status_version": 1,
"tls_cipher": (
"TLS-DHE-RSA-WITH-AES-256-CBC-SHA:"
"TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA:"
"@SECLEVEL=0"
),
"tls_server": True,
"user": "nobody",
"verb": 3,
Expand Down
8 changes: 8 additions & 0 deletions tests/openwrt/test_openvpn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,11 @@ def test_parse_server_mode_data_ciphers(self):
"script_security": 1,
"status": "/var/log/openvpn.status 30",
"status_version": 1,
"tls_cipher": (
"TLS-DHE-RSA-WITH-AES-256-CBC-SHA:"
"TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA:"
"@SECLEVEL=0"
),
"tls_client": True,
"tun_ipv6": True,
"up": "/home/user/up-command.sh",
Expand Down Expand Up @@ -254,6 +259,9 @@ def test_parse_server_mode_data_ciphers(self):
option script_security '1'
option status '/var/log/openvpn.status 30'
option status_version '1'
list tls_cipher 'TLS-DHE-RSA-WITH-AES-256-CBC-SHA'
list tls_cipher 'TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA'
list tls_cipher '@SECLEVEL=0'
option tls_client '1'
option tun_ipv6 '1'
option up '/home/user/up-command.sh'
Expand Down