-
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.
add duration validation
- Loading branch information
Showing
2 changed files
with
51 additions
and
0 deletions.
There are no files selected for viewing
44 changes: 44 additions & 0 deletions
44
...shibboleth/admin/ui/controller/advice/DurationComparisonValidatingControllerAdvice.groovy
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,44 @@ | ||
package edu.internet2.tier.shibboleth.admin.ui.controller.advice | ||
|
||
import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicMetadataResolverAttributes | ||
import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver | ||
import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ReloadableMetadataResolverAttributes | ||
import edu.internet2.tier.shibboleth.admin.util.DurationUtility | ||
import org.springframework.core.MethodParameter | ||
import org.springframework.http.HttpInputMessage | ||
import org.springframework.http.converter.HttpMessageConverter | ||
import org.springframework.web.bind.annotation.ControllerAdvice | ||
import org.springframework.web.servlet.mvc.method.annotation.RequestBodyAdviceAdapter | ||
|
||
import java.lang.reflect.Type | ||
|
||
/** | ||
* Controller adivce that makse sure that set durations make sense | ||
*/ | ||
@ControllerAdvice | ||
class DurationComparisonValidatingControllerAdvice extends RequestBodyAdviceAdapter { | ||
@Override | ||
boolean supports(MethodParameter methodParameter, Type targetType, Class<? extends HttpMessageConverter<?>> converterType) { | ||
return MetadataResolver.isAssignableFrom(targetType) | ||
} | ||
|
||
@Override | ||
Object afterBodyRead(Object body, HttpInputMessage inputMessage, MethodParameter parameter, Type targetType, Class<? extends HttpMessageConverter<?>> converterType) { | ||
MetadataResolver metadataResolver = (MetadataResolver)body | ||
if (metadataResolver.hasProperty('dynamicMetadataResolverAttributes')) { | ||
DynamicMetadataResolverAttributes dynamicMetadataResolverAttributes = metadataResolver.dynamicMetadataResolverAttributes | ||
if (DurationUtility.toMillis(dynamicMetadataResolverAttributes.minCacheDuration) > DurationUtility.toMillis(dynamicMetadataResolverAttributes.maxCacheDuration)) { | ||
throw new MetadataResolverConfigurationValidationException('minimum cache duration larger than maximum') | ||
} | ||
} | ||
|
||
if (metadataResolver.hasProperty('reloadableMetadataResolverAttributes')) { | ||
ReloadableMetadataResolverAttributes reloadableMetadataResolverAttributes = metadataResolver.reloadableMetadataResolverAttributes | ||
if (DurationUtility.toMillis(reloadableMetadataResolverAttributes.minRefreshDelay) > DurationUtility.toMillis(reloadableMetadataResolverAttributes.maxRefreshDelay)) { | ||
throw new MetadataResolverConfigurationValidationException('minimum refresh delay duration larger than maximum') | ||
} | ||
} | ||
|
||
return body | ||
} | ||
} |
7 changes: 7 additions & 0 deletions
7
...boleth/admin/ui/controller/advice/MetadataResolverConfigurationValidationException.groovy
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,7 @@ | ||
package edu.internet2.tier.shibboleth.admin.ui.controller.advice | ||
|
||
class MetadataResolverConfigurationValidationException extends RuntimeException { | ||
MetadataResolverConfigurationValidationException(String message) { | ||
super(message) | ||
} | ||
} |