diff options
| author | Matthew Wild <mwild1@gmail.com> | 2025-02-15 10:34:26 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2025-02-15 10:34:26 +0000 |
| commit | 6218150e93631cfd0aa90bcf52eff3703751bb37 (patch) | |
| tree | ad5a17aec71ea06c03b75e9f932ce767770b5f64 | |
| parent | 1de000714134b3116dba310b277307a6a609a30b (diff) | |
| parent | f5f2755b632aef7d2646ee7db9e1b63c1cb9a099 (diff) | |
| download | prosody-6218150e93631cfd0aa90bcf52eff3703751bb37.tar.gz prosody-6218150e93631cfd0aa90bcf52eff3703751bb37.zip | |
Merge 13.0->trunk
| -rw-r--r-- | .semgrep.yml | 9 | ||||
| -rw-r--r-- | plugins/mod_cloud_notify.lua | 14 | ||||
| -rw-r--r-- | plugins/mod_cron.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_invites.lua | 4 |
4 files changed, 19 insertions, 10 deletions
diff --git a/.semgrep.yml b/.semgrep.yml index 22bfcfea..c475859d 100644 --- a/.semgrep.yml +++ b/.semgrep.yml @@ -28,3 +28,12 @@ rules: message: Use :get_text() to read text, or pass a value here to add text severity: WARNING languages: [lua] +- id: require-unprefixed-module + patterns: + - pattern: require("$X") + - metavariable-regex: + metavariable: $X + regex: '^(core|net|util)\.' + message: Prefix required module path with 'prosody.' + severity: ERROR + languages: [lua] diff --git a/plugins/mod_cloud_notify.lua b/plugins/mod_cloud_notify.lua index 987be84f..1c660e93 100644 --- a/plugins/mod_cloud_notify.lua +++ b/plugins/mod_cloud_notify.lua @@ -5,13 +5,13 @@ -- This file is MIT/X11 licensed. local os_time = os.time; -local st = require"util.stanza"; -local jid = require"util.jid"; -local dataform = require"util.dataforms".new; -local hashes = require"util.hashes"; -local random = require"util.random"; -local cache = require"util.cache"; -local watchdog = require "util.watchdog"; +local st = require"prosody.util.stanza"; +local jid = require"prosody.util.jid"; +local dataform = require"prosody.util.dataforms".new; +local hashes = require"prosody.util.hashes"; +local random = require"prosody.util.random"; +local cache = require"prosody.util.cache"; +local watchdog = require "prosody.util.watchdog"; local xmlns_push = "urn:xmpp:push:0"; diff --git a/plugins/mod_cron.lua b/plugins/mod_cron.lua index 67b68514..77bdd7e5 100644 --- a/plugins/mod_cron.lua +++ b/plugins/mod_cron.lua @@ -78,7 +78,7 @@ module:add_item("shell-command", { args = {}; handler = function(self, filter_host) local format_table = require("prosody.util.human.io").table; - local it = require("util.iterators"); + local it = require("prosody.util.iterators"); local row = format_table({ { title = "Host"; width = "2p" }; { title = "Task"; width = "3p" }; diff --git a/plugins/mod_invites.lua b/plugins/mod_invites.lua index 1e6ef861..c93afaa8 100644 --- a/plugins/mod_invites.lua +++ b/plugins/mod_invites.lua @@ -6,8 +6,8 @@ local jid_split = require "prosody.util.jid".split; local argparse = require "prosody.util.argparse"; local human_io = require "prosody.util.human.io"; -local url_escape = require "util.http".urlencode; -local render_url = require "util.interpolation".new("%b{}", url_escape, { +local url_escape = require "prosody.util.http".urlencode; +local render_url = require "prosody.util.interpolation".new("%b{}", url_escape, { urlescape = url_escape; noscheme = function (urlstring) return (urlstring:gsub("^[^:]+:", "")); |