Browse Source

Trivial improvement to print message

Marcos Kirsch 8 years ago
parent
commit
37e58389c6
1 changed files with 7 additions and 5 deletions
  1. 7 5
      httpserver-basicauth.lua

+ 7 - 5
httpserver-basicauth.lua

@@ -4,11 +4,11 @@
 
 basicAuth = {}
 
+-- Parse basic auth http header.
+-- Returns the username if header contains valid credentials,
+-- nil otherwise.
 function basicAuth.authenticate(header)
-   conf = dofile("httpserver-conf.lc")
-   -- Parse basic auth http header.
-   -- Returns the username if header contains valid credentials,
-   -- nil otherwise.
+   local conf = dofile("httpserver-conf.lc")
    local credentials_enc = header:match("Authorization: Basic ([A-Za-z0-9+/=]+)")
    if not credentials_enc then
       return nil
@@ -16,13 +16,15 @@ function basicAuth.authenticate(header)
    local credentials = dofile("httpserver-b64decode.lc")(credentials_enc)
    local user, pwd = credentials:match("^(.*):(.*)$")
    if user ~= conf.auth.user or pwd ~= conf.auth.password then
+      print("httpserver-basicauth: User \"" .. user .. "\": Access denied.")
       return nil
    end
-   print("httpserver-basicauth: User \"" .. user .. "\" authenticated.")
+   print("httpserver-basicauth: User \"" .. user .. "\": Authenticated.")
    return user
 end
 
 function basicAuth.authErrorHeader()
+   local conf = dofile("httpserver-conf.lc")
    return "WWW-Authenticate: Basic realm=\"" .. conf.auth.realm .. "\""
 end