summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorParamat <paramat@users.noreply.github.com>2019-01-03 11:10:07 +0000
committerLoïc Blot <nerzhul@users.noreply.github.com>2019-01-03 12:10:07 +0100
commitceacff13a666779d75ac48f2cc5c11bc2ce5c6e1 (patch)
treead82bd3a44ced8af130f372fb1c3df8d389b3bdd /src/network
parentc26eab6319b64089a32e43cf1626f9583947572a (diff)
downloadminetest-ceacff13a666779d75ac48f2cc5c11bc2ce5c6e1.tar.gz
minetest-ceacff13a666779d75ac48f2cc5c11bc2ce5c6e1.tar.bz2
minetest-ceacff13a666779d75ac48f2cc5c11bc2ce5c6e1.zip
CSM restrictions: Make 'LOAD_CLIENT_MODS' disable loading of 'builtin' (#8000)
Previously, when the CSM restriction 'LOAD_CLIENT_MODS' was used a client was still able to add CSM code to 'builtin' to bypass that restriction, because 'builtin' is not yet verified. Until server-sent CSM and verifying of 'builtin' are complete, make 'LOAD_CLIENT_MODS' disable the loading of builtin. Clarify code comments and messages to distinguish between client-side modding and client-side scripting. 'Scripting' includes 'builtin', 'modding' does not.
Diffstat (limited to 'src/network')
-rw-r--r--src/network/networkprotocol.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/network/networkprotocol.h b/src/network/networkprotocol.h
index 6d6708482..96dfbe44f 100644
--- a/src/network/networkprotocol.h
+++ b/src/network/networkprotocol.h
@@ -947,7 +947,11 @@ enum PlayerListModifer: u8
enum CSMRestrictionFlags : u64 {
CSM_RF_NONE = 0x00000000,
- CSM_RF_LOAD_CLIENT_MODS = 0x00000001, // Disable mods provided by clients
+ // Until server-sent CSM and verifying of builtin are complete,
+ // 'CSM_RF_LOAD_CLIENT_MODS' also disables loading 'builtin'.
+ // When those are complete, this should return to only being a restriction on the
+ // loading of client mods.
+ CSM_RF_LOAD_CLIENT_MODS = 0x00000001, // Don't load client-provided mods or 'builtin'
CSM_RF_CHAT_MESSAGES = 0x00000002, // Disable chat message sending from CSM
CSM_RF_READ_ITEMDEFS = 0x00000004, // Disable itemdef lookups
CSM_RF_READ_NODEDEFS = 0x00000008, // Disable nodedef lookups