Merge branch 'ssh-check' of 'https://github.com/acs/perceval.git'

Merges #134 Closes #134
chaoss · Apr 4, 2017 · ee954d6 · ee954d6
2 parents e708d40 + a376374
commit ee954d6
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/perceval/backends/core/gerrit.py b/perceval/backends/core/gerrit.py
@@ -54,11 +54,12 @@ class Gerrit(Backend):
     :param tag: label used to mark the data
     :param cache: cache object to store raw data
     """
-    version = '0.7.1'
+    version = '0.7.2'
 
     def __init__(self, url,
                  user=None, max_reviews=MAX_REVIEWS,
                  blacklist_reviews=None,
+                 disable_host_key_check=False,
                  tag=None, cache=None):
         origin = url
 
@@ -67,7 +68,7 @@ def __init__(self, url,
         self.max_reviews = max(1, max_reviews)
         self.blacklist_reviews = blacklist_reviews
         self.client = GerritClient(self.url, user, max_reviews,
-                                   blacklist_reviews)
+                                   blacklist_reviews, disable_host_key_check)
 
     @metadata
     def fetch(self, from_date=DEFAULT_DATETIME):
@@ -286,15 +287,20 @@ class GerritClient():
     MAX_RETRIES = 3  # max number of retries when a command fails
     RETRY_WAIT = 60  # number of seconds when retrying a ssh command
 
-    def __init__(self, repository, user, max_reviews, blacklist_reviews=[]):
+    def __init__(self, repository, user, max_reviews, blacklist_reviews=[],
+                 disable_host_key_check=False):
         self.gerrit_user = user
         self.max_reviews = max_reviews
         self.blacklist_reviews = blacklist_reviews
         self.repository = repository
         self.project = None
         self._version = None
-        self.gerrit_cmd = "ssh -p %s %s@%s" % (GerritClient.PORT, self.gerrit_user,
-                                               self.repository)
+        ssh_opts = ''
+        if disable_host_key_check:
+            ssh_opts += "-o StrictHostKeyChecking=no "
+
+        self.gerrit_cmd = "ssh %s -p %s %s@%s" % (ssh_opts, GerritClient.PORT,
+                                                  self.gerrit_user, self.repository)
         self.gerrit_cmd += " %s " % (GerritClient.CMD_GERRIT)
 
     def __execute(self, cmd):
@@ -442,6 +448,8 @@ def setup_cmd_parser():
         group.add_argument('--blacklist-reviews', dest='blacklist_reviews',
                            nargs='*',
                            help="Wrong reviews that must not be retrieved.")
+        group.add_argument('--disable-host-key-check', dest='disable_host_key_check', action='store_true',
+                           help="Don't check remote host identity")
 
         # Required arguments
         parser.parser.add_argument('url',