Skip to content

searchQuery_For_ContentSecurity #58

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

Open
wilkysingh-tarento wants to merge 1 commit into
base: 4.8.0-contentSecurity
Choose a base branch
from
Open

searchQuery_For_ContentSecurity #58

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
31 changes: 23 additions & 8 deletions search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,13 @@ private void formQuery(List<Map> properties, QueryBuilder queryBuilder, BoolQuer
relevanceSort = true;
propertyName = "all_fields";
queryBuilder = getAllFieldsPropertyQuery(values, fuzzy);
if(!enableSecureSettings)
boolQuery.mustNot(getSecureSettingsQuery());
boolQuery.must(queryBuilder);
if (!enableSecureSettings) {
boolQuery.mustNot(getSecureSettingsSearchDefaultQuery());
boolQuery.must(queryBuilder);
} else {
boolQuery.must(getSecureSettingsSearchQuery("0134149030919618561"));
boolQuery.must(queryBuilder);
}
continue;
}

Expand Down Expand Up @@ -453,9 +457,13 @@ private void formQuery(List<Map> properties, QueryBuilder queryBuilder, BoolQuer
}
}
if (operation.equalsIgnoreCase(AND)) {
if(!enableSecureSettings)
boolQuery.mustNot(getSecureSettingsQuery());
boolQuery.must(queryBuilder);
if (!enableSecureSettings) {
boolQuery.mustNot(getSecureSettingsSearchDefaultQuery());
boolQuery.must(queryBuilder);
} else {
boolQuery.must(getSecureSettingsSearchQuery("0134149030919618561"));
boolQuery.must(queryBuilder);
}
} else {
boolQuery.should(queryBuilder);
}
Expand Down Expand Up @@ -525,16 +533,23 @@ private QueryBuilder getAllFieldsPropertyQuery(List<Object> values, Boolean fuzz
}
return queryBuilder;
}
private QueryBuilder getSecureSettingsQuery() {
private QueryBuilder getSecureSettingsSearchDefaultQuery() {

QueryBuilder firstNestedQuery =new NestedQueryBuilder("secureSettings",
QueryBuilders.boolQuery() .mustNot(new ExistsQueryBuilder("organisation")), org.apache.lucene.search.join.ScoreMode.None);
QueryBuilder secondNestedQuery= new NestedQueryBuilder("secureSettings", QueryBuilders.boolQuery()
.filter(new RangeQueryBuilder("organisation" + ".length").lte(0)) , org.apache.lucene.search.join.ScoreMode.None);
.filter(new RangeQueryBuilder("organisation" + ".length").lte(0)) , org.apache.lucene.search.join.ScoreMode.None);
QueryBuilder query = QueryBuilders.boolQuery() .should(firstNestedQuery).should (secondNestedQuery);

return query;
}
private QueryBuilder getSecureSettingsSearchQuery(String org_id) {

QueryBuilder query =new NestedQueryBuilder("secureSettings",
QueryBuilders.boolQuery() .must(new ExistsQueryBuilder("secureSettings.organisation")).must(QueryBuilders.termQuery("secureSettings.organisation",org_id)), org.apache.lucene.search.join.ScoreMode.None);

return query;
}

/**
* @param softConstraints
Expand Down