Skip to content

SHORTY-81 Fix case with loops in URL redirection are not avoided #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Reyzis2021 wants to merge 1 commit into
base: development
Choose a base branch
from
Open

SHORTY-81 Fix case with loops in URL redirection are not avoided #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions src/main/kotlin/com/zufar/urlshortener/shorten/controller/UrlController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.zufar.urlshortener.shorten.controller

import com.zufar.urlshortener.common.exception.ErrorResponse
import com.zufar.urlshortener.common.exception.InvalidRequestException
import com.zufar.urlshortener.shorten.dto.*
import com.zufar.urlshortener.shorten.repository.UrlRepository
import com.zufar.urlshortener.shorten.service.*
Expand Down Expand Up @@ -164,6 +165,12 @@ class UrlController(
httpServletRequest.getHeader("User-Agent")
)

val existingMapping = urlRepository.findByShortUrl(originalUrl)
if (existingMapping.isPresent) {
log.warn("Loop detected: originalUrl='{}' points to another short URL.", originalUrl)
throw InvalidRequestException("URL cannot point to a loop back address")
}

val urlHash = StringEncoder.encode(originalUrl)
val urlMapping = urlRepository.findByUrlHash(urlHash)
val shortUrl: String
Expand Down
2 changes: 2 additions & 0 deletions src/main/kotlin/com/zufar/urlshortener/shorten/repository/UrlRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ interface UrlRepository : MongoRepository<UrlMapping, String> {
fun findByUrlHash(urlHash: String): Optional<UrlMapping>

fun findAllByUserId(userId: String, pageable: Pageable): Page<UrlMapping>

fun findByShortUrl(shortUrl: String): Optional<UrlMapping>
}