Add UpgradeToHttps() to reliably and forcibly upgrade all urls to https

git_cl.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.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld."""
 
 import logging
@@ skipping 25 matching lines @@
 import breakpad  # pylint: disable=W0611
 import fix_encoding
 import gclient_utils
 import presubmit_support
 import rietveld
 import scm
 import subprocess2
 import watchlists
 
 
-DEFAULT_SERVER = 'http://codereview.appspot.com'
+DEFAULT_SERVER = 'https://codereview.appspot.com'
 POSTUPSTREAM_HOOK_PATTERN = '.git/hooks/post-cl-%s'
 DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
 
 
 # Initialized in main()
 settings = None
 
 
 def DieWithError(message):
   print >> sys.stderr, message
@@ skipping 30 matching lines @@
 
 
 def ask_for_data(prompt):
   try:
     return raw_input(prompt)
   except KeyboardInterrupt:
     # Hide the exception.
     sys.exit(1)
 
 
-def FixUrl(server):
-  """Fix a server url to defaults protocol to http:// if none is specified."""
-  if not server:
-    return server
-  if not re.match(r'[a-z]+\://.*', server):
-    return 'http://' + server
-  return server
-
-
 def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
   """Return the corresponding git ref if |base_url| together with |glob_spec|
   matches the full |url|.
 
   If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below).
   """
   fetch_suburl, as_ref = glob_spec.split(':')
   if allow_wildcards:
     glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl)
     if glob_match:
@@ skipping 45 matching lines @@
     """Updates the settings from a codereview.settings file, if available."""
     if not self.updated:
       cr_settings_file = FindCodereviewSettingsFile()
       if cr_settings_file:
         LoadCodereviewSettingsFromFile(cr_settings_file)
       self.updated = True
 
   def GetDefaultServerUrl(self, error_ok=False):
     if not self.default_server:
       self.LazyUpdateIfNeeded()
-      self.default_server = FixUrl(self._GetConfig('rietveld.server',
-                                                   error_ok=True))
+      self.default_server = gclient_utils.UpgradeToHttps(
+          self._GetConfig('rietveld.server', error_ok=True))
       if error_ok:
         return self.default_server
       if not self.default_server:
         error_message = ('Could not find settings file. You must configure '
                          'your review setup by running "git cl config".')
-        self.default_server = FixUrl(self._GetConfig(
-            'rietveld.server', error_message=error_message))
+        self.default_server = gclient_utils.UpgradeToHttps(
+            self._GetConfig('rietveld.server', error_message=error_message))
     return self.default_server
 
   def GetRoot(self):
     if not self.root:
       self.root = os.path.abspath(RunGit(['rev-parse', '--show-cdup']).strip())
     return self.root
 
   def GetIsGitSvn(self):
     """Return true if this repo looks like it's using git-svn."""
     if self.is_git_svn is None:
@@ skipping 69 matching lines @@
     if not self.tree_status_url:
       error_message = ('You must configure your tree status URL by running '
                        '"git cl config".')
       self.tree_status_url = self._GetConfig('rietveld.tree-status-url',
                                              error_ok=error_ok,
                                              error_message=error_message)
     return self.tree_status_url
 
   def GetViewVCUrl(self):
     if not self.viewvc_url:
-      self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
+      self.viewvc_url = gclient_utils.UpgradeToHttps(
+          self._GetConfig('rietveld.viewvc-url', error_ok=True))
     return self.viewvc_url
 
   def GetDefaultCCList(self):
     return self._GetConfig('rietveld.cc', error_ok=True)
 
   def _GetConfig(self, param, **kwargs):
     self.LazyUpdateIfNeeded()
     return RunGit(['config', param], **kwargs).strip()
 
 
@@ skipping 139 matching lines @@
     if remote == '.':
       return None
     return RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
 
   def GetIssue(self):
     if not self.has_issue:
       CheckForMigration()
       issue = RunGit(['config', self._IssueSetting()], error_ok=True).strip()
       if issue:
         self.issue = issue
-        self.rietveld_server = FixUrl(RunGit(
+        self.rietveld_server = gclient_utils.UpgradeToHttps(RunGit(
             ['config', self._RietveldServer()], error_ok=True).strip())
       else:
         self.issue = None
       if not self.rietveld_server:
         self.rietveld_server = settings.GetDefaultServerUrl()
       self.has_issue = True
     return self.issue
 
   def GetRietveldServer(self):
     self.GetIssue()
@@ skipping 178 matching lines @@
 
 
 def GetCodereviewSettingsInteractively():
   """Prompt the user for settings."""
   server = settings.GetDefaultServerUrl(error_ok=True)
   prompt = 'Rietveld server (host[:port])'
   prompt += ' [%s]' % (server or DEFAULT_SERVER)
   newserver = ask_for_data(prompt + ':')
   if not server and not newserver:
     newserver = DEFAULT_SERVER
-  if newserver and newserver != server:
-    RunGit(['config', 'rietveld.server', newserver])
+  if newserver:
+    newserver = gclient_utils.UpgradeToHttps(newserver)
+    if newserver != server:
+      RunGit(['config', 'rietveld.server', newserver])
 
-  def SetProperty(initial, caption, name):
+  def SetProperty(initial, caption, name, is_url):
     prompt = caption
     if initial:
       prompt += ' ("x" to clear) [%s]' % initial
     new_val = ask_for_data(prompt + ':')
     if new_val == 'x':
       RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
-    elif new_val and new_val != initial:
-      RunGit(['config', 'rietveld.' + name, new_val])
+    elif new_val:
+      if is_url:
+        new_val = gclient_utils.UpgradeToHttps(new_val)
+      if new_val != initial:
+        RunGit(['config', 'rietveld.' + name, new_val])
 
-  SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc')
+  SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
   SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
-              'tree-status-url')
-  SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url')
+              'tree-status-url', False)
+  SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
 
   # TODO: configure a default branch to diff against, rather than this
   # svn-based hackery.
 
 
 class ChangeDescription(object):
   """Contains a parsed form of the change description."""
   def __init__(self, subject, log_desc, reviewers):
     self.subject = subject
     self.log_desc = log_desc
@@ skipping 576 matching lines @@
     return 1
   issue_arg = args[0]
 
   # TODO(maruel): Use apply_issue.py
 
   if re.match(r'\d+', issue_arg):
     # Input is an issue id.  Figure out the URL.
     issue = issue_arg
     patch_data = Changelist().GetPatchSetDiff(issue)
   else:
-    # Assume it's a URL to the patch. Default to http.
-    issue_url = FixUrl(issue_arg)
+    # Assume it's a URL to the patch. Default to https.
+    issue_url = gclient_utils.UpgradeToHttps(issue_arg)
     match = re.match(r'.*?/issue(\d+)_\d+.diff', issue_url)
     if not match:
       DieWithError('Must pass an issue ID or full URL for '
           '\'Download raw patch set\'')
     issue = match.group(1)
     patch_data = urllib2.urlopen(issue_arg).read()
 
   if options.newbranch:
     if options.force:
       RunGit(['branch', '-D', options.newbranch],
@@ skipping 178 matching lines @@
              'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
   # Not a known command. Default to help.
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))