Skip to content

Sanitizer user input #3 #1569

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

Merged
gizmocuz merged 1 commit into from
May 28, 2017
Merged

Sanitizer user input #3 #1569

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
54 changes: 33 additions & 21 deletions main/WebServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7994,11 +7994,18 @@ namespace http {
}

char szOrderBy[50];
if (order == "")
std::string szQuery;
bool isAlpha = true;
const std::string orderBy = order.c_str();
for(int i = 0; i < orderBy.size(); i++) {
if( !isalpha(orderBy[i])) {
isAlpha = false;
}
}
if (order.empty() || (!isAlpha)) {
strcpy(szOrderBy, "A.[Order],A.LastUpdate DESC");
else
{
sprintf(szOrderBy, "A.[Order],A.%s ASC", order.c_str());
} else {
sprintf(szOrderBy, "A.[Order],A.%%s ASC");
}

unsigned char tempsign = m_sql.m_tempsign[0];
Expand Down Expand Up @@ -8059,14 +8066,16 @@ namespace http {
" WHERE (C.FloorplanID=='%q') AND (C.ID==B.PlanID) AND (B.DeviceRowID==a.ID)"
" AND (B.DevSceneType==1) ORDER BY B.[Order]",
floorID.c_str());
else
result = m_sql.safe_query(
else {
szQuery = (
"SELECT A.ID, A.Name, A.nValue, A.LastUpdate, A.Favorite, A.SceneType,"
" A.Protected, B.XOffset, B.YOffset, B.PlanID, A.Description"
" FROM Scenes as A"
" LEFT OUTER JOIN DeviceToPlansMap as B ON (B.DeviceRowID==a.ID) AND (B.DevSceneType==1)"
" ORDER BY %q",
szOrderBy);
" ORDER BY ");
szQuery += szOrderBy;
result = m_sql.safe_query(szQuery.c_str(), order.c_str());
}

if (result.size() > 0)
{
Expand Down Expand Up @@ -8230,15 +8239,15 @@ namespace http {
bAllowDeviceToBeHidden = true;
}

if (order == "")
if (order.empty() || (!isAlpha))
strcpy(szOrderBy, "A.[Order],A.LastUpdate DESC");
else
{
sprintf(szOrderBy, "A.[Order],A.%s ASC", order.c_str());
sprintf(szOrderBy, "A.[Order],A.%%s ASC");
}
//_log.Log(LOG_STATUS, "Getting all devices: order by %s ", szOrderBy);
if (hardwareid != "") {
result = m_sql.safe_query(
szQuery = (
"SELECT A.ID, A.DeviceID, A.Unit, A.Name, A.Used,A.Type, A.SubType,"
" A.SignalLevel, A.BatteryLevel, A.nValue, A.sValue,"
" A.LastUpdate, A.Favorite, A.SwitchType, A.HardwareID,"
Expand All @@ -8249,11 +8258,12 @@ namespace http {
"FROM DeviceStatus as A LEFT OUTER JOIN DeviceToPlansMap as B "
"ON (B.DeviceRowID==a.ID) AND (B.DevSceneType==0) "
"WHERE (A.HardwareID == %q) "
"ORDER BY %q",
hardwareid.c_str(), szOrderBy);
"ORDER BY ");
szQuery += szOrderBy;
result = m_sql.safe_query(szQuery.c_str(), hardwareid.c_str(), order.c_str());
}
else {
result = m_sql.safe_query(
szQuery = (
"SELECT A.ID, A.DeviceID, A.Unit, A.Name, A.Used,A.Type, A.SubType,"
" A.SignalLevel, A.BatteryLevel, A.nValue, A.sValue,"
" A.LastUpdate, A.Favorite, A.SwitchType, A.HardwareID,"
Expand All @@ -8263,8 +8273,9 @@ namespace http {
" A.Options "
"FROM DeviceStatus as A LEFT OUTER JOIN DeviceToPlansMap as B "
"ON (B.DeviceRowID==a.ID) AND (B.DevSceneType==0) "
"ORDER BY %q",
szOrderBy);
"ORDER BY ");
szQuery += szOrderBy;
result = m_sql.safe_query(szQuery.c_str(), order.c_str());
}
}
}
Expand Down Expand Up @@ -8345,14 +8356,14 @@ namespace http {
bAllowDeviceToBeHidden = true;
}

if (order == "")
if (order.empty() || (!isAlpha))
strcpy(szOrderBy, "A.[Order],A.LastUpdate DESC");
else
{
sprintf(szOrderBy, "A.[Order],A.%s ASC", order.c_str());
sprintf(szOrderBy, "A.[Order],A.%%s ASC");
}
// _log.Log(LOG_STATUS, "Getting all devices for user %lu", m_users[iUser].ID);
result = m_sql.safe_query(
szQuery = (
"SELECT A.ID, A.DeviceID, A.Unit, A.Name, A.Used,"
" A.Type, A.SubType, A.SignalLevel, A.BatteryLevel,"
" A.nValue, A.sValue, A.LastUpdate, A.Favorite,"
Expand All @@ -8365,8 +8376,9 @@ namespace http {
"FROM DeviceStatus as A, SharedDevices as B "
"LEFT OUTER JOIN DeviceToPlansMap as C ON (C.DeviceRowID==A.ID)"
"WHERE (B.DeviceRowID==A.ID)"
" AND (B.SharedUserID==%lu) ORDER BY %q",
m_users[iUser].ID, szOrderBy);
" AND (B.SharedUserID==%lu) ORDER BY ");
szQuery += szOrderBy;
result = m_sql.safe_query(szQuery.c_str(), m_users[iUser].ID, order.c_str());
}
}

Expand Down