commit b0887dde0d4576e99318e55a78953e0d1613b0a4 Author: CismonX Date: Fri Feb 23 18:55:44 2018 +0800 archive diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c9f7010 --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +.gradle +/build/ +!gradle/wrapper/gradle-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..5c9ce8f --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2018 CismonX + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..da43a75 --- /dev/null +++ b/README.md @@ -0,0 +1,84 @@ +# url-shortener + +A simple short URL generator, written in kotlin. + +## 1. API + +### 1.1 Create new URL + +> POST /manage + +Create a new short URL. Accepts content-type `application/x-www-form-urlencoded`. + +Body should contain one parameter, `url`, the desired URL to be shortened. + +Returns `application/json`, format: + +```json +{ + "err" : 0, + "data" : { + "id" : ": ID of short URL", + "uuid" : ": 22 character unique string" + } +} +``` + +This API requires authentication. + +### 1.2 Get all URL + +> GET /manage + +Return a list of all URLs you've created. + +Returns `application/json`, format: + +```json +{ + "err" : 0, + "data" : [ + { + "id" : ": ID of short URL", + "uuid" : ": 22 character unique string", + "url" : ": The exact URL to be redirected to" + }, + { + "..." : "..." + }, + "..." + ] +} +``` + +This API requires authentication. + +### 1.3 Delete URL + +> DELETE /manage/{id} + +Delete a URL with the given ID. + +This API requires authentication. + +### 1.4 Using short URL + +> GET /{uuid} + +If the given UUID is valid, server will return a `302 Found`, and your browser will redirect you to the corresponding real URL. + +Otherwise you'll get a `404 Not Found`. + +## 2. Authentication + +Managing short URLs requires authentication. + +Simply specify `x-auth-id` and `x-auth-token` in HTTP header. + +You should manually add users in the `auth` table. + +## 3. Build + +This project provides a Gradle wrapper, so it's easy to build. + +Be sure to configure your MySQL database and edit the `application.properties` file before running. \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..49ba88b --- /dev/null +++ b/build.gradle @@ -0,0 +1,54 @@ +buildscript { + ext.kotlin_version = '1.2.21' + ext { + springBootVersion = '1.5.10.RELEASE' + kotlin_version = '1.2.21' + } + repositories { + jcenter() + mavenCentral() + } + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version" + classpath "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}" + } +} + +apply plugin: 'java' +apply plugin: 'kotlin' +apply plugin: 'eclipse' +apply plugin: 'org.springframework.boot' + +group = 'net.cismon' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = 1.8 + +repositories { + mavenCentral() +} + +dependencies { + compile('org.springframework.boot:spring-boot-starter-data-jpa') + compile('org.springframework.boot:spring-boot-starter-data-rest') + compile('org.springframework.boot:spring-boot-starter-jdbc') + compile('org.springframework.boot:spring-boot-starter-web') { + exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat' + } + compile 'com.fasterxml.jackson.core:jackson-databind' + runtime('mysql:mysql-connector-java') + testCompile('org.springframework.boot:spring-boot-starter-test') + compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + compile 'javax.xml.bind:jaxb-api:2.3.0' + compile group: 'commons-validator', name: 'commons-validator', version: '1.4.0' +} +compileKotlin { + kotlinOptions { + jvmTarget = "1.8" + } +} +compileTestKotlin { + kotlinOptions { + jvmTarget = "1.8" + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1a958be Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..498ea3e --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Feb 21 17:24:02 CST 2018 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..4453cce --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/main/kotlin/net/cismon/urlshortener/Bootstrap.kt b/src/main/kotlin/net/cismon/urlshortener/Bootstrap.kt new file mode 100644 index 0000000..d079fcb --- /dev/null +++ b/src/main/kotlin/net/cismon/urlshortener/Bootstrap.kt @@ -0,0 +1,11 @@ +package net.cismon.urlshortener + +import org.springframework.boot.SpringApplication +import org.springframework.boot.autoconfigure.SpringBootApplication + +@SpringBootApplication +open class Bootstrap + +fun main(args: Array) { + SpringApplication.run(Bootstrap::class.java, *args) +} \ No newline at end of file diff --git a/src/main/kotlin/net/cismon/urlshortener/configuration/WebConfig.kt b/src/main/kotlin/net/cismon/urlshortener/configuration/WebConfig.kt new file mode 100644 index 0000000..dbf60e1 --- /dev/null +++ b/src/main/kotlin/net/cismon/urlshortener/configuration/WebConfig.kt @@ -0,0 +1,18 @@ +package net.cismon.urlshortener.configuration + +import net.cismon.urlshortener.interceptor.AuthInterceptor +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration +import org.springframework.web.servlet.config.annotation.InterceptorRegistry +import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter + +@Configuration +open class WebConfig : WebMvcConfigurerAdapter() { + + override fun addInterceptors(registry: InterceptorRegistry) { + registry.addInterceptor(authInterceptor()).addPathPatterns("/manage/**") + } + + @Bean + open fun authInterceptor() = AuthInterceptor() +} \ No newline at end of file diff --git a/src/main/kotlin/net/cismon/urlshortener/controller/UrlController.kt b/src/main/kotlin/net/cismon/urlshortener/controller/UrlController.kt new file mode 100644 index 0000000..93cb947 --- /dev/null +++ b/src/main/kotlin/net/cismon/urlshortener/controller/UrlController.kt @@ -0,0 +1,52 @@ +package net.cismon.urlshortener.controller + +import net.cismon.urlshortener.helper.RespondError +import net.cismon.urlshortener.helper.UrlValidator +import net.cismon.urlshortener.helper.UuidGenerator +import net.cismon.urlshortener.model.UrlModel +import net.cismon.urlshortener.service.UrlService +import net.cismon.urlshortener.wrapper.* +import org.springframework.stereotype.Controller +import org.springframework.web.bind.annotation.* + +@Controller +@RequestMapping("/manage", produces = ["application/json"]) +class UrlController( + private val urlService: UrlService, + private val respondError: RespondError, + private val uuidGenerator: UuidGenerator, + private val urlValidator: UrlValidator) { + + @PostMapping(consumes = ["application/x-www-form-urlencoded"]) + @ResponseBody + fun shortenUrl( + request: NewUrlRequest, + @RequestHeader(name = "x-auth-id") uid: Long + ): Respond { + if (request.url == null || !urlValidator.validate(request.url!!)) + return respondError.invalidUrl() + return NewUrlRespond(urlService.saveUrl(UrlModel( + uid = uid, + uuid = uuidGenerator.generate(), + url = request.url))) + } + + @GetMapping + @ResponseBody + fun getUserUrl( + @RequestHeader(name = "x-auth-id") uid: Long + ) = UserUrlRespond(urlService.getAllUrl(uid)) + + @DeleteMapping("/{id}") + @ResponseBody + fun deleteUrl( + @PathVariable id: Long, + @RequestHeader(name = "x-auth-id") uid: Long + ): Respond { + val url = urlService.getUrl(id) ?: return respondError.invalidUrl() + if (uid != url.uid!!) + return respondError.permissionDenied() + urlService.deleteUrl(id) + return OkRespond() + } +} diff --git a/src/main/kotlin/net/cismon/urlshortener/controller/UrlRedirectController.kt b/src/main/kotlin/net/cismon/urlshortener/controller/UrlRedirectController.kt new file mode 100644 index 0000000..8e287fd --- /dev/null +++ b/src/main/kotlin/net/cismon/urlshortener/controller/UrlRedirectController.kt @@ -0,0 +1,20 @@ +package net.cismon.urlshortener.controller + +import net.cismon.urlshortener.service.UrlService +import org.springframework.data.rest.webmvc.ResourceNotFoundException +import org.springframework.stereotype.Controller +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.servlet.view.RedirectView + +@Controller +@RequestMapping("/{uuid}") +class UrlRedirectController(private val urlService: UrlService) { + + @GetMapping + fun getUrl(@PathVariable uuid: String): RedirectView { + val url = urlService.getUrl(uuid) ?: throw ResourceNotFoundException() + return RedirectView(url.url) + } +} \ No newline at end of file diff --git a/src/main/kotlin/net/cismon/urlshortener/dao/AuthDao.kt b/src/main/kotlin/net/cismon/urlshortener/dao/AuthDao.kt new file mode 100644 index 0000000..928f39d --- /dev/null +++ b/src/main/kotlin/net/cismon/urlshortener/dao/AuthDao.kt @@ -0,0 +1,10 @@ +package net.cismon.urlshortener.dao + +import net.cismon.urlshortener.model.AuthModel +import org.springframework.data.repository.CrudRepository +import org.springframework.transaction.annotation.Transactional + +@Transactional +interface AuthDao : CrudRepository { + fun findById(id: Long): AuthModel? +} \ No newline at end of file diff --git a/src/main/kotlin/net/cismon/urlshortener/dao/UrlDao.kt b/src/main/kotlin/net/cismon/urlshortener/dao/UrlDao.kt new file mode 100644 index 0000000..0ab9734 --- /dev/null +++ b/src/main/kotlin/net/cismon/urlshortener/dao/UrlDao.kt @@ -0,0 +1,19 @@ +package net.cismon.urlshortener.dao + +import net.cismon.urlshortener.model.UrlModel +import org.springframework.data.repository.CrudRepository +import org.springframework.transaction.annotation.Transactional + +@Transactional +interface UrlDao : CrudRepository { + + fun findById(id: Long): UrlModel? + + fun findByUid(uid: Long) : List + + fun findByUuid(uuid: String): UrlModel? + + fun deleteById(id: Long) + + fun save(url: UrlModel): UrlModel +} \ No newline at end of file diff --git a/src/main/kotlin/net/cismon/urlshortener/helper/RespondError.kt b/src/main/kotlin/net/cismon/urlshortener/helper/RespondError.kt new file mode 100644 index 0000000..88122b1 --- /dev/null +++ b/src/main/kotlin/net/cismon/urlshortener/helper/RespondError.kt @@ -0,0 +1,13 @@ +package net.cismon.urlshortener.helper + +import net.cismon.urlshortener.wrapper.Respond +import org.springframework.stereotype.Component + +@Component +class RespondError { + private fun error(ec: Long, msg: String) = Respond(ec, msg) + + fun invalidUrl() = error(1, "Invalid URL") + + fun permissionDenied() = error(2, "Permission denied") +} \ No newline at end of file diff --git a/src/main/kotlin/net/cismon/urlshortener/helper/UrlValidator.kt b/src/main/kotlin/net/cismon/urlshortener/helper/UrlValidator.kt new file mode 100644 index 0000000..5329534 --- /dev/null +++ b/src/main/kotlin/net/cismon/urlshortener/helper/UrlValidator.kt @@ -0,0 +1,12 @@ +package net.cismon.urlshortener.helper + +import org.apache.commons.validator.routines.UrlValidator +import org.springframework.stereotype.Component + +@Component +class UrlValidator { + + private val validator = UrlValidator(arrayOf("http", "https")) + + fun validate(url: String) = validator.isValid(url) +} \ No newline at end of file diff --git a/src/main/kotlin/net/cismon/urlshortener/helper/UuidGenerator.kt b/src/main/kotlin/net/cismon/urlshortener/helper/UuidGenerator.kt new file mode 100644 index 0000000..23234b5 --- /dev/null +++ b/src/main/kotlin/net/cismon/urlshortener/helper/UuidGenerator.kt @@ -0,0 +1,18 @@ +package net.cismon.urlshortener.helper + +import org.springframework.stereotype.Component +import org.springframework.util.Base64Utils +import java.nio.ByteBuffer +import java.util.* + +@Component +class UuidGenerator { + fun generate() : String { + val uuid = UUID.randomUUID() + return Base64Utils.encodeToUrlSafeString(ByteBuffer + .allocate(16) + .putLong(uuid.mostSignificantBits) + .putLong(uuid.leastSignificantBits) + .array()).trim('=') + } +} \ No newline at end of file diff --git a/src/main/kotlin/net/cismon/urlshortener/interceptor/AuthInterceptor.kt b/src/main/kotlin/net/cismon/urlshortener/interceptor/AuthInterceptor.kt new file mode 100644 index 0000000..8f0cc06 --- /dev/null +++ b/src/main/kotlin/net/cismon/urlshortener/interceptor/AuthInterceptor.kt @@ -0,0 +1,39 @@ +package net.cismon.urlshortener.interceptor + +import net.cismon.urlshortener.service.AuthService +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.stereotype.Component +import org.springframework.web.servlet.handler.HandlerInterceptorAdapter +import javax.servlet.http.HttpServletRequest +import javax.servlet.http.HttpServletResponse + +@Component +class AuthInterceptor: HandlerInterceptorAdapter() { + + @Autowired + lateinit var authService: AuthService + + override fun preHandle( + request: HttpServletRequest?, + response: HttpServletResponse?, + handler: Any?): Boolean { + val uid = request?.getHeader("x-auth-id") + val token = request?.getHeader("x-auth-token") + if (uid != null && token != null) { + try { + if (token == authService.getTokenById(uid.toLong())) + return true + else { + response?.sendError(403) + return false + } + } catch (ex: NumberFormatException) { + response?.sendError(400) + return false + } + } + response?.sendError(400) + return false + } + +} \ No newline at end of file diff --git a/src/main/kotlin/net/cismon/urlshortener/model/AuthModel.kt b/src/main/kotlin/net/cismon/urlshortener/model/AuthModel.kt new file mode 100644 index 0000000..6072ee7 --- /dev/null +++ b/src/main/kotlin/net/cismon/urlshortener/model/AuthModel.kt @@ -0,0 +1,15 @@ +package net.cismon.urlshortener.model + +import javax.persistence.* +import javax.validation.constraints.NotNull + +@Entity +@Table(name = "auth") +class AuthModel { + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + var id: Long? = null + + @NotNull + var token: String? = null +} \ No newline at end of file diff --git a/src/main/kotlin/net/cismon/urlshortener/model/UrlModel.kt b/src/main/kotlin/net/cismon/urlshortener/model/UrlModel.kt new file mode 100644 index 0000000..a9e3a4d --- /dev/null +++ b/src/main/kotlin/net/cismon/urlshortener/model/UrlModel.kt @@ -0,0 +1,24 @@ +package net.cismon.urlshortener.model + +import javax.persistence.* +import javax.validation.constraints.NotNull + +@Entity +@Table(name = "url", indexes = [ + Index(name = "unique_id", columnList = "uuid", unique = true) +]) +class UrlModel( + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + var id: Long? = null, + + @NotNull + @JoinColumn(foreignKey = ForeignKey(name = "created_by")) + var uid: Long? = null, + + @NotNull + var uuid: String? = null, + + @NotNull + var url: String? = null +) \ No newline at end of file diff --git a/src/main/kotlin/net/cismon/urlshortener/service/AuthService.kt b/src/main/kotlin/net/cismon/urlshortener/service/AuthService.kt new file mode 100644 index 0000000..ce93407 --- /dev/null +++ b/src/main/kotlin/net/cismon/urlshortener/service/AuthService.kt @@ -0,0 +1,10 @@ +package net.cismon.urlshortener.service + +import net.cismon.urlshortener.dao.AuthDao +import org.springframework.stereotype.Service + +@Service +class AuthService(val authDao: AuthDao) { + + fun getTokenById(id: Long): String? = authDao.findById(id)?.token +} \ No newline at end of file diff --git a/src/main/kotlin/net/cismon/urlshortener/service/UrlService.kt b/src/main/kotlin/net/cismon/urlshortener/service/UrlService.kt new file mode 100644 index 0000000..9e6e1cf --- /dev/null +++ b/src/main/kotlin/net/cismon/urlshortener/service/UrlService.kt @@ -0,0 +1,19 @@ +package net.cismon.urlshortener.service + +import net.cismon.urlshortener.dao.UrlDao +import net.cismon.urlshortener.model.UrlModel +import org.springframework.stereotype.Service + +@Service +class UrlService(val urlDao: UrlDao) { + + fun saveUrl(url: UrlModel) = urlDao.save(url) + + fun getAllUrl(uid: Long) = urlDao.findByUid(uid) + + fun deleteUrl(id: Long) = urlDao.deleteById(id) + + fun getUrl(id: Long) = urlDao.findById(id) + + fun getUrl(uuid: String) = urlDao.findByUuid(uuid) +} \ No newline at end of file diff --git a/src/main/kotlin/net/cismon/urlshortener/wrapper/NewUrlInfo.kt b/src/main/kotlin/net/cismon/urlshortener/wrapper/NewUrlInfo.kt new file mode 100644 index 0000000..0a0a6e5 --- /dev/null +++ b/src/main/kotlin/net/cismon/urlshortener/wrapper/NewUrlInfo.kt @@ -0,0 +1,3 @@ +package net.cismon.urlshortener.wrapper + +class NewUrlInfo(val id: Long, val uuid: String) \ No newline at end of file diff --git a/src/main/kotlin/net/cismon/urlshortener/wrapper/NewUrlRequest.kt b/src/main/kotlin/net/cismon/urlshortener/wrapper/NewUrlRequest.kt new file mode 100644 index 0000000..fa1c6ea --- /dev/null +++ b/src/main/kotlin/net/cismon/urlshortener/wrapper/NewUrlRequest.kt @@ -0,0 +1,5 @@ +package net.cismon.urlshortener.wrapper + +class NewUrlRequest { + var url: String? = null +} diff --git a/src/main/kotlin/net/cismon/urlshortener/wrapper/NewUrlRespond.kt b/src/main/kotlin/net/cismon/urlshortener/wrapper/NewUrlRespond.kt new file mode 100644 index 0000000..974d807 --- /dev/null +++ b/src/main/kotlin/net/cismon/urlshortener/wrapper/NewUrlRespond.kt @@ -0,0 +1,5 @@ +package net.cismon.urlshortener.wrapper + +import net.cismon.urlshortener.model.UrlModel + +class NewUrlRespond(url: UrlModel): Respond(0, NewUrlInfo(url.id!!, url.uuid!!)) \ No newline at end of file diff --git a/src/main/kotlin/net/cismon/urlshortener/wrapper/OkRespond.kt b/src/main/kotlin/net/cismon/urlshortener/wrapper/OkRespond.kt new file mode 100644 index 0000000..46fb7c4 --- /dev/null +++ b/src/main/kotlin/net/cismon/urlshortener/wrapper/OkRespond.kt @@ -0,0 +1,3 @@ +package net.cismon.urlshortener.wrapper + +class OkRespond : Respond(0, "Request fulfilled") \ No newline at end of file diff --git a/src/main/kotlin/net/cismon/urlshortener/wrapper/Respond.kt b/src/main/kotlin/net/cismon/urlshortener/wrapper/Respond.kt new file mode 100644 index 0000000..3303fac --- /dev/null +++ b/src/main/kotlin/net/cismon/urlshortener/wrapper/Respond.kt @@ -0,0 +1,3 @@ +package net.cismon.urlshortener.wrapper + +open class Respond(var err: Long = 0, var data: Data) diff --git a/src/main/kotlin/net/cismon/urlshortener/wrapper/UserUrlInfo.kt b/src/main/kotlin/net/cismon/urlshortener/wrapper/UserUrlInfo.kt new file mode 100644 index 0000000..b23e79c --- /dev/null +++ b/src/main/kotlin/net/cismon/urlshortener/wrapper/UserUrlInfo.kt @@ -0,0 +1,3 @@ +package net.cismon.urlshortener.wrapper + +class UserUrlInfo(val id: Long, val uuid: String, val url: String) \ No newline at end of file diff --git a/src/main/kotlin/net/cismon/urlshortener/wrapper/UserUrlRespond.kt b/src/main/kotlin/net/cismon/urlshortener/wrapper/UserUrlRespond.kt new file mode 100644 index 0000000..317b32a --- /dev/null +++ b/src/main/kotlin/net/cismon/urlshortener/wrapper/UserUrlRespond.kt @@ -0,0 +1,7 @@ +package net.cismon.urlshortener.wrapper + +import net.cismon.urlshortener.model.UrlModel + +class UserUrlRespond(list: List) : Respond>(0, list.map { + UserUrlInfo(it.id!!, it.uuid!!, it.url!!) +}) \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..79a1013 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,9 @@ +spring.main.banner-mode = off + +server.port = 8111 + +spring.datasource.url = jdbc:mysql://127.0.0.1:3306/url_shortener?autoReconnect=true&useSSL=false +spring.datasource.username = username +spring.datasource.password = password +spring.datasource.testWhileIdle = true +spring.datasource.validationQuery = SELECT 1 \ No newline at end of file