fix: trim base64 file input

x52dev · Jun 7, 2024 · e64b275 · e64b275
1 parent 05863d9
commit e64b275
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,7 +3,7 @@ updates:
   - package-ecosystem: github-actions
     directory: /
     schedule:
-      interval: weekly
+      interval: monthly
   - package-ecosystem: cargo
     directory: /
     schedule:

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -30,10 +30,10 @@ jobs:
           - { os: macos-latest, target: x86_64-apple-darwin }
           - { os: ubuntu-latest, target: aarch64-unknown-linux-gnu }
           - { os: ubuntu-latest, target: aarch64-unknown-linux-musl }
-          # - { os: ubuntu-latest, target: x86_64-unknown-freebsd } # not supported by aws-lc
+          - { os: ubuntu-latest, target: x86_64-unknown-freebsd }
           - { os: ubuntu-latest, target: x86_64-unknown-linux-gnu }
           - { os: ubuntu-latest, target: x86_64-unknown-linux-musl }
-          # - { os: windows-latest, target: aarch64-pc-windows-msvc } # not supported by aws-lc
+          - { os: windows-latest, target: aarch64-pc-windows-msvc }
           - { os: windows-latest, target: x86_64-pc-windows-msvc }
 
     name: Deploy (${{ matrix.target }})
@@ -44,10 +44,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install nasm
-        if: matrix.target.os == 'windows-latest'
-        uses: ilammy/[email protected]
-
       - name: Install Rust
         uses: actions-rust-lang/[email protected]
         with:
@@ -73,7 +69,7 @@ jobs:
         id: upload-release
         uses: taiki-e/[email protected]
         with:
-          bin: inspect-cert-chain
+          bin: protobug
           target: ${{ matrix.target }}
           tar: all
           zip: all

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,7 +1,8 @@
 name: Release
 
 on:
-  push: { branches: [main] }
+  push:
+    branches: [main]
 
 permissions:
   contents: write

diff --git a/protobug/src/main.rs b/protobug/src/main.rs
@@ -34,6 +34,7 @@ enum Commands {
         schema: Utf8PathBuf,
     },
 
+    /// Inspects a protobuf file (base64) using a schema.
     Inspect {
         #[arg(long)]
         schema: Utf8PathBuf,
@@ -89,11 +90,17 @@ fn inspect(schema: Utf8PathBuf, file: Utf8PathBuf) -> Result<(), Inspect> {
 
     let md = fd.message_by_package_relative_name(&msg_name).unwrap();
 
-    let file_contents = fs::read_to_string(file).change_context(Inspect)?;
-    let decoded_message = decode_any_base64(&file_contents);
+    let file_contents = fs::read_to_string(&file)
+        .attach_printable_lazy(|| format!("File: {file}"))
+        .change_context(Inspect)?;
+
+    let decoded_message = decode_any_base64(file_contents.trim_end())
+        .attach_printable_lazy(|| format!("File: {file}"))
+        .change_context(Inspect)?;
 
     let msg = md
         .parse_from_bytes(&decoded_message)
+        .attach_printable_lazy(|| format!("File: {file}"))
         .change_context(Inspect)?;
 
     let mut tui = tui::init().change_context(Inspect)?;
@@ -142,10 +149,10 @@ fn validate_schema(schema_path: Utf8PathBuf) -> Result<(), anyhow::Error> {
     Ok(())
 }
 
-fn decode_any_base64(encoded: &str) -> Vec<u8> {
-    None.or_else(|| BASE64_STANDARD.decode(encoded).ok())
-        .or_else(|| BASE64_STANDARD_NO_PAD.decode(encoded).ok())
-        .or_else(|| BASE64_URL_SAFE.decode(encoded).ok())
-        .or_else(|| BASE64_URL_SAFE_NO_PAD.decode(encoded).ok())
-        .unwrap()
+fn decode_any_base64(encoded: &str) -> Result<Vec<u8>, base64::DecodeError> {
+    Ok(BASE64_STANDARD
+        .decode(encoded)
+        .or_else(|_| BASE64_STANDARD_NO_PAD.decode(encoded))
+        .or_else(|_| BASE64_URL_SAFE.decode(encoded))
+        .or_else(|_| BASE64_URL_SAFE_NO_PAD.decode(encoded))?)
 }