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

Update sshd lens to split additional list keys #721

Merged
merged 2 commits into from
Nov 19, 2022
Merged

Update sshd lens to split additional list keys #721

merged 2 commits into from
Nov 19, 2022

Conversation

tedgarb
Copy link
Contributor

@tedgarb tedgarb commented Apr 15, 2021

Several configuration values used for setting crypto policy were being
incorrectly parsed as raw strings when they are in fact lists. Treat
them as such

Specifically:

  • GSSAPIKexAlgorithms
  • PubkeyAcceptedKeyTypes
  • CASignatureAlgorithms

@raphink
Copy link
Member

raphink commented Jun 22, 2021

Thanks for this and sorry for the delay in reviewing it.

Could you please add unit tests for these new keys?

Several configuration values used for setting crypto policy were being
incorrectly parsed as raw strings when they are in fact lists. Treat
them as such

Specifically:
- GSSAPIKexAlgorithms
- PubkeyAcceptedKeyTypes
- CASignatureAlgorithms
@tedgarb
Copy link
Contributor Author

tedgarb commented Nov 10, 2022

Apologies on the long delay here, I added the requested tests

@georgehansper
Copy link
Member

Thanks for that.

Since we are updating the sshd lens, can I ask you to also change the following:

@@ -151,7 +151,10 @@ module Sshd =
 
   let lns = (entry | comment | empty)* . match*
 
-  let xfm = transform lns (incl "/etc/ssh/sshd_config")
+  let filter = (incl "/etc/ssh/sshd_config" )
+               . ( incl "/etc/ssh/sshd_config.d/*.conf" )
+
+  let xfm = transform lns filter
 
 (* Local Variables: *)
 (* mode: caml       *)

My default sshd_config includes the line
Include /etc/ssh/sshd_config.d/*.conf

The "include something.d/*" approach to managing configs is becoming more and more common, I notice.

@tedgarb
Copy link
Contributor Author

tedgarb commented Nov 11, 2022

Done!

Copy link
Member

@georgehansper georgehansper left a comment

Choose a reason for hiding this comment

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

Look Good To Me

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

Successfully merging this pull request may close these issues.

3 participants