Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attempt to Update Bitflags #128

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Attempt to Update Bitflags #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ edition = "2021"
log = { version = "0.4", features = ["release_max_level_debug"] }
encoding = "0.2"
byteorder = "1"
bitflags = "1"
bitflags = "2.7"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
csv = "1"
Expand Down
69 changes: 68 additions & 1 deletion src/attribute/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use crate::err::Result;
use crate::impl_serialize_for_bitflags;

use std::io::{Cursor, Read, Seek};
use std::fmt;

use bitflags::bitflags;

Expand Down Expand Up @@ -211,6 +212,7 @@ bitflags! {
/// <https://github.com/EricZimmerman/MFT/blob/3bed2626ee85e9a96a6db70a17407d0c3696056a/MFT/Attributes/StandardInfo.cs#L10>
/// <https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-fscc/ca28ec38-f155-4768-81d6-4bfeb8586fc9>
///
#[derive(PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Clone, Copy)]
pub struct FileAttributeFlags: u32 {
const FILE_ATTRIBUTE_READONLY = 0x0000_0001;
const FILE_ATTRIBUTE_HIDDEN = 0x0000_0002;
Expand All @@ -234,10 +236,50 @@ bitflags! {
}
}

impl fmt::Display for FileAttributeFlags {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let mut first = true;
for flag in [
FileAttributeFlags::FILE_ATTRIBUTE_READONLY,
FileAttributeFlags::FILE_ATTRIBUTE_HIDDEN,
FileAttributeFlags::FILE_ATTRIBUTE_SYSTEM,
FileAttributeFlags::FILE_ATTRIBUTE_DIRECTORY,
FileAttributeFlags::FILE_ATTRIBUTE_ARCHIVE,
FileAttributeFlags::FILE_ATTRIBUTE_DEVICE,
FileAttributeFlags::FILE_ATTRIBUTE_NORMAL,
FileAttributeFlags::FILE_ATTRIBUTE_TEMPORARY,
FileAttributeFlags::FILE_ATTRIBUTE_SPARSE_FILE,
FileAttributeFlags::FILE_ATTRIBUTE_REPARSE_POINT,
FileAttributeFlags::FILE_ATTRIBUTE_COMPRESSED,
FileAttributeFlags::FILE_ATTRIBUTE_OFFLINE,
FileAttributeFlags::FILE_ATTRIBUTE_NOT_CONTENT_INDEXED,
FileAttributeFlags::FILE_ATTRIBUTE_ENCRYPTED,
FileAttributeFlags::FILE_ATTRIBUTE_INTEGRITY_STREAM,
FileAttributeFlags::FILE_ATTRIBUTE_NO_SCRUB_DATA,
FileAttributeFlags::FILE_ATTRIBUTE_HAS_EA,
FileAttributeFlags::FILE_ATTRIBUTE_IS_DIRECTORY,
FileAttributeFlags::FILE_ATTRIBUTE_INDEX_VIEW,
// Add other flags as needed
] {
if self.contains(flag) {
if !first {
write!(f, " | ")?;
}
let flag_str = format!("{:?}", flag);
let flag_str = flag_str.strip_prefix("FileAttributeFlags(").unwrap_or(&flag_str);
let flag_str = flag_str.strip_suffix(")").unwrap_or(&flag_str);
write!(f, "{}", flag_str)?;
first = false;
}
}
Ok(())
}
}

impl_serialize_for_bitflags! {FileAttributeFlags}

bitflags! {
#[derive(Default)]
#[derive(Default, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Clone, Copy)]
pub struct AttributeDataFlags: u16 {
const IS_COMPRESSED = 0x0001;
const COMPRESSION_MASK = 0x00FF;
Expand All @@ -246,4 +288,29 @@ bitflags! {
}
}

impl fmt::Display for AttributeDataFlags {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let mut first = true;
for flag in [
AttributeDataFlags::IS_COMPRESSED,
AttributeDataFlags::COMPRESSION_MASK,
AttributeDataFlags::ENCRYPTED,
AttributeDataFlags::SPARSE,
// Add other flags as needed
] {
if self.contains(flag) {
if !first {
write!(f, " | ")?;
}
let flag_str = format!("{:?}", flag);
let flag_str = flag_str.strip_prefix("AttributeDataFlags(").unwrap_or(&flag_str);
let flag_str = flag_str.strip_suffix(")").unwrap_or(&flag_str);
write!(f, "{}", flag_str)?;
first = false;
}
}
Ok(())
}
}

