Implement error page

thomasleplus · thomasleplus · commit b17db731eb04 · 2024-05-07T17:30:27.000-04:00
diff --git a/openid-connect-provider-debugger/Dockerfile b/openid-connect-provider-debugger/Dockerfile
@@ -14,14 +14,14 @@ RUN apk update \
  && "luarocks-${LUA_VERSION}" config variables.LUA_INCDIR "${LUA_INCDIR}" \
  && "luarocks-${LUA_VERSION}" install lua-resty-openidc
 
-COPY nginx.conf.patch /usr/local/openresty/nginx/conf/nginx.conf.patch
+COPY nginx.conf.patch /usr/local/openresty/nginx/conf/
 
 RUN patch /usr/local/openresty/nginx/conf/nginx.conf /usr/local/openresty/nginx/conf/nginx.conf.patch \
  && rm -f /usr/local/openresty/nginx/conf/nginx.conf.patch \
  && chmod o+rwx /var/run/openresty
 
-COPY default.conf /etc/nginx/conf.d/default.conf
+COPY default.conf /etc/nginx/conf.d/
 
-COPY index.html /usr/local/openresty/nginx/html/index.html
+COPY index.html error.html /usr/local/openresty/nginx/html/
 
 EXPOSE 80 443
diff --git a/openid-connect-provider-debugger/default.conf b/openid-connect-provider-debugger/default.conf
@@ -2,6 +2,8 @@ access_log /dev/stdout;
 
 lua_capture_error_log 32m;
 
+error_page 500 /error.html;
+
 init_by_lua_block {
   local errlog = require('ngx.errlog')
   local status, err = errlog.set_filter_level(ngx.DEBUG)
@@ -30,12 +32,9 @@ server {
   set $session_check_ua        off;
   set $session_check_scheme    off;
   set $session_check_addr      off;
+  set $session_cookie_secure   on;
   set $session_cookie_samesite None;
 
-  location /favicon.ico {
-    return 204;
-  }
-
   location ~ ^/(debug|login) {
     access_by_lua_block {
       local cjson = require('cjson')
@@ -158,5 +157,9 @@ server {
       ngx.exit(ngx.status)
     }
   }
+
+  location /favicon.ico {
+    return 204;
+  }
   
 }
diff --git a/openid-connect-provider-debugger/error.html b/openid-connect-provider-debugger/error.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Unexpected error</title>
+</head>
+<body>
+  <center><b>An unexpected error occurred, please see console log for details.</b></center>
+</body>
+</html>
