mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2024-11-27 08:18:24 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #192 from acelaya/feature/non-unique-long-urls

Browse source 
Ensured same long URL can be used multiple times for different short URLs
This commit is contained in:
Alejandro Celaya 2018-09-11 20:44:40 +02:00 committed by GitHub
commit 17779dbbc6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
module/Common/functions/functions.php
View file

@ -3,6 +3,10 @@ declare(strict_types=1);
namespace Shlinkio\Shlink\Common;
use function getenv;
use function strtolower;
use function trim;
/**
* Gets the value of an environment variable. Supports boolean, empty and null.
* This is basically Laravel's env helper

27
module/Core/src/Service/UrlShortener.php
View file

@ -23,6 +23,7 @@ class UrlShortener implements UrlShortenerInterface
use TagManagerTrait;
public const DEFAULT_CHARS = '123456789bcdfghjkmnpqrstvwxyzBCDFGHJKLMNPQRSTVWXYZ';
private const ID_INCREMENT = 200000;
/**
* @var ClientInterface
@ -54,7 +55,7 @@ class UrlShortener implements UrlShortenerInterface
) {
$this->httpClient = $httpClient;
$this->em = $em;
$this->urlValidationEnabled = $urlValidationEnabled;
$this->urlValidationEnabled = (bool) $urlValidationEnabled;
$this->chars = empty($chars) ? self::DEFAULT_CHARS : $chars;
$this->slugger = $slugger ?: new Slugify();
}
@ -81,18 +82,8 @@ class UrlShortener implements UrlShortenerInterface
string $customSlug = null,
int $maxVisits = null
): string {
// If the url already exists in the database, just return its short code
/** @var ShortUrl|null $shortUrl */
$shortUrl = $this->em->getRepository(ShortUrl::class)->findOneBy([
'originalUrl' => $url,
]);
if ($shortUrl !== null) {
return $shortUrl->getShortCode();
}
// Check if the validation of url is enabled in the config
if (true === $this->urlValidationEnabled) {
// Check that the URL exists
// If the URL validation is enabled, check that the URL actually exists
if ($this->urlValidationEnabled) {
$this->checkUrlExists($url);
}
$customSlug = $this->processCustomSlug($customSlug);
@ -153,14 +144,14 @@ class UrlShortener implements UrlShortenerInterface
*/
private function convertAutoincrementIdToShortCode(float $id): string
{
$id += 200000; // Increment the Id so that the generated shortcode is not too short
$id += self::ID_INCREMENT; // Increment the Id so that the generated shortcode is not too short
$length = \strlen($this->chars);
$code = '';
while ($id > 0) {
// Determine the value of the next higher character in the short code and prepend it
$code = $this->chars[(int) fmod($id, $length)] . $code;
$id = floor($id / $length);
$code = $this->chars[(int) \fmod($id, $length)] . $code;
$id = \floor($id / $length);
}
return $this->chars[(int) $id] . $code;
@ -172,7 +163,7 @@ class UrlShortener implements UrlShortenerInterface
return null;
}
// If a custom slug was provided, check it is unique
// If a custom slug was provided, make sure it's unique
$customSlug = $this->slugger->slugify($customSlug);
$shortUrl = $this->em->getRepository(ShortUrl::class)->findOneBy(['shortCode' => $customSlug]);
if ($shortUrl !== null) {
@ -191,7 +182,7 @@ class UrlShortener implements UrlShortenerInterface
public function shortCodeToUrl(string $shortCode): ShortUrl
{
// Validate short code format
if (! preg_match('|[' . $this->chars . ']+|', $shortCode)) {
if (! \preg_match('|[' . $this->chars . ']+|', $shortCode)) {
throw InvalidShortCodeException::fromCharset($shortCode, $this->chars);
}

15
module/Core/test/Service/UrlShortenerTest.php
View file

@ -119,21 +119,6 @@ class UrlShortenerTest extends TestCase
$this->urlShortener->urlToShortCode(new Uri('http://foobar.com/12345/hello?foo=bar'));
}
/**
* @test
*/
public function whenShortUrlExistsItsShortcodeIsReturned()
{
$shortUrl = new ShortUrl();
$shortUrl->setShortCode('expected_shortcode');
$repo = $this->prophesize(ObjectRepository::class);
$repo->findOneBy(Argument::any())->willReturn($shortUrl);
$this->em->getRepository(ShortUrl::class)->willReturn($repo->reveal());
$shortCode = $this->urlShortener->urlToShortCode(new Uri('http://foobar.com/12345/hello?foo=bar'));
$this->assertEquals($shortUrl->getShortCode(), $shortCode);
}
/**
* @test
*/