-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature/shibui-2269' of bitbucket.org:unicon/shib-idp-u…
…i into feature/SHIBUI-2269-external-filters
- Loading branch information
Showing
13 changed files
with
262 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
...ava/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ExternalMetadataResolver.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package edu.internet2.tier.shibboleth.admin.ui.domain.resolvers; | ||
|
|
||
| import lombok.EqualsAndHashCode; | ||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
| import lombok.ToString; | ||
| import org.hibernate.envers.Audited; | ||
|
|
||
| import javax.persistence.Column; | ||
| import javax.persistence.Entity; | ||
|
|
||
| @Entity | ||
| @EqualsAndHashCode(callSuper = true) | ||
| @Getter | ||
| @Setter | ||
| @ToString | ||
| @Audited | ||
| public class ExternalMetadataResolver extends MetadataResolver { | ||
| @Column | ||
| private String description; | ||
|
|
||
| @Column(unique = true) | ||
| private String externalResolverId; | ||
|
|
||
| @Column | ||
| String name; | ||
|
|
||
| public ExternalMetadataResolver() { | ||
| type = "ExternalMetadataResolver"; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
...internet2/tier/shibboleth/admin/ui/scheduled/ExternalMetadataProvidersScheduledTasks.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| package edu.internet2.tier.shibboleth.admin.ui.scheduled; | ||
|
|
||
| import edu.internet2.tier.shibboleth.admin.ui.service.FileWritingService; | ||
| import edu.internet2.tier.shibboleth.admin.ui.service.MetadataResolverService; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import org.springframework.core.io.Resource; | ||
| import org.springframework.core.io.WritableResource; | ||
| import org.springframework.scheduling.annotation.Scheduled; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
||
| import javax.xml.transform.OutputKeys; | ||
| import javax.xml.transform.Transformer; | ||
| import javax.xml.transform.TransformerException; | ||
| import javax.xml.transform.TransformerFactory; | ||
| import javax.xml.transform.dom.DOMSource; | ||
| import javax.xml.transform.stream.StreamResult; | ||
| import java.io.IOException; | ||
| import java.io.StringWriter; | ||
|
|
||
| @Configuration | ||
| @ConditionalOnProperty("shibui.external.metadataProviders.target") | ||
| public class ExternalMetadataProvidersScheduledTasks { | ||
| private static final Logger logger = LoggerFactory.getLogger(ExternalMetadataProvidersScheduledTasks.class); | ||
|
|
||
| private final Resource target; | ||
| private final MetadataResolverService metadataResolverService; | ||
| private final FileWritingService fileWritingService; | ||
|
|
||
| public ExternalMetadataProvidersScheduledTasks(Resource target, MetadataResolverService metadataResolverService, FileWritingService fileWritingService) { | ||
| this.target = target; | ||
| this.metadataResolverService = metadataResolverService; | ||
| this.fileWritingService = fileWritingService; | ||
| } | ||
|
|
||
| @Scheduled(fixedRateString = "${shibui.external.metadataProviders.taskRunRate:30000}") | ||
| @Transactional(readOnly = true) | ||
| public void generateMetadataProvidersFile() { | ||
| try (StringWriter os = new StringWriter()) { | ||
| Transformer transformer = TransformerFactory.newInstance().newTransformer(); | ||
| transformer.setOutputProperty(OutputKeys.INDENT, "yes"); | ||
| transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2"); | ||
|
|
||
|
|
||
| transformer.transform(new DOMSource(metadataResolverService.generateExternalMetadataFilterConfiguration()), new StreamResult(os)); | ||
| this.fileWritingService.write((WritableResource)this.target, os.toString()); | ||
| } catch (IOException | TransformerException e) { | ||
| logger.error(e.getLocalizedMessage(), e); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.