android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add option '--no-cert-checks' for 'upload' sub command."

Browse Source
This commit is contained in:
David Pursehouse 2017-08-30 15:11:10 +00:00 committed by Gerrit Code Review
commit 2c57d619bc
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
git_config.py
View File

@ -20,6 +20,7 @@ import errno
import json
import os
import re
import ssl
import subprocess
import sys
try:
@ -612,7 +613,7 @@ class Remote(object):
connectionUrl = self._InsteadOf()
return _preconnect(connectionUrl)
def ReviewUrl(self, userEmail):
def ReviewUrl(self, userEmail, validate_certs):
if self._review_url is None:
if self.review is None:
return None
@ -645,6 +646,10 @@ class Remote(object):
else:
try:
info_url = u + 'ssh_info'
if not validate_certs:
context = ssl._create_unverified_context()
info = urllib.request.urlopen(info_url, context=context).read()
else:
info = urllib.request.urlopen(info_url).read()
if info == 'NOT_AVAILABLE' or '<' in info:
# If `info` contains '<', we assume the server gave us some sort

11
project.py
View File

@ -179,14 +179,16 @@ class ReviewableBranch(object):
draft=False,
private=False,
wip=False,
dest_branch=None):
dest_branch=None,
validate_certs=True):
self.project.UploadForReview(self.name,
people,
auto_topic=auto_topic,
draft=draft,
private=private,
wip=wip,
dest_branch=dest_branch)
dest_branch=dest_branch,
validate_certs=validate_certs)
def GetPublishedRefs(self):
refs = {}
@ -1114,7 +1116,8 @@ class Project(object):
draft=False,
private=False,
wip=False,
dest_branch=None):
dest_branch=None,
validate_certs=True):
"""Uploads the named branch for code review.
"""
if branch is None:
@ -1139,7 +1142,7 @@ class Project(object):
branch.remote.projectname = self.name
branch.remote.Save()
url = branch.remote.ReviewUrl(self.UserEmail)
url = branch.remote.ReviewUrl(self.UserEmail, validate_certs)
if url is None:
raise UploadError('review not configured')
cmd = ['push']

7
subcmds/upload.py
View File

@ -181,6 +181,9 @@ Gerrit Code Review: http://code.google.com/p/gerrit/
# Never run upload hooks, but upload anyway (AKA bypass hooks).
# - no-verify=True, verify=True:
# Invalid
p.add_option('--no-cert-checks',
dest='validate_certs', action='store_false', default=True,
help='Disable verifying ssl certs (unsafe).')
p.add_option('--no-verify',
dest='bypass_hooks', action='store_true',
help='Do not run the upload hook.')
@ -389,7 +392,9 @@ Gerrit Code Review: http://code.google.com/p/gerrit/
draft=opt.draft,
private=opt.private,
wip=opt.wip,
dest_branch=destination)
dest_branch=destination,
validate_certs=opt.validate_certs)
branch.uploaded = True
except UploadError as e:
branch.error = e