diff options
| author | Adam Spragg <adam@spra.gg> | 2018-07-26 15:09:50 +0100 |
|---|---|---|
| committer | Adam Spragg <adam@spra.gg> | 2018-07-26 15:09:50 +0100 |
| commit | f80f775dfbe12cf6b95bda38b73f5dc37327d7fa (patch) | |
| tree | b8f597150176d028da15fdb135e372dbc8b11239 | |
| parent | 4daf6063d86efc8fda2f8286a2474247f62359a3 (diff) | |
Change the "private file" prefix from "@" to "_"
It has all the benefits previously mentioned in commit 2f547251, as well
as mirroring the common programming convention of using a "_" prefix to
identify private variables/functions
Hides files beginning with _ from mod_autoindex listings
As well as 404ing on files starting with "_", also 404 on files starting
with ".", as these are also private. Except for /.well-known/, because
that's... well known, and should be public.
| -rw-r--r-- | apache2.conf | 9 | ||||
| -rw-r--r-- | html/_include.php (renamed from html/@include.php) | 0 | ||||
| -rw-r--r-- | html/about | 2 | ||||
| -rw-r--r-- | html/contact | 2 | ||||
| -rw-r--r-- | html/index.php | 2 | ||||
| -rw-r--r-- | html/privacy | 2 | ||||
| -rw-r--r-- | html/projects/index.php | 2 | ||||
| -rw-r--r-- | rawdog/page.template | 2 |
8 files changed, 13 insertions, 8 deletions
diff --git a/apache2.conf b/apache2.conf index a29a16d..030bac1 100644 --- a/apache2.conf +++ b/apache2.conf @@ -157,9 +157,14 @@ RewriteCond %{LA-U:REQUEST_FILENAME} !-d RewriteRule !\. - [H=application/x-httpd-php] - # Disallow access to files/directories whose names begin with "@", returning a 404. + # Disallow access to files/directories whose names begin with "_" or "." + # (except for /.well-known/), returning a 404. # This makes those files appear to not exist. - RewriteRule "/@" "-" [R=404,L] + RewriteCond "%{REQUEST_URI}" "!^/.well-known/" + RewriteRule "/[_.]" "-" [R=404,L] + + # Do not list files beginning with an underscore in directory listings + IndexIgnore _??* <Location /obs> AuthType Basic diff --git a/html/@include.php b/html/_include.php index 7ce79b0..7ce79b0 100644 --- a/html/@include.php +++ b/html/_include.php @@ -1,4 +1,4 @@ -<?php include '@include.php'; ?><!DOCTYPE html> +<?php include '_include.php'; ?><!DOCTYPE html> <html lang="en"> <head> <?php echo indent(site_head('About - Spragg Software Services Ltd.'), 2); ?> diff --git a/html/contact b/html/contact index 632113a..3938f87 100644 --- a/html/contact +++ b/html/contact @@ -1,4 +1,4 @@ -<?php include '@include.php'; ?><!DOCTYPE html> +<?php include '_include.php'; ?><!DOCTYPE html> <html lang="en"> <head> <?php echo indent(site_head('Contact - Spragg Software Services Ltd.'), 2); ?> diff --git a/html/index.php b/html/index.php index 29e0cfa..488d9ba 100644 --- a/html/index.php +++ b/html/index.php @@ -1,4 +1,4 @@ -<?php include '@include.php'; ?><!DOCTYPE html> +<?php include '_include.php'; ?><!DOCTYPE html> <html lang="en"> <head> <?php echo indent(site_head('Spragg Software Services Ltd.'), 2); ?> diff --git a/html/privacy b/html/privacy index 6d338fd..a04ebd6 100644 --- a/html/privacy +++ b/html/privacy @@ -1,4 +1,4 @@ -<?php include '@include.php'; ?><!DOCTYPE html> +<?php include '_include.php'; ?><!DOCTYPE html> <html lang="en"> <head> <?php echo indent(site_head('Privacy - Spragg Software Services Ltd.'), 2); ?> diff --git a/html/projects/index.php b/html/projects/index.php index b995ccf..f7e5f07 100644 --- a/html/projects/index.php +++ b/html/projects/index.php @@ -1,4 +1,4 @@ -<?php include '../@include.php'; ?><!DOCTYPE html> +<?php include '../_include.php'; ?><!DOCTYPE html> <html lang="en"> <head> <?php echo indent(site_head('Projects - Spragg Software Services Ltd.'), 2); ?> diff --git a/rawdog/page.template b/rawdog/page.template index 050f719..df5e817 100644 --- a/rawdog/page.template +++ b/rawdog/page.template @@ -1,4 +1,4 @@ -<?php include '@include.php'; ?><!DOCTYPE html> +<?php include '_include.php'; ?><!DOCTYPE html> <html lang="en"> <head> <?php echo indent(site_head('Blog - Spragg Software Services Ltd.'), 2); ?> |