From 5b6ae71a01b8b5e7e96bddaabcb27638094d095e Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Mon, 19 Nov 2018 11:45:28 -0500 Subject: [PATCH 1/5] SHIBUI-997: wipe out indext for each resolver before init/update --- .../resolvers/opensaml/OpenSamlMetadataResolverDelegate.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverDelegate.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverDelegate.java index ab4cfd8aa..0fb36acf8 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverDelegate.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverDelegate.java @@ -29,6 +29,11 @@ public Iterable resolve(@Nullable CriteriaSet criteria) { } void addIndexedDescriptorsFromBackingStore(AbstractMetadataResolver.EntityBackingStore backingStore, String resourceId, IndexWriter indexWriter) throws ComponentInitializationException { + try { + indexWriter.deleteAll(); + } catch (IOException e) { + logger.error(e.getMessage(), e); + } for (String entityId : backingStore.getIndexedDescriptors().keySet()) { Document document = new Document(); document.add(new StringField("id", entityId, Field.Store.YES)); From eb05766eed9fe6c880b5d73b1306d6bac9103250 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Mon, 19 Nov 2018 14:04:09 -0500 Subject: [PATCH 2/5] SHIBUI-997: Polishing --- .../OpenSamlMetadataResolverDelegate.java | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverDelegate.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverDelegate.java index 0fb36acf8..45bca6e81 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverDelegate.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverDelegate.java @@ -31,23 +31,19 @@ public Iterable resolve(@Nullable CriteriaSet criteria) { void addIndexedDescriptorsFromBackingStore(AbstractMetadataResolver.EntityBackingStore backingStore, String resourceId, IndexWriter indexWriter) throws ComponentInitializationException { try { indexWriter.deleteAll(); - } catch (IOException e) { - logger.error(e.getMessage(), e); - } - for (String entityId : backingStore.getIndexedDescriptors().keySet()) { - Document document = new Document(); - document.add(new StringField("id", entityId, Field.Store.YES)); - document.add(new TextField("content", entityId, Field.Store.YES)); // TODO: change entityId to be content of entity descriptor block - document.add(new StringField("tag", resourceId, Field.Store.YES)); - try { - indexWriter.addDocument(document); - } catch (IOException e) { - logger.error(e.getMessage(), e); + for (String entityId : backingStore.getIndexedDescriptors().keySet()) { + Document document = new Document(); + document.add(new StringField("id", entityId, Field.Store.YES)); + document.add(new TextField("content", entityId, Field.Store.YES)); // TODO: change entityId to be content of entity descriptor block + document.add(new StringField("tag", resourceId, Field.Store.YES)); + try { + indexWriter.addDocument(document); + } catch (IOException e) { + logger.error(e.getMessage(), e); + } } - } - try { - indexWriter.commit(); } catch (IOException e) { + logger.error(e.getMessage(), e); throw new ComponentInitializationException(e); } } From 59cd36e559d5536638224c6399b6743021c85dea Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Mon, 19 Nov 2018 14:06:55 -0500 Subject: [PATCH 3/5] SHIBUI-997: Polishing --- .../opensaml/OpenSamlMetadataResolverDelegate.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverDelegate.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverDelegate.java index 45bca6e81..7c26adc4d 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverDelegate.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverDelegate.java @@ -36,11 +36,7 @@ void addIndexedDescriptorsFromBackingStore(AbstractMetadataResolver.EntityBackin document.add(new StringField("id", entityId, Field.Store.YES)); document.add(new TextField("content", entityId, Field.Store.YES)); // TODO: change entityId to be content of entity descriptor block document.add(new StringField("tag", resourceId, Field.Store.YES)); - try { - indexWriter.addDocument(document); - } catch (IOException e) { - logger.error(e.getMessage(), e); - } + indexWriter.addDocument(document); } } catch (IOException e) { logger.error(e.getMessage(), e); From 77205c5e7210cda8b233cfcb02d0aa2d6394eafd Mon Sep 17 00:00:00 2001 From: Jj! Date: Mon, 19 Nov 2018 13:26:56 -0600 Subject: [PATCH 4/5] [SHIBUI-999] cleanup --- .../schema/provider/filebacked-http-filters.schema.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/assets/schema/provider/filebacked-http-filters.schema.json b/ui/src/assets/schema/provider/filebacked-http-filters.schema.json index ee7b8208d..4bb2f399c 100644 --- a/ui/src/assets/schema/provider/filebacked-http-filters.schema.json +++ b/ui/src/assets/schema/provider/filebacked-http-filters.schema.json @@ -93,13 +93,13 @@ "oneOf": [ { "enum": [ - "SPSSODescriptor" + "md:SPSSODescriptor" ], "description": "value.spdescriptor" }, { "enum": [ - "AttributeAuthorityDescriptor" + "md:AttributeAuthorityDescriptor" ], "description": "value.attr-auth-descriptor" } From 0b126e51619cfd1bbcc5cc4c73c45b9098f4c1c5 Mon Sep 17 00:00:00 2001 From: Jj! Date: Mon, 19 Nov 2018 13:26:56 -0600 Subject: [PATCH 5/5] [SHIBUI-932] add `md` prefix --- .../schema/provider/filebacked-http-filters.schema.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/assets/schema/provider/filebacked-http-filters.schema.json b/ui/src/assets/schema/provider/filebacked-http-filters.schema.json index ee7b8208d..4bb2f399c 100644 --- a/ui/src/assets/schema/provider/filebacked-http-filters.schema.json +++ b/ui/src/assets/schema/provider/filebacked-http-filters.schema.json @@ -93,13 +93,13 @@ "oneOf": [ { "enum": [ - "SPSSODescriptor" + "md:SPSSODescriptor" ], "description": "value.spdescriptor" }, { "enum": [ - "AttributeAuthorityDescriptor" + "md:AttributeAuthorityDescriptor" ], "description": "value.attr-auth-descriptor" }