Skip to content

Generalize XML Source Sink Parser to be compatible with other language engines #394

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

Merged
merged 4 commits into from
Oct 4, 2021
Merged

Generalize XML Source Sink Parser to be compatible with other language engines #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
978fa96
Bug fix
Oct 4, 2021
87b6fca
Nicer
Oct 4, 2021
9b65b0a
Merge branch 'develop' into develop
niklbird Oct 4, 2021
e763709
Changes
Oct 4, 2021
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
82 changes: 44 additions & 38 deletions ...low-android/src/soot/jimple/infoflow/android/source/ConfigurationBasedCategoryFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
import soot.jimple.infoflow.InfoflowConfiguration.SourceSinkFilterMode;
import soot.jimple.infoflow.android.InfoflowAndroidConfiguration.SourceSinkConfiguration;
import soot.jimple.infoflow.android.data.CategoryDefinition;
import soot.jimple.infoflow.android.source.parsers.xml.XMLSourceSinkParser.ICategoryFilter;
import soot.jimple.infoflow.android.source.parsers.xml.AbstractXMLSourceSinkParser.ICategoryFilter;
import soot.jimple.infoflow.sourcesSinks.definitions.ISourceSinkCategory;
import soot.jimple.infoflow.sourcesSinks.definitions.SourceSinkType;

/**
Expand All @@ -28,61 +29,66 @@ public ConfigurationBasedCategoryFilter(SourceSinkConfiguration config) {
}

@Override
public boolean acceptsCategory(CategoryDefinition category) {
public boolean acceptsCategory(ISourceSinkCategory category) {
// We cannot compare descriptions to the configuration file
category = category.getIdOnlyDescription();
if (category instanceof CategoryDefinition) {
CategoryDefinition catDef = (CategoryDefinition) category;
catDef = catDef.getIdOnlyDescription();

CategoryMode sourceType = config.getSourceCategoriesAndModes().get(category);
CategoryMode sinkType = config.getSinkCategoriesAndModes().get(category);
CategoryMode sourceType = config.getSourceCategoriesAndModes().get(catDef);
CategoryMode sinkType = config.getSinkCategoriesAndModes().get(catDef);

// Check whether the category is excluded for everything
if (sourceType != null && sourceType == CategoryMode.Exclude)
if (sinkType != null && sinkType == CategoryMode.Exclude)
return false;
// Check whether the category is excluded for everything
if (sourceType != null && sourceType == CategoryMode.Exclude)
if (sinkType != null && sinkType == CategoryMode.Exclude)
return false;

// Check whether the category is included for something
if (config.getSinkFilterMode() == SourceSinkFilterMode.UseOnlyIncluded) {
if (sourceType != null && sourceType == CategoryMode.Include)
return true;
if (sinkType != null && sinkType == CategoryMode.Include)
return true;
// Check whether the category is included for something
if (config.getSinkFilterMode() == SourceSinkFilterMode.UseOnlyIncluded) {
if (sourceType != null && sourceType == CategoryMode.Include)
return true;
if (sinkType != null && sinkType == CategoryMode.Include)
return true;

return false;
return false;
}
}

// There is no reason to exclude the category
return true;
}

@Override
public SourceSinkType filter(CategoryDefinition category, SourceSinkType sourceSinkType) {
public SourceSinkType filter(ISourceSinkCategory category, SourceSinkType sourceSinkType) {
// We cannot compare descriptions to the configuration file
category = category.getIdOnlyDescription();

CategoryMode sourceMode = config.getSourceCategoriesAndModes().get(category);
CategoryMode sinkMode = config.getSinkCategoriesAndModes().get(category);

if (sourceSinkType == SourceSinkType.Source || sourceSinkType == SourceSinkType.Both) {
if (config.getSourceFilterMode() == SourceSinkFilterMode.UseAllButExcluded) {
if (sourceMode != null && sourceMode == CategoryMode.Exclude)
sourceSinkType = sourceSinkType.removeType(SourceSinkType.Source);
} else if (config.getSourceFilterMode() == SourceSinkFilterMode.UseOnlyIncluded) {
if (sourceMode == null || sourceMode != CategoryMode.Include)
sourceSinkType = sourceSinkType.removeType(SourceSinkType.Source);
if (category instanceof CategoryDefinition) {
CategoryDefinition catDef = (CategoryDefinition) category;
catDef = catDef.getIdOnlyDescription();
CategoryMode sourceMode = config.getSourceCategoriesAndModes().get(category);
CategoryMode sinkMode = config.getSinkCategoriesAndModes().get(category);
if (sourceSinkType == SourceSinkType.Source || sourceSinkType == SourceSinkType.Both) {
if (config.getSourceFilterMode() == SourceSinkFilterMode.UseAllButExcluded) {
if (sourceMode != null && sourceMode == CategoryMode.Exclude)
sourceSinkType = sourceSinkType.removeType(SourceSinkType.Source);
} else if (config.getSourceFilterMode() == SourceSinkFilterMode.UseOnlyIncluded) {
if (sourceMode == null || sourceMode != CategoryMode.Include)
sourceSinkType = sourceSinkType.removeType(SourceSinkType.Source);
}
}
}

if (sourceSinkType == SourceSinkType.Sink || sourceSinkType == SourceSinkType.Both) {
if (config.getSinkFilterMode() == SourceSinkFilterMode.UseAllButExcluded) {
if (sinkMode != null && sinkMode == CategoryMode.Exclude)
sourceSinkType = sourceSinkType.removeType(SourceSinkType.Sink);
} else if (config.getSinkFilterMode() == SourceSinkFilterMode.UseOnlyIncluded) {
if (sinkMode == null || sinkMode != CategoryMode.Include)
sourceSinkType = sourceSinkType.removeType(SourceSinkType.Sink);
if (sourceSinkType == SourceSinkType.Sink || sourceSinkType == SourceSinkType.Both) {
if (config.getSinkFilterMode() == SourceSinkFilterMode.UseAllButExcluded) {
if (sinkMode != null && sinkMode == CategoryMode.Exclude)
sourceSinkType = sourceSinkType.removeType(SourceSinkType.Sink);
} else if (config.getSinkFilterMode() == SourceSinkFilterMode.UseOnlyIncluded) {
if (sinkMode == null || sinkMode != CategoryMode.Include)
sourceSinkType = sourceSinkType.removeType(SourceSinkType.Sink);
}
}
return sourceSinkType;
}
return SourceSinkType.Undefined;

return sourceSinkType;
}

}
Loading