diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-api/src/main/java/org/xwiki/extension/security/internal/ExtensionSecuritySolrClient.java b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-api/src/main/java/org/xwiki/extension/security/internal/ExtensionSecuritySolrClient.java index e8f8057f40d5270e0eaad5e874a87b4895367261..f4161b46e29a05a0bed07d1fb6e58b18098e7946 100644 --- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-api/src/main/java/org/xwiki/extension/security/internal/ExtensionSecuritySolrClient.java +++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-api/src/main/java/org/xwiki/extension/security/internal/ExtensionSecuritySolrClient.java @@ -147,6 +147,7 @@ private static void initFilter(SolrQuery solrQuery) // Only include extensions with a computed CVSS score, meaning that they have at least one known security // vulnerability. solrQuery.addFilterQuery(String.format("%s:[0 TO 10]", SECURITY_MAX_CVSS)); + solrQuery.addFilterQuery(FIELD_INSTALLED_NAMESPACES + ":[* TO *]"); } private static void initSort(LiveDataQuery liveDataQuery, SolrQuery solrQuery) diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-api/src/test/java/org/xwiki/extension/security/internal/ExtensionSecuritySolrClientTest.java b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-api/src/test/java/org/xwiki/extension/security/internal/ExtensionSecuritySolrClientTest.java index d1e2fec44d2ace1929e56b5ffd6e7d986903f268..f5d7ca40626a556caee95568579c7c88cf2f2be3 100644 --- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-api/src/test/java/org/xwiki/extension/security/internal/ExtensionSecuritySolrClientTest.java +++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-api/src/test/java/org/xwiki/extension/security/internal/ExtensionSecuritySolrClientTest.java @@ -43,6 +43,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.xwiki.extension.InstalledExtension.FIELD_INSTALLED_NAMESPACES; import static org.xwiki.extension.security.internal.livedata.ExtensionSecurityLiveDataConfigurationProvider.FIX_VERSION; /** @@ -79,6 +80,7 @@ void getExtensionsCount() throws Exception SolrQuery params = new SolrQuery(); params.addFilterQuery("security_maxCVSS:[0 TO 10]"); + params.addFilterQuery(FIELD_INSTALLED_NAMESPACES + ":[* TO *]"); verify(this.extensionIndexStore) .search(ArgumentMatchers.<SolrQuery>argThat( t -> Arrays.equals(t.getFilterQueries(), params.getFilterQueries()))); @@ -103,6 +105,7 @@ void solrQuery() throws Exception SolrQuery params = new SolrQuery(); params.addFilterQuery("security_maxCVSS:[0 TO 10]"); + params.addFilterQuery(FIELD_INSTALLED_NAMESPACES + ":[* TO *]"); verify(this.extensionIndexStore) .search(AdditionalMatchers.<SolrQuery>and(