commit 988a94141f0accd98ed2b29ee7b3d7db7d57f8f6 Author: Felix Ableitner Date: Fri Apr 27 15:18:37 2018 +0200 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ddd6656 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +/.gradle/ +/.idea/ +/build/ +/database.mv.db +/database.trace.db +/server/build/ +/server/out/ \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..2f29493 --- /dev/null +++ b/README.md @@ -0,0 +1,22 @@ +Siapics +======= + +Install +------- + +First, you need to install Sia and execute `siad`. After block synchronization is complete (check with `siac` command), +you have to put some Sia coins into the wallet, and unlock the wallet. + https://github.com/dvstate/minio#install-sia-daemon + +When this is all done, you are ready to set up Minio. Execute the following commands: + +``` +MINIO_ACCESS_KEY=*username* +MINIO_SECRET_KEY=*password* +minio gateway sia +``` + +Now, install siapics on the server, and execute `siapics --minio-user *username* --minio-password *password*`. It will +listen on `http://localhost:9191`. To access siapics from another device, you need to set up a proxy server, like Nginx. + +You can browse the existing files at `http://localhost:9000`, with the above username and password. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..7020065 --- /dev/null +++ b/build.gradle @@ -0,0 +1,24 @@ +buildscript { + ext.kotlin_version = '1.2.31' + + repositories { + jcenter() + } + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +group 'com.siapics' +version '0.1' + +apply plugin: 'kotlin' + +sourceCompatibility = 1.8 + +compileKotlin { + kotlinOptions.jvmTarget = "1.8" +} +compileTestKotlin { + kotlinOptions.jvmTarget = "1.8" +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..01b8bf6 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..933b647 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..cccdd3d --- /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..e95643d --- /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/server/build.gradle b/server/build.gradle new file mode 100644 index 0000000..2590766 --- /dev/null +++ b/server/build.gradle @@ -0,0 +1,43 @@ +buildscript { + ext.kotlin_version = '1.2.31' + + repositories { + jcenter() + } + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +group 'com.siapics' +version '0.1' + +apply plugin: 'java' +apply plugin: 'kotlin' + +sourceCompatibility = 1.8 + +repositories { + jcenter() + maven { url "https://dl.bintray.com/kotlin/exposed" } +} + +dependencies { + compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + compile 'io.minio:minio:3.0.12' + compile "com.sparkjava:spark-kotlin:1.0.0-alpha" + compile "com.sparkjava:spark-template-velocity:2.7.1" + compile "org.slf4j:slf4j-simple:1.7.21" + compile 'com.h2database:h2:1.4.197' + compile 'org.apache.velocity:velocity:1.7' + //compile 'org.jetbrains.exposed:exposed:0.10.2' + compile 'org.jetbrains.exposed:exposed:0.10.1' + testCompile group: 'junit', name: 'junit', version: '4.12' +} + +compileKotlin { + kotlinOptions.jvmTarget = "1.8" +} +compileTestKotlin { + kotlinOptions.jvmTarget = "1.8" +} \ No newline at end of file diff --git a/server/src/main/kotlin/com/siapics/server/Database.kt b/server/src/main/kotlin/com/siapics/server/Database.kt new file mode 100644 index 0000000..9c72e9f --- /dev/null +++ b/server/src/main/kotlin/com/siapics/server/Database.kt @@ -0,0 +1,68 @@ +package com.siapics.server + +import org.jetbrains.exposed.sql.* +import org.jetbrains.exposed.sql.transactions.transaction +import java.io.File +import kotlin.streams.asSequence + +class Database { + + object Images : Table() { + val id: Column = integer("id").autoIncrement().primaryKey() + val externalId: Column = text("externalId") + val filename: Column = text("filename").nullable() + } + + // TODO: use a different path (something thats not in the git repo) + private val DatabaseFile = File("database").absolutePath + private val CreateImageIdLock = Object() + + private val db = org.jetbrains.exposed.sql.Database.connect("jdbc:h2:file:$DatabaseFile", driver = "org.h2.Driver") + + init { + transaction(db) { + SchemaUtils.createMissingTablesAndColumns(Images) + } + } + + fun generateRandomImageId(): String { + synchronized(CreateImageIdLock) { + var randomId = "" + while (randomId.isEmpty()) { + val characters = "abcdefghijklmnopqrstuvwxyz0123456789" + randomId = java.util.Random().ints(6, 0, characters.length) + .asSequence() + .map(characters::get) + .joinToString("") + transaction(db) { + SchemaUtils.create(Images) + if (Images.select { Images.externalId.eq(randomId) }.count() > 0) { + randomId = "" + } + } + } + + transaction(db) { + Images.insert { + it[externalId] = randomId + it[filename] = null + } + } + return randomId + } + } + + fun updateImage(imageId: String, filename: String?) { + transaction { + Images.update({ Images.externalId.eq(imageId)}) { + it[Images.filename] = filename + } + } + } + + fun getImage(imageId: String): ResultRow { + return transaction(db) { + Images.select { Images.externalId.eq(imageId)}.first() + } + } +} \ No newline at end of file diff --git a/server/src/main/kotlin/com/siapics/server/Main.kt b/server/src/main/kotlin/com/siapics/server/Main.kt new file mode 100644 index 0000000..38ad47e --- /dev/null +++ b/server/src/main/kotlin/com/siapics/server/Main.kt @@ -0,0 +1,91 @@ +package com.siapics.server + +import io.minio.MinioClient +import spark.ModelAndView +import spark.Request +import spark.Response +import spark.Spark +import spark.template.velocity.VelocityTemplateEngine +import java.io.File +import java.nio.file.Files +import javax.servlet.MultipartConfigElement + +object Main { + + private val AllowedExtensions = setOf("png", "jpeg", "jpg", "svg", "gif", "bmp") + + // TODO: read keys from env + private val minioClient = MinioClient("http://195.201.141.43:9000", + "ZVLLMKIJD1ULKOF3KGRG", "pLPB+LfzSFeUt2bKJ4WuYkCLtU8yvSLFe6bTgqp9") + private val database = Database() + + @JvmStatic fun main(args: Array) { + // Create bucket if it doesn't exist yet. + if (!minioClient.bucketExists("siapics")) { + minioClient.makeBucket("siapics") + } + + Spark.get("/", { request: Request, response: Response -> + ModelAndView(mutableMapOf("foo" to "test"), "index.vm") + }, VelocityTemplateEngine()) + + Spark.post("/", this::uploadFile) + + Spark.get("/view/:id", { request: Request, response: Response -> + val image = database.getImage(request.params("id")) + ModelAndView(mutableMapOf("filename" to image[Database.Images.filename]), "view.vm") + }, VelocityTemplateEngine()) + + Spark.get("/image/:id", { request: Request, response: Response -> + val inputStream = minioClient.getObject("siapics", request.params("id")) + inputStream.copyTo(response.raw().outputStream) + }) + } + + private fun uploadFile(request: Request, response: Response) { + if (request.contentLength() > 5 * 1024 * 1024) { + Spark.halt("File is too big, maximum 5 MB") + } + + val imageId = database.generateRandomImageId() + val tempFile = copyUploadToTempFile(imageId, request) + + val filename = getFileName(request) + val extension = filename?.split(".")?.last() + if (!AllowedExtensions.contains(extension)) { + tempFile.delete() + Spark.halt("Invalid file type. Supported types are: ${AllowedExtensions.joinToString()}") + } + database.updateImage(imageId, filename) + + minioClient.putObject("siapics", imageId, tempFile.absolutePath, request.contentType()) + tempFile.delete() + response.redirect("/view/$imageId", 303) + } + + private fun copyUploadToTempFile(imageId: String, request: Request): File { + val tempFile = Files.createTempFile(null, imageId).toFile() + request.attribute("org.eclipse.jetty.multipartConfig", MultipartConfigElement("/tmp")) + request.raw().getPart("uploaded_file").inputStream.use { inputStream -> + tempFile.outputStream().use { outputStream -> + inputStream.copyTo(outputStream) + } + } + return tempFile + } + + /** + * Reads the original filename of the uploaded file. + * + * From https://stackoverflow.com/a/30290614 + */ + private fun getFileName(request: Request): String? { + val part = request.raw().getPart("uploaded_file") + for (cd in part.getHeader("content-disposition").split(";")) { + if (cd.trim({ it <= ' ' }).startsWith("filename")) { + return cd.substring(cd.indexOf('=') + 1).trim({ it <= ' ' }).replace("\"", "") + } + } + return null + } +} diff --git a/server/src/main/resources/index.vm b/server/src/main/resources/index.vm new file mode 100644 index 0000000..9e5132e --- /dev/null +++ b/server/src/main/resources/index.vm @@ -0,0 +1,14 @@ + + + + + test + + + Hello $foo World! +
+ + +
+ + \ No newline at end of file diff --git a/server/src/main/resources/view.vm b/server/src/main/resources/view.vm new file mode 100644 index 0000000..1d9b97d --- /dev/null +++ b/server/src/main/resources/view.vm @@ -0,0 +1,11 @@ + + + + + test + + +

$filename

+ + + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..ad1c86c --- /dev/null +++ b/settings.gradle @@ -0,0 +1,3 @@ +rootProject.name = 'siapics' +include 'server' +