Send the filename as URI from the module

Most of our existing authorizations are done by full file path. We do use URIs for some, but we'll add another test scenario for that.
mlibrary · Dec 7, 2023 · 703e07d · 703e07d
1 parent 58fcf5d
commit 703e07d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/apache/module/mod_lauth.cpp b/apache/module/mod_lauth.cpp
@@ -40,7 +40,7 @@ static authz_status lauth_check_authorization(request_rec *r,
 
     Request req {
       .ip = r->useragent_ip ? std::string(r->useragent_ip) : "",
-      .uri = r->uri ? std::string(r->uri) : "",
+      .uri = r->filename ? std::string(r->filename) : "",
       .user = r->user ? std::string(r->user) : ""
     };
 

diff --git a/db/test-fixture.sql b/db/test-fixture.sql
@@ -24,17 +24,17 @@ INSERT INTO aa_coll VALUES(
 
 INSERT INTO aa_coll_obj VALUES(
   'www.lauth.local', -- server hostname, not vhost
-  '/restricted-by-username%', -- dlpsPath (URL as Apache sees it for <Location>)
+  '/lauth/test-site/web/restricted-by-username%', -- dlpsPath (path on disk, for Apache <Directory>)
   'lauth-by-username', -- coll.uniqueIdentifier
   CURRENT_TIMESTAMP, 'root', -- modified info
   'f' -- deleted
 );
 
--- Add a test case for full local file path via <Directory>
+-- Our "proxied" tests will covered URI-based locations
 ------------- !!!! -----------------
 -- INSERT INTO aa_coll_obj VALUES(
 --   'www.lauth.local', -- server hostname, not vhost
---   '/lauth/test-site/web/restricted-by-username%', -- dlpsPath (path on disk, for Apache <Directory>)
+--   '/restricted-by-username%', -- dlpsPath (URL as Apache sees it for <Location>)
 --   'lauth-by-username', -- coll.uniqueIdentifier
 --   CURRENT_TIMESTAMP, 'root', -- modified info
 --   'f' -- deleted