Support for base auth + cleanup

Author: essenciary

Project.toml

@@ -1,9 +1,10 @@
 name = "GenieAuthentication"
 uuid = "e115e502-7e3a-11e9-29b2-aba8be6c6778"
 authors = ["Adrian Salceanu <e@essenciary.com>"]
-version = "2.2.0"
+version = "2.3.0"
 
 [deps]
+Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 Genie = "c43c736e-a2d1-11e8-161f-af95117fbd1e"
 GeniePlugins = "07906039-e6ad-44b0-b988-2f2de6a70eec"
 GenieSession = "03cc5b98-4f21-4eb6-99f2-22eced81f962"

files/app/resources/users/Users.jl

@@ -24,7 +24,7 @@ Validation.validator(u::Type{User}) = ModelValidator([
   ValidationRule(:name,     UsersValidator.not_empty)
 ])
 
-function hash_password(password::String)
+function hash_password(password::AbstractString)
   sha256(password) |> bytes2hex
 end
 

files/app/resources/users/UsersValidator.jl

@@ -2,13 +2,13 @@ module UsersValidator
 
 using SearchLight, SearchLight.Validation, SearchLight.QueryBuilder
 
-function not_empty(field::Symbol, m::T, args::Vararg{Any})::ValidationResult where {T<:AbstractModel}
+function not_empty(field::Symbol, m::T)::ValidationResult where {T<:AbstractModel}
   isempty(getfield(m, field)) && return ValidationResult(invalid, :not_empty, "should not be empty")
 
   ValidationResult(valid)
 end
 
-function unique(field::Symbol, m::T, args::Vararg{Any})::ValidationResult where {T<:AbstractModel}
+function unique(field::Symbol, m::T)::ValidationResult where {T<:AbstractModel}
   ispersisted(m) && return ValidationResult(valid) # don't validate updates
 
   if SearchLight.count(typeof(m), where("$field = ?", getfield(m, field))) > 0

src/GenieAuthentication.jl

@@ -8,11 +8,14 @@ import GenieSession, GenieSessionFileSession
 import GeniePlugins
 import SHA
 
+using Base64
+
 export authenticate, deauthenticate, is_authenticated, isauthenticated, get_authentication, authenticated
 export login, logout, with_authentication, without_authentication, @authenticated!, @with_authentication!, authenticated!
 
 const USER_ID_KEY = :__auth_user_id
-
+const PARAMS_USERNAME_KEY = :username
+const PARAMS_PASSWORD_KEY = :password
 
 """
 Stores the user id on the session.
@@ -184,4 +187,35 @@ function install(dest::String; force = false, debug = false) :: Nothing
   nothing
 end
 
+
+function basicauthparams(req, res, params)
+  headers = Dict(req.headers)
+  if haskey(headers, "Authorization")
+    auth = headers["Authorization"]
+    if startswith(auth, "Basic ")
+      try
+        auth = String(base64decode(auth[7:end]))
+        auth = split(auth, ":")
+        params[PARAMS_USERNAME_KEY] = auth[1]
+        params[PARAMS_PASSWORD_KEY] = auth[2]
+      catch _
+      end
+    end
+  end
+
+  req, res, params
+end
+
+
+function isbasicauthrequest(params::Dict = Genie.Requests.payload()) :: Bool
+  haskey(params, PARAMS_USERNAME_KEY) && haskey(params, PARAMS_PASSWORD_KEY)
+end
+
+
+function __init__() :: Nothing
+  GenieAuthentication.basicauthparams in Genie.Router.pre_match_hooks || pushfirst!(Genie.Router.pre_match_hooks, GenieAuthentication.basicauthparams)
+
+  nothing
+end
+
 end