X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=manager%2Fbasic_login.lsp;h=c4488d37936be306457b5baebc1e738728f16763;hb=HEAD;hp=f491a9eee47ead9952defe603dd782c9f6792e76;hpb=4466d2ec250322c1b603d041703259586e213b22;p=rrq%2Fhourglass.git

diff --git a/manager/basic_login.lsp b/manager/basic_login.lsp
index f491a9e..c4488d3 100644
--- a/manager/basic_login.lsp
+++ b/manager/basic_login.lsp
@@ -5,28 +5,31 @@
 ;;
 ;; Its (main-args 0) has a final path component X.cgi that links to
 ;; this file as a packnl embedding that will use that X part of its
-;; name to determine th actual script. That lookup will also use the
-;; "role base" as declared in "roles.txt"
+;; name to determine th actual script.
 
-(write-line 2 (string (date-value) " " (main-args)))
+;(write-line 2 (string (date-value) " " (main-args)))
 (unless (ends-with (main-args 0) ".cgi")
+  (load "siteconfig.lsp")
   (if (exists file? (list (main-args 1)
                           (string (main-args 1) ".lsp")))
       (load $it)
     (write-line 2 (string "Unknown command " (main-args 1))))
   (exit 0))
 
-
 ;; This script is executed in (protected) subdirectory www
 (change-dir "..")
 
+(load "siteconfig.lsp")
+
 ;; Needs an HTTP_AUTHORIZATION environment variable
 (when (empty? (setf AUTH (env "HTTP_AUTHORIZATION")))
+  ;(write-line 2 "needs auth")
   (write-line 1 (read-file "tmpl/unauthorized.http"))
   (exit 0))
 
-;; Must find that value in .htpasswd
-(unless (ref (6 AUTH) (parse (read-file ".htpasswd") "\n"))
+;; Must find that value in wui.passwd
+(constant 'PASSWD SITE:wui.passwd)
+(unless (ref (6 AUTH) (parse (read-file PASSWD) "\n"))
   (write-line 1 (read-file "tmpl/unauthorized.http"))
   (exit 0))
 
@@ -40,11 +43,12 @@
  SCRIPT (role-script)
  )
 (env "REMOTE_USER" REMOTE_USER)
-(env "ROLE" ROLE)
+;(env "ROLE" ROLE)
 
 (unless (file? SCRIPT)
   (write 1 "\nBroken.\n")
   (exit 0))
 
+;(write-line 2 (string (list "script" SCRIPT)))
 (load SCRIPT)
 (exit 0)