Domain Reliability: Simplify configs and reports

components/domain_reliability/bake_in_configs.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 """Takes the JSON files in components/domain_reliability/baked_in_configs and
 encodes their contents as an array of C strings that gets compiled in to Chrome
 and loaded at runtime."""
 
@@ skipping 457 matching lines @@
 """
 
 
 def read_json_files_from_gypi(gypi_file):
   with open(gypi_file, 'r') as f:
     gypi_text = f.read()
   json_files = ast.literal_eval(gypi_text)['variables']['baked_in_configs']
   return json_files
 
 
-def domain_is_whitelisted(domain):
+def origin_is_whitelisted(origin):
+  if origin.startswith('https://') and origin.endswith('/'):
+    domain = origin[8:-1]
+  else:
+    return False
   return any(domain == e or domain.endswith('.' + e)  for e in DOMAIN_WHITELIST)
 
 
 def quote_and_wrap_text(text, width=79, prefix='  "', suffix='"'):
   max_length = width - len(prefix) - len(suffix)
   output = prefix
   line_length = 0
   for c in text:
     if c == "\"":
       c = "\\\""
@@ skipping 30 matching lines @@
 
   for json_file in json_files:
     with open(json_file, 'r') as f:
       json_text = f.read()
     try:
       config = json.loads(json_text)
     except ValueError, e:
       print >> sys.stderr, "%s: error parsing JSON: %s" % (json_file, e)
       found_invalid_config = True
       continue
-    if 'monitored_domain' not in config:

[Randy Smith (Not in Mondays), 2015/10/29 22:36:10]

Just confirming that all the .json files being parsed are in the source tree? 
I.e. we aren't yet dealing with stuff incoming from web sites?

[Deprecated (see juliatuttle), 2015/11/02 23:19:30]

Yes. We're not accepting *anything* from the web yet, even from our own origins.

-      print >> sys.stderr, '%s: no monitored_domain found' % json_file
+    if 'origin' not in config:
+      print >> sys.stderr, '%s: no origin found' % json_file
       found_invalid_config = True
       continue
-    domain = config['monitored_domain']
-    if not domain_is_whitelisted(domain):
-      print >> sys.stderr, ('%s: monitored_domain "%s" not in whitelist' %
-                            (json_file, domain))
+    origin = config['origin']
+    if not origin_is_whitelisted(origin):
+      print >> sys.stderr, ('%s: origin "%s" not in whitelist' %
+                            (json_file, origin))
       found_invalid_config = True
       continue
 
     # Re-dump JSON to get a more compact representation.
     dumped_json_text = json.dumps(config, separators=(',', ':'))
 
     cpp_code += "  // " + json_file + ":\n"
     cpp_code += quote_and_wrap_text(dumped_json_text) + ",\n"
     cpp_code += "\n"
 
   cpp_code += CC_FOOTER
 
   if found_invalid_config:
     return 1
 
   with open(cpp_file, 'wb') as f:
     f.write(cpp_code)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())