Skip to content

Fix CodeQL issues #14

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
z46-dev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix CodeQL issues #14

Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion database/queue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,12 @@ func QueuedQuery(query string, args ...interface{}) (*sql.Rows, error) {
var rows *sql.Rows
err := GetQueue().EnqueueOperation(func() error {
var err error
rows, err = db.Query(query, args...)
stmt, err := db.Prepare(query)

Check failure

Code scanning / CodeQL

Database query built from user-controlled sources

This query depends on a [user-provided value](1).

Copilot Autofix

AI over 1 year ago

To fix the problem, we need to ensure that user-provided data is safely embedded into SQL queries using placeholder parameters or prepared statements. Specifically, we should avoid directly concatenating user-provided keys into the query string. Instead, we can use a switch-case or if-else structure to handle different keys and construct the query string safely.

  1. Modify the QueryCourse function in database/course.go to use a switch-case structure to handle different keys and construct the query string safely.
  2. Ensure that the QueuedQuery function in database/queue.go uses the constructed query string with placeholder parameters.
Suggested changeset 1
database/course.go
Outside changed files

Autofix patch

Autofix patch
Run the following command in your local git repository to apply this patch
cat << 'EOF' | git apply
diff --git a/database/course.go b/database/course.go
--- a/database/course.go
+++ b/database/course.go
@@ -226,2 +226,4 @@
 	var err error
+	var query string
+	var args []interface{}
 
@@ -229,9 +231,13 @@
 	case "title":
-		rows, err = QueuedQuery("SELECT term_crn FROM courses WHERE title LIKE ?", "%"+values[0]+"%")
+		query = "SELECT term_crn FROM courses WHERE title LIKE ?"
+		args = append(args, "%"+values[0]+"%")
 	case "subject-number":
-		rows, err = QueuedQuery("SELECT term_crn FROM courses WHERE subject_code = ? AND course_number LIKE ?", values[0], "%"+values[1]+"%")
+		query = "SELECT term_crn FROM courses WHERE subject_code = ? AND course_number LIKE ?"
+		args = append(args, values[0], "%"+values[1]+"%")
 	default:
-		rows, err = QueuedQuery("SELECT term_crn FROM courses WHERE "+key+" = ?", values[0])
+		query = "SELECT term_crn FROM courses WHERE " + key + " = ?"
+		args = append(args, values[0])
 	}
 
+	rows, err = QueuedQuery(query, args...)
 	if err != nil {
EOF
@@ -226,2 +226,4 @@
var err error
var query string
var args []interface{}

@@ -229,9 +231,13 @@
case "title":
rows, err = QueuedQuery("SELECT term_crn FROM courses WHERE title LIKE ?", "%"+values[0]+"%")
query = "SELECT term_crn FROM courses WHERE title LIKE ?"
args = append(args, "%"+values[0]+"%")
case "subject-number":
rows, err = QueuedQuery("SELECT term_crn FROM courses WHERE subject_code = ? AND course_number LIKE ?", values[0], "%"+values[1]+"%")
query = "SELECT term_crn FROM courses WHERE subject_code = ? AND course_number LIKE ?"
args = append(args, values[0], "%"+values[1]+"%")
default:
rows, err = QueuedQuery("SELECT term_crn FROM courses WHERE "+key+" = ?", values[0])
query = "SELECT term_crn FROM courses WHERE " + key + " = ?"
args = append(args, values[0])
}

rows, err = QueuedQuery(query, args...)
if err != nil {
Copilot is powered by AI and may make mistakes. Always verify output.
if err != nil {
return err
}

rows, err = stmt.Query(args...)
return err
})
return rows, err
Expand Down
9 changes: 8 additions & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"encoding/json"
"fmt"
"io"
"math"
"net/http"
"strings"
"time"
Expand Down Expand Up @@ -656,7 +657,13 @@ func main() {
return
}

res, err := http.Get(fmt.Sprintf("https://api.mapbox.com/directions/v5/mapbox/walking/%f,%f;%f,%f?alternatives=true&geometries=geojson&language=en&overview=full&steps=true&access_token=%s", obj.StartX, obj.StartY, obj.EndX, obj.EndY, util.Config.Mapbox.AccessToken))
var validateCoordinate func(float64) float64 = func(x float64) float64 {
return math.Max(-90, math.Min(90, x))
}

var sX, sY, eX, eY float64 = validateCoordinate(obj.StartX), validateCoordinate(obj.StartY), validateCoordinate(obj.EndX), validateCoordinate(obj.EndY)

res, err := http.Get(fmt.Sprintf("https://api.mapbox.com/directions/v5/mapbox/walking/%f,%f;%f,%f?alternatives=true&geometries=geojson&language=en&overview=full&steps=true&access_token=%s", sX, sY, eX, eY, util.Config.Mapbox.AccessToken))

if err != nil {
w.WriteHeader(http.StatusInternalServerError)
Expand Down
15 changes: 13 additions & 2 deletions util/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package util

import (
"fmt"
"math"
"os"
"regexp"
"strconv"
Expand Down Expand Up @@ -100,7 +101,12 @@ func LoadEnvFile() {
Log.Error("DATABASE_QUEUE_SIZE not an integer")
os.Exit(1)
} else {
Config.Database.QueueSize = int(i)
if i > math.MinInt32 && i < math.MaxInt32 {
Config.Database.QueueSize = int(i)
} else {
Log.Error("DATABASE_QUEUE_SIZE not within int32 range")
os.Exit(1)
}
}
}

Expand Down Expand Up @@ -133,7 +139,12 @@ func LoadEnvFile() {
Log.Error("SERVER_PORT not an integer")
os.Exit(1)
} else {
Config.Server.Port = int(i)
if i < math.MaxUint16 {
Config.Server.Port = int(i)
} else {
Log.Error("SERVER_PORT not within int16 range")
os.Exit(1)
}
}
}

Expand Down