Skip to content

Fix incorrect regex for files in errors/ and return 404 for index.php #5149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
colinmollenhour wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix incorrect regex for files in errors/ and return 404 for index.php #5149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev/openmage/nginx-admin.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ server {
}
location /errors/ {
root /var/www/html;
location ~* \.(!(css|jpg|jpeg|gif|png|ico|webp))$ { return 404; }
location ~* \.(?!(css|jpg|jpeg|gif|png|ico|webp)$)[a-z]+$ { return 404; }
}
location /api/ {
rewrite ^/api/(.+?)/(.+)$ /api.php?type=$1&$args last;
Expand Down
5 changes: 3 additions & 2 deletions dev/openmage/nginx-frontend.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,13 @@ server {
}
location /errors/ {
root /var/www/html;
location ~* \.(!(css|jpg|jpeg|gif|png|ico|webp))$ { return 404; }
location ~* \.(?!(css|jpg|jpeg|gif|png|ico|webp)$)[a-z]+$ { return 404; }
}

# Non-rewritten URLs, Admin and API are disabled for frontend
location /index.php/ { return 404; }
location ~ ^/admin(?:/(.*))?$ { return 404; }
location /api/ { return 404; }
location /api.php { return 404; }

# Clients use the frontend to call API
#location /api {
Expand All @@ -166,8 +165,10 @@ server {
location ~ /\. { return 404; }

# Ignore the files that are needed only for Apache
location = /api.php { return 404; }
location = /get.php { return 404; }
location = /install.php { return 404; }
location = /index.php { return 404; }

# Custom error handlers
error_page 404 = @php-404;
Expand Down