Fix/disallow order bys

measurements/api/measurements.py

@@ -271,11 +271,14 @@ def list_measurements(
 
     q = current_app.db_session.query(*cols)\
             .join(Report, Report.report_no == Measurement.report_no)\
-            .outerjoin(Label, Label.msm_no == Measurement.msm_no)\
-            .outerjoin(Input, Measurement.input_no == Input.input_no)
+            .outerjoin(Label, Label.msm_no == Measurement.msm_no)
 
     if input_:
-        q = q.filter(Input.input.like('%{}%'.format(input_)))
+        q = q.join(Input, Measurement.input_no == Input.input_no)\
+             .filter(Input.input.like('%{}%'.format(input_)))
+    else:
+        q = q.outerjoin(Input, Measurement.input_no == Input.input_no)
+
     if report_id:
         q = q.filter(Report.report_id == report_id)
     if probe_cc:
@@ -306,7 +309,6 @@ def list_measurements(
             c_failure == False
         ))
 
-
     if order_by is not None:
         q = q.order_by('{} {}'.format(order_by, order))
 

measurements/openapi/measurements.yml

@@ -24,6 +24,7 @@ paths:
         - name: input
           in: query
           type: string
+          minLength: 3 # `input` is handled by pg_trgm
           description: The input (for example a URL or IP address) to search measurements for
         - name: probe_cc
           in: query
@@ -87,16 +88,11 @@ paths:
           type: string
           description: 'By which key the results should be ordered by (default: `test_start_time`)'
           enum:
-            - report_id
-            - input
             - test_start_time
+            - input
             - probe_cc
             - probe_asn
             - test_name
-            # These are all equivalent
-            - index
-            - idx
-            - report_no
         - name: order
           in: query
           type: string

package.json

@@ -23,7 +23,7 @@
     "gulp-sourcemaps": "^2.2.0",
     "gulp-util": "^3.0.7",
     "gulp-watch": "^4.3.9",
-    "jquery": "^2.2.1",
+    "jquery": "^3.0.0",
     "metrics-graphics": "2.10",
     "moment": "^2.17.0",
     "node-sass": "^4.5.3",