Skip to content

Fix mysql security issues and some updates to bring it to the main branch #2

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

Open
andreblue wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix mysql security issues and some updates to bring it to the main branch #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f564a0
Moved sql details out of the tool file that is sent to a client...
andreblue Oct 4, 2015
db0bb9c
Delete permaprops.lua.mysql
andreblue Oct 4, 2015
5f87040
Delete permaprops.lua.sqlite
andreblue Oct 4, 2015
2c61af5
andreblue Oct 4, 2015
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
23 changes: 23 additions & 0 deletions lua/autorun/server/permapropmysql.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@

require('mysqloo')

local HOST = "localhost"
local USER = "user"
local PASS = ""
local DATABASE = ""
local PORT = 3306

if !mysqloo then MsgN("[PermaProps] -> Failed to load mysqloo module.\n\tPlease recheck your version to make sure it's installed correctly.\n\tAlso check to see if you have the right version.") return end

Perma.MySQL = mysqloo.connect(HOST, USER, PASS, DATABASE, PORT)
Perma.MySQL.onConnected = function()
Perma.MySQLConnected = true

MsgN("[PermaProps] Successfully to connect to database.")
init()
end
Perma.MySQL.onConnectionFailed = function(db, err)
Perma.MySQLConnected = false
MsgN("[PermaProps] Failed to connect to database -> " .. err)
end
Perma.MySQL:connect()
35 changes: 3 additions & 32 deletions ...ons/gmod_tool/stools/permaprops.lua.mysql → lua/weapons/gmod_tool/stools/permaprops.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

Perma = Perma or {} -- Init table

TOOL.Category = "SaveProps"
TOOL.Category = "Props Tool"
TOOL.Name = "PermaProps"
TOOL.Command = nil
TOOL.ConfigName = ""
Expand All @@ -31,32 +31,7 @@ if CLIENT then
language.Add("Tool.permaprops.0", "LeftClick: Add RightClick: Remove Reload: Update")
end

if SERVER then
require('mysqloo')

local HOST = "localhost"
local USER = "user"
local PASS = ""
local DATABASE = ""
local PORT = 3306

if !mysqloo then MsgN("[PermaProps] -> Failed to load mysqloo module.\n\tPlease recheck your version to make sure it's installed correctly.\n\tAlso check to see if you have the right version.") return end

Perma.MySQL = mysqloo.connect(HOST, USER, PASS, DATABASE, PORT)
Perma.MySQL.onConnected = function()
Perma.MySQLConnected = true

MsgN("[PermaProps] Successfully to connect to database.")
init()
end
Perma.MySQL.onConnectionFailed = function(db, err)
Perma.MySQLConnected = false
MsgN("[PermaProps] Failed to connect to database -> " .. err)
end
Perma.MySQL:connect()


end

function init()

Expand Down Expand Up @@ -171,7 +146,7 @@ local function PPGetEntTable( ent )
content.Angle = ent:GetAngles()
content.Model = ent:GetModel()
content.Skin = ent:GetSkin()
content.Mins, content.Maxs = ent:GetCollisionBounds()
--content.Mins, content.Maxs = ent:GetCollisionBounds()
content.ColGroup = ent:GetCollisionGroup()
content.Name = ent:GetName()
content.ModelScale = ent:GetModelScale()
Expand Down Expand Up @@ -213,7 +188,7 @@ local function PPEntityFromTable( data, id )
ent:SetAngles( data.Angle or Angle(0, 0, 0) )
ent:SetModel( data.Model or "models/error.mdl" )
ent:SetSkin( data.Skin or 0 )
ent:SetCollisionBounds( ( data.Mins or 0 ), ( data.Maxs or 0 ) )
--ent:SetCollisionBounds( ( data.Mins or 0 ), ( data.Maxs or 0 ) )
ent:SetCollisionGroup( data.ColGroup or 0 )
ent:SetName( data.Name or "" )
ent:SetModelScale( data.ModelScale or 1 )
Expand Down Expand Up @@ -384,8 +359,6 @@ function TOOL:LeftClick(trace)

if CLIENT then return end

if not trace.Entity:IsValid() or not self:GetOwner():IsAdmin() then return end

local ent = trace.Entity
local ply = self:GetOwner()

Expand Down Expand Up @@ -425,8 +398,6 @@ function TOOL:RightClick(trace)

if CLIENT then return end

if (not trace.Entity:IsValid()) then return end

local ent = trace.Entity
local ply = self:GetOwner()

Expand Down
Loading