Mercurial > prosody-modules
annotate misc/systemd/socket-activation.lua @ 5418:f2c7bb3af600
mod_http_oauth2: Add role selector to consent page
List includes all roles available to the user, if more than one.
Defaults to either the first role in the scope string or the users
primary role.
Earlier draft listed all roles, but having options that can't be
selected is bad UX and the entire list of all roles on the server could
be long, and perhaps even sensitive.
Allows e.g. picking a role with fewer permissions than what might
otherwise have been selected.
UX wise, doing this with more checkboxes or possibly radio buttons would
have been confusion and/or looked messier.
Fixes the previous situation where unselecting a role would default to
the primary role, which could be more permissions than requested.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 05 May 2023 01:23:13 +0200 |
| parents | 3296a09b4e57 |
| children |
| rev | line source |
|---|---|
|
2352
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
1 -- Monkeypatch to support socket activation |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
2 -- |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
3 -- Requires LuaSocket after "agnostic" changes merged |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
4 -- |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
5 -- To enable: |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
6 -- RunScript "socket-activation.lua" |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
7 |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
8 local socket = require"socket"; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
9 local tcp_serv_mt = debug.getregistry()["tcp{server}"]; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
10 local socket_bind = socket.bind; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
11 |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
12 local SD_LISTEN_FDS_START = 3; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
13 |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
14 local fds = tonumber(os.getenv"LISTEN_FDS") or 0; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
15 |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
16 if fds < SD_LISTEN_FDS_START then return; end |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
17 |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
18 local servs = {}; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
19 |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
20 for i = 1, fds do |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
21 local serv = socket.tcp(); |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
22 if serv:getfd() >= 0 then |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
23 return; -- This won't work, we will leak the old FD |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
24 end |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
25 debug.setmetatable(serv, tcp_serv_mt); |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
26 serv:setfd(SD_LISTEN_FDS_START + i - 1); |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
27 local ip, port = serv:getsockname(); |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
28 servs [ ip .. ":" .. port ] = serv; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
29 end |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
30 |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
31 function socket.bind( ip, port, backlog ) |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
32 local sock = servs [ ip .. ":" .. port ]; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
33 if sock then |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
34 servs [ ip .. ":" .. port ] = nil; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
35 return sock; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
36 end |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
37 if next(servs) == nil then |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
38 -- my work here is done |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
39 socket.bind = socket_bind; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
40 end |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
41 return socket_bind( ip, port, backlog ); |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
42 end |
