Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ dependencies {
implementation 'io.seqera:lib-retry:2.0.0'
implementation 'io.seqera:lib-random:1.0.0'
implementation 'io.seqera:lib-util-time:1.0.0'
implementation 'io.seqera:lib-util-net:0.1.0'
implementation 'io.seqera:lib-activator:1.0.0'
implementation project(':wave-api')
implementation project(':wave-utils')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ import io.micronaut.http.annotation.Controller
import io.micronaut.http.annotation.Post
import io.micronaut.scheduling.TaskExecutors
import io.micronaut.scheduling.annotation.ExecuteOn
import io.seqera.util.net.SsrfValidationException
import io.seqera.util.net.SsrfValidator
import io.seqera.wave.auth.RegistryAuthService
import io.seqera.wave.configuration.SsrfConfig
import io.seqera.wave.util.SsrfValidator
import io.seqera.wave.exception.BadRequestException
import jakarta.inject.Inject
import jakarta.validation.Valid

Expand Down Expand Up @@ -54,7 +56,12 @@ class ValidateController {

private void validateRegistry(String registry) {
if (ssrfConfig.ssrfProtectionEnabled) {
SsrfValidator.validateHost(registry)
try {
SsrfValidator.validateHost(registry)
}
catch (SsrfValidationException e) {
throw new BadRequestException(e.message)
}
}
}

Expand Down
148 changes: 0 additions & 148 deletions src/main/groovy/io/seqera/wave/util/SsrfValidator.groovy

This file was deleted.

185 changes: 0 additions & 185 deletions src/test/groovy/io/seqera/wave/util/SsrfValidatorTest.groovy

This file was deleted.

Loading