better error handling for oauth

restructure route handlers

project.clj

@@ -4,14 +4,16 @@
                                         ;:url "http://example.com/FIXME"
 
   :dependencies [[buddy "2.0.0"]
-                 [com.cemerick/friend "0.2.3"]
                  [cheshire "5.8.1"]
                  [clj-oauth "1.5.5"]
                  [clojure.java-time "0.3.2"]
+                 [com.cemerick/friend "0.2.3"]
                  [com.cognitect/transit-clj "0.8.313"]
+                 [com.google.protobuf/protobuf-java "3.6.1"]
                  [compojure "1.6.1"]
                  [conman "0.8.3"]
                  [cprop "0.1.13"]
+                 [funcool/promesa "1.9.0"]
                  [funcool/struct "1.3.0"]
                  [luminus-immutant "0.2.4"]
                  [luminus-migrations "0.6.3"]
@@ -20,16 +22,15 @@
                  [markdown-clj "1.0.5"]
                  [metosin/muuntaja "0.6.3"]
                  [metosin/ring-http-response "0.9.1"]
-                 [slingshot "0.12.1"]
+                 [metosin/vega-tools "0.2.0"]
                  [mount "0.1.15"]
+                 [mysql/mysql-connector-java "8.0.12"]
                  [nrepl "0.5.3"]
                  [org.clojure/clojure "1.10.0"]
                  [org.clojure/clojurescript "1.10.439" :scope "provided"]
                  [org.clojure/tools.cli "0.4.1"]
                  [org.clojure/tools.logging "0.4.1"]
                                         ;[org.postgresql/postgresql "42.2.5"]
-                 [mysql/mysql-connector-java "8.0.12"]
-                 [com.google.protobuf/protobuf-java "3.6.1"]
                                         ;https://www.webjars.org/
                  [org.webjars.npm/bulma "0.7.2"]
                  [org.webjars/font-awesome "5.6.1"]
@@ -38,8 +39,7 @@
                  [ring/ring-core "1.7.1"]
                  [ring/ring-defaults "0.3.2"]
                  [selmer "1.12.5"]
-                 [metosin/vega-tools "0.2.0"]
+                 [slingshot "0.12.1"]]
-                 [funcool/promesa "1.9.0"]]
 
 
 

src/clj/cat/handler.clj

@@ -2,18 +2,30 @@
   (:require [cat.middleware :as middleware]
             [cat.layout :refer [error-page]]
             [cat.routes.home :refer [home-routes]]
-            [cat.routes.oauth :refer [oauth-routes]]
+            [cat.routes.oauth :refer [oauth-init oauth-callback clear-session!]]
-            [cat.routes.admin :refer [admin-routes]]
+            [cat.routes.admin :refer [set-admin! create-new-relation! create-user!]]
-            [compojure.core :refer [routes wrap-routes]]
+            [compojure.core :refer [routes defroutes GET POST wrap-routes]]
             [ring.util.http-response :as response]
             [compojure.route :as route]
             [cat.env :refer [defaults]]
+            [clojure.tools.logging :as log]
             [mount.core :as mount]))
 
 (mount/defstate init-app
   :start ((or (:init defaults) identity))
   :stop ((or (:stop defaults) identity)))
 
+(defroutes oauth-routes
+  (GET "/oauth/oauth-init" req (oauth-init req))
+  (GET "/oauth/oauth-callback" req (oauth-callback req))
+  (GET "/logout" req (clear-session! "/")))
+
+(defroutes admin-routes
+  (GET "/admin/enable" req (set-admin! req true))
+  (GET "/admin/disable" req (set-admin! req false))
+  (POST "/relations" req (create-new-relation! req))
+  (POST "/users" req (create-user! req)))
+
 (mount/defstate app
   :start
   (middleware/wrap-base

src/clj/cat/moauth.clj

@@ -12,11 +12,11 @@
    :client-secret    (env :oauth-consumer-secret)
    :authorize-uri    (env :authorize-uri)
    :redirect-uri     (str (env :app-host) "/oauth/oauth-callback")
-   :access-token-uri (env :access-token-uri)
+   :access-token-uri (env :access-token-uri)})
-   })
 
 ; To authorize, redirect the user to the sign in / grant page
 
