Skip to content
Merged
Changes from all commits
Commits
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
27 changes: 24 additions & 3 deletions mitmproxy-contentviews/src/protobuf/existing_proto_definitions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,32 @@ impl std::fmt::Display for RpcInfo {
fn parse_file_descriptor_set(definitions_path: &Path) -> anyhow::Result<Vec<FileDescriptor>> {
let mut parser = Parser::new();
parser.pure();
if let Some(parent) = definitions_path.parent() {
parser.include(parent);
if definitions_path.is_dir() {
walk_proto_directory(definitions_path, &mut parser)?;
} else {
if let Some(parent) = definitions_path.parent() {
parser.include(parent);
}
parser.input(definitions_path);
}
parser.input(definitions_path);
let fds = parser.file_descriptor_set()?;
FileDescriptor::new_dynamic_fds(fds.file, &[])
.context("failed to create dynamic file descriptors")
}

fn walk_proto_directory(definitions_path: &Path, parser: &mut Parser) -> anyhow::Result<()> {
parser.include(definitions_path);
for entry in definitions_path
.read_dir()
.context("failed to read protobuf directory")?
{
if let Ok(entry) = entry {
if entry.metadata()?.is_dir() {
walk_proto_directory(entry.path().as_path(), parser)?;
} else if entry.file_name().to_string_lossy().ends_with(".proto") {
parser.input(entry.path());
}
}
}
Ok(())
}
Loading