eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-19 17:49:45 +01:00
Code Issues Releases Wiki Activity

mbsync: make passwordCommand escaping consistent (#3630)

Browse source 
* Fix mbsync passwordCommand escaping

* email: use lib.escapeShellArgs

Co-authored-by: Naïm Favier <n@monade.li>

* mbsync: update tests

---------

Co-authored-by: Naïm Favier <n@monade.li>
This commit is contained in:
Jarkad 2023-02-04 00:22:11 +02:00 committed by GitHub
parent d1c7730bb7
commit e2c1756e3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/programs/mbsync.nix
View file

@ -84,7 +84,7 @@ let
genSection "IMAPAccount ${name}" ({ genSection "IMAPAccount ${name}" ({
Host = imap.host; Host = imap.host;
User = userName; User = userName;
PassCmd = toString passwordCommand; PassCmd = lib.escapeShellArgs passwordCommand;
} // genTlsConfig imap.tls } // genTlsConfig imap.tls
// optionalAttrs (imap.port != null) { Port = toString imap.port; } // optionalAttrs (imap.port != null) { Port = toString imap.port; }
// mbsync.extraConfig.account) + "\n" // mbsync.extraConfig.account) + "\n"

4
tests/modules/programs/mbsync/mbsync-expected.conf
View file

@ -3,7 +3,7 @@
IMAPAccount hm-account IMAPAccount hm-account
CertificateFile /etc/ssl/certs/ca-certificates.crt CertificateFile /etc/ssl/certs/ca-certificates.crt
Host imap.example.org Host imap.example.org
PassCmd "password-command 2" PassCmd "'password-command' '2'"
SSLType IMAPS SSLType IMAPS
User home.manager.jr User home.manager.jr
@ -55,7 +55,7 @@ Channel hm-account-strangeHostBoxName
IMAPAccount hm@example.com IMAPAccount hm@example.com
CertificateFile /etc/ssl/certs/ca-certificates.crt CertificateFile /etc/ssl/certs/ca-certificates.crt
Host imap.example.com Host imap.example.com
PassCmd password-command PassCmd 'password-command'
SSLType IMAPS SSLType IMAPS
SSLVersions TLSv1.3 TLSv1.2 SSLVersions TLSv1.3 TLSv1.2
User home.manager User home.manager