Browse Source

disable encrypted search by default

tags/2.0.1
Jonathan Cobb 4 years ago
parent
commit
78b8da1665
2 changed files with 3 additions and 1 deletions
  1. +1
    -1
      wizard-server/src/main/java/org/cobbzilla/wizard/dao/SqlViewSearchHelper.java
  2. +2
    -0
      wizard-server/src/main/java/org/cobbzilla/wizard/dao/SqlViewSearchableDAO.java

+ 1
- 1
wizard-server/src/main/java/org/cobbzilla/wizard/dao/SqlViewSearchHelper.java View File

@@ -45,7 +45,7 @@ public class SqlViewSearchHelper {
+ " where (").append(dao.fixedFilters()).append(") "); + " where (").append(dao.fixedFilters()).append(") ");


final List<Object> params = new ArrayList<>(); final List<Object> params = new ArrayList<>();
final boolean searchByEncryptedField = searchQuery.getHasFilter() && Arrays.stream(fields).anyMatch(a -> a.isFilter() && a.isEncrypted());
final boolean searchByEncryptedField = dao.encryptedSearchEnabled() && searchQuery.getHasFilter() && Arrays.stream(fields).anyMatch(a -> a.isFilter() && a.isEncrypted());


if (searchQuery.getHasFilter() && !searchByEncryptedField) { if (searchQuery.getHasFilter() && !searchByEncryptedField) {
final String filter = dao.buildFilter(searchQuery, params); final String filter = dao.buildFilter(searchQuery, params);


+ 2
- 0
wizard-server/src/main/java/org/cobbzilla/wizard/dao/SqlViewSearchableDAO.java View File

@@ -89,6 +89,8 @@ public interface SqlViewSearchableDAO<T extends Identifiable> extends DAO<T> {
}); });
} }


default boolean encryptedSearchEnabled() { return false; }

@AllArgsConstructor @AllArgsConstructor
class SimpleSearchResultHandler implements InvocationHandler { class SimpleSearchResultHandler implements InvocationHandler {




Loading…
Cancel
Save