Merge pull request containers#22 from mkenigs/certificate_authority

Add certificate_authority to expose --cert-dir
cgwalters · Dec 9, 2021 · 447c907 · 447c907
2 parents 5ea91ae + 88311ee
commit 447c907
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -51,7 +51,8 @@ jobs:
       - name: Checkout ostree-rs-ext
         uses: actions/checkout@v2
         with:
-          repository: ostreedev/ostree-rs-ext
+          repository: mkenigs/ostree-rs-ext
+          ref: cert_dir
           path: ostree-rs-ext
           fetch-depth: 20
       - name: Test ostree-rs-ext

diff --git a/src/imageproxy.rs b/src/imageproxy.rs
@@ -13,6 +13,7 @@ use std::convert::TryFrom;
 use std::fs::File;
 use std::os::unix::io::AsRawFd;
 use std::os::unix::prelude::{CommandExt, FromRawFd, RawFd};
+use std::path::PathBuf;
 use std::pin::Pin;
 use std::process::{Command, Stdio};
 use std::sync::{Arc, Mutex};
@@ -122,13 +123,17 @@ fn file_from_scm_rights(cmsg: ControlMessageOwned) -> Option<File> {
 #[derive(Debug, Default)]
 pub struct ImageProxyConfig {
     /// Path to container auth file; equivalent to `skopeo --authfile`.
-    pub authfile: Option<String>,
+    pub authfile: Option<PathBuf>,
 
     /// Do not use default container authentication paths; equivalent to `skopeo --no-creds`.
     ///
     /// Defaults to `false`; in other words, use the default file paths from `man containers-auth.json`.
     pub auth_anonymous: bool,
 
+    // Directory with certificates (*.crt, *.cert, *.key) used to connect to registry
+    // Equivalent to `skopeo --cert-dir`
+    pub certificate_directory: Option<PathBuf>,
+
     /// If set, disable TLS verification.  Equivalent to `skopeo --tls-verify=false`.
     pub insecure_skip_tls_verification: Option<bool>,
 
@@ -171,15 +176,20 @@ impl TryFrom<ImageProxyConfig> for Command {
             c
         });
         c.arg("experimental-image-proxy");
-        if let Some(authfile) = config.authfile.as_deref() {
-            c.args(&["--authfile", authfile]);
+        if let Some(authfile) = config.authfile {
             if config.auth_anonymous {
                 // This is a programmer error really
                 anyhow::bail!("Cannot use anonymous auth and an authfile");
             }
+            c.arg("--authfile");
+            c.arg(authfile);
         } else if config.auth_anonymous {
             c.arg("--no-creds");
         }
+        if let Some(certificate_directory) = config.certificate_directory {
+            c.arg("--cert-dir");
+            c.arg(certificate_directory);
+        }
         if config.insecure_skip_tls_verification.unwrap_or_default() {
             c.arg("--tls-verify=false");
         }
@@ -453,12 +463,19 @@ mod tests {
         );
 
         let c = Command::try_from(ImageProxyConfig {
-            authfile: Some("/path/to/authfile".to_string()),
+            authfile: Some(PathBuf::from("/path/to/authfile")),
             ..Default::default()
         })
         .unwrap();
         validate(c, &[r"--authfile", "/path/to/authfile"], &[]);
 
+        let c = Command::try_from(ImageProxyConfig {
+            certificate_directory: Some(PathBuf::from("/path/to/certs")),
+            ..Default::default()
+        })
+        .unwrap();
+        validate(c, &[r"--cert-dir", "/path/to/certs"], &[]);
+
         let c = Command::try_from(ImageProxyConfig {
             insecure_skip_tls_verification: Some(true),
             ..Default::default()