Skip to content

ssh: T7483: Add fido2 PubkeyAuthOptions #4852

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
scj643 wants to merge 4 commits into
base: current
Choose a base branch
from
+50 −0
Open

ssh: T7483: Add fido2 PubkeyAuthOptions #4852

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eef18e3
ssh: T7483: Add fido2 PubkeyAuthOptions
scj643 Nov 17, 2025
0310c83
ssh: T7483: Update fido2 option names
scj643 Nov 20, 2025
2e739ed
ssh: T7483: Fix sshd template indentation
scj643 Nov 20, 2025
bddeabc
smoketest: T7483: Add fido ssh smoketest
scj643 Nov 24, 2025
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
12 changes: 12 additions & 0 deletions data/templates/ssh/sshd_config.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,18 @@ HostKeyAlgorithms {{ hostkey_algorithm | join(',') }}
PubkeyAcceptedAlgorithms {{ pubkey_accepted_algorithm | join(',') }}
{% endif %}

{% set configured_pubkey_options = [] %}
{% if verify_required is vyos_defined %}
{{ configured_pubkey_options.append('verify-required') }}
{% endif %}
{% if touch_required is vyos_defined %}
{{ configured_pubkey_options.append('touch-required') }}
{% endif %}
{% if configured_pubkey_options | length > 0 %}
# Sets one or more public key authentication options.
PubkeyAuthOptions {{ configured_pubkey_options | join(',') }}
{% endif %}

{% if mac is vyos_defined %}
# Specifies the available MAC (message authentication code) algorithms
MACs {{ mac | join(',') }}
Expand Down
12 changes: 12 additions & 0 deletions interface-definitions/service_ssh.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,18 @@
<valueless/>
</properties>
</leafNode>
<leafNode name="verify-required">
<properties>
<help>Require FIDO2 keys to attest that a user has been verified (e.g. via a PIN)</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="touch-required">
<properties>
<help>Require FIDO2 keys to attest that a user is physically present</help>
<valueless/>
</properties>
</leafNode>
<node name="dynamic-protection">
<properties>
<help>Allow dynamic protection</help>
Expand Down
Loading