feat: Upgrade to new findshlibs (#153)

Author: mitsuhiko

Cargo.toml

@@ -51,7 +51,7 @@ error-chain = { version = "0.12.0", optional = true }
 im = { version = "12.3.4", optional = true }
 libc = { version = "0.2.51", optional = true }
 hostname = { version = "0.1.5", optional = true }
-findshlibs = { version = "0.4.1", optional = true }
+findshlibs = { version = "0.5.0", optional = true }
 rand = "0.6.5"
 httpdate = { version = "0.3.2", optional = true }
 curl = { version = "0.4.21", optional = true }

src/scope/noop.rs

@@ -97,7 +97,7 @@ impl Scope {
     /// Add an event processor to the scope.
     pub fn add_event_processor(
         &mut self,
-        f: Box<Fn(Event<'static>) -> Option<Event<'static>> + Send + Sync>,
+        f: Box<dyn Fn(Event<'static>) -> Option<Event<'static>> + Send + Sync>,
     ) {
         let _f = f;
         minimal_unreachable!();

src/utils.rs

@@ -67,72 +67,26 @@ mod model_support {
 mod findshlibs_support {
     use super::*;
 
-    use std::env;
-    use std::ffi::CStr;
-
-    use findshlibs::{
-        Segment, SharedLibrary, SharedLibraryId, TargetSharedLibrary, TARGET_SUPPORTED,
-    };
-
-    use crate::internals::Uuid;
-    use crate::protocol::debugid::DebugId;
-    use crate::protocol::SymbolicDebugImage;
-
     #[cfg(unix)]
-    pub fn find_build_id_from_binary(name: &CStr) -> Option<DebugId> {
-        use std::ffi::OsStr;
-        use std::fs::File;
-        use std::os::unix::ffi::OsStrExt;
-        use std::path::Path;
-
-        use goblin::elf::note::NT_GNU_BUILD_ID;
-        use goblin::elf::Elf;
-        use memmap::Mmap;
-
-        fn from_be(id: Uuid) -> Uuid {
-            let (a, b, c, d) = id.as_fields();
-            Uuid::from_fields(u32::from_be(a), u16::from_be(b), u16::from_be(c), d).unwrap()
-        }
-
-        let os_str = OsStr::from_bytes(name.to_bytes());
-        let path: &Path = if os_str.is_empty() {
-            "/proc/self/exe".as_ref()
-        } else {
-            os_str.as_ref()
-        };
-
-        let file = File::open(&path).ok()?;
-        let mmap = unsafe { Mmap::map(&file) }.ok()?;
-        if let Ok(elf_obj) = Elf::parse(&mmap) {
-            if let Some(note) = elf_obj
-                .iter_note_headers(&mmap)?
-                .filter_map(Result::ok)
-                .find(|note| note.n_type == NT_GNU_BUILD_ID && note.desc.len() >= 16)
-            {
-                // Can only fail if length of input is not 16
-                let build_id = from_be(Uuid::from_slice(&note.desc[0..16]).unwrap());
-                return Some(DebugId::from_uuid(build_id));
-            }
-        }
-        None
-    }
-
-    #[cfg(not(unix))]
-    pub fn find_build_id_from_binary(_name: &CStr) -> Option<DebugId> {
-        None
-    }
-
     pub fn find_shlibs() -> Option<Vec<DebugImage>> {
         if !TARGET_SUPPORTED {
             return None;
         }
 
+        use crate::internals::Uuid;
+        use crate::protocol::debugid::DebugId;
+        use crate::protocol::SymbolicDebugImage;
+        use findshlibs::{
+            Segment, SharedLibrary, SharedLibraryId, TargetSharedLibrary, TARGET_SUPPORTED,
+        };
+        use std::env;
+
         let mut rv = vec![];
         TargetSharedLibrary::each(|shlib| {
-            let maybe_debug_id = shlib
-                .id()
-                .map(|SharedLibraryId::Uuid(bytes)| DebugId::from_uuid(Uuid::from_bytes(bytes)))
-                .or_else(|| find_build_id_from_binary(shlib.name()));
+            let maybe_debug_id = shlib.id().and_then(|id| match id {
+                SharedLibraryId::Uuid(bytes) => Some(DebugId::from_uuid(Uuid::from_bytes(bytes))),
+                SharedLibraryId::GnuBuildId(ref id) => DebugId::from_guid_age(&id[..16], 0).ok(),
+            });
 
             let debug_id = match maybe_debug_id {
                 Some(debug_id) => debug_id,
@@ -182,6 +136,11 @@ mod findshlibs_support {
 
         Some(rv)
     }
+
+    #[cfg(not(unix))]
+    pub fn find_shlibs() -> Option<Vec<DebugImage>> {
+        None
+    }
 }
 
 #[cfg(not(feature = "with_debug_meta"))]

tests/test_basic.rs

@@ -100,7 +100,7 @@ fn test_factory() {
     let options = sentry::ClientOptions {
         dsn: "http://[email protected]/42".parse().ok(),
         transport: Box::new(
-            move |opts: &sentry::ClientOptions| -> Box<sentry::internals::Transport> {
+            move |opts: &sentry::ClientOptions| -> Box<dyn sentry::internals::Transport> {
                 assert_eq!(opts.dsn.as_ref().unwrap().host(), "example.com");
                 Box::new(TestTransport(events_for_options.clone()))
             },