impl_serialize_for_bitflags! {AttributeDataFlags}
56 changes: 56 additions & 0 deletions src/attribute/x90.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use bitflags::bitflags;
use serde::Serialize;
use winstructs::ntfs::mft_reference::MftReference;
use std::io::SeekFrom;
use std::fmt;
use num_derive::FromPrimitive;
use num_traits::FromPrimitive;

Expand Down Expand Up @@ -51,11 +52,41 @@ pub enum IndexCollationRules {
}

bitflags! {
#[derive(PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Clone, Copy)]
pub struct IndexRootFlags: u32 {
const SMALL_INDEX = 0x00;
const LARGE_INDEX = 0x01;
}
}

impl fmt::Display for IndexRootFlags {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let mut first = true;
for flag in [
IndexRootFlags::SMALL_INDEX,
IndexRootFlags::LARGE_INDEX,
// Add other flags as needed
] {
if self.contains(flag) {
if !first {
write!(f, " | ")?;
}
let flag_str = if flag.bits() == 0x00 {
"SMALL_INDEX".to_string()
} else {
let flag_str = format!("{:?}", flag);
let flag_str = flag_str.strip_prefix("IndexRootFlags(").unwrap_or(&flag_str);
let flag_str = flag_str.strip_suffix(")").unwrap_or(&flag_str);
flag_str.to_string()
};
write!(f, "{}", flag_str)?;
first = false;
}
}
Ok(())
}
}

impl_serialize_for_bitflags! {IndexRootFlags}

impl IndexRootAttr {
Expand Down Expand Up @@ -102,11 +133,36 @@ pub struct IndexEntryHeader {
pub fname_info: FileNameAttr
}
bitflags! {
#[derive(PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Clone, Copy)]
pub struct IndexEntryFlags: u32 {
const INDEX_ENTRY_NODE = 0x01;
const INDEX_ENTRY_END = 0x02;
}
}

impl fmt::Display for IndexEntryFlags {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let mut first = true;
for flag in [
IndexEntryFlags::INDEX_ENTRY_NODE,
IndexEntryFlags::INDEX_ENTRY_END,
// Add other flags as needed
] {
if self.contains(flag) {
if !first {
write!(f, " | ")?;
}
let flag_str = format!("{:?}", flag);
let flag_str = flag_str.strip_prefix("IndexEntryFlags(").unwrap_or(&flag_str);
let flag_str = flag_str.strip_suffix(")").unwrap_or(&flag_str);
write!(f, "{}", flag_str)?;
first = false;
}
}
Ok(())
}
}

impl_serialize_for_bitflags! {IndexEntryFlags}

impl IndexEntryHeader {
Expand Down
26 changes: 26 additions & 0 deletions src/entry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ use crate::attribute::{MftAttribute, MftAttributeContent, MftAttributeType};
use std::io::Read;
use std::io::SeekFrom;
use std::io::{Cursor, Seek};
use std::fmt;

const SEQUENCE_NUMBER_STRIDE: usize = 512;

Expand Down Expand Up @@ -83,6 +84,7 @@ pub struct EntryHeader {
pub record_number: u64,
}
bitflags! {
#[derive(PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Clone, Copy)]
pub struct EntryFlags: u16 {
const ALLOCATED = 0x01;
const INDEX_PRESENT = 0x02;
Expand All @@ -91,6 +93,30 @@ bitflags! {
}
}

impl fmt::Display for EntryFlags {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let mut first = true;
for flag in [
EntryFlags::ALLOCATED,
EntryFlags::INDEX_PRESENT,
EntryFlags::IS_EXTENSION,
EntryFlags::SPECIAL_INDEX_PRESENT,
] {
if self.contains(flag) {
if !first {
write!(f, " | ")?;
}
let flag_str = format!("{:?}", flag);
let flag_str = flag_str.strip_prefix("EntryFlags(").unwrap_or(&flag_str);
let flag_str = flag_str.strip_suffix(")").unwrap_or(&flag_str);
write!(f, "{}", flag_str)?;
first = false;
}
}
Ok(())
}
}

impl_serialize_for_bitflags! {EntryFlags}

impl EntryHeader {
Expand Down
2 changes: 1 addition & 1 deletion src/macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ macro_rules! impl_serialize_for_bitflags {
where
S: serde::ser::Serializer,
{
serializer.serialize_str(&format!("{:?}", &self))
serializer.serialize_str(&self.to_string())
}
}
};
Expand Down