Merge pull request #16 from open-AIMS/fix-auth

Fix auth middleware

Author: ConnectedSystems

sample.config.toml

@@ -2,7 +2,8 @@
 PREPPED_DATA_DIR = "/data"
 
 [server_config]
-CACHE_DIR = "./cache"
+TIFF_CACHE_DIR = "<some location to cache geotiffs>"
+REGIONAL_CACHE_DIR = "<some location to cache regional datasets>"
 DEBUG_MODE = "false"
 COG_THREADS = "2"  # Optional, Number of threads to use when creating COGs (defaults to 1)
 TILE_SIZE = "256"  # Optional, tile block size to use (defaults to 256)

src/Middleware.jl

@@ -40,7 +40,7 @@ function setup_jwt_middleware(config::Dict)
     public_key = jwks_json["keys"][1]["n"]
     rsa_public = JSONWebTokens.RS256(public_key)
 
-    function jwt_auth_middleware(handler)
+    return function jwt_auth_middleware(handler)
         return function(req::HTTP.Request)
             auth_header = HTTP.header(req, "Authorization", "")
             if !startswith(auth_header, "Bearer ")

src/ReefGuideAPI.jl

@@ -183,10 +183,10 @@ function tile_size(config::Dict)::Tuple
     return tile_dims
 end
 
-function get_auth_middleware(config :: Dict)
+function get_auth_router(config::Dict)
     # Setup auth middleware - depends on config.toml - can return identity func
     auth = setup_jwt_middleware(config)
-    return [auth]
+    return router(""; middleware=[auth])
 end
 
 """
@@ -205,35 +205,25 @@ function start_server(config_path)
 
     @info "Parsing configuration from $(config_path)..."
     config = TOML.parsefile(config_path)
-    @info "Successfully parsed configuration."
 
-    # setting up middleware
-    @info "Setting up middleware."
-    auth = get_middleware(config)
-    @info "Done."
+    @info "Setting up auth middleware and router."
+    auth = get_auth_router(config)
 
     @info "Setting up region routes..."
     setup_region_routes(config, auth)
-    @info "Completed region routes setup."
 
     @info "Setting up tile routes..."
     setup_tile_routes(auth)
 
-    @info "Setting up region routes..."
-    setup_region_routes(config)
-    @info "Completed region routes setup."
+    port = 8000
+    @info "Initialisation complete, starting server on port $(port) with $(Threads.nthreads()) threads."
 
-    @info "Setting up tile routes..."
-    setup_tile_routes()
-    @info "Completed tile routes setup."
-
-    @info "Initialisation complete, starting server on port 8000."
-    @info "Starting with $(Threads.nthreads()) threads..."
-    if Threads.nthreads() > 1
-        serveparallel(middleware=[CorsMiddleware], host="0.0.0.0", port=8000)
-    else
-        serve(middleware=[CorsMiddleware], host="0.0.0.0", port=8000)
-    end
+    serve(
+        middleware=[CorsMiddleware],
+        host="0.0.0.0",
+        port=port,
+        parallel=Threads.nthreads() > 1
+    )
 end
 
 export

src/assessment/criteria.jl

@@ -99,8 +99,7 @@ end
 function setup_region_routes(config, auth)
     reg_assess_data = setup_regional_data(config)
 
-    @get("/assess/{reg}/{rtype}", middleware=[auth])
-    function (req::Request, reg::String, rtype::String)
+    @get auth("/assess/{reg}/{rtype}") function (req::Request, reg::String, rtype::String)
         qp = queryparams(req)
         file_id = string(hash(qp))
         mask_temp_path = _cache_location(config)
@@ -155,15 +154,13 @@ function setup_region_routes(config, auth)
         return file(mask_path)
     end
 
-    @get("/bounds/{reg}", middleware=[auth])
-    function (req::Request, reg::String)
+    @get auth("/bounds/{reg}") function (req::Request, reg::String)
         rst_stack = reg_assess_data[reg].stack
 
         return json(Rasters.bounds(rst_stack))
     end
 
-    @get("/tile/{z}/{x}/{y}",middleware=[auth])
-    function (req::Request, z::Int64, x::Int64, y::Int64)
+    @get auth("/tile/{z}/{x}/{y}") function (req::Request, z::Int64, x::Int64, y::Int64)
         # http://127.0.0.1:8000/tile/10/10/10?region=Cairns-Cooktown&rtype=slopes&criteria_names=Depth,Slope,Rugosity&lb=-9.0,0.0,0.0&ub=-2.0,40.0,0.0
         qp = queryparams(req)
         file_id = string(hash(qp))
@@ -262,8 +259,7 @@ function setup_region_routes(config, auth)
     end
 
     # Parse the form data and return it
-    @post("/form", middleware=[auth])
-    function(req)
+    @post auth("/form") function(req)
         data = formdata(req)
         return data
     end

src/assessment/tiles.jl

@@ -157,14 +157,12 @@ function masked_nearest(
 end
 
 function setup_tile_routes(auth)
-    @get("/to-tile/{zoom}/{lon}/{lat}", middleware=[auth])
-    function (req::Request, zoom::Int64, lon::Float64, lat::Float64)
+    @get auth("/to-tile/{zoom}/{lon}/{lat}") function (req::Request, zoom::Int64, lon::Float64, lat::Float64)
         x, y = _lon_lat_to_tile(zoom, lon, lat)
         return json(Dict(:x=>x, :y=>y))
     end
 
-    @get("/to-lonlat/{zoom}/{x}/{y}", middleware=[auth])
-    function (req::Request, zoom::Int64, x::Int64, y::Int64)
+    @get auth("/to-lonlat/{zoom}/{x}/{y}") function (req::Request, zoom::Int64, x::Int64, y::Int64)
         lon_min, lon_max, lat_max, lat_min = _tile_bounds(zoom, x, y)
         return json(
                 Dict(