Merge branch 'feature/swagger-api' into develop

Author: ForNeVeR

.gitignore

@@ -12,4 +12,6 @@
 out
 Hyperspace.iml
 
+.nrepl-port
+
 hyperspace-server.*.db

README.md

@@ -11,8 +11,11 @@ Use `lein run client` to run the standalone game client.
 
 ## Game server
 
+### Configuring
+All configuration data is stored in the `config.edn` file.
+
 ### Running
-Use `lein run server [port]` to run game server.
+Use `lein ring server` to run game server.
 
 ### Protocol
 Hyperspace protocol is very simple. All messages are transferred in the JSON format.

config.edn

@@ -0,0 +1,3 @@
+{:database {:url "jdbc:h2:hyperspace-server;DB_CLOSE_DELAY=-1"
+            :user "sa"
+            :password ""}}

project.clj

@@ -1,14 +1,27 @@
 (defproject hyperspace "1.0.0-SNAPSHOT"
   :description "Simple 2D game written in Clojure."
-  :dependencies [[com.googlecode.flyway/flyway-core "2.3"]
+  :dependencies [[azql "0.2.0"]
+                 [clj-liquibase "0.5.2"]
                  [com.h2database/h2 "1.3.173"]
+                 [crypto-password "0.1.3"]
+                 [crypto-random "1.2.0"]
                  [log4j/log4j "1.2.17"]
+                 [metosin/ring-swagger "0.13.0"]
+                 [metosin/compojure-api "0.16.0"]
+                 [metosin/ring-http-response "0.5.0"]
+                 [metosin/ring-swagger-ui "2.0.17"]
                  [midje "1.5.0"]
-                 [org.clojure/clojure "1.5.1"]
+                 [org.clojure/clojure "1.6.0"]
                  [org.clojure/clojure-contrib "1.2.0"]
                  [org.clojure/data.json "0.2.2"]
                  [org.clojure/tools.logging "0.2.3"]
                  [org.clojars.rexim/jinput-platform-natives "2.0.5"]
                  [org.ru.codingteam/lwjgl-platform-natives "2.9.1"]
                  [org.lwjgl.lwjgl/lwjgl "2.9.1"]]
+  :ring {:handler hyperspace.swagger.server/app}
+  :uberjar-name "hyperspace-server.jar"
+  :profiles {:uberjar {:resource-paths ["swagger-ui"]
+                       :aot :all}
+             :dev {:dependencies [[javax.servlet/servlet-api "2.5"]]
+                   :plugins [[lein-ring "0.8.11"]]}}
   :main hyperspace.main)

src/hyperspace/server/config.clj

@@ -0,0 +1,11 @@
+(ns hyperspace.server.config
+  (:import (java.io PushbackReader))
+  (:require [clojure.java.io :as io]))
+
+(defn -from-edn
+  [fname]
+  (with-open [rdr (-> (io/reader fname)
+                      PushbackReader.)]
+    (clojure.edn/read rdr)))
+
+(def config (-from-edn "config.edn"))

src/hyperspace/server/database.clj

@@ -0,0 +1,22 @@
+(ns hyperspace.server.database.datasource
+  (:require [azql.emit :as emit]
+            [azql.dialect :as dialect]
+            [clj-liquibase.cli :as cli]
+            [hyperspace.server.database.migrations :as migrations])
+  (:use [hyperspace.server.config :only [config]])
+  (:import [org.h2.jdbcx JdbcConnectionPool]))
+
+(def datasource
+  (let [{url :url
+         user :user
+         password :password} (:database config)
+        ds (JdbcConnectionPool/create url user password)]
+    (cli/update {:datasource ds
+                 :changelog  migrations/changelog})
+    ds))
+
+(dialect/register-dialect ::h2)
+(defmethod dialect/guess-dialect :h2 [_] ::h2)
+(defmethod emit/quote-name ::h2 [name] (str name))
+
+(def db-spec {:datasource datasource})

src/hyperspace/server/database/datasource.clj

@@ -0,0 +1,14 @@
+(ns hyperspace.server.database.migrations
+  (:require [clj-liquibase.change :as ch])
+  (:use [clj-liquibase.core :only (defchangelog)]))
+
+(def add-users-table ["id=1"
+                      "author=ForNeVeR"
+                      [(ch/create-table :users
+                                        [[:id :int :null false :pk true :autoinc true]
+                                         [:login [:varchar 128] :unique true :null false]
+                                         [:password [:varchar 128] :null false]
+                                         [:session [:varchar 16] :null true :unique true]])
+                       (ch/create-index :users [:login])]])
+
+(defchangelog changelog "hyperspace-server" [add-users-table])

src/hyperspace/server/database/migrations.clj

@@ -0,0 +1,32 @@
+(ns hyperspace.server.database.user
+  (:import (java.util UUID))
+  (:require [crypto.password.scrypt :as password]
+            [crypto.random :as random])
+  (:use [azql.core]
+        [hyperspace.server.database.datasource :only [db-spec]]))
+
+(defn create [{login :login password :password}]
+  (insert! db-spec :users
+           (values [{:login    login
+                     :password (password/encrypt password)}])))
+
+(defn- generate-session []
+  ;; 8 random bytes = 16 hex digits should be enough for duplicates to be almost impossible with probability of about
+  ;; 10^-12
+  (random/hex 8))
+
+(defn login [{login :login password :password}]
+  (with-connection [c db-spec]
+    (transaction c
+      (let [user (fetch-one c
+                   (select (fields [:login :password])
+                           (from :u :users)
+                           (where (= :u.login login))))
+            user-id (:id user)]
+        (if (password/check password (:password user))
+          (let [session (generate-session)]
+            (update! c :users
+              (setf :session session)
+              (where (= :id user-id)))
+            session)
+          nil)))))