BZ1192831: User with no privileges for Repository can view and modify…

… assets in that Repository (cherry picked from commit db3df91)
AppFormer · Dec 8, 2015 · 2dcc471 · 2dcc471
1 parent 21e2053
commit 2dcc471
Show file tree

Hide file tree

Showing 2 changed files with 93 additions and 1 deletion.
diff --git a/...cene/src/main/java/org/uberfire/ext/metadata/backend/lucene/search/LuceneSearchIndex.java b/...cene/src/main/java/org/uberfire/ext/metadata/backend/lucene/search/LuceneSearchIndex.java
@@ -68,6 +68,9 @@ public List<KObject> searchByAttrs( final Map<String, ?> attrs,
                                         final int pageSize,
                                         final int startIndex,
                                         final ClusterSegment... clusterSegments ) {
+        if ( clusterSegments == null || clusterSegments.length == 0 ) {
+            return emptyList();
+        }
         if ( attrs == null || attrs.size() == 0 ) {
             return emptyList();
         }
@@ -79,12 +82,18 @@ public List<KObject> fullTextSearch( final String term,
                                          final int pageSize,
                                          final int startIndex,
                                          final ClusterSegment... clusterSegments ) {
+        if ( clusterSegments == null || clusterSegments.length == 0 ) {
+            return emptyList();
+        }
         return search( buildQuery( term, clusterSegments ), pageSize, startIndex, clusterSegments );
     }
 
     @Override
     public int searchByAttrsHits( final Map<String, ?> attrs,
                                   final ClusterSegment... clusterSegments ) {
+        if ( clusterSegments == null || clusterSegments.length == 0 ) {
+            return 0;
+        }
         if ( attrs == null || attrs.size() == 0 ) {
             return 0;
         }
@@ -94,6 +103,9 @@ public int searchByAttrsHits( final Map<String, ?> attrs,
     @Override
     public int fullTextSearchHits( final String term,
                                    final ClusterSegment... clusterSegments ) {
+        if ( clusterSegments == null || clusterSegments.length == 0 ) {
+            return 0;
+        }
         return searchHits( buildQuery( term, clusterSegments ), clusterSegments );
     }
 

diff --git a/...metadata-commons-io/src/test/java/org/uberfire/ext/metadata/io/LuceneSearchIndexTest.java b/...metadata-commons-io/src/test/java/org/uberfire/ext/metadata/io/LuceneSearchIndexTest.java
@@ -18,9 +18,11 @@
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
+import org.uberfire.ext.metadata.model.KObject;
 import org.uberfire.ext.metadata.search.ClusterSegment;
 import org.uberfire.java.nio.base.FileSystemId;
 import org.uberfire.java.nio.base.SegmentedPath;
@@ -76,32 +78,110 @@ public String[] segmentIds() {
                  "*.txt" );
         }};
 
+        //Attribute Search
         {
             final int hits = config.getSearchIndex().searchByAttrsHits( attributes );
-            assertEquals( 2,
+            final List<KObject> results = config.getSearchIndex().searchByAttrs( attributes,
+                                                                                 10,
+                                                                                 0 );
+            assertEquals( 0,
                           hits );
+            assertEquals( 0,
+                          results.size() );
         }
 
         {
             final int hits = config.getSearchIndex().searchByAttrsHits( attributes,
                                                                         cs1 );
+            final List<KObject> results = config.getSearchIndex().searchByAttrs( attributes,
+                                                                                 10,
+                                                                                 0,
+                                                                                 cs1 );
             assertEquals( 1,
                           hits );
+            assertEquals( 1,
+                          results.size() );
         }
 
         {
             final int hits = config.getSearchIndex().searchByAttrsHits( attributes,
                                                                         cs2 );
+            final List<KObject> results = config.getSearchIndex().searchByAttrs( attributes,
+                                                                                 10,
+                                                                                 0,
+                                                                                 cs2 );
             assertEquals( 1,
                           hits );
+            assertEquals( 1,
+                          results.size() );
         }
 
         {
             final int hits = config.getSearchIndex().searchByAttrsHits( attributes,
                                                                         cs1,
                                                                         cs2 );
+            final List<KObject> results = config.getSearchIndex().searchByAttrs( attributes,
+                                                                                 10,
+                                                                                 0,
+                                                                                 cs1,
+                                                                                 cs2 );
+            assertEquals( 2,
+                          hits );
+            assertEquals( 2,
+                          results.size() );
+        }
+
+        //Full Text Search
+        {
+            final int hits = config.getSearchIndex().fullTextSearchHits( "*indexed*" );
+            final List<KObject> results = config.getSearchIndex().fullTextSearch( "*indexed*",
+                                                                                  10,
+                                                                                  0 );
+            assertEquals( 0,
+                          hits );
+            assertEquals( 0,
+                          results.size() );
+        }
+
+        {
+            final int hits = config.getSearchIndex().fullTextSearchHits( "*indexed*",
+                                                                         cs1 );
+            final List<KObject> results = config.getSearchIndex().fullTextSearch( "*indexed*",
+                                                                                  10,
+                                                                                  0,
+                                                                                  cs1 );
+            assertEquals( 1,
+                          hits );
+            assertEquals( 1,
+                          results.size() );
+        }
+
+        {
+            final int hits = config.getSearchIndex().fullTextSearchHits( "*indexed*",
+                                                                         cs2 );
+            final List<KObject> results = config.getSearchIndex().fullTextSearch( "*indexed*",
+                                                                                  10,
+                                                                                  0,
+                                                                                  cs2 );
+            assertEquals( 1,
+                          hits );
+            assertEquals( 1,
+                          results.size() );
+        }
+
+        {
+            final int hits = config.getSearchIndex().fullTextSearchHits( "*indexed*",
+                                                                         cs1,
+                                                                         cs2 );
+            final List<KObject> results = config.getSearchIndex().fullTextSearch( "*indexed*",
+                                                                                  10,
+                                                                                  0,
+                                                                                  cs1,
+                                                                                  cs2 );
             assertEquals( 2,
                           hits );
+            assertEquals( 2,
+                          results.size() );
         }
     }