+
 (defn- authorize-uri
   [client-params #_csrf-token]
   (str
@@ -51,20 +51,21 @@
       (do
         (log/debug "Requesting access token with code " code)
         (let [oauth2-params (oauth2-params)
-              access-token (httpclient/post (:access-token-uri oauth2-params)
+              resp (httpclient/post (:access-token-uri oauth2-params)
                                             {:form-params {:code          code
                                                            :grant_type    "authorization_code"
                                                            :client_id     (:client-id oauth2-params)
                                                            :client_secret (:client-secret oauth2-params)
                                                            :redirect_uri  (:redirect-uri oauth2-params)}
-                                             ;:basic-auth  [(:client-id oauth2-params) (:client-secret oauth2-params)]
                                              :as          :json
-                                             :insecure? true
+                                             :throw-exceptions false
-                                             })]
+                                             :insecure? true})]
-          (log/debug "Access token response:" access-token)
+          (condp = (:status resp)
-          (:body access-token)))
+            200 (:body resp)
-      (catch Exception e (log/error "Something terrible happened..." e)))
+            401 (-> {:status 401 :body "Invalid authentication credentials"})
-    nil))
+            {:status 500 :body "Something went pear-shape when trying to authenticate"})))
+      )
+    (log/info "Invalid csrf token whilst authenticating")))
 
 (defn get-user-info
   "User info API call"
@@ -73,10 +74,11 @@
     (-> (httpclient/get url {:oauth-token access-token
                              :as          :json
                              :insecure? true})
-        :body)
+        :body)))
-    ))
 
 ; Refresh token when it expires
+
+
 (defn- refresh-tokens
   "Request a new token pair"
   [refresh-token]

src/clj/cat/routes/admin.clj

@@ -1,6 +1,5 @@
 (ns cat.routes.admin
   (:require [cat.db.core :refer [*db*] :as db]
-            [compojure.core :refer [defroutes GET POST]]
             [struct.core :as st]
             [clojure.tools.logging :as log]
             [ring.util.http-response :as response]))
@@ -13,29 +12,28 @@
   [[:from_id st/required st/integer-str]
    [:to_id st/required st/integer-str]])
 
-(defroutes admin-routes
+(defn set-admin! [req enabled?]
-           (GET "/admin/enable" req (-> (response/found "/")
+  (-> (response/found "/")
-                                        (assoc :session (assoc-in (:session req) [:user :admin :enabled] true))))
+      (assoc :session (assoc-in (:session req) [:user :admin :enabled] enabled?))))
-           (GET "/admin/disable" req (-> (response/found "/")
-                                         (assoc :session (assoc-in (:session req) [:user :admin :enabled] false))))
 
-           (POST "/relations" req
+(defn create-new-relation! [req]
-                 (let [data (:params req) [err result] (st/validate data relation-schema)]
+  (let [data (:params req)
-                   (log/info "Post to " (:uri req))
+        [err result] (st/validate data relation-schema)]
     (if (nil? err)
       (do
+        (log/info "Admin creates relation from " (:from_id data) "to" (:to_id data))
         (db/create-relation! result)
         (response/found "/"))
       (do
         (response/bad-request "Incorrect input")))))
-           (POST "/users" req
+
+(defn create-user! [req]
   (let [data (:params req)]
-                   (log/info "Post to " (:uri req))
     (println data)
     (if (st/valid? data user-schema)
       (do
+        (log/info "Admin creates user: " (:name data))
         (db/create-user! (assoc data :zeusid nil))
         (response/found "/"))
       (do
         (response/bad-request "Incorrect input")))))
-           )

src/clj/cat/routes/oauth.clj

@@ -29,7 +29,7 @@
       (assoc :session nil)))
 
 (defn oauth-init
-  "Initiates the Twitter OAuth"
+  "Initiates the OAuth"
   [request]
   (let [reee (mo/authorize-api-uri)]
     (log/debug "authorize uri: " reee)
@@ -40,13 +40,14 @@
   "Handles the callback from adams with the access_token
    Fetches the user from the database, creating a new one if not found
    Sets the user in the session and redirects back to origin \"/\" "
-  [req_token {:keys [params session]}]
+
+  [{:keys [params session]}]
   ; oauth request was denied by user
   (if (:denied params)
     (-> (found "/")
         (assoc :flash {:denied true}))
     ; fetch the request token and do anything else you wanna do if not denied.
-    (let [{:keys [access_token refresh_token]} (mo/get-authentication-response nil req_token)
+    (let [{:keys [access_token refresh_token]} (mo/get-authentication-response nil params)
           fetched-user (mo/get-user-info access_token)
           local-user (db/get-zeus-user {:zeusid (:id fetched-user)})]
       (if local-user
@@ -78,7 +79,3 @@
 ;      401 (println error))))
 
 
-(defroutes oauth-routes
-  (GET "/oauth/oauth-init" req (oauth-init req))
-  (GET "/oauth/oauth-callback" [& req_token :as req] (oauth-callback req_token req))
-  (GET "/logout" req (clear-session! "/")))