Merge pull request #3 from sileht/master

fix rhos gerrit typo and ssl
jd · Oct 11, 2016 · 0c1d71e · 0c1d71e
2 parents 86d426d + a584ac9
commit 0c1d71e
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/rh-cacert.crt b/rh-cacert.crt
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDsDCCAxmgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCVVMx
+FzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRAwDgYDVQQHEwdSYWxlaWdoMRYwFAYD
+VQQKEw1SZWQgSGF0LCBJbmMuMQswCQYDVQQLEwJJUzEWMBQGA1UEAxMNUmVkIEhh
+dCBJUyBDQTEmMCQGCSqGSIb3DQEJARYXc3lzYWRtaW4tcmR1QHJlZGhhdC5jb20w
+HhcNMDkwOTE2MTg0NTI1WhcNMTkwOTE0MTg0NTI1WjCBnTELMAkGA1UEBhMCVVMx
+FzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRAwDgYDVQQHEwdSYWxlaWdoMRYwFAYD
+VQQKEw1SZWQgSGF0LCBJbmMuMQswCQYDVQQLEwJJUzEWMBQGA1UEAxMNUmVkIEhh
+dCBJUyBDQTEmMCQGCSqGSIb3DQEJARYXc3lzYWRtaW4tcmR1QHJlZGhhdC5jb20w
+gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAN/HDWGiL8BarUWDIjNC6uxCXqYN
+QkwcmhILX+cl+YuDDArFL1pYVrith228gF3dSUU5X7kIOmPkkjNheRkbnas61X+n
+i3+KWvbX3q+h5VMxKX2cA1U+R3jLuXqYjF+N2gkPyPvxeoDuEncKAItw+mK/r+4L
+WBb5nFzek7hP3017AgMBAAGjgf0wgfowHQYDVR0OBBYEFA2sGXDtBKdeeKv+i6g0
+6yEmwVY1MIHKBgNVHSMEgcIwgb+AFA2sGXDtBKdeeKv+i6g06yEmwVY1oYGjpIGg
+MIGdMQswCQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xpbmExEDAOBgNV
+BAcTB1JhbGVpZ2gxFjAUBgNVBAoTDVJlZCBIYXQsIEluYy4xCzAJBgNVBAsTAklT
+MRYwFAYDVQQDEw1SZWQgSGF0IElTIENBMSYwJAYJKoZIhvcNAQkBFhdzeXNhZG1p
+bi1yZHVAcmVkaGF0LmNvbYIBATAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
+A4GBAFBgO5y3JcPXH/goumNBW7rr8m9EFZmQyK5gT1Ljv5qaCSZwxkAomhriv04p
+mb1y8yjrK5OY3WwgaRaAWRHp4/hn2HWaRvx3S+gwLM7p8V1pWnbSFJOXF3kbuC41
+voMIMqAFfHKidKN/yrjJg/1ahIjSt11lMUvRJ4TNT+pk5VnB
+-----END CERTIFICATE-----
diff --git a/trelloha.py b/trelloha.py
@@ -2,6 +2,7 @@
 import json
 import logging
 import netrc
+import os
 import re
 
 import defusedxml.ElementTree
@@ -26,9 +27,10 @@ def __init__(self, trello):
 
 class Trelloha(object):
 
+    CERTS = {'https://code.engineering.redhat.com': 'rh-cacert.crt'}
     GERRIT_URLS = {"OpenStack": "https://review.openstack.org",
                    "RDO": "https://review.rdoproject.org",
-                   "RHOS": "https:///code.engineering.redhat.com/gerrit"}
+                   "RHOS": "https://code.engineering.redhat.com/gerrit"}
     BUGZILLA_URLS = {"Red Hat": "https://bugzilla.redhat.com"}
 
     GITHUB_URL = "https://github.com"
@@ -45,6 +47,12 @@ def get_board_token(self, site_name="trello.com", netrc_file=None):
             raise NoAuth(self.trello)
         return n.hosts[site_name][0], n.hosts[site_name][2]
 
+    def get_verify(self, url):
+        for baseurl, cert in self.CERTS.items():
+            if url.startswith(baseurl):
+                return os.path.join(os.path.dirname(__file__), cert)
+        return True
+
     # TODO(jd) add that in trello.boards
     def checkitem_update_state(self, card_id, checklist_id, checkitem_id,
                                state):
@@ -57,12 +65,14 @@ def checkitem_update_state(self, card_id, checklist_id, checkitem_id,
         return json.loads(resp.content)
 
     def get_review(self, gerrit_url, review_id):
-        r = requests.get("%s/changes/%d" % (gerrit_url, review_id))
+        r = requests.get("%s/changes/%d" % (gerrit_url, review_id),
+                         verify=self.get_verify(gerrit_url))
         return json.loads(r.text[5:])
 
     def get_bugzilla(self, bugzilla_url, bug_id):
         r = requests.get("%s/show_bug.cgi?ctype=xml&id=%s" % (bugzilla_url,
-                                                              bug_id))
+                                                              bug_id),
+                         verify=self.get_verify(bugzilla_url))
         return defusedxml.ElementTree.fromstring(r.content)
 
     def is_a_github_pull_request_merged(self, checklist_item):