mirror of
https://github.com/bitechdev/ResolveSpec.git
synced 2026-05-15 16:25:20 +00:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
49639b6c19 | ||
|
|
8733176cba | ||
|
|
bce27f7ed2 |
@@ -31,6 +31,7 @@ type SqlQueryOptions struct {
|
|||||||
NoCount bool
|
NoCount bool
|
||||||
BlankParams bool
|
BlankParams bool
|
||||||
AllowFilter bool
|
AllowFilter bool
|
||||||
|
AllowQueryParamFilters bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewSqlQueryOptions() SqlQueryOptions {
|
func NewSqlQueryOptions() SqlQueryOptions {
|
||||||
@@ -38,6 +39,7 @@ func NewSqlQueryOptions() SqlQueryOptions {
|
|||||||
NoCount: false,
|
NoCount: false,
|
||||||
BlankParams: true,
|
BlankParams: true,
|
||||||
AllowFilter: true,
|
AllowFilter: true,
|
||||||
|
AllowQueryParamFilters: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -138,6 +140,11 @@ func (h *Handler) SqlQueryList(sqlquery string, options SqlQueryOptions) HTTPFun
|
|||||||
// Merge query string parameters
|
// Merge query string parameters
|
||||||
sqlquery = h.mergeQueryParams(r, sqlquery, variables, options.AllowFilter, propQry)
|
sqlquery = h.mergeQueryParams(r, sqlquery, variables, options.AllowFilter, propQry)
|
||||||
|
|
||||||
|
// Apply p_-prefixed query params as field filters
|
||||||
|
if options.AllowQueryParamFilters {
|
||||||
|
sqlquery = h.applyQueryParamFilters(r, sqlquery)
|
||||||
|
}
|
||||||
|
|
||||||
// Merge header parameters
|
// Merge header parameters
|
||||||
sqlquery = h.mergeHeaderParams(r, sqlquery, variables, propQry, &complexAPI)
|
sqlquery = h.mergeHeaderParams(r, sqlquery, variables, propQry, &complexAPI)
|
||||||
|
|
||||||
@@ -168,9 +175,16 @@ func (h *Handler) SqlQueryList(sqlquery string, options SqlQueryOptions) HTTPFun
|
|||||||
// Replace meta variables in SQL
|
// Replace meta variables in SQL
|
||||||
sqlquery = h.replaceMetaVariables(sqlquery, r, userCtx, metainfo, variables)
|
sqlquery = h.replaceMetaVariables(sqlquery, r, userCtx, metainfo, variables)
|
||||||
|
|
||||||
// Remove unused input variables
|
// Replace variables from provided values, then blank any remaining unused ones
|
||||||
if options.BlankParams {
|
|
||||||
for _, kw := range inputvars {
|
for _, kw := range inputvars {
|
||||||
|
varName := kw[1 : len(kw)-1] // strip [ and ]
|
||||||
|
if val, ok := variables[varName]; ok {
|
||||||
|
if strVal := fmt.Sprintf("%v", val); strVal != "" {
|
||||||
|
sqlquery = strings.ReplaceAll(sqlquery, kw, ValidSQL(strVal, "colvalue"))
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if options.BlankParams {
|
||||||
replacement := getReplacementForBlankParam(sqlquery, kw)
|
replacement := getReplacementForBlankParam(sqlquery, kw)
|
||||||
sqlquery = strings.ReplaceAll(sqlquery, kw, replacement)
|
sqlquery = strings.ReplaceAll(sqlquery, kw, replacement)
|
||||||
logger.Debug("Replaced unused variable %s with: %s", kw, replacement)
|
logger.Debug("Replaced unused variable %s with: %s", kw, replacement)
|
||||||
@@ -474,6 +488,11 @@ func (h *Handler) SqlQuery(sqlquery string, options SqlQueryOptions) HTTPFuncTyp
|
|||||||
// Merge query string parameters
|
// Merge query string parameters
|
||||||
sqlquery = h.mergeQueryParams(r, sqlquery, variables, false, propQry)
|
sqlquery = h.mergeQueryParams(r, sqlquery, variables, false, propQry)
|
||||||
|
|
||||||
|
// Apply p_-prefixed query params as field filters
|
||||||
|
if options.AllowQueryParamFilters {
|
||||||
|
sqlquery = h.applyQueryParamFilters(r, sqlquery)
|
||||||
|
}
|
||||||
|
|
||||||
// Merge header parameters
|
// Merge header parameters
|
||||||
sqlquery = h.mergeHeaderParams(r, sqlquery, variables, propQry, &complexAPI)
|
sqlquery = h.mergeHeaderParams(r, sqlquery, variables, propQry, &complexAPI)
|
||||||
hookCtx.ComplexAPI = complexAPI
|
hookCtx.ComplexAPI = complexAPI
|
||||||
@@ -520,9 +539,16 @@ func (h *Handler) SqlQuery(sqlquery string, options SqlQueryOptions) HTTPFuncTyp
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove unused input variables
|
// Replace variables from provided values, then blank any remaining unused ones
|
||||||
if options.BlankParams {
|
|
||||||
for _, kw := range inputvars {
|
for _, kw := range inputvars {
|
||||||
|
varName := kw[1 : len(kw)-1] // strip [ and ]
|
||||||
|
if val, ok := variables[varName]; ok {
|
||||||
|
if strVal := fmt.Sprintf("%v", val); strVal != "" {
|
||||||
|
sqlquery = strings.ReplaceAll(sqlquery, kw, ValidSQL(strVal, "colvalue"))
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if options.BlankParams {
|
||||||
replacement := getReplacementForBlankParam(sqlquery, kw)
|
replacement := getReplacementForBlankParam(sqlquery, kw)
|
||||||
sqlquery = strings.ReplaceAll(sqlquery, kw, replacement)
|
sqlquery = strings.ReplaceAll(sqlquery, kw, replacement)
|
||||||
logger.Debug("Replaced unused variable %s with: %s", kw, replacement)
|
logger.Debug("Replaced unused variable %s with: %s", kw, replacement)
|
||||||
@@ -824,6 +850,43 @@ func (h *Handler) mergeHeaderParams(r *http.Request, sqlquery string, variables
|
|||||||
return sqlquery
|
return sqlquery
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// sqlStripStringLiterals removes the contents of single-quoted string literals from SQL,
|
||||||
|
// leaving the structural identifiers (column names, table names) intact.
|
||||||
|
// Used to check column presence without matching inside string arguments.
|
||||||
|
func sqlStripStringLiterals(sql string) string {
|
||||||
|
re := regexp.MustCompile(`'(?:[^']|'')*'`)
|
||||||
|
return re.ReplaceAllString(sql, "''")
|
||||||
|
}
|
||||||
|
|
||||||
|
// applyQueryParamFilters applies query parameters as SQL field filters when the param name
|
||||||
|
// appears as a structural identifier in the SQL (not inside a string literal).
|
||||||
|
// e.g. ?rid_parent=0 → (rid_parent = 0 OR rid_parent IS NULL)
|
||||||
|
func (h *Handler) applyQueryParamFilters(r *http.Request, sqlquery string) string {
|
||||||
|
sqlStructure := strings.ToLower(sqlStripStringLiterals(sqlquery))
|
||||||
|
for parmk, parmv := range r.URL.Query() {
|
||||||
|
if len(parmv) == 0 || !strings.Contains(sqlStructure, strings.ToLower(parmk)) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
val := parmv[0]
|
||||||
|
dec, err := restheadspec.DecodeParam(val)
|
||||||
|
if err == nil {
|
||||||
|
val = dec
|
||||||
|
}
|
||||||
|
col := ValidSQL(parmk, "colname")
|
||||||
|
switch {
|
||||||
|
case val == "0":
|
||||||
|
sqlquery = sqlQryWhere(sqlquery, fmt.Sprintf("(%[1]s = 0 OR %[1]s IS NULL)", col))
|
||||||
|
case val == "":
|
||||||
|
sqlquery = sqlQryWhere(sqlquery, fmt.Sprintf("(%[1]s = '' OR %[1]s IS NULL)", col))
|
||||||
|
case IsNumeric(val):
|
||||||
|
sqlquery = sqlQryWhere(sqlquery, fmt.Sprintf("%s = %s", col, ValidSQL(val, "colvalue")))
|
||||||
|
default:
|
||||||
|
sqlquery = sqlQryWhere(sqlquery, fmt.Sprintf("%s = '%s'", col, ValidSQL(val, "colvalue")))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return sqlquery
|
||||||
|
}
|
||||||
|
|
||||||
// replaceMetaVariables replaces meta variables like [rid_user], [user], etc. in the SQL query
|
// replaceMetaVariables replaces meta variables like [rid_user], [user], etc. in the SQL query
|
||||||
func (h *Handler) replaceMetaVariables(sqlquery string, r *http.Request, userCtx *security.UserContext, metainfo map[string]interface{}, variables map[string]interface{}) string {
|
func (h *Handler) replaceMetaVariables(sqlquery string, r *http.Request, userCtx *security.UserContext, metainfo map[string]interface{}, variables map[string]interface{}) string {
|
||||||
if strings.Contains(sqlquery, "[p_meta_default]") {
|
if strings.Contains(sqlquery, "[p_meta_default]") {
|
||||||
@@ -991,8 +1054,8 @@ func getReplacementForBlankParam(sqlquery, param string) string {
|
|||||||
charAfter = sqlquery[endIdx]
|
charAfter = sqlquery[endIdx]
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if parameter is surrounded by quotes (single quote or dollar sign for PostgreSQL dollar-quoted strings)
|
// Check if parameter is surrounded by quotes (single quote, dollar sign for PostgreSQL dollar-quoted strings, or double quote for JSON string values)
|
||||||
if (charBefore == '\'' || charBefore == '$') && (charAfter == '\'' || charAfter == '$') {
|
if (charBefore == '\'' || charBefore == '$' || charBefore == '"') && (charAfter == '\'' || charAfter == '$' || charAfter == '"') {
|
||||||
// Parameter is in quotes, return empty string
|
// Parameter is in quotes, return empty string
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -76,9 +76,14 @@ func GetJSONNameForField(modelType reflect.Type, fieldName string) string {
|
|||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle pointer types
|
// Unwrap pointer and slice indirections to reach the struct type
|
||||||
if modelType.Kind() == reflect.Ptr {
|
for {
|
||||||
|
switch modelType.Kind() {
|
||||||
|
case reflect.Ptr, reflect.Slice:
|
||||||
modelType = modelType.Elem()
|
modelType = modelType.Elem()
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
if modelType.Kind() != reflect.Struct {
|
if modelType.Kind() != reflect.Struct {
|
||||||
|
|||||||
@@ -541,9 +541,14 @@ func collectSQLColumnsFromType(typ reflect.Type, columns *[]string, scanOnlyEmbe
|
|||||||
func IsColumnWritable(model any, columnName string) bool {
|
func IsColumnWritable(model any, columnName string) bool {
|
||||||
modelType := reflect.TypeOf(model)
|
modelType := reflect.TypeOf(model)
|
||||||
|
|
||||||
// Unwrap pointers to get to the base struct type
|
// Unwrap pointers and slices to get to the base struct type
|
||||||
for modelType != nil && modelType.Kind() == reflect.Pointer {
|
for modelType != nil {
|
||||||
|
switch modelType.Kind() {
|
||||||
|
case reflect.Ptr, reflect.Slice:
|
||||||
modelType = modelType.Elem()
|
modelType = modelType.Elem()
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
// Validate that we have a struct type
|
// Validate that we have a struct type
|
||||||
@@ -878,8 +883,14 @@ func GetRelationType(model interface{}, fieldName string) RelationType {
|
|||||||
return RelationUnknown
|
return RelationUnknown
|
||||||
}
|
}
|
||||||
|
|
||||||
if modelType.Kind() == reflect.Ptr {
|
// Unwrap pointer → slice → pointer chains to reach the underlying struct
|
||||||
|
for {
|
||||||
|
switch modelType.Kind() {
|
||||||
|
case reflect.Ptr, reflect.Slice:
|
||||||
modelType = modelType.Elem()
|
modelType = modelType.Elem()
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
if modelType == nil || modelType.Kind() != reflect.Struct {
|
if modelType == nil || modelType.Kind() != reflect.Struct {
|
||||||
@@ -1472,9 +1483,14 @@ func convertToFloat64(value interface{}) (float64, bool) {
|
|||||||
func GetValidJSONFieldNames(modelType reflect.Type) map[string]bool {
|
func GetValidJSONFieldNames(modelType reflect.Type) map[string]bool {
|
||||||
validFields := make(map[string]bool)
|
validFields := make(map[string]bool)
|
||||||
|
|
||||||
// Unwrap pointers to get to the base struct type
|
// Unwrap pointers and slices to get to the base struct type
|
||||||
for modelType != nil && modelType.Kind() == reflect.Pointer {
|
for modelType != nil {
|
||||||
|
switch modelType.Kind() {
|
||||||
|
case reflect.Ptr, reflect.Slice:
|
||||||
modelType = modelType.Elem()
|
modelType = modelType.Elem()
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
if modelType == nil || modelType.Kind() != reflect.Struct {
|
if modelType == nil || modelType.Kind() != reflect.Struct {
|
||||||
@@ -1535,8 +1551,13 @@ func getRelationModelSingleLevel(model interface{}, fieldName string) interface{
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if modelType.Kind() == reflect.Ptr {
|
for {
|
||||||
|
switch modelType.Kind() {
|
||||||
|
case reflect.Ptr, reflect.Slice:
|
||||||
modelType = modelType.Elem()
|
modelType = modelType.Elem()
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
if modelType == nil || modelType.Kind() != reflect.Struct {
|
if modelType == nil || modelType.Kind() != reflect.Struct {
|
||||||
@@ -1599,17 +1620,16 @@ func getRelationModelSingleLevel(model interface{}, fieldName string) interface{
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if targetType.Kind() == reflect.Slice {
|
for {
|
||||||
|
switch targetType.Kind() {
|
||||||
|
case reflect.Ptr, reflect.Slice:
|
||||||
targetType = targetType.Elem()
|
targetType = targetType.Elem()
|
||||||
if targetType == nil {
|
if targetType == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
if targetType.Kind() == reflect.Ptr {
|
break
|
||||||
targetType = targetType.Elem()
|
|
||||||
if targetType == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if targetType.Kind() != reflect.Struct {
|
if targetType.Kind() != reflect.Struct {
|
||||||
|
|||||||
Reference in New Issue
Block a user