Remove API keys from source.

remoting/webapp/build-webapp.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Creates a directory with with the unpacked contents of the remoting webapp.
 
 The directory will contain a copy-of or a link-to to all remoting webapp
 resources.  This includes HTML/JS and any plugin binaries. The script also
 massages resulting files appropriately with host plugin data. Finally,
 a zip archive for all of the above is produced.
 """
 
 # Python 2.5 compatibility
 from __future__ import with_statement
 
 import os
 import platform
 import re
 import shutil
 import subprocess
 import sys
 import time
 import zipfile
 
+# Munge include path to find the google_api_keys API, and import it.
+if __name__ == '__main__':
+  sys.path.append(
+      os.path.abspath(os.path.join(sys.path[0], '../../google_apis')))

[Wez, 2012/09/18 01:10:36]

This assumes that the path containing "google_apis" appears first in PYTHONPATH;
is that necessarily the case?

[Jamie, 2012/09/18 01:23:57]

It certainly appears to be when you run this using ninja. I haven't tried with
anything else. If it doesn't work, it will be a build failure, so should be easy
enough to track down.

+import google_api_keys
+
 def findAndReplace(filepath, findString, replaceString):
   """Does a search and replace on the contents of a file."""
   oldFilename = os.path.basename(filepath) + '.old'
   oldFilepath = os.path.join(os.path.dirname(filepath), oldFilename)
   os.rename(filepath, oldFilepath)
   with open(oldFilepath) as input:
     with open(filepath, 'w') as output:
       for s in input:
         output.write(s.replace(findString, replaceString))
   os.remove(oldFilepath)
@@ skipping 141 matching lines @@
     oauth2RedirectUrlJs = "'" + baseUrl + "/dev'"
     oauth2RedirectUrlJson = baseUrl + '/dev*'
   findAndReplace(os.path.join(destination, 'plugin_settings.js'),
                  "'OAUTH2_REDIRECT_URL'",
                  oauth2RedirectUrlJs)
   findAndReplace(os.path.join(destination, 'manifest.json'),
                  "OAUTH2_REDIRECT_URL",
                  oauth2RedirectUrlJson)
 
   # Set the correct API keys.
-  if (buildtype == 'Official'):
-    apiClientId = ('440925447803-avn2sj1kc099s0r7v62je5s339mu0am1.' +
-        'apps.googleusercontent.com')
-    apiClientSecret = 'Bgur6DFiOMM1h8x-AQpuTQlK'
-    oauth2UseOfficialClientId = 'true';
-  else:
-    apiClientId = ('440925447803-2pi3v45bff6tp1rde2f7q6lgbor3o5uj.' +
-        'apps.googleusercontent.com')
-    apiClientSecret = 'W2ieEsG-R1gIA4MMurGrgMc_'
-    oauth2UseOfficialClientId = 'false';
+  apiClientId = google_api_keys.GetClientID('REMOTING')
+  apiClientSecret = google_api_keys.GetClientSecret('REMOTING')
+  # TODO(jamiewalch): Get rid of the useOfficialClientId hack.

[Wez, 2012/09/18 01:10:36]

nit: Create & refer to a bug for that work.

[Jamie, 2012/09/18 01:23:57]

Done.

+  oauth2UseOfficialClientId = 'true';
+
   findAndReplace(os.path.join(destination, 'plugin_settings.js'),
                  "'API_CLIENT_ID'",
                  "'" + apiClientId + "'")
   findAndReplace(os.path.join(destination, 'plugin_settings.js'),
                  "'API_CLIENT_SECRET'",
                  "'" + apiClientSecret + "'")
   findAndReplace(os.path.join(destination, 'plugin_settings.js'),
                  "OAUTH2_USE_OFFICIAL_CLIENT_ID",
                  oauth2UseOfficialClientId)
 
@@ skipping 19 matching lines @@
     else:
       files.append(arg)
 
   buildWebApp(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5],
               sys.argv[6], files, locales)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())