Skip to content

Fix gmod_wire_textscreen console command injection through copied settings #3738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
James159758 wants to merge 1 commit into from
Closed

Fix gmod_wire_textscreen console command injection through copied settings #3738

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 24 additions & 12 deletions lua/wire/stools/textscreen.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,21 @@ TOOL.ClientConVar = {
text = "",
}

local copyConVars = {
"text", "model", "tsize", "tjust", "valign", "tfont",
"tred", "tgreen", "tblue", "tbgred", "tbggreen", "tbgblue"
}

if SERVER then
util.AddNetworkString("wire_textscreen_copysettings")
else
net.Receive("wire_textscreen_copysettings", function()
for _, name in ipairs(copyConVars) do
GetConVar("wire_textscreen_" .. name):SetString(net.ReadString())
end
end)
end

function TOOL:RightClick( trace )
if not trace.HitPos then return false end
local ent = trace.Entity
Expand All @@ -74,18 +89,15 @@ function TOOL:RightClick( trace )
local ply = self:GetOwner()

if ent:IsValid() and ent:GetClass() == "gmod_wire_textscreen" then
ply:ConCommand('wire_textscreen_text "'..ent.text..'"')
ply:ConCommand('wire_textscreen_model "'..ent:GetModel()..'"')
ply:ConCommand('wire_textscreen_tsize "'..(16 -ent.chrPerLine)..'"')
ply:ConCommand('wire_textscreen_tjust "'..ent.textJust..'"')
ply:ConCommand('wire_textscreen_valign "'..ent.valign..'"')
ply:ConCommand('wire_textscreen_tfont "'..ent.tfont..'"')
ply:ConCommand('wire_textscreen_tred "'..ent.fgcolor.r..'"')
ply:ConCommand('wire_textscreen_tgreen "'..ent.fgcolor.g..'"')
ply:ConCommand('wire_textscreen_tblue "'..ent.fgcolor.b..'"')
ply:ConCommand('wire_textscreen_tbgred "'..ent.bgcolor.r..'"')
ply:ConCommand('wire_textscreen_tbggreen "'..ent.bgcolor.g..'"')
ply:ConCommand('wire_textscreen_tbgblue "'..ent.bgcolor.b..'"')
local values = {
ent.text, ent:GetModel(), 16 - ent.chrPerLine, ent.textJust, ent.valign, ent.tfont,
ent.fgcolor.r, ent.fgcolor.g, ent.fgcolor.b, ent.bgcolor.r, ent.bgcolor.g, ent.bgcolor.b
}
net.Start("wire_textscreen_copysettings")
for _, value in ipairs(values) do
net.WriteString(tostring(value))
end
net.Send(ply)
return true
end

Expand Down
Loading