fixes bug 932060 - Whitelist annotation "BIOS_Manufacturer", r=selena…

…marie
mozilla-services · Oct 29, 2013 · 81b7eb7 · 81b7eb7
1 parent 9e8bf28
commit 81b7eb7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/webapp-django/crashstats/api/tests/test_views.py b/webapp-django/crashstats/api/tests/test_views.py
@@ -638,6 +638,7 @@ def mocked_get(url, **options):
             "legacy_processing": 0,
             "ProductID": "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}",
             "AsyncShutdownTimeout": 12345,
+            "BIOS_Manufacturer": "abc123",
             "Comments": "I visited http://p0rn.com and mail@email.com"
             }
             """)
@@ -659,6 +660,7 @@ def mocked_get(url, **options):
         ok_('id' in dump)
         ok_('URL' not in dump)  # right?
         ok_('AsyncShutdownTimeout' in dump)
+        ok_('BIOS_Manufacturer' in dump)
 
         # `Comments` is scrubbed
         ok_('I visited' in dump['Comments'])

diff --git a/webapp-django/crashstats/crashstats/models.py b/webapp-django/crashstats/crashstats/models.py
@@ -856,6 +856,7 @@ class RawCrash(SocorroMiddleware):
         'Android_CPU_ABI2',
         'throttle_rate',
         'AsyncShutdownTimeout',
+        'BIOS_Manufacturer',
     )
 
     API_CLEAN_SCRUB = (