prefixed

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "brownpaper"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["shimun <shimun@shimun.net>"]
 edition = "2018"
 

default.nix

@@ -9,7 +9,7 @@ let
   crate2nix_tools = import "${fetchgit { url = "https://github.com/kolloch/crate2nix.git"; rev = "adecff03c53b87255b3299f5a5787327342a69b2"; sha256 = "0l10yqa3gq73fc4xc977vb9zk5jlp70xiz5qd9c1vq873yqk1c7g"; }}/tools.nix" { inherit pkgs; };
   overrides = pkgs.defaultCrateOverrides // rec {
     nettle-sys = attrs: with pkgs; {
-      nativeBuildInputs = [ clang nettle pkg-config ];
+      propagatedBuildInputs = [ clang nettle pkg-config ];
       LIBCLANG_PATH = "${clang.cc.lib}/lib";
     };
     sequoia-openpgp = attrs: with pkgs; {
@@ -22,4 +22,4 @@ let
     PATH=${pkgs.bash}/bin/:${pkgs.gnupg}/bin/:${pkgs.curl}/bin/:$PATH ${./bp.sh} "$@"
   '';
 in
-{ server = (crate2nix_tools.generatedCargoNix { inherit name src; });  inherit client; }
+{ server = callPackage (crate2nix_tools.generatedCargoNix { inherit name src; }) { inherit pkgs; };  inherit client; }

src/main.rs

@@ -21,14 +21,14 @@ use iron::url::Url;
 use iron::mime::Mime;
 use sha2::Digest;
 
+use std::env::{self, args};
 use std::io;
 use std::io::prelude::*;
 use std::iter::Iterator;
+use std::net::SocketAddr;
 use std::path::Path;
 use std::sync::Arc;
 use std::sync::Mutex;
-use std::net::SocketAddr;
-use std::env::{args,self};
 
 const STORAGE_DIR: &str = "./snips";
 
@@ -125,5 +125,16 @@ fn handle(req: &mut Request) -> IronResult<Response> {
 fn main() {
     let chain = Chain::new(handle);
     println!("Starting brownpaper: {}", STORAGE_DIR);
-    Iron::new(chain).http(args().skip(1).next().map(|ip| ip.parse::<SocketAddr>().expect("can't parse socket address")).unwrap_or("0.0.0.0:3000".parse::<SocketAddr>().unwrap()).to_string().as_str());
+    Iron::new(chain).http(
+        args()
+            .skip(1)
+            .next()
+            .map(|ip| {
+                ip.parse::<SocketAddr>()
+                    .expect("can't parse socket address")
+            })
+            .unwrap_or("0.0.0.0:3000".parse::<SocketAddr>().unwrap())
+            .to_string()
+            .as_str(),
+    );
 }

src/pgp.rs

@@ -37,8 +37,32 @@ impl KnownKeys {
     pub fn verify(&mut self, r: impl Read) -> io::Result<Vec<u8>> {
         let mut content = Vec::with_capacity(2048);
         let helper = &*self;
-        let mut v = Verifier::<&KnownKeys>::from_reader(r, helper, None)
-            .map_err(|e| io::Error::new(io::ErrorKind::InvalidData, "Failed to verify signature"))?;
+        let mut v = Verifier::<&KnownKeys>::from_reader(r, helper, None).map_err(|e| {
+            io::Error::new(io::ErrorKind::InvalidData, "Failed to verify signature")
+        })?;
+        let mut buf = [0u8; 512];
+        let bp = "brownpaper".as_bytes();
+        loop {
+            match v.read(&mut buf)? {
+                0 => break,
+                read => {
+                    // first buffer read
+                    if content.len() == 0 {
+                        if !(buf.len() > bp.len() && bp == &buf[0..bp.len()]) {
+                            return Err(io::Error::new(
+                                io::ErrorKind::InvalidData,
+                                "Failed to verify signature(prefix)",
+                            ));
+                        } else {
+                            // remove prefix
+                            content.extend_from_slice(&buf[bp.len()..read])
+                        }
+                    } else {
+                        content.extend_from_slice(&buf[0..read]);
+                    }
+                }
+            }
+        }
         if v.read_to_end(&mut content).is_err() {
             return Err(io::Error::new(
                 io::ErrorKind::InvalidData,