Merge pull request #502 from ooni/master+hotfix

Make it harder to find AS0 measurements (+merge fix into master)
ooni · Oct 7, 2020 · d698422 · d698422
2 parents e22dc38 + 445812d
commit d698422
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/components/search/FilterSidebar.js b/components/search/FilterSidebar.js
@@ -118,16 +118,21 @@ class FilterSidebar extends React.Component {
       switch(filterName) {
       case 'asnFilter':
         var asnValue = e.target.value
-        var asnRegEx = /^(^AS|as)?[0-9]+$/
-        if (asnValue && asnValue.match(asnRegEx) === null) {
+        // Accepts only formats like AS1234 or 1234
+        // https://regex101.com/r/DnkspD/latest
+        var asnRegEx = /^(AS)?([1-9][0-9]*)$/
+        if (
+          typeof asnValue === 'string' &&
+          (asnValue === '' || asnValue.match(asnRegEx) !== null)
+        ) {
           this.setState({
-            asnError: intl.formatMessage({id: 'Search.Sidebar.ASN.Error'}),
-            isFilterDirty: false
+            asnError: false,
+            isFilterDirty: true
           })
         } else {
           this.setState({
-            asnError: false,
-            isFilterDirty: true
+            asnError: intl.formatMessage({id: 'Search.Sidebar.ASN.Error'}),
+            isFilterDirty: false
           })
         }
         break

diff --git a/pages/search.js b/pages/search.js
@@ -179,10 +179,12 @@ class Search extends React.Component {
     }
 
     const measurements = msmtR.data
+    // drop results with probe_asn === 'AS0'
+    const results = measurements.results.filter(item => item.probe_asn !== 'AS0')
 
     return {
       error: null,
-      results: measurements.results,
+      results,
       nextURL: measurements.metadata.next_url,
       testNamesKeyed,
       testNames,
@@ -240,8 +242,9 @@ class Search extends React.Component {
     axios.get(this.state.nextURL)
       .then((res) => {
         // XXX update the query
+        const nextPageResults = res.data.results.filter(item => item.probe_asn !== 'AS0')
         this.setState({
-          results: this.state.results.concat(res.data.results),
+          results: this.state.results.concat(nextPageResults),
           nextURL: res.data.metadata.next_url,
           show: this.state.show + 50
         })
@@ -268,9 +271,10 @@ class Search extends React.Component {
         // XXX do error handling
         getMeasurements(query)
           .then((res) => {
+            const results = res.data.results.filter(item => item.probe_asn !== 'AS0')
             this.setState({
               loading: false,
-              results: res.data.results,
+              results,
               nextURL: res.data.metadata.next_url
             })
           })