Skip to content

Замели метод lib/orm/models/sql_table.p@pfSQLTable.__normalizeWhitespaces на __untaintSQL с явным apply-taint #124

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
unhandled-exception merged 1 commit into from
Jul 28, 2025
Merged

Замели метод lib/orm/models/sql_table.p@pfSQLTable.__normalizeWhitespaces на __untaintSQL с явным apply-taint #124

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
70 changes: 31 additions & 39 deletions lib/sql/models/sql_table.p
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ pfClass
## + Все опции pfSQL.
^self.cleanMethodArgument[aOptions;aSQLOptions]
$lResultType[^if(def $aOptions.asHashOn){table}{^self.__getResultType[$aOptions]}]
$result[^self.CSQL.[$lResultType]{^self.__normalizeWhitespaces{^self.__allSQLExpression[$lResultType;$aOptions;$aSQLOptions]}}[][$aSQLOptions]]
$result[^self.CSQL.[$lResultType]{^self.__untaintSQL{^self.__allSQLExpression[$lResultType;$aOptions;$aSQLOptions]}}[][$aSQLOptions]]

^if($result is table && def $aOptions.asHashOn){
$result[^result.hash[$aOptions.asHashOn;$.type[table] $.distinct(true)]]
Expand All @@ -361,10 +361,8 @@ pfClass
@allSQL[aOptions;aSQLOptions]
## Возвращает текст запроса из метода all.
^self.cleanMethodArgument[aOptions;aSQLOptions]
^CSQL.connect{
$lResultType[^self.__getResultType[$aOptions]]
$result[^self.__normalizeWhitespaces{^self.__allSQLExpression[$lResultType;$aOptions;$aSQLOptions]}[$.apply(true)]]
}
$lResultType[^self.__getResultType[$aOptions]]
$result[^self.__untaintSQL{^self.__allSQLExpression[$lResultType;$aOptions;$aSQLOptions]}]

@union[*aConds]
## Выполняет несколько запросов и объединяет их в один результат.
Expand Down Expand Up @@ -399,7 +397,7 @@ pfClass
# Если нужны сложные варианты используйте aggregate.
$aConds[^hash::create[$aConds] $.orderBy[] $.having[]]
$lExpression[^self._selectExpression[COUNT(*)][;$aConds;$aSQLOptions]]
$result[^self.CSQL.int{^self.__normalizeWhitespaces{$lExpression}}[][$aSQLOptions]]
$result[^self.CSQL.int{^self.__untaintSQL{$lExpression}}[][$aSQLOptions]]

@aggregate[*aConds]
## Выборки с группировкой
Expand All @@ -411,20 +409,18 @@ pfClass
$lConds[^self.__getAgrConds[$aConds]]
$lResultType[^if(def $lConds.options.asHashOn){table}{^self.__getResultType[$lConds.options]}]
$lExpression[^self.__aggregateSQLExpression[$lResultType;$lConds]]
$result[^self.CSQL.[$lResultType]{^self.__normalizeWhitespaces{$lExpression}}[][$lConds.sqlOptions]]
$result[^self.CSQL.[$lResultType]{^self.__untaintSQL{$lExpression}}[][$lConds.sqlOptions]]

^if($result is table && def $lConds.options.asHashOn){
$result[^result.hash[$lConds.options.asHashOn;$.type[table] $.distinct(true)]]
}

@aggregateSQL[*aConds]
## Возвращает текст запроса из метода aggregate.
^CSQL.connect{
$lConds[^self.__getAgrConds[$aConds]]
$lResultType[^self.__getResultType[$lConds.options]]
$lExpression[^self.__aggregateSQLExpression[$lResultType;$lConds]]
$result[^self.CSQL.connect{^self.__normalizeWhitespaces{$lExpression}[$.apply(true)]}]
}
$lConds[^self.__getAgrConds[$aConds]]
$lResultType[^self.__getResultType[$lConds.options]]
$lExpression[^self.__aggregateSQLExpression[$lResultType;$lConds]]
$result[^self.CSQL.connect{^self.__untaintSQL{$lExpression}}]

#----- Манипуляции с данными -----

Expand All @@ -437,7 +433,7 @@ pfClass
^self.assert(!$self._readOnlyTable){Модель $self.CLASS_NAME в режиме read only (только чтение данных)}
^self.cleanMethodArgument[aData;aSQLOptions]
^self.asContext[update]{
$result[^self.CSQL.void{^self.__normalizeWhitespaces{^self._builder.insertStatement[$self.TABLE_NAME;$self._fields;^if($aData is table){$aData.fields}{$aData};
$result[^self.CSQL.void{^self.__untaintSQL{^self._builder.insertStatement[$self.TABLE_NAME;$self._fields;^if($aData is table){$aData.fields}{$aData};
^hash::create[$aSQLOptions]
$.skipFields[$self._skipOnInsert]
$.schema[$self.SCHEMA]
Expand All @@ -456,7 +452,7 @@ pfClass
^self.assert(def $aPrimaryKeyValue){Не задано значение первичного ключа}
^self.cleanMethodArgument[aData]
$result[^self.CSQL.void{
^self.asContext[update]{^self.__normalizeWhitespaces{
^self.asContext[update]{^self.__untaintSQL{
^self._builder.updateStatement[$self.TABLE_NAME;$self._fields;^if($aData is table){$aData.fields}{$aData}][$self.PRIMARYKEY = ^self.fieldValue[$self._fields.[$self._primaryKey];$aPrimaryKeyValue]][
$.skipAbsent(true)
$.skipFields[$self._skipOnUpdate]
Expand Down Expand Up @@ -490,7 +486,7 @@ pfClass
^self.assert(def $self._primaryKey){Не определен первичный ключ для таблицы ${TABLE_NAME}.}
^self.assert(def $aPrimaryKeyValue){Не задано значение первичного ключа}
$result[^self.CSQL.void{
^self.asContext[update]{^self.__normalizeWhitespaces{
^self.asContext[update]{^self.__untaintSQL{
DELETE FROM ^if(def $self.SCHEMA){^self._builder.quoteIdentifier[$self.SCHEMA].}^self._builder.quoteIdentifier[$self.TABLE_NAME] WHERE $self.PRIMARYKEY = ^self.fieldValue[$self._fields.[$self._primaryKey];$aPrimaryKeyValue]
}}
}[][$aSQLOptions]]
Expand All @@ -506,7 +502,7 @@ pfClass
$aValue(^if(def $aValue){$aValue}{1})
$lFieldName[^self._builder.sqlFieldName[$self._fields.[$aFieldName]]]]
$result[^self.CSQL.void{
^self.asContext[update]{^self.__normalizeWhitespaces{
^self.asContext[update]{^self.__untaintSQL{
UPDATE ^if(def $self.SCHEMA){^self._builder.quoteIdentifier[$self.SCHEMA].}^self._builder.quoteIdentifier[$self.TABLE_NAME]
SET $lFieldName = $lFieldName ^if($aValue < 0){-}{+} ^self.fieldValue[$self._fields.[$aFieldName]](^math:abs($aValue))
WHERE $self.PRIMARYKEY = ^self.fieldValue[$self._fields.[$self._primaryKey];$aPrimaryKeyValue]
Expand All @@ -521,7 +517,7 @@ pfClass
^self.assert(!$self._readOnlyTable){Модель $self.CLASS_NAME в режиме read only (только чтение данных)}
^self.cleanMethodArgument[aOptions;aData]
$result[^self.CSQL.void{
^self.asContext[update]{^self.__normalizeWhitespaces{
^self.asContext[update]{^self.__untaintSQL{
^self._builder.updateStatement[$self.TABLE_NAME;$self._fields;$aData][
^self._allWhere[$aOptions]
][
Expand All @@ -538,29 +534,27 @@ pfClass
## Возвращает текст запроса метода modifyAll
^self.assert(!$self._readOnlyTable){Модель $self.CLASS_NAME в режиме read only (только чтение данных)}
^self.cleanMethodArgument[aOptions;aData]
^CSQL.connect{
$result[
^self.asContext[update]{^self.__normalizeWhitespaces{
^self._builder.updateStatement[$self.TABLE_NAME;$self._fields;$aData][
^self._allWhere[$aOptions]
][
$.schema[$self.SCHEMA]
$.skipAbsent(true)
$.skipFields[$self._skipOnUpdate]
$.emptySetExpression[]
$.fieldValueFunction[$self.fieldValue]
]
}}
]
}
$result[
^self.asContext[update]{^self.__untaintSQL{
^self._builder.updateStatement[$self.TABLE_NAME;$self._fields;$aData][
^self._allWhere[$aOptions]
][
$.schema[$self.SCHEMA]
$.skipAbsent(true)
$.skipFields[$self._skipOnUpdate]
$.emptySetExpression[]
$.fieldValueFunction[$self.fieldValue]
]
}}
]

@deleteAll[aOptions]
## Удаляем все записи из таблицы
## Условие для удаления берем из self._allWhere
^self.assert(!$self._readOnlyTable){Модель $self.CLASS_NAME в режиме read only (только чтение данных)}
^self.cleanMethodArgument[]
$result[^self.CSQL.void{
^self.asContext[update]{^self.__normalizeWhitespaces{
^self.asContext[update]{^self.__untaintSQL{
DELETE FROM ^if(def $self.SCHEMA){^self._builder.quoteIdentifier[$self.SCHEMA].}^self._builder.quoteIdentifier[$self.TABLE_NAME]
WHERE ^self._allWhere[$aOptions]
}}
Expand Down Expand Up @@ -903,11 +897,9 @@ pfClass

$result[^result.foreach[_;v]{$v.expr^if(def $v.alias){ AS ^self._builder.quoteIdentifier[$v.alias]}}[, ]]

@__normalizeWhitespaces[aQuery;aOptions]
$result[^untaint[optimized-as-is]{^untaint[sql]{$aQuery}}]

^if(^aOptions.apply.bool(false)){
$result[^apply-taint[$result]]
@__untaintSQL[aQuery]
^CSQL.connect{
$result[^apply-taint[sql][$aQuery]]
}

#----------------------------------------------------------------------------------------------------------------------
Expand Down