Software /
code /
verse
Annotate
squishy @ 498:50d0bd035bb7
util.sasl.oauthbearer: Don't send authzid
It's not needed and not recommended in XMPP unless we want to act as
someone other than who we authenticate as. We find out the JID during
resource binding.
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Fri, 23 Jun 2023 12:09:49 +0200 |
parent | 497:eb86e3751978 |
child | 500:674daff6c73b |
rev | line source |
---|---|
26 | 1 Output "verse.lua" |
0 | 2 |
491
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
3 local VerseModule = Module |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
4 local function ProsodyModule(s) |
493 | 5 return VerseModule("prosody." .. s) |
158
068176069dfa
squishy: Add --prosody option to specify a path to a Prosody checkout to use when squishing
Matthew Wild <mwild1@gmail.com>
parents:
157
diff
changeset
|
6 end |
0 | 7 |
491
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
8 function ProsodyModules() |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
9 local Module = ProsodyModule; |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
10 |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
11 -- Prosody libraries |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
12 if not GetOption("prosody") then |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
13 AutoFetchURL "http://hg.prosody.im/0.10/raw-file/tip/?" |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
14 else |
493 | 15 AutoFetchURL(GetOption("prosody") .. "/?") |
491
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
16 end |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
17 |
493 | 18 Module "util.sha1" "util/sha1.lua" |
19 Module "util.bit" "libs/bit.lua" | |
486
6416ea3fff86
Fix sha1 support when no binary dependencies available
Matthew Wild <mwild1@gmail.com>
parents:
482
diff
changeset
|
20 |
493 | 21 Module "util.stanza" "util/stanza.lua" |
22 Module "util.timer" "util/timer.lua" | |
23 Module "util.termcolours" "util/termcolours.lua" | |
24 Module "util.uuid" "util/uuid.lua" | |
491
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
25 Module "util.time" "libs/time.lua" |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
26 Module "util.envload" "util/envload.lua" |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
27 Module "util.id" "util/id.lua" |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
28 Module "util.serialization" "util/serialization.lua" |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
29 Module "util.indexedbheap" "util/indexedbheap.lua" |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
30 Module "util.xpcall" "util/xpcall.lua" |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
31 Module "util.array" "util/array.lua" |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
32 Module "util.format" "util/format.lua" |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
33 Module "util.promise" "util/promise.lua" |
493 | 34 Module "net.adns" "net/unbound.lua" |
491
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
35 Module "util.dns" "util/dns.lua" |
493 | 36 Module "net.server_select" "net/server_select.lua" |
37 Module "util.xmppstream" "util/xmppstream.lua" | |
38 Module "util.jid" "util/jid.lua" | |
39 Module "util.events" "util/events.lua" | |
40 Module "util.dataforms" "util/dataforms.lua" | |
41 Module "util.caps" "util/caps.lua" | |
42 Module "util.logger" "util/logger.lua" | |
43 Module "util.datetime" "util/datetime.lua" | |
44 Module "util.json" "util/json.lua" | |
45 Module "util.xml" "util/xml.lua" | |
46 Module "util.rsm" "util/rsm.lua" | |
47 Module "util.random" "util/random.lua" | |
48 Module "util.ip" "util/ip.lua" | |
491
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
49 Module "util.hex" "util/hex.lua" |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
50 Module "util.net" "libs/net.lua" |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
51 Module "util.sslconfig" "util/sslconfig.lua" |
493 | 52 Module "util.paths" "util/paths.lua" |
491
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
53 Module "util.mathcompat" "util/mathcompat.lua" |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
54 Module "util.dnsregistry" "util/dnsregistry.lua" |
493 | 55 Module "net.tls_luasec" "net/tls_luasec.lua" |
116
151c8cc776df
verse.plugins.adhoc: XEP-0050 Ad-hoc commands plugin
Matthew Wild <mwild1@gmail.com>
parents:
114
diff
changeset
|
56 |
491
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
57 Module "util.http" "util/http.lua" |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
58 Module "net.http.parser" "net/http/parser.lua" |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
59 Module "net.http" "net/http.lua" |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
60 Module "util.x509" "util/x509.lua" |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
61 |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
62 if GetOption "internal-bit-module" then |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
63 Module "bit" "libs/bit.lua" |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
64 end |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
65 end |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
66 |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
67 ProsodyModules() |
357 | 68 |
14 | 69 -- Verse plugins |
233
b5fd3292bdbd
squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents:
227
diff
changeset
|
70 plugins = { |
b5fd3292bdbd
squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents:
227
diff
changeset
|
71 -- Login |
493 | 72 "tls"; |
73 "sasl"; | |
74 "bind"; -- "session", "legacy", "compression"; | |
233
b5fd3292bdbd
squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents:
227
diff
changeset
|
75 -- Reliability |
493 | 76 "smacks"; |
77 "keepalive"; | |
233
b5fd3292bdbd
squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents:
227
diff
changeset
|
78 -- Queries |
493 | 79 "disco"; |
80 "version"; | |
81 "ping"; | |
82 "uptime"; | |
83 "time"; | |
233
b5fd3292bdbd
squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents:
227
diff
changeset
|
84 -- Privacy control |
b5fd3292bdbd
squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents:
227
diff
changeset
|
85 "blocking"; |
b5fd3292bdbd
squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents:
227
diff
changeset
|
86 -- Jingle / file transfer |
493 | 87 "jingle"; |
88 "jingle_ft"; | |
89 "jingle_s5b"; | |
90 "proxy65"; | |
91 "jingle_ibb"; | |
233
b5fd3292bdbd
squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents:
227
diff
changeset
|
92 -- Pubsub |
493 | 93 "pubsub"; |
94 "pep"; | |
233
b5fd3292bdbd
squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents:
227
diff
changeset
|
95 -- Command and control |
b5fd3292bdbd
squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents:
227
diff
changeset
|
96 "adhoc"; |
b5fd3292bdbd
squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents:
227
diff
changeset
|
97 -- Basics |
493 | 98 "presence"; |
99 "private"; | |
100 "roster"; | |
101 "register"; | |
233
b5fd3292bdbd
squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents:
227
diff
changeset
|
102 -- MUC |
b5fd3292bdbd
squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents:
227
diff
changeset
|
103 "groupchat"; |
b5fd3292bdbd
squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents:
227
diff
changeset
|
104 -- vCard |
493 | 105 "vcard"; |
106 "vcard_update"; | |
233
b5fd3292bdbd
squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents:
227
diff
changeset
|
107 -- Carbons |
b5fd3292bdbd
squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents:
227
diff
changeset
|
108 "carbons"; |
273
c5b7a4c717a6
plugins.archive: Experimental implementation of the Message Archive Management ProtoXEP
Kim Alvefur <zash@zash.se>
parents:
238
diff
changeset
|
109 |
c5b7a4c717a6
plugins.archive: Experimental implementation of the Message Archive Management ProtoXEP
Kim Alvefur <zash@zash.se>
parents:
238
diff
changeset
|
110 "archive"; |
481
6fc84e9bd03e
squishy: Add browsing plugin
Matthew Wild <mwild1@gmail.com>
parents:
480
diff
changeset
|
111 "browsing"; |
233
b5fd3292bdbd
squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents:
227
diff
changeset
|
112 } |
b5fd3292bdbd
squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents:
227
diff
changeset
|
113 |
b5fd3292bdbd
squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents:
227
diff
changeset
|
114 for _, plugin in ipairs(plugins) do |
493 | 115 VerseModule("verse.plugins." .. plugin)("plugins/" .. plugin .. ".lua") |
134
2101acbb27c4
squishy: Use --internal-bit-module to squish with the pure-Lua bit library
Matthew Wild <mwild1@gmail.com>
parents:
131
diff
changeset
|
116 end |
2101acbb27c4
squishy: Use --internal-bit-module to squish with the pure-Lua bit library
Matthew Wild <mwild1@gmail.com>
parents:
131
diff
changeset
|
117 |
495
1ca531495c3d
squishy: Move some compat layers into verse namespace
Kim Alvefur <zash@zash.se>
parents:
493
diff
changeset
|
118 -- Verse-specific versions of libraries |
1ca531495c3d
squishy: Move some compat layers into verse namespace
Kim Alvefur <zash@zash.se>
parents:
493
diff
changeset
|
119 VerseModule "verse.util.adhoc" "libs/adhoc.lib.lua" |
1ca531495c3d
squishy: Move some compat layers into verse namespace
Kim Alvefur <zash@zash.se>
parents:
493
diff
changeset
|
120 VerseModule "verse.util.encodings" "libs/encodings.lua" |
1ca531495c3d
squishy: Move some compat layers into verse namespace
Kim Alvefur <zash@zash.se>
parents:
493
diff
changeset
|
121 VerseModule "verse.util.hashes" "libs/hashes.lua" |
1ca531495c3d
squishy: Move some compat layers into verse namespace
Kim Alvefur <zash@zash.se>
parents:
493
diff
changeset
|
122 VerseModule "verse.util.table" "libs/table.lua" |
497
eb86e3751978
util.vcard: Move into verse namespace since it's removed from Prosody
Kim Alvefur <zash@zash.se>
parents:
495
diff
changeset
|
123 VerseModule "verse.util.vcard" "util/vcard.lua" |
495
1ca531495c3d
squishy: Move some compat layers into verse namespace
Kim Alvefur <zash@zash.se>
parents:
493
diff
changeset
|
124 |
492
22844ac3be4e
server: Import one of Prosodys net.server implementations
Kim Alvefur <zash@zash.se>
parents:
491
diff
changeset
|
125 VerseModule "verse.server" "server.lua" |
22844ac3be4e
server: Import one of Prosodys net.server implementations
Kim Alvefur <zash@zash.se>
parents:
491
diff
changeset
|
126 |
491
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
127 -- SASL client mechanisms |
493 | 128 VerseModule "verse.util.sasl.scram" "util/sasl/scram.lua" |
129 VerseModule "verse.util.sasl.plain" "util/sasl/plain.lua" | |
130 VerseModule "verse.util.sasl.anonymous" "util/sasl/anonymous.lua" | |
491
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
131 VerseModule "verse.util.sasl.oauthbearer" "util/sasl/oauthbearer.lua" |
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
132 |
493 | 133 VerseModule "verse.client" "client.lua" |
491
edf078a58f25
squishy: Update for prosody.* namespace
Matthew Wild <mwild1@gmail.com>
parents:
490
diff
changeset
|
134 VerseModule "verse.component" "component.lua" |
493 | 135 VerseModule "verse.bosh" "bosh.lua" |
0 | 136 |
137 -- Main verse file | |
138 Main "init.lua" |