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.

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

Add and use pkcs12 in tls-crypt-v2 e2e test #272

Merged
merged 3 commits into from
Jun 26, 2024
Merged

Add and use pkcs12 in tls-crypt-v2 e2e test #272

merged 3 commits into from
Jun 26, 2024

Conversation

reynir
Copy link
Contributor

@reynir reynir commented Jun 25, 2024

This will exercise some of the pkcs12 code.

I also removed unused symbolic links.

@reynir
Copy link
Contributor Author

reynir commented Jun 25, 2024

I added a test with peer-fingerprint too, but --peer-fingerprint is OpenVPN>=2.6 so doesn't work with CI.

@hannesm
Copy link
Contributor

hannesm commented Jun 25, 2024

I opened #273 to get openvpn 2.6 installed on the GitHub worker (following the OpenVPN instructions). I guess that would be nice for this here as well :)

@@ -28,9 +28,9 @@ trap cleanup EXIT

(
sleep 1
openvpn --cd "$config_dir" --config "client.conf" --dev-type tun --dev "$tun_interface" --writepid "$pidfile" --script-security 2 --up ../client-up.sh > /dev/null
openvpn --cd "$config_dir" --config "client.conf" --dev-type tun --dev "$tun_interface" --writepid "$pidfile" --script-security 2 --up ../client-up.sh
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm undecided about the output here.. somehow it is nice to spot the issues easily in CI, somehow it is also nice to not get a lot of output.

In the end, I'm fine without the redirection to /dev/null. if there's need to see less output, someone invoking the scripts can still redirect to /dev/null. :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed the redirection to /dev/null to debug in CI. We should add it back, I just forgot.

@hannesm
Copy link
Contributor

hannesm commented Jun 25, 2024

looks good to me

This will exercise some of the pkcs12 code.
@reynir
Copy link
Contributor Author

reynir commented Jun 26, 2024

The two numbers are unfortunately not 100% comparable as for the 2nd numbers I rebased on #273 which covers more code as well. While rebasing I also dropped the "debug" commit which removed the redirection to /dev/null.

@hannesm
Copy link
Contributor

hannesm commented Jun 26, 2024

The other PR was at 72.76%, here we're nearly 1% more.

@reynir reynir merged commit 9a7c5c8 into main Jun 26, 2024
1 of 5 checks passed
@reynir
Copy link
Contributor Author

reynir commented Jun 26, 2024

I squashed the fixup commit before merging

@reynir reynir deleted the e2e-testing branch June 26, 2024 08:12
Copy link

  0.00 %      0/21     src/cc_message.ml
 80.28 %   1482/1846   src/config.ml
 57.64 %    117/203    src/config_ext.ml
 94.74 %     18/19     src/cstruct_ext.ml
 64.51 %    847/1313   src/engine.ml
100.00 %      0/0      src/miragevpn.ml
 92.88 %    365/393    src/packet.ml
 20.00 %      1/5      src/result.ml
 63.41 %     52/82     src/state.ml
 61.48 %    150/244    src/tls_crypt.ml
 73.49 %   3032/4126   Project coverage

@reynir
Copy link
Contributor Author

reynir commented Jun 26, 2024

Hmm the coverage dropped slightly after re-adding the /dev/null redirection. My guess is some code paths are slightly timing sensitive in our tests?!

@hannesm
Copy link
Contributor

hannesm commented Jun 26, 2024

Should we remove the redirects? As mentioned above, fine with me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants