From ab46c154ef9df19d64ec3935463d552f39ed8fd5 Mon Sep 17 00:00:00 2001
From: mii <kurochian2@gmail.com>
Date: Mon, 29 Nov 2021 20:11:53 +0900
Subject: [PATCH] Add section header name parser

---
 src/elf_parser.rs | 21 ++++++++++++++++++---
 src/elf_struct.rs |  5 +++--
 src/main.rs       |  4 ++--
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/elf_parser.rs b/src/elf_parser.rs
index cda1b01..ff887da 100644
--- a/src/elf_parser.rs
+++ b/src/elf_parser.rs
@@ -1,6 +1,6 @@
-use nom::{IResult, bytes::complete::{tag, take}, multi::count, number::complete::{le_u16, le_u32, le_u64}};
+use nom::{combinator::not, IResult, bytes::complete::{tag, take, take_while}, character::{is_alphabetic, is_alphanumeric}, multi::count, number::complete::{le_u16, le_u32, le_u64}};
 
-use crate::elf_struct::{Elf, ElfHeader, ProgramHeader, SectionHeader};
+use crate::elf_struct::{Elf, ElfHeader, ProgramHeader, SectionHeader, Section};
 
 pub struct ElfParser {
     pub file: Vec<u8>
@@ -23,13 +23,28 @@ impl ElfParser {
             &self.file[elf_header.section_header_offset as usize..]
         )?;
 
+        let section_names_offset = section_headers[elf_header.section_header_name_index as usize].offset;
+        let section_names_bytes = &self.file[section_names_offset as usize..];
+        let sections = section_headers.into_iter().map(|header| Section {
+            name: String::from_utf8(ElfParser::take_alphabetic(&section_names_bytes[header.name as usize..]).unwrap().1.to_vec()).unwrap(),
+            header
+        }).collect::<Vec<Section>>();
+
         Ok((input, Elf {
             header: elf_header,
             program_headers,
-            section_headers
+            sections
         }))
     }
 
+    fn take_alphabetic(input: &[u8]) -> IResult<&[u8], &[u8]> {
+        Ok(take_while(ElfParser::is_not_end)(input)?)
+    }
+//  17
+    fn is_not_end(input: u8) -> bool {
+        input != b'\x00'
+    }
+
     pub fn parse_section_headers(num: usize) -> impl Fn(&[u8]) -> IResult<&[u8], Vec<SectionHeader>> {
         move |raw: &[u8]| count(ElfParser::parse_section_header, num)(raw)
     }
diff --git a/src/elf_struct.rs b/src/elf_struct.rs
index 35ea77b..cba3dfc 100644
--- a/src/elf_struct.rs
+++ b/src/elf_struct.rs
@@ -2,12 +2,13 @@
 pub struct Elf {
     pub header: ElfHeader,
     pub program_headers: Vec<ProgramHeader>,
-    pub section_headers: Vec<SectionHeader>
+    pub sections: Vec<Section>
 }
 
+#[derive(Debug)]
 pub struct Section {
     pub name: String,
-    pub section_header: SectionHeader
+    pub header: SectionHeader
 }
 
 #[derive(Debug)]
diff --git a/src/main.rs b/src/main.rs
index 4893f17..12593b5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -17,8 +17,8 @@ fn main() {
                 println!("{:?}", program_header);
             }
 
-            for section_header in elf.section_headers {
-                println!("{:?}", section_header);
+            for section in elf.sections {
+                println!("{:?}", section);
             }
         },
         Err(_) => {}