Add support for gathering proc files necessary to convert coredump to minidump

charts/core-dump-handler/README.md

@@ -177,6 +177,11 @@ The agent pod has the following environment variables and these are all set by t
     false (Default): The composer will generate the additional JSON files.
 
     true: The composer will only collect the core dump and save the core parameters as an additional JSON
+* COMP_INCLUDE_PROC_INFO - Defines if the composer should get additional proc files from the container process. *Warning:* These files can contain sensitive information regarding the process, use with caution
+
+    false (Default): The composer will not collect any pid related files
+
+    true: The composer will copy 'auxv', 'cmdline', 'environ', 'maps' and 'status' for every container into the zip
 * COMP_CRIO_IMAGE_CMD - The command to use to get image information for the core dump.
 
     "img" (Default): This is the value most crictls expect.
@@ -272,6 +277,7 @@ Image
 Composer
 * logLevel: The log level for the composer (Default "Warn")
 * ignoreCrio: Maps to the COMP_IGNORE_CRIO enviroment variable  (Default false)
+* includeProcInfo: Maps to the COMP_INCLUDE_PROC_INFO enviroment variable  (Default false)
 * crioImageCmd: Maps to the COMP_CRIO_IMAGE_CMD enviroment variable (Default "img")
 * timeout: Maps to the COMP_TIMEOUT environment variable ("Default 600)
 * compression: Maps to the COMP_COMPRESSION environment variable (Default "true")

charts/core-dump-handler/ci/inotify-manage-store.yaml

@@ -21,6 +21,7 @@ storageClass: hostclass
 
 composer:
   ignoreCrio: false
+  includeProcInfo: false
   crioImageCmd: "img"
   logLevel: "Warn"
   # Double curlies are required otherwise helm trys to parse the string

charts/core-dump-handler/ci/interval-manage-store.yaml

@@ -21,6 +21,7 @@ storageClass: hostclass
 
 composer:
   ignoreCrio: false
+  includeProcInfo: false
   crioImageCmd: "img"
   logLevel: "Warn"
   # Double curlies are required otherwise helm trys to parse the string

charts/core-dump-handler/ci/schedule-no-manage-store.yaml

@@ -21,6 +21,7 @@ storageClass: hostclass
 
 composer:
   ignoreCrio: false
+  includeProcInfo: false
   crioImageCmd: "img"
   logLevel: "Warn"
   # Double curlies are required otherwise helm trys to parse the string

charts/core-dump-handler/templates/daemonset.yaml

@@ -44,6 +44,8 @@ spec:
             value: {{ .Values.composer.logLevel }}
           - name: COMP_IGNORE_CRIO
             value: {{ .Values.composer.ignoreCrio | quote }}
+          - name: COMP_INCLUDE_PROC_INFO
+            value: {{ .Values.composer.includeProcInfo | quote }}
           - name: COMP_CRIO_IMAGE_CMD
             value:  {{ .Values.composer.crioImageCmd }}
           - name: COMP_POD_SELECTOR_LABEL

charts/core-dump-handler/values.schema.json

@@ -110,6 +110,9 @@
                 "ignoreCrio": {
                     "type": "boolean"
                 },
+                "includeProcInfo": {
+                    "type": "boolean"
+                },
                 "crioImageCmd": {
                     "type": "string"
                 },
@@ -130,6 +133,7 @@
             "required": [
                 "crioImageCmd",
                 "ignoreCrio",
+                "includeProcInfo",
                 "logLevel",
                 "logLength",
                 "filenameTemplate",

charts/core-dump-handler/values.yaml

@@ -23,6 +23,7 @@ storageClass: hostclass
 
 composer:
   ignoreCrio: false
+  includeProcInfo: false
   crioImageCmd: "img"
   logLevel: "Warn"
   filenameTemplate: "{uuid}-dump-{timestamp}-{hostname}-{exe_name}-{pid}-{signal}"

core-dump-agent/Cargo.toml

@@ -31,5 +31,8 @@ features = ["tokio-rustls-tls"]
 [target.x86_64-unknown-linux-gnu.dependencies.rust-s3]
 version = "0.31.0"
 
+[target.aarch64-unknown-linux-gnu.dependencies.rust-s3]
+version = "0.31.0"
+
 [dev-dependencies]
 fs_extra = "1.2"

core-dump-agent/src/main.rs

@@ -466,6 +466,9 @@ fn create_env_file(host_location: &str) -> Result<(), std::io::Error> {
     let ignore_crio = env::var("COMP_IGNORE_CRIO")
         .unwrap_or_else(|_| "false".to_string())
         .to_lowercase();
+    let include_proc_info = env::var("COMP_INCLUDE_PROC_INFO")
+        .unwrap_or_else(|_| "false".to_string())
+        .to_lowercase();
     let crio_image = env::var("COMP_CRIO_IMAGE_CMD").unwrap_or_else(|_| "img".to_string());
     let destination = format!("{}/{}", host_location, ".env");
     let use_crio_config = env::var("DEPLOY_CRIO_CONFIG")
@@ -492,7 +495,7 @@ fn create_env_file(host_location: &str) -> Result<(), std::io::Error> {
     info!("Creating {} file with LOG_LEVEL={}", destination, loglevel);
     let mut env_file = File::create(destination)?;
     let text = format!(
-        "LOG_LEVEL={loglevel}\nIGNORE_CRIO={ignore_crio}\nCRIO_IMAGE_CMD={crio_image}\nUSE_CRIO_CONF={use_crio_config}\nFILENAME_TEMPLATE={filename_template}\nLOG_LENGTH={log_length}\nPOD_SELECTOR_LABEL={pod_selector_label}\nTIMEOUT={timeout}\nCOMPRESSION={compression}\nCORE_EVENTS={core_events}\nEVENT_DIRECTORY={event_directory}\n");
+        "LOG_LEVEL={loglevel}\nIGNORE_CRIO={ignore_crio}\nINCLUDE_PROC_INFO={include_proc_info}\nCRIO_IMAGE_CMD={crio_image}\nUSE_CRIO_CONF={use_crio_config}\nFILENAME_TEMPLATE={filename_template}\nLOG_LENGTH={log_length}\nPOD_SELECTOR_LABEL={pod_selector_label}\nTIMEOUT={timeout}\nCOMPRESSION={compression}\nCORE_EVENTS={core_events}\nEVENT_DIRECTORY={event_directory}\n");
     info!("Writing composer .env \n{}", text);
     env_file.write_all(text.as_bytes())?;
     env_file.flush()?;

core-dump-agent/tests/basic.rs

@@ -89,6 +89,7 @@ fn basic() -> Result<(), std::io::Error> {
     let env_content = fs::read_to_string(&env_file).unwrap();
     assert!(env_content.contains("LOG_LEVEL=debug"));
     assert!(env_content.contains("IGNORE_CRIO=false"));
+    assert!(env_content.contains("INCLUDE_PROC_INFO=false"));
     assert!(env_content.contains("CRIO_IMAGE_CMD=img"));
     assert!(env_content.contains("USE_CRIO_CONF=false"));
     assert!(env_content.contains(
@@ -97,7 +98,7 @@ fn basic() -> Result<(), std::io::Error> {
     assert!(env_content.contains("LOG_LENGTH=500"));
     assert!(env_content.contains("EVENTS=false"));
     assert!(env_content.contains("EVENT_DIRECTORY=/"));
-    assert_eq!(env_content.lines().count(), 11);
+    assert_eq!(env_content.lines().count(), 12);
     //TODO: [No9] Test uploading of a corefile
     //TODO: [No9] Test remove option
     //TODO: [No9] Test sweep option

core-dump-composer/Cargo.toml

@@ -18,7 +18,7 @@ anyhow = "1.0.53"
 serde_json = "1.0.76"
 serde = { version = "1.0.134", features = ["derive"] }
 hostname = "0.3.1"
-libcrio = "2.0.0"
+libcrio = "2.1.0"
 tinytemplate = "1.2.1"
 
 [dev-dependencies]