Software `/` code `/` prosody

Annotate

plugins/mod_http_errors.lua @ 10419:3b9d17c234df

Back out c8aa66595072: Extra changes accidentally included

author	Kim Alvefur <zash@zash.se>
date	Sun, 17 Nov 2019 23:45:44 +0100
parent	9760:88640b3ea6b8
child	10430:46dd9df2db0c

rev	line source
4711 4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	1 module:set_global();
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	2
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	3 local server = require "net.http.server";
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	4 local codes = require "net.http.codes";
8364 f91ab40a3105 mod_http_errors: Use util.interpolation to render HTML template Kim Alvefur <zash@zash.se> parents: 8363 diff changeset	5 local xml_escape = require "util.stanza".xml_escape;
f91ab40a3105 mod_http_errors: Use util.interpolation to render HTML template Kim Alvefur <zash@zash.se> parents: 8363 diff changeset	6 local render = require "util.interpolation".new("%b{}", xml_escape);
4711 4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	7
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	8 local show_private = module:get_option_boolean("http_errors_detailed", false);
4737 7b9e2a8c4710 mod_http_errors: Add two new config options, http_errors_always_show (show even for unknown errors) and http_errors_default_message (message for unknown errors) Matthew Wild <mwild1@gmail.com> parents: 4711 diff changeset	9 local always_serve = module:get_option_boolean("http_errors_always_show", true);
7b9e2a8c4710 mod_http_errors: Add two new config options, http_errors_always_show (show even for unknown errors) and http_errors_default_message (message for unknown errors) Matthew Wild <mwild1@gmail.com> parents: 4711 diff changeset	10 local default_message = { module:get_option_string("http_errors_default_message", "That's all I know.") };
4711 4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	11 local default_messages = {
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	12 [400] = { "What kind of request do you call that??" };
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	13 [403] = { "You're not allowed to do that." };
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	14 [404] = { "Whatever you were looking for is not here. %";
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	15 "Where did you put it?", "It's behind you.", "Keep looking." };
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	16 [500] = { "% Check your error log for more info.";
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	17 "Gremlins.", "It broke.", "Don't look at me." };
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	18 };
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	19
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	20 local messages = setmetatable(module:get_option("http_errors_messages", {}), { __index = default_messages });
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	21
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	22 local html = [[
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	23 <!DOCTYPE html>
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	24 <html>
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	25 <head>
8364 f91ab40a3105 mod_http_errors: Use util.interpolation to render HTML template Kim Alvefur <zash@zash.se> parents: 8363 diff changeset	26 <meta charset="utf-8">
f91ab40a3105 mod_http_errors: Use util.interpolation to render HTML template Kim Alvefur <zash@zash.se> parents: 8363 diff changeset	27 <title>{title}</title>
f91ab40a3105 mod_http_errors: Use util.interpolation to render HTML template Kim Alvefur <zash@zash.se> parents: 8363 diff changeset	28 <style>
9760 88640b3ea6b8 mod_http_errors: Normalize CSS Kim Alvefur <zash@zash.se> parents: 8364 diff changeset	29 body {
88640b3ea6b8 mod_http_errors: Normalize CSS Kim Alvefur <zash@zash.se> parents: 8364 diff changeset	30 margin-top : 14%;
88640b3ea6b8 mod_http_errors: Normalize CSS Kim Alvefur <zash@zash.se> parents: 8364 diff changeset	31 text-align : center;
88640b3ea6b8 mod_http_errors: Normalize CSS Kim Alvefur <zash@zash.se> parents: 8364 diff changeset	32 background-color : #F8F8F8;
88640b3ea6b8 mod_http_errors: Normalize CSS Kim Alvefur <zash@zash.se> parents: 8364 diff changeset	33 font-family : sans-serif
8364 f91ab40a3105 mod_http_errors: Use util.interpolation to render HTML template Kim Alvefur <zash@zash.se> parents: 8363 diff changeset	34 }
9760 88640b3ea6b8 mod_http_errors: Normalize CSS Kim Alvefur <zash@zash.se> parents: 8364 diff changeset	35
88640b3ea6b8 mod_http_errors: Normalize CSS Kim Alvefur <zash@zash.se> parents: 8364 diff changeset	36 h1 {
88640b3ea6b8 mod_http_errors: Normalize CSS Kim Alvefur <zash@zash.se> parents: 8364 diff changeset	37 font-size : xx-large
8364 f91ab40a3105 mod_http_errors: Use util.interpolation to render HTML template Kim Alvefur <zash@zash.se> parents: 8363 diff changeset	38 }
9760 88640b3ea6b8 mod_http_errors: Normalize CSS Kim Alvefur <zash@zash.se> parents: 8364 diff changeset	39
88640b3ea6b8 mod_http_errors: Normalize CSS Kim Alvefur <zash@zash.se> parents: 8364 diff changeset	40 p {
88640b3ea6b8 mod_http_errors: Normalize CSS Kim Alvefur <zash@zash.se> parents: 8364 diff changeset	41 font-size : x-large
8364 f91ab40a3105 mod_http_errors: Use util.interpolation to render HTML template Kim Alvefur <zash@zash.se> parents: 8363 diff changeset	42 }
9760 88640b3ea6b8 mod_http_errors: Normalize CSS Kim Alvefur <zash@zash.se> parents: 8364 diff changeset	43
8364 f91ab40a3105 mod_http_errors: Use util.interpolation to render HTML template Kim Alvefur <zash@zash.se> parents: 8363 diff changeset	44 p+p {
9760 88640b3ea6b8 mod_http_errors: Normalize CSS Kim Alvefur <zash@zash.se> parents: 8364 diff changeset	45 font-size : large;
88640b3ea6b8 mod_http_errors: Normalize CSS Kim Alvefur <zash@zash.se> parents: 8364 diff changeset	46 font-family : courier
8364 f91ab40a3105 mod_http_errors: Use util.interpolation to render HTML template Kim Alvefur <zash@zash.se> parents: 8363 diff changeset	47 }
f91ab40a3105 mod_http_errors: Use util.interpolation to render HTML template Kim Alvefur <zash@zash.se> parents: 8363 diff changeset	48 </style>
4711 4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	49 </head>
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	50 <body>
8364 f91ab40a3105 mod_http_errors: Use util.interpolation to render HTML template Kim Alvefur <zash@zash.se> parents: 8363 diff changeset	51 <h1>{title}</h1>
f91ab40a3105 mod_http_errors: Use util.interpolation to render HTML template Kim Alvefur <zash@zash.se> parents: 8363 diff changeset	52 <p>{message}</p>
f91ab40a3105 mod_http_errors: Use util.interpolation to render HTML template Kim Alvefur <zash@zash.se> parents: 8363 diff changeset	53 <p>{extra?}</p>
4711 4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	54 </body>
7492 9a749cf8c1ba mod_http_errors: Add a newline after end of HTML Kim Alvefur <zash@zash.se> parents: 5776 diff changeset	55 </html>
9a749cf8c1ba mod_http_errors: Add a newline after end of HTML Kim Alvefur <zash@zash.se> parents: 5776 diff changeset	56 ]];
4711 4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	57
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	58 local function get_page(code, extra)
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	59 local message = messages[code];
4737 7b9e2a8c4710 mod_http_errors: Add two new config options, http_errors_always_show (show even for unknown errors) and http_errors_default_message (message for unknown errors) Matthew Wild <mwild1@gmail.com> parents: 4711 diff changeset	60 if always_serve or message then
7b9e2a8c4710 mod_http_errors: Add two new config options, http_errors_always_show (show even for unknown errors) and http_errors_default_message (message for unknown errors) Matthew Wild <mwild1@gmail.com> parents: 4711 diff changeset	61 message = message or default_message;
8364 f91ab40a3105 mod_http_errors: Use util.interpolation to render HTML template Kim Alvefur <zash@zash.se> parents: 8363 diff changeset	62 return render(html, {
4711 4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	63 title = rawget(codes, code) or ("Code "..tostring(code));
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	64 message = message[1]:gsub("%%", function ()
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	65 return message[math.random(2, math.max(#message,2))];
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	66 end);
8364 f91ab40a3105 mod_http_errors: Use util.interpolation to render HTML template Kim Alvefur <zash@zash.se> parents: 8363 diff changeset	67 extra = extra;
f91ab40a3105 mod_http_errors: Use util.interpolation to render HTML template Kim Alvefur <zash@zash.se> parents: 8363 diff changeset	68 });
4711 4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	69 end
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	70 end
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	71
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	72 module:hook_object_event(server, "http-error", function (event)
8363 e2460edc2a2f mod_http_errors: Set Content-Type header to HTML (fixes #1030) Kim Alvefur <zash@zash.se> parents: 7492 diff changeset	73 if event.response then
e2460edc2a2f mod_http_errors: Set Content-Type header to HTML (fixes #1030) Kim Alvefur <zash@zash.se> parents: 7492 diff changeset	74 event.response.headers.content_type = "text/html; charset=utf-8";
e2460edc2a2f mod_http_errors: Set Content-Type header to HTML (fixes #1030) Kim Alvefur <zash@zash.se> parents: 7492 diff changeset	75 end
4711 4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	76 return get_page(event.code, (show_private and event.private_message) or event.message);
4ddf3ba0c749 mod_http_errors: Module to handle HTTP errors with a HTML page Matthew Wild <mwild1@gmail.com> parents: diff changeset	77 end);

prosody

3b9d17c234df

plugins/mod_http_errors.lua

Software / code / prosody

Annotate

plugins/mod_http_errors.lua @ 10419:3b9d17c234df

Software `/` code `/` prosody